From 67009184e3dcf5bae83d53e3342d6b6f4ee1c4ae Mon Sep 17 00:00:00 2001 From: Ian Lepore Date: Thu, 1 Jan 2015 23:21:46 +0000 Subject: [PATCH] Remove -Wa,-march=armv7a from arm kernel configs, it makes clang 3.5 sad and apparently isn't needed now that we're using the integrated assembler. --- sys/arm/allwinner/a20/std.a20 | 2 +- sys/arm/allwinner/std.a10 | 2 +- sys/arm/altera/socfpga/std.socfpga | 2 +- sys/arm/freescale/imx/std.imx51 | 2 +- sys/arm/freescale/imx/std.imx53 | 2 +- sys/arm/freescale/imx/std.imx6 | 2 +- sys/arm/freescale/vybrid/std.vybrid | 2 +- sys/arm/mv/std-pj4b.mv | 2 +- sys/arm/rockchip/std.rk30xx | 2 +- sys/arm/samsung/exynos/std.exynos5250 | 2 +- sys/arm/samsung/exynos/std.exynos5420 | 2 +- sys/arm/ti/std.ti | 2 +- sys/arm/xilinx/std.zynq7 | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/sys/arm/allwinner/a20/std.a20 b/sys/arm/allwinner/a20/std.a20 index 7beb2bda953..7d5342b0137 100644 --- a/sys/arm/allwinner/a20/std.a20 +++ b/sys/arm/allwinner/a20/std.a20 @@ -3,7 +3,7 @@ cpu CPU_CORTEXA machine arm armv6 -makeoptions CONF_CFLAGS="-march=armv7a -Wa,-march=armv7a" +makeoptions CONF_CFLAGS="-march=armv7a" makeoption ARM_LITTLE_ENDIAN # Physical memory starts at 0x40200000. We assume images are loaded at diff --git a/sys/arm/allwinner/std.a10 b/sys/arm/allwinner/std.a10 index 338395d1598..fa24d5cfb88 100644 --- a/sys/arm/allwinner/std.a10 +++ b/sys/arm/allwinner/std.a10 @@ -3,7 +3,7 @@ cpu CPU_CORTEXA machine arm armv6 -makeoptions CONF_CFLAGS="-march=armv7a -Wa,-march=armv7a" +makeoptions CONF_CFLAGS="-march=armv7a" makeoption ARM_LITTLE_ENDIAN # Physical memory starts at 0x40200000. We assume images are loaded at diff --git a/sys/arm/altera/socfpga/std.socfpga b/sys/arm/altera/socfpga/std.socfpga index 2bc45b94e49..7fa5c88a8e5 100644 --- a/sys/arm/altera/socfpga/std.socfpga +++ b/sys/arm/altera/socfpga/std.socfpga @@ -4,7 +4,7 @@ makeoption ARM_LITTLE_ENDIAN cpu CPU_CORTEXA machine arm armv6 -makeoptions CONF_CFLAGS="-march=armv7a -Wa,-march=armv7a" +makeoptions CONF_CFLAGS="-march=armv7a" options PHYSADDR=0x00000000 diff --git a/sys/arm/freescale/imx/std.imx51 b/sys/arm/freescale/imx/std.imx51 index 4ffcac7bc88..fbc134968ee 100644 --- a/sys/arm/freescale/imx/std.imx51 +++ b/sys/arm/freescale/imx/std.imx51 @@ -1,7 +1,7 @@ # $FreeBSD$ machine arm armv6 cpu CPU_CORTEXA -makeoptions CONF_CFLAGS="-march=armv7a -Wa,-march=armv7a" +makeoptions CONF_CFLAGS="-march=armv7a" makeoptions ARM_LITTLE_ENDIAN options ARM_L2_PIPT diff --git a/sys/arm/freescale/imx/std.imx53 b/sys/arm/freescale/imx/std.imx53 index 6bc96cf7d43..cbef21aedb9 100644 --- a/sys/arm/freescale/imx/std.imx53 +++ b/sys/arm/freescale/imx/std.imx53 @@ -1,7 +1,7 @@ # $FreeBSD$ machine arm armv6 cpu CPU_CORTEXA -makeoptions CONF_CFLAGS="-march=armv7a -Wa,-march=armv7a" +makeoptions CONF_CFLAGS="-march=armv7a" makeoptions ARM_LITTLE_ENDIAN options ARM_L2_PIPT diff --git a/sys/arm/freescale/imx/std.imx6 b/sys/arm/freescale/imx/std.imx6 index 4249f9e1bd9..08fa4410ab5 100644 --- a/sys/arm/freescale/imx/std.imx6 +++ b/sys/arm/freescale/imx/std.imx6 @@ -1,7 +1,7 @@ # $FreeBSD$ machine arm armv6 cpu CPU_CORTEXA -makeoptions CONF_CFLAGS="-march=armv7a -Wa,-march=armv7a" +makeoptions CONF_CFLAGS="-march=armv7a" makeoptions ARM_LITTLE_ENDIAN options ARM_L2_PIPT diff --git a/sys/arm/freescale/vybrid/std.vybrid b/sys/arm/freescale/vybrid/std.vybrid index 35a2a257527..5d732a512c4 100644 --- a/sys/arm/freescale/vybrid/std.vybrid +++ b/sys/arm/freescale/vybrid/std.vybrid @@ -4,7 +4,7 @@ makeoption ARM_LITTLE_ENDIAN cpu CPU_CORTEXA machine arm armv6 -makeoptions CONF_CFLAGS="-march=armv7a -Wa,-march=armv7a" +makeoptions CONF_CFLAGS="-march=armv7a" options PHYSADDR=0x80000000 diff --git a/sys/arm/mv/std-pj4b.mv b/sys/arm/mv/std-pj4b.mv index 1053ff0c3fc..ed9fd00bab6 100644 --- a/sys/arm/mv/std-pj4b.mv +++ b/sys/arm/mv/std-pj4b.mv @@ -3,6 +3,6 @@ files "../mv/files.mv" cpu CPU_MV_PJ4B machine arm armv6 -makeoptions CONF_CFLAGS="-march=armv7a -Wa,-march=armv7a" +makeoptions CONF_CFLAGS="-march=armv7a" options VM_MAXUSER_ADDRESS="(KERNBASE-(1024*1024*1024))" diff --git a/sys/arm/rockchip/std.rk30xx b/sys/arm/rockchip/std.rk30xx index b62b77a47fe..1f20cdd7f86 100644 --- a/sys/arm/rockchip/std.rk30xx +++ b/sys/arm/rockchip/std.rk30xx @@ -3,7 +3,7 @@ cpu CPU_CORTEXA machine arm armv6 -makeoptions CONF_CFLAGS="-march=armv7a -Wa,-march=armv7a" +makeoptions CONF_CFLAGS="-march=armv7a" makeoption ARM_LITTLE_ENDIAN # Physical memory starts at 0x60400000. We assume images are loaded at diff --git a/sys/arm/samsung/exynos/std.exynos5250 b/sys/arm/samsung/exynos/std.exynos5250 index 39c378b6f57..bbcb64ed042 100644 --- a/sys/arm/samsung/exynos/std.exynos5250 +++ b/sys/arm/samsung/exynos/std.exynos5250 @@ -4,7 +4,7 @@ makeoption ARM_LITTLE_ENDIAN cpu CPU_CORTEXA machine arm armv6 -makeoptions CONF_CFLAGS="-march=armv7a -Wa,-march=armv7a" +makeoptions CONF_CFLAGS="-march=armv7a" options PHYSADDR=0x40000000 diff --git a/sys/arm/samsung/exynos/std.exynos5420 b/sys/arm/samsung/exynos/std.exynos5420 index b70537d8798..36c23db4de8 100644 --- a/sys/arm/samsung/exynos/std.exynos5420 +++ b/sys/arm/samsung/exynos/std.exynos5420 @@ -4,7 +4,7 @@ makeoption ARM_LITTLE_ENDIAN cpu CPU_CORTEXA machine arm armv6 -makeoptions CONF_CFLAGS="-march=armv7a -Wa,-march=armv7a" +makeoptions CONF_CFLAGS="-march=armv7a" options PHYSADDR=0x20000000 diff --git a/sys/arm/ti/std.ti b/sys/arm/ti/std.ti index 5e859b687a6..7509fd7fe3c 100644 --- a/sys/arm/ti/std.ti +++ b/sys/arm/ti/std.ti @@ -2,6 +2,6 @@ cpu CPU_CORTEXA machine arm armv6 -makeoptions CONF_CFLAGS="-march=armv7a -Wa,-march=armv7a" +makeoptions CONF_CFLAGS="-march=armv7a" files "../ti/files.ti" diff --git a/sys/arm/xilinx/std.zynq7 b/sys/arm/xilinx/std.zynq7 index 34e67399e7e..10f3ecc7a3c 100644 --- a/sys/arm/xilinx/std.zynq7 +++ b/sys/arm/xilinx/std.zynq7 @@ -5,7 +5,7 @@ cpu CPU_CORTEXA machine arm armv6 -makeoptions CONF_CFLAGS="-march=armv7a -Wa,-march=armv7a" +makeoptions CONF_CFLAGS="-march=armv7a" files "../xilinx/files.zynq7"