diff --git a/binutils.changes b/binutils.changes index c23433c..b43968a 100644 --- a/binutils.changes +++ b/binutils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Nov 20 14:59:28 UTC 2024 - Jiri Slaby + +- drop ld-relro.diff (relro is the default for some time) + and it warns on avr spuriously (bsc#1233520) + ------------------------------------------------------------------- Tue Sep 10 05:25:27 UTC 2024 - Martin Liška diff --git a/binutils.spec b/binutils.spec index e0bac3f..e61c95f 100644 --- a/binutils.spec +++ b/binutils.spec @@ -136,7 +136,6 @@ Patch3: binutils-skip-rpaths.patch Patch4: s390-biarch.diff Patch5: x86-64-biarch.patch Patch6: unit-at-a-time.patch -Patch8: ld-relro.diff Patch9: testsuite.diff Patch10: enable-targets-gold.diff Patch12: s390-pic-dso.diff @@ -257,7 +256,6 @@ cp ld/ldgram.y ld/ldgram.y.orig %patch -P 4 %patch -P 5 %patch -P 6 -%patch -P 8 %patch -P 9 %patch -P 10 %patch -P 12 diff --git a/ld-relro.diff b/ld-relro.diff deleted file mode 100644 index 23e727b..0000000 --- a/ld-relro.diff +++ /dev/null @@ -1,63 +0,0 @@ -Index: ld/lexsup.c -=================================================================== ---- ld/lexsup.c.orig 2024-08-04 01:00:00.000000000 +0200 -+++ ld/lexsup.c 2024-08-06 16:02:35.554864901 +0200 -@@ -772,6 +772,9 @@ parse_args (unsigned argc, char **argv) - } - } - -+ optarg = "relro"; -+ ldemul_handle_option ('z'); -+ - last_optind = -1; - while (1) - { -Index: ld/testsuite/config/default.exp -=================================================================== ---- ld/testsuite/config/default.exp.orig 2024-08-04 01:00:00.000000000 +0200 -+++ ld/testsuite/config/default.exp 2024-08-06 16:05:13.860859897 +0200 -@@ -39,7 +39,7 @@ if [info exists env(LD_UNDER_TEST)] { - } - - if ![info exists ld] then { -- set ld [findfile $base_dir/ld-new $base_dir/ld-new [transform ld]] -+ set ld "[findfile $base_dir/ld-new $base_dir/ld-new [transform ld]] -znorelro" - } - - if ![info exists as] then { -@@ -92,7 +92,7 @@ if {[info exists ld_testsuite_bindir]} { - } - catch "exec ln -s ld tmpdir/ld/collect-ld" status - catch "exec ln -s ../../../gas/as-new tmpdir/ld/as" status -- set gcc_B_opt "-B[pwd]/tmpdir/ld/" -+ set gcc_B_opt "-B[pwd]/tmpdir/ld/ -Wl,-z,norelro" - } - - # load the linker path -@@ -343,7 +343,7 @@ if ![info exists ELFEDIT] then { - } - - if ![info exists LD] then { -- set LD [findfile $base_dir/ld-new ./ld-new [transform ld]] -+ set LD "[findfile $base_dir/ld-new ./ld-new [transform ld]] -znorelro" - } - - if ![info exists LDFLAGS] then { -Index: ld/testsuite/ld-bootstrap/bootstrap.exp -=================================================================== ---- ld/testsuite/ld-bootstrap/bootstrap.exp.orig 2024-08-04 01:00:00.000000000 +0200 -+++ ld/testsuite/ld-bootstrap/bootstrap.exp 2024-08-06 16:02:35.554864901 +0200 -@@ -112,7 +112,12 @@ foreach flags $test_flags { - - # This test can only be run if we have the ld build directory, - # since we need the object files. -- if {[file normalize $ld] != [file normalize $objdir/ld-new]} { -+ set ldexe $ld -+ set ldparm [string first " " $ld] -+ if { $ldparm > 0 } then { -+ set ldexe [string range $ld 0 $ldparm] -+ } -+ if {[file normalize $ldexe] != [file normalize $objdir/ld-new]} { - untested $testname - continue - }