From c076913c3584c7ecf244102ee873622326a312cc Mon Sep 17 00:00:00 2001 From: Stewart Addison Date: Tue, 3 Dec 2019 17:13:45 +0000 Subject: [PATCH 1/2] Revert "Temporarily use JDK11 to boot JDK11 builds (#1411)" This reverts commit 572d554169a10c1b02a5f1440acd1657cbcb7648. --- build-farm/make-adopt-build-farm.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-farm/make-adopt-build-farm.sh b/build-farm/make-adopt-build-farm.sh index e1e50d1fb..9f9f85cc3 100755 --- a/build-farm/make-adopt-build-farm.sh +++ b/build-farm/make-adopt-build-farm.sh @@ -59,7 +59,7 @@ case "${JDK_BOOT_VERSION}" in "7") export JDK_BOOT_DIR="${JDK_BOOT_DIR:-$JDK7_BOOT_DIR}";; "8") export JDK_BOOT_DIR="${JDK_BOOT_DIR:-$JDK8_BOOT_DIR}";; "9") export JDK_BOOT_DIR="${JDK_BOOT_DIR:-$JDK9_BOOT_DIR}";; - "10") export JDK_BOOT_DIR="${JDK_BOOT_DIR:-$JDK11_BOOT_DIR}";; + "10") export JDK_BOOT_DIR="${JDK_BOOT_DIR:-$JDK10_BOOT_DIR}";; "11") export JDK_BOOT_DIR="${JDK_BOOT_DIR:-$JDK11_BOOT_DIR}";; "12") export JDK_BOOT_DIR="${JDK_BOOT_DIR:-$JDK12_BOOT_DIR}";; "13") export JDK_BOOT_DIR="${JDK_BOOT_DIR:-$JDK13_BOOT_DIR}";; From bad3bc9b5e168d36ec3acbe4b29010c6d6fafd59 Mon Sep 17 00:00:00 2001 From: Stewart Addison Date: Thu, 12 Dec 2019 16:39:22 +0000 Subject: [PATCH 2/2] Revert "Disable DDR support for AIX/JDK13/OpenJ9 (#1399)" This reverts commit 7b2f444b21e2be974ab68925f60fd8121ec95371. --- build-farm/platform-specific-configurations/aix.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/build-farm/platform-specific-configurations/aix.sh b/build-farm/platform-specific-configurations/aix.sh index 189c0a277..dd64525cb 100755 --- a/build-farm/platform-specific-configurations/aix.sh +++ b/build-farm/platform-specific-configurations/aix.sh @@ -64,10 +64,6 @@ then export PATH=/opt/freeware/bin:$JAVA_HOME/bin:/usr/local/bin:/opt/IBM/xlC/16.1.0/bin:/opt/IBM/xlc/16.1.0/bin:$PATH export CC=xlclang export CXX=xlclang++ - # J9 JDK13 will break with an error building against libdwarf without this at present - if [ "${VARIANT}" == "${BUILD_VARIANT_OPENJ9}" ]; then - export CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM} --disable-ddr" - fi else export PATH=/opt/freeware/bin:$JAVA_HOME/bin:/usr/local/bin:/opt/IBM/xlC/13.1.3/bin:/opt/IBM/xlc/13.1.3/bin:$PATH fi