diff --git a/libexec/ld.elf_so/Makefile b/libexec/ld.elf_so/Makefile index b59a01a42731..60cfe8e049ae 100644 --- a/libexec/ld.elf_so/Makefile +++ b/libexec/ld.elf_so/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.148 2023/10/07 12:15:53 rin Exp $ +# $NetBSD: Makefile,v 1.149 2024/01/19 19:21:34 christos Exp $ # # NOTE: when changing ld.so, ensure that ldd still compiles. # @@ -111,7 +111,7 @@ BINDIR= ${SHLINKINSTALLDIR} CPPFLAGS.tls.c+= -std=gnu11 CPPFLAGS+= -DLIBDIR=\"${LIBDIR}\" -D_PATH_RTLD=\"${BINDIR}/${PROG}\" CPPFLAGS+= -I${.CURDIR} -I. -D_KERNTYPES -CPPFLAGS+= -DRTLD_LOADER +CPPFLAGS+= -DRTLD_LOADER -D_LIBC_INTERNAL CPPFLAGS+= -DGNU_RELRO CPPFLAGS+= -D_RTLD_SOURCE CPPFLAGS+= -DHAVE_INITFINI_ARRAY diff --git a/libexec/ld.elf_so/rtld.c b/libexec/ld.elf_so/rtld.c index 3a7de92b42a7..50dc4a6b6e4f 100644 --- a/libexec/ld.elf_so/rtld.c +++ b/libexec/ld.elf_so/rtld.c @@ -1,4 +1,4 @@ -/* $NetBSD: rtld.c,v 1.216 2023/10/03 09:48:18 martin Exp $ */ +/* $NetBSD: rtld.c,v 1.217 2024/01/19 19:21:34 christos Exp $ */ /* * Copyright 1996 John D. Polstra. @@ -40,7 +40,7 @@ #include #ifndef lint -__RCSID("$NetBSD: rtld.c,v 1.216 2023/10/03 09:48:18 martin Exp $"); +__RCSID("$NetBSD: rtld.c,v 1.217 2024/01/19 19:21:34 christos Exp $"); #endif /* not lint */ #include @@ -1550,8 +1550,6 @@ __dl_cxa_refcount(void *addr, ssize_t delta) _rtld_exclusive_exit(&mask); } -pid_t __fork(void); - __dso_public pid_t __locked_fork(int *my_errno) {