Commit acaa4364 authored by Samuel Holland's avatar Samuel Holland

system/binutils: Fix testsuite with -ffunction-sections

Signed-off-by: Samuel Holland's avatarSamuel Holland <samuel@sholland.org>
parent e731759a
......@@ -26,6 +26,7 @@ source="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz
remove-pr19553c-test.patch
gold-mips.patch
binutils-2.30-testsuite-default-pie.patch
binutils-2.30-testsuite-ffunction-sections.patch
"
builddir="$srcdir/$pkgname-$pkgver"
......@@ -139,4 +140,5 @@ b40f9a3841a7af8fc12e8a4044cd672df5614bfda8461b0ca45efa57a42c3bc8490e491ea490c6c0
32ab4215669c728648179c124632467573a3d4675e79f0f0d221c22eb2ec1ca5488b79910bd09142f90a1e0d0b81d99ca4846297f4f9561f158db63745facb66 remove-pr2404-tests.patch
39ef9c76dd5db6b15f11ffa8061f7ca844fb79c3fb9879c3b1466eef332a28b833597c87003ab9f260b1b85023fae264659088aee27cad7e5aa77b2d58b9a3f6 remove-pr19553c-test.patch
f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488ea137f03e32d62efc878d95f018f836f8cec870bc448556f gold-mips.patch
db3f8cd3e1fe9409aa9c07e9b0213c0e621dd7f8b64350e48d908d0310a615655f0ac1edc836412752a6d105afdaeb247997bda3f16691956843d7a6e1d15645 binutils-2.30-testsuite-default-pie.patch"
db3f8cd3e1fe9409aa9c07e9b0213c0e621dd7f8b64350e48d908d0310a615655f0ac1edc836412752a6d105afdaeb247997bda3f16691956843d7a6e1d15645 binutils-2.30-testsuite-default-pie.patch
63008f12d0120ae6f22ffc05473c220672852844d5db55c4164baee0ac0fe927ef603a4cdd3f044bd136a979fd692a1eec6a66fd80c9a4e45ff8dca6a55fb83d binutils-2.30-testsuite-ffunction-sections.patch"
diff --git binutils-2.30/ld/testsuite/ld-elfvers/vers1.sym binutils-2.30/ld/testsuite/ld-elfvers/vers1.sym
index 206863f..0bca7fd 100644
--- binutils-2.30/ld/testsuite/ld-elfvers/vers1.sym
+++ binutils-2.30/ld/testsuite/ld-elfvers/vers1.sym
@@ -1,4 +1,4 @@
-[0-9a-f]+ g(F +\.text|F? +\.opd) [0-9a-f]+ (0x[0-9a-f]+ )?_?show_foo@
-[0-9a-f]+ g(F +\.text|F? +\.opd) [0-9a-f]+ (0x[0-9a-f]+ )?_?show_foo@@VERS_2\.0
-[0-9a-f]+ g(F +\.text|F? +\.opd) [0-9a-f]+ (0x[0-9a-f]+ )?_?show_foo@VERS_1\.1
-[0-9a-f]+ g(F +\.text|F? +\.opd) [0-9a-f]+ (0x[0-9a-f]+ )?_?show_foo@VERS_1\.2
+[0-9a-f]+ g(F +\.text|F? +\.opd)(.[[:graph:]]+)? [0-9a-f]+ (0x[0-9a-f]+ )?_?show_foo@
+[0-9a-f]+ g(F +\.text|F? +\.opd)(.[[:graph:]]+)? [0-9a-f]+ (0x[0-9a-f]+ )?_?show_foo@@VERS_2\.0
+[0-9a-f]+ g(F +\.text|F? +\.opd)(.[[:graph:]]+)? [0-9a-f]+ (0x[0-9a-f]+ )?_?show_foo@VERS_1\.1
+[0-9a-f]+ g(F +\.text|F? +\.opd)(.[[:graph:]]+)? [0-9a-f]+ (0x[0-9a-f]+ )?_?show_foo@VERS_1\.2
diff --git binutils-2.30/ld/testsuite/ld-elfvers/vers15.sym binutils-2.30/ld/testsuite/ld-elfvers/vers15.sym
index ccf4f4d..6e6120a 100644
--- binutils-2.30/ld/testsuite/ld-elfvers/vers15.sym
+++ binutils-2.30/ld/testsuite/ld-elfvers/vers15.sym
@@ -1,3 +1,3 @@
-[0-9a-f]+ g(F +\.text|F? +\.opd) [0-9a-f]+ (0x[0-9a-f]+ )?_?show_foo@
-[0-9a-f]+ g(F +\.text|F? +\.opd) [0-9a-f]+ (0x[0-9a-f]+ )?_?show_foo@@VERS_1\.2
-[0-9a-f]+ g(F +\.text|F? +\.opd) [0-9a-f]+ (0x[0-9a-f]+ )?_?show_foo@VERS_1\.1
+[0-9a-f]+ g(F +\.text|F? +\.opd)(.[[:graph:]]+)? [0-9a-f]+ (0x[0-9a-f]+ )?_?show_foo@
+[0-9a-f]+ g(F +\.text|F? +\.opd)(.[[:graph:]]+)? [0-9a-f]+ (0x[0-9a-f]+ )?_?show_foo@@VERS_1\.2
+[0-9a-f]+ g(F +\.text|F? +\.opd)(.[[:graph:]]+)? [0-9a-f]+ (0x[0-9a-f]+ )?_?show_foo@VERS_1\.1
diff --git binutils-2.30/ld/testsuite/ld-elfvers/vers18.sym binutils-2.30/ld/testsuite/ld-elfvers/vers18.sym
index 04fa49c..7e00bbe 100644
--- binutils-2.30/ld/testsuite/ld-elfvers/vers18.sym
+++ binutils-2.30/ld/testsuite/ld-elfvers/vers18.sym
@@ -1,4 +1,4 @@
-[0-9a-f]+ +w(F +\.text|F? +\.opd) [0-9a-f]+ (0x[0-9a-f]+ )?_?show_foo@
-[0-9a-f]+ +w(F +\.text|F? +\.opd) [0-9a-f]+ (0x[0-9a-f]+ )?_?show_foo@@VERS_2\.0
-[0-9a-f]+ +w(F +\.text|F? +\.opd) [0-9a-f]+ (0x[0-9a-f]+ )?_?show_foo@VERS_1\.1
-[0-9a-f]+ +w(F +\.text|F? +\.opd) [0-9a-f]+ (0x[0-9a-f]+ )?_?show_foo@VERS_1\.2
+[0-9a-f]+ +w(F +\.text|F? +\.opd)(.[[:graph:]]+)? [0-9a-f]+ (0x[0-9a-f]+ )?_?show_foo@
+[0-9a-f]+ +w(F +\.text|F? +\.opd)(.[[:graph:]]+)? [0-9a-f]+ (0x[0-9a-f]+ )?_?show_foo@@VERS_2\.0
+[0-9a-f]+ +w(F +\.text|F? +\.opd)(.[[:graph:]]+)? [0-9a-f]+ (0x[0-9a-f]+ )?_?show_foo@VERS_1\.1
+[0-9a-f]+ +w(F +\.text|F? +\.opd)(.[[:graph:]]+)? [0-9a-f]+ (0x[0-9a-f]+ )?_?show_foo@VERS_1\.2
diff --git binutils-2.30/ld/testsuite/ld-elfvers/vers21.sym binutils-2.30/ld/testsuite/ld-elfvers/vers21.sym
index f5ade0b..e540938 100644
--- binutils-2.30/ld/testsuite/ld-elfvers/vers21.sym
+++ binutils-2.30/ld/testsuite/ld-elfvers/vers21.sym
@@ -1,3 +1,3 @@
-[0-9a-f]+ +w(F +\.text|F? +\.opd) [0-9a-f]+ (0x[0-9a-f]+ )?_?bar@VERS\.0
-[0-9a-f]+ +g(F +\.text|F? +\.opd) [0-9a-f]+ (0x[0-9a-f]+ )?_?foo@VERS\.0
-[0-9a-f]+ +gO +\.s?data [0-9a-f]+ (0x[0-9a-f]+ )?_?foobar@VERS\.0
+[0-9a-f]+ +w(F +\.text|F? +\.opd)(.[[:graph:]]+)? [0-9a-f]+ (0x[0-9a-f]+ )?_?bar@VERS\.0
+[0-9a-f]+ +g(F +\.text|F? +\.opd)(.[[:graph:]]+)? [0-9a-f]+ (0x[0-9a-f]+ )?_?foo@VERS\.0
+[0-9a-f]+ +gO +\.s?data(.[[:graph:]]+)? [0-9a-f]+ (0x[0-9a-f]+ )?_?foobar@VERS\.0
diff --git binutils-2.30/ld/testsuite/ld-elfvers/vers22a.sym binutils-2.30/ld/testsuite/ld-elfvers/vers22a.sym
index cddf0c6..ed271f3 100644
--- binutils-2.30/ld/testsuite/ld-elfvers/vers22a.sym
+++ binutils-2.30/ld/testsuite/ld-elfvers/vers22a.sym
@@ -1 +1 @@
-[0-9a-f]+ +g(F +\.text|F? +\.opd) [0-9a-f]+ (0x[0-9a-f]+ )?_?bar@VERS.0
+[0-9a-f]+ +g(F +\.text|F? +\.opd)(.[[:graph:]]+)? [0-9a-f]+ (0x[0-9a-f]+ )?_?bar@VERS.0
diff --git binutils-2.30/ld/testsuite/ld-elfvers/vers23a.sym binutils-2.30/ld/testsuite/ld-elfvers/vers23a.sym
index cddf0c6..ed271f3 100644
--- binutils-2.30/ld/testsuite/ld-elfvers/vers23a.sym
+++ binutils-2.30/ld/testsuite/ld-elfvers/vers23a.sym
@@ -1 +1 @@
-[0-9a-f]+ +g(F +\.text|F? +\.opd) [0-9a-f]+ (0x[0-9a-f]+ )?_?bar@VERS.0
+[0-9a-f]+ +g(F +\.text|F? +\.opd)(.[[:graph:]]+)? [0-9a-f]+ (0x[0-9a-f]+ )?_?bar@VERS.0
diff --git binutils-2.30/ld/testsuite/ld-elfvers/vers27d.sym binutils-2.30/ld/testsuite/ld-elfvers/vers27d.sym
index 9133ed0..f972518 100644
--- binutils-2.30/ld/testsuite/ld-elfvers/vers27d.sym
+++ binutils-2.30/ld/testsuite/ld-elfvers/vers27d.sym
@@ -1 +1 @@
-[0-9a-f]+ +g(F +\.text|F? +\.opd) [0-9a-f]+ (0x[0-9a-f]+ )?_?foo@VERS\.0
+[0-9a-f]+ +g(F +\.text|F? +\.opd)(.[[:graph:]]+)? [0-9a-f]+ (0x[0-9a-f]+ )?_?foo@VERS\.0
diff --git binutils-2.30/ld/testsuite/ld-elfvers/vers4.sym binutils-2.30/ld/testsuite/ld-elfvers/vers4.sym
index 6511fc3..3ce7efb 100644
--- binutils-2.30/ld/testsuite/ld-elfvers/vers4.sym
+++ binutils-2.30/ld/testsuite/ld-elfvers/vers4.sym
@@ -1 +1 @@
-[0-9a-f]+ g(F +\.text|F? +\.opd) [0-9a-f]+ (0x[0-9a-f]+ )?_?foo@@VERS_2\.0
+[0-9a-f]+ g(F +\.text|F? +\.opd)(.[[:graph:]]+)? [0-9a-f]+ (0x[0-9a-f]+ )?_?foo@@VERS_2\.0
diff --git binutils-2.30/ld/testsuite/ld-elfvers/vers4a.sym binutils-2.30/ld/testsuite/ld-elfvers/vers4a.sym
index 6511fc3..3ce7efb 100644
--- binutils-2.30/ld/testsuite/ld-elfvers/vers4a.sym
+++ binutils-2.30/ld/testsuite/ld-elfvers/vers4a.sym
@@ -1 +1 @@
-[0-9a-f]+ g(F +\.text|F? +\.opd) [0-9a-f]+ (0x[0-9a-f]+ )?_?foo@@VERS_2\.0
+[0-9a-f]+ g(F +\.text|F? +\.opd)(.[[:graph:]]+)? [0-9a-f]+ (0x[0-9a-f]+ )?_?foo@@VERS_2\.0
diff --git binutils-2.30/ld/testsuite/ld-elfvers/vers7a.sym binutils-2.30/ld/testsuite/ld-elfvers/vers7a.sym
index 8b37561..1095171 100644
--- binutils-2.30/ld/testsuite/ld-elfvers/vers7a.sym
+++ binutils-2.30/ld/testsuite/ld-elfvers/vers7a.sym
@@ -1,2 +1,2 @@
-[0-9a-f]+ g(F +\.text|F? +\.opd) [0-9a-f]+ (0x[0-9a-f]+ )?_?hide_a@@VERS_1
-[0-9a-f]+ g(F +\.text|F? +\.opd) [0-9a-f]+ (0x[0-9a-f]+ )?_?show_b@@VERS_1
+[0-9a-f]+ g(F +\.text|F? +\.opd)(.[[:graph:]]+)? [0-9a-f]+ (0x[0-9a-f]+ )?_?hide_a@@VERS_1
+[0-9a-f]+ g(F +\.text|F? +\.opd)(.[[:graph:]]+)? [0-9a-f]+ (0x[0-9a-f]+ )?_?show_b@@VERS_1
diff --git binutils-2.30/ld/testsuite/ld-elfvers/vers9.sym binutils-2.30/ld/testsuite/ld-elfvers/vers9.sym
index 28afa0d..b74903d 100644
--- binutils-2.30/ld/testsuite/ld-elfvers/vers9.sym
+++ binutils-2.30/ld/testsuite/ld-elfvers/vers9.sym
@@ -1,4 +1,4 @@
0+ *F? *\*UND\* 0+ \.?_?foo@VERS_1\.2
-[0-9a-f]+ g(F +\.text|F? +\.opd) [0-9a-f]+ (0x[0-9a-f]+ )?_?foo@
-[0-9a-f]+ g(F +\.text|F? +\.opd) [0-9a-f]+ (0x[0-9a-f]+ )?_?foo@@VERS_1\.2
-[0-9a-f]+ g(F +\.text|F? +\.opd) [0-9a-f]+ (0x[0-9a-f]+ )?_?foo@VERS_1\.1
+[0-9a-f]+ g(F +\.text|F? +\.opd)(.[[:graph:]]+)? [0-9a-f]+ (0x[0-9a-f]+ )?_?foo@
+[0-9a-f]+ g(F +\.text|F? +\.opd)(.[[:graph:]]+)? [0-9a-f]+ (0x[0-9a-f]+ )?_?foo@@VERS_1\.2
+[0-9a-f]+ g(F +\.text|F? +\.opd)(.[[:graph:]]+)? [0-9a-f]+ (0x[0-9a-f]+ )?_?foo@VERS_1\.1
diff --git binutils-2.30/ld/testsuite/ld-elfweak/strong.sym binutils-2.30/ld/testsuite/ld-elfweak/strong.sym
index 27d0daa..56d2783 100644
--- binutils-2.30/ld/testsuite/ld-elfweak/strong.sym
+++ binutils-2.30/ld/testsuite/ld-elfweak/strong.sym
@@ -1 +1 @@
-[0-9a-f]+ g(F +\.text|F? +\.opd) [0-9a-f]+ +(0x[0-9a-f]+ )?foo
+[0-9a-f]+ g(F +\.text|F? +\.opd)(.[[:graph:]]+)? [0-9a-f]+ +(0x[0-9a-f]+ )?foo
diff --git binutils-2.30/ld/testsuite/ld-elfweak/strongcomm.sym binutils-2.30/ld/testsuite/ld-elfweak/strongcomm.sym
index c5fe85c..6b451ac 100644
--- binutils-2.30/ld/testsuite/ld-elfweak/strongcomm.sym
+++ binutils-2.30/ld/testsuite/ld-elfweak/strongcomm.sym
@@ -1,2 +1,2 @@
-[0-9a-f]+ gO +\.s?bss [0-9a-f]+ +deallocate_foo
-[0-9a-f]+ g(F +\.text|F? +\.opd) [0-9a-f]+ +(0x[0-9a-f]+ )?foo
+[0-9a-f]+ gO +\.s?bss(.[[:graph:]]+)? [0-9a-f]+ +deallocate_foo
+[0-9a-f]+ g(F +\.text|F? +\.opd)(.[[:graph:]]+)? [0-9a-f]+ +(0x[0-9a-f]+ )?foo
diff --git binutils-2.30/ld/testsuite/ld-elfweak/strongdata.sym binutils-2.30/ld/testsuite/ld-elfweak/strongdata.sym
index d09722a..c57e1b2 100644
--- binutils-2.30/ld/testsuite/ld-elfweak/strongdata.sym
+++ binutils-2.30/ld/testsuite/ld-elfweak/strongdata.sym
@@ -1,2 +1,2 @@
-[0-9a-f]+ gO +\.s?(data|bss) [0-9a-f]+ +deallocate_foo
-[0-9a-f]+ g(F +\.text|F? +\.opd) [0-9a-f]+ +(0x[0-9a-f]+ )?foo
+[0-9a-f]+ gO +\.s?(data|bss)(.[[:graph:]]+)? [0-9a-f]+ +deallocate_foo
+[0-9a-f]+ g(F +\.text|F? +\.opd)(.[[:graph:]]+)? [0-9a-f]+ +(0x[0-9a-f]+ )?foo
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment