1 |
commit: f5037c69c46b9f592e409381a07c106024b86eb7 |
2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat May 15 22:30:01 2021 +0000 |
4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat May 15 22:31:30 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5037c69 |
7 |
|
8 |
sys-devel/binutils: add powerpc tests patch to 2.35.2 |
9 |
|
10 |
Package-Manager: Portage-3.0.18, Repoman-3.0.3 |
11 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
12 |
|
13 |
sys-devel/binutils/binutils-2.35.2.ebuild | 5 +- |
14 |
.../files/binutils-2.35.2-powerpc-tests.patch | 136 +++++++++++++++++++++ |
15 |
2 files changed, 140 insertions(+), 1 deletion(-) |
16 |
|
17 |
diff --git a/sys-devel/binutils/binutils-2.35.2.ebuild b/sys-devel/binutils/binutils-2.35.2.ebuild |
18 |
index 051e68de5e7..9b2a1db7bbf 100644 |
19 |
--- a/sys-devel/binutils/binutils-2.35.2.ebuild |
20 |
+++ b/sys-devel/binutils/binutils-2.35.2.ebuild |
21 |
@@ -67,7 +67,10 @@ BDEPEND=" |
22 |
|
23 |
RESTRICT="!test? ( test )" |
24 |
|
25 |
-PATCHES=("${FILESDIR}"/${PN}-2.35.1-cet.patch) |
26 |
+PATCHES=( |
27 |
+ "${FILESDIR}"/${PN}-2.35.1-cet.patch |
28 |
+ "${FILESDIR}"/${PN}-2.35.2-powerpc-tests.patch |
29 |
+) |
30 |
|
31 |
MY_BUILDDIR=${WORKDIR}/build |
32 |
|
33 |
|
34 |
diff --git a/sys-devel/binutils/files/binutils-2.35.2-powerpc-tests.patch b/sys-devel/binutils/files/binutils-2.35.2-powerpc-tests.patch |
35 |
new file mode 100644 |
36 |
index 00000000000..711194b1eae |
37 |
--- /dev/null |
38 |
+++ b/sys-devel/binutils/files/binutils-2.35.2-powerpc-tests.patch |
39 |
@@ -0,0 +1,136 @@ |
40 |
+From: Alan Modra <amodra@×××××.com> |
41 |
+Date: Mon, 16 Nov 2020 22:08:05 +0000 (+1030) |
42 |
+Subject: PR26882, --enable-textrel-check=warning test failures on powerpc |
43 |
+X-Git-Tag: binutils-2_36~578 |
44 |
+X-Git-Url: https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff_plain;h=7cc340055d3993a25ded914aef88f784f16d46bc;hp=6f2643dbd2192e6fff77a5e6fec5141d209fd7d0 |
45 |
+ |
46 |
+PR26882, --enable-textrel-check=warning test failures on powerpc |
47 |
+ |
48 |
+ PR 26882 |
49 |
+ * testsuite/ld-powerpc/dotsym3.d: Add "-z notext" to ld options. |
50 |
+ * testsuite/ld-powerpc/dotsym4.d: Likewise. |
51 |
+ * testsuite/ld-powerpc/ppc476-shared.d: Likewise. |
52 |
+ * testsuite/ld-powerpc/ppc476-shared2.d: Likewise. |
53 |
+ * testsuite/ld-powerpc/powerpc.exp: Likewise for various tests. |
54 |
+ * testsuite/ld-undefined/weak-fundef.s: Add BLPLT variant. |
55 |
+ * testsuite/ld-undefined/weak-undef.exp: Define BLPLT for ppc32. |
56 |
+--- |
57 |
+ |
58 |
+diff --git a/ld/testsuite/ld-powerpc/dotsym3.d b/ld/testsuite/ld-powerpc/dotsym3.d |
59 |
+index fac2f8ec732..215a9c2a6c1 100644 |
60 |
+--- a/ld/testsuite/ld-powerpc/dotsym3.d |
61 |
++++ b/ld/testsuite/ld-powerpc/dotsym3.d |
62 |
+@@ -1,7 +1,7 @@ |
63 |
+ #source: nodotsym.s |
64 |
+ #source: dotsymref.s |
65 |
+ #as: -a64 |
66 |
+-#ld: -melf64ppc -Ttext=0x1000 -shared |
67 |
++#ld: -melf64ppc -Ttext=0x1000 -shared -z notext |
68 |
+ #objdump: -dR |
69 |
+ |
70 |
+ .*: file format .* |
71 |
+diff --git a/ld/testsuite/ld-powerpc/dotsym4.d b/ld/testsuite/ld-powerpc/dotsym4.d |
72 |
+index fdd92f3da76..d774e83bcf6 100644 |
73 |
+--- a/ld/testsuite/ld-powerpc/dotsym4.d |
74 |
++++ b/ld/testsuite/ld-powerpc/dotsym4.d |
75 |
+@@ -1,7 +1,7 @@ |
76 |
+ #source: dotsymref.s |
77 |
+ #source: nodotsym.s |
78 |
+ #as: -a64 |
79 |
+-#ld: -melf64ppc -Ttext=0x1000 -shared |
80 |
++#ld: -melf64ppc -Ttext=0x1000 -shared -z notext |
81 |
+ #objdump: -dR |
82 |
+ |
83 |
+ .*: file format .* |
84 |
+diff --git a/ld/testsuite/ld-powerpc/powerpc.exp b/ld/testsuite/ld-powerpc/powerpc.exp |
85 |
+index 74af28d7421..2cbefb841c2 100644 |
86 |
+--- a/ld/testsuite/ld-powerpc/powerpc.exp |
87 |
++++ b/ld/testsuite/ld-powerpc/powerpc.exp |
88 |
+@@ -99,7 +99,7 @@ proc supports_ppc64 { } { |
89 |
+ # readelf: Apply readelf options on result. Compare with regex (last arg). |
90 |
+ |
91 |
+ set ppcelftests { |
92 |
+- {"Reloc section order" "-melf32ppc -shared -z nocombreloc" "" "-a32" {reloc.s} |
93 |
++ {"Reloc section order" "-melf32ppc -shared -z nocombreloc -z notext" "" "-a32" {reloc.s} |
94 |
+ {{objdump -hw reloc.d}} "reloc.so"} |
95 |
+ {"APUinfo section processing" "-melf32ppc" "" |
96 |
+ "-a32 -me500" {apuinfo1.s apuinfo-nul.s apuinfo2.s} |
97 |
+@@ -134,7 +134,7 @@ set ppcelftests { |
98 |
+ {{readelf -WSsrl tlsexe32no.r} {objdump -dr tlsexe32no.d} |
99 |
+ {objdump -sj.got tlsexe32no.g} {objdump -sj.tdata tlsexe32.t}} |
100 |
+ "tlsexe32no"} |
101 |
+- {"TLS32 shared" "-shared -melf32ppc --no-plt-align --no-ld-generated-unwind-info --hash-style=sysv tmpdir/tls32.o" "" "" {} |
102 |
++ {"TLS32 shared" "-shared -melf32ppc --no-plt-align --no-ld-generated-unwind-info --hash-style=sysv -z notext tmpdir/tls32.o" "" "" {} |
103 |
+ {{readelf -WSsrl tlsso32.r} {objdump -dr tlsso32.d} |
104 |
+ {objdump -sj.got tlsso32.g} {objdump -sj.tdata tlsso32.t}} |
105 |
+ "tls32.so"} |
106 |
+@@ -202,7 +202,7 @@ set ppc64elftests { |
107 |
+ {{readelf -WSsrl tlsexeno.r} {objdump -dr tlsexeno.d} |
108 |
+ {objdump -sj.got tlsexeno.g} {objdump -sj.tdata tlsexe.t}} |
109 |
+ "tlsexeno"} |
110 |
+- {"TLS shared" "-shared -melf64ppc --no-plt-align --no-ld-generated-unwind-info --hash-style=sysv tmpdir/tls.o" "" "" {} |
111 |
++ {"TLS shared" "-shared -melf64ppc --no-plt-align --no-ld-generated-unwind-info --hash-style=sysv -z notext tmpdir/tls.o" "" "" {} |
112 |
+ {{readelf -WSsrl tlsso.r} {objdump -dr tlsso.d} |
113 |
+ {objdump -sj.got tlsso.g} {objdump -sj.tdata tlsso.t}} |
114 |
+ "tls.so"} |
115 |
+@@ -229,7 +229,7 @@ set ppc64elftests { |
116 |
+ {{readelf -WSsrl tlsexetoc.r} {objdump -dr tlsexetocno.d} |
117 |
+ {objdump -sj.got tlsexetocno.g} {objdump -sj.tdata tlsexetoc.t}} |
118 |
+ "tlsexetocno"} |
119 |
+- {"TLSTOC shared" "-shared -melf64ppc --no-plt-align --no-ld-generated-unwind-info --hash-style=sysv tmpdir/tlstoc.o" "" "" {} |
120 |
++ {"TLSTOC shared" "-shared -melf64ppc --no-plt-align --no-ld-generated-unwind-info --hash-style=sysv -z notext tmpdir/tlstoc.o" "" "" {} |
121 |
+ {{readelf -WSsrl tlstocso.r} {objdump -dr tlstocso.d} |
122 |
+ {objdump -sj.got tlstocso.g} {objdump -sj.tdata tlstocso.t}} |
123 |
+ "tlstoc.so"} |
124 |
+diff --git a/ld/testsuite/ld-powerpc/ppc476-shared.d b/ld/testsuite/ld-powerpc/ppc476-shared.d |
125 |
+index 7953cb44e25..3b2cc8a155c 100644 |
126 |
+--- a/ld/testsuite/ld-powerpc/ppc476-shared.d |
127 |
++++ b/ld/testsuite/ld-powerpc/ppc476-shared.d |
128 |
+@@ -1,6 +1,6 @@ |
129 |
+ #source: ppc476-shared.s |
130 |
+ #as: -a32 |
131 |
+-#ld: -melf32ppc -q -shared -z common-page-size=0x10000 --ppc476-workaround -T ppc476-shared.lnk |
132 |
++#ld: -melf32ppc -q -shared -z common-page-size=0x10000 -z notext --ppc476-workaround -T ppc476-shared.lnk |
133 |
+ #objdump: -dr |
134 |
+ #target: powerpc*-*-* |
135 |
+ |
136 |
+diff --git a/ld/testsuite/ld-powerpc/ppc476-shared2.d b/ld/testsuite/ld-powerpc/ppc476-shared2.d |
137 |
+index 26a5c41f988..48917fd4d92 100644 |
138 |
+--- a/ld/testsuite/ld-powerpc/ppc476-shared2.d |
139 |
++++ b/ld/testsuite/ld-powerpc/ppc476-shared2.d |
140 |
+@@ -1,6 +1,6 @@ |
141 |
+ #source: ppc476-shared.s |
142 |
+ #as: -a32 |
143 |
+-#ld: -melf32ppc -shared -z common-page-size=0x10000 --ppc476-workaround -T ppc476-shared.lnk |
144 |
++#ld: -melf32ppc -shared -z common-page-size=0x10000 -z notext --ppc476-workaround -T ppc476-shared.lnk |
145 |
+ #objdump: -R |
146 |
+ #target: powerpc*-*-* |
147 |
+ |
148 |
+diff --git a/ld/testsuite/ld-undefined/weak-fundef.s b/ld/testsuite/ld-undefined/weak-fundef.s |
149 |
+index 2c20f799417..de8f641b6c2 100644 |
150 |
+--- a/ld/testsuite/ld-undefined/weak-fundef.s |
151 |
++++ b/ld/testsuite/ld-undefined/weak-fundef.s |
152 |
+@@ -5,6 +5,9 @@ |
153 |
+ bl undef_weak_fun |
154 |
+ nop |
155 |
+ .endif |
156 |
++ .ifdef BLPLT |
157 |
++ bl undef_weak_fun@plt |
158 |
++ .endif |
159 |
+ .ifdef CALLPLT |
160 |
+ call undef_weak_fun@plt |
161 |
+ .endif |
162 |
+diff --git a/ld/testsuite/ld-undefined/weak-undef.exp b/ld/testsuite/ld-undefined/weak-undef.exp |
163 |
+index 50c8e1483e3..14b6774c5bc 100644 |
164 |
+--- a/ld/testsuite/ld-undefined/weak-undef.exp |
165 |
++++ b/ld/testsuite/ld-undefined/weak-undef.exp |
166 |
+@@ -105,7 +105,8 @@ set asflags "" |
167 |
+ switch -glob $target_triplet { |
168 |
+ aarch64* - |
169 |
+ arm* - |
170 |
+- powerpc* { set asflags "--defsym BL=1" } |
171 |
++ powerpc64* { set asflags "--defsym BL=1" } |
172 |
++ powerpc* { set asflags "--defsym BLPLT=1" } |
173 |
+ hppa* { set asflags "--defsym HPPA=1" } |
174 |
+ i\[3-7\]86* - |
175 |
+ x86_64* { set asflags "--defsym CALLPLT=1" } |