From 882df891e13ce5c64718c364efb9ef2bf189eabf Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 5 May 2020 16:59:47 -0700 Subject: gcc-runtime: Avoid march conflicts with newer cortex-a55 CPUs gcc-runtime/libatomic explicitly add -march=armv8-a+lse for all arch64 but cortex-a55 is armv8.2-a, which essentially conflicts, so let gcc override it by not forcing the -mcpu option from TUNE_CCARGS Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/gcc-runtime.inc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/recipes-devtools/gcc/gcc-runtime.inc b/meta/recipes-devtools/gcc/gcc-runtime.inc index ace706dbf4..d9a4e483cc 100644 --- a/meta/recipes-devtools/gcc/gcc-runtime.inc +++ b/meta/recipes-devtools/gcc/gcc-runtime.inc @@ -18,6 +18,10 @@ EXTRA_OECONF_append_linuxstdbase = " --enable-clocale=gnu" EXTRA_OECONF_append = " --cache-file=${B}/config.cache" EXTRA_OECONF_append_libc-newlib = " --with-newlib" +# cortex-a55 is ARMv8.2-a based but libatomic explicitly asks for -march=armv8.1-a +# which caused -march conflicts in gcc +TUNE_CCARGS_remove = "-mcpu=cortex-a55+crc -mcpu=cortex-a55 -mcpu=cortex-a55+crc+crypto" + # Disable ifuncs for libatomic on arm conflicts -march/-mcpu EXTRA_OECONF_append_arm = " libat_cv_have_ifunc=no " EXTRA_OECONF_append_armeb = " libat_cv_have_ifunc=no " -- cgit 1.2.3-korg