Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package binutils for openSUSE:Factory
checked in at 2022-08-13 22:36:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/binutils (Old)
and /work/SRC/openSUSE:Factory/.binutils.new.1521 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "binutils"
Sat Aug 13 22:36:31 2022 rev:159 rq:994281 version:2.39
Changes:
--------
--- /work/SRC/openSUSE:Factory/binutils/binutils.changes 2022-05-28
00:28:05.689652160 +0200
+++ /work/SRC/openSUSE:Factory/.binutils.new.1521/binutils.changes
2022-08-13 22:36:32.986626973 +0200
@@ -1,0 +2,46 @@
+Wed Aug 10 09:04:57 UTC 2022 - Martin Li??ka <mli...@suse.cz>
+
+- Rebase binutils-2.39-branch.diff.gz that contains fix for PR29451.
+
+-------------------------------------------------------------------
+Mon Aug 8 11:43:14 UTC 2022 - Martin Li??ka <mli...@suse.cz>
+
+- Add binutils-2.39-branch.diff.gz.
+- Explicitly enable --enable-warn-execstack=yes and
--enable-warn-rwx-segments=yes.
+- Add gprofng subpackage.
+
+-------------------------------------------------------------------
+Sat Aug 6 08:41:08 UTC 2022 - Martin Li??ka <mli...@suse.cz>
+
+- Update to binutils 2.39:
+ * The ELF linker will now generate a warning message if the stack is made
+ executable. Similarly it will warn if the output binary contains a
+ segment with all three of the read, write and execute permission
+ bits set. These warnings are intended to help developers identify
+ programs which might be vulnerable to attack via these executable
+ memory regions.
+ The warnings are enabled by default but can be disabled via a command
+ line option. It is also possible to build a linker with the warnings
+ disabled, should that be necessary.
+ * The ELF linker now supports a --package-metadata option that allows
+ embedding a JSON payload in accordance to the Package Metadata
+ specification.
+ * In linker scripts it is now possible to use TYPE=<type> in an output
+ section description to set the section type value.
+ * The objdump program now supports coloured/colored syntax
+ highlighting of its disassembler output for some architectures.
+ (Currently: AVR, RiscV, s390, x86, x86_64).
+ * The nm program now supports a --no-weak/-W option to make it ignore
+ weak symbols.
+ * The readelf and objdump programs now support a -wE option to prevent
+ them from attempting to access debuginfod servers when following
+ links.
+ * The objcopy program's --weaken, --weaken-symbol, and
+ --weaken-symbols options now works with unique symbols as well.
+- Rebase binutils-compat-old-behaviour.diff, binutils-revert-hlasm-insns.diff,
+ binutils-revert-plt32-in-branches.diff and remove
binutils-2.38-branch.diff.gz.
+- For now use --disable-gprofng.
+- Includes fixes for these CVEs:
+ bnc#1142579 aka CVE-2019-1010204 aka PR23765
+
+-------------------------------------------------------------------
Old:
----
binutils-2.38-branch.diff.gz
binutils-2.38.tar.bz2
binutils-2.38.tar.bz2.sig
New:
----
binutils-2.39-branch.diff.gz
binutils-2.39.tar.bz2
binutils-2.39.tar.bz2.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ binutils.spec ++++++
--- /var/tmp/diff_new_pack.QBo6vm/_old 2022-08-13 22:36:34.718631352 +0200
+++ /var/tmp/diff_new_pack.QBo6vm/_new 2022-08-13 22:36:34.722631362 +0200
@@ -61,7 +61,7 @@
%else
BuildRequires: zlib-devel
%endif
-Version: 2.38
+Version: 2.39
Release: 0
# disable libalternatives for now until it's changed to not
@@ -117,7 +117,7 @@
Source2: binutils-%{version}.tar.bz2.sig
Source3: binutils.keyring
Source4: baselibs.conf
-Patch1: binutils-2.38-branch.diff.gz
+Patch1: binutils-2.39-branch.diff.gz
Patch3: binutils-skip-rpaths.patch
Patch4: s390-biarch.diff
Patch5: x86-64-biarch.patch
@@ -204,6 +204,14 @@
This package includes the libctf-nobfd shared library.
The Compact C Type Format (CTF) is a way of representing information about a
binary program
+%package -n gprofng
+Summary: The next generation profiling tool for Linux
+License: GFDL-1.3-only AND GPL-3.0-or-later
+Group: Development/Tools/Building
+
+%description -n gprofng
+The next generation profiling tool for Linux
+
%ifarch %arm
%define HOST %{_target_cpu}-suse-linux-gnueabi
%else
@@ -313,6 +321,10 @@
# rebuilding the same archive from unchanged .o files recreates
# it, because timestamps in the .a are 0, unequal to the actual timestamp
# of the .o files :-/
+#
+# Enable the following 2 configure options explicitly
+# (--enable-warn-execstack=yes, --enable-warn-rwx-segments=yes)
+# as they are not enabled by default for some targets (and we use
--enable-targets=[many]).
%define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\
--prefix=%{_prefix} --libdir=%{_libdir} \\\
--infodir=%{_infodir} --mandir=%{_mandir} \\\
@@ -348,7 +360,12 @@
%if %{suse_version} > 1500
--enable-pgo-build=lto \
%endif
- --enable-obsolete
+%if %{suse_version} <= 1500
+ --disable-gprofng \
+%endif
+ --enable-obsolete \
+ --enable-warn-execstack=yes \
+ --enable-warn-rwx-segments=yes
# we patch headers (bfd-in.h) that are input to other headers
# which are generated only with --enable-maintainer-mode (which we
@@ -413,6 +430,7 @@
--disable-nls \
--enable-new-dtags \
--enable-obsolete \
+ --disable-gprofng \
%if %{suse_version} <= 1320
--disable-x86-relax-relocations \
%endif
@@ -670,6 +688,18 @@
%files -n libctf-nobfd0
%defattr(-,root,root)
%{_libdir}/libctf-nobfd.so.*
+
+%if %{suse_version} > 1500
+%ifarch %ix86 x86_64 aarch64
+%files -n gprofng
+%defattr(-,root,root)
+%dir %{_libdir}/gprofng/
+%{_libdir}/gprofng/lib*.so
+%{_libdir}/gprofng/lib*.so.*
+%{_distconfdir}/gprofng.rc
+%endif
+%endif
+
%endif
%changelog
++++++ binutils-2.38-branch.diff.gz -> binutils-2.39-branch.diff.gz ++++++
Binary files /work/SRC/openSUSE:Factory/binutils/binutils-2.38-branch.diff.gz
and /work/SRC/openSUSE:Factory/.binutils.new.1521/binutils-2.39-branch.diff.gz
differ
++++++ binutils-2.38.tar.bz2 -> binutils-2.39.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/binutils/binutils-2.38.tar.bz2
/work/SRC/openSUSE:Factory/.binutils.new.1521/binutils-2.39.tar.bz2 differ:
char 11, line 1
++++++ binutils-compat-old-behaviour.diff ++++++
--- /var/tmp/diff_new_pack.QBo6vm/_old 2022-08-13 22:36:34.834631645 +0200
+++ /var/tmp/diff_new_pack.QBo6vm/_new 2022-08-13 22:36:34.838631655 +0200
@@ -19,7 +19,7 @@
@@ -396,7 +396,7 @@ proc check_pr25749b {testname srcfilea srcfileb cflags
ldflags dsoldflags args}
[list \
"Build lib${testname}.so ($dsoldflags)" \
- "-shared $dsoldflags tmpdir/pr25749-bin.o" \
+ "-shared $dsoldflags tmpdir/pr25749-bin.o -z noexecstack" \
- "-fPIC -I../bfd" \
+ "-fPIC -I../bfd -Wa,-mrelax-relocations=yes" \
[list $srcfileb] \
++++++ binutils-revert-hlasm-insns.diff ++++++
--- /var/tmp/diff_new_pack.QBo6vm/_old 2022-08-13 22:36:34.862631715 +0200
+++ /var/tmp/diff_new_pack.QBo6vm/_new 2022-08-13 22:36:34.866631726 +0200
@@ -7,12 +7,17 @@
mnemonic (that's only a problem for jgnop vs brcl, but still).
So, just revert the whole commit.
+v2: this adjusts the reversion of above commit to care for commit
+0cfd6cffde32726ca69cde6ed3cc1ece21b9cf7c that changes the touched
+testcases so that it applies again, so it's not a simple revert of
+above commit anymore.
+
(We leave out the patch to ChangeLog in the reversion)
-diff --git a/gas/testsuite/gas/s390/esa-g5.d b/gas/testsuite/gas/s390/esa-g5.d
-index 67a971bef15..949ef141c1a 100644
---- a/gas/testsuite/gas/s390/esa-g5.d
-+++ b/gas/testsuite/gas/s390/esa-g5.d
+Index: binutils-2.38.50/gas/testsuite/gas/s390/esa-g5.d
+===================================================================
+--- binutils-2.38.50.orig/gas/testsuite/gas/s390/esa-g5.d 2022-05-13
17:56:05.000000000 +0200
++++ binutils-2.38.50/gas/testsuite/gas/s390/esa-g5.d 2022-05-13
17:56:06.000000000 +0200
@@ -78,14 +78,10 @@ Disassembly of section .text:
.*: 07 29 [ ]*bhr %r9
.*: 07 f9 [ ]*br %r9
@@ -109,10 +114,10 @@
.*: b2 21 bd 69 [ ]*ipte %r6,%r9,%r11,13
-.*: 07 07 [ ]*nopr %r7
+.*: 07 07 [ ]*nopr %r7
-diff --git a/gas/testsuite/gas/s390/esa-g5.s b/gas/testsuite/gas/s390/esa-g5.s
-index ee3d6319b19..c417b818add 100644
---- a/gas/testsuite/gas/s390/esa-g5.s
-+++ b/gas/testsuite/gas/s390/esa-g5.s
+Index: binutils-2.38.50/gas/testsuite/gas/s390/esa-g5.s
+===================================================================
+--- binutils-2.38.50.orig/gas/testsuite/gas/s390/esa-g5.s 2022-05-13
17:56:05.000000000 +0200
++++ binutils-2.38.50/gas/testsuite/gas/s390/esa-g5.s 2022-05-13
17:56:06.000000000 +0200
@@ -72,14 +72,10 @@ foo:
bpr %r9
br %r9
@@ -157,11 +162,11 @@
kdb %f6,4095(%r5,%r10)
kdbr %f6,%f9
keb %f6,4095(%r5,%r10)
-diff --git a/gas/testsuite/gas/s390/esa-z900.d
b/gas/testsuite/gas/s390/esa-z900.d
-index 42f408b624f..f6ff0812d89 100644
---- a/gas/testsuite/gas/s390/esa-z900.d
-+++ b/gas/testsuite/gas/s390/esa-z900.d
-@@ -6,52 +6,29 @@
+Index: binutils-2.38.50/gas/testsuite/gas/s390/esa-z900.d
+===================================================================
+--- binutils-2.38.50.orig/gas/testsuite/gas/s390/esa-z900.d 2022-05-13
17:56:05.000000000 +0200
++++ binutils-2.38.50/gas/testsuite/gas/s390/esa-z900.d 2022-05-13
18:07:33.000000000 +0200
+@@ -6,56 +6,31 @@
Disassembly of section .text:
.* <foo>:
@@ -211,6 +216,10 @@
-.*: c0 f4 00 00 00 00 [ ]*jg 102 <foo\+0x102>
-.*: c0 65 00 00 00 00 [ ]*brasl %r6,108 <foo\+0x108>
-.*: c0 65 00 00 00 00 [ ]*brasl %r6,10e <foo\+0x10e>
+-.*: c0 65 80 00 00 00 [ ]*brasl %r6,114 <foo\+0x114>
+-.*: c0 65 80 00 00 00 [ ]*brasl %r6,11a <foo\+0x11a>
+-.*: c0 65 7f ff ff ff [ ]*brasl %r6,11e <foo\+0x11e>
+-.*: c0 65 7f ff ff ff [ ]*brasl %r6,124 <foo\+0x124>
+.*: c0 f4 00 00 00 00 [ ]*jg 0 \<foo\>
+.*: c0 14 00 00 00 00 [ ]*jgo 6 \<foo\+0x6>
+.*: c0 24 00 00 00 00 [ ]*jgh c \<foo\+0xc>
@@ -234,27 +243,29 @@
+.*: c0 e4 00 00 00 00 [ ]*jgno 78 \<foo\+0x78>
+.*: c0 f4 00 00 00 00 [ ]*jg 7e \<foo\+0x7e>
+.*: c0 65 00 00 00 00 [ ]*brasl %r6,84 \<foo\+0x84>
++.*: c0 65 80 00 00 00 [ ]*brasl %r6,8a <foo\+0x8a>
++.*: c0 65 7f ff ff ff [ ]*brasl %r6,8e <foo\+0x8e>
.*: 01 0b [ ]*tam
.*: 01 0c [ ]*sam24
.*: 01 0d [ ]*sam31
-@@ -62,7 +39,7 @@ Disassembly of section .text:
+@@ -66,7 +41,7 @@ Disassembly of section .text:
.*: b9 97 00 69 [ ]*dlr %r6,%r9
.*: b9 98 00 69 [ ]*alcr %r6,%r9
.*: b9 99 00 69 [ ]*slbr %r6,%r9
--.*: c0 60 00 00 00 00 [ ]*larl %r6,136 <foo\+0x136>
-+.*: c0 60 00 00 00 00 [ ]*larl %r6,ac \<foo\+0xac\>
+-.*: c0 60 00 00 00 00 [ ]*larl %r6,14e <foo\+0x14e>
++.*: c0 60 00 00 00 00 [ ]*larl %r6,b8 <foo\+0xb8>
.*: e3 65 af ff 00 1e [ ]*lrv %r6,4095\(%r5,%r10\)
.*: e3 65 af ff 00 1f [ ]*lrvh %r6,4095\(%r5,%r10\)
.*: e3 65 af ff 00 3e [ ]*strv %r6,4095\(%r5,%r10\)
-@@ -72,4 +49,3 @@ Disassembly of section .text:
+@@ -76,4 +51,3 @@ Disassembly of section .text:
.*: e3 65 af ff 00 98 [ ]*alc %r6,4095\(%r5,%r10\)
.*: e3 65 af ff 00 99 [ ]*slb %r6,4095\(%r5,%r10\)
.*: eb 69 5f ff 00 1d [ ]*rll %r6,%r9,4095\(%r5\)
-.*: 07 07 [ ]*nopr %r7
-diff --git a/gas/testsuite/gas/s390/esa-z900.s
b/gas/testsuite/gas/s390/esa-z900.s
-index 7a006168f9e..815732df37c 100644
---- a/gas/testsuite/gas/s390/esa-z900.s
-+++ b/gas/testsuite/gas/s390/esa-z900.s
+Index: binutils-2.38.50/gas/testsuite/gas/s390/esa-z900.s
+===================================================================
+--- binutils-2.38.50.orig/gas/testsuite/gas/s390/esa-z900.s 2022-05-13
17:56:05.000000000 +0200
++++ binutils-2.38.50/gas/testsuite/gas/s390/esa-z900.s 2022-05-13
17:57:59.000000000 +0200
@@ -1,7 +1,6 @@
.text
foo:
@@ -263,7 +274,7 @@
jgo .
jgh .
jgp .
-@@ -23,29 +22,7 @@ foo:
+@@ -23,33 +22,9 @@ foo:
jgnp .
jgno .
jg .
@@ -290,13 +301,17 @@
- brul .
brasl %r6,.
- jasl %r6,.
+ brasl %r6,.-0x100000000
+- jasl %r6,.-0x100000000
+ brasl %r6,.+0xfffffffe
+- jasl %r6,.+0xfffffffe
tam
sam24
sam31
-diff --git a/gas/testsuite/gas/s390/zarch-z900.d
b/gas/testsuite/gas/s390/zarch-z900.d
-index 8d292dfc11b..8491a8f4e7a 100644
---- a/gas/testsuite/gas/s390/zarch-z900.d
-+++ b/gas/testsuite/gas/s390/zarch-z900.d
+Index: binutils-2.38.50/gas/testsuite/gas/s390/zarch-z900.d
+===================================================================
+--- binutils-2.38.50.orig/gas/testsuite/gas/s390/zarch-z900.d 2022-05-13
17:56:05.000000000 +0200
++++ binutils-2.38.50/gas/testsuite/gas/s390/zarch-z900.d 2022-05-13
17:56:06.000000000 +0200
@@ -20,11 +20,8 @@ Disassembly of section .text:
.*: e3 95 af ff 00 46 [ ]*bctg %r9,4095\(%r5,%r10\)
.*: b9 46 00 96 [ ]*bctgr %r9,%r6
@@ -311,10 +326,10 @@
.*: eb 96 5f ff 00 44 [ ]*bxhg %r9,%r6,4095\(%r5\)
.*: eb 96 5f ff 00 45 [ ]*bxleg %r9,%r6,4095\(%r5\)
.*: b3 a5 00 96 [ ]*cdgbr %f9,%r6
-diff --git a/gas/testsuite/gas/s390/zarch-z900.s
b/gas/testsuite/gas/s390/zarch-z900.s
-index 96d27e7b7e2..a175cca2f4f 100644
---- a/gas/testsuite/gas/s390/zarch-z900.s
-+++ b/gas/testsuite/gas/s390/zarch-z900.s
+Index: binutils-2.38.50/gas/testsuite/gas/s390/zarch-z900.s
+===================================================================
+--- binutils-2.38.50.orig/gas/testsuite/gas/s390/zarch-z900.s 2022-05-13
17:56:05.000000000 +0200
++++ binutils-2.38.50/gas/testsuite/gas/s390/zarch-z900.s 2022-05-13
17:56:06.000000000 +0200
@@ -14,11 +14,8 @@ foo:
bctg %r9,4095(%r5,%r10)
bctgr %r9,%r6
@@ -327,10 +342,10 @@
bxhg %r9,%r6,4095(%r5)
bxleg %r9,%r6,4095(%r5)
cdgbr %f9,%r6
-diff --git a/ld/testsuite/ld-s390/tlsbin_64.dd
b/ld/testsuite/ld-s390/tlsbin_64.dd
-index d2aa851af46..b984c5719c9 100644
---- a/ld/testsuite/ld-s390/tlsbin_64.dd
-+++ b/ld/testsuite/ld-s390/tlsbin_64.dd
+Index: binutils-2.38.50/ld/testsuite/ld-s390/tlsbin_64.dd
+===================================================================
+--- binutils-2.38.50.orig/ld/testsuite/ld-s390/tlsbin_64.dd 2022-05-13
17:56:05.000000000 +0200
++++ binutils-2.38.50/ld/testsuite/ld-s390/tlsbin_64.dd 2022-05-13
17:56:06.000000000 +0200
@@ -87,26 +87,26 @@ Disassembly of section .text:
+[0-9a-f]+: 41 22 90 00 la %r2,0\(%r2,%r9\)
# GD -> LE with global variable defined in executable
@@ -363,11 +378,11 @@
+[0-9a-f]+: 41 32 90 00 la %r3,0\(%r2,%r9\)
+[0-9a-f]+: e3 40 d0 48 00 04 lg %r4,72\(%r13\)
+[0-9a-f]+: 41 54 30 00 la %r5,0\(%r4,%r3\)
-diff --git a/opcodes/s390-opc.txt b/opcodes/s390-opc.txt
-index d84f9f798a4..33dbeb38249 100644
---- a/opcodes/s390-opc.txt
-+++ b/opcodes/s390-opc.txt
-@@ -246,14 +246,10 @@ d7 xc SS_L0RDRD "exclusive OR" g5 esa,zarch
+Index: binutils-2.38.50/opcodes/s390-opc.txt
+===================================================================
+--- binutils-2.38.50.orig/opcodes/s390-opc.txt 2022-05-13 17:56:05.000000000
+0200
++++ binutils-2.38.50/opcodes/s390-opc.txt 2022-05-13 17:56:06.000000000
+0200
+@@ -246,14 +246,10 @@ d7 xc SS_L0RDRD "exclusive OR" g5 esa,za
f8 zap SS_LLRDRD "zero and add" g5 esa,zarch
a70a ahi RI_RI "add halfword immediate" g5 esa,zarch
84 brxh RSI_RRP "branch relative on index high" g5 esa,zarch
@@ -382,7 +397,7 @@
b241 cksm RRE_RR "checksum" g5 esa,zarch
a70e chi RI_RI "compare halfword immediate" g5 esa,zarch
a9 clcle RS_RRRD "compare logical long extended" g5 esa,zarch
-@@ -272,11 +268,8 @@ a701 tml RI_RU "test under mask low" g5 esa,zarch
+@@ -272,11 +268,8 @@ a701 tml RI_RU "test under mask low" g5
4700 nop RX_0RRD "no operation" g5 esa,zarch optparm
4700 b*8 RX_0RRD "conditional branch" g5 esa,zarch
47f0 b RX_0RRD "unconditional branch" g5 esa,zarch
@@ -394,7 +409,7 @@
b34a axbr RRE_FEFE "add extended bfp" g5 esa,zarch
b31a adbr RRE_FF "add long bfp" g5 esa,zarch
ed000000001a adb RXE_FRRD "add long bfp" g5 esa,zarch
-@@ -444,9 +437,7 @@ e3000000001b slgf RXE_RRRD "subtract logical 64<32" z900
zarch
+@@ -444,9 +437,7 @@ e3000000001b slgf RXE_RRRD "subtract log
e3000000000c msg RXE_RRRD "multiply single 64" z900 zarch
e3000000001c msgf RXE_RRRD "multiply single 64<32" z900 zarch
ec0000000044 brxhg RIE_RRP "branch relative on index high 64" z900 zarch
@@ -404,7 +419,7 @@
eb0000000044 bxhg RSE_RRRD "branch on index high 64" z900 zarch
eb0000000045 bxleg RSE_RRRD "branch on index low or equal 64" z900 zarch
eb000000000c srlg RSE_RRRD "shift right single logical 64" z900 zarch
-@@ -471,15 +462,10 @@ eb0000000080 icmh RSE_RURD "insert characters under mask
high" z900 zarch
+@@ -471,15 +462,10 @@ eb0000000080 icmh RSE_RURD "insert chara
a702 tmhh RI_RU "test under mask high high" z900 zarch
a703 tmhl RI_RU "test under mask high low" z900 zarch
c004 brcl RIL_UP "branch relative on condition long" z900 esa,zarch
++++++ binutils-revert-plt32-in-branches.diff ++++++
--- /var/tmp/diff_new_pack.QBo6vm/_old 2022-08-13 22:36:34.878631756 +0200
+++ /var/tmp/diff_new_pack.QBo6vm/_new 2022-08-13 22:36:34.882631766 +0200
@@ -279,7 +279,7 @@
+[ ]*[a-f0-9]+: 66 e8 00 00 00 00 data16 call (0x)?2a <.*>
26: R_X86_64_PC32 foo-0x4
+[ ]*[a-f0-9]+: 66 e9 00 00 00 00 data16 jmp (0x)?30 <.*> 2c:
R_X86_64_PC32 foo-0x4
+[ ]*[a-f0-9]+: 66 0f 82 00 00 00 00 data16 jb (0x)?37 <.*> 33:
R_X86_64_PC32 foo-0x4
- [ ]*[a-f0-9]+: 66 c3 data16 ret *
+ [ ]*[a-f0-9]+: 66 c3 data16 ret
[ ]*[a-f0-9]+: 66 c2 08 00 data16 ret \$0x8
[ ]*[a-f0-9]+: 3e 74 03[ ]+je,pt +[0-9a-fx]+ <.*>
diff --git a/gas/testsuite/gas/i386/reloc64.d
b/gas/testsuite/gas/i386/reloc64.d
@@ -311,7 +311,7 @@
[ ]*[a-f0-9]+: 66 e8 00 00 callw 11 <bar\+0x6> f:
R_X86_64_PC16 foo-0x2
-[ ]*[a-f0-9]+: 66 48 e8 00 00 00 00 data16 rex\.W call 18
<bar\+0xd> 14: R_X86_64_PLT32 foo-0x4
+[ ]*[a-f0-9]+: 66 48 e8 00 00 00 00 data16 rex\.W call 18
<bar\+0xd> 14: R_X86_64_PC32 foo-0x4
- [ ]*[a-f0-9]+: 66 c3 retw *
+ [ ]*[a-f0-9]+: 66 c3 retw
[ ]*[a-f0-9]+: 66 c2 08 00 retw \$0x8
#pass
diff --git a/gas/testsuite/gas/i386/x86-64-jump.d
b/gas/testsuite/gas/i386/x86-64-jump.d
@@ -407,7 +407,7 @@
+[ ]*[a-f0-9]+: e9 00 00 00 00 jmp 22 <hidden_def> 1e:
R_X86_64_PC32 hidden_undef-0x4
0+22 <hidden_def>:
- [ ]*[a-f0-9]+: c3 ret *
+ [ ]*[a-f0-9]+: c3 ret
diff --git a/gas/testsuite/gas/i386/x86-64-relax-3.d
b/gas/testsuite/gas/i386/x86-64-relax-3.d
index 01df9ef340e..d16e6a55395 100644
--- a/gas/testsuite/gas/i386/x86-64-relax-3.d
@@ -426,7 +426,7 @@
+[ ]*[a-f0-9]+: e9 00 00 00 00 jmp 1f <hidden_def> 1b:
R_X86_64_PC32 hidden_undef-0x4
0+1f <hidden_def>:
- [ ]*[a-f0-9]+: c3 ret *
+ [ ]*[a-f0-9]+: c3 ret
diff --git a/ld/testsuite/ld-x86-64/mpx1c.rd b/ld/testsuite/ld-x86-64/mpx1c.rd
index d66524c8834..d3b292cbdc1 100644
--- a/ld/testsuite/ld-x86-64/mpx1c.rd
@@ -459,13 +459,14 @@
index 9751db49aa5..00000000000
--- a/ld/testsuite/ld-x86-64/pr22791-1b.s
+++ /dev/null
-@@ -1,6 +0,0 @@
+@@ -1,7 +0,0 @@
- .text
- .globl main
- .type main, @function
-main:
- movl foo(%rip), %eax
- .size main, .-main
+- .section .note.GNU-stack
diff --git a/ld/testsuite/ld-x86-64/pr22791-2.rd
b/ld/testsuite/ld-x86-64/pr22791-2.rd
deleted file mode 100644
index 70deb30d84d..00000000000
