# HG changeset patch # User erikj # Date 1548881669 28800 # Node ID b5f05fe4a6f8b3996a000c20078b356d991ca8ec # Parent ad3bb34fe3993985cec8648b6119c32772869620 8218084: Revert JDK-8218057 Reviewed-by: darcy, ctornqvi diff -r ad3bb34fe399 -r b5f05fe4a6f8 make/conf/jib-profiles.js --- a/make/conf/jib-profiles.js Wed Jan 30 21:12:56 2019 +0100 +++ b/make/conf/jib-profiles.js Wed Jan 30 12:54:29 2019 -0800 @@ -238,7 +238,7 @@ common.main_profile_names = [ "linux-x64", "linux-x86", "macosx-x64", "solaris-x64", "solaris-sparcv9", "windows-x64", "windows-x86", - "linux-aarch64", "linux-arm32", "linux-ppc64le", "linux-s390x" + "linux-aarch64", "linux-arm32" ]; // These are the base setttings for all the main build profiles. @@ -461,28 +461,6 @@ "--with-abi-profile=arm-vfp-hflt", "--disable-warnings-as-errors" ], }, - - "linux-ppc64le": { - target_os: "linux", - target_cpu: "ppc64le", - build_cpu: "x64", - dependencies: ["devkit", "build_devkit", "cups"], - configure_args: [ - "--openjdk-target=ppc64le-linux-gnu", "--with-freetype=bundled", - "--disable-warnings-as-errors" - ], - }, - - "linux-s390x": { - target_os: "linux", - target_cpu: "s390x", - build_cpu: "x64", - dependencies: ["devkit", "build_devkit", "cups"], - configure_args: [ - "--openjdk-target=s390x-linux-gnu", "--with-freetype=bundled", - "--disable-warnings-as-errors" - ], - }, }; // Add the base settings to all the main profiles @@ -645,12 +623,6 @@ }, "linux-arm32": { platform: "linux-arm32", - }, - "linux-ppc64le": { - platform: "linux-ppc64le", - }, - "linux-s390x": { - platform: "linux-s390x", } } // Generate common artifacts for all main profiles @@ -895,9 +867,7 @@ solaris_sparcv9: "SS12u6-Solaris11u3+1.0", windows_x64: "VS2017-15.5.5+1.0", linux_aarch64: "gcc7.3.0-Fedora27+1.2", - linux_arm: "gcc7.3.0-Fedora27+1.2", - linux_ppc64le: "gcc7.3.0-Fedora27+1.0", - linux_s390x: "gcc7.3.0-Fedora27+1.0" + linux_arm: "gcc7.3.0-Fedora27+1.2" }; var devkit_platform = (input.target_cpu == "x86"