Module Name: src
Committed By: christos
Date: Fri Jan 19 19:21:34 UTC 2024
Modified Files:
src/libexec/ld.elf_so: Makefile rtld.c
Log Message:
use header decl of __fork()
To generate a diff of this commit:
cvs rdiff -u -r1.148 -r1.149 src/libexec/ld.elf_so/Makefile
cvs rdiff -u -r1.216 -r1.217 src/libexec/ld.elf_so/rtld.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ld.elf_so/Makefile
diff -u src/libexec/ld.elf_so/Makefile:1.148 src/libexec/ld.elf_so/Makefile:1.149
--- src/libexec/ld.elf_so/Makefile:1.148 Sat Oct 7 08:15:53 2023
+++ src/libexec/ld.elf_so/Makefile Fri Jan 19 14:21:34 2024
@@ -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
Index: src/libexec/ld.elf_so/rtld.c
diff -u src/libexec/ld.elf_so/rtld.c:1.216 src/libexec/ld.elf_so/rtld.c:1.217
--- src/libexec/ld.elf_so/rtld.c:1.216 Tue Oct 3 05:48:18 2023
+++ src/libexec/ld.elf_so/rtld.c Fri Jan 19 14:21:34 2024
@@ -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 <sys/cdefs.h>
#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 <sys/param.h>
@@ -1550,8 +1550,6 @@ __dl_cxa_refcount(void *addr, ssize_t de
_rtld_exclusive_exit(&mask);
}
-pid_t __fork(void);
-
__dso_public pid_t
__locked_fork(int *my_errno)
{
