Index: stable/10/sys/arm/allwinner/a20/std.a20
===================================================================
--- stable/10/sys/arm/allwinner/a20/std.a20	(revision 278600)
+++ stable/10/sys/arm/allwinner/a20/std.a20	(revision 278601)
@@ -1,24 +1,25 @@
 # Allwinner A20 common options
 #$FreeBSD$
 
 cpu		CPU_CORTEXA
 machine 	arm armv6
+makeoptions	CONF_CFLAGS="-march=armv7a -Wa,-march=armv7a"
 makeoption	ARM_LITTLE_ENDIAN
 
 # Physical memory starts at 0x40200000.  We assume images are loaded at
 # 0x40200000, e.g. from u-boot with 'fatload mmc 0 0x40200000 kernel'
 #
 #
 options 	PHYSADDR=0x40000000
 
 makeoptions	KERNPHYSADDR=0x40200000
 options 	KERNPHYSADDR=0x40200000
 makeoptions	KERNVIRTADDR=0xc0200000
 options 	KERNVIRTADDR=0xc0200000
 
 options 	ARM_L2_PIPT
 
 options 	IPI_IRQ_START=0
 options 	IPI_IRQ_END=15
 
 files		"../allwinner/a20/files.a20"
Index: stable/10/sys/arm/allwinner/std.a10
===================================================================
--- stable/10/sys/arm/allwinner/std.a10	(revision 278600)
+++ stable/10/sys/arm/allwinner/std.a10	(revision 278601)
@@ -1,19 +1,20 @@
 # Allwinner A10 common options
 #$FreeBSD$
 
 cpu		CPU_CORTEXA
 machine 	arm armv6
+makeoptions	CONF_CFLAGS="-march=armv7a -Wa,-march=armv7a"
 makeoption	ARM_LITTLE_ENDIAN
 
 # Physical memory starts at 0x40200000.  We assume images are loaded at
 # 0x40200000, e.g. from u-boot with 'fatload mmc 0 0x40200000 kernel'
 #
 #
 options		PHYSADDR=0x40000000
 
 makeoptions	KERNPHYSADDR=0x40200000
 options		KERNPHYSADDR=0x40200000
 makeoptions	KERNVIRTADDR=0xc0200000
 options		KERNVIRTADDR=0xc0200000
 
 files		"../allwinner/files.a10"
Index: stable/10/sys/arm/broadcom/bcm2835/std.bcm2835
===================================================================
--- stable/10/sys/arm/broadcom/bcm2835/std.bcm2835	(revision 278600)
+++ stable/10/sys/arm/broadcom/bcm2835/std.bcm2835	(revision 278601)
@@ -1,7 +1,8 @@
 # $FreeBSD$
 
 machine	arm armv6
 cpu	CPU_ARM1176
+makeoptions	CONF_CFLAGS="-mcpu=arm1176jzf-s -Wa,-mcpu=arm1176jzf-s"
 
 files	"../broadcom/bcm2835/files.bcm2835"
 
Index: stable/10/sys/arm/freescale/imx/std.imx51
===================================================================
--- stable/10/sys/arm/freescale/imx/std.imx51	(revision 278600)
+++ stable/10/sys/arm/freescale/imx/std.imx51	(revision 278601)
@@ -1,16 +1,17 @@
 # $FreeBSD$
 machine		arm	armv6
 cpu 		CPU_CORTEXA
+makeoptions	CONF_CFLAGS="-march=armv7a -Wa,-march=armv7a"
 makeoptions	ARM_LITTLE_ENDIAN
 options		ARM_L2_PIPT
 
 options		KERNVIRTADDR=0xc0100000
 makeoptions	KERNVIRTADDR=0xc0100000
 options		KERNPHYSADDR=0x90100000
 makeoptions	KERNPHYSADDR=0x90100000
 options		PHYSADDR=0x90000000
 
 device  	fdt_pinctrl
 
 files "../freescale/imx/files.imx51"
 
Index: stable/10/sys/arm/freescale/imx/std.imx53
===================================================================
--- stable/10/sys/arm/freescale/imx/std.imx53	(revision 278600)
+++ stable/10/sys/arm/freescale/imx/std.imx53	(revision 278601)
@@ -1,16 +1,17 @@
 # $FreeBSD$
 machine		arm	armv6
 cpu 		CPU_CORTEXA
+makeoptions	CONF_CFLAGS="-march=armv7a -Wa,-march=armv7a"
 makeoptions	ARM_LITTLE_ENDIAN
 options		ARM_L2_PIPT
 
 options		KERNVIRTADDR=0xc0100000
 makeoptions	KERNVIRTADDR=0xc0100000
 options		KERNPHYSADDR=0x70100000
 makeoptions	KERNPHYSADDR=0x70100000
 options		PHYSADDR=0x70000000
 
 device  	fdt_pinctrl
 
 files "../freescale/imx/files.imx53"
 
Index: stable/10/sys/arm/freescale/imx/std.imx6
===================================================================
--- stable/10/sys/arm/freescale/imx/std.imx6	(revision 278600)
+++ stable/10/sys/arm/freescale/imx/std.imx6	(revision 278601)
@@ -1,19 +1,20 @@
 # $FreeBSD$
 machine		arm	armv6
 cpu 		CPU_CORTEXA
+makeoptions	CONF_CFLAGS="-march=armv7a -Wa,-march=armv7a"
 makeoptions	ARM_LITTLE_ENDIAN
 options		ARM_L2_PIPT
 
 options		KERNVIRTADDR		= 0xc2000000
 makeoptions	KERNVIRTADDR		= 0xc2000000
 options		KERNPHYSADDR		= 0x12000000
 makeoptions	KERNPHYSADDR		= 0x12000000
 options		PHYSADDR		= 0x10000000
 
 options		IPI_IRQ_START=0
 options		IPI_IRQ_END=15
 
 device  	fdt_pinctrl
 
 files "../freescale/imx/files.imx6"
 
Index: stable/10/sys/arm/freescale/vybrid/std.vybrid
===================================================================
--- stable/10/sys/arm/freescale/vybrid/std.vybrid	(revision 278600)
+++ stable/10/sys/arm/freescale/vybrid/std.vybrid	(revision 278601)
@@ -1,18 +1,19 @@
 # $FreeBSD$
 
 makeoption	ARM_LITTLE_ENDIAN
 
 cpu		CPU_CORTEXA
 machine		arm armv6
+makeoptions	CONF_CFLAGS="-march=armv7a -Wa,-march=armv7a"
 
 options		PHYSADDR=0x80000000
 
 makeoptions	KERNPHYSADDR=0x80100000
 options		KERNPHYSADDR=0x80100000
 
 makeoptions	KERNVIRTADDR=0xc0100000
 options		KERNVIRTADDR=0xc0100000
 
 options		ARM_L2_PIPT
 
 files		"../freescale/vybrid/files.vybrid"
Index: stable/10/sys/arm/mv/std-pj4b.mv
===================================================================
--- stable/10/sys/arm/mv/std-pj4b.mv	(revision 278600)
+++ stable/10/sys/arm/mv/std-pj4b.mv	(revision 278601)
@@ -1,7 +1,8 @@
 # $FreeBSD$
 
 files		"../mv/files.mv"
 cpu		CPU_MV_PJ4B
 machine 	arm	armv6
+makeoptions	CONF_CFLAGS="-march=armv7a -Wa,-march=armv7a"
 
 options		VM_MAXUSER_ADDRESS="(KERNBASE-(1024*1024*1024))"
Index: stable/10/sys/arm/rockchip/std.rk30xx
===================================================================
--- stable/10/sys/arm/rockchip/std.rk30xx	(revision 278600)
+++ stable/10/sys/arm/rockchip/std.rk30xx	(revision 278601)
@@ -1,25 +1,26 @@
 # Rockchip rk30xx common options
 #$FreeBSD$
 
 cpu		CPU_CORTEXA
 machine		arm armv6
+makeoptions	CONF_CFLAGS="-march=armv7a -Wa,-march=armv7a"
 makeoption	ARM_LITTLE_ENDIAN
 
 # Physical memory starts at 0x60400000.  We assume images are loaded at
 # 0x60400000.
 #
 #
 options		PHYSADDR=0x60000000
 
 makeoptions	KERNPHYSADDR=0x60400000
 options		KERNPHYSADDR=0x60400000
 
 makeoptions	KERNVIRTADDR=0xc0400000
 options		KERNVIRTADDR=0xc0400000
 
 options		ARM_L2_PIPT
 
 options		IPI_IRQ_START=0
 options		IPI_IRQ_END=15
 
 files		"../rockchip/files.rk30xx"
Index: stable/10/sys/arm/samsung/exynos/std.exynos5250
===================================================================
--- stable/10/sys/arm/samsung/exynos/std.exynos5250	(revision 278600)
+++ stable/10/sys/arm/samsung/exynos/std.exynos5250	(revision 278601)
@@ -1,21 +1,22 @@
 # $FreeBSD$
 
 makeoption	ARM_LITTLE_ENDIAN
 
 cpu		CPU_CORTEXA
 machine		arm armv6
+makeoptions	CONF_CFLAGS="-march=armv7a -Wa,-march=armv7a"
 
 options		PHYSADDR=0x40000000
 
 makeoptions	KERNPHYSADDR=0x40f00000
 options		KERNPHYSADDR=0x40f00000
 
 makeoptions	KERNVIRTADDR=0xc0f00000
 options		KERNVIRTADDR=0xc0f00000
 
 options		ARM_L2_PIPT
 
 options		IPI_IRQ_START=0
 options		IPI_IRQ_END=15
 
 files		"../samsung/exynos/files.exynos5"
Index: stable/10/sys/arm/samsung/exynos/std.exynos5420
===================================================================
--- stable/10/sys/arm/samsung/exynos/std.exynos5420	(revision 278600)
+++ stable/10/sys/arm/samsung/exynos/std.exynos5420	(revision 278601)
@@ -1,21 +1,22 @@
 # $FreeBSD$
 
 makeoption	ARM_LITTLE_ENDIAN
 
 cpu		CPU_CORTEXA
 machine		arm armv6
+makeoptions	CONF_CFLAGS="-march=armv7a -Wa,-march=armv7a"
 
 options		PHYSADDR=0x20000000
 
 makeoptions	KERNPHYSADDR=0x20f00000
 options		KERNPHYSADDR=0x20f00000
 
 makeoptions	KERNVIRTADDR=0xc0f00000
 options		KERNVIRTADDR=0xc0f00000
 
 options		ARM_L2_PIPT
 
 options		IPI_IRQ_START=0
 options		IPI_IRQ_END=15
 
 files		"../samsung/exynos/files.exynos5"
Index: stable/10/sys/arm/ti/std.ti
===================================================================
--- stable/10/sys/arm/ti/std.ti	(revision 278600)
+++ stable/10/sys/arm/ti/std.ti	(revision 278601)
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 cpu 		CPU_CORTEXA
 machine 	arm	armv6
+makeoptions	CONF_CFLAGS="-march=armv7a -Wa,-march=armv7a"
 
 files		"../ti/files.ti"
Index: stable/10/sys/arm/xilinx/std.zynq7
===================================================================
--- stable/10/sys/arm/xilinx/std.zynq7	(revision 278600)
+++ stable/10/sys/arm/xilinx/std.zynq7	(revision 278601)
@@ -1,24 +1,25 @@
 #
 # std.zynq7		- Generic configuration for Xilinx Zynq-7000 PS.
 #
 # $FreeBSD$
 
 cpu		CPU_CORTEXA
 machine		arm	armv6
+makeoptions	CONF_CFLAGS="-march=armv7a -Wa,-march=armv7a"
 
 files		"../xilinx/files.zynq7"
 
 # Physical memory starts at 0x00000000.  We assume images are loaded at
 # 0x00100000, e.g. from u-boot with 'fatload mmc 0 0x100000 kernel.bin'
 #
 #
 options		PHYSADDR=0x00000000
 options		KERNPHYSADDR=0x00100000
 makeoptions	KERNPHYSADDR=0x00100000
 options		KERNVIRTADDR=0xc0100000		# Used in ldscript.arm
 makeoptions	KERNVIRTADDR=0xc0100000
 
 options		ARM_L2_PIPT
 
 options		IPI_IRQ_START=0
 options		IPI_IRQ_END=15
Index: stable/10
===================================================================
--- stable/10	(revision 278600)
+++ stable/10	(revision 278601)

Property changes on: stable/10
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r276047