From: Boris Krasnovskiy <borkra@gmail.com>
Date: Thu, 21 Mar 2019 03:00:51 +0000 (-0400)
Subject: toolchain: ARM: Fix option conflict with multiarch
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=4cf991bedb4cbf42fd60af52a730bf52461c7161;p=openwrt%2Fstaging%2Fblogic.git

toolchain: ARM: Fix option conflict with multiarch

This problem exposed when compiling glibc, but applicable across the
board. gcc compiles runtime libraries for all supported architectures,
unless otherwise specified, and later selects applicable library based
-m[arch,cpu,*] options, thus these options should not be passed to gcc
as they break the compilation process.

Signed-off-by: Boris Krasnovskiy <borkra@gmail.com>
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
[modified so it only touches ARM - I'm too chicken, changed authors email]
---

diff --git a/toolchain/gcc/common.mk b/toolchain/gcc/common.mk
index 6e8767f707b7..6e0edfb36a21 100644
--- a/toolchain/gcc/common.mk
+++ b/toolchain/gcc/common.mk
@@ -170,6 +170,11 @@ ifeq ($(CONFIG_arm),y)
 		--with-fpu=$(word 2, $(subst +, ",$(CONFIG_CPU_TYPE))) \
 		--with-float=hard
   endif
+
+  # Do not let TARGET_CFLAGS get poisoned by extra CPU optimization flags
+  # that do not belong here. The cpu,fpu type should be specified via
+  # --with-cpu and --with-fpu for ARM and not CFLAGS.
+  TARGET_CFLAGS:=$(filter-out -m%,$(call qstrip,$(TARGET_CFLAGS)))
 endif
 
 ifeq ($(CONFIG_TARGET_x86)$(CONFIG_USE_GLIBC)$(CONFIG_INSTALL_GCCGO),yyy)