Author: andrew
Date: Sun May 31 12:53:10 2015
New Revision: 283824
URL: https://svnweb.freebsd.org/changeset/base/283824
Log:
Remove __ARM_EABI__ from more places in libc as this is the only ARM ABI
we support.
Modified:
head/lib/libc/arm/SYS.h
head/lib/libc/arm/gen/_setjmp.S
head/lib/libc/arm/gen/setjmp.S
Modified: head/lib/libc/arm/SYS.h
==============================================================================
--- head/lib/libc/arm/SYS.h Sun May 31 12:50:10 2015 (r283823)
+++ head/lib/libc/arm/SYS.h Sun May 31 12:53:10 2015 (r283824)
@@ -39,15 +39,11 @@
#include <sys/syscall.h>
#include <machine/swi.h>
-#ifdef __ARM_EABI__
#define SYSTRAP(x) \
mov ip, r7; \
ldr r7, =SYS_ ## x; \
swi 0; \
mov r7, ip
-#else
-#define SYSTRAP(x) swi 0 | SYS_ ## x
-#endif
#define CERROR _C_LABEL(cerror)
#define CURBRK _C_LABEL(curbrk)
Modified: head/lib/libc/arm/gen/_setjmp.S
==============================================================================
--- head/lib/libc/arm/gen/_setjmp.S Sun May 31 12:50:10 2015
(r283823)
+++ head/lib/libc/arm/gen/_setjmp.S Sun May 31 12:53:10 2015
(r283824)
@@ -36,7 +36,7 @@
#error FPA is not supported anymore
#endif
-#if defined(__ARM_EABI__) && !defined(_STANDALONE)
+#if !defined(_STANDALONE)
.fpu vfp
#endif
@@ -61,7 +61,7 @@ __FBSDID("$FreeBSD$");
ENTRY(_setjmp)
ldr r1, .L_setjmp_magic
-#if defined(__ARM_EABI__) && !defined(_STANDALONE)
+#if !defined(_STANDALONE)
ldr r2, .Lfpu_present
#ifdef PIC
GOT_INIT(r3, .L_setjmp_got, .L_setjmp_gotinit)
@@ -79,7 +79,7 @@ ENTRY(_setjmp)
vmrs r2, fpscr
str r2, [r0, #(_JB_REG_FPSCR * 4)]
1:
-#endif /* __ARM_EABI__ */
+#endif /* !_STANDALONE */
str r1, [r0]
@@ -99,11 +99,11 @@ END(_setjmp)
.L_setjmp_magic:
.word _JB_MAGIC__SETJMP
-#if defined(__ARM_EABI__) && !defined(_STANDALONE)
+#if !defined(_STANDALONE)
GOT_INITSYM(.L_setjmp_got, .L_setjmp_gotinit)
.Lfpu_present:
.word PIC_SYM(_libc_arm_fpu_present, GOTOFF)
-#endif /* __ARM_EABI__ */
+#endif /* !_STANDALONE */
WEAK_ALIAS(___longjmp, _longjmp)
ENTRY(_longjmp)
@@ -114,7 +114,7 @@ ENTRY(_longjmp)
teq ip, r3 /* magic correct? */
bne botch /* no, botch */
-#if defined(__ARM_EABI__) && !defined(_STANDALONE)
+#if !defined(_STANDALONE)
teq r3, r2 /* did magic change? */
beq 1f /* no, don't restore VFP */
add ip, r0, #(_JB_REG_D8 * 4)
@@ -122,7 +122,7 @@ ENTRY(_longjmp)
ldr ip, [r0, #(_JB_REG_FPSCR * 4)]
vmsr fpscr, ip
1:
-#endif /* __ARM_EABI__ */
+#endif /* !_STANDALONE */
add r0, r0, #(_JB_REG_R4 * 4)
/* Restore integer registers */
Modified: head/lib/libc/arm/gen/setjmp.S
==============================================================================
--- head/lib/libc/arm/gen/setjmp.S Sun May 31 12:50:10 2015
(r283823)
+++ head/lib/libc/arm/gen/setjmp.S Sun May 31 12:53:10 2015
(r283824)
@@ -36,9 +36,7 @@
#error FPA is not supported anymore
#endif
-#ifdef __ARM_EABI__
.fpu vfp
-#endif
#include <machine/asm.h>
#include <machine/setjmp.h>
@@ -66,7 +64,6 @@ ENTRY(setjmp)
ldr r1, .Lsetjmp_magic
-#ifdef __ARM_EABI__
ldr r2, .Lfpu_present
#ifdef PIC
GOT_INIT(r3, .Lsetjmp_got, .Lsetjmp_gotinit)
@@ -84,7 +81,6 @@ ENTRY(setjmp)
vmrs r2, fpscr
str r2, [r0, #(_JB_REG_FPSCR * 4)]
1:
-#endif /* __ARM_EABI__ */
str r1, [r0] /* store magic */
@@ -102,11 +98,9 @@ ENTRY(setjmp)
.Lsetjmp_magic:
.word _JB_MAGIC_SETJMP
-#ifdef __ARM_EABI__
GOT_INITSYM(.Lsetjmp_got, .Lsetjmp_gotinit)
.Lfpu_present:
.word PIC_SYM(_libc_arm_fpu_present, GOTOFF)
-#endif /* __ARM_EABI__ */
END(setjmp)
.weak _C_LABEL(longjmp)
@@ -126,7 +120,6 @@ ENTRY(__longjmp)
bl PIC_SYM(_C_LABEL(sigprocmask), PLT)
ldmfd sp!, {r0-r2, r14}
-#ifdef __ARM_EABI__
tst r2, #(_JB_MAGIC_SETJMP ^ _JB_MAGIC_SETJMP_VFP)
/* is this a VFP magic? */
beq 1f /* no, don't restore VFP */
@@ -135,7 +128,6 @@ ENTRY(__longjmp)
ldr ip, [r0, #(_JB_REG_FPSCR * 4)]
vmsr fpscr, ip
1:
-#endif /* __ARM_EABI__ */
add r0, r0, #(_JB_REG_R4 * 4)
/* Restore integer registers */
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
