Imagelibrary/tinycc
1
0
Fork 0
mirror of https://github.com/TinyCC/tinycc.git synced 2025-11-16 12:34:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update bsd notes

Browse Source 
freebsd 13 must not have note section.
freebsd 14 must have note section.

also added version info.
This commit is contained in:
herman ten brugge
2025-09-03 07:09:42 +02:00
parent b427545419
commit b45cea5f4b
1 changed files with 55 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
tccelf.c
View File

@@ -2803,23 +2803,62 @@ static void create_arm_attribute_section(TCCState *s1)
} }
#endif #endif
#if TARGETOS_OpenBSD || TARGETOS_NetBSD #if TARGETOS_OpenBSD || TARGETOS_NetBSD || TARGETOS_FreeBSD
#include <sys/utsname.h>
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);
}
static Section *create_bsd_note_section(TCCState *s1, static Section *create_bsd_note_section(TCCState *s1,
const char *name, const char *name,
const char *value) const char *value)
{ {
Section *s = find_section (s1, name); Section *s;
unsigned int major = 0, minor = 0, patch = 0;
struct utsname uts;
if (s->data_offset == 0) { if (!uname(&uts))
char *ptr = section_ptr_add(s, sizeof(ElfW(Nhdr)) + 8 + 4); sscanf(uts.release, "%u.%u.%u", &major, &minor, &patch);
ElfW(Nhdr) *note = (ElfW(Nhdr) *) ptr; #if TARGETOS_FreeBSD
if (major < 14)
s->sh_type = SHT_NOTE; return NULL;
note->n_namesz = 8; #endif
note->n_descsz = 4; s = find_section (s1, name);
note->n_type = ELF_NOTE_OS_GNU; s->sh_type = SHT_NOTE;
strcpy (ptr + sizeof(ElfW(Nhdr)), value); #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
return s; return s;
} }
#endif #endif
@@ -2853,12 +2892,13 @@ static int elf_output_file(TCCState *s1, const char *filename)
dyninf.note = create_bsd_note_section (s1, ".note.netbsd.ident", "NetBSD"); dyninf.note = create_bsd_note_section (s1, ".note.netbsd.ident", "NetBSD");
#endif #endif
#if TARGETOS_FreeBSD
dyninf.note = create_bsd_note_section (s1, ".note.tag", "FreeBSD");
#endif
#if TARGETOS_FreeBSD || TARGETOS_NetBSD #if TARGETOS_FreeBSD || TARGETOS_NetBSD
dyninf.roinf = NULL; dyninf.roinf = NULL;
#endif #endif
#if TARGETOS_FreeBSD
dyninf.note = find_section (s1, ".note.tag");
#endif
/* if linking, also link in runtime libraries (libc, libgcc, etc.) */ /* if linking, also link in runtime libraries (libc, libgcc, etc.) */
tcc_add_runtime(s1); tcc_add_runtime(s1);