diff options
| author | Aurelien Jarno <aurelien@aurel32.net> | 2020-02-10 21:12:13 +0100 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2020-02-10 23:19:47 +0100 |
| commit | 7b0e84212c04ecd3a752eb48f80a477ddf2717d4 (patch) | |
| tree | 41c65dd8b1ca43cc8613632c621ffa0b13fb6f35 | |
| parent | 427836f3b97fc8b2b489f25463e1d8f8ef812b5d (diff) | |
debian/patches/any/submitted-stt-gnu-ifunc-detection.patch: update to version 2 of the patch to fix the wrong detection on sparc.
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/patches/any/submitted-stt-gnu-ifunc-detection.patch | 23 |
2 files changed, 15 insertions, 10 deletions
diff --git a/debian/changelog b/debian/changelog index 99a0812a..c4394af7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,8 @@ glibc (2.30-0experimental3) UNRELEASED; urgency=medium [ Aurelien Jarno ] * debian/patches/any/local-revert-24323.diff: drop, obsolete. * debian/control.in/libc: add a Breaks: against wcc (<< 0.0.2+dfsg-3). + * debian/patches/any/submitted-stt-gnu-ifunc-detection.patch: update to + version 2 of the patch to fix the wrong detection on sparc. -- Samuel Thibault <sthibault@debian.org> Sat, 08 Feb 2020 03:08:56 +0100 diff --git a/debian/patches/any/submitted-stt-gnu-ifunc-detection.patch b/debian/patches/any/submitted-stt-gnu-ifunc-detection.patch index b8480899..541b902f 100644 --- a/debian/patches/any/submitted-stt-gnu-ifunc-detection.patch +++ b/debian/patches/any/submitted-stt-gnu-ifunc-detection.patch @@ -1,12 +1,15 @@ -commit 8f923e75945a6e829d5640ac412b5e9555e5ef9c -Author: Fangrui Song <maskray@google.com> -Date: Tue Feb 4 22:09:22 2020 -0800 +From 624b3a0c9e4f2f421227bb3f331723dfe807f157 Mon Sep 17 00:00:00 2001 +From: Fangrui Song <maskray@google.com> +Date: Tue, 4 Feb 2020 21:55:44 -0800 +Subject: [PATCH] Improve IFUNC check [BZ #25506] - Improve IFUNC check - - GNU ld's RISCV port does not support IFUNC. ld -no-pie produces no - relocation and the test passed incorrectly. Be more rigid by testing - IRELATIVE explicitly. +GNU ld does not support IFUNC but does not produces a relocation. +The test passed incorrectly. Be more rigid by testing IRELATIVE +explicitly. +--- + configure | 2 +- + configure.ac | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) --- a/configure +++ b/configure @@ -15,7 +18,7 @@ Date: Tue Feb 4 22:09:22 2020 -0800 # Do a link to see if the backend supports IFUNC relocs. $READELF -r conftest 1>&5 - LC_ALL=C $READELF -r conftest | grep 'no relocations' >/dev/null || { -+ LC_ALL=C $READELF -Wr conftest | grep -q IRELATIVE && { ++ LC_ALL=C $READELF -Wr conftest | grep -q 'IRELATIVE\|R_SPARC_JMP_IREL' && { libc_cv_ld_gnu_indirect_function=yes } fi @@ -26,7 +29,7 @@ Date: Tue Feb 4 22:09:22 2020 -0800 # Do a link to see if the backend supports IFUNC relocs. $READELF -r conftest 1>&AS_MESSAGE_LOG_FD - LC_ALL=C $READELF -r conftest | grep 'no relocations' >/dev/null || { -+ LC_ALL=C $READELF -Wr conftest | grep -q IRELATIVE && { ++ LC_ALL=C $READELF -Wr conftest | grep -q 'IRELATIVE\|R_SPARC_JMP_IREL' && { libc_cv_ld_gnu_indirect_function=yes } fi |