90f5896dac
- Retire: binutils-2.36-branch-updates.patch - Retire: binutils-CVE-2021-20197.patch - Retire: binutils-CVE-2021-3530.patch - Retire: binutils-plugin-file-descriptors.patch - Retire: binutils-ppc-weak-undefined-plt-relocs.patch - Retire: binutils-ppc64le-note-merge.patch - Retire: binutils-s390-arch14-insns.patch
500 lines
26 KiB
Diff
500 lines
26 KiB
Diff
diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-10.d binutils-2.36.1/ld/testsuite/ld-plugin/plugin-10.d
|
|
--- binutils.orig/ld/testsuite/ld-plugin/plugin-10.d 2021-02-12 10:13:11.116049499 +0000
|
|
+++ binutils-2.36.1/ld/testsuite/ld-plugin/plugin-10.d 2021-02-12 10:23:44.298370984 +0000
|
|
@@ -32,7 +32,7 @@ hook called: claim_file tmpdir/func.o \[
|
|
hook called: claim_file tmpdir/libtext.a \[@.* not claimed
|
|
#...
|
|
hook called: all symbols read.
|
|
-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY
|
|
+Sym: '_?func' Resolution: LDPR_PREVAILING_DE.*
|
|
Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
|
|
#...
|
|
hook called: cleanup.
|
|
diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-11.d binutils-2.36.1/ld/testsuite/ld-plugin/plugin-11.d
|
|
--- binutils.orig/ld/testsuite/ld-plugin/plugin-11.d 2021-02-12 10:13:11.119049477 +0000
|
|
+++ binutils-2.36.1/ld/testsuite/ld-plugin/plugin-11.d 2021-02-12 10:50:40.973828943 +0000
|
|
@@ -35,9 +35,9 @@ hook called: claim_file tmpdir/func.o \[
|
|
hook called: claim_file tmpdir/libtext.a \[@.* CLAIMED
|
|
#...
|
|
hook called: all symbols read.
|
|
-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY
|
|
+Sym: '_?func' Resolution: LDPR_PREVAILING_DE.*
|
|
Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
|
|
-Sym: '_?text' Resolution: LDPR_PREVAILING_DEF_IRONLY
|
|
+Sym: '_?text' Resolution: LDPR_PREVAILING_DE.*
|
|
#...
|
|
hook called: cleanup.
|
|
#...
|
|
diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-16.d binutils-2.36.1/ld/testsuite/ld-plugin/plugin-16.d
|
|
--- binutils.orig/ld/testsuite/ld-plugin/plugin-16.d 2021-02-12 10:13:11.119049477 +0000
|
|
+++ binutils-2.36.1/ld/testsuite/ld-plugin/plugin-16.d 2021-02-12 10:29:31.510843797 +0000
|
|
@@ -30,7 +30,7 @@ hook called: claim_file .*/ld/testsuite/
|
|
hook called: claim_file tmpdir/text.o \[@0/.* not claimed
|
|
#...
|
|
hook called: all symbols read.
|
|
-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY
|
|
+Sym: '_?func' Resolution: LDPR_PREVAILING_DE.*
|
|
Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
|
|
#...
|
|
hook called: cleanup.
|
|
diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-17.d binutils-2.36.1/ld/testsuite/ld-plugin/plugin-17.d
|
|
--- binutils.orig/ld/testsuite/ld-plugin/plugin-17.d 2021-02-12 10:13:11.116049499 +0000
|
|
+++ binutils-2.36.1/ld/testsuite/ld-plugin/plugin-17.d 2021-02-12 10:35:13.348404638 +0000
|
|
@@ -31,7 +31,7 @@ hook called: claim_file .*/ld/testsuite/
|
|
hook called: claim_file tmpdir/text.o \[@0/.* not claimed
|
|
#...
|
|
hook called: all symbols read.
|
|
-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY
|
|
+Sym: '_?func' Resolution: LDPR_PREVAILING_DE.*
|
|
Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
|
|
#...
|
|
hook called: cleanup.
|
|
diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-18.d binutils-2.36.1/ld/testsuite/ld-plugin/plugin-18.d
|
|
--- binutils.orig/ld/testsuite/ld-plugin/plugin-18.d 2021-02-12 10:13:11.118049484 +0000
|
|
+++ binutils-2.36.1/ld/testsuite/ld-plugin/plugin-18.d 2021-02-12 10:29:47.974726314 +0000
|
|
@@ -32,7 +32,7 @@ hook called: claim_file .*/ld/testsuite/
|
|
hook called: claim_file tmpdir/libtext.a \[@.* not claimed
|
|
#...
|
|
hook called: all symbols read.
|
|
-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY
|
|
+Sym: '_?func' Resolution: LDPR_PREVAILING_DE.*
|
|
Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
|
|
#...
|
|
hook called: cleanup.
|
|
diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-19.d binutils-2.36.1/ld/testsuite/ld-plugin/plugin-19.d
|
|
--- binutils.orig/ld/testsuite/ld-plugin/plugin-19.d 2021-02-12 10:13:11.116049499 +0000
|
|
+++ binutils-2.36.1/ld/testsuite/ld-plugin/plugin-19.d 2021-02-12 10:30:31.990412245 +0000
|
|
@@ -35,9 +35,9 @@ hook called: claim_file .*/ld/testsuite/
|
|
hook called: claim_file tmpdir/libtext.a \[@.* CLAIMED
|
|
#...
|
|
hook called: all symbols read.
|
|
-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY
|
|
+Sym: '_?func' Resolution: LDPR_PREVAILING_DE.*
|
|
Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
|
|
-Sym: '_?text' Resolution: LDPR_PREVAILING_DEF_IRONLY
|
|
+Sym: '_?text' Resolution: LDPR_PREVAILING_DE.*
|
|
#...
|
|
hook called: cleanup.
|
|
#...
|
|
diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-8.d binutils-2.36.1/ld/testsuite/ld-plugin/plugin-8.d
|
|
--- binutils.orig/ld/testsuite/ld-plugin/plugin-8.d 2021-02-12 10:13:11.118049484 +0000
|
|
+++ binutils-2.36.1/ld/testsuite/ld-plugin/plugin-8.d 2021-02-12 10:23:18.489561148 +0000
|
|
@@ -30,7 +30,7 @@ hook called: claim_file tmpdir/func.o \[
|
|
hook called: claim_file tmpdir/text.o \[@0/.* not claimed
|
|
#...
|
|
hook called: all symbols read.
|
|
-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY
|
|
+Sym: '_?func' Resolution: LDPR_PREVAILING_DE.*
|
|
Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
|
|
#...
|
|
hook called: cleanup.
|
|
diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-9.d binutils-2.36.1/ld/testsuite/ld-plugin/plugin-9.d
|
|
--- binutils.orig/ld/testsuite/ld-plugin/plugin-9.d 2021-02-12 10:13:11.119049477 +0000
|
|
+++ binutils-2.36.1/ld/testsuite/ld-plugin/plugin-9.d 2021-02-12 10:23:34.417443785 +0000
|
|
@@ -31,7 +31,7 @@ hook called: claim_file tmpdir/func.o \[
|
|
hook called: claim_file tmpdir/text.o \[@0/.* not claimed
|
|
#...
|
|
hook called: all symbols read.
|
|
-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF_IRONLY
|
|
+Sym: '_?func' Resolution: LDPR_PREVAILING_DE.*
|
|
Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
|
|
#...
|
|
hook called: cleanup.
|
|
diff -rup binutils.orig/ld/testsuite/ld-x86-64/x86-64.exp binutils-2.36.1/ld/testsuite/ld-x86-64/x86-64.exp
|
|
--- binutils.orig/ld/testsuite/ld-x86-64/x86-64.exp 2021-02-12 10:13:11.177049047 +0000
|
|
+++ binutils-2.36.1/ld/testsuite/ld-x86-64/x86-64.exp 2021-02-12 10:57:23.339975059 +0000
|
|
@@ -1437,22 +1437,6 @@ if { [isnative] && [check_compiler_avail
|
|
} else {
|
|
run_cc_link_tests [list \
|
|
[list \
|
|
- "Build pr22001-1b" \
|
|
- "$NOPIE_LDFLAGS -Wl,-z,nocopyreloc,--no-as-needed,-z,notext tmpdir/pr22001-1.so" \
|
|
- "$NOPIE_CFLAGS -Wa,-mx86-used-note=yes" \
|
|
- { pr22001-1c.c } \
|
|
- {{error_output "pr22001-1b.err"}} \
|
|
- "pr22001-1b" \
|
|
- ] \
|
|
- [list \
|
|
- "Build pr21997-1b" \
|
|
- "$NOPIE_LDFLAGS -Wl,--no-as-needed,-z,notext tmpdir/pr21997-1.so" \
|
|
- "$NOPIE_CFLAGS -Wa,-mx86-used-note=yes" \
|
|
- { pr21997-1c.c } \
|
|
- {{error_output "pr21997-1b.err"}} \
|
|
- "pr21997-1b" \
|
|
- ] \
|
|
- [list \
|
|
"Build lam-u48.so" \
|
|
"-shared -Wl,-z,lam-u48" \
|
|
"" \
|
|
@@ -1766,49 +1750,6 @@ if { [isnative] && [check_compiler_avail
|
|
if { [istarget "x86_64-*-linux*"] \
|
|
&& ![istarget "x86_64-*-linux*-gnux32"]} {
|
|
|
|
- run_cc_link_tests [list \
|
|
- [list \
|
|
- "Build plt-main with -z bndplt" \
|
|
- "tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \
|
|
- tmpdir/plt-main4.o tmpdir/libplt-lib.so -z bndplt \
|
|
- -z noseparate-code -z max-page-size=0x200000" \
|
|
- "-Wa,-mx86-used-note=yes $NOCF_PROTECTION_CFLAGS" \
|
|
- { plt-main5.c } \
|
|
- {{objdump {-drw} plt-main-bnd.dd}} \
|
|
- "plt-main-bnd" \
|
|
- ] \
|
|
- [list \
|
|
- "Build plt-main with PIE and -z bndplt" \
|
|
- "tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \
|
|
- tmpdir/plt-main4.o tmpdir/libplt-lib.so -z bndplt -pie \
|
|
- -z noseparate-code -z max-page-size=0x200000" \
|
|
- "-fPIC -Wa,-mx86-used-note=yes $NOCF_PROTECTION_CFLAGS" \
|
|
- { plt-main5.c } \
|
|
- {{objdump {-drw} plt-main-bnd.dd}} \
|
|
- "plt-main-pie-bnd" \
|
|
- ] \
|
|
- [list \
|
|
- "Build plt-main with -z bndplt -z now" \
|
|
- "tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \
|
|
- tmpdir/plt-main4.o tmpdir/libplt-lib.so -z bndplt -z now \
|
|
- -z noseparate-code -z max-page-size=0x200000" \
|
|
- "-Wa,-mx86-used-note=yes $NOCF_PROTECTION_CFLAGS" \
|
|
- { plt-main5.c } \
|
|
- {{readelf {-SW} plt-main-bnd-now.rd} {objdump {-drw} plt-main-bnd.dd}} \
|
|
- "plt-main-bnd-now" \
|
|
- ] \
|
|
- [list \
|
|
- "Build plt-main with PIE and -z bndplt -z now" \
|
|
- "tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \
|
|
- tmpdir/plt-main4.o tmpdir/libplt-lib.so -z bndplt -z now -pie \
|
|
- -z noseparate-code -z max-page-size=0x200000" \
|
|
- "-fPIC -Wa,-mx86-used-note=yes $NOCF_PROTECTION_CFLAGS" \
|
|
- { plt-main5.c } \
|
|
- {{readelf {-SW} plt-main-bnd-now.rd} {objdump {-drw} plt-main-bnd.dd}} \
|
|
- "plt-main-pie-bnd-now" \
|
|
- ] \
|
|
- ]
|
|
-
|
|
run_ld_link_exec_tests [list \
|
|
[list \
|
|
"Run plt-main with -z bndplt" \
|
|
@@ -1893,66 +1834,6 @@ if { [isnative] && [check_compiler_avail
|
|
set pltdump {{objdump {-drw} plt-main-ibt.dd}}
|
|
set pltsecdump {{readelf {-SW} plt-main-ibt-now.rd} {objdump {-drw} plt-main-ibt.dd}}
|
|
}
|
|
- run_cc_link_tests [list \
|
|
- [list \
|
|
- "Build plt-main with -z ibtplt" \
|
|
- "tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \
|
|
- tmpdir/plt-main4.o tmpdir/libplt-lib.so -z ibtplt \
|
|
- -z noseparate-code -z max-page-size=0x200000" \
|
|
- "-Wa,-mx86-used-note=yes" \
|
|
- { plt-main5.c } \
|
|
- $pltdump \
|
|
- "plt-main-ibt" \
|
|
- ] \
|
|
- [list \
|
|
- "Build plt-main with PIE and -z ibtplt" \
|
|
- "tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \
|
|
- tmpdir/plt-main4.o tmpdir/libplt-lib.so -z ibtplt -pie \
|
|
- -z noseparate-code -z max-page-size=0x200000" \
|
|
- "-fPIC -Wa,-mx86-used-note=yes" \
|
|
- { plt-main5.c } \
|
|
- $pltdump \
|
|
- "plt-main-pie-ibt" \
|
|
- ] \
|
|
- [list \
|
|
- "Build plt-main with -z ibtplt -z now" \
|
|
- "tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \
|
|
- tmpdir/plt-main4.o tmpdir/libplt-lib.so -z ibtplt -z now \
|
|
- -z noseparate-code -z max-page-size=0x200000" \
|
|
- "-Wa,-mx86-used-note=yes" \
|
|
- { plt-main5.c } \
|
|
- $pltsecdump \
|
|
- "plt-main-ibt-now" \
|
|
- ] \
|
|
- [list \
|
|
- "Build plt-main with PIE and -z ibtplt -z now" \
|
|
- "tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \
|
|
- tmpdir/plt-main4.o tmpdir/libplt-lib.so -z ibtplt -z now -pie \
|
|
- -z noseparate-code -z max-page-size=0x200000" \
|
|
- "-fPIC -Wa,-mx86-used-note=yes" \
|
|
- { plt-main5.c } \
|
|
- $pltsecdump \
|
|
- "plt-main-pie-ibt-now" \
|
|
- ] \
|
|
- [list \
|
|
- "Build libibtplt-lib.so with -z ibtplt" \
|
|
- "-shared -z ibtplt \
|
|
- -z noseparate-code -z max-page-size=0x200000" \
|
|
- "-fPIC -Wa,-mx86-used-note=yes" \
|
|
- { plt-main1.c plt-main2.c plt-main3.c plt-main4.c} \
|
|
- $pltdump \
|
|
- "libibtplt-lib.so" \
|
|
- ] \
|
|
- [list \
|
|
- "Build libibtplt--now-lib.so with -z ibtplt -z now" \
|
|
- "-shared -z ibtplt -z now \
|
|
- -z noseparate-code -z max-page-size=0x200000" \
|
|
- "-fPIC -Wa,-mx86-used-note=yes" \
|
|
- { plt-main1.c plt-main2.c plt-main3.c plt-main4.c} \
|
|
- $pltdump \
|
|
- "libibtplt-now-lib.so" \
|
|
- ] \
|
|
- ]
|
|
|
|
run_ld_link_exec_tests [list \
|
|
[list \
|
|
diff -rup binutils.orig/ld/testsuite/ld-x86-64/x86-64.exp binutils-2.36.1/ld/testsuite/ld-x86-64/x86-64.exp
|
|
--- binutils.orig/ld/testsuite/ld-x86-64/x86-64.exp 2021-02-12 11:44:39.121364751 +0000
|
|
+++ binutils-2.36.1/ld/testsuite/ld-x86-64/x86-64.exp 2021-02-12 11:46:27.505597689 +0000
|
|
@@ -1878,24 +1878,6 @@ if { [isnative] && [check_compiler_avail
|
|
"plt-main.out" \
|
|
"-fPIC" \
|
|
] \
|
|
- [list \
|
|
- "Run plt-main with libibtplt-lib.so -z ibtplt" \
|
|
- "-Wl,--no-as-needed,-z,ibtplt tmpdir/libibtplt-lib.so \
|
|
- tmpdir/libplt-lib.so" \
|
|
- "-Wa,-mx86-used-note=yes" \
|
|
- { plt-main5.c } \
|
|
- "plt-main-ibt-lib" \
|
|
- "plt-main.out" \
|
|
- ] \
|
|
- [list \
|
|
- "Run plt-main with libibtplt-lib.so -z ibtplt -z now" \
|
|
- "-Wl,--no-as-needed,-z,ibtplt,-z,now \
|
|
- tmpdir/libibtplt-now-lib.so tmpdir/libplt-lib.so" \
|
|
- "-Wa,-mx86-used-note=yes" \
|
|
- { plt-main5.c } \
|
|
- "plt-main-ibt-now-lib" \
|
|
- "plt-main.out" \
|
|
- ] \
|
|
]
|
|
|
|
if { [check_ifunc_attribute_available] } {
|
|
@@ -1922,7 +1904,6 @@ if { [isnative] && [check_compiler_avail
|
|
}
|
|
}
|
|
|
|
- undefined_weak "$NOPIE_CFLAGS" "$NOPIE_LDFLAGS"
|
|
undefined_weak "-fPIE" ""
|
|
undefined_weak "-fPIE" "-pie"
|
|
undefined_weak "-fPIE" "-Wl,-z,nodynamic-undefined-weak"
|
|
--- binutils.orig/ld/testsuite/ld-plugin/plugin-12.d 2021-02-12 11:44:39.076365068 +0000
|
|
+++ binutils-2.36.1/ld/testsuite/ld-plugin/plugin-12.d 2021-02-12 12:01:48.091931654 +0000
|
|
@@ -1,5 +1,5 @@
|
|
#...
|
|
-.*: symbol `func' definition: DEF, visibility: DEFAULT, resolution: PREVAILING_DEF
|
|
+.*: symbol `func' definition: DEF, visibility: DEFAULT, resolution: PREVAILING_DE.*
|
|
.*: symbol `func1' definition: DEF, visibility: PROTECTED, resolution: PREVAILING_DEF_IRONLY
|
|
.*: symbol `func2' definition: DEF, visibility: INTERNAL, resolution: PREVAILING_DEF_IRONLY
|
|
.*: symbol `func3' definition: DEF, visibility: HIDDEN, resolution: PREVAILING_DEF_IRONLY
|
|
--- binutils.orig/ld/testsuite/ld-plugin/plugin-12.d 2021-02-12 14:14:25.023160021 +0000
|
|
+++ binutils-2.36.1/ld/testsuite/ld-plugin/plugin-12.d 2021-02-12 14:19:29.106923745 +0000
|
|
@@ -1,6 +1,6 @@
|
|
#...
|
|
-.*: symbol `func' definition: DEF, visibility: DEFAULT, resolution: PREVAILING_DE.*
|
|
-.*: symbol `func1' definition: DEF, visibility: PROTECTED, resolution: PREVAILING_DEF_IRONLY
|
|
-.*: symbol `func2' definition: DEF, visibility: INTERNAL, resolution: PREVAILING_DEF_IRONLY
|
|
-.*: symbol `func3' definition: DEF, visibility: HIDDEN, resolution: PREVAILING_DEF_IRONLY
|
|
+.*: symbol `.*unc' definition: DEF, visibility: DEFAULT, resolution: PREVAILING_DE.*
|
|
+.*: symbol `.*unc1' definition: DEF, visibility: PROTECTED, resolution: PREVAILING_DEF_IRONLY
|
|
+.*: symbol `.*unc2' definition: DEF, visibility: INTERNAL, resolution: PREVAILING_DEF_IRONLY
|
|
+.*: symbol `.*unc3' definition: DEF, visibility: HIDDEN, resolution: PREVAILING_DEF_IRONLY
|
|
#pass
|
|
--- binutils.orig/ld/testsuite/ld-aarch64/variant_pcs-now.d 2021-07-19 12:39:14.240555833 +0100
|
|
+++ binutils-2.37/ld/testsuite/ld-aarch64/variant_pcs-now.d 2021-07-19 12:50:27.753751551 +0100
|
|
@@ -23,10 +23,10 @@ Symbol table '\.dynsym' contains 7 entri
|
|
Num: Value Size Type Bind Vis Ndx Name
|
|
0: 0000000000000000 0 NOTYPE LOCAL DEFAULT UND
|
|
1: 0000000000000000 0 NOTYPE GLOBAL DEFAULT UND f_base_global_default_undef
|
|
- 2: 0000000000000000 0 NOTYPE GLOBAL DEFAULT \[VARIANT_PCS\] UND f_spec_global_default_undef
|
|
- 3: 0000000000008000 0 IFUNC GLOBAL DEFAULT \[VARIANT_PCS\] 1 f_spec_global_default_ifunc
|
|
+ 2: 0000000000000000 0 NOTYPE GLOBAL DEFAULT[ ]+UND f_spec_global_default_undef[ ]+\[VARIANT_PCS\]
|
|
+ 3: 0000000000008000 0 IFUNC GLOBAL DEFAULT[ ]+1 f_spec_global_default_ifunc[ ]+\[VARIANT_PCS\]
|
|
4: 0000000000008000 0 NOTYPE GLOBAL DEFAULT 1 f_base_global_default_def
|
|
- 5: 0000000000008000 0 NOTYPE GLOBAL DEFAULT \[VARIANT_PCS\] 1 f_spec_global_default_def
|
|
+ 5: 0000000000008000 0 NOTYPE GLOBAL DEFAULT[ ]+1 f_spec_global_default_def[ ]+\[VARIANT_PCS\]
|
|
6: 0000000000008000 0 IFUNC GLOBAL DEFAULT 1 f_base_global_default_ifunc
|
|
|
|
Symbol table '\.symtab' contains 35 entries:
|
|
@@ -41,28 +41,28 @@ Symbol table '\.symtab' contains 35 entr
|
|
7: 00000000000111c8 0 SECTION LOCAL DEFAULT 7.*
|
|
8: 0000000000011270 0 SECTION LOCAL DEFAULT 8.*
|
|
9: 0000000000000000 0 FILE LOCAL DEFAULT ABS .*variant_pcs-1\.o
|
|
- 10: 0000000000008000 0 NOTYPE LOCAL DEFAULT \[VARIANT_PCS\] 1 f_spec_local
|
|
- 11: 0000000000008000 0 IFUNC LOCAL DEFAULT \[VARIANT_PCS\] 1 f_spec_local_ifunc
|
|
+ 10: 0000000000008000 0 NOTYPE LOCAL DEFAULT .*
|
|
+ 11: 0000000000008000 0 IFUNC LOCAL DEFAULT .*
|
|
12: 0000000000008000 0 IFUNC LOCAL DEFAULT 1 f_base_local_ifunc
|
|
13: 0000000000008000 0 NOTYPE LOCAL DEFAULT 1 f_base_local
|
|
14: 0000000000008000 0 NOTYPE LOCAL DEFAULT 1 \$x
|
|
15: 0000000000000000 0 FILE LOCAL DEFAULT ABS .*variant_pcs-2\.o
|
|
- 16: 0000000000008038 0 NOTYPE LOCAL DEFAULT \[VARIANT_PCS\] 1 f_spec_local2
|
|
- 17: 0000000000008038 0 IFUNC LOCAL DEFAULT \[VARIANT_PCS\] 1 f_spec_local2_ifunc
|
|
+ 16: 0000000000008038 0 NOTYPE LOCAL DEFAULT .*
|
|
+ 17: 0000000000008038 0 IFUNC LOCAL DEFAULT .*
|
|
18: 0000000000008038 0 IFUNC LOCAL DEFAULT 1 f_base_local2_ifunc
|
|
19: 0000000000008038 0 NOTYPE LOCAL DEFAULT 1 f_base_local2
|
|
20: 0000000000008038 0 NOTYPE LOCAL DEFAULT 1 \$x
|
|
21: 0000000000000000 0 FILE LOCAL DEFAULT ABS
|
|
22: 0000000000009080 0 OBJECT LOCAL DEFAULT ABS _DYNAMIC
|
|
- 23: 0000000000008000 0 NOTYPE LOCAL DEFAULT \[VARIANT_PCS\] 1 f_spec_global_hidden_def
|
|
+ 23: 0000000000008000 0 NOTYPE LOCAL DEFAULT .*
|
|
24: 0000000000008000 0 IFUNC LOCAL DEFAULT 1 f_base_global_hidden_ifunc
|
|
25: 0000000000008000 0 NOTYPE LOCAL DEFAULT 1 f_base_global_hidden_def
|
|
26: 0000000000009000 0 OBJECT LOCAL DEFAULT ABS _GLOBAL_OFFSET_TABLE_
|
|
- 27: 0000000000008000 0 IFUNC LOCAL DEFAULT \[VARIANT_PCS\] 1 f_spec_global_hidden_ifunc
|
|
+ 27: 0000000000008000 0 IFUNC LOCAL DEFAULT .*
|
|
28: 0000000000008070 0 NOTYPE LOCAL DEFAULT 2 \$x
|
|
29: 0000000000000000 0 NOTYPE GLOBAL DEFAULT UND f_base_global_default_undef
|
|
- 30: 0000000000000000 0 NOTYPE GLOBAL DEFAULT \[VARIANT_PCS\] UND f_spec_global_default_undef
|
|
- 31: 0000000000008000 0 IFUNC GLOBAL DEFAULT \[VARIANT_PCS\] 1 f_spec_global_default_ifunc
|
|
+ 30: 0000000000000000 0 NOTYPE GLOBAL DEFAULT .*
|
|
+ 31: 0000000000008000 0 IFUNC GLOBAL DEFAULT .*
|
|
32: 0000000000008000 0 NOTYPE GLOBAL DEFAULT 1 f_base_global_default_def
|
|
- 33: 0000000000008000 0 NOTYPE GLOBAL DEFAULT \[VARIANT_PCS\] 1 f_spec_global_default_def
|
|
+ 33: 0000000000008000 0 NOTYPE GLOBAL DEFAULT .*
|
|
34: 0000000000008000 0 IFUNC GLOBAL DEFAULT 1 f_base_global_default_ifunc
|
|
--- binutils.orig/ld/testsuite/ld-aarch64/variant_pcs-r.d 2021-07-19 12:39:14.235555861 +0100
|
|
+++ binutils-2.37/ld/testsuite/ld-aarch64/variant_pcs-r.d 2021-07-19 12:51:04.981541273 +0100
|
|
@@ -37,24 +37,24 @@ Symbol table '\.symtab' contains 26 entr
|
|
2: 0000000000000000 0 SECTION LOCAL DEFAULT 3.*
|
|
3: 0000000000000000 0 SECTION LOCAL DEFAULT 4.*
|
|
4: 0000000000000000 0 FILE LOCAL DEFAULT ABS .*variant_pcs-1\.o
|
|
- 5: 0000000000000000 0 NOTYPE LOCAL DEFAULT \[VARIANT_PCS\] 1 f_spec_local
|
|
- 6: 0000000000000000 0 IFUNC LOCAL DEFAULT \[VARIANT_PCS\] 1 f_spec_local_ifunc
|
|
+ 5: 0000000000000000 0 NOTYPE LOCAL DEFAULT .*
|
|
+ 6: 0000000000000000 0 IFUNC LOCAL DEFAULT .*
|
|
7: 0000000000000000 0 IFUNC LOCAL DEFAULT 1 f_base_local_ifunc
|
|
8: 0000000000000000 0 NOTYPE LOCAL DEFAULT 1 f_base_local
|
|
9: 0000000000000000 0 NOTYPE LOCAL DEFAULT 1 \$x
|
|
10: 0000000000000000 0 FILE LOCAL DEFAULT ABS .*variant_pcs-2\.o
|
|
- 11: 0000000000000038 0 NOTYPE LOCAL DEFAULT \[VARIANT_PCS\] 1 f_spec_local2
|
|
- 12: 0000000000000038 0 IFUNC LOCAL DEFAULT \[VARIANT_PCS\] 1 f_spec_local2_ifunc
|
|
+ 11: 0000000000000038 0 NOTYPE LOCAL DEFAULT .*
|
|
+ 12: 0000000000000038 0 IFUNC LOCAL DEFAULT .*
|
|
13: 0000000000000038 0 IFUNC LOCAL DEFAULT 1 f_base_local2_ifunc
|
|
14: 0000000000000038 0 NOTYPE LOCAL DEFAULT 1 f_base_local2
|
|
15: 0000000000000038 0 NOTYPE LOCAL DEFAULT 1 \$x
|
|
16: 0000000000000000 0 NOTYPE GLOBAL DEFAULT UND f_base_global_default_undef
|
|
- 17: 0000000000000000 0 NOTYPE GLOBAL DEFAULT \[VARIANT_PCS\] UND f_spec_global_default_undef
|
|
- 18: 0000000000000000 0 NOTYPE GLOBAL HIDDEN \[VARIANT_PCS\] 1 f_spec_global_hidden_def
|
|
+ 17: 0000000000000000 0 NOTYPE GLOBAL DEFAULT .*
|
|
+ 18: 0000000000000000 0 NOTYPE GLOBAL HIDDEN .*
|
|
19: 0000000000000000 0 IFUNC GLOBAL HIDDEN 1 f_base_global_hidden_ifunc
|
|
- 20: 0000000000000000 0 IFUNC GLOBAL DEFAULT \[VARIANT_PCS\] 1 f_spec_global_default_ifunc
|
|
+ 20: 0000000000000000 0 IFUNC GLOBAL DEFAULT .*
|
|
21: 0000000000000000 0 NOTYPE GLOBAL HIDDEN 1 f_base_global_hidden_def
|
|
- 22: 0000000000000000 0 IFUNC GLOBAL HIDDEN \[VARIANT_PCS\] 1 f_spec_global_hidden_ifunc
|
|
+ 22: 0000000000000000 0 IFUNC GLOBAL HIDDEN .*
|
|
23: 0000000000000000 0 NOTYPE GLOBAL DEFAULT 1 f_base_global_default_def
|
|
- 24: 0000000000000000 0 NOTYPE GLOBAL DEFAULT \[VARIANT_PCS\] 1 f_spec_global_default_def
|
|
+ 24: 0000000000000000 0 NOTYPE GLOBAL DEFAULT .*
|
|
25: 0000000000000000 0 IFUNC GLOBAL DEFAULT 1 f_base_global_default_ifunc
|
|
--- binutils.orig/ld/testsuite/ld-aarch64/variant_pcs-shared.d 2021-07-19 12:39:14.235555861 +0100
|
|
+++ binutils-2.37/ld/testsuite/ld-aarch64/variant_pcs-shared.d 2021-07-19 12:51:38.076354339 +0100
|
|
@@ -23,10 +23,10 @@ Symbol table '\.dynsym' contains 7 entri
|
|
Num: Value Size Type Bind Vis Ndx Name
|
|
0: 0000000000000000 0 NOTYPE LOCAL DEFAULT UND
|
|
1: 0000000000000000 0 NOTYPE GLOBAL DEFAULT UND f_base_global_default_undef
|
|
- 2: 0000000000000000 0 NOTYPE GLOBAL DEFAULT \[VARIANT_PCS\] UND f_spec_global_default_undef
|
|
- 3: 0000000000008000 0 IFUNC GLOBAL DEFAULT \[VARIANT_PCS\] 1 f_spec_global_default_ifunc
|
|
+ 2: 0000000000000000 0 NOTYPE GLOBAL DEFAULT[ ]+UND f_spec_global_default_undef[ ]+\[VARIANT_PCS\]
|
|
+ 3: 0000000000008000 0 IFUNC GLOBAL DEFAULT[ ]+1 f_spec_global_default_ifunc[ ]+\[VARIANT_PCS\]
|
|
4: 0000000000008000 0 NOTYPE GLOBAL DEFAULT 1 f_base_global_default_def
|
|
- 5: 0000000000008000 0 NOTYPE GLOBAL DEFAULT \[VARIANT_PCS\] 1 f_spec_global_default_def
|
|
+ 5: 0000000000008000 0 NOTYPE GLOBAL DEFAULT[ ]+1 f_spec_global_default_def[ ]+\[VARIANT_PCS\]
|
|
6: 0000000000008000 0 IFUNC GLOBAL DEFAULT 1 f_base_global_default_ifunc
|
|
|
|
Symbol table '\.symtab' contains 35 entries:
|
|
@@ -41,28 +41,28 @@ Symbol table '\.symtab' contains 35 entr
|
|
7: 00000000000111c8 0 SECTION LOCAL DEFAULT 7.*
|
|
8: 0000000000011270 0 SECTION LOCAL DEFAULT 8.*
|
|
9: 0000000000000000 0 FILE LOCAL DEFAULT ABS .*variant_pcs-1\.o
|
|
- 10: 0000000000008000 0 NOTYPE LOCAL DEFAULT \[VARIANT_PCS\] 1 f_spec_local
|
|
- 11: 0000000000008000 0 IFUNC LOCAL DEFAULT \[VARIANT_PCS\] 1 f_spec_local_ifunc
|
|
+ 10: 0000000000008000 0 NOTYPE LOCAL DEFAULT .*
|
|
+ 11: 0000000000008000 0 IFUNC LOCAL DEFAULT .*
|
|
12: 0000000000008000 0 IFUNC LOCAL DEFAULT 1 f_base_local_ifunc
|
|
13: 0000000000008000 0 NOTYPE LOCAL DEFAULT 1 f_base_local
|
|
14: 0000000000008000 0 NOTYPE LOCAL DEFAULT 1 \$x
|
|
15: 0000000000000000 0 FILE LOCAL DEFAULT ABS .*variant_pcs-2\.o
|
|
- 16: 0000000000008038 0 NOTYPE LOCAL DEFAULT \[VARIANT_PCS\] 1 f_spec_local2
|
|
- 17: 0000000000008038 0 IFUNC LOCAL DEFAULT \[VARIANT_PCS\] 1 f_spec_local2_ifunc
|
|
+ 16: 0000000000008038 0 NOTYPE LOCAL DEFAULT .*
|
|
+ 17: 0000000000008038 0 IFUNC LOCAL DEFAULT .*
|
|
18: 0000000000008038 0 IFUNC LOCAL DEFAULT 1 f_base_local2_ifunc
|
|
19: 0000000000008038 0 NOTYPE LOCAL DEFAULT 1 f_base_local2
|
|
20: 0000000000008038 0 NOTYPE LOCAL DEFAULT 1 \$x
|
|
21: 0000000000000000 0 FILE LOCAL DEFAULT ABS
|
|
22: 0000000000009080 0 OBJECT LOCAL DEFAULT ABS _DYNAMIC
|
|
- 23: 0000000000008000 0 NOTYPE LOCAL DEFAULT \[VARIANT_PCS\] 1 f_spec_global_hidden_def
|
|
+ 23: 0000000000008000 0 NOTYPE LOCAL DEFAULT .*
|
|
24: 0000000000008000 0 IFUNC LOCAL DEFAULT 1 f_base_global_hidden_ifunc
|
|
25: 0000000000008000 0 NOTYPE LOCAL DEFAULT 1 f_base_global_hidden_def
|
|
26: 0000000000009000 0 OBJECT LOCAL DEFAULT ABS _GLOBAL_OFFSET_TABLE_
|
|
- 27: 0000000000008000 0 IFUNC LOCAL DEFAULT \[VARIANT_PCS\] 1 f_spec_global_hidden_ifunc
|
|
+ 27: 0000000000008000 0 IFUNC LOCAL DEFAULT .*
|
|
28: 0000000000008070 0 NOTYPE LOCAL DEFAULT 2 \$x
|
|
29: 0000000000000000 0 NOTYPE GLOBAL DEFAULT UND f_base_global_default_undef
|
|
- 30: 0000000000000000 0 NOTYPE GLOBAL DEFAULT \[VARIANT_PCS\] UND f_spec_global_default_undef
|
|
- 31: 0000000000008000 0 IFUNC GLOBAL DEFAULT \[VARIANT_PCS\] 1 f_spec_global_default_ifunc
|
|
+ 30: 0000000000000000 0 NOTYPE GLOBAL DEFAULT .*
|
|
+ 31: 0000000000008000 0 IFUNC GLOBAL DEFAULT .*
|
|
32: 0000000000008000 0 NOTYPE GLOBAL DEFAULT 1 f_base_global_default_def
|
|
- 33: 0000000000008000 0 NOTYPE GLOBAL DEFAULT \[VARIANT_PCS\] 1 f_spec_global_default_def
|
|
+ 33: 0000000000008000 0 NOTYPE GLOBAL DEFAULT .*
|
|
34: 0000000000008000 0 IFUNC GLOBAL DEFAULT 1 f_base_global_default_ifunc
|
|
--- binutils.orig/gold/main.cc 2021-07-19 12:39:14.643553557 +0100
|
|
+++ binutils-2.37/gold/main.cc 2021-07-19 12:53:40.043665415 +0100
|
|
@@ -290,16 +290,6 @@ main(int argc, char** argv)
|
|
elapsed.sys / 1000, (elapsed.sys % 1000) * 1000,
|
|
elapsed.wall / 1000, (elapsed.wall % 1000) * 1000);
|
|
|
|
-#if defined(HAVE_MALLINFO2)
|
|
- struct mallinfo2 m = mallinfo2();
|
|
- fprintf(stderr, _("%s: total space allocated by malloc: %lld bytes\n"),
|
|
- program_name, static_cast<long long>(m.arena));
|
|
-#elif defined(HAVE_MALLINFO)
|
|
- struct mallinfo m = mallinfo();
|
|
- fprintf(stderr, _("%s: total space allocated by malloc: %lld bytes\n"),
|
|
- program_name, static_cast<long long>(m.arena));
|
|
-#endif
|
|
-
|
|
File_read::print_stats();
|
|
Archive::print_stats();
|
|
Lib_group::print_stats();
|
|
--- binutils.orig/ld/testsuite/ld-aarch64/tls-relax-gdesc-le-now.d 2021-07-19 14:51:48.859666911 +0100
|
|
+++ binutils-2.37/ld/testsuite/ld-aarch64/tls-relax-gdesc-le-now.d 2021-07-19 14:59:56.130065901 +0100
|
|
@@ -11,7 +11,7 @@
|
|
0x.+ \(PLTRELSZ\) \s+.+ \(bytes\)
|
|
0x.+ \(PLTREL\) \s+RELA
|
|
0x.+ \(JMPREL\) \s+0x.+
|
|
- 0x.+ \(BIND_NOW\) \s+
|
|
+ 0x.+ \(FLAGS\) \s+BIND_NOW
|
|
0x.+ \(FLAGS_1\) \s+ Flags: NOW
|
|
0x.+ \(NULL\) \s+ 0x0
|
|
|
|
--- binutils.orig/ld/testsuite/ld-plugin/plugin.exp 2021-07-19 14:51:48.905666659 +0100
|
|
+++ binutils-2.37/ld/testsuite/ld-plugin/plugin.exp 2021-07-19 15:06:56.159875135 +0100
|
|
@@ -119,7 +119,7 @@ if { $can_compile && !$failed_compile }
|
|
|
|
# I do not know why, but the underscore prefix test is going
|
|
# wrong on ppc64le targets. So override it here.
|
|
-if { [istarget powerpc*-*-linux*] || [istarget x86_64*-*-linux*] } {
|
|
+if { [istarget powerpc*-*-linux*] || [istarget x86_64*-*-linux*] || [istarget *-*-*] } {
|
|
set _ ""
|
|
}
|
|
|
|
--- binutils.orig/ld/testsuite/ld-elf/compress.exp 2021-07-19 14:51:48.982666235 +0100
|
|
+++ binutils-2.37/ld/testsuite/ld-elf/compress.exp 2021-07-19 15:16:14.268931663 +0100
|
|
@@ -168,7 +168,7 @@ if { [regexp_diff tmpdir/$test.out $srcd
|
|
set test_name "Link with zlib compressed debug output 1"
|
|
set test normal
|
|
send_log "$READELF -w tmpdir/$test > tmpdir/$test.out\n"
|
|
-set got [remote_exec host [concat sh -c [list "$READELF -w tmpdir/$test > tmpdir/$test.out"]] "" "/dev/null"]
|
|
+set got [remote_exec host [concat sh -c [list "$READELF -wi tmpdir/$test > tmpdir/$test.out"]] "" "/dev/null"]
|
|
if { [lindex $got 0] != 0 || ![string match "" [lindex $got 1]] } then {
|
|
send_log "$got\n"
|
|
fail "$test_name"
|