diff options
Diffstat (limited to 'lib/libc/arm/aeabi')
| -rw-r--r-- | lib/libc/arm/aeabi/Makefile.inc | 1 | ||||
| -rw-r--r-- | lib/libc/arm/aeabi/Symbol.map | 47 | ||||
| -rw-r--r-- | lib/libc/arm/aeabi/aeabi_atexit.c | 1 | ||||
| -rw-r--r-- | lib/libc/arm/aeabi/aeabi_double.c | 3 | ||||
| -rw-r--r-- | lib/libc/arm/aeabi/aeabi_float.c | 3 | ||||
| -rw-r--r-- | lib/libc/arm/aeabi/aeabi_int_div.S | 2 | ||||
| -rw-r--r-- | lib/libc/arm/aeabi/aeabi_unwind_cpp.c | 1 | ||||
| -rw-r--r-- | lib/libc/arm/aeabi/aeabi_unwind_exidx.c | 1 | ||||
| -rw-r--r-- | lib/libc/arm/aeabi/aeabi_vfp.h | 6 |
9 files changed, 8 insertions, 57 deletions
diff --git a/lib/libc/arm/aeabi/Makefile.inc b/lib/libc/arm/aeabi/Makefile.inc index 08158f1d8e63..ef9ff746060f 100644 --- a/lib/libc/arm/aeabi/Makefile.inc +++ b/lib/libc/arm/aeabi/Makefile.inc @@ -1,4 +1,3 @@ - .PATH: ${LIBC_SRCTOP}/arm/aeabi SRCS+= aeabi_atexit.c \ diff --git a/lib/libc/arm/aeabi/Symbol.map b/lib/libc/arm/aeabi/Symbol.map index 823e4ad0d79d..515794004ba7 100644 --- a/lib/libc/arm/aeabi/Symbol.map +++ b/lib/libc/arm/aeabi/Symbol.map @@ -1,7 +1,4 @@ /* - */ - -/* * This only needs to contain AEABI symbols that are not listed in * symbol maps from other parts of libc (i.e., not found in * stdlib/Symbol.map, string/Symbol.map, sys/Symbol.map, ...). @@ -9,50 +6,6 @@ FBSDprivate_1.0 { __aeabi_atexit; - __aeabi_dcmpeq; - __aeabi_dcmplt; - __aeabi_dcmple; - __aeabi_dcmpge; - __aeabi_dcmpgt; - __aeabi_dcmpun; - - __aeabi_cdcmpeq; - __aeabi_cdcmple; - __aeabi_cdrcmple; - - __aeabi_d2iz; - __aeabi_d2f; - - __aeabi_dadd; - __aeabi_ddiv; - __aeabi_dmul; - __aeabi_dsub; - - - __aeabi_fcmpeq; - __aeabi_fcmplt; - __aeabi_fcmple; - __aeabi_fcmpge; - __aeabi_fcmpgt; - __aeabi_fcmpun; - - __aeabi_cfcmpeq; - __aeabi_cfcmple; - __aeabi_cfrcmple; - - __aeabi_f2iz; - __aeabi_f2d; - - __aeabi_fadd; - __aeabi_fdiv; - __aeabi_fmul; - __aeabi_fsub; - - - __aeabi_i2d; - __aeabi_i2f; - - __aeabi_memclr; __aeabi_memclr4; __aeabi_memclr8; diff --git a/lib/libc/arm/aeabi/aeabi_atexit.c b/lib/libc/arm/aeabi/aeabi_atexit.c index 267ddfb223de..d688edf9c4e9 100644 --- a/lib/libc/arm/aeabi/aeabi_atexit.c +++ b/lib/libc/arm/aeabi/aeabi_atexit.c @@ -27,7 +27,6 @@ * */ -#include <sys/cdefs.h> int __cxa_atexit(void (*)(void *), void *, void *); int diff --git a/lib/libc/arm/aeabi/aeabi_double.c b/lib/libc/arm/aeabi/aeabi_double.c index 9fb0c61a3467..61f64678e795 100644 --- a/lib/libc/arm/aeabi/aeabi_double.c +++ b/lib/libc/arm/aeabi/aeabi_double.c @@ -27,7 +27,6 @@ * */ -#include <sys/cdefs.h> #include "softfloat-for-gcc.h" #include "milieu.h" #include "softfloat.h" @@ -55,7 +54,7 @@ float64 __aeabi_dsub_vfp(float64, float64); /* * Depending on the target these will: - * On armv6 with a vfp call the above function, or + * On armv7 with a vfp call the above function, or * Call the softfloat function in the 3rd argument. */ int AEABI_FUNC2(dcmpeq, float64, float64_eq) diff --git a/lib/libc/arm/aeabi/aeabi_float.c b/lib/libc/arm/aeabi/aeabi_float.c index 71b46af836ed..0e465754ecf0 100644 --- a/lib/libc/arm/aeabi/aeabi_float.c +++ b/lib/libc/arm/aeabi/aeabi_float.c @@ -27,7 +27,6 @@ * */ -#include <sys/cdefs.h> #include "softfloat-for-gcc.h" #include "milieu.h" #include "softfloat.h" @@ -55,7 +54,7 @@ float32 __aeabi_fsub_vfp(float32, float32); /* * Depending on the target these will: - * On armv6 with a vfp call the above function, or + * On armv7 with a vfp call the above function, or * Call the softfloat function in the 3rd argument. */ int AEABI_FUNC2(fcmpeq, float32, float32_eq) diff --git a/lib/libc/arm/aeabi/aeabi_int_div.S b/lib/libc/arm/aeabi/aeabi_int_div.S index 708b478b3881..bb002c2716f7 100644 --- a/lib/libc/arm/aeabi/aeabi_int_div.S +++ b/lib/libc/arm/aeabi/aeabi_int_div.S @@ -37,11 +37,13 @@ */ ENTRY(__aeabi_uidiv_compat) + .hidden __aeabi_uidiv_compat .symver __aeabi_uidiv_compat, __aeabi_uidiv@ b __udivsi3 END(__aeabi_uidiv_compat) ENTRY(__aeabi_idiv_compat) + .hidden __aeabi_idiv_compat .symver __aeabi_idiv_compat, __aeabi_idiv@ b __divsi3 END(__aeabi_idiv_compat) diff --git a/lib/libc/arm/aeabi/aeabi_unwind_cpp.c b/lib/libc/arm/aeabi/aeabi_unwind_cpp.c index f3bee222d529..efcace2c0675 100644 --- a/lib/libc/arm/aeabi/aeabi_unwind_cpp.c +++ b/lib/libc/arm/aeabi/aeabi_unwind_cpp.c @@ -34,7 +34,6 @@ * check this. */ -#include <sys/cdefs.h> #include <stdlib.h> void __aeabi_unwind_cpp_pr0(void) __hidden; diff --git a/lib/libc/arm/aeabi/aeabi_unwind_exidx.c b/lib/libc/arm/aeabi/aeabi_unwind_exidx.c index e7bff3816ff5..cf61922d4304 100644 --- a/lib/libc/arm/aeabi/aeabi_unwind_exidx.c +++ b/lib/libc/arm/aeabi/aeabi_unwind_exidx.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> #include <sys/types.h> #include <machine/elf.h> #include <link.h> diff --git a/lib/libc/arm/aeabi/aeabi_vfp.h b/lib/libc/arm/aeabi/aeabi_vfp.h index f87f9acfd0a2..4f3bb2ef969b 100644 --- a/lib/libc/arm/aeabi/aeabi_vfp.h +++ b/lib/libc/arm/aeabi/aeabi_vfp.h @@ -40,7 +40,9 @@ #define AEABI_ENTRY(x) ENTRY(__aeabi_ ## x ## _vfp) #define AEABI_END(x) END(__aeabi_ ## x ## _vfp) #else -#define AEABI_ENTRY(x) ENTRY(__aeabi_ ## x) +#define AEABI_ENTRY(x) \ + ENTRY(__aeabi_ ## x) \ + .symver __aeabi_##x, __aeabi_##x##@FBSDprivate_1.0; #define AEABI_END(x) END(__aeabi_ ## x) #endif @@ -65,7 +67,7 @@ * C Helper macros */ -#if __ARM_ARCH >= 6 && !defined(SOFTFLOAT_FOR_GCC) +#if !defined(SOFTFLOAT_FOR_GCC) /* * Generate a function that will either call into the VFP implementation, * or the soft float version for a given __aeabi_* helper. The function |