git: 7448408656b0 - main - Make __libsys_interposing_slot libsys only
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 22 Apr 2024 20:29:13 UTC
The branch main has been updated by brooks:
URL: https://cgit.FreeBSD.org/src/commit/?id=7448408656b05b7aa6f81c72366296c567591df9
commit 7448408656b05b7aa6f81c72366296c567591df9
Author: Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2024-04-22 18:24:36 +0000
Commit: Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2024-04-22 20:28:26 +0000
Make __libsys_interposing_slot libsys only
Reviewed by: kib
Differential Revision: https://reviews.freebsd.org/D44881
---
lib/libsys/Makefile | 3 ++-
lib/libsys/Makefile.sys | 3 ++-
lib/libsys/Symbol.map | 1 +
lib/libsys/Symbol.sys.map | 1 -
4 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/lib/libsys/Makefile b/lib/libsys/Makefile
index 93b880cd67fe..b4c0e91e860c 100644
--- a/lib/libsys/Makefile
+++ b/lib/libsys/Makefile
@@ -60,7 +60,8 @@ MIASM=
NOASM=
SYM_MAPS+= ${LIBSYS_SRCTOP}/Symbol.map
-SRCS+= auxv.c
+SRCS+= auxv.c \
+ interposing_table.c
.include "${LIBSYS_SRCTOP}/Makefile.sys"
diff --git a/lib/libsys/Makefile.sys b/lib/libsys/Makefile.sys
index 98a9688e58a1..205f6bc1a5eb 100644
--- a/lib/libsys/Makefile.sys
+++ b/lib/libsys/Makefile.sys
@@ -37,7 +37,6 @@ SRCS+= \
__getosreldate.c \
getpagesize.c \
getpagesizes.c \
- interposing_table.c \
libsys_sigwait.c
.if ${LIB} == "c"
@@ -46,6 +45,8 @@ SOBJS+= libc_stubs.pico
# Link the full implementation of ELF auxargs for static libc.
STATICOBJS+= auxv.o
+
+STATICOBJS+= interposing_table.o
.endif
NOASM= yield.o
diff --git a/lib/libsys/Symbol.map b/lib/libsys/Symbol.map
index 99cc171dd405..2cd524c19a3f 100644
--- a/lib/libsys/Symbol.map
+++ b/lib/libsys/Symbol.map
@@ -2,6 +2,7 @@ FBSDprivate_1.0 {
__elf_aux_vector;
__getosreldate;
__realpathat;
+ __libsys_interposing_slot;
_elf_aux_info;
freebsd11_fstat;
freebsd11_fstatat;
diff --git a/lib/libsys/Symbol.sys.map b/lib/libsys/Symbol.sys.map
index 822c007d32f1..464086985cfc 100644
--- a/lib/libsys/Symbol.sys.map
+++ b/lib/libsys/Symbol.sys.map
@@ -384,7 +384,6 @@ FBSD_1.8 {
FBSDprivate_1.0 {
/* Add entries in sort(1) order */
- __libsys_interposing_slot;
__set_error_selector;
__sigwait;
gssd_syscall;