$ git diff --patch-with-stat --summary 693ab1027dd856338292f209896e54adff1bc86c..63457f0a681a5a2b93f5b50f77682ca882d9d707
.abf.yml | 2 +-
java-1.8.0-openjdk.spec | 53 ++++++++++++++++++++---------------
rhbz1548475-LDFLAGSusage.patch | 63 +++++++++++++++++++++---------------------
3 files changed, 63 insertions(+), 55 deletions(-)
diff --git a/.abf.yml b/.abf.yml
index 10636da..6335789 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,3 +1,3 @@
sources:
+ aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u212-b04.tar.xz: ca52171b9a47c3efd4714f974ca4e6c27d890c55
systemtap-tapset-3.6.0pre02.tar.xz: 93bca27ce5eeeb2bc1f6f3cd4ffe34c3567a3c73
- aarch64-port-jdk8u-aarch64-jdk8u181-b14.tar.xz: fd01bd5547b9051f134af3ade2a9712b08ced921
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index acf6aa7..e26a20e 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -102,10 +102,10 @@
%global origin openjdk
# note, following three variables are sedded from update_sources if used correctly. Hardcode them rather there.
%global project aarch64-port
-%global repo jdk8u
+%global repo jdk8u-shenandoah
# Current version should be listed at
# http://openjdk.java.net/projects/jdk8u/ or http://hg.openjdk.java.net/aarch64-port/jdk8u/tags
-%global revision aarch64-jdk8u181-b14
+%global revision aarch64-shenandoah-jdk8u212-b04
# eg # jdk8u60-b27 -> jdk8u60 or # aarch64-jdk8u60-b27 -> aarch64-jdk8u60 (dont forget spec escape % by %%)
%global whole_update %(VERSION=%{revision}; echo ${VERSION%%-*})
# eg jdk8u60 -> 60 or aarch64-jdk8u60 -> 60
@@ -174,7 +174,7 @@ URL: http://openjdk.java.net/
# Source from upstrem OpenJDK8 project. To regenerate, use
# aarch64-port now contains integration forest of both aarch64 and normal jdk
-# PROJECT_NAME=aarch64-port REPO_NAME=jdk8u VERSION=aarch64-jdk8u181-b14 ./generate_source_tarball.sh
+# PROJECT_NAME=aarch64-port REPO_NAME=jdk8u VERSION=aarch64-jdk8u181-b15 ./generate_source_tarball.sh
Source0: %{project}-%{repo}-%{revision}.tar.xz
# Custom README for -src subpackage
@@ -245,7 +245,7 @@ Patch529: https://src.fedoraproject.org/rpms/java-1.8.0-openjdk/raw/master/f/rhb
# Upstreamable debugging patches
# Patches 204 and 205 stop the build adding .gnu_debuglink sections to unstripped files
-Patch204: https://src.fedoraproject.org/rpms/java-1.8.0-openjdk/raw/master/f/hotspot-remove-debuglink.patch
+#Patch204: https://src.fedoraproject.org/rpms/java-1.8.0-openjdk/raw/master/f/hotspot-remove-debuglink.patch
Patch205: https://src.fedoraproject.org/rpms/java-1.8.0-openjdk/raw/master/f/dont-add-unnecessary-debug-links.patch
# Enable debug information for assembly code files
Patch206: https://src.fedoraproject.org/rpms/java-1.8.0-openjdk/raw/master/f/hotspot-assembler-debuginfo.patch
@@ -509,49 +509,49 @@ cp %{_datadir}/automake-*/config.sub openjdk/common/autoconf/build-aux/
%patch203
# Debugging fixes
-%patch204
-%patch205
+#patch204
+#patch205
%patch206
-%patch210
+#patch210
%patch300
%patch1
%patch3
%patch5
-%patch7
+#patch7
# s390 build fixes
-%patch100
+#patch100
# ppc64le fixes
%patch603
-%patch601
-%patch602
+#patch601
+#patch602
# Zero fixes.
# Upstreamable fixes
%patch502
%patch504
-%patch506
-%patch507
-%patch508
-%patch509
+#patch506
+#patch507
+#patch508
+#patch509
%patch511
-%patch512
+#patch512
%patch514
%patch515
%patch516
%patch400
%patch523
-%patch526
+#patch526
%patch528
-%patch538
-%patch540
-%patch560
+#patch538
+#patch540 -p1 -b .0540~
+#patch560
pushd openjdk/jdk
-%patch529 -p1
+#patch529 -p1
popd
-%patch561
+#patch561
# RPM-only fixes
%patch525
@@ -608,12 +608,19 @@ export ARCH_DATA_MODEL=64
export CFLAGS="$CFLAGS -mieee"
%endif
+%ifarch %{arm}
+# Let's see if this fixes the crash on startup when javac is launched
+# for the first time...
+export CC=gcc
+export CXX=g++
+%endif
+
# We use because the OpenJDK build seems to
# pass EXTRA_CFLAGS to the HotSpot C++ compiler...
# Explicitly set the C++ standard as the default has changed on GCC >= 6
EXTRA_CFLAGS=" -Wno-error -std=gnu++98 -fno-delete-null-pointer-checks -fno-lifetime-dse"
EXTRA_CPP_FLAGS=" -std=gnu++98 -fno-delete-null-pointer-checks -fno-lifetime-dse"
-%ifarch %{ix86}
+%ifarch %{ix86} %{arm}
EXTRA_CFLAGS="$EXTRA_CFLAGS -mincoming-stack-boundary=2"
EXTRA_CPP_FLAGS="$EXTRA_CPP_FLAGS -mincoming-stack-boundary=2"
%endif
diff --git a/rhbz1548475-LDFLAGSusage.patch b/rhbz1548475-LDFLAGSusage.patch
index 243c71b..98ba1ba 100644
--- a/rhbz1548475-LDFLAGSusage.patch
+++ b/rhbz1548475-LDFLAGSusage.patch
@@ -1,10 +1,7 @@
-# User jvanek
-# https://bugzilla.redhat.com/show_bug.cgi?id=1548475
-# java-1.8.0-openjdk: Partial build flags injection
-# LFLAGS += $(EXTRA_CFLAGS) corrected to LFLAGS += $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)
---- openjdk/hotspot/make/aix/makefiles/vm.make
-+++ openjdk/hotspot/make/aix/makefiles/vm.make
-@@ -117,7 +117,7 @@
+diff -up java-1.8.0-openjdk/openjdk/hotspot/make/aix/makefiles/vm.make.0540~ java-1.8.0-openjdk/openjdk/hotspot/make/aix/makefiles/vm.make
+--- java-1.8.0-openjdk/openjdk/hotspot/make/aix/makefiles/vm.make.0540~ 2018-12-22 03:05:35.411928325 +0100
++++ java-1.8.0-openjdk/openjdk/hotspot/make/aix/makefiles/vm.make 2018-12-22 03:29:24.808908831 +0100
+@@ -117,7 +117,7 @@ CFLAGS += $(CFLAGS/NOEX)
# Extra flags from gnumake's invocation or environment
CFLAGS += $(EXTRA_CFLAGS)
@@ -13,9 +10,10 @@
# Don't set excutable bit on stack segment
# the same could be done by separate execstack command
---- openjdk/hotspot/make/bsd/makefiles/vm.make
-+++ openjdk/hotspot/make/bsd/makefiles/vm.make
-@@ -119,7 +119,7 @@
+diff -up java-1.8.0-openjdk/openjdk/hotspot/make/bsd/makefiles/vm.make.0540~ java-1.8.0-openjdk/openjdk/hotspot/make/bsd/makefiles/vm.make
+--- java-1.8.0-openjdk/openjdk/hotspot/make/bsd/makefiles/vm.make.0540~ 2018-12-22 03:05:35.414928371 +0100
++++ java-1.8.0-openjdk/openjdk/hotspot/make/bsd/makefiles/vm.make 2018-12-22 03:29:24.808908831 +0100
+@@ -119,7 +119,7 @@ CFLAGS += $(CFLAGS/NOEX)
# Extra flags from gnumake's invocation or environment
CFLAGS += $(EXTRA_CFLAGS)
@@ -24,20 +22,22 @@
# Don't set excutable bit on stack segment
# the same could be done by separate execstack command
---- openjdk/hotspot/make/linux/makefiles/vm.make
-+++ openjdk/hotspot/make/linux/makefiles/vm.make
-@@ -122,7 +122,7 @@
+diff -up java-1.8.0-openjdk/openjdk/hotspot/make/linux/makefiles/jsig.make.0540~ java-1.8.0-openjdk/openjdk/hotspot/make/linux/makefiles/jsig.make
+--- java-1.8.0-openjdk/openjdk/hotspot/make/linux/makefiles/jsig.make.0540~ 2018-12-22 03:29:24.808908831 +0100
++++ java-1.8.0-openjdk/openjdk/hotspot/make/linux/makefiles/jsig.make 2018-12-22 03:29:54.088326966 +0100
+@@ -44,7 +44,7 @@ LIBJSIG_MAPFILE = $(MAKEFILES_DIR)/mapfi
+ # cause problems with interposing. See CR: 6466665
+ # LFLAGS_JSIG += $(MAPFLAG:FILENAME=$(LIBJSIG_MAPFILE))
- # Extra flags from gnumake's invocation or environment
- CFLAGS += $(EXTRA_CFLAGS)
--LFLAGS += $(EXTRA_CFLAGS)
-+LFLAGS += $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)
+-LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE) $(LDFLAGS_NO_EXEC_STACK)
++LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE) $(LDFLAGS_NO_EXEC_STACK) $(EXTRA_LDFLAGS)
- # Don't set excutable bit on stack segment
- # the same could be done by separate execstack command
---- openjdk/hotspot/make/linux/makefiles/saproc.make
-+++ openjdk/hotspot/make/linux/makefiles/saproc.make
-@@ -73,7 +73,7 @@
+ # DEBUG_BINARIES overrides everything, use full -g debug information
+ ifeq ($(DEBUG_BINARIES), true)
+diff -up java-1.8.0-openjdk/openjdk/hotspot/make/linux/makefiles/saproc.make.0540~ java-1.8.0-openjdk/openjdk/hotspot/make/linux/makefiles/saproc.make
+--- java-1.8.0-openjdk/openjdk/hotspot/make/linux/makefiles/saproc.make.0540~ 2018-12-22 03:29:24.783908475 +0100
++++ java-1.8.0-openjdk/openjdk/hotspot/make/linux/makefiles/saproc.make 2018-12-22 03:29:24.808908831 +0100
+@@ -73,7 +73,7 @@ ALT_SAINCDIR=-I$(ALT_SASRCDIR) -DALT_SAS
else
ALT_SAINCDIR=
endif
@@ -46,14 +46,15 @@
SAARCH ?= $(BUILDARCH)
---- openjdk/hotspot/make/linux/makefiles/jsig.make
-+++ openjdk/hotspot/make/linux/makefiles/jsig.make
-@@ -44,7 +44,7 @@ LIBJSIG_MAPFILE = $(MAKEFILES_DIR)/mapfile-vers-jsig
- # cause problems with interposing. See CR: 6466665
- # LFLAGS_JSIG += $(MAPFLAG:FILENAME=$(LIBJSIG_MAPFILE))
+diff -up java-1.8.0-openjdk/openjdk/hotspot/make/linux/makefiles/vm.make.0540~ java-1.8.0-openjdk/openjdk/hotspot/make/linux/makefiles/vm.make
+--- java-1.8.0-openjdk/openjdk/hotspot/make/linux/makefiles/vm.make.0540~ 2018-12-22 03:29:24.783908475 +0100
++++ java-1.8.0-openjdk/openjdk/hotspot/make/linux/makefiles/vm.make 2018-12-22 03:29:24.808908831 +0100
+@@ -122,7 +122,7 @@ CFLAGS += $(CFLAGS/NOEX)
--LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE)
-+LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE) $(EXTRA_LDFLAGS)
+ # Extra flags from gnumake's invocation or environment
+ CFLAGS += $(EXTRA_CFLAGS)
+-LFLAGS += $(EXTRA_CFLAGS)
++LFLAGS += $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)
- # DEBUG_BINARIES overrides everything, use full -g debug information
- ifeq ($(DEBUG_BINARIES), true)
+ # Don't set excutable bit on stack segment
+ # the same could be done by separate execstack command