gcc: Drop reverting __getauxval patch

Issue has been fixed in valgrind itself

(From OE-Core rev: c4070f3d76e0170cf6ee672a8a9a38e4cdbbcad9)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
2020-05-14 10:30:10 -07:00
committed by Richard Purdie
parent 3799c960c2
commit b6dc3c1d8c
3 changed files with 2 additions and 50 deletions

View File

@@ -65,8 +65,7 @@ SRC_URI = "\
file://0035-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch \
file://0036-Enable-CET-in-cross-compiler-if-possible.patch \
file://0037-mingw32-Enable-operation_not_supported.patch \
file://0038-Revert-AArch64-Use-__getauxval-instead-of-getauxval-.patch \
file://0039-libatomic-Do-not-enforce-march-on-aarch64.patch \
file://0038-libatomic-Do-not-enforce-march-on-aarch64.patch \
"
SRC_URI[sha256sum] = "b6898a23844b656f1b68691c5c012036c2e694ac4b53a8918d4712ad876e7ea2"

View File

@@ -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 */

View File

@@ -1,4 +1,4 @@
From 411fc85c14bb14b07c0db807c55d25ce3f3e507f Mon Sep 17 00:00:00 2001
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