svn commit: r285338 - head/sys/libkern/arm
Andrew Turner
andrew at FreeBSD.org
Thu Jul 9 21:02:43 UTC 2015
Author: andrew
Date: Thu Jul 9 21:02:40 2015
New Revision: 285338
URL: https://svnweb.freebsd.org/changeset/base/285338
Log:
Remove checks for __ARM_EABI__, we only build for EABI now.
Sponsored by: ABT Systems Ltd
Modified:
head/sys/libkern/arm/aeabi_unwind.c
head/sys/libkern/arm/divsi3.S
head/sys/libkern/arm/ldivmod.S
head/sys/libkern/arm/ldivmod_helper.c
head/sys/libkern/arm/memcpy.S
head/sys/libkern/arm/memset.S
Modified: head/sys/libkern/arm/aeabi_unwind.c
==============================================================================
--- head/sys/libkern/arm/aeabi_unwind.c Thu Jul 9 20:54:38 2015 (r285337)
+++ head/sys/libkern/arm/aeabi_unwind.c Thu Jul 9 21:02:40 2015 (r285338)
@@ -35,7 +35,6 @@ __FBSDID("$FreeBSD$");
#define panic(x) (void)0
#endif
-#ifdef __ARM_EABI__
/* We need to provide these functions never call them */
void __aeabi_unwind_cpp_pr0(void);
void __aeabi_unwind_cpp_pr1(void);
@@ -58,5 +57,3 @@ __aeabi_unwind_cpp_pr2(void)
{
panic("__aeabi_unwind_cpp_pr2");
}
-#endif
-
Modified: head/sys/libkern/arm/divsi3.S
==============================================================================
--- head/sys/libkern/arm/divsi3.S Thu Jul 9 20:54:38 2015 (r285337)
+++ head/sys/libkern/arm/divsi3.S Thu Jul 9 21:02:40 2015 (r285338)
@@ -52,10 +52,8 @@ ENTRY_NP(__modsi3)
END(__modsi3)
ENTRY_NP(__udivsi3)
-#ifdef __ARM_EABI__
EENTRY_NP(__aeabi_uidiv)
EENTRY_NP(__aeabi_uidivmod)
-#endif
.L_udivide: /* r0 = r0 / r1; r1 = r0 % r1 */
eor r0, r1, r0
eor r1, r0, r1
@@ -76,17 +74,13 @@ EENTRY_NP(__aeabi_uidivmod)
mov r0, r1
mov r1, #0
RET
-#ifdef __ARM_EABI__
EEND(__aeabi_uidiv)
EEND(__aeabi_uidivmod)
-#endif
END(__udivsi3)
ENTRY_NP(__divsi3)
-#ifdef __ARM_EABI__
EENTRY_NP(__aeabi_idiv)
EENTRY_NP(__aeabi_idivmod)
-#endif
.L_divide: /* r0 = r0 / r1; r1 = r0 % r1 */
eor r0, r1, r0
eor r1, r0, r1
@@ -400,9 +394,7 @@ EENTRY_NP(__aeabi_idivmod)
addhs r3, r3, r2
mov r0, r3
RET
-#ifdef __ARM_EABI__
EEND(__aeabi_idiv)
EEND(__aeabi_idivmod)
-#endif
END(__divsi3)
Modified: head/sys/libkern/arm/ldivmod.S
==============================================================================
--- head/sys/libkern/arm/ldivmod.S Thu Jul 9 20:54:38 2015 (r285337)
+++ head/sys/libkern/arm/ldivmod.S Thu Jul 9 21:02:40 2015 (r285338)
@@ -28,8 +28,6 @@
#include <machine/asm.h>
__FBSDID("$FreeBSD$");
-#ifdef __ARM_EABI__
-
/*
* These calculate:
* q = n / m
@@ -64,6 +62,3 @@ ENTRY_NP(__aeabi_uldivmod)
ldmfd sp!, {r2, r3} /* Load the remainder */
RET
END(__aeabi_uldivmod)
-
-#endif
-
Modified: head/sys/libkern/arm/ldivmod_helper.c
==============================================================================
--- head/sys/libkern/arm/ldivmod_helper.c Thu Jul 9 20:54:38 2015 (r285337)
+++ head/sys/libkern/arm/ldivmod_helper.c Thu Jul 9 21:02:40 2015 (r285338)
@@ -28,7 +28,6 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#ifdef __ARM_EABI__
#include <libkern/quad.h>
/*
@@ -48,6 +47,3 @@ __kern_ldivmod(long long n, long long m,
return q;
}
-
-#endif
-
Modified: head/sys/libkern/arm/memcpy.S
==============================================================================
--- head/sys/libkern/arm/memcpy.S Thu Jul 9 20:54:38 2015 (r285337)
+++ head/sys/libkern/arm/memcpy.S Thu Jul 9 21:02:40 2015 (r285338)
@@ -28,8 +28,6 @@
#include <machine/asm.h>
__FBSDID("$FreeBSD$");
-#ifdef __ARM_EABI__
-
ENTRY_NP(__aeabi_memcpy)
EENTRY_NP(__aeabi_memcpy4)
EENTRY_NP(__aeabi_memcpy8)
@@ -37,6 +35,3 @@ EENTRY_NP(__aeabi_memcpy8)
EEND(__aeabi_memcpy8)
EEND(__aeabi_memcpy4)
END(__aeabi_memcpy)
-
-#endif
-
Modified: head/sys/libkern/arm/memset.S
==============================================================================
--- head/sys/libkern/arm/memset.S Thu Jul 9 20:54:38 2015 (r285337)
+++ head/sys/libkern/arm/memset.S Thu Jul 9 21:02:40 2015 (r285338)
@@ -28,8 +28,6 @@
#include <machine/asm.h>
__FBSDID("$FreeBSD$");
-#ifdef __ARM_EABI__
-
/*
* This implements
* void __aeabi_memset(void *dest, size_t len, int c)
@@ -44,6 +42,3 @@ ENTRY_NP(__aeabi_memset)
mov r1, r3
b memset
END(__aeabi_memset)
-
-#endif
-
More information about the svn-src-head
mailing list