Skip to content

GitLab

I
icedtea
Commit b8185fb2 authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev
Browse files
Options

Fixed build for aarch64 of icedtea-2

parent d300ad95
Show whitespace changes
Inline Side-by-side
Showing with 60 additions and 24 deletions
icedtea-2.6.10-fixed.patch
View file @ b8185fb2
diff -uNr icedtea-2.6.10/configure icedtea-2.6.10-fixed/configure diff -uNr icedtea-2.6.10/configure icedtea-2.6.10-fixed/configure
--- icedtea-2.6.10/configure 2017-05-17 12:48:59.353452900 +0930 --- icedtea-2.6.10/configure 2017-05-17 03:18:59.353452900 +0000
+++ icedtea-2.6.10-fixed/configure 2020-01-07 14:54:20.037441291 +1030 +++ icedtea-2.6.10-fixed/configure 2020-06-17 02:05:56.356285436 +0000
@@ -15851,7 +15851,7 @@ @@ -15851,7 +15851,7 @@
fi fi
done done
...@@ -20,32 +20,32 @@ diff -uNr icedtea-2.6.10/configure icedtea-2.6.10-fixed/configure ...@@ -20,32 +20,32 @@ diff -uNr icedtea-2.6.10/configure icedtea-2.6.10-fixed/configure
done done
diff -uNr icedtea-2.6.10/Makefile.am icedtea-2.6.10-fixed/Makefile.am diff -uNr icedtea-2.6.10/Makefile.am icedtea-2.6.10-fixed/Makefile.am
--- icedtea-2.6.10/Makefile.am 2017-05-17 12:48:00.046401098 +0930 --- icedtea-2.6.10/Makefile.am 2017-05-17 03:18:00.046401098 +0000
+++ icedtea-2.6.10-fixed/Makefile.am 2020-01-07 15:01:59.435405027 +1030 +++ icedtea-2.6.10-fixed/Makefile.am 2020-06-17 02:16:18.988412611 +0000
@@ -372,7 +372,7 @@ @@ -372,7 +372,7 @@
# Patch list # Patch list
-ICEDTEA_PATCHES = -ICEDTEA_PATCHES =
+ICEDTEA_PATCHES = patches/freetypecheck_fix.patch patches/jdk-fixed_xattr.patch +ICEDTEA_PATCHES = patches/freetypecheck_fix.patch patches/jdk-fixed_xattr.patch patches/sharedRuntime_aarch64-fix.patch
# Conditional patches # Conditional patches
diff -uNr icedtea-2.6.10/Makefile.in icedtea-2.6.10-fixed/Makefile.in diff -uNr icedtea-2.6.10/Makefile.in icedtea-2.6.10-fixed/Makefile.in
--- icedtea-2.6.10/Makefile.in 2017-05-17 12:49:00.769430260 +0930 --- icedtea-2.6.10/Makefile.in 2017-05-17 03:19:00.769430260 +0000
+++ icedtea-2.6.10-fixed/Makefile.in 2020-01-07 15:02:14.007435732 +1030 +++ icedtea-2.6.10-fixed/Makefile.in 2020-06-17 02:16:11.327926074 +0000
@@ -786,7 +786,7 @@ @@ -786,7 +786,7 @@
MIME_TYPE_CHECK_SRCS = $(top_srcdir)/test/standalone/RH1195203.java MIME_TYPE_CHECK_SRCS = $(top_srcdir)/test/standalone/RH1195203.java
# Patch list # Patch list
-ICEDTEA_PATCHES = $(am__append_8) $(am__append_9) $(am__append_10) \ -ICEDTEA_PATCHES = $(am__append_8) $(am__append_9) $(am__append_10) \
+ICEDTEA_PATCHES = patches/freetypecheck_fix.patch patches/jdk-fixed_xattr.patch $(am__append_8) $(am__append_9) $(am__append_10) \ +ICEDTEA_PATCHES = patches/freetypecheck_fix.patch patches/jdk-fixed_xattr.patch patches/sharedRuntime_aarch64-fix.patch $(am__append_8) $(am__append_9) $(am__append_10) \
$(am__append_11) $(am__append_12) $(am__append_13) \ $(am__append_11) $(am__append_12) $(am__append_13) \
$(am__append_14) $(DISTRIBUTION_PATCHES) $(am__append_14) $(DISTRIBUTION_PATCHES)
diff -uNr icedtea-2.6.10/patches/freetypecheck_fix.patch icedtea-2.6.10-fixed/patches/freetypecheck_fix.patch diff -uNr icedtea-2.6.10/patches/freetypecheck_fix.patch icedtea-2.6.10-fixed/patches/freetypecheck_fix.patch
--- icedtea-2.6.10/patches/freetypecheck_fix.patch 1970-01-01 09:30:00.000000000 +0930 --- icedtea-2.6.10/patches/freetypecheck_fix.patch 1970-01-01 00:00:00.000000000 +0000
+++ icedtea-2.6.10-fixed/patches/freetypecheck_fix.patch 2020-01-07 14:54:08.245416597 +1030 +++ icedtea-2.6.10-fixed/patches/freetypecheck_fix.patch 2020-06-17 02:05:56.376290451 +0000
@@ -0,0 +1,34 @@ @@ -0,0 +1,34 @@
+diff -uNr openjdk/jdk/make/common/shared/Sanity.gmk openjdk.fixed/jdk/make/common/shared/Sanity.gmk +diff -uNr openjdk/jdk/make/common/shared/Sanity.gmk openjdk.fixed/jdk/make/common/shared/Sanity.gmk
+--- openjdk/jdk/make/common/shared/Sanity.gmk 2016-12-30 15:00:21.000000000 +1030 +--- openjdk/jdk/make/common/shared/Sanity.gmk 2016-12-30 15:00:21.000000000 +1030
...@@ -82,8 +82,8 @@ diff -uNr icedtea-2.6.10/patches/freetypecheck_fix.patch icedtea-2.6.10-fixed/pa ...@@ -82,8 +82,8 @@ diff -uNr icedtea-2.6.10/patches/freetypecheck_fix.patch icedtea-2.6.10-fixed/pa
+ ###################################################### + ######################################################
+ # CUPS_HEADERS_PATH must be valid + # CUPS_HEADERS_PATH must be valid
diff -uNr icedtea-2.6.10/patches/jdk-fixed_xattr.patch icedtea-2.6.10-fixed/patches/jdk-fixed_xattr.patch diff -uNr icedtea-2.6.10/patches/jdk-fixed_xattr.patch icedtea-2.6.10-fixed/patches/jdk-fixed_xattr.patch
--- icedtea-2.6.10/patches/jdk-fixed_xattr.patch 1970-01-01 09:30:00.000000000 +0930 --- icedtea-2.6.10/patches/jdk-fixed_xattr.patch 1970-01-01 00:00:00.000000000 +0000
+++ icedtea-2.6.10-fixed/patches/jdk-fixed_xattr.patch 2020-01-07 15:00:21.034197666 +1030 +++ icedtea-2.6.10-fixed/patches/jdk-fixed_xattr.patch 2020-06-17 02:05:56.376290451 +0000
@@ -0,0 +1,12 @@ @@ -0,0 +1,12 @@
+diff -uNr openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c openjdk.fixed/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c +diff -uNr openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c openjdk.fixed/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c
+--- openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c 2017-05-03 12:20:28.000000000 +0930 +--- openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c 2017-05-03 12:20:28.000000000 +0930
...@@ -97,3 +97,21 @@ diff -uNr icedtea-2.6.10/patches/jdk-fixed_xattr.patch icedtea-2.6.10-fixed/patc ...@@ -97,3 +97,21 @@ diff -uNr icedtea-2.6.10/patches/jdk-fixed_xattr.patch icedtea-2.6.10-fixed/patc
+ #else + #else
+ #include <syscalls_fp.h> + #include <syscalls_fp.h>
+ #endif + #endif
diff -uNr icedtea-2.6.10/patches/sharedRuntime_aarch64-fix.patch icedtea-2.6.10-fixed/patches/sharedRuntime_aarch64-fix.patch
--- icedtea-2.6.10/patches/sharedRuntime_aarch64-fix.patch 1970-01-01 00:00:00.000000000 +0000
+++ icedtea-2.6.10-fixed/patches/sharedRuntime_aarch64-fix.patch 2020-06-17 02:14:04.031107828 +0000
@@ -0,0 +1,14 @@
+diff -uNr openjdk/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp openjdk.fixed/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp
+--- openjdk/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp 2017-05-03 02:50:28.000000000 +0000
++++ openjdk.fixed/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp 2020-06-17 02:08:24.138049779 +0000
+@@ -194,10 +194,6 @@
+ return (r->reg2stack() + SharedRuntime::out_preserve_stack_slots()) * VMRegImpl::stack_slot_size;
+ }
+
+-template <class T> static const T& min (const T& a, const T& b) {
+- return (a > b) ? b : a;
+-}
+-
+ // ---------------------------------------------------------------------------
+ // Read the array of BasicTypes from a signature, and compute where the
+ // arguments should go. Values in the VMRegPair regs array refer to 4-byte
icedtea-2.6.20-fixed.patch
View file @ b8185fb2
diff -uNr icedtea-2.6.20/configure icedtea-2.6.20-fixed/configure diff -uNr icedtea-2.6.20/configure icedtea-2.6.20-fixed/configure
--- icedtea-2.6.20/configure 2019-11-18 16:20:27.364013811 +1030 --- icedtea-2.6.20/configure 2019-11-18 05:50:27.364013811 +0000
+++ icedtea-2.6.20-fixed/configure 2020-01-17 09:15:14.201255681 +1030 +++ icedtea-2.6.20-fixed/configure 2020-06-17 11:39:38.360001051 +0000
@@ -16089,7 +16089,7 @@ @@ -16089,7 +16089,7 @@
fi fi
done done
...@@ -20,32 +20,32 @@ diff -uNr icedtea-2.6.20/configure icedtea-2.6.20-fixed/configure ...@@ -20,32 +20,32 @@ diff -uNr icedtea-2.6.20/configure icedtea-2.6.20-fixed/configure
done done
diff -uNr icedtea-2.6.20/Makefile.am icedtea-2.6.20-fixed/Makefile.am diff -uNr icedtea-2.6.20/Makefile.am icedtea-2.6.20-fixed/Makefile.am
--- icedtea-2.6.20/Makefile.am 2019-11-15 15:15:51.645205555 +1030 --- icedtea-2.6.20/Makefile.am 2019-11-15 04:45:51.645205555 +0000
+++ icedtea-2.6.20-fixed/Makefile.am 2020-01-17 09:17:38.971543733 +1030 +++ icedtea-2.6.20-fixed/Makefile.am 2020-06-17 11:43:52.233196142 +0000
@@ -369,7 +369,7 @@ @@ -369,7 +369,7 @@
# Patch list # Patch list
-ICEDTEA_PATCHES = patches/8232643-pr3761.patch -ICEDTEA_PATCHES = patches/8232643-pr3761.patch
+ICEDTEA_PATCHES = patches/8232643-pr3761.patch patches/freetypecheck_fix.patch patches/jdk-fixed_xattr.patch +ICEDTEA_PATCHES = patches/8232643-pr3761.patch patches/freetypecheck_fix.patch patches/jdk-fixed_xattr.patch patches/sharedRuntime_aarch64-fix.patch
# Conditional patches # Conditional patches
diff -uNr icedtea-2.6.20/Makefile.in icedtea-2.6.20-fixed/Makefile.in diff -uNr icedtea-2.6.20/Makefile.in icedtea-2.6.20-fixed/Makefile.in
--- icedtea-2.6.20/Makefile.in 2019-11-18 16:20:28.180001295 +1030 --- icedtea-2.6.20/Makefile.in 2019-11-18 05:50:28.180001295 +0000
+++ icedtea-2.6.20-fixed/Makefile.in 2020-01-17 09:18:45.532676179 +1030 +++ icedtea-2.6.20-fixed/Makefile.in 2020-06-17 11:44:13.293620894 +0000
@@ -788,7 +788,7 @@ @@ -788,7 +788,7 @@
MIME_TYPE_CHECK_SRCS = $(top_srcdir)/test/standalone/RH1195203.java MIME_TYPE_CHECK_SRCS = $(top_srcdir)/test/standalone/RH1195203.java
# Patch list # Patch list
-ICEDTEA_PATCHES = patches/8232643-pr3761.patch $(am__append_8) \ -ICEDTEA_PATCHES = patches/8232643-pr3761.patch $(am__append_8) \
+ICEDTEA_PATCHES = patches/8232643-pr3761.patch patches/freetypecheck_fix.patch patches/jdk-fixed_xattr.patch $(am__append_8) \ +ICEDTEA_PATCHES = patches/8232643-pr3761.patch patches/freetypecheck_fix.patch patches/jdk-fixed_xattr.patch patches/sharedRuntime_aarch64-fix.patch $(am__append_8) \
$(am__append_9) $(am__append_10) $(am__append_11) \ $(am__append_9) $(am__append_10) $(am__append_11) \
$(am__append_12) $(am__append_13) $(DISTRIBUTION_PATCHES) $(am__append_12) $(am__append_13) $(DISTRIBUTION_PATCHES)
diff -uNr icedtea-2.6.20/patches/freetypecheck_fix.patch icedtea-2.6.20-fixed/patches/freetypecheck_fix.patch diff -uNr icedtea-2.6.20/patches/freetypecheck_fix.patch icedtea-2.6.20-fixed/patches/freetypecheck_fix.patch
--- icedtea-2.6.20/patches/freetypecheck_fix.patch 1970-01-01 09:30:00.000000000 +0930 --- icedtea-2.6.20/patches/freetypecheck_fix.patch 1970-01-01 00:00:00.000000000 +0000
+++ icedtea-2.6.20-fixed/patches/freetypecheck_fix.patch 2020-01-17 09:15:14.208255695 +1030 +++ icedtea-2.6.20-fixed/patches/freetypecheck_fix.patch 2020-06-17 11:39:38.380001467 +0000
@@ -0,0 +1,34 @@ @@ -0,0 +1,34 @@
+diff -uNr openjdk/jdk/make/common/shared/Sanity.gmk openjdk.fixed/jdk/make/common/shared/Sanity.gmk +diff -uNr openjdk/jdk/make/common/shared/Sanity.gmk openjdk.fixed/jdk/make/common/shared/Sanity.gmk
+--- openjdk/jdk/make/common/shared/Sanity.gmk 2016-12-30 15:00:21.000000000 +1030 +--- openjdk/jdk/make/common/shared/Sanity.gmk 2016-12-30 15:00:21.000000000 +1030
...@@ -82,8 +82,8 @@ diff -uNr icedtea-2.6.20/patches/freetypecheck_fix.patch icedtea-2.6.20-fixed/pa ...@@ -82,8 +82,8 @@ diff -uNr icedtea-2.6.20/patches/freetypecheck_fix.patch icedtea-2.6.20-fixed/pa
+ ###################################################### + ######################################################
+ # CUPS_HEADERS_PATH must be valid + # CUPS_HEADERS_PATH must be valid
diff -uNr icedtea-2.6.20/patches/jdk-fixed_xattr.patch icedtea-2.6.20-fixed/patches/jdk-fixed_xattr.patch diff -uNr icedtea-2.6.20/patches/jdk-fixed_xattr.patch icedtea-2.6.20-fixed/patches/jdk-fixed_xattr.patch
--- icedtea-2.6.20/patches/jdk-fixed_xattr.patch 1970-01-01 09:30:00.000000000 +0930 --- icedtea-2.6.20/patches/jdk-fixed_xattr.patch 1970-01-01 00:00:00.000000000 +0000
+++ icedtea-2.6.20-fixed/patches/jdk-fixed_xattr.patch 2020-01-17 09:15:14.208255695 +1030 +++ icedtea-2.6.20-fixed/patches/jdk-fixed_xattr.patch 2020-06-17 11:39:38.380001467 +0000
@@ -0,0 +1,12 @@ @@ -0,0 +1,12 @@
+diff -uNr openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c openjdk.fixed/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c +diff -uNr openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c openjdk.fixed/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c
+--- openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c 2017-05-03 12:20:28.000000000 +0930 +--- openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c 2017-05-03 12:20:28.000000000 +0930
...@@ -97,3 +97,21 @@ diff -uNr icedtea-2.6.20/patches/jdk-fixed_xattr.patch icedtea-2.6.20-fixed/patc ...@@ -97,3 +97,21 @@ diff -uNr icedtea-2.6.20/patches/jdk-fixed_xattr.patch icedtea-2.6.20-fixed/patc
+ #else + #else
+ #include <syscalls_fp.h> + #include <syscalls_fp.h>
+ #endif + #endif
diff -uNr icedtea-2.6.20/patches/sharedRuntime_aarch64-fix.patch icedtea-2.6.20-fixed/patches/sharedRuntime_aarch64-fix.patch
--- icedtea-2.6.20/patches/sharedRuntime_aarch64-fix.patch 1970-01-01 00:00:00.000000000 +0000
+++ icedtea-2.6.20-fixed/patches/sharedRuntime_aarch64-fix.patch 2020-06-17 11:42:44.543825294 +0000
@@ -0,0 +1,14 @@
+diff -uNr openjdk/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp openjdk.fixed/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp
+--- openjdk/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp 2019-10-14 18:21:39.000000000 +0000
++++ openjdk.fixed/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp 2020-06-17 11:41:45.690625648 +0000
+@@ -194,10 +194,6 @@
+ return (r->reg2stack() + SharedRuntime::out_preserve_stack_slots()) * VMRegImpl::stack_slot_size;
+ }
+
+-template <class T> static const T& min (const T& a, const T& b) {
+- return (a > b) ? b : a;
+-}
+-
+ // ---------------------------------------------------------------------------
+ // Read the array of BasicTypes from a signature, and compute where the
+ // arguments should go. Values in the VMRegPair regs array refer to 4-byte
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment