[src/trunk]: src/sys/arch/arm/conf Explicitly force a CPU for the assembler f...

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

details:   https://anonhg.NetBSD.org/src/rev/a848b55852fa
branches:  trunk
changeset: 325716:a848b55852fa
user:      joerg <joerg%NetBSD.org@localhost>
date:      Sat Jan 04 01:33:11 2014 +0000

description:
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.

diffstat:

 sys/arch/arm/conf/Makefile.arm |  9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diffs (23 lines):

diff -r c3d2d1ec3fcf -r a848b55852fa sys/arch/arm/conf/Makefile.arm
--- a/sys/arch/arm/conf/Makefile.arm    Sat Jan 04 00:10:02 2014 +0000
+++ b/sys/arch/arm/conf/Makefile.arm    Sat Jan 04 01:33:11 2014 +0000
@@ -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.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
 ##