From dec53367a82ef6837657698fb303ff61ff68cd76 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 9 Mar 2016 23:04:48 +0000 Subject: gcc-configure/gcc-target: Move arm6/7 config to target only We only build one gcc-cross per architecture and having target specific flags means gcc-cross would rebuild. These flags are really for the on target case, so they should be set in gcc-target only. (From OE-Core rev: 851937dde81de2a9ef54c5f19a78fb12fb82afd4) Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/gcc-configure-common.inc | 8 -------- meta/recipes-devtools/gcc/gcc-target.inc | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/meta/recipes-devtools/gcc/gcc-configure-common.inc b/meta/recipes-devtools/gcc/gcc-configure-common.inc index 00ef89ec57..086525997e 100644 --- a/meta/recipes-devtools/gcc/gcc-configure-common.inc +++ b/meta/recipes-devtools/gcc/gcc-configure-common.inc @@ -66,14 +66,6 @@ EXTRA_OECONF_append_mipsisa32r6 = " --with-abi=32 --with-arch=mips32r6" EXTRA_OECONF_append_mipsisa64r6el = " --with-abi=64 --with-arch-64=mips64r6" EXTRA_OECONF_append_mipsisa64r6 = " --with-abi=64 --with-arch-64=mips64r6" -# ARMv6+ adds atomic instructions that affect the ABI in libraries built -# with TUNE_CCARGS in gcc-runtime. Make the compiler default to a -# compatible architecture. armv6 and armv7a cover the minimum tune -# features used in OE. -EXTRA_OECONF_append_armv6 = " --with-arch=armv6" -EXTRA_OECONF_append_armv7a = " --with-arch=armv7-a" -EXTRA_OECONF_append_armv7ve = " --with-arch=armv7-a" - EXTRA_OECONF_GCC_FLOAT ??= "" CPPFLAGS = "" diff --git a/meta/recipes-devtools/gcc/gcc-target.inc b/meta/recipes-devtools/gcc/gcc-target.inc index eef4434dbb..b6e31f5d93 100644 --- a/meta/recipes-devtools/gcc/gcc-target.inc +++ b/meta/recipes-devtools/gcc/gcc-target.inc @@ -9,6 +9,14 @@ EXTRA_OECONF_PATHS = "\ EXTRA_OECONF_append_linuxstdbase = " --enable-clocale=gnu" +# ARMv6+ adds atomic instructions that affect the ABI in libraries built +# with TUNE_CCARGS in gcc-runtime. Make the compiler default to a +# compatible architecture. armv6 and armv7a cover the minimum tune +# features used in OE. +EXTRA_OECONF_append_armv6 = " --with-arch=armv6" +EXTRA_OECONF_append_armv7a = " --with-arch=armv7-a" +EXTRA_OECONF_append_armv7ve = " --with-arch=armv7-a" + # libcc1 requres gcc_cv_objdump when cross build, but gcc_cv_objdump is # set in subdir gcc, so subdir libcc1 can't use it, export it here to # fix the problem. -- cgit v1.2.3-54-g00ecf