From a062fd2f75bef2a43df9fe7343c8022272cefddd Mon Sep 17 00:00:00 2001 From: Roger Riggs Date: Tue, 11 Apr 2017 14:20:00 -0400 Subject: [PATCH 1/6] 8178347: Process and ProcessHandle getPid method name inconsistency Reviewed-by: alanb, bpb --- test/lib/jdk/test/lib/apps/LingeredApp.java | 4 ++-- test/lib/jdk/test/lib/process/ProcessTools.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/lib/jdk/test/lib/apps/LingeredApp.java b/test/lib/jdk/test/lib/apps/LingeredApp.java index 8632a835695..22a123ccbb5 100644 --- a/test/lib/jdk/test/lib/apps/LingeredApp.java +++ b/test/lib/jdk/test/lib/apps/LingeredApp.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -143,7 +143,7 @@ public class LingeredApp { if (appProcess == null) { throw new RuntimeException("Process is not alive"); } - return appProcess.getPid(); + return appProcess.pid(); } /** diff --git a/test/lib/jdk/test/lib/process/ProcessTools.java b/test/lib/jdk/test/lib/process/ProcessTools.java index 3f4bbb7fa79..5066efb7f1b 100644 --- a/test/lib/jdk/test/lib/process/ProcessTools.java +++ b/test/lib/jdk/test/lib/process/ProcessTools.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -302,7 +302,7 @@ public final class ProcessTools { * @return Process id */ public static long getProcessId() throws Exception { - return ProcessHandle.current().getPid(); + return ProcessHandle.current().pid(); } /** * Gets the array of strings containing input arguments passed to the VM @@ -580,8 +580,8 @@ public final class ProcessTools { } @Override - public long getPid() { - return p.getPid(); + public long pid() { + return p.pid(); } @Override From 2cd45adf99c0c7c7d0026eda32889687d256a44b Mon Sep 17 00:00:00 2001 From: Erik Joelsson Date: Thu, 13 Apr 2017 09:41:53 +0200 Subject: [PATCH 2/6] 8177822: Move closed jib configuration for arm platforms to open Reviewed-by: tbell --- common/conf/jib-profiles.js | 60 ++++++++++++++++++++++++++++++++++--- 1 file changed, 56 insertions(+), 4 deletions(-) diff --git a/common/conf/jib-profiles.js b/common/conf/jib-profiles.js index 871068d8a6a..248f85cd45c 100644 --- a/common/conf/jib-profiles.js +++ b/common/conf/jib-profiles.js @@ -231,7 +231,8 @@ var getJibProfilesCommon = function (input, data) { // List of the main profile names used for iteration common.main_profile_names = [ "linux-x64", "linux-x86", "macosx-x64", "solaris-x64", - "solaris-sparcv9", "windows-x64", "windows-x86" + "solaris-sparcv9", "windows-x64", "windows-x86", + "linux-arm64", "linux-arm-vfp-hflt", "linux-arm-vfp-hflt-dyn" ]; // These are the base setttings for all the main build profiles. @@ -471,8 +472,43 @@ var getJibProfilesProfiles = function (input, common, data) { build_cpu: "x64", dependencies: ["devkit", "freetype"], configure_args: concat(common.configure_args_32bit), + }, + + "linux-arm64": { + target_os: "linux", + target_cpu: "aarch64", + build_cpu: "x64", + dependencies: ["devkit", "build_devkit", "cups", "headless_stubs"], + configure_args: [ + "--with-cpu-port=arm64", + "--with-jvm-variants=server", + "--openjdk-target=aarch64-linux-gnu", + "--enable-headless-only" + ], + }, + + "linux-arm-vfp-hflt": { + target_os: "linux", + target_cpu: "arm", + build_cpu: "x64", + dependencies: ["devkit", "build_devkit", "cups"], + configure_args: [ + "--with-jvm-variants=minimal1,client", + "--with-x=" + input.get("devkit", "install_path") + "/arm-linux-gnueabihf/libc/usr/X11R6-PI", + "--openjdk-target=arm-linux-gnueabihf", + "--with-abi-profile=arm-vfp-hflt" + ], + }, + + // Special version of the SE profile adjusted to be testable on arm64 hardware. + "linux-arm-vfp-hflt-dyn": { + configure_args: "--with-stdc++lib=dynamic" } }; + // Let linux-arm-vfp-hflt-dyn inherit everything from linux-arm-vfp-hflt + profiles["linux-arm-vfp-hflt-dyn"] = concatObjects( + profiles["linux-arm-vfp-hflt-dyn"], profiles["linux-arm-vfp-hflt"]); + // Add the base settings to all the main profiles common.main_profile_names.forEach(function (name) { profiles[name] = concatObjects(common.main_profile_base, profiles[name]); @@ -658,16 +694,28 @@ var getJibProfilesProfiles = function (input, common, data) { "windows-x86": { platform: "windows-x86", demo_ext: "zip" + }, + "linux-arm64": { + platform: "linux-arm64-vfp-hflt", + demo_ext: "tar.gz" + }, + "linux-arm-vfp-hflt": { + platform: "linux-arm32-vfp-hflt", + demo_ext: "tar.gz" + }, + "linux-arm-vfp-hflt-dyn": { + platform: "linux-arm32-vfp-hflt-dyn", + demo_ext: "tar.gz" } } // Generate common artifacts for all main profiles - common.main_profile_names.forEach(function (name) { + Object.keys(artifactData).forEach(function (name) { profiles[name] = concatObjects(profiles[name], common.main_profile_artifacts(artifactData[name].platform, artifactData[name].demo_ext)); }); // Generate common artifacts for all debug profiles - common.main_profile_names.forEach(function (name) { + Object.keys(artifactData).forEach(function (name) { var debugName = name + common.debug_suffix; profiles[debugName] = concatObjects(profiles[debugName], common.debug_profile_artifacts(artifactData[name].platform)); @@ -839,7 +887,11 @@ var getJibProfilesDependencies = function (input, common) { macosx_x64: "Xcode6.3-MacOSX10.9+1.0", solaris_x64: "SS12u4-Solaris11u1+1.0", solaris_sparcv9: "SS12u4-Solaris11u1+1.0", - windows_x64: "VS2013SP4+1.0" + windows_x64: "VS2013SP4+1.0", + linux_aarch64: "gcc-linaro-aarch64-linux-gnu-4.8-2013.11_linux+1.0", + linux_arm: (input.profile != null && input.profile.indexOf("hflt") >= 0 + ? "gcc-linaro-arm-linux-gnueabihf-raspbian-2012.09-20120921_linux+1.0" + : "arm-linaro-4.7+1.0") }; var devkit_platform = (input.target_cpu == "x86" From 8b64fbd1365eb0c250b07ca5732d27ecf0b25a58 Mon Sep 17 00:00:00 2001 From: Erik Joelsson Date: Thu, 13 Apr 2017 09:50:41 +0200 Subject: [PATCH 3/6] 8176271: Still unable to build JDK 9 on some *7 sparcs Reviewed-by: ihse --- common/conf/jib-profiles.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/conf/jib-profiles.js b/common/conf/jib-profiles.js index 248f85cd45c..1ffff5d8b9e 100644 --- a/common/conf/jib-profiles.js +++ b/common/conf/jib-profiles.js @@ -392,7 +392,7 @@ var getJibProfilesCommon = function (input, data) { // on such hardware. if (input.build_cpu == "sparcv9") { var cpu_brand = $EXEC("bash -c \"kstat -m cpu_info | grep brand | head -n1 | awk '{ print \$2 }'\""); - if (cpu_brand.trim() == 'SPARC-M7') { + if (cpu_brand.trim().match('SPARC-.7')) { boot_jdk_revision = "8u20"; boot_jdk_subdirpart = "1.8.0_20"; } From bdada9936e13888f84e61a0cfaea9f0320f8192c Mon Sep 17 00:00:00 2001 From: Joe Darcy Date: Thu, 13 Apr 2017 14:38:13 -0700 Subject: [PATCH 4/6] 8177553: Address removal lint warnings in the JDK build Reviewed-by: mchung, erikj --- make/common/SetupJavaCompilers.gmk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make/common/SetupJavaCompilers.gmk b/make/common/SetupJavaCompilers.gmk index 5ac4b86fe23..1a80d47fddc 100644 --- a/make/common/SetupJavaCompilers.gmk +++ b/make/common/SetupJavaCompilers.gmk @@ -32,7 +32,7 @@ DISABLE_WARNINGS := -Xlint:all,-deprecation,-removal,-unchecked,-rawtypes,-cast, # If warnings needs to be non-fatal for testing purposes use a command like: # make JAVAC_WARNINGS="-Xlint:all -Xmaxwarns 10000" -JAVAC_WARNINGS := -Xlint:all,-removal -Werror +JAVAC_WARNINGS := -Xlint:all -Werror # The BOOT_JAVAC setup uses the boot jdk compiler to compile the tools # and the interim javac, to be run by the boot jdk. From 0306e163993308f1e697ddf89c874119128b509c Mon Sep 17 00:00:00 2001 From: Lana Steuck Date: Thu, 20 Apr 2017 18:14:03 +0000 Subject: [PATCH 5/6] Added tag jdk-9+166 for changeset 513c3026b94f --- .hgtags-top-repo | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags-top-repo b/.hgtags-top-repo index 5b8767812e2..6610d08c27f 100644 --- a/.hgtags-top-repo +++ b/.hgtags-top-repo @@ -408,3 +408,4 @@ cda60babd152d889aba4d8f20a8f643ab151d3de jdk-9+161 c38c6b270ccc8e2b86d1631bcf42248241b54d2c jdk-9+163 7810f75d016a52e32295c4233009de5ca90e31af jdk-9+164 aff4f339acd40942d3dab499846b52acd87b3af1 jdk-9+165 +ba5b16c9c6d80632b61959a33d424b1c3398ce62 jdk-9+166 From 588f3628ae3f44abc6efed25a80a4d8b51ddec34 Mon Sep 17 00:00:00 2001 From: Erik Joelsson Date: Fri, 21 Apr 2017 16:51:38 +0200 Subject: [PATCH 6/6] 8179078: Jib run-test-prebuilt profile missing dependency on bootjdk Reviewed-by: ctornqvi, tbell --- common/conf/jib-profiles.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/conf/jib-profiles.js b/common/conf/jib-profiles.js index 7405f414d79..4e4f40f08ba 100644 --- a/common/conf/jib-profiles.js +++ b/common/conf/jib-profiles.js @@ -584,7 +584,7 @@ var getJibProfilesProfiles = function (input, common, data) { var testOnlyProfilesPrebuilt = { "run-test-prebuilt": { src: "src.conf", - dependencies: [ "jtreg", "gnumake", testedProfile + ".jdk", + dependencies: [ "jtreg", "gnumake", "boot_jdk", testedProfile + ".jdk", testedProfile + ".test", "src.full" ], work_dir: input.get("src.full", "install_path") + "/test",