File tree 3 files changed +17
-10
lines changed
src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot 3 files changed +17
-10
lines changed Original file line number Diff line number Diff line change @@ -197,11 +197,6 @@ dailyJDK15Debug: ${oraclejdk15Debug} {
197
197
198
198
]
199
199
timelimit : "2:00:00"
200
- packages : {
201
- # SVM object files with debuginfo are apparently more likely to be subject
202
- # to linker incompatibilities so we need to use the same linker use for building JDK 15
203
- binutils : "==2.34"
204
- }
205
200
}
206
201
207
202
gateLinuxAMD64AVX3 : ${gateLinuxAMD64} {
Original file line number Diff line number Diff line change @@ -231,19 +231,23 @@ protected void reportErrors() {
231
231
}
232
232
233
233
static void reportError (String rawErrorMessage ) {
234
- String value = getProperty ("JVMCI_CONFIG_CHECK" );
234
+ String value = System . getenv ("JVMCI_CONFIG_CHECK" );
235
235
Formatter errorMessage = new Formatter ().format (rawErrorMessage );
236
236
String javaHome = getProperty ("java.home" );
237
237
String vmName = getProperty ("java.vm.name" );
238
- errorMessage .format ("%nSet the JVMCI_CONFIG_CHECK system property to \" ignore\" to suppress " );
238
+ errorMessage .format ("%nSet the JVMCI_CONFIG_CHECK environment variable to \" ignore\" to suppress " );
239
239
errorMessage .format ("this error or to \" warn\" to emit a warning and continue execution.%n" );
240
240
errorMessage .format ("Currently used Java home directory is %s.%n" , javaHome );
241
241
errorMessage .format ("Currently used VM configuration is: %s%n" , vmName );
242
242
if ("ignore" .equals (value )) {
243
243
return ;
244
244
} else if ("warn" .equals (value ) || JDK_PRERELEASE ) {
245
245
System .err .println (errorMessage .toString ());
246
- } else {
246
+ } else if (!JVMCI && Assertions .assertionsEnabled ()) {
247
+ // We cannot control when VM config updates are made in non JVMCI JDKs so
248
+ // only issue a warning and only when assertions are enabled.
249
+ System .err .println (errorMessage .toString ());
250
+ } else if (JVMCI ) {
247
251
throw new JVMCIError (errorMessage .toString ());
248
252
}
249
253
}
Original file line number Diff line number Diff line change @@ -278,6 +278,14 @@ libgraal_truffle: ${svm-common-linux-amd64} ${custom_vm_linux} ${vm_linux} {
278
278
targets : [gate ]
279
279
}
280
280
281
+ binutils2_34 : {
282
+ packages : {
283
+ # On Linux AMD64, SVM object files with debuginfo are apparently more likely to be subject
284
+ # to linker incompatibilities so we need to use the same linker used for building JDK 15
285
+ binutils : "==2.34"
286
+ }
287
+ }
288
+
281
289
builds += [
282
290
#
283
291
# Gates
@@ -291,12 +299,12 @@ builds += [
291
299
${libgraal_compiler} ${vm_java_8} { name : gate-vm-libgraal-compiler-8-linux-amd64 }
292
300
${libgraal_compiler} ${vm_java_11} { name : gate-vm-libgraal-compiler-11-linux-amd64 }
293
301
${libgraal_compiler} ${vm_java_15} { name : gate-vm-libgraal-compiler-15-linux-amd64 }
294
- ${libgraal_compiler} ${vm_java_15Debug} { name : daily-vm-libgraal-compiler-15-linux-amd64 } ${dailyJDK15Debug}
302
+ ${libgraal_compiler} ${vm_java_15Debug} { name : daily-vm-libgraal-compiler-15-linux-amd64 } ${dailyJDK15Debug} ${binutils2_34}
295
303
296
304
${libgraal_truffle} ${vm_java_8} { name : gate-vm-libgraal-truffle-8-linux-amd64 }
297
305
${libgraal_truffle} ${vm_java_11} { name : gate-vm-libgraal-truffle-11-linux-amd64 }
298
306
${libgraal_truffle} ${vm_java_15} { name : gate-vm-libgraal-truffle-15-linux-amd64 }
299
- ${libgraal_truffle} ${vm_java_15Debug} { name : daily-vm-libgraal-truffle-15-linux-amd64 } ${dailyJDK15Debug}
307
+ ${libgraal_truffle} ${vm_java_15Debug} { name : daily-vm-libgraal-truffle-15-linux-amd64 } ${dailyJDK15Debug} ${binutils2_34}
300
308
301
309
${vm_java_8} ${svm-common-linux-amd64} ${sulong_linux} ${custom_vm_linux} ${gate_vm_linux} {
302
310
run : [
You can’t perform that action at this time.
0 commit comments