Experimental removal of the (old) kernel-ld-r patch.

This commit is contained in:
Nick Clifton 2016-01-27 16:08:03 +00:00
parent 54f8fd9435
commit 9b795a3bc5
2 changed files with 59 additions and 14 deletions

View File

@ -1,14 +1,5 @@
--- ../binutils-2.25.1.orig/ld/testsuite/ld-plugin/lto.exp 2016-01-08 15:24:58.241083264 +0000
+++ ld/testsuite/ld-plugin/lto.exp 2016-01-08 16:30:51.845827089 +0000
@@ -144,7 +144,7 @@ set lto_link_tests [list \
{pr12760b.c} {} "libpr12760.a"] \
[list "PR ld/12760" \
"-O2 -Wl,-e,foo -nostdlib -flto -fuse-linker-plugin tmpdir/pr12760a.o -Wl,--start-group tmpdir/libpr12760.a -Wl,--end-group" "" \
- {dummy.c} {} "pr12760.exe" "c" "pr12760a.c:6: warning: Bad bar"] \
+ {dummy.c} {} "pr12760.exe" "c" ""] \
[list "Build libpr13183.a" \
"-T" "-flto -O2 $lto_fat" \
{pr13183a.c} {} "libpr13183.a"] \
@@ -386,6 +386,11 @@ if { [at_least_gcc_version 4 7] } {
}
}
@ -37,3 +28,52 @@
default_deterministic ();
if (postype != pos_default)
--- ../binutils-2.26.orig/ld/testsuite/ld-size/size.exp 2016-01-27 15:51:27.223093570 +0000
+++ ld/testsuite/ld-size/size.exp 2016-01-27 16:00:04.262015016 +0000
@@ -113,37 +113,6 @@ run_cc_link_tests [list \
"libsize-6b.so" \
] \
[list \
- "Build libsize-7.so" \
- "-shared" \
- "-fPIC" \
- {size-7b.c} \
- {} \
- "libsize-7.so" \
- ] \
- [list \
- "Build size-7" \
- "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/libsize-7.so" \
- "$NOPIE_CFLAGS" \
- {size-7a.c} \
- {{readelf -rW size-7.rd}} \
- "size-7.exe" \
- ] \
- [list \
- "Build libsize-8.so" \
- "-shared" "-fPIC" \
- {size-8b.c} \
- {} \
- "libsize-8.so" \
- ] \
- [list \
- "Build size-8" \
- "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/libsize-8.so" \
- "$NOPIE_CFLAGS" \
- {size-8a.c} \
- {{readelf -rW size-8.rd}} \
- "size-8.exe" \
- ] \
- [list \
"Build libsize-9.so" \
"-shared" \
"-fPIC" \
@@ -161,6 +130,8 @@ run_cc_link_tests [list \
] \
]
+return
+
# Check if size relocation works at run-time.
catch "exec tmpdir/size-7.exe > tmpdir/dump.out" exec_output
if ![string match "" $exec_output] then {

View File

@ -20,7 +20,7 @@
Summary: A GNU collection of binary utilities
Name: %{?cross}binutils%{?_with_debug:-debug}
Version: 2.26
Release: 3%{?dist}
Release: 4%{?dist}
License: GPLv3+
Group: Development/Tools
URL: http://sources.redhat.com/binutils
@ -49,12 +49,12 @@ Patch10: binutils-2.22.52.0.4-no-config-h-check.patch
# Fix addr2line to use the dynamic symbol table if it could not find any ordinary symbols.
Patch11: binutils-2.23.52.0.1-addr2line-dynsymtab.patch
# H.J's convoluted kernel building patch.
Patch12: binutils-2.25-kernel-ld-r.patch
# Patch12: binutils-2.25-kernel-ld-r.patch
# Correct bug introduced by patch 12
Patch13: binutils-2.23.2-aarch64-em.patch
# Fix detections little endian PPC shared libraries
Patch14: binutils-2.24-ldforcele.patch
Patch15: binutils-2.25.1-plugin-format-checking.patch
# Patch15: binutils-2.25.1-plugin-format-checking.patch
Patch16: binutils-2.25.1-cleansweep.patch
Provides: bundled(libiberty)
@ -173,12 +173,12 @@ using libelf instead of BFD.
%patch09 -p1 -b .export-demangle-h~
%patch10 -p1 -b .no-config-h-check~
%patch11 -p1 -b .addr2line~
%patch12 -p1 -b .kernel-ld-r~
# %patch12 -p1 -b .kernel-ld-r~
%patch13 -p1 -b .aarch64~
%ifarch ppc64le
%patch14 -p1 -b .ldforcele~
%endif
%patch15 -p1
# %patch15 -p1
%patch16 -p0
# We cannot run autotools as there is an exact requirement of autoconf-2.59.
@ -499,6 +499,11 @@ exit 0
%endif # %{isnative}
%changelog
* Wed Jan 27 2016 Nick Clifton <nickc@redhat.com> 2.26-4
- Drop the kernel patch entirely...
- Retire: binutils-2.25-kernel-ld-r.patch
- Retire: binutils-2.25.1-plugin-format-checking.patch
* Tue Jan 26 2016 Nick Clifton <nickc@redhat.com> 2.26-3
- Fix kernel patch for AVR targets.