Module Name: src
Committed By: joerg
Date: Sat Jan 4 01:33:11 UTC 2014
Modified Files:
src/sys/arch/arm/conf: Makefile.arm
Log Message:
Explicitly force a CPU for the assembler for the compatibility
cpu_func_* files. LLVM complains about the use of deprecated
instructions when -march=armv7 or equivalent is in use.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/arm/conf/Makefile.arm
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/conf/Makefile.arm
diff -u src/sys/arch/arm/conf/Makefile.arm:1.39 src/sys/arch/arm/conf/Makefile.arm:1.40
--- src/sys/arch/arm/conf/Makefile.arm:1.39 Fri Dec 27 04:41:29 2013
+++ src/sys/arch/arm/conf/Makefile.arm Sat Jan 4 01:33:11 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.arm,v 1.39 2013/12/27 04:41:29 matt Exp $
+# $NetBSD: Makefile.arm,v 1.40 2014/01/04 01:33:11 joerg Exp $
# Makefile for NetBSD
#
@@ -45,6 +45,13 @@ AFLAGS.blockio.S+=-marm
AFLAGS.copystr.S+=-marm
CFLAGS+= -mfloat-abi=soft
+# This files use instructions deprecated for ARMv7+, but still
+# included in kernel that build with higher -mcpu=... settings.
+CPPFLAGS.cpufunc_asm_armv4.S+= -mcpu=arm9
+CPPFLAGS.cpufunc_asm_armv6.S+= -mcpu=arm1136j-s
+CPPFLAGS.cpufunc_asm_arm11.S+= -mcpu=arm1136j-s
+CPPFLAGS.cpufunc_asm_xscale.S+= -mcpu=xscale
+
##
## (3) libkern and compat
##
