Skip to content

Commit fa765e7

Browse files
magicusmagicus
committed
8356335: Remove linux-x86 from jib profiles
Reviewed-by: erikj
1 parent 60a4594 commit fa765e7

File tree

1 file changed

+45
-55
lines changed

1 file changed

+45
-55
lines changed

‎make/conf/jib-profiles.js‎

Lines changed: 45 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -241,10 +241,10 @@ var getJibProfilesCommon = function (input, data) {
241241

242242
// List of the main profile names used for iteration
243243
common.main_profile_names = [
244-
"linux-x64", "linux-x86", "macosx-x64", "macosx-aarch64",
244+
"macosx-x64", "macosx-aarch64",
245245
"windows-x64", "windows-aarch64",
246-
"linux-aarch64", "linux-arm32", "linux-ppc64le", "linux-s390x",
247-
"linux-riscv64"
246+
"linux-x64", "linux-aarch64",
247+
"linux-arm32", "linux-ppc64le", "linux-s390x", "linux-riscv64"
248248
];
249249

250250
// These are the base settings for all the main build profiles.
@@ -283,9 +283,6 @@ var getJibProfilesCommon = function (input, data) {
283283
labels: "open"
284284
};
285285

286-
common.configure_args_64bit = ["--with-target-bits=64"];
287-
common.configure_args_32bit = ["--with-target-bits=32"];
288-
289286
/**
290287
* Define common artifacts template for all main profiles
291288
* @param o - Object containing data for artifacts
@@ -412,58 +409,34 @@ var getJibProfilesProfiles = function (input, common, data) {
412409

413410
// Main SE profiles
414411
var profiles = {
415-
416-
"linux-x64": {
417-
target_os: "linux",
418-
target_cpu: "x64",
419-
dependencies: ["devkit", "gtest", "build_devkit", "graphviz", "pandoc", "tidy"],
420-
configure_args: concat(
421-
(input.build_cpu == "x64" ? common.configure_args_64bit
422-
: "--openjdk-target=x86_64-linux-gnu"),
423-
"--with-zlib=system", "--disable-dtrace",
424-
(isWsl(input) ? [ "--host=x86_64-unknown-linux-gnu",
425-
"--build=x86_64-unknown-linux-gnu" ] : [])),
426-
},
427-
428-
"linux-x86": {
429-
target_os: "linux",
430-
target_cpu: "x86",
431-
build_cpu: "x64",
432-
dependencies: ["devkit", "gtest", "libffi"],
433-
configure_args: concat(common.configure_args_32bit, [
434-
"--with-jvm-variants=minimal,server",
435-
"--with-zlib=system",
436-
"--with-libffi=" + input.get("libffi", "home_path"),
437-
"--enable-libffi-bundling",
438-
"--enable-fallback-linker"
439-
])
440-
},
441-
442412
"macosx-x64": {
443413
target_os: "macosx",
444414
target_cpu: "x64",
445415
dependencies: ["devkit", "gtest", "graphviz", "pandoc", "tidy"],
446-
configure_args: concat(common.configure_args_64bit, "--with-zlib=system",
416+
configure_args: [
417+
"--with-zlib=system",
447418
"--with-macosx-version-max=11.00.00",
448419
"--enable-compatible-cds-alignment",
449420
// Use system SetFile instead of the one in the devkit as the
450421
// devkit one may not work on Catalina.
451-
"SETFILE=/usr/bin/SetFile"),
422+
"SETFILE=/usr/bin/SetFile"
423+
],
452424
},
453425

454426
"macosx-aarch64": {
455427
target_os: "macosx",
456428
target_cpu: "aarch64",
457429
dependencies: ["devkit", "gtest", "graphviz", "pandoc", "tidy"],
458-
configure_args: concat(common.configure_args_64bit,
459-
"--with-macosx-version-max=11.00.00"),
430+
configure_args: [
431+
"--with-macosx-version-max=11.00.00"
432+
],
460433
},
461434

462435
"windows-x64": {
463436
target_os: "windows",
464437
target_cpu: "x64",
465438
dependencies: ["devkit", "gtest", "pandoc"],
466-
configure_args: concat(common.configure_args_64bit),
439+
configure_args: [],
467440
},
468441

469442
"windows-aarch64": {
@@ -475,7 +448,19 @@ var getJibProfilesProfiles = function (input, common, data) {
475448
],
476449
},
477450

478-
"linux-aarch64": {
451+
"linux-x64": {
452+
target_os: "linux",
453+
target_cpu: "x64",
454+
dependencies: ["devkit", "gtest", "build_devkit", "graphviz", "pandoc", "tidy"],
455+
configure_args: concat(
456+
"--with-zlib=system",
457+
"--disable-dtrace",
458+
(cross_compiling ? [ "--openjdk-target=x86_64-linux-gnu" ] : []),
459+
(isWsl(input) ? [ "--host=x86_64-unknown-linux-gnu",
460+
"--build=x86_64-unknown-linux-gnu" ] : [])),
461+
},
462+
463+
"linux-aarch64": {
479464
target_os: "linux",
480465
target_cpu: "aarch64",
481466
dependencies: ["devkit", "gtest", "build_devkit", "graphviz", "pandoc", "tidy"],
@@ -492,8 +477,10 @@ var getJibProfilesProfiles = function (input, common, data) {
492477
build_cpu: "x64",
493478
dependencies: ["devkit", "gtest", "build_devkit"],
494479
configure_args: [
495-
"--openjdk-target=arm-linux-gnueabihf", "--with-freetype=bundled",
496-
"--with-abi-profile=arm-vfp-hflt", "--disable-warnings-as-errors"
480+
"--openjdk-target=arm-linux-gnueabihf",
481+
"--with-freetype=bundled",
482+
"--with-abi-profile=arm-vfp-hflt",
483+
"--disable-warnings-as-errors"
497484
],
498485
},
499486

@@ -503,7 +490,8 @@ var getJibProfilesProfiles = function (input, common, data) {
503490
build_cpu: "x64",
504491
dependencies: ["devkit", "gtest", "build_devkit"],
505492
configure_args: [
506-
"--openjdk-target=ppc64le-linux-gnu", "--with-freetype=bundled",
493+
"--openjdk-target=ppc64le-linux-gnu",
494+
"--with-freetype=bundled",
507495
"--disable-warnings-as-errors"
508496
],
509497
},
@@ -514,7 +502,8 @@ var getJibProfilesProfiles = function (input, common, data) {
514502
build_cpu: "x64",
515503
dependencies: ["devkit", "gtest", "build_devkit"],
516504
configure_args: [
517-
"--openjdk-target=s390x-linux-gnu", "--with-freetype=bundled",
505+
"--openjdk-target=s390x-linux-gnu",
506+
"--with-freetype=bundled",
518507
"--disable-warnings-as-errors"
519508
],
520509
},
@@ -525,7 +514,8 @@ var getJibProfilesProfiles = function (input, common, data) {
525514
build_cpu: "x64",
526515
dependencies: ["devkit", "gtest", "build_devkit"],
527516
configure_args: [
528-
"--openjdk-target=riscv64-linux-gnu", "--with-freetype=bundled",
517+
"--openjdk-target=riscv64-linux-gnu",
518+
"--with-freetype=bundled",
529519
"--disable-warnings-as-errors"
530520
],
531521
},
@@ -586,37 +576,38 @@ var getJibProfilesProfiles = function (input, common, data) {
586576
target_os: "linux",
587577
target_cpu: "x64",
588578
dependencies: ["devkit", "gtest", "libffi"],
589-
configure_args: concat(common.configure_args_64bit, [
579+
configure_args: [
590580
"--with-zlib=system",
591581
"--with-jvm-variants=zero",
592582
"--with-libffi=" + input.get("libffi", "home_path"),
593583
"--enable-libffi-bundling",
594-
])
584+
]
595585
},
596586

597587
"linux-aarch64-zero": {
598588
target_os: "linux",
599589
target_cpu: "aarch64",
600590
dependencies: ["devkit", "gtest", "libffi"],
601-
configure_args: concat(common.configure_args_64bit, [
591+
configure_args: [
602592
"--with-zlib=system",
603593
"--with-jvm-variants=zero",
604594
"--with-libffi=" + input.get("libffi", "home_path"),
605595
"--enable-libffi-bundling"
606-
])
596+
]
607597
},
608598

609599
"linux-x86-zero": {
610600
target_os: "linux",
611601
target_cpu: "x86",
612602
build_cpu: "x64",
613603
dependencies: ["devkit", "gtest", "libffi"],
614-
configure_args: concat(common.configure_args_32bit, [
604+
configure_args: [
605+
"--with-target-bits=32",
615606
"--with-zlib=system",
616607
"--with-jvm-variants=zero",
617608
"--with-libffi=" + input.get("libffi", "home_path"),
618609
"--enable-libffi-bundling"
619-
])
610+
]
620611
}
621612
}
622613
profiles = concatObjects(profiles, zeroProfiles);
@@ -635,8 +626,10 @@ var getJibProfilesProfiles = function (input, common, data) {
635626
target_os: "linux",
636627
target_cpu: "x64",
637628
dependencies: ["devkit", "gtest"],
638-
configure_args: concat(common.configure_args_64bit,
639-
"--with-zlib=system", "--disable-precompiled-headers"),
629+
configure_args: [
630+
"--with-zlib=system",
631+
"--disable-precompiled-headers"
632+
],
640633
},
641634
};
642635
profiles = concatObjects(profiles, noPchProfiles);
@@ -693,9 +686,6 @@ var getJibProfilesProfiles = function (input, common, data) {
693686
"linux-x64": {
694687
platform: "linux-x64",
695688
},
696-
"linux-x86": {
697-
platform: "linux-x86",
698-
},
699689
"macosx-x64": {
700690
platform: "macos-x64",
701691
jdk_subdir: "jdk-" + data.version + ".jdk/Contents/Home",

0 commit comments

Comments
 (0)