Module Name: src
Committed By: joerg
Date: Mon Jul 24 19:37:41 UTC 2017
Modified Files:
src/sys/arch/arm/cortex: a9_mpsubr.S
src/sys/arch/evbarm/conf: mk.sunxi
Log Message:
Replace assembler flags with .arch* annotation.
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/arm/cortex/a9_mpsubr.S
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/conf/mk.sunxi
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/cortex/a9_mpsubr.S
diff -u src/sys/arch/arm/cortex/a9_mpsubr.S:1.48 src/sys/arch/arm/cortex/a9_mpsubr.S:1.49
--- src/sys/arch/arm/cortex/a9_mpsubr.S:1.48 Wed Jul 5 20:53:40 2017
+++ src/sys/arch/arm/cortex/a9_mpsubr.S Mon Jul 24 19:37:41 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: a9_mpsubr.S,v 1.48 2017/07/05 20:53:40 skrll Exp $ */
+/* $NetBSD: a9_mpsubr.S,v 1.49 2017/07/24 19:37:41 joerg Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -50,6 +50,10 @@
blx ip
#endif
+#if defined(CPU_CORTEXA7) || defined(CPU_CORTEXA15) || defined(CPU_CORTEXA17)
+ .arch armv7a
+ .arch_extension virt
+#endif
// We'll modify va and pa at run time so we can use relocatable addresses.
#define MMU_INIT(va,pa,n_sec,attr) \
Index: src/sys/arch/evbarm/conf/mk.sunxi
diff -u src/sys/arch/evbarm/conf/mk.sunxi:1.1 src/sys/arch/evbarm/conf/mk.sunxi:1.2
--- src/sys/arch/evbarm/conf/mk.sunxi:1.1 Wed Jun 28 23:51:29 2017
+++ src/sys/arch/evbarm/conf/mk.sunxi Mon Jul 24 19:37:41 2017
@@ -1,11 +1,8 @@
-# $NetBSD: mk.sunxi,v 1.1 2017/06/28 23:51:29 jmcneill Exp $
+# $NetBSD: mk.sunxi,v 1.2 2017/07/24 19:37:41 joerg Exp $
SYSTEM_FIRST_OBJ= sunxi_start.o
SYSTEM_FIRST_SFILE= ${THISARM}/sunxi/sunxi_start.S
-AFLAGS.sunxi_start.S+= -Wa,-march=armv7-a+virt
-AFLAGS.psci_arm.S+= -Wa,-march=armv7-a+sec+virt
-
GENASSYM_EXTRAS+= ${THISARM}/sunxi/genassym.cf
_OSRELEASE!= ${HOST_SH} $S/conf/osrelease.sh
