Skip to content

Libexec/rtld freebsd noinit #356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
laffer1 merged 2 commits into from
May 15, 2026
+6 −3
Merged

Libexec/rtld freebsd noinit #356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9684ec4
lib/libsqlite3: enable PREUPDATE_HOOK and COLUMN_METADATA
laffer1 May 8, 2026
7380db8
rtld: honor FreeBSD no-init notes
laffer1 May 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion lib/libsqlite3/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@ CFLAGS+= -I${SQLITE} \
-DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_FTS4 \
-DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_GEOPOLY \
-DSQLITE_HAVE_ZLIB -DSQLITE_ENABLE_MATH_FUNCTIONS \
-DSQLITE_ENABLE_SESSION
-DSQLITE_ENABLE_SESSION \
-DSQLITE_ENABLE_PREUPDATE_HOOK \
-DSQLITE_ENABLE_COLUMN_METADATA

MK_MAN= no

Expand Down
5 changes: 3 additions & 2 deletions libexec/rtld-elf/rtld.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1770,7 +1770,8 @@ digest_notes(Obj_Entry *obj, Elf_Addr note_start, Elf_Addr note_end)
note = (const Elf_Note *)((const char *)(note + 1) +
roundup2(note->n_namesz, sizeof(Elf32_Addr)) +
roundup2(note->n_descsz, sizeof(Elf32_Addr)))) {
if (note->n_namesz != sizeof(NOTE_MIDNIGHTBSD_VENDOR) ||
if ((note->n_namesz != sizeof(NOTE_MIDNIGHTBSD_VENDOR) &&
note->n_namesz != sizeof(NOTE_FREEBSD_VENDOR)) ||
note->n_descsz != sizeof(int32_t))
continue;
if (note->n_type != NT_FREEBSD_ABI_TAG &&
Expand Down Expand Up @@ -1802,7 +1803,7 @@ digest_notes(Obj_Entry *obj, Elf_Addr note_start, Elf_Addr note_end)
dbg("note fctl0 %#x", obj->fctl0);
break;
case NT_MIDNIGHTBSD_NOINIT_TAG:
/* MidnightBSD 'crt does not call init' note */
/* FreeBSD/MidnightBSD 'crt does not call init' note */
obj->crt_no_init = true;
dbg("note crt_no_init");
break;
Expand Down
Loading