From 9ece52d7d3d8f9233aecd50e685c885b4dac3250 Mon Sep 17 00:00:00 2001 From: Andrew Hughes Date: Thu, 17 Jan 2019 01:04:08 -0500 Subject: [PATCH] Update to aarch64-shenandoah-jdk8u191-b14. Adjust JDK-8073139/PR1758/RH1191652 to apply following 8155627 backport. --- .gitignore | 1 + java-1.8.0-openjdk.spec | 6 ++- ...s_its_arch_is_ppc64_not_ppc64le_root.patch | 43 ++++++++++--------- sources | 2 +- 4 files changed, 29 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index 4a93ad0..95356b2 100644 --- a/.gitignore +++ b/.gitignore @@ -128,3 +128,4 @@ /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u191-b10.tar.xz /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u191-b12.tar.xz /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u191-b13.tar.xz +/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u191-b14.tar.xz diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index 7c9af01..0f4e214 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -225,7 +225,7 @@ # note, following three variables are sedded from update_sources if used correctly. Hardcode them rather there. %global shenandoah_project aarch64-port %global shenandoah_repo jdk8u-shenandoah -%global shenandoah_revision aarch64-shenandoah-jdk8u191-b13 +%global shenandoah_revision aarch64-shenandoah-jdk8u191-b14 # Define old aarch64/jdk8u tree variables for compatibility %global project %{shenandoah_project} %global repo %{shenandoah_repo} @@ -2347,6 +2347,10 @@ require "copy_jdk_configs.lua" %endif %changelog +* Thu Jan 10 2019 Andrew Hughes - 1:1.8.0.191.b14-0 +- Update to aarch64-shenandoah-jdk8u191-b14. +- Adjust JDK-8073139/PR1758/RH1191652 to apply following 8155627 backport. + * Wed Jan 09 2019 Andrew Hughes - 1:1.8.0.191.b13-0 - Update to aarch64-shenandoah-jdk8u191-b13. - Update tarball generation script in preparation for PR3667/RH1656676 SunEC changes. diff --git a/jdk8073139-pr1758-rh1191652-ppc64_le_says_its_arch_is_ppc64_not_ppc64le_root.patch b/jdk8073139-pr1758-rh1191652-ppc64_le_says_its_arch_is_ppc64_not_ppc64le_root.patch index 746529a..6511281 100644 --- a/jdk8073139-pr1758-rh1191652-ppc64_le_says_its_arch_is_ppc64_not_ppc64le_root.patch +++ b/jdk8073139-pr1758-rh1191652-ppc64_le_says_its_arch_is_ppc64_not_ppc64le_root.patch @@ -1,28 +1,16 @@ # HG changeset patch -# User sgehwolf +# User asmundak # Date 1537883922 -7200 # Tue Sep 25 15:58:42 2018 +0200 # Node ID 2fabe07c0bd8bf21400313f3bb9b8e80fcb31724 # Parent 91867683f73de3882ef88981a79995beeeb1e980 8073139: PPC64: User-visible arch directory and os.arch value on ppc64le cause issues with Java tooling Reviewed-by: erikj, goetz, dholmes +Contributed-by: Andrew Hughes , Alexander Smundak -diff --git a/common/autoconf/toolchain.m4 b/common/autoconf/toolchain.m4 ---- openjdk/common/autoconf/toolchain.m4 -+++ openjdk/common/autoconf/toolchain.m4 -@@ -1125,6 +1125,9 @@ AC_DEFUN_ONCE([TOOLCHAIN_SETUP_COMPILER_FLAGS_FOR_JDK], - else - COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_BIG_ENDIAN" - fi -+ if test "x$OPENJDK_TARGET_CPU" = xppc64le; then -+ COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DABI_ELFv2" -+ fi - if test "x$OPENJDK_TARGET_OS" = xlinux; then - COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DLINUX" - fi -diff --git a/common/autoconf/jdk-options.m4 b/common/autoconf/jdk-options.m4 ---- openjdk/common/autoconf/jdk-options.m4 -+++ openjdk/common/autoconf/jdk-options.m4 +diff --git openjdk.orig///common/autoconf/jdk-options.m4 openjdk///common/autoconf/jdk-options.m4 +--- openjdk.orig///common/autoconf/jdk-options.m4 ++++ openjdk///common/autoconf/jdk-options.m4 @@ -158,7 +158,7 @@ if test "x$JVM_VARIANT_ZEROSHARK" = xtrue ; then INCLUDE_SA=false @@ -31,10 +19,10 @@ diff --git a/common/autoconf/jdk-options.m4 b/common/autoconf/jdk-options.m4 + if test "x$VAR_CPU" = xppc64 -o "x$VAR_CPU" = xppc64le ; then INCLUDE_SA=false fi - if test "x$OPENJDK_TARGET_CPU" = xaarch64; then -diff --git a/common/autoconf/platform.m4 b/common/autoconf/platform.m4 ---- openjdk/common/autoconf/platform.m4 -+++ openjdk/common/autoconf/platform.m4 + AC_SUBST(INCLUDE_SA) +diff --git openjdk.orig///common/autoconf/platform.m4 openjdk///common/autoconf/platform.m4 +--- openjdk.orig///common/autoconf/platform.m4 ++++ openjdk///common/autoconf/platform.m4 @@ -67,7 +67,7 @@ VAR_CPU_ENDIAN=big ;; @@ -44,3 +32,16 @@ diff --git a/common/autoconf/platform.m4 b/common/autoconf/platform.m4 VAR_CPU_ARCH=ppc VAR_CPU_BITS=64 VAR_CPU_ENDIAN=little +diff --git openjdk.orig///common/autoconf/toolchain.m4 openjdk///common/autoconf/toolchain.m4 +--- openjdk.orig///common/autoconf/toolchain.m4 ++++ openjdk///common/autoconf/toolchain.m4 +@@ -1123,6 +1123,9 @@ + else + COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_BIG_ENDIAN" + fi ++ if test "x$OPENJDK_TARGET_CPU" = xppc64le; then ++ COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DABI_ELFv2" ++ fi + if test "x$OPENJDK_TARGET_OS" = xlinux; then + COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DLINUX" + fi diff --git a/sources b/sources index 0a6bbc4..34cf8d8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz) = cf578221b77d8c7e019f69909bc86c419c5fb5e10bceba9592ff6e7f96887b0a7f07c9cefe90800975247a078785ca190fdec5c2d0f841bb447cee784b570f7d -SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u191-b13.tar.xz) = 56fc01edf3c8a7f7ad5af719983837d70efa10877b066ab4021cb8e753cf9edfd8c86433e9b04e859f09478d98533fca06360a0ee0d58c17e3405b737c77689a +SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u191-b14.tar.xz) = d2f3e618bf8fa8d8991f2db32b665d52170642fd375926f84b0cc40a7896278847f6374fcb6d095f681b72a170ac7189ec3501907c5ca0d3d454a09397eedcfa