Skip to content

Commit c5063a0

Browse files
JakubVanekJakubVanek
committed
[patch] Update upstreaming patches
1 parent c58c34d commit c5063a0

File tree

3 files changed

+40
-70
lines changed

3 files changed

+40
-70
lines changed

‎upstream/armv5.patch‎

Lines changed: 9 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,7 @@
1-
diff --git a/src/hotspot/cpu/arm/vm_version_arm_32.cpp b/src/hotspot/cpu/arm/vm_version_arm_32.cpp
2-
index df0fb2e..f15dabd 100644
3-
--- a/src/hotspot/cpu/arm/vm_version_arm_32.cpp
4-
+++ b/src/hotspot/cpu/arm/vm_version_arm_32.cpp
5-
@@ -303,6 +303,15 @@ void VM_Version::initialize() {
6-
FLAG_SET_DEFAULT(UseUnalignedAccesses, false);
7-
}
8-
9-
+ // ARMv5 MP workaround
10-
+ if (arm_arch() == 5) {
11-
+ if (FLAG_IS_DEFAULT(AssumeMP)) {
12-
+ FLAG_SET_DEFAULT(AssumeMP, false);
13-
+ } else if (AssumeMP) {
14-
+ warning("AssumeMP can not be true for ARMv5 as there is only uniprocessor support");
15-
+ FLAG_SET_DEFAULT(AssumeMP, false);
16-
+ }
17-
+ }
18-
_is_initialized = true;
19-
}
20-
21-
diff --git a/src/hotspot/os_cpu/linux_arm/orderAccess_linux_arm.hpp b/src/hotspot/os_cpu/linux_arm/orderAccess_linux_arm.hpp
22-
index 9e6bda2..01a4ade 100644
23-
--- a/src/hotspot/os_cpu/linux_arm/orderAccess_linux_arm.hpp
24-
+++ b/src/hotspot/os_cpu/linux_arm/orderAccess_linux_arm.hpp
25-
@@ -72,7 +72,7 @@ inline static void dmb_sy() {
1+
diff -Naur a/src/hotspot/os_cpu/linux_arm/orderAccess_linux_arm.hpp b/src/hotspot/os_cpu/linux_arm/orderAccess_linux_arm.hpp
2+
--- a/src/hotspot/os_cpu/linux_arm/orderAccess_linux_arm.hpp 2018-10-27 00:13:12.000000000 +0200
3+
+++ b/src/hotspot/os_cpu/linux_arm/orderAccess_linux_arm.hpp 2018-10-27 20:20:42.794765749 +0200
4+
@@ -67,7 +67,7 @@
265
__asm__ volatile (
276
".word 0xF57FF050 | 0xf" : : : "memory");
287
#endif
@@ -31,7 +10,7 @@ index 9e6bda2..01a4ade 100644
3110
intptr_t zero = 0;
3211
__asm__ volatile (
3312
"mcr p15, 0, %0, c7, c10, 5"
34-
@@ -96,7 +96,7 @@ inline static void dmb_st() {
13+
@@ -88,7 +88,7 @@
3514
__asm__ volatile (
3615
".word 0xF57FF050 | 0xe" : : : "memory");
3716
#endif
@@ -40,11 +19,10 @@ index 9e6bda2..01a4ade 100644
4019
intptr_t zero = 0;
4120
__asm__ volatile (
4221
"mcr p15, 0, %0, c7, c10, 5"
43-
diff --git a/src/hotspot/cpu/arm/assembler_arm_32.hpp b/src/hotspot/cpu/arm/assembler_arm_32.hpp
44-
index 53d6d17..c949c63 100644
45-
--- a/src/hotspot/cpu/arm/assembler_arm_32.hpp
46-
+++ b/src/hotspot/cpu/arm/assembler_arm_32.hpp
47-
@@ -498,7 +498,7 @@ class Assembler : public AbstractAssembler {
22+
diff -Naur a/src/hotspot/cpu/arm/assembler_arm_32.hpp b/src/hotspot/cpu/arm/assembler_arm_32.hpp
23+
--- a/src/hotspot/cpu/arm/assembler_arm_32.hpp 2018-10-27 00:13:12.000000000 +0200
24+
+++ b/src/hotspot/cpu/arm/assembler_arm_32.hpp 2018-10-27 20:20:42.794765749 +0200
25+
@@ -498,7 +498,7 @@
4826
void dmb(DMB_Opt opt, Register reg) {
4927
if (VM_Version::arm_arch() >= 7) {
5028
emit_int32(0xF57FF050 | opt);

‎upstream/optimizations.patch‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
diff --git a/make/autoconf/flags-other.m4 b/make/autoconf/flags-other.m4
2-
index e10e589..c72b939 100644
3-
--- a/make/autoconf/flags-other.m4
4-
+++ b/make/autoconf/flags-other.m4
5-
@@ -121,6 +121,16 @@ AC_DEFUN([FLAGS_SETUP_ASFLAGS_CPU_DEP],
1+
diff -Naur a/make/autoconf/flags-other.m4 b/make/autoconf/flags-other.m4
2+
--- a/make/autoconf/flags-other.m4 2018-10-27 00:13:12.000000000 +0200
3+
+++ b/make/autoconf/flags-other.m4 2018-10-27 20:20:42.790765675 +0200
4+
@@ -119,6 +119,16 @@
65
# Misuse EXTRA_CFLAGS to mimic old behavior
76
$2JVM_ASFLAGS="$JVM_BASIC_ASFLAGS ${$2EXTRA_CFLAGS}"
87

@@ -19,11 +18,10 @@ index e10e589..c72b939 100644
1918
AC_SUBST($2JVM_ASFLAGS)
2019
])
2120

22-
diff --git a/make/autoconf/flags.m4 b/make/autoconf/flags.m4
23-
index 472e7a6..45445f2 100644
24-
--- a/make/autoconf/flags.m4
25-
+++ b/make/autoconf/flags.m4
26-
@@ -34,7 +34,7 @@ m4_include([flags-other.m4])
21+
diff -Naur a/make/autoconf/flags.m4 b/make/autoconf/flags.m4
22+
--- a/make/autoconf/flags.m4 2018-10-27 00:13:12.000000000 +0200
23+
+++ b/make/autoconf/flags.m4 2018-10-27 20:20:42.790765675 +0200
24+
@@ -34,7 +34,7 @@
2725
AC_DEFUN([FLAGS_SETUP_ABI_PROFILE],
2826
[
2927
AC_ARG_WITH(abi-profile, [AS_HELP_STRING([--with-abi-profile],
@@ -32,7 +30,7 @@ index 472e7a6..45445f2 100644
3230

3331
if test "x$with_abi_profile" != x; then
3432
if test "x$OPENJDK_TARGET_CPU" != xarm && \
35-
@@ -55,6 +55,18 @@ AC_DEFUN([FLAGS_SETUP_ABI_PROFILE],
33+
@@ -55,6 +55,18 @@
3634
elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-sflt; then
3735
ARM_FLOAT_TYPE=sflt
3836
ARM_ARCH_TYPE_FLAGS='-march=armv5t -marm'

‎upstream/softfloat.patch‎

Lines changed: 22 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
diff --git a/make/autoconf/lib-softfloat.m4 b/make/autoconf/lib-softfloat.m4
2-
new file mode 100644
3-
index 0000000..7fa1ed1
4-
--- /dev/null
5-
+++ b/make/autoconf/lib-softfloat.m4
1+
diff -Naur a/make/autoconf/lib-softfloat.m4 b/make/autoconf/lib-softfloat.m4
2+
--- a/make/autoconf/lib-softfloat.m4 1970-01-01 01:00:00.000000000 +0100
3+
+++ b/make/autoconf/lib-softfloat.m4 2018-10-27 20:20:42.790765675 +0200
64
@@ -0,0 +1,57 @@
75
+#
86
+# Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
@@ -61,19 +59,18 @@ index 0000000..7fa1ed1
6159
+
6260
+ AC_SUBST(SOFTFLOAT_LIBS)
6361
+])
64-
diff --git a/make/autoconf/libraries.m4 b/make/autoconf/libraries.m4
65-
index 5bf8569..eec4be6 100644
66-
--- a/make/autoconf/libraries.m4
67-
+++ b/make/autoconf/libraries.m4
68-
@@ -32,6 +32,7 @@ m4_include([lib-freetype.m4])
69-
m4_include([lib-std.m4])
62+
diff -Naur a/make/autoconf/libraries.m4 b/make/autoconf/libraries.m4
63+
--- a/make/autoconf/libraries.m4 2018-10-27 00:13:12.000000000 +0200
64+
+++ b/make/autoconf/libraries.m4 2018-10-27 20:20:42.790765675 +0200
65+
@@ -33,6 +33,7 @@
7066
m4_include([lib-x11.m4])
7167
m4_include([lib-fontconfig.m4])
68+
m4_include([lib-tests.m4])
7269
+m4_include([lib-softfloat.m4])
7370

7471
################################################################################
7572
# Determine which libraries are needed for this configuration
76-
@@ -78,6 +79,13 @@ AC_DEFUN_ONCE([LIB_DETERMINE_DEPENDENCIES],
73+
@@ -79,6 +80,13 @@
7774
NEEDS_LIB_ALSA=false
7875
fi
7976

@@ -87,43 +84,40 @@ index 5bf8569..eec4be6 100644
8784
# Check if ffi is needed
8885
if HOTSPOT_CHECK_JVM_VARIANT(zero); then
8986
NEEDS_LIB_FFI=true
90-
@@ -97,6 +105,7 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES],
87+
@@ -98,6 +106,7 @@
9188
LIB_SETUP_FONTCONFIG
9289
LIB_SETUP_FREETYPE
9390
LIB_SETUP_ALSA
9491
+ LIB_SETUP_SOFTFLOAT
9592
LIB_SETUP_LIBFFI
9693
LIB_SETUP_BUNDLED_LIBS
9794
LIB_SETUP_MISC_LIBS
98-
diff --git a/make/autoconf/spec.gmk.in b/make/autoconf/spec.gmk.in
99-
index ec45949..f3b222e 100644
100-
--- a/make/autoconf/spec.gmk.in
101-
+++ b/make/autoconf/spec.gmk.in
102-
@@ -343,6 +343,7 @@ FONTCONFIG_CFLAGS:=@FONTCONFIG_CFLAGS@
95+
diff -Naur a/make/autoconf/spec.gmk.in b/make/autoconf/spec.gmk.in
96+
--- a/make/autoconf/spec.gmk.in 2018-10-27 00:13:12.000000000 +0200
97+
+++ b/make/autoconf/spec.gmk.in 2018-10-27 20:20:42.794765749 +0200
98+
@@ -349,6 +349,7 @@
10399
CUPS_CFLAGS:=@CUPS_CFLAGS@
104100
ALSA_LIBS:=@ALSA_LIBS@
105101
ALSA_CFLAGS:=@ALSA_CFLAGS@
106102
+SOFTFLOAT_LIBS:=@SOFTFLOAT_LIBS@
107103
LIBFFI_LIBS:=@LIBFFI_LIBS@
108104
LIBFFI_CFLAGS:=@LIBFFI_CFLAGS@
109105
ENABLE_LIBFFI_BUNDLING:=@ENABLE_LIBFFI_BUNDLING@
110-
diff --git a/make/hotspot/lib/CompileJvm.gmk b/make/hotspot/lib/CompileJvm.gmk
111-
index a4b67f0..15f8ae6 100644
112-
--- a/make/hotspot/lib/CompileJvm.gmk
113-
+++ b/make/hotspot/lib/CompileJvm.gmk
114-
@@ -49,6 +49,7 @@ JVM_LDFLAGS += \
106+
diff -Naur a/make/hotspot/lib/CompileJvm.gmk b/make/hotspot/lib/CompileJvm.gmk
107+
--- a/make/hotspot/lib/CompileJvm.gmk 2018-10-27 00:13:12.000000000 +0200
108+
+++ b/make/hotspot/lib/CompileJvm.gmk 2018-10-27 20:20:42.794765749 +0200
109+
@@ -49,6 +49,7 @@
115110

116111
JVM_LIBS += \
117112
$(JVM_LIBS_FEATURES) \
118113
+ $(SOFTFLOAT_LIBS) \
119114
#
120115

121116
# These files and directories are always excluded
122-
diff --git a/src/hotspot/cpu/arm/assembler_arm_32.hpp b/src/hotspot/cpu/arm/assembler_arm_32.hpp
123-
index 53d6d17..c949c63 100644
124-
--- a/src/hotspot/cpu/arm/assembler_arm_32.hpp
125-
+++ b/src/hotspot/cpu/arm/assembler_arm_32.hpp
126-
@@ -1239,10 +1239,11 @@ extern int __aeabi_dcmpgt(double, double);
117+
diff -Naur a/src/hotspot/cpu/arm/assembler_arm_32.hpp b/src/hotspot/cpu/arm/assembler_arm_32.hpp
118+
--- a/src/hotspot/cpu/arm/assembler_arm_32.hpp 2018-10-27 00:13:12.000000000 +0200
119+
+++ b/src/hotspot/cpu/arm/assembler_arm_32.hpp 2018-10-27 20:20:42.794765749 +0200
120+
@@ -1242,10 +1242,11 @@
127121

128122
// Imported code from glibc soft-fp bundle for
129123
// calculation accuracy improvement. See CR 6757269.

0 commit comments

Comments
 (0)