Module Name: src
Committed By: justin
Date: Thu Mar 26 13:34:51 UTC 2015
Modified Files:
src/common/lib/libc/arch/arm/string: memcmp.S memcpy.S memmove.S
memset.S
Log Message:
Don't build the __eabi_ aliases in the arm rump kernel.
These are provided by libc in userspace, so leave out of kernel
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/common/lib/libc/arch/arm/string/memcmp.S
cvs rdiff -u -r1.6 -r1.7 src/common/lib/libc/arch/arm/string/memcpy.S
cvs rdiff -u -r1.8 -r1.9 src/common/lib/libc/arch/arm/string/memmove.S
cvs rdiff -u -r1.7 -r1.8 src/common/lib/libc/arch/arm/string/memset.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/arch/arm/string/memcmp.S
diff -u src/common/lib/libc/arch/arm/string/memcmp.S:1.4 src/common/lib/libc/arch/arm/string/memcmp.S:1.5
--- src/common/lib/libc/arch/arm/string/memcmp.S:1.4 Mon Dec 2 21:21:33 2013
+++ src/common/lib/libc/arch/arm/string/memcmp.S Thu Mar 26 13:34:51 2015
@@ -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 @@ ENTRY(memcmp)
#endif
END(memcmp)
-#if defined(__ARM_EABI__)
+#if defined(__ARM_EABI__) && !defined(_RUMPKERNEL)
STRONG_ALIAS(__aeabi_memcmp, memcmp)
#endif
Index: src/common/lib/libc/arch/arm/string/memcpy.S
diff -u src/common/lib/libc/arch/arm/string/memcpy.S:1.6 src/common/lib/libc/arch/arm/string/memcpy.S:1.7
--- src/common/lib/libc/arch/arm/string/memcpy.S:1.6 Mon Dec 2 21:21:33 2013
+++ src/common/lib/libc/arch/arm/string/memcpy.S Thu Mar 26 13:34:51 2015
@@ -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
Index: src/common/lib/libc/arch/arm/string/memmove.S
diff -u src/common/lib/libc/arch/arm/string/memmove.S:1.8 src/common/lib/libc/arch/arm/string/memmove.S:1.9
--- src/common/lib/libc/arch/arm/string/memmove.S:1.8 Mon Dec 2 21:21:33 2013
+++ src/common/lib/libc/arch/arm/string/memmove.S Thu Mar 26 13:34:51 2015
@@ -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(memmove)
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)
Index: src/common/lib/libc/arch/arm/string/memset.S
diff -u src/common/lib/libc/arch/arm/string/memset.S:1.7 src/common/lib/libc/arch/arm/string/memset.S:1.8
--- src/common/lib/libc/arch/arm/string/memset.S:1.7 Mon Dec 2 21:21:33 2013
+++ src/common/lib/libc/arch/arm/string/memset.S Thu Mar 26 13:34:51 2015
@@ -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
