Module Name: src
Committed By: matt
Date: Tue Aug 20 21:43:03 UTC 2013
Modified Files:
src/sys/lib/libkern/arch/arm: Makefile.inc
Log Message:
Some assembly files need to compiled -marm since they are Thumb compatible.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/lib/libkern/arch/arm/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/lib/libkern/arch/arm/Makefile.inc
diff -u src/sys/lib/libkern/arch/arm/Makefile.inc:1.19 src/sys/lib/libkern/arch/arm/Makefile.inc:1.20
--- src/sys/lib/libkern/arch/arm/Makefile.inc:1.19 Mon Aug 12 23:22:12 2013
+++ src/sys/lib/libkern/arch/arm/Makefile.inc Tue Aug 20 21:43:03 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.19 2013/08/12 23:22:12 matt Exp $
+# $NetBSD: Makefile.inc,v 1.20 2013/08/20 21:43:03 matt Exp $
SRCS+= byte_swap_2.S byte_swap_4.S
SRCS+= ffs.S
@@ -9,5 +9,17 @@ SRCS+= modsi3.S umodsi3.S
.if !empty(MACHINE_ARCH:Mearm*)
SRCS+= __aeabi_ldivmod.S __aeabi_uldivmod.S __aeabi_lcmp.c __aeabi_ulcmp.c
SRCS+= unwind_stub.c
-.else
+.endif
+.if empty(MACHINE_ARCH:Mearmv7*)
+CPUFLAGS.ffs.S+= -marm
+.endif
+CPUFLAGS.divide.S+= -marm
+CPUFLAGS.memcmp.S+= -marm
+CPUFLAGS.memcpy.S+= -marm
+CPUFLAGS.memmove.S+= -marm
+CPUFLAGS.memset.S+= -marm
+.if empty(CPPFLAGS:M-D_STANDALONE)
+CPUFLAGS.strcpy.S+= -marm
+CPUFLAGS.strlcpy.S+= -marm
+CPUFLAGS.strncpy.S+= -marm
.endif
