From bf8a3a816d4b3ca79d78c437b60bb4d169e590ad Mon Sep 17 00:00:00 2001 From: Brooks Davis Date: Wed, 13 Mar 2024 20:34:46 +0000 Subject: [PATCH] libc/softfloat: we don't export _fp[gs]et* symbols Remove attempts to use NetBSD __weak_alias macros to export _-prefixed versions of various fp[sg]et* symbols under softfloat. __weak_alias isn't defined so we didn't export them and thus the Symbol.map entries were wrong. Reviewed by: jhibbits Differential Revision: https://reviews.freebsd.org/D44327 --- lib/libc/arm/gen/fpgetmask_vfp.c | 4 ---- lib/libc/arm/gen/fpgetsticky_vfp.c | 4 ---- lib/libc/powerpc/Symbol.map | 1 - lib/libc/powerpc/gen/fpgetsticky.c | 4 ---- lib/libc/powerpc64/gen/fpgetsticky.c | 4 ---- lib/libc/powerpcspe/gen/fpgetsticky.c | 4 ---- lib/libc/softfloat/Symbol.map | 6 ------ lib/libc/softfloat/fpgetmask.c | 5 ----- lib/libc/softfloat/fpgetsticky.c | 5 ----- 9 files changed, 37 deletions(-) diff --git a/lib/libc/arm/gen/fpgetmask_vfp.c b/lib/libc/arm/gen/fpgetmask_vfp.c index a4ed8d1afbe..5e73a274daf 100644 --- a/lib/libc/arm/gen/fpgetmask_vfp.c +++ b/lib/libc/arm/gen/fpgetmask_vfp.c @@ -28,10 +28,6 @@ #include #include -#ifdef __weak_alias -__weak_alias(fpgetmask,_fpgetmask) -#endif - #define FP_X_MASK (FP_X_INV | FP_X_DZ | FP_X_OFL | FP_X_UFL | FP_X_IMP) fp_except_t diff --git a/lib/libc/arm/gen/fpgetsticky_vfp.c b/lib/libc/arm/gen/fpgetsticky_vfp.c index 7d278c3ad84..651610dddf8 100644 --- a/lib/libc/arm/gen/fpgetsticky_vfp.c +++ b/lib/libc/arm/gen/fpgetsticky_vfp.c @@ -28,10 +28,6 @@ #include #include -#ifdef __weak_alias -__weak_alias(fpgetsticky,_fpgetsticky) -#endif - #define FP_X_MASK (FP_X_INV | FP_X_DZ | FP_X_OFL | FP_X_UFL | FP_X_IMP) fp_except diff --git a/lib/libc/powerpc/Symbol.map b/lib/libc/powerpc/Symbol.map index f836a08ae0d..ccf74c1748e 100644 --- a/lib/libc/powerpc/Symbol.map +++ b/lib/libc/powerpc/Symbol.map @@ -20,7 +20,6 @@ FBSD_1.3 { }; FBSDprivate_1.0 { - _fpgetsticky; __longjmp; signalcontext; __signalcontext; diff --git a/lib/libc/powerpc/gen/fpgetsticky.c b/lib/libc/powerpc/gen/fpgetsticky.c index d609586360f..3512c97f8cf 100644 --- a/lib/libc/powerpc/gen/fpgetsticky.c +++ b/lib/libc/powerpc/gen/fpgetsticky.c @@ -38,10 +38,6 @@ #include #ifndef _SOFT_FLOAT -#ifdef __weak_alias -__weak_alias(fpgetsticky,_fpgetsticky) -#endif - fp_except_t fpgetsticky() { diff --git a/lib/libc/powerpc64/gen/fpgetsticky.c b/lib/libc/powerpc64/gen/fpgetsticky.c index d609586360f..3512c97f8cf 100644 --- a/lib/libc/powerpc64/gen/fpgetsticky.c +++ b/lib/libc/powerpc64/gen/fpgetsticky.c @@ -38,10 +38,6 @@ #include #ifndef _SOFT_FLOAT -#ifdef __weak_alias -__weak_alias(fpgetsticky,_fpgetsticky) -#endif - fp_except_t fpgetsticky() { diff --git a/lib/libc/powerpcspe/gen/fpgetsticky.c b/lib/libc/powerpcspe/gen/fpgetsticky.c index 58bdc43cef3..a97c27296ca 100644 --- a/lib/libc/powerpcspe/gen/fpgetsticky.c +++ b/lib/libc/powerpcspe/gen/fpgetsticky.c @@ -37,10 +37,6 @@ #include #ifndef _SOFT_FLOAT -#ifdef __weak_alias -__weak_alias(fpgetsticky,_fpgetsticky) -#endif - fp_except_t fpgetsticky() { diff --git a/lib/libc/softfloat/Symbol.map b/lib/libc/softfloat/Symbol.map index 9c5229a1806..d412eb41776 100644 --- a/lib/libc/softfloat/Symbol.map +++ b/lib/libc/softfloat/Symbol.map @@ -1,15 +1,9 @@ FBSD_1.0 { - _fpgetmask; fpgetmask; - _fpgetround; fpgetround; - _fpgetsticky; fpgetsticky; - _fpsetmask; fpsetmask; - _fpsetround; fpsetround; - _fpsetsticky; fpsetsticky; }; diff --git a/lib/libc/softfloat/fpgetmask.c b/lib/libc/softfloat/fpgetmask.c index c417e163d77..86cf8902066 100644 --- a/lib/libc/softfloat/fpgetmask.c +++ b/lib/libc/softfloat/fpgetmask.c @@ -40,13 +40,8 @@ #include "milieu.h" #include "softfloat.h" -#ifdef __weak_alias -__weak_alias(fpgetmask,_fpgetmask) -#endif - fp_except fpgetmask(void) { - return float_exception_mask; } diff --git a/lib/libc/softfloat/fpgetsticky.c b/lib/libc/softfloat/fpgetsticky.c index 2d31d9149a2..f42c348784e 100644 --- a/lib/libc/softfloat/fpgetsticky.c +++ b/lib/libc/softfloat/fpgetsticky.c @@ -40,13 +40,8 @@ #include "milieu.h" #include "softfloat.h" -#ifdef __weak_alias -__weak_alias(fpgetsticky,_fpgetsticky) -#endif - fp_except fpgetsticky(void) { - return float_exception_flags; }