Merge
This commit is contained in:
commit
9e0d0d77fc
@ -370,3 +370,4 @@ f80c841ae2545eaf9acd2724bccc305d98cefbe2 jdk-9+124
|
|||||||
9aa7d40f3a453f51e47f4c1b19eff5740a74a9f8 jdk-9+125
|
9aa7d40f3a453f51e47f4c1b19eff5740a74a9f8 jdk-9+125
|
||||||
3a58466296d36944454756ef01e7513ac5e14a16 jdk-9+126
|
3a58466296d36944454756ef01e7513ac5e14a16 jdk-9+126
|
||||||
8fa686245bd2a072ece3392743460030f0854520 jdk-9+127
|
8fa686245bd2a072ece3392743460030f0854520 jdk-9+127
|
||||||
|
b30ae794d974d7dd3eb4e84203f70021823fa6c6 jdk-9+128
|
||||||
|
@ -345,6 +345,9 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_ARGUMENTS],
|
|||||||
# Disable special log output when a debug build is used as Boot JDK...
|
# Disable special log output when a debug build is used as Boot JDK...
|
||||||
ADD_JVM_ARG_IF_OK([-XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput],boot_jdk_jvmargs,[$JAVA])
|
ADD_JVM_ARG_IF_OK([-XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput],boot_jdk_jvmargs,[$JAVA])
|
||||||
|
|
||||||
|
# Force en-US environment
|
||||||
|
ADD_JVM_ARG_IF_OK([-Duser.language=en -Duser.country=US],boot_jdk_jvmargs,[$JAVA])
|
||||||
|
|
||||||
# Apply user provided options.
|
# Apply user provided options.
|
||||||
ADD_JVM_ARG_IF_OK([$with_boot_jdk_jvmargs],boot_jdk_jvmargs,[$JAVA])
|
ADD_JVM_ARG_IF_OK([$with_boot_jdk_jvmargs],boot_jdk_jvmargs,[$JAVA])
|
||||||
|
|
||||||
|
@ -50755,6 +50755,17 @@ $as_echo "$as_me: GCC >= 6 detected; adding ${NO_DELETE_NULL_POINTER_CHECKS_CFLA
|
|||||||
OPENJDK_BUILD_CFLAGS_JDK="$OPENJDK_BUILD_CFLAGS_JDK ${NO_DELETE_NULL_POINTER_CHECKS_CFLAG} ${NO_LIFETIME_DSE_CFLAG}"
|
OPENJDK_BUILD_CFLAGS_JDK="$OPENJDK_BUILD_CFLAGS_JDK ${NO_DELETE_NULL_POINTER_CHECKS_CFLAG} ${NO_LIFETIME_DSE_CFLAG}"
|
||||||
OPENJDK_BUILD_JVM_CFLAGS="$OPENJDK_BUILD_JVM_CFLAGS ${NO_DELETE_NULL_POINTER_CHECKS_CFLAG} ${NO_LIFETIME_DSE_CFLAG}"
|
OPENJDK_BUILD_JVM_CFLAGS="$OPENJDK_BUILD_JVM_CFLAGS ${NO_DELETE_NULL_POINTER_CHECKS_CFLAG} ${NO_LIFETIME_DSE_CFLAG}"
|
||||||
|
|
||||||
|
# These flags are required for GCC 6 builds as undefined behaviour in OpenJDK code
|
||||||
|
# runs afoul of the more aggressive versions of these optimisations.
|
||||||
|
# Notably, value range propagation now assumes that the this pointer of C++
|
||||||
|
# member functions is non-null.
|
||||||
|
NO_DELETE_NULL_POINTER_CHECKS_CFLAG="-fno-delete-null-pointer-checks"
|
||||||
|
NO_LIFETIME_DSE_CFLAG="-fno-lifetime-dse"
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: GCC >= 6 detected; adding ${NO_DELETE_NULL_POINTER_CHECKS_CFLAG} and ${NO_LIFETIME_DSE_CFLAG}" >&5
|
||||||
|
$as_echo "$as_me: GCC >= 6 detected; adding ${NO_DELETE_NULL_POINTER_CHECKS_CFLAG} and ${NO_LIFETIME_DSE_CFLAG}" >&6;}
|
||||||
|
OPENJDK_BUILD_CFLAGS_JDK="$OPENJDK_BUILD_CFLAGS_JDK ${NO_DELETE_NULL_POINTER_CHECKS_CFLAG} ${NO_LIFETIME_DSE_CFLAG}"
|
||||||
|
OPENJDK_BUILD_JVM_CFLAGS="$OPENJDK_BUILD_JVM_CFLAGS ${NO_DELETE_NULL_POINTER_CHECKS_CFLAG} ${NO_LIFETIME_DSE_CFLAG}"
|
||||||
|
|
||||||
else
|
else
|
||||||
:
|
:
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user