Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 7f85468

Browse files
[patch] fix: rebase JDK11 patches
Build is not failing yet, but let's update the patches so that no fuzzy matching is required. Related to ev3dev-lang-java/ev3dev-lang-java#742 
1 parent 9856847 commit 7f85468

File tree

5 files changed

+18
-18
lines changed

5 files changed

+18
-18
lines changed

‎scripts/jdk11.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ index dbbeaf11c..985b06cbd 100644
1414
])
1515

1616
diff --git a/make/autoconf/flags.m4 b/make/autoconf/flags.m4
17-
index 1ffc43726..159a329b8 100644
17+
index 0d2141daf..ff64434db 100644
1818
--- a/make/autoconf/flags.m4
1919
+++ b/make/autoconf/flags.m4
2020
@@ -34,7 +34,7 @@ m4_include([flags-other.m4])
@@ -37,7 +37,7 @@ index 1ffc43726..159a329b8 100644
3737
ARM_FLOAT_TYPE=vfp-sflt
3838
ARM_ARCH_TYPE_FLAGS='-march=armv5t -marm'
3939
diff --git a/src/hotspot/cpu/arm/assembler_arm_32.hpp b/src/hotspot/cpu/arm/assembler_arm_32.hpp
40-
index 53d6d17de..00abcbaf7 100644
40+
index e05653b17..ac9f39c9e 100644
4141
--- a/src/hotspot/cpu/arm/assembler_arm_32.hpp
4242
+++ b/src/hotspot/cpu/arm/assembler_arm_32.hpp
4343
@@ -498,7 +498,7 @@ class Assembler : public AbstractAssembler {
@@ -50,10 +50,10 @@ index 53d6d17de..00abcbaf7 100644
5050
if(preserve_tmp) {
5151
reg = Rtemp;
5252
diff --git a/src/hotspot/cpu/arm/vm_version_arm_32.cpp b/src/hotspot/cpu/arm/vm_version_arm_32.cpp
53-
index df0fb2ecf..f15dabd45 100644
53+
index 7d3f369eb..a613e52c1 100644
5454
--- a/src/hotspot/cpu/arm/vm_version_arm_32.cpp
5555
+++ b/src/hotspot/cpu/arm/vm_version_arm_32.cpp
56-
@@ -303,6 +303,15 @@ void VM_Version::initialize() {
56+
@@ -305,6 +305,15 @@ void VM_Version::initialize() {
5757
FLAG_SET_DEFAULT(UseUnalignedAccesses, false);
5858
}
5959

‎scripts/jdk11_cds.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/src/hotspot/share/memory/metaspaceShared.cpp b/src/hotspot/share/memory/metaspaceShared.cpp
2-
index 40c5f7be1..e43428a23 100644
2+
index 63e3f1e65..121400b0e 100644
33
--- a/src/hotspot/share/memory/metaspaceShared.cpp
44
+++ b/src/hotspot/share/memory/metaspaceShared.cpp
5-
@@ -133,7 +133,7 @@ private:
5+
@@ -134,7 +134,7 @@ private:
66
public:
77
DumpRegion(const char* name) : _name(name), _base(NULL), _top(NULL), _end(NULL), _is_packed(false) {}
88

@@ -11,7 +11,7 @@ index 40c5f7be1..e43428a23 100644
1111
char* p = (char*)align_up(_top, alignment);
1212
char* newtop = p + align_up(num_bytes, alignment);
1313
expand_top_to(newtop);
14-
@@ -1130,7 +1130,7 @@ public:
14+
@@ -1103,7 +1103,7 @@ public:
1515
address obj = ref->obj();
1616
int bytes = ref->size() * BytesPerWord;
1717
char* p;

‎scripts/jdk11_lib.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/make/hotspot/lib/CompileJvm.gmk b/make/hotspot/lib/CompileJvm.gmk
2-
index a4b67f09f..15f6f94db 100644
2+
index 2bcff9c7b..c8d470c0c 100644
33
--- a/make/hotspot/lib/CompileJvm.gmk
44
+++ b/make/hotspot/lib/CompileJvm.gmk
5-
@@ -129,6 +129,11 @@ ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), solaris-sparcv9)
5+
@@ -131,6 +131,11 @@ ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), solaris-sparcv9)
66
endif
77
endif
88

@@ -15,7 +15,7 @@ index a4b67f09f..15f6f94db 100644
1515
ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
1616
RC_DESC := 64-Bit$(SPACE)
1717
diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
18-
index 2cccc9767..35a62ca1b 100644
18+
index c4ed288f1..306a39068 100644
1919
--- a/src/hotspot/os/linux/os_linux.cpp
2020
+++ b/src/hotspot/os/linux/os_linux.cpp
2121
@@ -408,10 +408,10 @@ void os::init_system_properties_values() {

‎scripts/jdk11_new.patch‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/make/autoconf/hotspot.m4 b/make/autoconf/hotspot.m4
2-
index 1d4c710be..da6f3711c 100644
2+
index d598b9897..8c1038d2a 100644
33
--- a/make/autoconf/hotspot.m4
44
+++ b/make/autoconf/hotspot.m4
5-
@@ -312,6 +312,11 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES],
5+
@@ -326,6 +326,11 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES],
66
HOTSPOT_TARGET_CPU_ARCH=arm
77
fi
88

@@ -73,22 +73,22 @@ index 342c1c347..ac86ecfbd 100644
7373
}
7474
#endif // !AARCH64
7575
diff --git a/src/hotspot/share/memory/metaspaceShared.cpp b/src/hotspot/share/memory/metaspaceShared.cpp
76-
index f20f5305c..40c5f7be1 100644
76+
index 8403ae7e1..63e3f1e65 100644
7777
--- a/src/hotspot/share/memory/metaspaceShared.cpp
7878
+++ b/src/hotspot/share/memory/metaspaceShared.cpp
79-
@@ -63,6 +63,7 @@
80-
#include "utilities/align.hpp"
79+
@@ -64,6 +64,7 @@
80+
#include "utilities/bitMap.hpp"
8181
#include "utilities/defaultStream.hpp"
8282
#include "utilities/hashtable.inline.hpp"
8383
+#include "gc/shared/softRefPolicy.hpp"
8484
#if INCLUDE_G1GC
8585
#include "gc/g1/g1Allocator.inline.hpp"
8686
#include "gc/g1/g1CollectedHeap.hpp"
8787
diff --git a/src/hotspot/share/oops/constantPool.cpp b/src/hotspot/share/oops/constantPool.cpp
88-
index 6ebf9513b..543fff64b 100644
88+
index 914b63bea..a87863d93 100644
8989
--- a/src/hotspot/share/oops/constantPool.cpp
9090
+++ b/src/hotspot/share/oops/constantPool.cpp
91-
@@ -400,8 +400,12 @@ void ConstantPool::remove_unshareable_info() {
91+
@@ -405,8 +405,12 @@ void ConstantPool::remove_unshareable_info() {
9292
}
9393

9494
int ConstantPool::cp_to_object_index(int cp_index) {

‎scripts/jdk11_nosflt.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/src/hotspot/cpu/arm/assembler_arm_32.hpp b/src/hotspot/cpu/arm/assembler_arm_32.hpp
2-
index 00abcbaf7..f52495086 100644
2+
index ac9f39c9e..7447ca6b4 100644
33
--- a/src/hotspot/cpu/arm/assembler_arm_32.hpp
44
+++ b/src/hotspot/cpu/arm/assembler_arm_32.hpp
55
@@ -1239,10 +1239,11 @@ extern int __aeabi_dcmpgt(double, double);

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /