diff options
Diffstat (limited to 'poky/meta/recipes-devtools/gcc/gcc-10.1')
2 files changed, 42 insertions, 47 deletions
diff --git a/poky/meta/recipes-devtools/gcc/gcc-10.1/0038-Revert-AArch64-Use-__getauxval-instead-of-getauxval-.patch b/poky/meta/recipes-devtools/gcc/gcc-10.1/0038-Revert-AArch64-Use-__getauxval-instead-of-getauxval-.patch deleted file mode 100644 index fc9228277a..0000000000 --- a/poky/meta/recipes-devtools/gcc/gcc-10.1/0038-Revert-AArch64-Use-__getauxval-instead-of-getauxval-.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 2101fb718935c7cf1cc2ad201bdeb1e635b54b0a Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 11 May 2020 11:03:41 -0700 -Subject: [PATCH] Revert "[AArch64] Use __getauxval instead of getauxval in LSE - detection code in libgcc" - -This reverts commit 5a57016dd2758cc63a544f191f77635342397a72. - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - libgcc/config/aarch64/lse-init.c | 17 ++++++++--------- - 1 file changed, 8 insertions(+), 9 deletions(-) - -diff --git a/libgcc/config/aarch64/lse-init.c b/libgcc/config/aarch64/lse-init.c -index 00e9ab8cd1c..74acef25cce 100644 ---- a/libgcc/config/aarch64/lse-init.c -+++ b/libgcc/config/aarch64/lse-init.c -@@ -29,20 +29,19 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see - _Bool __aarch64_have_lse_atomics - __attribute__((visibility("hidden"), nocommon)); - --/* Gate availability of __getauxval on glibc. All AArch64-supporting glibc -- versions support it. */ --#ifdef __gnu_linux__ -+/* Disable initialization of __aarch64_have_lse_atomics during bootstrap. */ -+#if !defined(inhibit_libc) && defined(HAVE_SYS_AUXV_H) -+# include <sys/auxv.h> - --# define AT_HWCAP 16 --# define HWCAP_ATOMICS (1 << 8) -- --unsigned long int __getauxval (unsigned long int); -+/* Disable initialization if the system headers are too old. */ -+# if defined(AT_HWCAP) && defined(HWCAP_ATOMICS) - - static void __attribute__((constructor)) - init_have_lse_atomics (void) - { -- unsigned long hwcap = __getauxval (AT_HWCAP); -+ unsigned long hwcap = getauxval (AT_HWCAP); - __aarch64_have_lse_atomics = (hwcap & HWCAP_ATOMICS) != 0; - } - --#endif /* __gnu_linux__ */ -+# endif /* HWCAP */ -+#endif /* inhibit_libc */ diff --git a/poky/meta/recipes-devtools/gcc/gcc-10.1/0038-libatomic-Do-not-enforce-march-on-aarch64.patch b/poky/meta/recipes-devtools/gcc/gcc-10.1/0038-libatomic-Do-not-enforce-march-on-aarch64.patch new file mode 100644 index 0000000000..3946acea11 --- /dev/null +++ b/poky/meta/recipes-devtools/gcc/gcc-10.1/0038-libatomic-Do-not-enforce-march-on-aarch64.patch @@ -0,0 +1,42 @@ +From 38d262bfe7c0c894c364dc6e4dc7971e78a73974 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 13 May 2020 15:10:38 -0700 +Subject: [PATCH] libatomic: Do not enforce march on aarch64 + +OE passes the right options via gcc compiler cmdline via TUNE_CCARGS +this can conflict between -mcpu settings and -march setting here, since +-mcpu will translate into an appropriate -march, lets depend on that +instead of setting it explicitly + +Upstream-Status: Inappropriate [OE-Specific] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + libatomic/Makefile.am | 1 - + libatomic/Makefile.in | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/libatomic/Makefile.am b/libatomic/Makefile.am +index 133fbbca77e..ac1ca645876 100644 +--- a/libatomic/Makefile.am ++++ b/libatomic/Makefile.am +@@ -125,7 +125,6 @@ libatomic_la_LIBADD = $(foreach s,$(SIZES),$(addsuffix _$(s)_.lo,$(SIZEOBJS))) + ## On a target-specific basis, include alternates to be selected by IFUNC. + if HAVE_IFUNC + if ARCH_AARCH64_LINUX +-IFUNC_OPTIONS = -march=armv8-a+lse + libatomic_la_LIBADD += $(foreach s,$(SIZES),$(addsuffix _$(s)_1_.lo,$(SIZEOBJS))) + endif + if ARCH_ARM_LINUX +diff --git a/libatomic/Makefile.in b/libatomic/Makefile.in +index a51807e95c9..97df2d7ff03 100644 +--- a/libatomic/Makefile.in ++++ b/libatomic/Makefile.in +@@ -431,7 +431,6 @@ M_SRC = $(firstword $(filter %/$(M_FILE), $(all_c_files))) + libatomic_la_LIBADD = $(foreach s,$(SIZES),$(addsuffix \ + _$(s)_.lo,$(SIZEOBJS))) $(am__append_1) $(am__append_2) \ + $(am__append_3) $(am__append_4) +-@ARCH_AARCH64_LINUX_TRUE@@HAVE_IFUNC_TRUE@IFUNC_OPTIONS = -march=armv8-a+lse + @ARCH_ARM_LINUX_TRUE@@HAVE_IFUNC_TRUE@IFUNC_OPTIONS = -march=armv7-a+fp -DHAVE_KERNEL64 + @ARCH_I386_TRUE@@HAVE_IFUNC_TRUE@IFUNC_OPTIONS = -march=i586 + @ARCH_X86_64_TRUE@@HAVE_IFUNC_TRUE@IFUNC_OPTIONS = -mcx16 |