Skip to content

JDK11 Jenkins bugfixes #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 27, 2020
Merged

JDK11 Jenkins bugfixes #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f85468
[patch] fix: rebase JDK11 patches
JakubVanek Nov 27, 2020
24d615e
[pkg] fix: add support for four-element version (three dots)
JakubVanek Nov 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion packaging/package.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,17 @@ if [ "$NUM_OF_FIELDS" -eq 0 ]; then
export DEB_JRI_MAJOR=$DEB_JRI_PREFIX
export DEB_JRI_MINOR=0
export DEB_JRI_PATCH=0
export DEB_JRI_SUBPATCH=""
elif [ "$NUM_OF_FIELDS" -eq 2 ]; then
export DEB_JRI_MAJOR=$(echo "$DEB_JRI_PREFIX" | cut -d . -f 1)
export DEB_JRI_MINOR=$(echo "$DEB_JRI_PREFIX" | cut -d . -f 2)
export DEB_JRI_PATCH=$(echo "$DEB_JRI_PREFIX" | cut -d . -f 3)
export DEB_JRI_SUBPATCH=""
elif [ "$NUM_OF_FIELDS" -eq 3 ]; then
export DEB_JRI_MAJOR=$(echo "$DEB_JRI_PREFIX" | cut -d . -f 1)
export DEB_JRI_MINOR=$(echo "$DEB_JRI_PREFIX" | cut -d . -f 2)
export DEB_JRI_PATCH=$(echo "$DEB_JRI_PREFIX" | cut -d . -f 3)
export DEB_JRI_SUBPATCH=".$(echo "$DEB_JRI_PREFIX" | cut -d . -f 4)"
else
echo "Unsupported version string: $JAVA_VERSION" 1>&2
exit 1
Expand All @@ -38,7 +45,7 @@ if [ -z "$DEB_JRI_PATCH" ]; then
fi

PKG="jri-${DEB_JRI_MAJOR}-${DEB_JRI_PLATFORM}"
PKGVER="${DEB_JRI_MAJOR}.${DEB_JRI_MINOR}.${DEB_JRI_PATCH}~${DEB_JRI_BUILD}"
PKGVER="${DEB_JRI_MAJOR}.${DEB_JRI_MINOR}.${DEB_JRI_PATCH}${DEB_JRI_SUBPATCH}~${DEB_JRI_BUILD}"
PKGNAME="${PKG}_${PKGVER}"
DATE=$(LC_ALL=C date -R)
if [ -z "$DISTRO" ]; then
Expand Down
8 changes: 4 additions & 4 deletions scripts/jdk11.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ index dbbeaf11c..985b06cbd 100644
])

diff --git a/make/autoconf/flags.m4 b/make/autoconf/flags.m4
index 1ffc43726..159a329b8 100644
index 0d2141daf..ff64434db 100644
--- a/make/autoconf/flags.m4
+++ b/make/autoconf/flags.m4
@@ -34,7 +34,7 @@ m4_include([flags-other.m4])
Expand All @@ -37,7 +37,7 @@ index 1ffc43726..159a329b8 100644
ARM_FLOAT_TYPE=vfp-sflt
ARM_ARCH_TYPE_FLAGS='-march=armv5t -marm'
diff --git a/src/hotspot/cpu/arm/assembler_arm_32.hpp b/src/hotspot/cpu/arm/assembler_arm_32.hpp
index 53d6d17de..00abcbaf7 100644
index e05653b17..ac9f39c9e 100644
--- a/src/hotspot/cpu/arm/assembler_arm_32.hpp
+++ b/src/hotspot/cpu/arm/assembler_arm_32.hpp
@@ -498,7 +498,7 @@ class Assembler : public AbstractAssembler {
Expand All @@ -50,10 +50,10 @@ index 53d6d17de..00abcbaf7 100644
if(preserve_tmp) {
reg = Rtemp;
diff --git a/src/hotspot/cpu/arm/vm_version_arm_32.cpp b/src/hotspot/cpu/arm/vm_version_arm_32.cpp
index df0fb2ecf..f15dabd45 100644
index 7d3f369eb..a613e52c1 100644
--- a/src/hotspot/cpu/arm/vm_version_arm_32.cpp
+++ b/src/hotspot/cpu/arm/vm_version_arm_32.cpp
@@ -303,6 +303,15 @@ void VM_Version::initialize() {
@@ -305,6 +305,15 @@ void VM_Version::initialize() {
FLAG_SET_DEFAULT(UseUnalignedAccesses, false);
}

Expand Down
6 changes: 3 additions & 3 deletions scripts/jdk11_cds.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/src/hotspot/share/memory/metaspaceShared.cpp b/src/hotspot/share/memory/metaspaceShared.cpp
index 40c5f7be1..e43428a23 100644
index 63e3f1e65..121400b0e 100644
--- a/src/hotspot/share/memory/metaspaceShared.cpp
+++ b/src/hotspot/share/memory/metaspaceShared.cpp
@@ -133,7 +133,7 @@ private:
@@ -134,7 +134,7 @@ private:
public:
DumpRegion(const char* name) : _name(name), _base(NULL), _top(NULL), _end(NULL), _is_packed(false) {}

Expand All @@ -11,7 +11,7 @@ index 40c5f7be1..e43428a23 100644
char* p = (char*)align_up(_top, alignment);
char* newtop = p + align_up(num_bytes, alignment);
expand_top_to(newtop);
@@ -1130,7 +1130,7 @@ public:
@@ -1103,7 +1103,7 @@ public:
address obj = ref->obj();
int bytes = ref->size() * BytesPerWord;
char* p;
Expand Down
6 changes: 3 additions & 3 deletions scripts/jdk11_lib.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/make/hotspot/lib/CompileJvm.gmk b/make/hotspot/lib/CompileJvm.gmk
index a4b67f09f..15f6f94db 100644
index 2bcff9c7b..c8d470c0c 100644
--- a/make/hotspot/lib/CompileJvm.gmk
+++ b/make/hotspot/lib/CompileJvm.gmk
@@ -129,6 +129,11 @@ ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), solaris-sparcv9)
@@ -131,6 +131,11 @@ ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), solaris-sparcv9)
endif
endif

Expand All @@ -15,7 +15,7 @@ index a4b67f09f..15f6f94db 100644
ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
RC_DESC := 64-Bit$(SPACE)
diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
index 2cccc9767..35a62ca1b 100644
index c4ed288f1..306a39068 100644
--- a/src/hotspot/os/linux/os_linux.cpp
+++ b/src/hotspot/os/linux/os_linux.cpp
@@ -408,10 +408,10 @@ void os::init_system_properties_values() {
Expand Down
14 changes: 7 additions & 7 deletions scripts/jdk11_new.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/make/autoconf/hotspot.m4 b/make/autoconf/hotspot.m4
index 1d4c710be..da6f3711c 100644
index d598b9897..8c1038d2a 100644
--- a/make/autoconf/hotspot.m4
+++ b/make/autoconf/hotspot.m4
@@ -312,6 +312,11 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES],
@@ -326,6 +326,11 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES],
HOTSPOT_TARGET_CPU_ARCH=arm
fi

Expand Down Expand Up @@ -73,22 +73,22 @@ index 342c1c347..ac86ecfbd 100644
}
#endif // !AARCH64
diff --git a/src/hotspot/share/memory/metaspaceShared.cpp b/src/hotspot/share/memory/metaspaceShared.cpp
index f20f5305c..40c5f7be1 100644
index 8403ae7e1..63e3f1e65 100644
--- a/src/hotspot/share/memory/metaspaceShared.cpp
+++ b/src/hotspot/share/memory/metaspaceShared.cpp
@@ -63,6 +63,7 @@
#include "utilities/align.hpp"
@@ -64,6 +64,7 @@
#include "utilities/bitMap.hpp"
#include "utilities/defaultStream.hpp"
#include "utilities/hashtable.inline.hpp"
+#include "gc/shared/softRefPolicy.hpp"
#if INCLUDE_G1GC
#include "gc/g1/g1Allocator.inline.hpp"
#include "gc/g1/g1CollectedHeap.hpp"
diff --git a/src/hotspot/share/oops/constantPool.cpp b/src/hotspot/share/oops/constantPool.cpp
index 6ebf9513b..543fff64b 100644
index 914b63bea..a87863d93 100644
--- a/src/hotspot/share/oops/constantPool.cpp
+++ b/src/hotspot/share/oops/constantPool.cpp
@@ -400,8 +400,12 @@ void ConstantPool::remove_unshareable_info() {
@@ -405,8 +405,12 @@ void ConstantPool::remove_unshareable_info() {
}

int ConstantPool::cp_to_object_index(int cp_index) {
Expand Down
2 changes: 1 addition & 1 deletion scripts/jdk11_nosflt.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/src/hotspot/cpu/arm/assembler_arm_32.hpp b/src/hotspot/cpu/arm/assembler_arm_32.hpp
index 00abcbaf7..f52495086 100644
index ac9f39c9e..7447ca6b4 100644
--- a/src/hotspot/cpu/arm/assembler_arm_32.hpp
+++ b/src/hotspot/cpu/arm/assembler_arm_32.hpp
@@ -1239,10 +1239,11 @@ extern int __aeabi_dcmpgt(double, double);
Expand Down