MahnoKropotkinvich/tinycc
1
0
Fork 0
mirror of git://repo.or.cz/tinycc.git synced 2026-07-10 13:28:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Compare commits

base: MahnoKropotkinvich:8c3396a76f1a49eb2209206cf1274c9fc00a7506
Branches Tags
MahnoKropotkinvich:mob
MahnoKropotkinvich:master
MahnoKropotkinvich:release_0_9_27
MahnoKropotkinvich:release_0_9_26
MahnoKropotkinvich:release_0_9_25
MahnoKropotkinvich:release_0_9_24
MahnoKropotkinvich:release_0_9_23
MahnoKropotkinvich:release_0_9_22
MahnoKropotkinvich:release_0_9_20
MahnoKropotkinvich:release_0_9_19
MahnoKropotkinvich:release_0_9_18
MahnoKropotkinvich:initial
..
compare: MahnoKropotkinvich:b42754541919b021ffe4edcdc35724fe4d30a2c2
Branches Tags
MahnoKropotkinvich:mob
MahnoKropotkinvich:master
MahnoKropotkinvich:release_0_9_27
MahnoKropotkinvich:release_0_9_26
MahnoKropotkinvich:release_0_9_25
MahnoKropotkinvich:release_0_9_24
MahnoKropotkinvich:release_0_9_23
MahnoKropotkinvich:release_0_9_22
MahnoKropotkinvich:release_0_9_20
MahnoKropotkinvich:release_0_9_19
MahnoKropotkinvich:release_0_9_18
MahnoKropotkinvich:initial

No commits in common. "8c3396a76f1a49eb2209206cf1274c9fc00a7506" and "b42754541919b021ffe4edcdc35724fe4d30a2c2" have entirely different histories.
8c3396a76f ... b427545419

1 changed files with 15 additions and 60 deletions
Show Stats Expand all files Collapse all files

75
tccelf.c
View File

@ -2803,67 +2803,23 @@ static void create_arm_attribute_section(TCCState *s1)
}
#endif
#if TARGETOS_OpenBSD || TARGETOS_NetBSD || TARGETOS_FreeBSD
#ifndef _WIN32
#include <sys/utsname.h>
#endif
static void fill_bsd_note(Section *s, int type,
const char *value, uint32_t data)
{
unsigned long offset = 0;
char *ptr;
ElfW(Nhdr) *note;
int align = s->sh_addralign;
/* check if type present */
while (offset + sizeof(ElfW(Nhdr)) < s->data_offset) {
note = (ElfW(Nhdr) *) (s->data + offset);
if (note->n_type == type)
return;
offset += (sizeof(ElfW(Nhdr)) + note->n_namesz + note->n_descsz +
align - 1) & -align;
}
ptr = section_ptr_add(s, sizeof(ElfW(Nhdr)) + 8 + 4);
note = (ElfW(Nhdr) *) ptr;
note->n_namesz = 8;
note->n_descsz = 4;
note->n_type = type;
strcpy (ptr + sizeof(ElfW(Nhdr)), value);
memcpy (ptr + sizeof(ElfW(Nhdr)) + 8, &data, 4);
}
#if TARGETOS_OpenBSD || TARGETOS_NetBSD
static Section *create_bsd_note_section(TCCState *s1,
const char *name,
const char *value)
{
Section *s;
unsigned int major = 0, minor = 0, patch = 0;
#ifndef _WIN32
struct utsname uts;
Section *s = find_section (s1, name);
/* Maybe move this to configure option for cross compiling */
if (!uname(&uts))
sscanf(uts.release, "%u.%u.%u", &major, &minor, &patch);
#endif
#if TARGETOS_FreeBSD
if (major < 14)
return NULL;
#endif
s = find_section (s1, name);
s->sh_type = SHT_NOTE;
#if TARGETOS_OpenBSD
fill_bsd_note(s, ELF_NOTE_OS_GNU, value, 0);
#elif TARGETOS_NetBSD
fill_bsd_note(s, 1 /* NT_NETBSD_IDENT_TAG */, value,
major * 100000000u + (minor % 100u) * 1000000u +
(patch % 10000u) * 100u);
#elif TARGETOS_FreeBSD
fill_bsd_note(s, 1 /* NT_FREEBSD_ABI_TAG */, value,
major * 100000u + (minor % 100u) * 1000u);
fill_bsd_note(s, 4 /* NT_FREEBSD_FEATURE_CTL */, value, 0);
fill_bsd_note(s, 2 /* NT_FREEBSD_NOINIT_TAG */, value, 0);
#endif
if (s->data_offset == 0) {
char *ptr = section_ptr_add(s, sizeof(ElfW(Nhdr)) + 8 + 4);
ElfW(Nhdr) *note = (ElfW(Nhdr) *) ptr;
s->sh_type = SHT_NOTE;
note->n_namesz = 8;
note->n_descsz = 4;
note->n_type = ELF_NOTE_OS_GNU;
strcpy (ptr + sizeof(ElfW(Nhdr)), value);
}
return s;
}
#endif
@ -2897,13 +2853,12 @@ static int elf_output_file(TCCState *s1, const char *filename)
dyninf.note = create_bsd_note_section (s1, ".note.netbsd.ident", "NetBSD");
#endif
#if TARGETOS_FreeBSD
dyninf.note = create_bsd_note_section (s1, ".note.tag", "FreeBSD");
#endif
#if TARGETOS_FreeBSD || TARGETOS_NetBSD
dyninf.roinf = NULL;
#endif
#if TARGETOS_FreeBSD
dyninf.note = find_section (s1, ".note.tag");
#endif
/* if linking, also link in runtime libraries (libc, libgcc, etc.) */
tcc_add_runtime(s1);