aboutsummaryrefslogtreecommitdiff
path: root/lib/libc/arm/gen
diff options
context:
space:
mode:
Diffstat (limited to 'lib/libc/arm/gen')
-rw-r--r--lib/libc/arm/gen/Makefile.inc2
-rw-r--r--lib/libc/arm/gen/_setjmp.S8
-rw-r--r--lib/libc/arm/gen/arm_drain_writebuf.c1
-rw-r--r--lib/libc/arm/gen/arm_initfini.c1
-rw-r--r--lib/libc/arm/gen/arm_sync_icache.c1
-rw-r--r--lib/libc/arm/gen/fabs.c1
-rw-r--r--lib/libc/arm/gen/flt_rounds.c1
-rw-r--r--lib/libc/arm/gen/fpgetmask_vfp.c5
-rw-r--r--lib/libc/arm/gen/fpgetround_vfp.c1
-rw-r--r--lib/libc/arm/gen/fpgetsticky_vfp.c5
-rw-r--r--lib/libc/arm/gen/fpsetmask_vfp.c1
-rw-r--r--lib/libc/arm/gen/fpsetround_vfp.c1
-rw-r--r--lib/libc/arm/gen/fpsetsticky_vfp.c1
-rw-r--r--lib/libc/arm/gen/getcontextx.c1
-rw-r--r--lib/libc/arm/gen/infinity.c1
-rw-r--r--lib/libc/arm/gen/makecontext.c11
-rw-r--r--lib/libc/arm/gen/setjmp.S4
-rw-r--r--lib/libc/arm/gen/signalcontext.c1
18 files changed, 11 insertions, 36 deletions
diff --git a/lib/libc/arm/gen/Makefile.inc b/lib/libc/arm/gen/Makefile.inc
index 01c35f24adb0..dfb83da20a1f 100644
--- a/lib/libc/arm/gen/Makefile.inc
+++ b/lib/libc/arm/gen/Makefile.inc
@@ -1,5 +1,3 @@
-# @(#)Makefile.inc 8.1 (Berkeley) 6/4/93
-
SRCS+= \
__aeabi_read_tp.S \
_ctx_start.S \
diff --git a/lib/libc/arm/gen/_setjmp.S b/lib/libc/arm/gen/_setjmp.S
index 19b8b6b07059..9e655d2e9e2e 100644
--- a/lib/libc/arm/gen/_setjmp.S
+++ b/lib/libc/arm/gen/_setjmp.S
@@ -58,12 +58,12 @@
ENTRY(_setjmp)
ldr r1, .L_setjmp_magic
-#if !defined(_STANDALONE) && __ARM_ARCH >= 6 && !defined(SOFTFLOAT_FOR_GCC)
+#if !defined(_STANDALONE) && !defined(SOFTFLOAT_FOR_GCC)
add r2, r0, #(_JB_REG_D8 * 4)
vstmia r2, {d8-d15}
vmrs r2, fpscr
str r2, [r0, #(_JB_REG_FPSCR * 4)]
-#endif /* !_STANDALONE && __ARM_ARCH >= 6 */
+#endif /* !_STANDALONE && !SOFTFLOAT_FOR_GCC */
str r1, [r0]
@@ -91,12 +91,12 @@ ENTRY(_longjmp)
teq ip, r2 /* magic correct? */
bne botch /* no, botch */
-#if !defined(_STANDALONE) && __ARM_ARCH >= 6 && !defined(SOFTFLOAT_FOR_GCC)
+#if !defined(_STANDALONE) && !defined(SOFTFLOAT_FOR_GCC)
add ip, r0, #(_JB_REG_D8 * 4)
vldmia ip, {d8-d15}
ldr ip, [r0, #(_JB_REG_FPSCR * 4)]
vmsr fpscr, ip
-#endif /* !_STANDALONE && __ARM_ARCH >= 6 */
+#endif /* !_STANDALONE && !SOFTFLOAT_FOR_GCC */
add r0, r0, #(_JB_REG_R4 * 4)
/* Restore integer registers */
diff --git a/lib/libc/arm/gen/arm_drain_writebuf.c b/lib/libc/arm/gen/arm_drain_writebuf.c
index d8e4063f27cb..30c93718bfe6 100644
--- a/lib/libc/arm/gen/arm_drain_writebuf.c
+++ b/lib/libc/arm/gen/arm_drain_writebuf.c
@@ -25,7 +25,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <machine/sysarch.h>
#include <stddef.h>
diff --git a/lib/libc/arm/gen/arm_initfini.c b/lib/libc/arm/gen/arm_initfini.c
index 00ca41165c29..31756aa852a4 100644
--- a/lib/libc/arm/gen/arm_initfini.c
+++ b/lib/libc/arm/gen/arm_initfini.c
@@ -33,7 +33,6 @@
* $NetBSD: arm_initfini.c,v 1.2 2013/01/31 06:47:55 matt Exp $
*/
-#include <sys/cdefs.h>
/*
* To properly implement setjmp/longjmp for the ARM AAPCS ABI, it has to be
* aware of whether there is a FPU is present or not. Regardless of whether
diff --git a/lib/libc/arm/gen/arm_sync_icache.c b/lib/libc/arm/gen/arm_sync_icache.c
index d89f57cbae18..b5872fb8ef00 100644
--- a/lib/libc/arm/gen/arm_sync_icache.c
+++ b/lib/libc/arm/gen/arm_sync_icache.c
@@ -25,7 +25,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <machine/sysarch.h>
#include <stddef.h>
diff --git a/lib/libc/arm/gen/fabs.c b/lib/libc/arm/gen/fabs.c
index b3020b88062d..2e0abbb8a42a 100644
--- a/lib/libc/arm/gen/fabs.c
+++ b/lib/libc/arm/gen/fabs.c
@@ -36,7 +36,6 @@
/*
* fabs(x) returns the absolute value of x.
*/
-#include <sys/cdefs.h>
double
fabs(double x)
{
diff --git a/lib/libc/arm/gen/flt_rounds.c b/lib/libc/arm/gen/flt_rounds.c
index a592dbff38c0..7621262419a4 100644
--- a/lib/libc/arm/gen/flt_rounds.c
+++ b/lib/libc/arm/gen/flt_rounds.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <fenv.h>
#include <float.h>
diff --git a/lib/libc/arm/gen/fpgetmask_vfp.c b/lib/libc/arm/gen/fpgetmask_vfp.c
index d70f5caf845b..5e73a274dafa 100644
--- a/lib/libc/arm/gen/fpgetmask_vfp.c
+++ b/lib/libc/arm/gen/fpgetmask_vfp.c
@@ -25,14 +25,9 @@
*
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <ieeefp.h>
-#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/fpgetround_vfp.c b/lib/libc/arm/gen/fpgetround_vfp.c
index 830193b65e65..21debc0b028d 100644
--- a/lib/libc/arm/gen/fpgetround_vfp.c
+++ b/lib/libc/arm/gen/fpgetround_vfp.c
@@ -25,7 +25,6 @@
*
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <ieeefp.h>
diff --git a/lib/libc/arm/gen/fpgetsticky_vfp.c b/lib/libc/arm/gen/fpgetsticky_vfp.c
index 34ed2f0dd5e0..651610dddf83 100644
--- a/lib/libc/arm/gen/fpgetsticky_vfp.c
+++ b/lib/libc/arm/gen/fpgetsticky_vfp.c
@@ -25,14 +25,9 @@
*
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <ieeefp.h>
-#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/arm/gen/fpsetmask_vfp.c b/lib/libc/arm/gen/fpsetmask_vfp.c
index bf9c1c622094..92ad97e6dfa2 100644
--- a/lib/libc/arm/gen/fpsetmask_vfp.c
+++ b/lib/libc/arm/gen/fpsetmask_vfp.c
@@ -25,7 +25,6 @@
*
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <ieeefp.h>
diff --git a/lib/libc/arm/gen/fpsetround_vfp.c b/lib/libc/arm/gen/fpsetround_vfp.c
index 76b8a9e92269..4e55335f6a3b 100644
--- a/lib/libc/arm/gen/fpsetround_vfp.c
+++ b/lib/libc/arm/gen/fpsetround_vfp.c
@@ -25,7 +25,6 @@
*
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <ieeefp.h>
diff --git a/lib/libc/arm/gen/fpsetsticky_vfp.c b/lib/libc/arm/gen/fpsetsticky_vfp.c
index e98681e2372c..fb3a59b25178 100644
--- a/lib/libc/arm/gen/fpsetsticky_vfp.c
+++ b/lib/libc/arm/gen/fpsetsticky_vfp.c
@@ -25,7 +25,6 @@
*
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <ieeefp.h>
diff --git a/lib/libc/arm/gen/getcontextx.c b/lib/libc/arm/gen/getcontextx.c
index 78db8c077152..357d3a2a0416 100644
--- a/lib/libc/arm/gen/getcontextx.c
+++ b/lib/libc/arm/gen/getcontextx.c
@@ -26,7 +26,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/ucontext.h>
#include <errno.h>
diff --git a/lib/libc/arm/gen/infinity.c b/lib/libc/arm/gen/infinity.c
index fe6c147980ec..1a78a03be2e3 100644
--- a/lib/libc/arm/gen/infinity.c
+++ b/lib/libc/arm/gen/infinity.c
@@ -2,7 +2,6 @@
* infinity.c
*/
-#include <sys/cdefs.h>
#include <math.h>
/* bytes for +Infinity on a 387 */
diff --git a/lib/libc/arm/gen/makecontext.c b/lib/libc/arm/gen/makecontext.c
index bf24e1f741c9..ac338085f2ed 100644
--- a/lib/libc/arm/gen/makecontext.c
+++ b/lib/libc/arm/gen/makecontext.c
@@ -31,7 +31,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <stdlib.h>
#include <stddef.h>
#include <inttypes.h>
@@ -43,15 +42,15 @@ extern void _ctx_start(void);
void
ctx_done(ucontext_t *ucp)
-{
-
+{
+
if (ucp->uc_link == NULL)
exit(0);
- else {
+ else {
setcontext((const ucontext_t *)ucp->uc_link);
abort();
- }
-}
+ }
+}
__weak_reference(__makecontext, makecontext);
diff --git a/lib/libc/arm/gen/setjmp.S b/lib/libc/arm/gen/setjmp.S
index 5a6c899e2b23..e7f8b788e878 100644
--- a/lib/libc/arm/gen/setjmp.S
+++ b/lib/libc/arm/gen/setjmp.S
@@ -61,7 +61,7 @@ ENTRY(setjmp)
ldr r1, .Lsetjmp_magic
-#if __ARM_ARCH >= 6 && !defined(SOFTFLOAT_FOR_GCC)
+#if !defined(SOFTFLOAT_FOR_GCC)
add r2, r0, #(_JB_REG_D8 * 4)
vstmia r2, {d8-d15}
vmrs r2, fpscr
@@ -102,7 +102,7 @@ ENTRY(__longjmp)
bl PIC_SYM(_C_LABEL(sigprocmask), PLT)
ldmfd sp!, {r0-r2, r14}
-#if __ARM_ARCH >= 6 && !defined(SOFTFLOAT_FOR_GCC)
+#if !defined(SOFTFLOAT_FOR_GCC)
add ip, r0, #(_JB_REG_D8 * 4)
vldmia ip, {d8-d15}
ldr ip, [r0, #(_JB_REG_FPSCR * 4)]
diff --git a/lib/libc/arm/gen/signalcontext.c b/lib/libc/arm/gen/signalcontext.c
index 95fdc1579f84..e66a08928355 100644
--- a/lib/libc/arm/gen/signalcontext.c
+++ b/lib/libc/arm/gen/signalcontext.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/signal.h>
#include <sys/ucontext.h>
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-09 04:07:42 +0000