diff options
author | Khem Raj <raj.khem@gmail.com> | 2020-05-14 10:30:10 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-05-15 16:31:45 +0100 |
commit | b6dc3c1d8c511f087bfc86699acec6aff6fe99b9 (patch) | |
tree | e9f9d209ddc0b764eb44c7b3909b201cd58827c2 | |
parent | 3799c960c24b2bed74320df9dc8525821c8e1477 (diff) | |
download | poky-b6dc3c1d8c511f087bfc86699acec6aff6fe99b9.tar.gz |
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>
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-10.1.inc | 3 | ||||
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-10.1/0038-Revert-AArch64-Use-__getauxval-instead-of-getauxval-.patch | 47 | ||||
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-10.1/0038-libatomic-Do-not-enforce-march-on-aarch64.patch (renamed from meta/recipes-devtools/gcc/gcc-10.1/0039-libatomic-Do-not-enforce-march-on-aarch64.patch) | 2 |
3 files changed, 2 insertions, 50 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-10.1.inc b/meta/recipes-devtools/gcc/gcc-10.1.inc index 82b5a20a42..041d426187 100644 --- a/meta/recipes-devtools/gcc/gcc-10.1.inc +++ b/meta/recipes-devtools/gcc/gcc-10.1.inc | |||
@@ -65,8 +65,7 @@ SRC_URI = "\ | |||
65 | file://0035-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch \ | 65 | file://0035-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch \ |
66 | file://0036-Enable-CET-in-cross-compiler-if-possible.patch \ | 66 | file://0036-Enable-CET-in-cross-compiler-if-possible.patch \ |
67 | file://0037-mingw32-Enable-operation_not_supported.patch \ | 67 | file://0037-mingw32-Enable-operation_not_supported.patch \ |
68 | file://0038-Revert-AArch64-Use-__getauxval-instead-of-getauxval-.patch \ | 68 | file://0038-libatomic-Do-not-enforce-march-on-aarch64.patch \ |
69 | file://0039-libatomic-Do-not-enforce-march-on-aarch64.patch \ | ||
70 | " | 69 | " |
71 | SRC_URI[sha256sum] = "b6898a23844b656f1b68691c5c012036c2e694ac4b53a8918d4712ad876e7ea2" | 70 | SRC_URI[sha256sum] = "b6898a23844b656f1b68691c5c012036c2e694ac4b53a8918d4712ad876e7ea2" |
72 | 71 | ||
diff --git a/meta/recipes-devtools/gcc/gcc-10.1/0038-Revert-AArch64-Use-__getauxval-instead-of-getauxval-.patch b/meta/recipes-devtools/gcc/gcc-10.1/0038-Revert-AArch64-Use-__getauxval-instead-of-getauxval-.patch deleted file mode 100644 index fc9228277a..0000000000 --- a/meta/recipes-devtools/gcc/gcc-10.1/0038-Revert-AArch64-Use-__getauxval-instead-of-getauxval-.patch +++ /dev/null | |||
@@ -1,47 +0,0 @@ | |||
1 | From 2101fb718935c7cf1cc2ad201bdeb1e635b54b0a Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 11 May 2020 11:03:41 -0700 | ||
4 | Subject: [PATCH] Revert "[AArch64] Use __getauxval instead of getauxval in LSE | ||
5 | detection code in libgcc" | ||
6 | |||
7 | This reverts commit 5a57016dd2758cc63a544f191f77635342397a72. | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | libgcc/config/aarch64/lse-init.c | 17 ++++++++--------- | ||
13 | 1 file changed, 8 insertions(+), 9 deletions(-) | ||
14 | |||
15 | diff --git a/libgcc/config/aarch64/lse-init.c b/libgcc/config/aarch64/lse-init.c | ||
16 | index 00e9ab8cd1c..74acef25cce 100644 | ||
17 | --- a/libgcc/config/aarch64/lse-init.c | ||
18 | +++ b/libgcc/config/aarch64/lse-init.c | ||
19 | @@ -29,20 +29,19 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see | ||
20 | _Bool __aarch64_have_lse_atomics | ||
21 | __attribute__((visibility("hidden"), nocommon)); | ||
22 | |||
23 | -/* Gate availability of __getauxval on glibc. All AArch64-supporting glibc | ||
24 | - versions support it. */ | ||
25 | -#ifdef __gnu_linux__ | ||
26 | +/* Disable initialization of __aarch64_have_lse_atomics during bootstrap. */ | ||
27 | +#if !defined(inhibit_libc) && defined(HAVE_SYS_AUXV_H) | ||
28 | +# include <sys/auxv.h> | ||
29 | |||
30 | -# define AT_HWCAP 16 | ||
31 | -# define HWCAP_ATOMICS (1 << 8) | ||
32 | - | ||
33 | -unsigned long int __getauxval (unsigned long int); | ||
34 | +/* Disable initialization if the system headers are too old. */ | ||
35 | +# if defined(AT_HWCAP) && defined(HWCAP_ATOMICS) | ||
36 | |||
37 | static void __attribute__((constructor)) | ||
38 | init_have_lse_atomics (void) | ||
39 | { | ||
40 | - unsigned long hwcap = __getauxval (AT_HWCAP); | ||
41 | + unsigned long hwcap = getauxval (AT_HWCAP); | ||
42 | __aarch64_have_lse_atomics = (hwcap & HWCAP_ATOMICS) != 0; | ||
43 | } | ||
44 | |||
45 | -#endif /* __gnu_linux__ */ | ||
46 | +# endif /* HWCAP */ | ||
47 | +#endif /* inhibit_libc */ | ||
diff --git a/meta/recipes-devtools/gcc/gcc-10.1/0039-libatomic-Do-not-enforce-march-on-aarch64.patch b/meta/recipes-devtools/gcc/gcc-10.1/0038-libatomic-Do-not-enforce-march-on-aarch64.patch index fecb562f51..3946acea11 100644 --- a/meta/recipes-devtools/gcc/gcc-10.1/0039-libatomic-Do-not-enforce-march-on-aarch64.patch +++ b/meta/recipes-devtools/gcc/gcc-10.1/0038-libatomic-Do-not-enforce-march-on-aarch64.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 411fc85c14bb14b07c0db807c55d25ce3f3e507f Mon Sep 17 00:00:00 2001 | 1 | From 38d262bfe7c0c894c364dc6e4dc7971e78a73974 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Wed, 13 May 2020 15:10:38 -0700 | 3 | Date: Wed, 13 May 2020 15:10:38 -0700 |
4 | Subject: [PATCH] libatomic: Do not enforce march on aarch64 | 4 | Subject: [PATCH] libatomic: Do not enforce march on aarch64 |