Revert fix for PR 23161 which was placing unversioned section symbols (_edata, _end, __bss_start) into shared libraries.

Resolves: #1599521
This commit is contained in:
Nick Clifton 2018-07-10 12:28:40 +01:00
parent f0cd52938b
commit 57a0cd3028
2 changed files with 36 additions and 2 deletions

View File

@ -0,0 +1,25 @@
diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc
index 444aef2942..8a3858d32b 100644
--- a/ld/scripttempl/elf.sc
+++ b/ld/scripttempl/elf.sc
@@ -637,9 +637,9 @@ cat <<EOF
${SDATA_GOT+${OTHER_GOT_SECTIONS}}
${DATA_SDATA-${SDATA}}
${DATA_SDATA-${OTHER_SDATA_SECTIONS}}
- ${RELOCATING+${DATA_END_SYMBOLS-${CREATE_SHLIB+PROVIDE (}${USER_LABEL_PREFIX}_edata = .${CREATE_SHLIB+)}; PROVIDE (${USER_LABEL_PREFIX}edata = .);}}
+ ${RELOCATING+${DATA_END_SYMBOLS-${USER_LABEL_PREFIX}_edata = .; PROVIDE (${USER_LABEL_PREFIX}edata = .);}}
${RELOCATING+. = .;}
- ${RELOCATING+${CREATE_SHLIB+PROVIDE (}${USER_LABEL_PREFIX}__bss_start = .${CREATE_SHLIB+)};}
+ ${RELOCATING+${USER_LABEL_PREFIX}__bss_start = .;}
${RELOCATING+${OTHER_BSS_SYMBOLS}}
${DATA_SDATA-${SBSS}}
${BSS_PLT+${PLT}}
@@ -672,7 +672,7 @@ cat <<EOF
${LARGE_BSS_AFTER_BSS-${LARGE_BSS}}
${RELOCATING+. = ALIGN(${ALIGNMENT});}
${RELOCATING+${OTHER_END_SYMBOLS}}
- ${RELOCATING+${END_SYMBOLS-${CREATE_SHLIB+PROVIDE (}${USER_LABEL_PREFIX}_end = .${CREATE_SHLIB+)}; PROVIDE (${USER_LABEL_PREFIX}end = .);}}
+ ${RELOCATING+${END_SYMBOLS-${USER_LABEL_PREFIX}_end = .; PROVIDE (${USER_LABEL_PREFIX}end = .);}}
${RELOCATING+${DATA_SEGMENT_END}}
${TINY_DATA_SECTION}
${TINY_BSS_SECTION}

View File

@ -69,7 +69,7 @@
Summary: A GNU collection of binary utilities Summary: A GNU collection of binary utilities
Name: %{?cross}binutils%{?_with_debug:-debug} Name: %{?cross}binutils%{?_with_debug:-debug}
Version: 2.30.90 Version: 2.30.90
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv3+ License: GPLv3+
URL: https://sourceware.org/binutils URL: https://sourceware.org/binutils
@ -155,6 +155,11 @@ Patch09: binutils-2.27-aarch64-ifunc.patch
# Lifetime: Fixed in 2.32 (probably) # Lifetime: Fixed in 2.32 (probably)
Patch10: binutils-fix-testsuite-failures.patch Patch10: binutils-fix-testsuite-failures.patch
# Purpose: Revert fix for PR 23161 which was placing unversioned section
# symbols (_edata, _end, __bss_start) into shared libraries.
# Lifetime: Fixed in 2.32 (maybe)
Patch11: binutils-do-not-provide-shared-section-symbols.patch
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
Provides: bundled(libiberty) Provides: bundled(libiberty)
@ -289,6 +294,7 @@ using libelf instead of BFD.
%patch08 -p1 %patch08 -p1
%patch09 -p1 %patch09 -p1
%patch10 -p1 %patch10 -p1
%patch11 -p1
# We cannot run autotools as there is an exact requirement of autoconf-2.59. # We cannot run autotools as there is an exact requirement of autoconf-2.59.
@ -696,7 +702,10 @@ exit 0
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
%changelog %changelog
* Mon Jul 9 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2.30.90-1 * Tue Jul 10 2018 Nick Clifton <nickc@redhat.com> 2.30.90-2
- Revert fix for PR 23161 which was placing unversioned section symbols (_edata, _end, __bss_start) into shared libraries. (#1599521)
* Mon Jul 9 2018 Nick Clifton <nickc@redhat.com> 2.30.90-1
- Rebase to a snapshot of the soon-to-be-created 2.31 FSF release. - Rebase to a snapshot of the soon-to-be-created 2.31 FSF release.
* Fri Jul 6 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2.30-26 * Fri Jul 6 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2.30-26