Module Name: src
Committed By: matt
Date: Mon Oct 28 22:52:04 UTC 2013
Modified Files:
src/sys/arch/arm/conf: Makefile.arm
Log Message:
Make sure certain files are always assembled with -marm
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 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.37 src/sys/arch/arm/conf/Makefile.arm:1.38
--- src/sys/arch/arm/conf/Makefile.arm:1.37 Sun Feb 3 11:36:55 2013
+++ src/sys/arch/arm/conf/Makefile.arm Mon Oct 28 22:52:04 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.arm,v 1.37 2013/02/03 11:36:55 skrll Exp $
+# $NetBSD: Makefile.arm,v 1.38 2013/10/28 22:52:04 matt Exp $
# Makefile for NetBSD
#
@@ -35,6 +35,14 @@ GENASSYM_CONF= ${ARM}/arm32/genassym.cf
# CPPFLAGS set by platform-specific Makefile fragment.
AFLAGS+= -x assembler-with-cpp
COPTS.arm32_kvminit.c+= -fno-stack-protector
+AFLAGS.bcopyinout.S+=-marm
+AFLAGS.cpuswitch.S+=-marm
+AFLAGS.locore.S+=-marm
+AFLAGS.fusu.S+=-marm
+AFLAGS.exception.S+=-marm
+AFLAGS.irq_dispatch.S+=-marm
+AFLAGS.blockio.S+=-marm
+AFLAGS.copystr.S+=-marm
CFLAGS+= -mfloat-abi=soft
##
@@ -42,6 +50,7 @@ CFLAGS+= -mfloat-abi=soft
##
KERN_AS= obj
+
##
## (4) local objects, compile rules, and dependencies
##
@@ -109,11 +118,20 @@ spl.o vectors.o: assym.h
%RULES
##
-## (9) port independent kernel machinery
+## (9) after the config file is inserted
+##
+
+.for f in ${SFILES:T:Mcpufunc_asm*}
+AFLAGS.${f}+=-marm
+.endfor
+
+##
+## (10) port independent kernel machinery
##
+
.include "$S/conf/Makefile.kern.inc"
##
-## (10) Appending make options.
+## (11) Appending make options.
##
%MAKEOPTIONSAPPEND
