[src/trunk]: src/common/lib/libc/arch/arm/string Don't build the __eabi_ alia...

[justin <justin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ee8c0716cd75
branches:  trunk
changeset: 807033:ee8c0716cd75
user:      justin <justin%NetBSD.org@localhost>
date:      Thu Mar 26 13:34:51 2015 +0000

description:
Don't build the __eabi_ aliases in the arm rump kernel.

These are provided by libc in userspace, so leave out of kernel

diffstat:

 common/lib/libc/arch/arm/string/memcmp.S  |  6 +++---
 common/lib/libc/arch/arm/string/memcpy.S  |  4 ++--
 common/lib/libc/arch/arm/string/memmove.S |  4 ++--
 common/lib/libc/arch/arm/string/memset.S  |  4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diffs (79 lines):

diff -r 6d7a63dda96a -r ee8c0716cd75 common/lib/libc/arch/arm/string/memcmp.S
--- a/common/lib/libc/arch/arm/string/memcmp.S  Thu Mar 26 11:59:38 2015 +0000
+++ b/common/lib/libc/arch/arm/string/memcmp.S  Thu Mar 26 13:34:51 2015 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: memcmp.S,v 1.4 2013/12/02 21:21:33 joerg Exp $ */
+/*      $NetBSD: memcmp.S,v 1.5 2015/03/26 13:34:51 justin Exp $ */
 
 /*
  * Copyright 2003 Wasabi Systems, Inc.
@@ -64,7 +64,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$NetBSD: memcmp.S,v 1.4 2013/12/02 21:21:33 joerg Exp $")
+RCSID("$NetBSD: memcmp.S,v 1.5 2015/03/26 13:34:51 justin Exp $")
 
 ENTRY(memcmp)
        mov     ip, r0
@@ -180,6 +180,6 @@
 #endif
 END(memcmp)
 
-#if defined(__ARM_EABI__)
+#if defined(__ARM_EABI__) && !defined(_RUMPKERNEL)
 STRONG_ALIAS(__aeabi_memcmp, memcmp)
 #endif
diff -r 6d7a63dda96a -r ee8c0716cd75 common/lib/libc/arch/arm/string/memcpy.S
--- a/common/lib/libc/arch/arm/string/memcpy.S  Thu Mar 26 11:59:38 2015 +0000
+++ b/common/lib/libc/arch/arm/string/memcpy.S  Thu Mar 26 13:34:51 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: memcpy.S,v 1.6 2013/12/02 21:21:33 joerg Exp $ */
+/*     $NetBSD: memcpy.S,v 1.7 2015/03/26 13:34:51 justin Exp $        */
 
 #include <arm/cdefs.h>
 
@@ -8,6 +8,6 @@
 #include "memcpy_xscale.S"
 #endif
 
-#if defined(__ARM_EABI__)
+#if defined(__ARM_EABI__) && !defined(_RUMPKERNEL)
 STRONG_ALIAS(__aeabi_memcpy, memcpy)
 #endif
diff -r 6d7a63dda96a -r ee8c0716cd75 common/lib/libc/arch/arm/string/memmove.S
--- a/common/lib/libc/arch/arm/string/memmove.S Thu Mar 26 11:59:38 2015 +0000
+++ b/common/lib/libc/arch/arm/string/memmove.S Thu Mar 26 13:34:51 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: memmove.S,v 1.8 2013/12/02 21:21:33 joerg Exp $        */
+/*     $NetBSD: memmove.S,v 1.9 2015/03/26 13:34:51 justin Exp $       */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -585,7 +585,7 @@
 END(bcopy)
 #endif
 
-#if defined(__ARM_EABI__) && !defined(BCOPY)
+#if defined(__ARM_EABI__) && !defined(BCOPY) && !defined(_RUMPKERNEL)
 STRONG_ALIAS(__aeabi_memmove, memmove)
 STRONG_ALIAS(__aeabi_memmove4, memmove)
 STRONG_ALIAS(__aeabi_memmove8, memmove)
diff -r 6d7a63dda96a -r ee8c0716cd75 common/lib/libc/arch/arm/string/memset.S
--- a/common/lib/libc/arch/arm/string/memset.S  Thu Mar 26 11:59:38 2015 +0000
+++ b/common/lib/libc/arch/arm/string/memset.S  Thu Mar 26 13:34:51 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: memset.S,v 1.7 2013/12/02 21:21:33 joerg Exp $ */
+/*     $NetBSD: memset.S,v 1.8 2015/03/26 13:34:51 justin Exp $        */
 
 /*
  * Copyright 2003 Wasabi Systems, Inc.
@@ -68,7 +68,7 @@
 
 #include <machine/asm.h>
 
-#if defined(__ARM_EABI__) && !defined(_BZERO)
+#if defined(__ARM_EABI__) && !defined(_BZERO) && !defined(_RUMPKERNEL)
 ENTRY(__aeabi_memset)
        mov     r3, r1
        mov     r1, r2