Skip to content

Commit 142f99a

Browse files
rorthrorth
authored
[clang][Driver][test] Fix Driver/solaris-ld.c (#138466)
`Clang :: Driver/solaris-ld.c` currently `FAIL`s on two buildbots: [fuchsia-x86_64-linux](https://lab.llvm.org/buildbot/#/builders/11/builds/14369) and [llvm-clang-win-x-aarch64](https://lab.llvm.org/buildbot/#/builders/193/builds/7452). Judging from `linux-ld.c`, all subtests need `-rtlib=platform --unwindlib=platform` whenever host and target have different `rtlib` and `unwindlib` defaults, which is what this patch does for `solaris-ld.c`, too. Tested on `amd64-pc-solaris2.11`, `sparcv9-sun-solaris2.11`, and `x86_64-pc-linux-gnu`.
1 parent c3ff3b2 commit 142f99a

File tree

1 file changed

+35
-1
lines changed

1 file changed

+35
-1
lines changed

‎clang/test/Driver/solaris-ld.c

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@
33

44
// Check sparc-sun-solaris2.11, 32bit
55
// RUN: %clang -### %s --target=sparc-sun-solaris2.11 -fuse-ld= \
6+
// RUN: -rtlib=platform --unwindlib=platform \
67
// RUN: --sysroot=%S/Inputs/solaris_sparc_tree 2>&1 \
78
// RUN: | FileCheck --check-prefixes=CHECK-LD-SPARC32,CHECK-LD %s
89
// RUN: %clang -### %s --target=sparc-sun-solaris2.11 -fuse-ld=gld \
10+
// RUN: -rtlib=platform --unwindlib=platform \
911
// RUN: --sysroot=%S/Inputs/solaris_sparc_tree 2>&1 \
1012
// RUN: | FileCheck --check-prefixes=CHECK-LD-SPARC32,CHECK-GLD %s
1113
// CHECK-LD-SPARC32-NOT: warning:
@@ -29,6 +31,7 @@
2931

3032
// Check sparc-sun-solaris2.11, 64bit
3133
// RUN: %clang -m64 -### %s 2>&1 --target=sparc-sun-solaris2.11 \
34+
// RUN: -rtlib=platform --unwindlib=platform \
3235
// RUN: --sysroot=%S/Inputs/solaris_sparc_tree \
3336
// RUN: | FileCheck --check-prefix=CHECK-LD-SPARC64 %s
3437
// CHECK-LD-SPARC64-NOT: warning:
@@ -50,6 +53,7 @@
5053

5154
// Check i386-pc-solaris2.11, 32bit
5255
// RUN: %clang -### %s 2>&1 --target=i386-pc-solaris2.11 \
56+
// RUN: -rtlib=platform --unwindlib=platform \
5357
// RUN: --sysroot=%S/Inputs/solaris_x86_tree \
5458
// RUN: | FileCheck --check-prefix=CHECK-LD-X32 %s
5559
// CHECK-LD-X32-NOT: warning:
@@ -72,6 +76,7 @@
7276
// Check i386-pc-solaris2.11, 64bit
7377
// RUN: %clang -m64 -### %s 2>&1 \
7478
// RUN: --target=i386-pc-solaris2.11 \
79+
// RUN: -rtlib=platform --unwindlib=platform \
7580
// RUN: --sysroot=%S/Inputs/solaris_x86_tree \
7681
// RUN: | FileCheck --check-prefix=CHECK-LD-X64 %s
7782
// CHECK-LD-X64-NOT: warning:
@@ -94,6 +99,7 @@
9499
// Check the right -l flags are present with -shared
95100
// RUN: %clang -### %s -shared 2>&1 \
96101
// RUN: --target=sparc-sun-solaris2.11 \
102+
// RUN: -rtlib=platform --unwindlib=platform \
97103
// RUN: --sysroot=%S/Inputs/solaris_sparc_tree \
98104
// RUN: | FileCheck --check-prefix=CHECK-SPARC32-SHARED %s
99105
// CHECK-SPARC32-SHARED: "{{.*}}ld{{(.exe)?}}"
@@ -103,7 +109,7 @@
103109

104110
/// Check that -static-libgcc is supported.
105111
// RUN: %clang -### %s --target=sparc-sun-solaris2.11 \
106-
// RUN: -static-libgcc \
112+
// RUN: -static-libgcc -rtlib=platform --unwindlib=platform \
107113
// RUN: --sysroot=%S/Inputs/solaris_sparc_tree 2>&1 \
108114
// RUN: | FileCheck --check-prefixes=CHECK-STATIC-LIBGCC %s
109115
// CHECK-STATIC-LIBGCC-NOT: warning: argument unused during compilation: '-static-libgcc'
@@ -112,51 +118,65 @@
112118

113119
// Check that libm is only linked with clang++.
114120
// RUN: %clang -### %s --target=sparc-sun-solaris2.11 \
121+
// RUN: -rtlib=platform --unwindlib=platform \
115122
// RUN: --sysroot=%S/Inputs/solaris_sparc_tree 2>&1 \
116123
// RUN: | FileCheck --check-prefix=CHECK-NOLIBM %s
117124
// RUN: %clang -### %s -shared --target=sparc-sun-solaris2.11 \
125+
// RUN: -rtlib=platform --unwindlib=platform \
118126
// RUN: --sysroot=%S/Inputs/solaris_sparc_tree 2>&1 \
119127
// RUN: | FileCheck --check-prefix=CHECK-NOLIBM %s
120128
// RUN: %clangxx -### %s --target=sparc-sun-solaris2.11 \
129+
// RUN: -rtlib=platform --unwindlib=platform \
121130
// RUN: --sysroot=%S/Inputs/solaris_sparc_tree 2>&1 \
122131
// RUN: | FileCheck --check-prefix=CHECK-LIBM %s
123132
// RUN: %clangxx -### %s -shared --target=sparc-sun-solaris2.11 \
133+
// RUN: -rtlib=platform --unwindlib=platform \
124134
// RUN: --sysroot=%S/Inputs/solaris_sparc_tree 2>&1 \
125135
// RUN: | FileCheck --check-prefix=CHECK-LIBM %s
126136
// CHECK-LIBM: "-lm"
127137
// CHECK-NOLIBM-NOT: "-lm"
128138

129139
// Check the right ld flags are present with -pie.
130140
// RUN: %clang --target=sparc-sun-solaris2.11 -### %s -pie -fuse-ld= \
141+
// RUN: -rtlib=platform --unwindlib=platform \
131142
// RUN: --sysroot=%S/Inputs/solaris_sparc_tree 2>&1 \
132143
// RUN: | FileCheck --check-prefix=CHECK-PIE-LD %s
133144
// RUN: %clang --target=sparc-sun-solaris2.11 -### %s -pie -fuse-ld=gld \
145+
// RUN: -rtlib=platform --unwindlib=platform \
134146
// RUN: --sysroot=%S/Inputs/solaris_sparc_tree 2>&1 \
135147
// RUN: | FileCheck --check-prefix=CHECK-PIE-GLD %s
136148
// RUN: %clang --target=sparc-sun-solaris2.11 -### %s -no-pie -fuse-ld= \
149+
// RUN: -rtlib=platform --unwindlib=platform \
137150
// RUN: --sysroot=%S/Inputs/solaris_sparc_tree 2>&1 \
138151
// RUN: | FileCheck --check-prefix=CHECK-NOPIE-LD %s
139152
// RUN: %clang --target=sparc-sun-solaris2.11 -### %s -no-pie -fuse-ld=gld \
153+
// RUN: -rtlib=platform --unwindlib=platform \
140154
// RUN: --sysroot=%S/Inputs/solaris_sparc_tree 2>&1 \
141155
// RUN: | FileCheck --check-prefix=CHECK-NOPIE-GLD %s
142156

143157
// Check that -shared/-r/-static disable PIE.
144158
// RUN: %clang --target=sparc-sun-solaris2.11 -### %s -shared -pie -fuse-ld= \
159+
// RUN: -rtlib=platform --unwindlib=platform \
145160
// RUN: --sysroot=%S/Inputs/solaris_sparc_tree 2>&1 \
146161
// RUN: | FileCheck --check-prefix=CHECK-NOPIE-LD %s
147162
// RUN: %clang --target=sparc-sun-solaris2.11 -### %s -shared -pie -fuse-ld=gld \
163+
// RUN: -rtlib=platform --unwindlib=platform \
148164
// RUN: --sysroot=%S/Inputs/solaris_sparc_tree 2>&1 \
149165
// RUN: | FileCheck --check-prefix=CHECK-NOPIE-GLD %s
150166
// RUN: %clang --target=sparc-sun-solaris2.11 -### %s -r -pie -fuse-ld= \
167+
// RUN: -rtlib=platform --unwindlib=platform \
151168
// RUN: --sysroot=%S/Inputs/solaris_sparc_tree 2>&1 \
152169
// RUN: | FileCheck --check-prefix=CHECK-NOPIE-LD %s
153170
// RUN: %clang --target=sparc-sun-solaris2.11 -### %s -r -pie -fuse-ld=gld \
171+
// RUN: -rtlib=platform --unwindlib=platform \
154172
// RUN: --sysroot=%S/Inputs/solaris_sparc_tree 2>&1 \
155173
// RUN: | FileCheck --check-prefix=CHECK-NOPIE-GLD %s
156174
// RUN: %clang --target=sparc-sun-solaris2.11 -### %s -static -pie -fuse-ld= \
175+
// RUN: -rtlib=platform --unwindlib=platform \
157176
// RUN: --sysroot=%S/Inputs/solaris_sparc_tree 2>&1 \
158177
// RUN: | FileCheck --check-prefix=CHECK-NOPIE-LD %s
159178
// RUN: %clang --target=sparc-sun-solaris2.11 -### %s -static -pie -fuse-ld=gld \
179+
// RUN: -rtlib=platform --unwindlib=platform \
160180
// RUN: --sysroot=%S/Inputs/solaris_sparc_tree 2>&1 \
161181
// RUN: | FileCheck --check-prefix=CHECK-NOPIE-GLD %s
162182

@@ -167,6 +187,7 @@
167187

168188
// -r suppresses default -l and crt*.o, values-*.o like -nostdlib.
169189
// RUN: %clang -### %s --target=sparc-sun-solaris2.11 -r 2>&1 \
190+
// RUN: -rtlib=platform --unwindlib=platform \
170191
// RUN: | FileCheck %s --check-prefix=CHECK-RELOCATABLE
171192
// CHECK-RELOCATABLE: "-L
172193
// CHECK-RELOCATABLE: "-r"
@@ -177,15 +198,19 @@
177198

178199
// Check that crt{begin,end}S.o is linked with -shared/-pie.
179200
// RUN: %clang --target=sparc-sun-solaris2.11 -### %s \
201+
// RUN: -rtlib=platform --unwindlib=platform \
180202
// RUN: --sysroot=%S/Inputs/solaris_sparc_tree 2>&1 \
181203
// RUN: | FileCheck --check-prefix=CHECK-NOCRTS %s
182204
// RUN: %clang --target=sparc-sun-solaris2.11 -### %s -shared \
205+
// RUN: -rtlib=platform --unwindlib=platform \
183206
// RUN: --sysroot=%S/Inputs/solaris_sparc_tree 2>&1 \
184207
// RUN: | FileCheck --check-prefix=CHECK-CRTS %s
185208
// RUN: %clang --target=sparc-sun-solaris2.11 -### %s -no-pie \
209+
// RUN: -rtlib=platform --unwindlib=platform \
186210
// RUN: --sysroot=%S/Inputs/solaris_sparc_tree 2>&1 \
187211
// RUN: | FileCheck --check-prefix=CHECK-NOCRTS %s
188212
// RUN: %clang --target=sparc-sun-solaris2.11 -### %s -pie \
213+
// RUN: -rtlib=platform --unwindlib=platform \
189214
// RUN: --sysroot=%S/Inputs/solaris_sparc_tree 2>&1 \
190215
// RUN: | FileCheck --check-prefix=CHECK-CRTS %s
191216
// CHECK-CRTS: crtbeginS.o
@@ -197,12 +222,15 @@
197222

198223
// Check sparc-sun-solaris2.11, 32bit
199224
// RUN: %clang --target=sparc-sun-solaris2.11 -### %s \
225+
// RUN: -rtlib=platform --unwindlib=platform \
200226
// RUN: --sysroot=%S/Inputs/solaris_sparc_tree 2>&1 \
201227
// RUN: | FileCheck --check-prefix=CHECK-NOCRTFASTMATH-SPARC32 %s
202228
// RUN: %clang --target=sparc-sun-solaris2.11 -### %s -ffast-math \
229+
// RUN: -rtlib=platform --unwindlib=platform \
203230
// RUN: --sysroot=%S/Inputs/solaris_sparc_tree 2>&1 \
204231
// RUN: | FileCheck --check-prefix=CHECK-CRTFASTMATH-SPARC32 %s
205232
// RUN: %clang --target=sparc-sun-solaris2.11 -### %s -ffp-model=fast \
233+
// RUN: -rtlib=platform --unwindlib=platform \
206234
// RUN: --sysroot=%S/Inputs/solaris_sparc_tree 2>&1 \
207235
// RUN: | FileCheck --check-prefix=CHECK-CRTFASTMATH-SPARC32 %s
208236
// CHECK-CRTFASTMATH-SPARC32: "-isysroot" "[[SYSROOT:[^"]+]]"
@@ -211,9 +239,11 @@
211239

212240
// Check sparc-pc-solaris2.11, 64bit
213241
// RUN: %clang -m64 --target=sparc-sun-solaris2.11 -### %s \
242+
// RUN: -rtlib=platform --unwindlib=platform \
214243
// RUN: --sysroot=%S/Inputs/solaris_sparc_tree 2>&1 \
215244
// RUN: | FileCheck --check-prefix=CHECK-NOCRTFASTMATH-SPARC64 %s
216245
// RUN: %clang -m64 --target=sparc-sun-solaris2.11 -### %s -ffast-math \
246+
// RUN: -rtlib=platform --unwindlib=platform \
217247
// RUN: --sysroot=%S/Inputs/solaris_sparc_tree 2>&1 \
218248
// RUN: | FileCheck --check-prefix=CHECK-CRTFASTMATH-SPARC64 %s
219249
// CHECK-CRTFASTMATH-SPARC64: "-isysroot" "[[SYSROOT:[^"]+]]"
@@ -222,9 +252,11 @@
222252

223253
// Check i386-pc-solaris2.11, 32bit
224254
// RUN: %clang --target=i386-pc-solaris2.11 -### %s \
255+
// RUN: -rtlib=platform --unwindlib=platform \
225256
// RUN: --sysroot=%S/Inputs/solaris_x86_tree 2>&1 \
226257
// RUN: | FileCheck --check-prefix=CHECK-NOCRTFASTMATH-X32 %s
227258
// RUN: %clang --target=i386-pc-solaris2.11 -### %s -ffast-math \
259+
// RUN: -rtlib=platform --unwindlib=platform \
228260
// RUN: --sysroot=%S/Inputs/solaris_x86_tree 2>&1 \
229261
// RUN: | FileCheck --check-prefix=CHECK-CRTFASTMATH-X32 %s
230262
// CHECK-CRTFASTMATH-X32: "-isysroot" "[[SYSROOT:[^"]+]]"
@@ -233,9 +265,11 @@
233265

234266
// Check i386-pc-solaris2.11, 64bit
235267
// RUN: %clang -m64 --target=i386-pc-solaris2.11 -### %s \
268+
// RUN: -rtlib=platform --unwindlib=platform \
236269
// RUN: --sysroot=%S/Inputs/solaris_x86_tree 2>&1 \
237270
// RUN: | FileCheck --check-prefix=CHECK-NOCRTFASTMATH-X64 %s
238271
// RUN: %clang -m64 --target=i386-pc-solaris2.11 -### %s -ffast-math \
272+
// RUN: -rtlib=platform --unwindlib=platform \
239273
// RUN: --sysroot=%S/Inputs/solaris_x86_tree 2>&1 \
240274
// RUN: | FileCheck --check-prefix=CHECK-CRTFASTMATH-X64 %s
241275
// CHECK-CRTFASTMATH-X64: "-isysroot" "[[SYSROOT:[^"]+]]"

0 commit comments

Comments
 (0)