From fa765e7d346d26a1c5065830bd01d850720da8ae Mon Sep 17 00:00:00 2001 From: Magnus Ihse Bursie Date: Wed, 7 May 2025 13:23:16 +0000 Subject: [PATCH] 8356335: Remove linux-x86 from jib profiles Reviewed-by: erikj --- make/conf/jib-profiles.js | 100 +++++++++++++++++--------------------- 1 file changed, 45 insertions(+), 55 deletions(-) diff --git a/make/conf/jib-profiles.js b/make/conf/jib-profiles.js index f0cb6f451a3..172ed74f4cd 100644 --- a/make/conf/jib-profiles.js +++ b/make/conf/jib-profiles.js @@ -241,10 +241,10 @@ var getJibProfilesCommon = function (input, data) { // List of the main profile names used for iteration common.main_profile_names = [ - "linux-x64", "linux-x86", "macosx-x64", "macosx-aarch64", + "macosx-x64", "macosx-aarch64", "windows-x64", "windows-aarch64", - "linux-aarch64", "linux-arm32", "linux-ppc64le", "linux-s390x", - "linux-riscv64" + "linux-x64", "linux-aarch64", + "linux-arm32", "linux-ppc64le", "linux-s390x", "linux-riscv64" ]; // These are the base settings for all the main build profiles. @@ -283,9 +283,6 @@ var getJibProfilesCommon = function (input, data) { labels: "open" }; - common.configure_args_64bit = ["--with-target-bits=64"]; - common.configure_args_32bit = ["--with-target-bits=32"]; - /** * Define common artifacts template for all main profiles * @param o - Object containing data for artifacts @@ -412,58 +409,34 @@ var getJibProfilesProfiles = function (input, common, data) { // Main SE profiles var profiles = { - - "linux-x64": { - target_os: "linux", - target_cpu: "x64", - dependencies: ["devkit", "gtest", "build_devkit", "graphviz", "pandoc", "tidy"], - configure_args: concat( - (input.build_cpu == "x64" ? common.configure_args_64bit - : "--openjdk-target=x86_64-linux-gnu"), - "--with-zlib=system", "--disable-dtrace", - (isWsl(input) ? [ "--host=x86_64-unknown-linux-gnu", - "--build=x86_64-unknown-linux-gnu" ] : [])), - }, - - "linux-x86": { - target_os: "linux", - target_cpu: "x86", - build_cpu: "x64", - dependencies: ["devkit", "gtest", "libffi"], - configure_args: concat(common.configure_args_32bit, [ - "--with-jvm-variants=minimal,server", - "--with-zlib=system", - "--with-libffi=" + input.get("libffi", "home_path"), - "--enable-libffi-bundling", - "--enable-fallback-linker" - ]) - }, - "macosx-x64": { target_os: "macosx", target_cpu: "x64", dependencies: ["devkit", "gtest", "graphviz", "pandoc", "tidy"], - configure_args: concat(common.configure_args_64bit, "--with-zlib=system", + configure_args: [ + "--with-zlib=system", "--with-macosx-version-max=11.00.00", "--enable-compatible-cds-alignment", // Use system SetFile instead of the one in the devkit as the // devkit one may not work on Catalina. - "SETFILE=/usr/bin/SetFile"), + "SETFILE=/usr/bin/SetFile" + ], }, "macosx-aarch64": { target_os: "macosx", target_cpu: "aarch64", dependencies: ["devkit", "gtest", "graphviz", "pandoc", "tidy"], - configure_args: concat(common.configure_args_64bit, - "--with-macosx-version-max=11.00.00"), + configure_args: [ + "--with-macosx-version-max=11.00.00" + ], }, "windows-x64": { target_os: "windows", target_cpu: "x64", dependencies: ["devkit", "gtest", "pandoc"], - configure_args: concat(common.configure_args_64bit), + configure_args: [], }, "windows-aarch64": { @@ -475,7 +448,19 @@ var getJibProfilesProfiles = function (input, common, data) { ], }, - "linux-aarch64": { + "linux-x64": { + target_os: "linux", + target_cpu: "x64", + dependencies: ["devkit", "gtest", "build_devkit", "graphviz", "pandoc", "tidy"], + configure_args: concat( + "--with-zlib=system", + "--disable-dtrace", + (cross_compiling ? [ "--openjdk-target=x86_64-linux-gnu" ] : []), + (isWsl(input) ? [ "--host=x86_64-unknown-linux-gnu", + "--build=x86_64-unknown-linux-gnu" ] : [])), + }, + + "linux-aarch64": { target_os: "linux", target_cpu: "aarch64", dependencies: ["devkit", "gtest", "build_devkit", "graphviz", "pandoc", "tidy"], @@ -492,8 +477,10 @@ var getJibProfilesProfiles = function (input, common, data) { build_cpu: "x64", dependencies: ["devkit", "gtest", "build_devkit"], configure_args: [ - "--openjdk-target=arm-linux-gnueabihf", "--with-freetype=bundled", - "--with-abi-profile=arm-vfp-hflt", "--disable-warnings-as-errors" + "--openjdk-target=arm-linux-gnueabihf", + "--with-freetype=bundled", + "--with-abi-profile=arm-vfp-hflt", + "--disable-warnings-as-errors" ], }, @@ -503,7 +490,8 @@ var getJibProfilesProfiles = function (input, common, data) { build_cpu: "x64", dependencies: ["devkit", "gtest", "build_devkit"], configure_args: [ - "--openjdk-target=ppc64le-linux-gnu", "--with-freetype=bundled", + "--openjdk-target=ppc64le-linux-gnu", + "--with-freetype=bundled", "--disable-warnings-as-errors" ], }, @@ -514,7 +502,8 @@ var getJibProfilesProfiles = function (input, common, data) { build_cpu: "x64", dependencies: ["devkit", "gtest", "build_devkit"], configure_args: [ - "--openjdk-target=s390x-linux-gnu", "--with-freetype=bundled", + "--openjdk-target=s390x-linux-gnu", + "--with-freetype=bundled", "--disable-warnings-as-errors" ], }, @@ -525,7 +514,8 @@ var getJibProfilesProfiles = function (input, common, data) { build_cpu: "x64", dependencies: ["devkit", "gtest", "build_devkit"], configure_args: [ - "--openjdk-target=riscv64-linux-gnu", "--with-freetype=bundled", + "--openjdk-target=riscv64-linux-gnu", + "--with-freetype=bundled", "--disable-warnings-as-errors" ], }, @@ -586,24 +576,24 @@ var getJibProfilesProfiles = function (input, common, data) { target_os: "linux", target_cpu: "x64", dependencies: ["devkit", "gtest", "libffi"], - configure_args: concat(common.configure_args_64bit, [ + configure_args: [ "--with-zlib=system", "--with-jvm-variants=zero", "--with-libffi=" + input.get("libffi", "home_path"), "--enable-libffi-bundling", - ]) + ] }, "linux-aarch64-zero": { target_os: "linux", target_cpu: "aarch64", dependencies: ["devkit", "gtest", "libffi"], - configure_args: concat(common.configure_args_64bit, [ + configure_args: [ "--with-zlib=system", "--with-jvm-variants=zero", "--with-libffi=" + input.get("libffi", "home_path"), "--enable-libffi-bundling" - ]) + ] }, "linux-x86-zero": { @@ -611,12 +601,13 @@ var getJibProfilesProfiles = function (input, common, data) { target_cpu: "x86", build_cpu: "x64", dependencies: ["devkit", "gtest", "libffi"], - configure_args: concat(common.configure_args_32bit, [ + configure_args: [ + "--with-target-bits=32", "--with-zlib=system", "--with-jvm-variants=zero", "--with-libffi=" + input.get("libffi", "home_path"), "--enable-libffi-bundling" - ]) + ] } } profiles = concatObjects(profiles, zeroProfiles); @@ -635,8 +626,10 @@ var getJibProfilesProfiles = function (input, common, data) { target_os: "linux", target_cpu: "x64", dependencies: ["devkit", "gtest"], - configure_args: concat(common.configure_args_64bit, - "--with-zlib=system", "--disable-precompiled-headers"), + configure_args: [ + "--with-zlib=system", + "--disable-precompiled-headers" + ], }, }; profiles = concatObjects(profiles, noPchProfiles); @@ -693,9 +686,6 @@ var getJibProfilesProfiles = function (input, common, data) { "linux-x64": { platform: "linux-x64", }, - "linux-x86": { - platform: "linux-x86", - }, "macosx-x64": { platform: "macos-x64", jdk_subdir: "jdk-" + data.version + ".jdk/Contents/Home",