aboutsummaryrefslogtreecommitdiff
path: root/lib/libc/arm/aeabi
diff options
context:
space:
mode:
Diffstat (limited to 'lib/libc/arm/aeabi')
-rw-r--r--lib/libc/arm/aeabi/Makefile.inc7
-rw-r--r--lib/libc/arm/aeabi/Symbol.map48
-rw-r--r--lib/libc/arm/aeabi/aeabi_asm_double.S2
-rw-r--r--lib/libc/arm/aeabi/aeabi_asm_float.S2
-rw-r--r--lib/libc/arm/aeabi/aeabi_atexit.c5
-rw-r--r--lib/libc/arm/aeabi/aeabi_double.c7
-rw-r--r--lib/libc/arm/aeabi/aeabi_float.c7
-rw-r--r--lib/libc/arm/aeabi/aeabi_int_div.S4
-rw-r--r--lib/libc/arm/aeabi/aeabi_unwind_cpp.c5
-rw-r--r--lib/libc/arm/aeabi/aeabi_unwind_exidx.c3
-rw-r--r--lib/libc/arm/aeabi/aeabi_vfp.h8
-rw-r--r--lib/libc/arm/aeabi/aeabi_vfp_double.S2
-rw-r--r--lib/libc/arm/aeabi/aeabi_vfp_float.S2
13 files changed, 14 insertions, 88 deletions
diff --git a/lib/libc/arm/aeabi/Makefile.inc b/lib/libc/arm/aeabi/Makefile.inc
index 9ccabc2186f9..ef9ff746060f 100644
--- a/lib/libc/arm/aeabi/Makefile.inc
+++ b/lib/libc/arm/aeabi/Makefile.inc
@@ -1,18 +1,15 @@
-# $FreeBSD$
-
.PATH: ${LIBC_SRCTOP}/arm/aeabi
SRCS+= aeabi_atexit.c \
aeabi_unwind_cpp.c \
aeabi_unwind_exidx.c
-.if (${MACHINE_ARCH:Marmv[67]*} && defined(CPUTYPE) && ${CPUTYPE:M*soft*} != "") || \
- ${MACHINE_ARCH:Marmv[67]*} == ""
+.if defined(CPUTYPE) && ${CPUTYPE:M*soft*} != ""
SRCS+= aeabi_asm_double.S \
aeabi_asm_float.S \
aeabi_double.c \
aeabi_float.c
.endif
-.if ${MACHINE_ARCH:Marmv[67]*} && (!defined(CPUTYPE) || ${CPUTYPE:M*soft*} == "")
+.if !defined(CPUTYPE) || ${CPUTYPE:M*soft*} == ""
SRCS+= aeabi_vfp_double.S \
aeabi_vfp_float.S
.endif
diff --git a/lib/libc/arm/aeabi/Symbol.map b/lib/libc/arm/aeabi/Symbol.map
index 4a08d31d601b..515794004ba7 100644
--- a/lib/libc/arm/aeabi/Symbol.map
+++ b/lib/libc/arm/aeabi/Symbol.map
@@ -1,8 +1,4 @@
/*
- * $FreeBSD$
- */
-
-/*
* 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, ...).
@@ -10,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_asm_double.S b/lib/libc/arm/aeabi/aeabi_asm_double.S
index ced4d78b6cbf..767c62a7edf8 100644
--- a/lib/libc/arm/aeabi/aeabi_asm_double.S
+++ b/lib/libc/arm/aeabi/aeabi_asm_double.S
@@ -26,8 +26,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#define PCR_Z (1 << 30)
#define PCR_C (1 << 29)
diff --git a/lib/libc/arm/aeabi/aeabi_asm_float.S b/lib/libc/arm/aeabi/aeabi_asm_float.S
index de6b1c88f4f2..f9dff9e0aec6 100644
--- a/lib/libc/arm/aeabi/aeabi_asm_float.S
+++ b/lib/libc/arm/aeabi/aeabi_asm_float.S
@@ -26,8 +26,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#define PCR_Z (1 << 30)
#define PCR_C (1 << 29)
diff --git a/lib/libc/arm/aeabi/aeabi_atexit.c b/lib/libc/arm/aeabi/aeabi_atexit.c
index a33ca8f78af4..d688edf9c4e9 100644
--- a/lib/libc/arm/aeabi/aeabi_atexit.c
+++ b/lib/libc/arm/aeabi/aeabi_atexit.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2012 Andrew Turner
* All rights reserved.
@@ -27,9 +27,6 @@
*
*/
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
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 0ec3e625c25c..61f64678e795 100644
--- a/lib/libc/arm/aeabi/aeabi_double.c
+++ b/lib/libc/arm/aeabi/aeabi_double.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2012 Andrew Turner
* All rights reserved.
@@ -27,9 +27,6 @@
*
*/
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "softfloat-for-gcc.h"
#include "milieu.h"
#include "softfloat.h"
@@ -57,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 62f78495e844..0e465754ecf0 100644
--- a/lib/libc/arm/aeabi/aeabi_float.c
+++ b/lib/libc/arm/aeabi/aeabi_float.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2012 Andrew Turner
* All rights reserved.
@@ -27,9 +27,6 @@
*
*/
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include "softfloat-for-gcc.h"
#include "milieu.h"
#include "softfloat.h"
@@ -57,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 41f5c123b1e4..bb002c2716f7 100644
--- a/lib/libc/arm/aeabi/aeabi_int_div.S
+++ b/lib/libc/arm/aeabi/aeabi_int_div.S
@@ -26,8 +26,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
/*
* Due to bug in libcompiler_rt, all symbols declared by
* DEFINE_AEABI_FUNCTION_ALIAS() are not hidden. All these but
@@ -39,11 +37,13 @@ __FBSDID("$FreeBSD$");
*/
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 78b77c351cdb..efcace2c0675 100644
--- a/lib/libc/arm/aeabi/aeabi_unwind_cpp.c
+++ b/lib/libc/arm/aeabi/aeabi_unwind_cpp.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2011 Andrew Turner
* All rights reserved.
@@ -34,9 +34,6 @@
* check this.
*/
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#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 d5af8b3fc6e0..cf61922d4304 100644
--- a/lib/libc/arm/aeabi/aeabi_unwind_exidx.c
+++ b/lib/libc/arm/aeabi/aeabi_unwind_exidx.c
@@ -24,9 +24,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#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 a7b6b7b54618..4f3bb2ef969b 100644
--- a/lib/libc/arm/aeabi/aeabi_vfp.h
+++ b/lib/libc/arm/aeabi/aeabi_vfp.h
@@ -23,8 +23,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
- *
*/
#ifndef AEABI_VFP_H
@@ -42,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
@@ -67,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
diff --git a/lib/libc/arm/aeabi/aeabi_vfp_double.S b/lib/libc/arm/aeabi/aeabi_vfp_double.S
index be4309dd6efc..89287d922f78 100644
--- a/lib/libc/arm/aeabi/aeabi_vfp_double.S
+++ b/lib/libc/arm/aeabi/aeabi_vfp_double.S
@@ -26,8 +26,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#include "aeabi_vfp.h"
.fpu vfp
diff --git a/lib/libc/arm/aeabi/aeabi_vfp_float.S b/lib/libc/arm/aeabi/aeabi_vfp_float.S
index c9df41cf4b2e..389e58935f89 100644
--- a/lib/libc/arm/aeabi/aeabi_vfp_float.S
+++ b/lib/libc/arm/aeabi/aeabi_vfp_float.S
@@ -26,8 +26,6 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
#include "aeabi_vfp.h"
.fpu vfp
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-17 17:51:38 +0000