From 6a4a0db965117b7d69bde849601dd6d2160a34e0 Mon Sep 17 00:00:00 2001
From: andrew <andrew@FreeBSD.org>
Date: Thu, 9 Jul 2015 21:02:40 +0000
Subject: Remove checks for __ARM_EABI__, we only build for EABI now.

Sponsored by:	ABT Systems Ltd
---
 sys/libkern/arm/aeabi_unwind.c   | 3 ---
 sys/libkern/arm/divsi3.S         | 8 --------
 sys/libkern/arm/ldivmod.S        | 5 -----
 sys/libkern/arm/ldivmod_helper.c | 4 ----
 sys/libkern/arm/memcpy.S         | 5 -----
 sys/libkern/arm/memset.S         | 5 -----
 6 files changed, 30 deletions(-)

(limited to 'sys/libkern')

diff --git a/sys/libkern/arm/aeabi_unwind.c b/sys/libkern/arm/aeabi_unwind.c
index efaf58d..18cf1d0 100644
--- a/sys/libkern/arm/aeabi_unwind.c
+++ b/sys/libkern/arm/aeabi_unwind.c
@@ -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
-
diff --git a/sys/libkern/arm/divsi3.S b/sys/libkern/arm/divsi3.S
index 46e7c63..9b71b83 100644
--- a/sys/libkern/arm/divsi3.S
+++ b/sys/libkern/arm/divsi3.S
@@ -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)
 
diff --git a/sys/libkern/arm/ldivmod.S b/sys/libkern/arm/ldivmod.S
index 26a3944..95f816b 100644
--- a/sys/libkern/arm/ldivmod.S
+++ b/sys/libkern/arm/ldivmod.S
@@ -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
-
diff --git a/sys/libkern/arm/ldivmod_helper.c b/sys/libkern/arm/ldivmod_helper.c
index 9061ae4..f3c02b2 100644
--- a/sys/libkern/arm/ldivmod_helper.c
+++ b/sys/libkern/arm/ldivmod_helper.c
@@ -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, long long *rem)
 
 	return q;
 }
-
-#endif
-
diff --git a/sys/libkern/arm/memcpy.S b/sys/libkern/arm/memcpy.S
index 3703195..dd3dea1 100644
--- a/sys/libkern/arm/memcpy.S
+++ b/sys/libkern/arm/memcpy.S
@@ -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
-
diff --git a/sys/libkern/arm/memset.S b/sys/libkern/arm/memset.S
index 57d2507..dd06e6b 100644
--- a/sys/libkern/arm/memset.S
+++ b/sys/libkern/arm/memset.S
@@ -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
-
-- 
cgit v1.1