From 01edb548c52ee7e3916f8f272d6b45e9e0f7fa6d Mon Sep 17 00:00:00 2001 From: Brooks Davis Date: Wed, 15 Nov 2023 23:42:18 +0000 Subject: [PATCH] libc: centralize makecontext symbols Declare makecontext() and __makecontext() symbols centrally as they are always implemented. Reviewed by: imp, kib Differential Revision: https://reviews.freebsd.org/D42617 (cherry picked from commit 5d79b5445e12873b316a04de352d12a02bfe2d53) --- lib/libc/aarch64/Symbol.map | 5 ----- lib/libc/amd64/Symbol.map | 2 -- lib/libc/arm/Symbol.map | 2 -- lib/libc/gen/Symbol.map | 2 ++ lib/libc/i386/Symbol.map | 2 -- lib/libc/powerpc/Symbol.map | 2 -- lib/libc/powerpc64/Symbol.map | 2 -- lib/libc/riscv/Symbol.map | 5 ----- 8 files changed, 2 insertions(+), 20 deletions(-) diff --git a/lib/libc/aarch64/Symbol.map b/lib/libc/aarch64/Symbol.map index a02c71c82b7..39cc43d12c2 100644 --- a/lib/libc/aarch64/Symbol.map +++ b/lib/libc/aarch64/Symbol.map @@ -11,9 +11,4 @@ FBSD_1.0 { fpsetmask; __infinity; __nan; - makecontext; -}; - -FBSDprivate_1.0 { - __makecontext; }; diff --git a/lib/libc/amd64/Symbol.map b/lib/libc/amd64/Symbol.map index ea3b7866b71..6c514097dd0 100644 --- a/lib/libc/amd64/Symbol.map +++ b/lib/libc/amd64/Symbol.map @@ -16,7 +16,6 @@ FBSD_1.0 { fpsetround; __infinity; __nan; - makecontext; rfork_thread; amd64_get_fsbase; amd64_get_gsbase; @@ -43,7 +42,6 @@ FBSDprivate_1.0 { _getlogin; ___longjmp; - __makecontext; __longjmp; __signalcontext; signalcontext; diff --git a/lib/libc/arm/Symbol.map b/lib/libc/arm/Symbol.map index 4be0a7b0296..5f6cc934410 100644 --- a/lib/libc/arm/Symbol.map +++ b/lib/libc/arm/Symbol.map @@ -9,7 +9,6 @@ FBSD_1.0 { fabs; __infinity; __nan; - makecontext; brk; sbrk; }; @@ -34,7 +33,6 @@ FBSDprivate_1.0 { __aeabi_read_tp; ___longjmp; - __makecontext; __longjmp; signalcontext; _signalcontext; diff --git a/lib/libc/gen/Symbol.map b/lib/libc/gen/Symbol.map index 2b819524473..a21bf243084 100644 --- a/lib/libc/gen/Symbol.map +++ b/lib/libc/gen/Symbol.map @@ -196,6 +196,7 @@ FBSD_1.0 { ldexp; lockf; lrand48; + makecontext; modf; mrand48; nice; @@ -577,4 +578,5 @@ FBSDprivate_1.0 { __fillcontextx; __fillcontextx2; __getcontextx_size; + __makecontext; }; diff --git a/lib/libc/i386/Symbol.map b/lib/libc/i386/Symbol.map index 3b3df6b3720..ac2cb068d94 100644 --- a/lib/libc/i386/Symbol.map +++ b/lib/libc/i386/Symbol.map @@ -10,7 +10,6 @@ FBSD_1.0 { __flt_rounds; __nan; __infinity; - makecontext; rfork_thread; brk; i386_clr_watch; @@ -40,7 +39,6 @@ FBSDprivate_1.0 { _getlogin; ___longjmp; - __makecontext; __longjmp; __signalcontext; signalcontext; diff --git a/lib/libc/powerpc/Symbol.map b/lib/libc/powerpc/Symbol.map index 93e79fe9673..9f6f8804898 100644 --- a/lib/libc/powerpc/Symbol.map +++ b/lib/libc/powerpc/Symbol.map @@ -14,7 +14,6 @@ FBSD_1.0 { fpsetround; __infinity; __nan; - makecontext; brk; sbrk; }; @@ -28,7 +27,6 @@ FBSDprivate_1.0 { _getlogin; _fpgetsticky; - __makecontext; __longjmp; signalcontext; __signalcontext; diff --git a/lib/libc/powerpc64/Symbol.map b/lib/libc/powerpc64/Symbol.map index 6af9a010381..63638bbb890 100644 --- a/lib/libc/powerpc64/Symbol.map +++ b/lib/libc/powerpc64/Symbol.map @@ -14,7 +14,6 @@ FBSD_1.0 { fpsetround; __infinity; __nan; - makecontext; brk; sbrk; }; @@ -24,7 +23,6 @@ FBSDprivate_1.0 { _getlogin; _fpgetsticky; - __makecontext; __longjmp; signalcontext; __signalcontext; diff --git a/lib/libc/riscv/Symbol.map b/lib/libc/riscv/Symbol.map index 2e046774477..79ee74e81a8 100644 --- a/lib/libc/riscv/Symbol.map +++ b/lib/libc/riscv/Symbol.map @@ -10,9 +10,4 @@ FBSD_1.0 { fpsetmask; __infinity; __nan; - makecontext; -}; - -FBSDprivate_1.0 { - __makecontext; };