diff options
Diffstat (limited to 'recipes-core/openjdk')
28 files changed, 226 insertions, 281 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/0001-Allow-using-a-system-installed-libjpeg.patch b/recipes-core/openjdk/patches-openjdk-8/0001-Allow-using-a-system-installed-libjpeg.patch index 3bc5630..00ce23f 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0001-Allow-using-a-system-installed-libjpeg.patch +++ b/recipes-core/openjdk/patches-openjdk-8/0001-Allow-using-a-system-installed-libjpeg.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 21c555306afcc4cab2819adc550f1546f3390d15 Mon Sep 17 00:00:00 2001 | 1 | From 74366a35d754d2dacab28d36804b5cde5dec481b Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> | 2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> |
3 | Date: Tue, 27 Feb 2018 13:36:53 +0000 | 3 | Date: Tue, 27 Feb 2018 13:36:53 +0000 |
4 | Subject: [PATCH 01/13] Allow using a system-installed libjpeg | 4 | Subject: [PATCH] Allow using a system-installed libjpeg |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
6 | Content-Type: text/plain; charset=UTF-8 | 6 | Content-Type: text/plain; charset=UTF-8 |
7 | Content-Transfer-Encoding: 8bit | 7 | Content-Transfer-Encoding: 8bit |
@@ -22,12 +22,13 @@ Upstream-Status: Backport | |||
22 | 22 | ||
23 | Signed-off-by: André Draszik <andre.draszik@jci.com> | 23 | Signed-off-by: André Draszik <andre.draszik@jci.com> |
24 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | 24 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> |
25 | |||
25 | --- | 26 | --- |
26 | common/autoconf/libraries.m4 | 35 ++++++++++++++++++++++++++++++----- | 27 | common/autoconf/libraries.m4 | 35 ++++++++++++++++++++++++++++++----- |
27 | 1 file changed, 30 insertions(+), 5 deletions(-) | 28 | 1 file changed, 30 insertions(+), 5 deletions(-) |
28 | 29 | ||
29 | diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4 | 30 | diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4 |
30 | index 6d803f9..d2732eb 100644 | 31 | index 6d803f9b..d2732eb8 100644 |
31 | --- a/common/autoconf/libraries.m4 | 32 | --- a/common/autoconf/libraries.m4 |
32 | +++ b/common/autoconf/libraries.m4 | 33 | +++ b/common/autoconf/libraries.m4 |
33 | @@ -774,11 +774,36 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS], | 34 | @@ -774,11 +774,36 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS], |
@@ -72,6 +73,3 @@ index 6d803f9..d2732eb 100644 | |||
72 | AC_SUBST(USE_EXTERNAL_LIBJPEG) | 73 | AC_SUBST(USE_EXTERNAL_LIBJPEG) |
73 | 74 | ||
74 | ############################################################################### | 75 | ############################################################################### |
75 | -- | ||
76 | 2.26.2 | ||
77 | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/0002-Allow-using-a-system-installed-libpng.patch b/recipes-core/openjdk/patches-openjdk-8/0002-Allow-using-a-system-installed-libpng.patch index 98c09d6..64f4bce 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0002-Allow-using-a-system-installed-libpng.patch +++ b/recipes-core/openjdk/patches-openjdk-8/0002-Allow-using-a-system-installed-libpng.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 17413a1bca9a6c27e049122d65b0d4fa291a53ec Mon Sep 17 00:00:00 2001 | 1 | From 048b9cb7910cf2f04f73483dd9755aeb50017e6b Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> | 2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> |
3 | Date: Thu, 2 Jan 2020 13:40:50 +0100 | 3 | Date: Thu, 2 Jan 2020 13:40:50 +0100 |
4 | Subject: [PATCH 02/13] Allow using a system-installed libpng | 4 | Subject: [PATCH] Allow using a system-installed libpng |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
6 | Content-Type: text/plain; charset=UTF-8 | 6 | Content-Type: text/plain; charset=UTF-8 |
7 | Content-Transfer-Encoding: 8bit | 7 | Content-Transfer-Encoding: 8bit |
@@ -19,12 +19,13 @@ Upstream-Status: Backport | |||
19 | 19 | ||
20 | Signed-off-by: André Draszik <andre.draszik@jci.com> | 20 | Signed-off-by: André Draszik <andre.draszik@jci.com> |
21 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | 21 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> |
22 | |||
22 | --- | 23 | --- |
23 | common/autoconf/libraries.m4 | 41 ++++++++++++++++++++++++++++++++++++ | 24 | common/autoconf/libraries.m4 | 41 ++++++++++++++++++++++++++++++++++++ |
24 | 1 file changed, 41 insertions(+) | 25 | 1 file changed, 41 insertions(+) |
25 | 26 | ||
26 | diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4 | 27 | diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4 |
27 | index d2732eb..727f018 100644 | 28 | index d2732eb8..727f0181 100644 |
28 | --- a/common/autoconf/libraries.m4 | 29 | --- a/common/autoconf/libraries.m4 |
29 | +++ b/common/autoconf/libraries.m4 | 30 | +++ b/common/autoconf/libraries.m4 |
30 | @@ -843,6 +843,47 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS], | 31 | @@ -843,6 +843,47 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS], |
@@ -75,6 +76,3 @@ index d2732eb..727f018 100644 | |||
75 | ############################################################################### | 76 | ############################################################################### |
76 | # | 77 | # |
77 | # Check for the zlib library | 78 | # Check for the zlib library |
78 | -- | ||
79 | 2.26.2 | ||
80 | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/0003-build-fix-build-on-as-needed-toolchains-generic.patch b/recipes-core/openjdk/patches-openjdk-8/0003-build-fix-build-on-as-needed-toolchains-generic.patch index d2b6031..0ab4b7d 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0003-build-fix-build-on-as-needed-toolchains-generic.patch +++ b/recipes-core/openjdk/patches-openjdk-8/0003-build-fix-build-on-as-needed-toolchains-generic.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 770123c9fcc4ab8c8ce8f37cde5afe9c44c7176c Mon Sep 17 00:00:00 2001 | 1 | From 34bfdbabf0b2d9b1d0965b5fe362fd9596f58527 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> | 2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> |
3 | Date: Mon, 12 Mar 2018 15:40:58 +0000 | 3 | Date: Mon, 12 Mar 2018 15:40:58 +0000 |
4 | Subject: [PATCH 03/13] build: fix build on --as-needed toolchains (generic) | 4 | Subject: [PATCH] build: fix build on --as-needed toolchains (generic) |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
6 | Content-Type: text/plain; charset=UTF-8 | 6 | Content-Type: text/plain; charset=UTF-8 |
7 | Content-Transfer-Encoding: 8bit | 7 | Content-Transfer-Encoding: 8bit |
@@ -66,12 +66,13 @@ all. | |||
66 | 66 | ||
67 | Signed-off-by: André Draszik <andre.draszik@jci.com> | 67 | Signed-off-by: André Draszik <andre.draszik@jci.com> |
68 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | 68 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> |
69 | |||
69 | --- | 70 | --- |
70 | make/common/NativeCompilation.gmk | 5 ++--- | 71 | make/common/NativeCompilation.gmk | 5 ++--- |
71 | 1 file changed, 2 insertions(+), 3 deletions(-) | 72 | 1 file changed, 2 insertions(+), 3 deletions(-) |
72 | 73 | ||
73 | diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk | 74 | diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk |
74 | index d961cf3..92f8033 100644 | 75 | index d961cf35..92f8033f 100644 |
75 | --- a/make/common/NativeCompilation.gmk | 76 | --- a/make/common/NativeCompilation.gmk |
76 | +++ b/make/common/NativeCompilation.gmk | 77 | +++ b/make/common/NativeCompilation.gmk |
77 | @@ -618,9 +618,8 @@ endif # no MacOS X support yet | 78 | @@ -618,9 +618,8 @@ endif # no MacOS X support yet |
@@ -86,6 +87,3 @@ index d961cf3..92f8033 100644 | |||
86 | ifneq (,$$($1_GEN_MANIFEST)) | 87 | ifneq (,$$($1_GEN_MANIFEST)) |
87 | $(MT) -nologo -manifest $$($1_GEN_MANIFEST) -outputresource:$$@;#1 | 88 | $(MT) -nologo -manifest $$($1_GEN_MANIFEST) -outputresource:$$@;#1 |
88 | endif | 89 | endif |
89 | -- | ||
90 | 2.26.2 | ||
91 | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/0004-don-t-expect-fqpn-for-make.patch b/recipes-core/openjdk/patches-openjdk-8/0004-don-t-expect-fqpn-for-make.patch index 77efe81..eab00d2 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0004-don-t-expect-fqpn-for-make.patch +++ b/recipes-core/openjdk/patches-openjdk-8/0004-don-t-expect-fqpn-for-make.patch | |||
@@ -1,15 +1,16 @@ | |||
1 | From 12dbeed90199730ad56ad842ae53e9d8aa477c0c Mon Sep 17 00:00:00 2001 | 1 | From a99cf53a082c1b25f5f7159c65bfd2c27a63fe75 Mon Sep 17 00:00:00 2001 |
2 | From: Jens Rehsack <rehsack@gmail.com> | 2 | From: Jens Rehsack <rehsack@gmail.com> |
3 | Date: Thu, 2 Jan 2020 13:42:43 +0100 | 3 | Date: Thu, 2 Jan 2020 13:42:43 +0100 |
4 | Subject: [PATCH 04/13] don't expect fqpn for make | 4 | Subject: [PATCH] don't expect fqpn for make |
5 | 5 | ||
6 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | 6 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> |
7 | |||
7 | --- | 8 | --- |
8 | common/autoconf/basics.m4 | 8 +++++--- | 9 | common/autoconf/basics.m4 | 8 +++++--- |
9 | 1 file changed, 5 insertions(+), 3 deletions(-) | 10 | 1 file changed, 5 insertions(+), 3 deletions(-) |
10 | 11 | ||
11 | diff --git a/common/autoconf/basics.m4 b/common/autoconf/basics.m4 | 12 | diff --git a/common/autoconf/basics.m4 b/common/autoconf/basics.m4 |
12 | index 4ee9cdd..c20ea76 100644 | 13 | index 4ee9cdd1..c20ea765 100644 |
13 | --- a/common/autoconf/basics.m4 | 14 | --- a/common/autoconf/basics.m4 |
14 | +++ b/common/autoconf/basics.m4 | 15 | +++ b/common/autoconf/basics.m4 |
15 | @@ -740,10 +740,12 @@ AC_DEFUN([BASIC_CHECK_GNU_MAKE], | 16 | @@ -740,10 +740,12 @@ AC_DEFUN([BASIC_CHECK_GNU_MAKE], |
@@ -28,6 +29,3 @@ index 4ee9cdd..c20ea76 100644 | |||
28 | if test "x$FOUND_MAKE" = x; then | 29 | if test "x$FOUND_MAKE" = x; then |
29 | AC_MSG_ERROR([The specified make (by MAKE=$MAKE) is not GNU make 3.81 or newer.]) | 30 | AC_MSG_ERROR([The specified make (by MAKE=$MAKE) is not GNU make 3.81 or newer.]) |
30 | fi | 31 | fi |
31 | -- | ||
32 | 2.26.2 | ||
33 | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/0005-autoconf-filter-aclocal-copy-too.patch b/recipes-core/openjdk/patches-openjdk-8/0005-autoconf-filter-aclocal-copy-too.patch index 27a2ff2..1a0f6e3 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0005-autoconf-filter-aclocal-copy-too.patch +++ b/recipes-core/openjdk/patches-openjdk-8/0005-autoconf-filter-aclocal-copy-too.patch | |||
@@ -1,15 +1,16 @@ | |||
1 | From def92aa795271fa3e6fd36009d89e06009d21c6a Mon Sep 17 00:00:00 2001 | 1 | From 37a7b95ab512ddeb635b6b8e23e4bac089ccee38 Mon Sep 17 00:00:00 2001 |
2 | From: Jens Rehsack <rehsack@gmail.com> | 2 | From: Jens Rehsack <rehsack@gmail.com> |
3 | Date: Thu, 2 Jan 2020 13:44:25 +0100 | 3 | Date: Thu, 2 Jan 2020 13:44:25 +0100 |
4 | Subject: [PATCH 05/13] autoconf: filter aclocal copy too | 4 | Subject: [PATCH] autoconf: filter aclocal copy too |
5 | 5 | ||
6 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | 6 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> |
7 | |||
7 | --- | 8 | --- |
8 | common/autoconf/basics.m4 | 1 + | 9 | common/autoconf/basics.m4 | 1 + |
9 | 1 file changed, 1 insertion(+) | 10 | 1 file changed, 1 insertion(+) |
10 | 11 | ||
11 | diff --git a/common/autoconf/basics.m4 b/common/autoconf/basics.m4 | 12 | diff --git a/common/autoconf/basics.m4 b/common/autoconf/basics.m4 |
12 | index c20ea76..8e06cd2 100644 | 13 | index c20ea765..8e06cd25 100644 |
13 | --- a/common/autoconf/basics.m4 | 14 | --- a/common/autoconf/basics.m4 |
14 | +++ b/common/autoconf/basics.m4 | 15 | +++ b/common/autoconf/basics.m4 |
15 | @@ -636,6 +636,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_OUTPUT_DIR], | 16 | @@ -636,6 +636,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_OUTPUT_DIR], |
@@ -20,6 +21,3 @@ index c20ea76..8e06cd2 100644 | |||
20 | -e 's/ //g' \ | 21 | -e 's/ //g' \ |
21 | | $TR -d '\n'` | 22 | | $TR -d '\n'` |
22 | if test "x$filtered_files" != x; then | 23 | if test "x$filtered_files" != x; then |
23 | -- | ||
24 | 2.26.2 | ||
25 | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/0006-autoconf-handle-extra-output.patch b/recipes-core/openjdk/patches-openjdk-8/0006-autoconf-handle-extra-output.patch index 58dd7bc..d24ed71 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0006-autoconf-handle-extra-output.patch +++ b/recipes-core/openjdk/patches-openjdk-8/0006-autoconf-handle-extra-output.patch | |||
@@ -1,19 +1,20 @@ | |||
1 | From ee5e07895570a9ea2ae2490f3b159bde29967238 Mon Sep 17 00:00:00 2001 | 1 | From be1397b2106874869eebfc0b21943f1976a97f1b Mon Sep 17 00:00:00 2001 |
2 | From: Haiqing Bai <Haiqing.Bai@windriver.com> | 2 | From: Haiqing Bai <Haiqing.Bai@windriver.com> |
3 | Date: Thu, 2 Jan 2020 13:45:42 +0100 | 3 | Date: Thu, 2 Jan 2020 13:45:42 +0100 |
4 | Subject: [PATCH 06/13] autoconf: handle extra output | 4 | Subject: [PATCH] autoconf: handle extra output |
5 | 5 | ||
6 | When adding the environment variable JAVA_TOOL_OPTIONS an extra line | 6 | When adding the environment variable JAVA_TOOL_OPTIONS an extra line |
7 | in the output from 'java -version' is produced. As this output is | 7 | in the output from 'java -version' is produced. As this output is |
8 | parsed by configure script the extra line has to be filtered out. | 8 | parsed by configure script the extra line has to be filtered out. |
9 | 9 | ||
10 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | 10 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> |
11 | |||
11 | --- | 12 | --- |
12 | common/autoconf/boot-jdk.m4 | 2 +- | 13 | common/autoconf/boot-jdk.m4 | 2 +- |
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
14 | 15 | ||
15 | diff --git a/common/autoconf/boot-jdk.m4 b/common/autoconf/boot-jdk.m4 | 16 | diff --git a/common/autoconf/boot-jdk.m4 b/common/autoconf/boot-jdk.m4 |
16 | index 5be15b8..0d1a6e1 100644 | 17 | index 5be15b86..0d1a6e14 100644 |
17 | --- a/common/autoconf/boot-jdk.m4 | 18 | --- a/common/autoconf/boot-jdk.m4 |
18 | +++ b/common/autoconf/boot-jdk.m4 | 19 | +++ b/common/autoconf/boot-jdk.m4 |
19 | @@ -51,7 +51,7 @@ AC_DEFUN([BOOTJDK_DO_CHECK], | 20 | @@ -51,7 +51,7 @@ AC_DEFUN([BOOTJDK_DO_CHECK], |
@@ -25,6 +26,3 @@ index 5be15b8..0d1a6e1 100644 | |||
25 | 26 | ||
26 | # Extra M4 quote needed to protect [] in grep expression. | 27 | # Extra M4 quote needed to protect [] in grep expression. |
27 | [FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`] | 28 | [FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`] |
28 | -- | ||
29 | 2.26.2 | ||
30 | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/0007-fix-assembler-flag-handling-in-makefile.patch b/recipes-core/openjdk/patches-openjdk-8/0007-fix-assembler-flag-handling-in-makefile.patch index 01cabbd..b7e84b2 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0007-fix-assembler-flag-handling-in-makefile.patch +++ b/recipes-core/openjdk/patches-openjdk-8/0007-fix-assembler-flag-handling-in-makefile.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From b8d48149b05fcd1a12dce25ffc345b43aaa76f32 Mon Sep 17 00:00:00 2001 | 1 | From 2206e1d037359cf4f08a6c7b944d6735b56ea36d Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Erkka=20K=C3=A4=C3=A4ri=C3=A4?= <erkka.kaaria@intel.com> | 2 | From: =?UTF-8?q?Erkka=20K=C3=A4=C3=A4ri=C3=A4?= <erkka.kaaria@intel.com> |
3 | Date: Thu, 2 Jan 2020 13:49:02 +0100 | 3 | Date: Thu, 2 Jan 2020 13:49:02 +0100 |
4 | Subject: [PATCH 07/13] fix assembler flag handling in makefile | 4 | Subject: [PATCH] fix assembler flag handling in makefile |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
6 | Content-Type: text/plain; charset=UTF-8 | 6 | Content-Type: text/plain; charset=UTF-8 |
7 | Content-Transfer-Encoding: 8bit | 7 | Content-Transfer-Encoding: 8bit |
@@ -14,12 +14,13 @@ Upstream-Status: Pending | |||
14 | 14 | ||
15 | Signed-off-by: Erkka Kääriä <erkka.kaaria@intel.com> | 15 | Signed-off-by: Erkka Kääriä <erkka.kaaria@intel.com> |
16 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | 16 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> |
17 | |||
17 | --- | 18 | --- |
18 | make/common/NativeCompilation.gmk | 2 +- | 19 | make/common/NativeCompilation.gmk | 2 +- |
19 | 1 file changed, 1 insertion(+), 1 deletion(-) | 20 | 1 file changed, 1 insertion(+), 1 deletion(-) |
20 | 21 | ||
21 | diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk | 22 | diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk |
22 | index 92f8033..46a1be9 100644 | 23 | index 92f8033f..46a1be91 100644 |
23 | --- a/make/common/NativeCompilation.gmk | 24 | --- a/make/common/NativeCompilation.gmk |
24 | +++ b/make/common/NativeCompilation.gmk | 25 | +++ b/make/common/NativeCompilation.gmk |
25 | @@ -391,7 +391,7 @@ define SetupNativeCompilation | 26 | @@ -391,7 +391,7 @@ define SetupNativeCompilation |
@@ -31,6 +32,3 @@ index 92f8033..46a1be9 100644 | |||
31 | 32 | ||
32 | # On windows we need to create a resource file | 33 | # On windows we need to create a resource file |
33 | ifeq ($(OPENJDK_TARGET_OS), windows) | 34 | ifeq ($(OPENJDK_TARGET_OS), windows) |
34 | -- | ||
35 | 2.26.2 | ||
36 | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/0008-autoconf-fix-shark-build-common.patch b/recipes-core/openjdk/patches-openjdk-8/0008-autoconf-fix-shark-build-common.patch index 84a37a3..9cf468e 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0008-autoconf-fix-shark-build-common.patch +++ b/recipes-core/openjdk/patches-openjdk-8/0008-autoconf-fix-shark-build-common.patch | |||
@@ -1,15 +1,16 @@ | |||
1 | From c03f916a8a49a3c83f72f28fefa6eab6377b909c Mon Sep 17 00:00:00 2001 | 1 | From bc54b9fbe29c524c07377fb8a87922be55c61700 Mon Sep 17 00:00:00 2001 |
2 | From: Jens Rehsack <rehsack@gmail.com> | 2 | From: Jens Rehsack <rehsack@gmail.com> |
3 | Date: Thu, 2 Jan 2020 13:51:40 +0100 | 3 | Date: Thu, 2 Jan 2020 13:51:40 +0100 |
4 | Subject: [PATCH 08/13] autoconf: fix shark build (common) | 4 | Subject: [PATCH] autoconf: fix shark build (common) |
5 | 5 | ||
6 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | 6 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> |
7 | |||
7 | --- | 8 | --- |
8 | common/autoconf/libraries.m4 | 5 +++-- | 9 | common/autoconf/libraries.m4 | 5 +++-- |
9 | 1 file changed, 3 insertions(+), 2 deletions(-) | 10 | 1 file changed, 3 insertions(+), 2 deletions(-) |
10 | 11 | ||
11 | diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4 | 12 | diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4 |
12 | index 727f018..91d2b5c 100644 | 13 | index 727f0181..91d2b5ca 100644 |
13 | --- a/common/autoconf/libraries.m4 | 14 | --- a/common/autoconf/libraries.m4 |
14 | +++ b/common/autoconf/libraries.m4 | 15 | +++ b/common/autoconf/libraries.m4 |
15 | @@ -1079,8 +1079,9 @@ AC_DEFUN_ONCE([LIB_SETUP_STATIC_LINK_LIBSTDCPP], | 16 | @@ -1079,8 +1079,9 @@ AC_DEFUN_ONCE([LIB_SETUP_STATIC_LINK_LIBSTDCPP], |
@@ -32,6 +33,3 @@ index 727f018..91d2b5c 100644 | |||
32 | if echo "${flag}" | grep -q '^-l'; then | 33 | if echo "${flag}" | grep -q '^-l'; then |
33 | if test "${LLVM_LIBS}" != ""; then | 34 | if test "${LLVM_LIBS}" != ""; then |
34 | LLVM_LIBS="${LLVM_LIBS} " | 35 | LLVM_LIBS="${LLVM_LIBS} " |
35 | -- | ||
36 | 2.26.2 | ||
37 | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/0009-prevent-debuginfo-in-favour-of-openembedded-package-.patch b/recipes-core/openjdk/patches-openjdk-8/0009-prevent-debuginfo-in-favour-of-openembedded-package-.patch index 294e448..ff6180f 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0009-prevent-debuginfo-in-favour-of-openembedded-package-.patch +++ b/recipes-core/openjdk/patches-openjdk-8/0009-prevent-debuginfo-in-favour-of-openembedded-package-.patch | |||
@@ -1,16 +1,16 @@ | |||
1 | From a2a8f8df244efca22da633b676a45d62b2fbb580 Mon Sep 17 00:00:00 2001 | 1 | From 038f36c083a83916504b8b59c80099fbeb9a68d6 Mon Sep 17 00:00:00 2001 |
2 | From: Jens Rehsack <rehsack@gmail.com> | 2 | From: Jens Rehsack <rehsack@gmail.com> |
3 | Date: Thu, 2 Jan 2020 13:53:50 +0100 | 3 | Date: Thu, 2 Jan 2020 13:53:50 +0100 |
4 | Subject: [PATCH 09/13] prevent debuginfo in favour of openembedded package | 4 | Subject: [PATCH] prevent debuginfo in favour of openembedded package split |
5 | split | ||
6 | 5 | ||
7 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | 6 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> |
7 | |||
8 | --- | 8 | --- |
9 | make/common/NativeCompilation.gmk | 122 ------------------------------ | 9 | make/common/NativeCompilation.gmk | 122 ------------------------------ |
10 | 1 file changed, 122 deletions(-) | 10 | 1 file changed, 122 deletions(-) |
11 | 11 | ||
12 | diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk | 12 | diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk |
13 | index 46a1be9..b4ea2c6 100644 | 13 | index 46a1be91..b4ea2c6f 100644 |
14 | --- a/make/common/NativeCompilation.gmk | 14 | --- a/make/common/NativeCompilation.gmk |
15 | +++ b/make/common/NativeCompilation.gmk | 15 | +++ b/make/common/NativeCompilation.gmk |
16 | @@ -456,67 +456,6 @@ define SetupNativeCompilation | 16 | @@ -456,67 +456,6 @@ define SetupNativeCompilation |
@@ -149,6 +149,3 @@ index 46a1be9..b4ea2c6 100644 | |||
149 | endif | 149 | endif |
150 | endif | 150 | endif |
151 | 151 | ||
152 | -- | ||
153 | 2.26.2 | ||
154 | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/0010-autoconf-remove-shell-variables-from-autoheader.patch b/recipes-core/openjdk/patches-openjdk-8/0010-autoconf-remove-shell-variables-from-autoheader.patch index 2aa4a8d..ff9346c 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0010-autoconf-remove-shell-variables-from-autoheader.patch +++ b/recipes-core/openjdk/patches-openjdk-8/0010-autoconf-remove-shell-variables-from-autoheader.patch | |||
@@ -1,15 +1,16 @@ | |||
1 | From 8864d47290e9d5563fb8f3ea92639c4accc46fe8 Mon Sep 17 00:00:00 2001 | 1 | From b6e88ffb6c4a8d84da643fa9cb29c086f7c02584 Mon Sep 17 00:00:00 2001 |
2 | From: Jens Rehsack <rehsack@gmail.com> | 2 | From: Jens Rehsack <rehsack@gmail.com> |
3 | Date: Thu, 2 Jan 2020 13:55:29 +0100 | 3 | Date: Thu, 2 Jan 2020 13:55:29 +0100 |
4 | Subject: [PATCH 10/13] autoconf: remove shell variables from autoheader | 4 | Subject: [PATCH] autoconf: remove shell variables from autoheader |
5 | 5 | ||
6 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | 6 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> |
7 | |||
7 | --- | 8 | --- |
8 | common/autoconf/basics.m4 | 14 +++++++------- | 9 | common/autoconf/basics.m4 | 14 +++++++------- |
9 | 1 file changed, 7 insertions(+), 7 deletions(-) | 10 | 1 file changed, 7 insertions(+), 7 deletions(-) |
10 | 11 | ||
11 | diff --git a/common/autoconf/basics.m4 b/common/autoconf/basics.m4 | 12 | diff --git a/common/autoconf/basics.m4 b/common/autoconf/basics.m4 |
12 | index 8e06cd2..c220bba 100644 | 13 | index 8e06cd25..c220bba7 100644 |
13 | --- a/common/autoconf/basics.m4 | 14 | --- a/common/autoconf/basics.m4 |
14 | +++ b/common/autoconf/basics.m4 | 15 | +++ b/common/autoconf/basics.m4 |
15 | @@ -661,21 +661,21 @@ AC_DEFUN_ONCE([BASIC_SETUP_OUTPUT_DIR], | 16 | @@ -661,21 +661,21 @@ AC_DEFUN_ONCE([BASIC_SETUP_OUTPUT_DIR], |
@@ -41,6 +42,3 @@ index 8e06cd2..c220bba 100644 | |||
41 | ]) | 42 | ]) |
42 | 43 | ||
43 | AC_DEFUN_ONCE([BASIC_SETUP_LOGGING], | 44 | AC_DEFUN_ONCE([BASIC_SETUP_LOGGING], |
44 | -- | ||
45 | 2.26.2 | ||
46 | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/0013-autoconf-remove-Werror.patch b/recipes-core/openjdk/patches-openjdk-8/0013-autoconf-remove-Werror.patch index 91fedb5..7991a04 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0013-autoconf-remove-Werror.patch +++ b/recipes-core/openjdk/patches-openjdk-8/0013-autoconf-remove-Werror.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 3d7493808f435b70101003534d98e249bf7e734c Mon Sep 17 00:00:00 2001 | 1 | From 3a41aceff84ac9c64910f2efbd4bee7c3532c65d Mon Sep 17 00:00:00 2001 |
2 | From: Richard Leitner <richard.leitner@skidata.com> | 2 | From: Richard Leitner <richard.leitner@skidata.com> |
3 | Date: Wed, 29 Apr 2020 10:15:11 +0200 | 3 | Date: Wed, 29 Apr 2020 10:15:11 +0200 |
4 | Subject: [PATCH 13/13] autoconf: remove Werror | 4 | Subject: [PATCH] autoconf: remove Werror |
5 | 5 | ||
6 | We don't want to mess around with disabling warnings on new | 6 | We don't want to mess around with disabling warnings on new |
7 | compiler versions therefore we remove Werror. | 7 | compiler versions therefore we remove Werror. |
@@ -9,13 +9,14 @@ compiler versions therefore we remove Werror. | |||
9 | Upstream-Status: Invalid | 9 | Upstream-Status: Invalid |
10 | 10 | ||
11 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | 11 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> |
12 | |||
12 | --- | 13 | --- |
13 | common/autoconf/flags.m4 | 12 +++--- | 14 | common/autoconf/flags.m4 | 12 +++--- |
14 | common/autoconf/generated-configure.sh | 56 +++++++++++++------------- | 15 | common/autoconf/generated-configure.sh | 56 +++++++++++++------------- |
15 | 2 files changed, 34 insertions(+), 34 deletions(-) | 16 | 2 files changed, 34 insertions(+), 34 deletions(-) |
16 | 17 | ||
17 | diff --git a/common/autoconf/flags.m4 b/common/autoconf/flags.m4 | 18 | diff --git a/common/autoconf/flags.m4 b/common/autoconf/flags.m4 |
18 | index 077efa2..b98575a 100644 | 19 | index 077efa29..b98575a1 100644 |
19 | --- a/common/autoconf/flags.m4 | 20 | --- a/common/autoconf/flags.m4 |
20 | +++ b/common/autoconf/flags.m4 | 21 | +++ b/common/autoconf/flags.m4 |
21 | @@ -399,7 +399,7 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK], | 22 | @@ -399,7 +399,7 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK], |
@@ -63,10 +64,10 @@ index 077efa2..b98575a 100644 | |||
63 | CFLAGS_JDK="${CFLAGS_JDK} ${NO_DELETE_NULL_POINTER_CHECKS_CFLAG} ${NO_LIFETIME_DSE_CFLAG}" | 64 | CFLAGS_JDK="${CFLAGS_JDK} ${NO_DELETE_NULL_POINTER_CHECKS_CFLAG} ${NO_LIFETIME_DSE_CFLAG}" |
64 | AC_SUBST([NO_LIFETIME_DSE_CFLAG]) | 65 | AC_SUBST([NO_LIFETIME_DSE_CFLAG]) |
65 | diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh | 66 | diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh |
66 | index f285a74..31d41b1 100644 | 67 | index d57035b0..1953dc4e 100644 |
67 | --- a/common/autoconf/generated-configure.sh | 68 | --- a/common/autoconf/generated-configure.sh |
68 | +++ b/common/autoconf/generated-configure.sh | 69 | +++ b/common/autoconf/generated-configure.sh |
69 | @@ -41503,12 +41503,12 @@ $as_echo "$ac_cv_c_bigendian" >&6; } | 70 | @@ -41498,12 +41498,12 @@ $as_echo "$ac_cv_c_bigendian" >&6; } |
70 | fi | 71 | fi |
71 | CXXSTD_CXXFLAG="-std=gnu++98" | 72 | CXXSTD_CXXFLAG="-std=gnu++98" |
72 | 73 | ||
@@ -82,7 +83,7 @@ index f285a74..31d41b1 100644 | |||
82 | ac_ext=cpp | 83 | ac_ext=cpp |
83 | ac_cpp='$CXXCPP $CPPFLAGS' | 84 | ac_cpp='$CXXCPP $CPPFLAGS' |
84 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' | 85 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
85 | @@ -41659,12 +41659,12 @@ fi | 86 | @@ -41654,12 +41654,12 @@ fi |
86 | NO_DELETE_NULL_POINTER_CHECKS_CFLAG="-fno-delete-null-pointer-checks" | 87 | NO_DELETE_NULL_POINTER_CHECKS_CFLAG="-fno-delete-null-pointer-checks" |
87 | 88 | ||
88 | 89 | ||
@@ -98,7 +99,7 @@ index f285a74..31d41b1 100644 | |||
98 | ac_ext=c | 99 | ac_ext=c |
99 | ac_cpp='$CPP $CPPFLAGS' | 100 | ac_cpp='$CPP $CPPFLAGS' |
100 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | 101 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
101 | @@ -41699,12 +41699,12 @@ $as_echo "$supports" >&6; } | 102 | @@ -41694,12 +41694,12 @@ $as_echo "$supports" >&6; } |
102 | fi | 103 | fi |
103 | 104 | ||
104 | 105 | ||
@@ -114,7 +115,7 @@ index f285a74..31d41b1 100644 | |||
114 | ac_ext=cpp | 115 | ac_ext=cpp |
115 | ac_cpp='$CXXCPP $CPPFLAGS' | 116 | ac_cpp='$CXXCPP $CPPFLAGS' |
116 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' | 117 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
117 | @@ -41738,8 +41738,8 @@ $as_echo "$supports" >&6; } | 118 | @@ -41733,8 +41733,8 @@ $as_echo "$supports" >&6; } |
118 | fi | 119 | fi |
119 | 120 | ||
120 | 121 | ||
@@ -125,7 +126,7 @@ index f285a74..31d41b1 100644 | |||
125 | supports=no | 126 | supports=no |
126 | if test "x$C_COMP_SUPPORTS" = "xyes" -a "x$CXX_COMP_SUPPORTS" = "xyes"; then supports=yes; fi | 127 | if test "x$C_COMP_SUPPORTS" = "xyes" -a "x$CXX_COMP_SUPPORTS" = "xyes"; then supports=yes; fi |
127 | 128 | ||
128 | @@ -41755,12 +41755,12 @@ $as_echo "$supports" >&6; } | 129 | @@ -41750,12 +41750,12 @@ $as_echo "$supports" >&6; } |
129 | NO_LIFETIME_DSE_CFLAG="-fno-lifetime-dse" | 130 | NO_LIFETIME_DSE_CFLAG="-fno-lifetime-dse" |
130 | 131 | ||
131 | 132 | ||
@@ -141,7 +142,7 @@ index f285a74..31d41b1 100644 | |||
141 | ac_ext=c | 142 | ac_ext=c |
142 | ac_cpp='$CPP $CPPFLAGS' | 143 | ac_cpp='$CPP $CPPFLAGS' |
143 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | 144 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
144 | @@ -41794,12 +41794,12 @@ $as_echo "$supports" >&6; } | 145 | @@ -41789,12 +41789,12 @@ $as_echo "$supports" >&6; } |
145 | fi | 146 | fi |
146 | 147 | ||
147 | 148 | ||
@@ -157,7 +158,7 @@ index f285a74..31d41b1 100644 | |||
157 | ac_ext=cpp | 158 | ac_ext=cpp |
158 | ac_cpp='$CXXCPP $CPPFLAGS' | 159 | ac_cpp='$CXXCPP $CPPFLAGS' |
159 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' | 160 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
160 | @@ -41833,8 +41833,8 @@ $as_echo "$supports" >&6; } | 161 | @@ -41828,8 +41828,8 @@ $as_echo "$supports" >&6; } |
161 | fi | 162 | fi |
162 | 163 | ||
163 | 164 | ||
@@ -168,7 +169,7 @@ index f285a74..31d41b1 100644 | |||
168 | supports=no | 169 | supports=no |
169 | if test "x$C_COMP_SUPPORTS" = "xyes" -a "x$CXX_COMP_SUPPORTS" = "xyes"; then supports=yes; fi | 170 | if test "x$C_COMP_SUPPORTS" = "xyes" -a "x$CXX_COMP_SUPPORTS" = "xyes"; then supports=yes; fi |
170 | 171 | ||
171 | @@ -41867,12 +41867,12 @@ $as_echo "$supports" >&6; } | 172 | @@ -41862,12 +41862,12 @@ $as_echo "$supports" >&6; } |
172 | # -mno-fused-madd -fno-strict-aliasing for GCC < 4.6 | 173 | # -mno-fused-madd -fno-strict-aliasing for GCC < 4.6 |
173 | COMPILER_FP_CONTRACT_OFF_FLAG="-ffp-contract=off" | 174 | COMPILER_FP_CONTRACT_OFF_FLAG="-ffp-contract=off" |
174 | 175 | ||
@@ -184,7 +185,7 @@ index f285a74..31d41b1 100644 | |||
184 | ac_ext=cpp | 185 | ac_ext=cpp |
185 | ac_cpp='$CXXCPP $CPPFLAGS' | 186 | ac_cpp='$CXXCPP $CPPFLAGS' |
186 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' | 187 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
187 | @@ -41911,12 +41911,12 @@ $as_echo "$supports" >&6; } | 188 | @@ -41906,12 +41906,12 @@ $as_echo "$supports" >&6; } |
188 | test "$OPENJDK_TARGET_CPU_ARCH" = "ppc"; then | 189 | test "$OPENJDK_TARGET_CPU_ARCH" = "ppc"; then |
189 | M_NO_FUSED_ADD_FLAG="-mno-fused-madd" | 190 | M_NO_FUSED_ADD_FLAG="-mno-fused-madd" |
190 | 191 | ||
@@ -200,7 +201,7 @@ index f285a74..31d41b1 100644 | |||
200 | ac_ext=cpp | 201 | ac_ext=cpp |
201 | ac_cpp='$CXXCPP $CPPFLAGS' | 202 | ac_cpp='$CXXCPP $CPPFLAGS' |
202 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' | 203 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
203 | @@ -41951,12 +41951,12 @@ $as_echo "$supports" >&6; } | 204 | @@ -41946,12 +41946,12 @@ $as_echo "$supports" >&6; } |
204 | 205 | ||
205 | NO_STRICT_ALIASING_FLAG="-fno-strict-aliasing" | 206 | NO_STRICT_ALIASING_FLAG="-fno-strict-aliasing" |
206 | 207 | ||
@@ -216,6 +217,3 @@ index f285a74..31d41b1 100644 | |||
216 | ac_ext=cpp | 217 | ac_ext=cpp |
217 | ac_cpp='$CXXCPP $CPPFLAGS' | 218 | ac_cpp='$CXXCPP $CPPFLAGS' |
218 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' | 219 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
219 | -- | ||
220 | 2.26.2 | ||
221 | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/1002-hotspot-use-correct-include-for-poll.patch b/recipes-core/openjdk/patches-openjdk-8/1002-hotspot-use-correct-include-for-poll.patch index aa93c25..7739c8b 100644 --- a/recipes-core/openjdk/patches-openjdk-8/1002-hotspot-use-correct-include-for-poll.patch +++ b/recipes-core/openjdk/patches-openjdk-8/1002-hotspot-use-correct-include-for-poll.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From e40d948b71ff33d74c6e1595a798f359fb673d8f Mon Sep 17 00:00:00 2001 | 1 | From 9f2a5acce1da9908a7e94388880c831e1635e51f Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> | 2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> |
3 | Date: Tue, 27 Feb 2018 09:28:06 +0000 | 3 | Date: Tue, 27 Feb 2018 09:28:06 +0000 |
4 | Subject: [PATCH 1002/1013] hotspot: use correct include for poll | 4 | Subject: [PATCH] hotspot: use correct include for poll |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
6 | Content-Type: text/plain; charset=UTF-8 | 6 | Content-Type: text/plain; charset=UTF-8 |
7 | Content-Transfer-Encoding: 8bit | 7 | Content-Transfer-Encoding: 8bit |
@@ -23,15 +23,16 @@ Upstream-Status: Pending | |||
23 | 23 | ||
24 | Signed-off-by: André Draszik <andre.draszik@jci.com> | 24 | Signed-off-by: André Draszik <andre.draszik@jci.com> |
25 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | 25 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> |
26 | |||
26 | --- | 27 | --- |
27 | src/os/aix/vm/os_aix.inline.hpp | 2 +- | 28 | hotspot/src/os/aix/vm/os_aix.inline.hpp | 2 +- |
28 | src/os/bsd/vm/os_bsd.inline.hpp | 2 +- | 29 | hotspot/src/os/bsd/vm/os_bsd.inline.hpp | 2 +- |
29 | src/os/linux/vm/os_linux.inline.hpp | 2 +- | 30 | hotspot/src/os/linux/vm/os_linux.inline.hpp | 2 +- |
30 | src/os/solaris/vm/os_solaris.inline.hpp | 2 +- | 31 | hotspot/src/os/solaris/vm/os_solaris.inline.hpp | 2 +- |
31 | 4 files changed, 4 insertions(+), 4 deletions(-) | 32 | 4 files changed, 4 insertions(+), 4 deletions(-) |
32 | 33 | ||
33 | diff --git a/hotspot/src/os/aix/vm/os_aix.inline.hpp b/hotspot/src/os/aix/vm/os_aix.inline.hpp | 34 | diff --git a/hotspot/src/os/aix/vm/os_aix.inline.hpp b/hotspot/src/os/aix/vm/os_aix.inline.hpp |
34 | index 421ea342e..9a1e1e096 100644 | 35 | index 421ea342..9a1e1e09 100644 |
35 | --- a/hotspot/src/os/aix/vm/os_aix.inline.hpp | 36 | --- a/hotspot/src/os/aix/vm/os_aix.inline.hpp |
36 | +++ b/hotspot/src/os/aix/vm/os_aix.inline.hpp | 37 | +++ b/hotspot/src/os/aix/vm/os_aix.inline.hpp |
37 | @@ -34,7 +34,7 @@ | 38 | @@ -34,7 +34,7 @@ |
@@ -44,7 +45,7 @@ index 421ea342e..9a1e1e096 100644 | |||
44 | #include <netdb.h> | 45 | #include <netdb.h> |
45 | 46 | ||
46 | diff --git a/hotspot/src/os/bsd/vm/os_bsd.inline.hpp b/hotspot/src/os/bsd/vm/os_bsd.inline.hpp | 47 | diff --git a/hotspot/src/os/bsd/vm/os_bsd.inline.hpp b/hotspot/src/os/bsd/vm/os_bsd.inline.hpp |
47 | index c35abf486..8ff584aee 100644 | 48 | index c35abf48..8ff584ae 100644 |
48 | --- a/hotspot/src/os/bsd/vm/os_bsd.inline.hpp | 49 | --- a/hotspot/src/os/bsd/vm/os_bsd.inline.hpp |
49 | +++ b/hotspot/src/os/bsd/vm/os_bsd.inline.hpp | 50 | +++ b/hotspot/src/os/bsd/vm/os_bsd.inline.hpp |
50 | @@ -33,7 +33,7 @@ | 51 | @@ -33,7 +33,7 @@ |
@@ -57,7 +58,7 @@ index c35abf486..8ff584aee 100644 | |||
57 | 58 | ||
58 | inline void* os::thread_local_storage_at(int index) { | 59 | inline void* os::thread_local_storage_at(int index) { |
59 | diff --git a/hotspot/src/os/linux/vm/os_linux.inline.hpp b/hotspot/src/os/linux/vm/os_linux.inline.hpp | 60 | diff --git a/hotspot/src/os/linux/vm/os_linux.inline.hpp b/hotspot/src/os/linux/vm/os_linux.inline.hpp |
60 | index a23bd5631..9d56de0ef 100644 | 61 | index a23bd563..9d56de0e 100644 |
61 | --- a/hotspot/src/os/linux/vm/os_linux.inline.hpp | 62 | --- a/hotspot/src/os/linux/vm/os_linux.inline.hpp |
62 | +++ b/hotspot/src/os/linux/vm/os_linux.inline.hpp | 63 | +++ b/hotspot/src/os/linux/vm/os_linux.inline.hpp |
63 | @@ -33,7 +33,7 @@ | 64 | @@ -33,7 +33,7 @@ |
@@ -70,7 +71,7 @@ index a23bd5631..9d56de0ef 100644 | |||
70 | 71 | ||
71 | inline void* os::thread_local_storage_at(int index) { | 72 | inline void* os::thread_local_storage_at(int index) { |
72 | diff --git a/hotspot/src/os/solaris/vm/os_solaris.inline.hpp b/hotspot/src/os/solaris/vm/os_solaris.inline.hpp | 73 | diff --git a/hotspot/src/os/solaris/vm/os_solaris.inline.hpp b/hotspot/src/os/solaris/vm/os_solaris.inline.hpp |
73 | index 8e095ab69..ce37e9a12 100644 | 74 | index 8e095ab6..ce37e9a1 100644 |
74 | --- a/hotspot/src/os/solaris/vm/os_solaris.inline.hpp | 75 | --- a/hotspot/src/os/solaris/vm/os_solaris.inline.hpp |
75 | +++ b/hotspot/src/os/solaris/vm/os_solaris.inline.hpp | 76 | +++ b/hotspot/src/os/solaris/vm/os_solaris.inline.hpp |
76 | @@ -33,7 +33,7 @@ | 77 | @@ -33,7 +33,7 @@ |
@@ -82,6 +83,3 @@ index 8e095ab69..ce37e9a12 100644 | |||
82 | #include <sys/filio.h> | 83 | #include <sys/filio.h> |
83 | #include <unistd.h> | 84 | #include <unistd.h> |
84 | #include <netdb.h> | 85 | #include <netdb.h> |
85 | -- | ||
86 | 2.26.2 | ||
87 | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/1003-hotspot-don-t-rely-on-old-SysV-SIGCLD.patch b/recipes-core/openjdk/patches-openjdk-8/1003-hotspot-don-t-rely-on-old-SysV-SIGCLD.patch index 974c3a9..e0864be 100644 --- a/recipes-core/openjdk/patches-openjdk-8/1003-hotspot-don-t-rely-on-old-SysV-SIGCLD.patch +++ b/recipes-core/openjdk/patches-openjdk-8/1003-hotspot-don-t-rely-on-old-SysV-SIGCLD.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 1a4d6458d94bc275a740cab895f8ada303916cd6 Mon Sep 17 00:00:00 2001 | 1 | From 7e40a364af1427b5f5238cd8d49e947db1c1557d Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> | 2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> |
3 | Date: Tue, 27 Feb 2018 15:00:55 +0000 | 3 | Date: Tue, 27 Feb 2018 15:00:55 +0000 |
4 | Subject: [PATCH 1003/1013] hotspot: don't rely on old SysV SIGCLD | 4 | Subject: [PATCH] hotspot: don't rely on old SysV SIGCLD |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
6 | Content-Type: text/plain; charset=UTF-8 | 6 | Content-Type: text/plain; charset=UTF-8 |
7 | Content-Transfer-Encoding: 8bit | 7 | Content-Transfer-Encoding: 8bit |
@@ -20,12 +20,13 @@ Upstream-Status: Pending | |||
20 | 20 | ||
21 | Signed-off-by: André Draszik <andre.draszik@jci.com> | 21 | Signed-off-by: André Draszik <andre.draszik@jci.com> |
22 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | 22 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> |
23 | |||
23 | --- | 24 | --- |
24 | src/os/linux/vm/jvm_linux.cpp | 2 ++ | 25 | hotspot/src/os/linux/vm/jvm_linux.cpp | 2 ++ |
25 | 1 file changed, 2 insertions(+) | 26 | 1 file changed, 2 insertions(+) |
26 | 27 | ||
27 | diff --git a/hotspot/src/os/linux/vm/jvm_linux.cpp b/hotspot/src/os/linux/vm/jvm_linux.cpp | 28 | diff --git a/hotspot/src/os/linux/vm/jvm_linux.cpp b/hotspot/src/os/linux/vm/jvm_linux.cpp |
28 | index ba84788a1..c22281f7c 100644 | 29 | index ba84788a..c22281f7 100644 |
29 | --- a/hotspot/src/os/linux/vm/jvm_linux.cpp | 30 | --- a/hotspot/src/os/linux/vm/jvm_linux.cpp |
30 | +++ b/hotspot/src/os/linux/vm/jvm_linux.cpp | 31 | +++ b/hotspot/src/os/linux/vm/jvm_linux.cpp |
31 | @@ -154,7 +154,9 @@ struct siglabel siglabels[] = { | 32 | @@ -154,7 +154,9 @@ struct siglabel siglabels[] = { |
@@ -38,6 +39,3 @@ index ba84788a1..c22281f7c 100644 | |||
38 | "CHLD", SIGCHLD, /* Child status has changed (POSIX). */ | 39 | "CHLD", SIGCHLD, /* Child status has changed (POSIX). */ |
39 | "CONT", SIGCONT, /* Continue (POSIX). */ | 40 | "CONT", SIGCONT, /* Continue (POSIX). */ |
40 | "STOP", SIGSTOP, /* Stop, unblockable (POSIX). */ | 41 | "STOP", SIGSTOP, /* Stop, unblockable (POSIX). */ |
41 | -- | ||
42 | 2.26.2 | ||
43 | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/1004-hotspot-fix-Wreturn-type-issues-introduced-by-806165.patch b/recipes-core/openjdk/patches-openjdk-8/1004-hotspot-fix-Wreturn-type-issues-introduced-by-806165.patch index 54534ed..2eba669 100644 --- a/recipes-core/openjdk/patches-openjdk-8/1004-hotspot-fix-Wreturn-type-issues-introduced-by-806165.patch +++ b/recipes-core/openjdk/patches-openjdk-8/1004-hotspot-fix-Wreturn-type-issues-introduced-by-806165.patch | |||
@@ -1,8 +1,7 @@ | |||
1 | From 794a7bf743e23ff74c4900801ddc56c253542b44 Mon Sep 17 00:00:00 2001 | 1 | From 7cca9e147d9f4b98ffbc6b10e817d2e8dbd686fb Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> | 2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> |
3 | Date: Mon, 13 Aug 2018 16:40:34 +0100 | 3 | Date: Mon, 13 Aug 2018 16:40:34 +0100 |
4 | Subject: [PATCH 1004/1013] hotspot: fix -Wreturn-type issues introduced by | 4 | Subject: [PATCH] hotspot: fix -Wreturn-type issues introduced by 8061651 |
5 | 8061651 | ||
6 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
7 | Content-Type: text/plain; charset=UTF-8 | 6 | Content-Type: text/plain; charset=UTF-8 |
8 | Content-Transfer-Encoding: 8bit | 7 | Content-Transfer-Encoding: 8bit |
@@ -19,12 +18,13 @@ Upstream-Status: Backport | |||
19 | 18 | ||
20 | Signed-off-by: André Draszik <andre.draszik@jci.com> | 19 | Signed-off-by: André Draszik <andre.draszik@jci.com> |
21 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | 20 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> |
21 | |||
22 | --- | 22 | --- |
23 | src/share/vm/prims/jvm.cpp | 6 +++--- | 23 | hotspot/src/share/vm/prims/jvm.cpp | 6 +++--- |
24 | 1 file changed, 3 insertions(+), 3 deletions(-) | 24 | 1 file changed, 3 insertions(+), 3 deletions(-) |
25 | 25 | ||
26 | diff --git a/hotspot/src/share/vm/prims/jvm.cpp b/hotspot/src/share/vm/prims/jvm.cpp | 26 | diff --git a/hotspot/src/share/vm/prims/jvm.cpp b/hotspot/src/share/vm/prims/jvm.cpp |
27 | index c32c98ade..6f2221c41 100644 | 27 | index c32c98ad..6f2221c4 100644 |
28 | --- a/hotspot/src/share/vm/prims/jvm.cpp | 28 | --- a/hotspot/src/share/vm/prims/jvm.cpp |
29 | +++ b/hotspot/src/share/vm/prims/jvm.cpp | 29 | +++ b/hotspot/src/share/vm/prims/jvm.cpp |
30 | @@ -929,7 +929,7 @@ JVM_END | 30 | @@ -929,7 +929,7 @@ JVM_END |
@@ -54,6 +54,3 @@ index c32c98ade..6f2221c41 100644 | |||
54 | #else | 54 | #else |
55 | return NULL; | 55 | return NULL; |
56 | #endif | 56 | #endif |
57 | -- | ||
58 | 2.26.2 | ||
59 | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/1005-hotspot-Zero-build-requires-disabled-warnings.patch b/recipes-core/openjdk/patches-openjdk-8/1005-hotspot-Zero-build-requires-disabled-warnings.patch index fe1837d..36eefe5 100644 --- a/recipes-core/openjdk/patches-openjdk-8/1005-hotspot-Zero-build-requires-disabled-warnings.patch +++ b/recipes-core/openjdk/patches-openjdk-8/1005-hotspot-Zero-build-requires-disabled-warnings.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From f8a3f19fa4fabaf57b0c2c77e966d9896399b3f8 Mon Sep 17 00:00:00 2001 | 1 | From 9ae232a21a7c2cec88cdb4ff7e6cf7092f1578ab Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> | 2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> |
3 | Date: Mon, 13 Aug 2018 16:45:24 +0100 | 3 | Date: Mon, 13 Aug 2018 16:45:24 +0100 |
4 | Subject: [PATCH 1005/1013] hotspot: Zero build requires disabled warnings | 4 | Subject: [PATCH] hotspot: Zero build requires disabled warnings |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
6 | Content-Type: text/plain; charset=UTF-8 | 6 | Content-Type: text/plain; charset=UTF-8 |
7 | Content-Transfer-Encoding: 8bit | 7 | Content-Transfer-Encoding: 8bit |
@@ -19,15 +19,16 @@ Upstream-Status: Backport | |||
19 | 19 | ||
20 | Signed-off-by: André Draszik <andre.draszik@jci.com> | 20 | Signed-off-by: André Draszik <andre.draszik@jci.com> |
21 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | 21 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> |
22 | |||
22 | --- | 23 | --- |
23 | src/cpu/zero/vm/cppInterpreter_zero.cpp | 2 +- | 24 | hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp | 2 +- |
24 | src/cpu/zero/vm/interpreterRT_zero.cpp | 4 ++-- | 25 | hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp | 4 ++-- |
25 | src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 14 ++++++++++++-- | 26 | hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 14 ++++++++++++-- |
26 | src/os_cpu/linux_zero/vm/thread_linux_zero.hpp | 3 ++- | 27 | .../src/os_cpu/linux_zero/vm/thread_linux_zero.hpp | 3 ++- |
27 | 4 files changed, 17 insertions(+), 6 deletions(-) | 28 | 4 files changed, 17 insertions(+), 6 deletions(-) |
28 | 29 | ||
29 | diff --git a/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp b/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp | 30 | diff --git a/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp b/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp |
30 | index 525031eb9..d47422b8c 100644 | 31 | index 525031eb..d47422b8 100644 |
31 | --- a/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp | 32 | --- a/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp |
32 | +++ b/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp | 33 | +++ b/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp |
33 | @@ -100,7 +100,7 @@ intptr_t narrow(BasicType type, intptr_t result) { | 34 | @@ -100,7 +100,7 @@ intptr_t narrow(BasicType type, intptr_t result) { |
@@ -40,7 +41,7 @@ index 525031eb9..d47422b8c 100644 | |||
40 | } | 41 | } |
41 | 42 | ||
42 | diff --git a/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp b/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp | 43 | diff --git a/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp b/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp |
43 | index e23e3eaa9..061ed8ce8 100644 | 44 | index e23e3eaa..061ed8ce 100644 |
44 | --- a/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp | 45 | --- a/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp |
45 | +++ b/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp | 46 | +++ b/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp |
46 | @@ -1,5 +1,5 @@ | 47 | @@ -1,5 +1,5 @@ |
@@ -60,7 +61,7 @@ index e23e3eaa9..061ed8ce8 100644 | |||
60 | case T_VOID: | 61 | case T_VOID: |
61 | ftype = &ffi_type_void; | 62 | ftype = &ffi_type_void; |
62 | diff --git a/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp b/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 63 | diff --git a/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp b/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp |
63 | index d22ea1141..cbee43baa 100644 | 64 | index d22ea114..cbee43ba 100644 |
64 | --- a/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 65 | --- a/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp |
65 | +++ b/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 66 | +++ b/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp |
66 | @@ -61,6 +61,7 @@ address os::current_stack_pointer() { | 67 | @@ -61,6 +61,7 @@ address os::current_stack_pointer() { |
@@ -119,7 +120,7 @@ index d22ea1141..cbee43baa 100644 | |||
119 | 120 | ||
120 | void os::Linux::set_fpu_control_word(int fpu) { | 121 | void os::Linux::set_fpu_control_word(int fpu) { |
121 | diff --git a/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp b/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp | 122 | diff --git a/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp b/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp |
122 | index 94bc83a30..b3ba526f2 100644 | 123 | index 94bc83a3..b3ba526f 100644 |
123 | --- a/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp | 124 | --- a/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp |
124 | +++ b/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp | 125 | +++ b/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp |
125 | @@ -1,5 +1,5 @@ | 126 | @@ -1,5 +1,5 @@ |
@@ -137,6 +138,3 @@ index 94bc83a30..b3ba526f2 100644 | |||
137 | } | 138 | } |
138 | 139 | ||
139 | bool pd_get_top_frame_for_profiling(frame* fr_addr, | 140 | bool pd_get_top_frame_for_profiling(frame* fr_addr, |
140 | -- | ||
141 | 2.26.2 | ||
142 | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/1006-hotspot-Missing-return-statement-in-__sync_val_compa.patch b/recipes-core/openjdk/patches-openjdk-8/1006-hotspot-Missing-return-statement-in-__sync_val_compa.patch index 18aca4c..2e32702 100644 --- a/recipes-core/openjdk/patches-openjdk-8/1006-hotspot-Missing-return-statement-in-__sync_val_compa.patch +++ b/recipes-core/openjdk/patches-openjdk-8/1006-hotspot-Missing-return-statement-in-__sync_val_compa.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 5e21de887d87243b6be03781afb4015c4673851c Mon Sep 17 00:00:00 2001 | 1 | From 1f618dcda554d85d1c1dcd1bfd84d9554cb2f3b8 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> | 2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> |
3 | Date: Mon, 13 Aug 2018 16:46:33 +0100 | 3 | Date: Mon, 13 Aug 2018 16:46:33 +0100 |
4 | Subject: [PATCH 1006/1013] hotspot: Missing return statement in | 4 | Subject: [PATCH] hotspot: Missing return statement in |
5 | __sync_val_compare_and_swap_8 | 5 | __sync_val_compare_and_swap_8 |
6 | MIME-Version: 1.0 | 6 | MIME-Version: 1.0 |
7 | Content-Type: text/plain; charset=UTF-8 | 7 | Content-Type: text/plain; charset=UTF-8 |
@@ -21,13 +21,14 @@ Upstream-Status: Backport | |||
21 | 21 | ||
22 | Signed-off-by: André Draszik <andre.draszik@jci.com> | 22 | Signed-off-by: André Draszik <andre.draszik@jci.com> |
23 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | 23 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> |
24 | |||
24 | --- | 25 | --- |
25 | src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp | 1 + | 26 | hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp | 1 + |
26 | src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 1 + | 27 | hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 1 + |
27 | 2 files changed, 2 insertions(+) | 28 | 2 files changed, 2 insertions(+) |
28 | 29 | ||
29 | diff --git a/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp b/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp | 30 | diff --git a/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp b/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp |
30 | index c857b5526..4aaf78b1d 100644 | 31 | index c857b552..4aaf78b1 100644 |
31 | --- a/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp | 32 | --- a/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp |
32 | +++ b/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp | 33 | +++ b/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp |
33 | @@ -457,6 +457,7 @@ extern "C" { | 34 | @@ -457,6 +457,7 @@ extern "C" { |
@@ -39,7 +40,7 @@ index c857b5526..4aaf78b1d 100644 | |||
39 | }; | 40 | }; |
40 | #endif // !_LP64 | 41 | #endif // !_LP64 |
41 | diff --git a/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp b/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 42 | diff --git a/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp b/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp |
42 | index cbee43baa..136d4d3de 100644 | 43 | index cbee43ba..136d4d3d 100644 |
43 | --- a/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 44 | --- a/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp |
44 | +++ b/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 45 | +++ b/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp |
45 | @@ -498,6 +498,7 @@ extern "C" { | 46 | @@ -498,6 +498,7 @@ extern "C" { |
@@ -50,6 +51,3 @@ index cbee43baa..136d4d3de 100644 | |||
50 | } | 51 | } |
51 | }; | 52 | }; |
52 | #endif // !_LP64 | 53 | #endif // !_LP64 |
53 | -- | ||
54 | 2.26.2 | ||
55 | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/1007-hotspot-Turn-on-the-Wreturn-type-warning.patch b/recipes-core/openjdk/patches-openjdk-8/1007-hotspot-Turn-on-the-Wreturn-type-warning.patch index 0dc09b6..b1b59c3 100644 --- a/recipes-core/openjdk/patches-openjdk-8/1007-hotspot-Turn-on-the-Wreturn-type-warning.patch +++ b/recipes-core/openjdk/patches-openjdk-8/1007-hotspot-Turn-on-the-Wreturn-type-warning.patch | |||
@@ -1,7 +1,11 @@ | |||
1 | From 024e0d522f205ca8659fce60ca4be68b9e3e08db Mon Sep 17 00:00:00 2001 | 1 | From 6758bf27e31110dc5d4c7237476c823ff05454a2 Mon Sep 17 00:00:00 2001 |
2 | From: Richard Leitner <richard.leitner@skidata.com> | 2 | From: Richard Leitner <richard.leitner@skidata.com> |
3 | Date: Thu, 22 Oct 2020 09:41:07 +0200 | 3 | Date: Thu, 22 Oct 2020 09:41:07 +0200 |
4 | Subject: [PATCH 1007/1013] hotspot: Turn on the -Wreturn-type warning | 4 | Subject: [PATCH] hotspot: Turn on the -Wreturn-type warning |
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
5 | MIME-Version: 1.0 | 9 | MIME-Version: 1.0 |
6 | Content-Type: text/plain; charset=UTF-8 | 10 | Content-Type: text/plain; charset=UTF-8 |
7 | Content-Transfer-Encoding: 8bit | 11 | Content-Transfer-Encoding: 8bit |
@@ -19,27 +23,28 @@ Upstream-Status: Backport | |||
19 | 23 | ||
20 | Signed-off-by: André Draszik <andre.draszik@jci.com> | 24 | Signed-off-by: André Draszik <andre.draszik@jci.com> |
21 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | 25 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> |
26 | |||
22 | --- | 27 | --- |
23 | make/linux/makefiles/gcc.make | 2 +- | 28 | hotspot/make/linux/makefiles/gcc.make | 2 +- |
24 | src/cpu/x86/vm/x86_32.ad | 1 + | 29 | hotspot/src/cpu/x86/vm/x86_32.ad | 1 + |
25 | src/os_cpu/linux_x86/vm/os_linux_x86.cpp | 1 + | 30 | hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp | 1 + |
26 | src/share/vm/classfile/defaultMethods.cpp | 4 ++-- | 31 | hotspot/src/share/vm/classfile/defaultMethods.cpp | 4 ++-- |
27 | src/share/vm/classfile/symbolTable.cpp | 4 ++-- | 32 | hotspot/src/share/vm/classfile/symbolTable.cpp | 4 ++-- |
28 | src/share/vm/classfile/systemDictionary.cpp | 6 +++--- | 33 | hotspot/src/share/vm/classfile/systemDictionary.cpp | 6 +++--- |
29 | src/share/vm/memory/heapInspection.hpp | 2 +- | 34 | hotspot/src/share/vm/memory/heapInspection.hpp | 2 +- |
30 | src/share/vm/memory/metaspaceShared.hpp | 2 +- | 35 | hotspot/src/share/vm/memory/metaspaceShared.hpp | 2 +- |
31 | src/share/vm/oops/constantPool.hpp | 2 +- | 36 | hotspot/src/share/vm/oops/constantPool.hpp | 2 +- |
32 | src/share/vm/prims/jvm.cpp | 2 +- | 37 | hotspot/src/share/vm/prims/jvm.cpp | 2 +- |
33 | src/share/vm/runtime/reflection.cpp | 2 +- | 38 | hotspot/src/share/vm/runtime/reflection.cpp | 2 +- |
34 | src/share/vm/runtime/sharedRuntime.cpp | 2 +- | 39 | hotspot/src/share/vm/runtime/sharedRuntime.cpp | 2 +- |
35 | src/share/vm/services/memTracker.hpp | 2 +- | 40 | hotspot/src/share/vm/services/memTracker.hpp | 2 +- |
36 | 13 files changed, 17 insertions(+), 15 deletions(-) | 41 | 13 files changed, 17 insertions(+), 15 deletions(-) |
37 | 42 | ||
38 | diff --git a/hotspot/make/linux/makefiles/gcc.make b/hotspot/make/linux/makefiles/gcc.make | 43 | diff --git a/hotspot/make/linux/makefiles/gcc.make b/hotspot/make/linux/makefiles/gcc.make |
39 | index ac44b6837..7a5162a06 100644 | 44 | index 36b3c8ba..cd9511e5 100644 |
40 | --- a/hotspot/make/linux/makefiles/gcc.make | 45 | --- a/hotspot/make/linux/makefiles/gcc.make |
41 | +++ b/hotspot/make/linux/makefiles/gcc.make | 46 | +++ b/hotspot/make/linux/makefiles/gcc.make |
42 | @@ -212,7 +212,7 @@ ifeq ($(USE_CLANG), true) | 47 | @@ -211,7 +211,7 @@ ifeq ($(USE_CLANG), true) |
43 | WARNINGS_ARE_ERRORS += -Wno-return-type -Wno-empty-body | 48 | WARNINGS_ARE_ERRORS += -Wno-return-type -Wno-empty-body |
44 | endif | 49 | endif |
45 | 50 | ||
@@ -49,7 +54,7 @@ index ac44b6837..7a5162a06 100644 | |||
49 | ifeq ($(USE_CLANG),) | 54 | ifeq ($(USE_CLANG),) |
50 | # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit | 55 | # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit |
51 | diff --git a/hotspot/src/cpu/x86/vm/x86_32.ad b/hotspot/src/cpu/x86/vm/x86_32.ad | 56 | diff --git a/hotspot/src/cpu/x86/vm/x86_32.ad b/hotspot/src/cpu/x86/vm/x86_32.ad |
52 | index f42d1a288..c8f4ee161 100644 | 57 | index f42d1a28..c8f4ee16 100644 |
53 | --- a/hotspot/src/cpu/x86/vm/x86_32.ad | 58 | --- a/hotspot/src/cpu/x86/vm/x86_32.ad |
54 | +++ b/hotspot/src/cpu/x86/vm/x86_32.ad | 59 | +++ b/hotspot/src/cpu/x86/vm/x86_32.ad |
55 | @@ -1250,6 +1250,7 @@ uint MachSpillCopyNode::implementation( CodeBuffer *cbuf, PhaseRegAlloc *ra_, bo | 60 | @@ -1250,6 +1250,7 @@ uint MachSpillCopyNode::implementation( CodeBuffer *cbuf, PhaseRegAlloc *ra_, bo |
@@ -61,7 +66,7 @@ index f42d1a288..c8f4ee161 100644 | |||
61 | 66 | ||
62 | #ifndef PRODUCT | 67 | #ifndef PRODUCT |
63 | diff --git a/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp b/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp | 68 | diff --git a/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp b/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp |
64 | index c35d8677f..65c3165ca 100644 | 69 | index c35d8677..65c3165c 100644 |
65 | --- a/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp | 70 | --- a/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp |
66 | +++ b/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp | 71 | +++ b/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp |
67 | @@ -541,6 +541,7 @@ JVM_handle_linux_signal(int sig, | 72 | @@ -541,6 +541,7 @@ JVM_handle_linux_signal(int sig, |
@@ -73,7 +78,7 @@ index c35d8677f..65c3165ca 100644 | |||
73 | 78 | ||
74 | void os::Linux::init_thread_fpu_state(void) { | 79 | void os::Linux::init_thread_fpu_state(void) { |
75 | diff --git a/hotspot/src/share/vm/classfile/defaultMethods.cpp b/hotspot/src/share/vm/classfile/defaultMethods.cpp | 80 | diff --git a/hotspot/src/share/vm/classfile/defaultMethods.cpp b/hotspot/src/share/vm/classfile/defaultMethods.cpp |
76 | index 4b4b4e250..196622aed 100644 | 81 | index 4b4b4e25..196622ae 100644 |
77 | --- a/hotspot/src/share/vm/classfile/defaultMethods.cpp | 82 | --- a/hotspot/src/share/vm/classfile/defaultMethods.cpp |
78 | +++ b/hotspot/src/share/vm/classfile/defaultMethods.cpp | 83 | +++ b/hotspot/src/share/vm/classfile/defaultMethods.cpp |
79 | @@ -506,7 +506,7 @@ Symbol* MethodFamily::generate_method_message(Symbol *klass_name, Method* method | 84 | @@ -506,7 +506,7 @@ Symbol* MethodFamily::generate_method_message(Symbol *klass_name, Method* method |
@@ -95,7 +100,7 @@ index 4b4b4e250..196622aed 100644 | |||
95 | 100 | ||
96 | 101 | ||
97 | diff --git a/hotspot/src/share/vm/classfile/symbolTable.cpp b/hotspot/src/share/vm/classfile/symbolTable.cpp | 102 | diff --git a/hotspot/src/share/vm/classfile/symbolTable.cpp b/hotspot/src/share/vm/classfile/symbolTable.cpp |
98 | index ec97077b7..2621a7d62 100644 | 103 | index 83369cbc..8dd4e6b2 100644 |
99 | --- a/hotspot/src/share/vm/classfile/symbolTable.cpp | 104 | --- a/hotspot/src/share/vm/classfile/symbolTable.cpp |
100 | +++ b/hotspot/src/share/vm/classfile/symbolTable.cpp | 105 | +++ b/hotspot/src/share/vm/classfile/symbolTable.cpp |
101 | @@ -249,7 +249,7 @@ Symbol* SymbolTable::lookup(const char* name, int len, TRAPS) { | 106 | @@ -249,7 +249,7 @@ Symbol* SymbolTable::lookup(const char* name, int len, TRAPS) { |
@@ -117,7 +122,7 @@ index ec97077b7..2621a7d62 100644 | |||
117 | 122 | ||
118 | Symbol* SymbolTable::lookup_only(const char* name, int len, | 123 | Symbol* SymbolTable::lookup_only(const char* name, int len, |
119 | diff --git a/hotspot/src/share/vm/classfile/systemDictionary.cpp b/hotspot/src/share/vm/classfile/systemDictionary.cpp | 124 | diff --git a/hotspot/src/share/vm/classfile/systemDictionary.cpp b/hotspot/src/share/vm/classfile/systemDictionary.cpp |
120 | index 5911d94f5..df4d56f6f 100644 | 125 | index 4541e815..98412e1e 100644 |
121 | --- a/hotspot/src/share/vm/classfile/systemDictionary.cpp | 126 | --- a/hotspot/src/share/vm/classfile/systemDictionary.cpp |
122 | +++ b/hotspot/src/share/vm/classfile/systemDictionary.cpp | 127 | +++ b/hotspot/src/share/vm/classfile/systemDictionary.cpp |
123 | @@ -236,15 +236,15 @@ Klass* SystemDictionary::resolve_or_null(Symbol* class_name, Handle class_loader | 128 | @@ -236,15 +236,15 @@ Klass* SystemDictionary::resolve_or_null(Symbol* class_name, Handle class_loader |
@@ -140,7 +145,7 @@ index 5911d94f5..df4d56f6f 100644 | |||
140 | } | 145 | } |
141 | 146 | ||
142 | diff --git a/hotspot/src/share/vm/memory/heapInspection.hpp b/hotspot/src/share/vm/memory/heapInspection.hpp | 147 | diff --git a/hotspot/src/share/vm/memory/heapInspection.hpp b/hotspot/src/share/vm/memory/heapInspection.hpp |
143 | index 09ee6602e..c5fec15c3 100644 | 148 | index 09ee6602..c5fec15c 100644 |
144 | --- a/hotspot/src/share/vm/memory/heapInspection.hpp | 149 | --- a/hotspot/src/share/vm/memory/heapInspection.hpp |
145 | +++ b/hotspot/src/share/vm/memory/heapInspection.hpp | 150 | +++ b/hotspot/src/share/vm/memory/heapInspection.hpp |
146 | @@ -367,7 +367,7 @@ class HeapInspection : public StackObj { | 151 | @@ -367,7 +367,7 @@ class HeapInspection : public StackObj { |
@@ -153,7 +158,7 @@ index 09ee6602e..c5fec15c3 100644 | |||
153 | private: | 158 | private: |
154 | void iterate_over_heap(KlassInfoTable* cit, BoolObjectClosure* filter = NULL); | 159 | void iterate_over_heap(KlassInfoTable* cit, BoolObjectClosure* filter = NULL); |
155 | diff --git a/hotspot/src/share/vm/memory/metaspaceShared.hpp b/hotspot/src/share/vm/memory/metaspaceShared.hpp | 160 | diff --git a/hotspot/src/share/vm/memory/metaspaceShared.hpp b/hotspot/src/share/vm/memory/metaspaceShared.hpp |
156 | index 2f3abae6a..d58ebecb2 100644 | 161 | index 2f3abae6..d58ebecb 100644 |
157 | --- a/hotspot/src/share/vm/memory/metaspaceShared.hpp | 162 | --- a/hotspot/src/share/vm/memory/metaspaceShared.hpp |
158 | +++ b/hotspot/src/share/vm/memory/metaspaceShared.hpp | 163 | +++ b/hotspot/src/share/vm/memory/metaspaceShared.hpp |
159 | @@ -93,7 +93,7 @@ class MetaspaceShared : AllStatic { | 164 | @@ -93,7 +93,7 @@ class MetaspaceShared : AllStatic { |
@@ -166,10 +171,10 @@ index 2f3abae6a..d58ebecb2 100644 | |||
166 | static ReservedSpace* shared_rs() { | 171 | static ReservedSpace* shared_rs() { |
167 | CDS_ONLY(return _shared_rs); | 172 | CDS_ONLY(return _shared_rs); |
168 | diff --git a/hotspot/src/share/vm/oops/constantPool.hpp b/hotspot/src/share/vm/oops/constantPool.hpp | 173 | diff --git a/hotspot/src/share/vm/oops/constantPool.hpp b/hotspot/src/share/vm/oops/constantPool.hpp |
169 | index 124c970e2..dae574c09 100644 | 174 | index 68435471..fad4a92c 100644 |
170 | --- a/hotspot/src/share/vm/oops/constantPool.hpp | 175 | --- a/hotspot/src/share/vm/oops/constantPool.hpp |
171 | +++ b/hotspot/src/share/vm/oops/constantPool.hpp | 176 | +++ b/hotspot/src/share/vm/oops/constantPool.hpp |
172 | @@ -353,7 +353,7 @@ class ConstantPool : public Metadata { | 177 | @@ -350,7 +350,7 @@ class ConstantPool : public Metadata { |
173 | 178 | ||
174 | Klass* klass_at(int which, TRAPS) { | 179 | Klass* klass_at(int which, TRAPS) { |
175 | constantPoolHandle h_this(THREAD, this); | 180 | constantPoolHandle h_this(THREAD, this); |
@@ -177,9 +182,9 @@ index 124c970e2..dae574c09 100644 | |||
177 | + return klass_at_impl(h_this, which, THREAD); | 182 | + return klass_at_impl(h_this, which, THREAD); |
178 | } | 183 | } |
179 | 184 | ||
180 | Symbol* klass_name_at(int which); // Returns the name, w/o resolving. | 185 | Symbol* klass_name_at(int which) const; // Returns the name, w/o resolving. |
181 | diff --git a/hotspot/src/share/vm/prims/jvm.cpp b/hotspot/src/share/vm/prims/jvm.cpp | 186 | diff --git a/hotspot/src/share/vm/prims/jvm.cpp b/hotspot/src/share/vm/prims/jvm.cpp |
182 | index 6f2221c41..daa69f89a 100644 | 187 | index 6f2221c4..daa69f89 100644 |
183 | --- a/hotspot/src/share/vm/prims/jvm.cpp | 188 | --- a/hotspot/src/share/vm/prims/jvm.cpp |
184 | +++ b/hotspot/src/share/vm/prims/jvm.cpp | 189 | +++ b/hotspot/src/share/vm/prims/jvm.cpp |
185 | @@ -4368,7 +4368,7 @@ JVM_ENTRY(jlong,JVM_DTraceActivate( | 190 | @@ -4368,7 +4368,7 @@ JVM_ENTRY(jlong,JVM_DTraceActivate( |
@@ -192,7 +197,7 @@ index 6f2221c41..daa69f89a 100644 | |||
192 | 197 | ||
193 | JVM_ENTRY(jboolean,JVM_DTraceIsProbeEnabled(JNIEnv* env, jmethodID method)) | 198 | JVM_ENTRY(jboolean,JVM_DTraceIsProbeEnabled(JNIEnv* env, jmethodID method)) |
194 | diff --git a/hotspot/src/share/vm/runtime/reflection.cpp b/hotspot/src/share/vm/runtime/reflection.cpp | 199 | diff --git a/hotspot/src/share/vm/runtime/reflection.cpp b/hotspot/src/share/vm/runtime/reflection.cpp |
195 | index d9fddbe47..a5f737935 100644 | 200 | index 4b39d8cc..9cd7b0dc 100644 |
196 | --- a/hotspot/src/share/vm/runtime/reflection.cpp | 201 | --- a/hotspot/src/share/vm/runtime/reflection.cpp |
197 | +++ b/hotspot/src/share/vm/runtime/reflection.cpp | 202 | +++ b/hotspot/src/share/vm/runtime/reflection.cpp |
198 | @@ -1093,7 +1093,7 @@ oop Reflection::invoke(instanceKlassHandle klass, methodHandle reflected_method, | 203 | @@ -1093,7 +1093,7 @@ oop Reflection::invoke(instanceKlassHandle klass, methodHandle reflected_method, |
@@ -205,10 +210,10 @@ index d9fddbe47..a5f737935 100644 | |||
205 | } | 210 | } |
206 | 211 | ||
207 | diff --git a/hotspot/src/share/vm/runtime/sharedRuntime.cpp b/hotspot/src/share/vm/runtime/sharedRuntime.cpp | 212 | diff --git a/hotspot/src/share/vm/runtime/sharedRuntime.cpp b/hotspot/src/share/vm/runtime/sharedRuntime.cpp |
208 | index 013aa7a23..df4cde963 100644 | 213 | index d5bea29c..50578ad6 100644 |
209 | --- a/hotspot/src/share/vm/runtime/sharedRuntime.cpp | 214 | --- a/hotspot/src/share/vm/runtime/sharedRuntime.cpp |
210 | +++ b/hotspot/src/share/vm/runtime/sharedRuntime.cpp | 215 | +++ b/hotspot/src/share/vm/runtime/sharedRuntime.cpp |
211 | @@ -1045,7 +1045,7 @@ Handle SharedRuntime::find_callee_info(JavaThread* thread, Bytecodes::Code& bc, | 216 | @@ -1041,7 +1041,7 @@ Handle SharedRuntime::find_callee_info(JavaThread* thread, Bytecodes::Code& bc, |
212 | // last java frame on stack (which includes native call frames) | 217 | // last java frame on stack (which includes native call frames) |
213 | vframeStream vfst(thread, true); // Do not skip and javaCalls | 218 | vframeStream vfst(thread, true); // Do not skip and javaCalls |
214 | 219 | ||
@@ -218,7 +223,7 @@ index 013aa7a23..df4cde963 100644 | |||
218 | 223 | ||
219 | 224 | ||
220 | diff --git a/hotspot/src/share/vm/services/memTracker.hpp b/hotspot/src/share/vm/services/memTracker.hpp | 225 | diff --git a/hotspot/src/share/vm/services/memTracker.hpp b/hotspot/src/share/vm/services/memTracker.hpp |
221 | index 8ea859ddb..535147f8c 100644 | 226 | index 8ea859dd..535147f8 100644 |
222 | --- a/hotspot/src/share/vm/services/memTracker.hpp | 227 | --- a/hotspot/src/share/vm/services/memTracker.hpp |
223 | +++ b/hotspot/src/share/vm/services/memTracker.hpp | 228 | +++ b/hotspot/src/share/vm/services/memTracker.hpp |
224 | @@ -64,7 +64,7 @@ class MemTracker : AllStatic { | 229 | @@ -64,7 +64,7 @@ class MemTracker : AllStatic { |
@@ -230,6 +235,3 @@ index 8ea859ddb..535147f8c 100644 | |||
230 | static inline void record_virtual_memory_type(void* addr, MEMFLAGS flag) { } | 235 | static inline void record_virtual_memory_type(void* addr, MEMFLAGS flag) { } |
231 | static inline void record_thread_stack(void* addr, size_t size) { } | 236 | static inline void record_thread_stack(void* addr, size_t size) { } |
232 | static inline void release_thread_stack(void* addr, size_t size) { } | 237 | static inline void release_thread_stack(void* addr, size_t size) { } |
233 | -- | ||
234 | 2.26.2 | ||
235 | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/1008-hotspot-handle-format-error-for-GCC-7.patch b/recipes-core/openjdk/patches-openjdk-8/1008-hotspot-handle-format-error-for-GCC-7.patch index b3abd04..e077c53 100644 --- a/recipes-core/openjdk/patches-openjdk-8/1008-hotspot-handle-format-error-for-GCC-7.patch +++ b/recipes-core/openjdk/patches-openjdk-8/1008-hotspot-handle-format-error-for-GCC-7.patch | |||
@@ -1,18 +1,19 @@ | |||
1 | From dc6db949f4140b2dd7d3dfe040984bdfd88f2ba0 Mon Sep 17 00:00:00 2001 | 1 | From bb394ba055197ef7c7e27b436dd92f5a86305019 Mon Sep 17 00:00:00 2001 |
2 | From: Andreas Obergschwandtner <andreas.obergschwandtner@skidata.com> | 2 | From: Andreas Obergschwandtner <andreas.obergschwandtner@skidata.com> |
3 | Date: Fri, 21 Sep 2018 10:44:06 +0200 | 3 | Date: Fri, 21 Sep 2018 10:44:06 +0200 |
4 | Subject: [PATCH 1008/1013] hotspot: handle format error for GCC >= 7 | 4 | Subject: [PATCH] hotspot: handle format error for GCC >= 7 |
5 | 5 | ||
6 | Upstream-Status: Pending | 6 | Upstream-Status: Pending |
7 | 7 | ||
8 | Signed-off-by: Andreas Obergschwandtner <andreas.obergschwandtner@skidata.com> | 8 | Signed-off-by: Andreas Obergschwandtner <andreas.obergschwandtner@skidata.com> |
9 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | 9 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> |
10 | |||
10 | --- | 11 | --- |
11 | src/share/vm/adlc/output_c.cpp | 6 ++++-- | 12 | hotspot/src/share/vm/adlc/output_c.cpp | 6 ++++-- |
12 | 1 file changed, 4 insertions(+), 2 deletions(-) | 13 | 1 file changed, 4 insertions(+), 2 deletions(-) |
13 | 14 | ||
14 | diff --git a/hotspot/src/share/vm/adlc/output_c.cpp b/hotspot/src/share/vm/adlc/output_c.cpp | 15 | diff --git a/hotspot/src/share/vm/adlc/output_c.cpp b/hotspot/src/share/vm/adlc/output_c.cpp |
15 | index 199169046..889b785c1 100644 | 16 | index 19916904..889b785c 100644 |
16 | --- a/hotspot/src/share/vm/adlc/output_c.cpp | 17 | --- a/hotspot/src/share/vm/adlc/output_c.cpp |
17 | +++ b/hotspot/src/share/vm/adlc/output_c.cpp | 18 | +++ b/hotspot/src/share/vm/adlc/output_c.cpp |
18 | @@ -419,9 +419,11 @@ static int pipeline_res_mask_initializer( | 19 | @@ -419,9 +419,11 @@ static int pipeline_res_mask_initializer( |
@@ -29,6 +30,3 @@ index 199169046..889b785c1 100644 | |||
29 | 30 | ||
30 | static const char* pipeline_use_cycle_mask = "Pipeline_Use_Cycle_Mask"; | 31 | static const char* pipeline_use_cycle_mask = "Pipeline_Use_Cycle_Mask"; |
31 | static const char* pipeline_use_element = "Pipeline_Use_Element"; | 32 | static const char* pipeline_use_element = "Pipeline_Use_Element"; |
32 | -- | ||
33 | 2.26.2 | ||
34 | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/1012-hotspot-enable-Wno-error.patch b/recipes-core/openjdk/patches-openjdk-8/1012-hotspot-enable-Wno-error.patch index aeeba6b..1ad8351 100644 --- a/recipes-core/openjdk/patches-openjdk-8/1012-hotspot-enable-Wno-error.patch +++ b/recipes-core/openjdk/patches-openjdk-8/1012-hotspot-enable-Wno-error.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 37b5885e35a7974bbd8895ae9a7e9ec7ebf9dc68 Mon Sep 17 00:00:00 2001 | 1 | From 2303926f157f8c90cef167c43bd530793c19e480 Mon Sep 17 00:00:00 2001 |
2 | From: Richard Leitner <richard.leitner@skidata.com> | 2 | From: Richard Leitner <richard.leitner@skidata.com> |
3 | Date: Thu, 20 Aug 2020 09:39:23 +0200 | 3 | Date: Thu, 20 Aug 2020 09:39:23 +0200 |
4 | Subject: [PATCH 1012/1013] hotspot: enable -Wno-error | 4 | Subject: [PATCH] hotspot: enable -Wno-error |
5 | 5 | ||
6 | As we don't want to deal with compiler warnings in OpenEmbedded disable | 6 | As we don't want to deal with compiler warnings in OpenEmbedded disable |
7 | them for now. | 7 | them for now. |
@@ -9,15 +9,16 @@ them for now. | |||
9 | Upstream-Status: Pending | 9 | Upstream-Status: Pending |
10 | 10 | ||
11 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | 11 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> |
12 | |||
12 | --- | 13 | --- |
13 | make/linux/makefiles/gcc.make | 4 ++-- | 14 | hotspot/make/linux/makefiles/gcc.make | 4 ++-- |
14 | 1 file changed, 2 insertions(+), 2 deletions(-) | 15 | 1 file changed, 2 insertions(+), 2 deletions(-) |
15 | 16 | ||
16 | diff --git a/hotspot/make/linux/makefiles/gcc.make b/hotspot/make/linux/makefiles/gcc.make | 17 | diff --git a/hotspot/make/linux/makefiles/gcc.make b/hotspot/make/linux/makefiles/gcc.make |
17 | index 7a5162a06..67607fb26 100644 | 18 | index cd9511e5..94412c8f 100644 |
18 | --- a/hotspot/make/linux/makefiles/gcc.make | 19 | --- a/hotspot/make/linux/makefiles/gcc.make |
19 | +++ b/hotspot/make/linux/makefiles/gcc.make | 20 | +++ b/hotspot/make/linux/makefiles/gcc.make |
20 | @@ -201,8 +201,8 @@ else | 21 | @@ -200,8 +200,8 @@ else |
21 | CFLAGS += -pipe | 22 | CFLAGS += -pipe |
22 | endif | 23 | endif |
23 | 24 | ||
@@ -28,6 +29,3 @@ index 7a5162a06..67607fb26 100644 | |||
28 | 29 | ||
29 | ifeq ($(USE_CLANG), true) | 30 | ifeq ($(USE_CLANG), true) |
30 | # However we need to clean the code up before we can unrestrictedly enable this option with Clang | 31 | # However we need to clean the code up before we can unrestrictedly enable this option with Clang |
31 | -- | ||
32 | 2.26.2 | ||
33 | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/2001-jdk-comparison-between-pointer-and-integer.patch b/recipes-core/openjdk/patches-openjdk-8/2001-jdk-comparison-between-pointer-and-integer.patch index bd6c38d..244d2b4 100644 --- a/recipes-core/openjdk/patches-openjdk-8/2001-jdk-comparison-between-pointer-and-integer.patch +++ b/recipes-core/openjdk/patches-openjdk-8/2001-jdk-comparison-between-pointer-and-integer.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From b4e7774c35cf29aaca2bd04d115afc3ea3c77d7a Mon Sep 17 00:00:00 2001 | 1 | From dcf3e46758fa5e77ce6fb4b3f51867bb5186f8f0 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> | 2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> |
3 | Date: Fri, 2 Mar 2018 11:13:08 +0000 | 3 | Date: Fri, 2 Mar 2018 11:13:08 +0000 |
4 | Subject: [PATCH 2001/2009] jdk: comparison between pointer and integer | 4 | Subject: [PATCH] jdk: comparison between pointer and integer |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
6 | Content-Type: text/plain; charset=UTF-8 | 6 | Content-Type: text/plain; charset=UTF-8 |
7 | Content-Transfer-Encoding: 8bit | 7 | Content-Transfer-Encoding: 8bit |
@@ -21,14 +21,15 @@ Upstream-Status: Backport [http://hg.openjdk.java.net/jdk9/jdk9/jdk/rev/90c64359 | |||
21 | 21 | ||
22 | Signed-off-by: André Draszik <andre.draszik@jci.com> | 22 | Signed-off-by: André Draszik <andre.draszik@jci.com> |
23 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | 23 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> |
24 | |||
24 | --- | 25 | --- |
25 | src/share/native/java/net/net_util.c | 15 +++++++-------- | 26 | jdk/src/share/native/java/net/net_util.c | 15 +++++++-------- |
26 | src/share/native/java/net/net_util.h | 8 ++++---- | 27 | jdk/src/share/native/java/net/net_util.h | 8 ++++---- |
27 | src/solaris/native/java/net/Inet6AddressImpl.c | 4 ++-- | 28 | .../solaris/native/java/net/Inet6AddressImpl.c | 4 ++-- |
28 | 3 files changed, 13 insertions(+), 14 deletions(-) | 29 | 3 files changed, 13 insertions(+), 14 deletions(-) |
29 | 30 | ||
30 | diff --git a/jdk/src/share/native/java/net/net_util.c b/jdk/src/share/native/java/net/net_util.c | 31 | diff --git a/jdk/src/share/native/java/net/net_util.c b/jdk/src/share/native/java/net/net_util.c |
31 | index b1b8223a63..2eee6261ac 100644 | 32 | index b1b8223a..2eee6261 100644 |
32 | --- a/jdk/src/share/native/java/net/net_util.c | 33 | --- a/jdk/src/share/native/java/net/net_util.c |
33 | +++ b/jdk/src/share/native/java/net/net_util.c | 34 | +++ b/jdk/src/share/native/java/net/net_util.c |
34 | @@ -108,7 +108,7 @@ jobject getInet6Address_scopeifname(JNIEnv *env, jobject iaObj) { | 35 | @@ -108,7 +108,7 @@ jobject getInet6Address_scopeifname(JNIEnv *env, jobject iaObj) { |
@@ -99,7 +100,7 @@ index b1b8223a63..2eee6261ac 100644 | |||
99 | int scope; | 100 | int scope; |
100 | 101 | ||
101 | diff --git a/jdk/src/share/native/java/net/net_util.h b/jdk/src/share/native/java/net/net_util.h | 102 | diff --git a/jdk/src/share/native/java/net/net_util.h b/jdk/src/share/native/java/net/net_util.h |
102 | index c8a5e68c49..176ca586ee 100644 | 103 | index c8a5e68c..176ca586 100644 |
103 | --- a/jdk/src/share/native/java/net/net_util.h | 104 | --- a/jdk/src/share/native/java/net/net_util.h |
104 | +++ b/jdk/src/share/native/java/net/net_util.h | 105 | +++ b/jdk/src/share/native/java/net/net_util.h |
105 | @@ -64,12 +64,12 @@ JNIEXPORT void JNICALL initInetAddressIDs(JNIEnv *env); | 106 | @@ -64,12 +64,12 @@ JNIEXPORT void JNICALL initInetAddressIDs(JNIEnv *env); |
@@ -120,7 +121,7 @@ index c8a5e68c49..176ca586ee 100644 | |||
120 | extern void setInetAddress_addr(JNIEnv *env, jobject iaObj, int address); | 121 | extern void setInetAddress_addr(JNIEnv *env, jobject iaObj, int address); |
121 | extern void setInetAddress_family(JNIEnv *env, jobject iaObj, int family); | 122 | extern void setInetAddress_family(JNIEnv *env, jobject iaObj, int family); |
122 | diff --git a/jdk/src/solaris/native/java/net/Inet6AddressImpl.c b/jdk/src/solaris/native/java/net/Inet6AddressImpl.c | 123 | diff --git a/jdk/src/solaris/native/java/net/Inet6AddressImpl.c b/jdk/src/solaris/native/java/net/Inet6AddressImpl.c |
123 | index 0a51a365fd..dcc348cf1f 100644 | 124 | index 0a51a365..dcc348cf 100644 |
124 | --- a/jdk/src/solaris/native/java/net/Inet6AddressImpl.c | 125 | --- a/jdk/src/solaris/native/java/net/Inet6AddressImpl.c |
125 | +++ b/jdk/src/solaris/native/java/net/Inet6AddressImpl.c | 126 | +++ b/jdk/src/solaris/native/java/net/Inet6AddressImpl.c |
126 | @@ -392,7 +392,7 @@ Java_java_net_Inet6AddressImpl_lookupAllHostAddr(JNIEnv *env, jobject this, | 127 | @@ -392,7 +392,7 @@ Java_java_net_Inet6AddressImpl_lookupAllHostAddr(JNIEnv *env, jobject this, |
@@ -141,6 +142,3 @@ index 0a51a365fd..dcc348cf1f 100644 | |||
141 | ret = NULL; | 142 | ret = NULL; |
142 | goto cleanupAndReturn; | 143 | goto cleanupAndReturn; |
143 | } | 144 | } |
144 | -- | ||
145 | 2.26.2 | ||
146 | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/2002-jdk-Allow-using-a-system-installed-libjpeg.patch b/recipes-core/openjdk/patches-openjdk-8/2002-jdk-Allow-using-a-system-installed-libjpeg.patch index 64d6113..5f8981d 100644 --- a/recipes-core/openjdk/patches-openjdk-8/2002-jdk-Allow-using-a-system-installed-libjpeg.patch +++ b/recipes-core/openjdk/patches-openjdk-8/2002-jdk-Allow-using-a-system-installed-libjpeg.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 1d7ea474a12a12e0e28e1a24f686a7478fe42b8d Mon Sep 17 00:00:00 2001 | 1 | From a1a63e85513aa3501588b02940e4f0e93e992e89 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> | 2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> |
3 | Date: Tue, 27 Feb 2018 13:36:53 +0000 | 3 | Date: Tue, 27 Feb 2018 13:36:53 +0000 |
4 | Subject: [PATCH 2002/2009] jdk: Allow using a system-installed libjpeg | 4 | Subject: [PATCH] jdk: Allow using a system-installed libjpeg |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
6 | Content-Type: text/plain; charset=UTF-8 | 6 | Content-Type: text/plain; charset=UTF-8 |
7 | Content-Transfer-Encoding: 8bit | 7 | Content-Transfer-Encoding: 8bit |
@@ -21,8 +21,9 @@ Issues fixed on top of debian patch: | |||
21 | Upstream-Status: Backport | 21 | Upstream-Status: Backport |
22 | Signed-off-by: André Draszik <andre.draszik@jci.com> | 22 | Signed-off-by: André Draszik <andre.draszik@jci.com> |
23 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | 23 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> |
24 | |||
24 | --- | 25 | --- |
25 | make/lib/Awt2dLibraries.gmk | 69 +++++++++++++------ | 26 | jdk/make/lib/Awt2dLibraries.gmk | 69 +++++++++++++------ |
26 | .../imageio/plugins/jpeg/JPEGImageReader.java | 2 +- | 27 | .../imageio/plugins/jpeg/JPEGImageReader.java | 2 +- |
27 | .../imageio/plugins/jpeg/JPEGImageWriter.java | 2 +- | 28 | .../imageio/plugins/jpeg/JPEGImageWriter.java | 2 +- |
28 | .../sun/awt/image/JPEGImageDecoder.java | 2 +- | 29 | .../sun/awt/image/JPEGImageDecoder.java | 2 +- |
@@ -30,7 +31,7 @@ Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | |||
30 | 5 files changed, 51 insertions(+), 26 deletions(-) | 31 | 5 files changed, 51 insertions(+), 26 deletions(-) |
31 | 32 | ||
32 | diff --git a/jdk/make/lib/Awt2dLibraries.gmk b/jdk/make/lib/Awt2dLibraries.gmk | 33 | diff --git a/jdk/make/lib/Awt2dLibraries.gmk b/jdk/make/lib/Awt2dLibraries.gmk |
33 | index 9368a9d508..7fffcafc70 100644 | 34 | index 9368a9d5..7fffcafc 100644 |
34 | --- a/jdk/make/lib/Awt2dLibraries.gmk | 35 | --- a/jdk/make/lib/Awt2dLibraries.gmk |
35 | +++ b/jdk/make/lib/Awt2dLibraries.gmk | 36 | +++ b/jdk/make/lib/Awt2dLibraries.gmk |
36 | @@ -702,21 +702,24 @@ $(BUILD_LIBLCMS): $(BUILD_LIBAWT) | 37 | @@ -702,21 +702,24 @@ $(BUILD_LIBLCMS): $(BUILD_LIBAWT) |
@@ -160,7 +161,7 @@ index 9368a9d508..7fffcafc70 100644 | |||
160 | VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ | 161 | VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ |
161 | RC_FLAGS := $(RC_FLAGS) \ | 162 | RC_FLAGS := $(RC_FLAGS) \ |
162 | diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java b/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java | 163 | diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java b/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java |
163 | index 8f58f5b3e6..fcbab82602 100644 | 164 | index 8f58f5b3..fcbab826 100644 |
164 | --- a/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java | 165 | --- a/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java |
165 | +++ b/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java | 166 | +++ b/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java |
166 | @@ -89,7 +89,7 @@ public class JPEGImageReader extends ImageReader { | 167 | @@ -89,7 +89,7 @@ public class JPEGImageReader extends ImageReader { |
@@ -173,7 +174,7 @@ index 8f58f5b3e6..fcbab82602 100644 | |||
173 | } | 174 | } |
174 | }); | 175 | }); |
175 | diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java b/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java | 176 | diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java b/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java |
176 | index 6a33bd5a15..dca189ed85 100644 | 177 | index 6a33bd5a..dca189ed 100644 |
177 | --- a/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java | 178 | --- a/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java |
178 | +++ b/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java | 179 | +++ b/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java |
179 | @@ -177,7 +177,7 @@ public class JPEGImageWriter extends ImageWriter { | 180 | @@ -177,7 +177,7 @@ public class JPEGImageWriter extends ImageWriter { |
@@ -186,7 +187,7 @@ index 6a33bd5a15..dca189ed85 100644 | |||
186 | } | 187 | } |
187 | }); | 188 | }); |
188 | diff --git a/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java b/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java | 189 | diff --git a/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java b/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java |
189 | index 872ffc0197..5965a186b9 100644 | 190 | index 872ffc01..5965a186 100644 |
190 | --- a/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java | 191 | --- a/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java |
191 | +++ b/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java | 192 | +++ b/jdk/src/share/classes/sun/awt/image/JPEGImageDecoder.java |
192 | @@ -56,7 +56,7 @@ public class JPEGImageDecoder extends ImageDecoder { | 193 | @@ -56,7 +56,7 @@ public class JPEGImageDecoder extends ImageDecoder { |
@@ -199,7 +200,7 @@ index 872ffc0197..5965a186b9 100644 | |||
199 | } | 200 | } |
200 | }); | 201 | }); |
201 | diff --git a/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c b/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c | 202 | diff --git a/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c b/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c |
202 | index 7e1d8c99d7..8cac61da32 100644 | 203 | index 7e1d8c99..8cac61da 100644 |
203 | --- a/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c | 204 | --- a/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c |
204 | +++ b/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c | 205 | +++ b/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c |
205 | @@ -51,7 +51,7 @@ | 206 | @@ -51,7 +51,7 @@ |
@@ -211,6 +212,3 @@ index 7e1d8c99d7..8cac61da32 100644 | |||
211 | 212 | ||
212 | #undef MAX | 213 | #undef MAX |
213 | #define MAX(a,b) ((a) > (b) ? (a) : (b)) | 214 | #define MAX(a,b) ((a) > (b) ? (a) : (b)) |
214 | -- | ||
215 | 2.26.2 | ||
216 | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/2003-jdk-Allow-using-a-system-installed-libpng.patch b/recipes-core/openjdk/patches-openjdk-8/2003-jdk-Allow-using-a-system-installed-libpng.patch index 9c4e70e..dbc714e 100644 --- a/recipes-core/openjdk/patches-openjdk-8/2003-jdk-Allow-using-a-system-installed-libpng.patch +++ b/recipes-core/openjdk/patches-openjdk-8/2003-jdk-Allow-using-a-system-installed-libpng.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From c7fb1d599ba66116fb132537b4696092e9c48331 Mon Sep 17 00:00:00 2001 | 1 | From ce26d6cbb550039516432993894d65660b7c9e06 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> | 2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> |
3 | Date: Tue, 27 Feb 2018 13:43:04 +0000 | 3 | Date: Tue, 27 Feb 2018 13:43:04 +0000 |
4 | Subject: [PATCH 2003/2009] jdk: Allow using a system-installed libpng | 4 | Subject: [PATCH] jdk: Allow using a system-installed libpng |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
6 | Content-Type: text/plain; charset=UTF-8 | 6 | Content-Type: text/plain; charset=UTF-8 |
7 | Content-Transfer-Encoding: 8bit | 7 | Content-Transfer-Encoding: 8bit |
@@ -18,13 +18,14 @@ Issues fixed on top of debian patch: | |||
18 | Upstream-Status: Backport | 18 | Upstream-Status: Backport |
19 | Signed-off-by: André Draszik <andre.draszik@jci.com> | 19 | Signed-off-by: André Draszik <andre.draszik@jci.com> |
20 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | 20 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> |
21 | |||
21 | --- | 22 | --- |
22 | make/lib/Awt2dLibraries.gmk | 12 +++++++++--- | 23 | jdk/make/lib/Awt2dLibraries.gmk | 12 +++++++++--- |
23 | .../native/sun/awt/splashscreen/splashscreen_png.c | 3 +-- | 24 | .../native/sun/awt/splashscreen/splashscreen_png.c | 3 +-- |
24 | 2 files changed, 10 insertions(+), 5 deletions(-) | 25 | 2 files changed, 10 insertions(+), 5 deletions(-) |
25 | 26 | ||
26 | diff --git a/jdk/make/lib/Awt2dLibraries.gmk b/jdk/make/lib/Awt2dLibraries.gmk | 27 | diff --git a/jdk/make/lib/Awt2dLibraries.gmk b/jdk/make/lib/Awt2dLibraries.gmk |
27 | index 7fffcafc70..7f42e09ce4 100644 | 28 | index 7fffcafc..7f42e09c 100644 |
28 | --- a/jdk/make/lib/Awt2dLibraries.gmk | 29 | --- a/jdk/make/lib/Awt2dLibraries.gmk |
29 | +++ b/jdk/make/lib/Awt2dLibraries.gmk | 30 | +++ b/jdk/make/lib/Awt2dLibraries.gmk |
30 | @@ -1155,7 +1155,6 @@ endif | 31 | @@ -1155,7 +1155,6 @@ endif |
@@ -65,7 +66,7 @@ index 7fffcafc70..7f42e09ce4 100644 | |||
65 | VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ | 66 | VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ |
66 | RC_FLAGS := $(RC_FLAGS) \ | 67 | RC_FLAGS := $(RC_FLAGS) \ |
67 | diff --git a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c b/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c | 68 | diff --git a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c b/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c |
68 | index 3599433e42..5bf002ea17 100644 | 69 | index 3599433e..5bf002ea 100644 |
69 | --- a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c | 70 | --- a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c |
70 | +++ b/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c | 71 | +++ b/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c |
71 | @@ -25,8 +25,7 @@ | 72 | @@ -25,8 +25,7 @@ |
@@ -78,6 +79,3 @@ index 3599433e42..5bf002ea17 100644 | |||
78 | #include <setjmp.h> | 79 | #include <setjmp.h> |
79 | 80 | ||
80 | #define SIG_BYTES 8 | 81 | #define SIG_BYTES 8 |
81 | -- | ||
82 | 2.26.2 | ||
83 | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/2004-jdk-use-correct-include-for-poll.patch b/recipes-core/openjdk/patches-openjdk-8/2004-jdk-use-correct-include-for-poll.patch index 7f8d3b3..91ec91f 100644 --- a/recipes-core/openjdk/patches-openjdk-8/2004-jdk-use-correct-include-for-poll.patch +++ b/recipes-core/openjdk/patches-openjdk-8/2004-jdk-use-correct-include-for-poll.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 5bced26833d8e7876852fa65479f7ada5266a3d7 Mon Sep 17 00:00:00 2001 | 1 | From 44512cfca65ea5b7b6d1732560d8aa2cd221de22 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> | 2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> |
3 | Date: Tue, 27 Feb 2018 09:28:06 +0000 | 3 | Date: Tue, 27 Feb 2018 09:28:06 +0000 |
4 | Subject: [PATCH 2004/2009] jdk: use correct include for poll | 4 | Subject: [PATCH] jdk: use correct include for poll |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
6 | Content-Type: text/plain; charset=UTF-8 | 6 | Content-Type: text/plain; charset=UTF-8 |
7 | Content-Transfer-Encoding: 8bit | 7 | Content-Transfer-Encoding: 8bit |
@@ -25,21 +25,22 @@ the following command: | |||
25 | Upstream-Status: Pending | 25 | Upstream-Status: Pending |
26 | Signed-off-by: André Draszik <andre.draszik@jci.com> | 26 | Signed-off-by: André Draszik <andre.draszik@jci.com> |
27 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | 27 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> |
28 | |||
28 | --- | 29 | --- |
29 | src/aix/native/java/net/aix_close.c | 2 +- | 30 | jdk/src/aix/native/java/net/aix_close.c | 2 +- |
30 | src/aix/native/sun/nio/ch/AixPollPort.c | 2 +- | 31 | jdk/src/aix/native/sun/nio/ch/AixPollPort.c | 2 +- |
31 | src/solaris/native/java/net/PlainSocketImpl.c | 2 +- | 32 | jdk/src/solaris/native/java/net/PlainSocketImpl.c | 2 +- |
32 | src/solaris/native/java/net/bsd_close.c | 2 +- | 33 | jdk/src/solaris/native/java/net/bsd_close.c | 2 +- |
33 | src/solaris/native/java/net/linux_close.c | 2 +- | 34 | jdk/src/solaris/native/java/net/linux_close.c | 2 +- |
34 | src/solaris/native/java/net/net_util_md.h | 2 +- | 35 | jdk/src/solaris/native/java/net/net_util_md.h | 2 +- |
35 | src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c | 2 +- | 36 | jdk/src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c | 2 +- |
36 | src/solaris/native/sun/nio/ch/Net.c | 2 +- | 37 | jdk/src/solaris/native/sun/nio/ch/Net.c | 2 +- |
37 | src/solaris/native/sun/nio/fs/LinuxWatchService.c | 2 +- | 38 | jdk/src/solaris/native/sun/nio/fs/LinuxWatchService.c | 2 +- |
38 | src/solaris/transport/socket/socket_md.c | 2 +- | 39 | jdk/src/solaris/transport/socket/socket_md.c | 2 +- |
39 | 10 files changed, 10 insertions(+), 10 deletions(-) | 40 | 10 files changed, 10 insertions(+), 10 deletions(-) |
40 | 41 | ||
41 | diff --git a/jdk/src/aix/native/java/net/aix_close.c b/jdk/src/aix/native/java/net/aix_close.c | 42 | diff --git a/jdk/src/aix/native/java/net/aix_close.c b/jdk/src/aix/native/java/net/aix_close.c |
42 | index 90d57b42f0..fbeb73efa4 100644 | 43 | index 90d57b42..fbeb73ef 100644 |
43 | --- a/jdk/src/aix/native/java/net/aix_close.c | 44 | --- a/jdk/src/aix/native/java/net/aix_close.c |
44 | +++ b/jdk/src/aix/native/java/net/aix_close.c | 45 | +++ b/jdk/src/aix/native/java/net/aix_close.c |
45 | @@ -54,7 +54,7 @@ | 46 | @@ -54,7 +54,7 @@ |
@@ -52,7 +53,7 @@ index 90d57b42f0..fbeb73efa4 100644 | |||
52 | /* | 53 | /* |
53 | * Stack allocated by thread when doing blocking operation | 54 | * Stack allocated by thread when doing blocking operation |
54 | diff --git a/jdk/src/aix/native/sun/nio/ch/AixPollPort.c b/jdk/src/aix/native/sun/nio/ch/AixPollPort.c | 55 | diff --git a/jdk/src/aix/native/sun/nio/ch/AixPollPort.c b/jdk/src/aix/native/sun/nio/ch/AixPollPort.c |
55 | index 70064b890e..c10c602b6b 100644 | 56 | index 70064b89..c10c602b 100644 |
56 | --- a/jdk/src/aix/native/sun/nio/ch/AixPollPort.c | 57 | --- a/jdk/src/aix/native/sun/nio/ch/AixPollPort.c |
57 | +++ b/jdk/src/aix/native/sun/nio/ch/AixPollPort.c | 58 | +++ b/jdk/src/aix/native/sun/nio/ch/AixPollPort.c |
58 | @@ -34,7 +34,7 @@ | 59 | @@ -34,7 +34,7 @@ |
@@ -65,7 +66,7 @@ index 70064b890e..c10c602b6b 100644 | |||
65 | #include <fcntl.h> | 66 | #include <fcntl.h> |
66 | #include <stddef.h> | 67 | #include <stddef.h> |
67 | diff --git a/jdk/src/solaris/native/java/net/PlainSocketImpl.c b/jdk/src/solaris/native/java/net/PlainSocketImpl.c | 68 | diff --git a/jdk/src/solaris/native/java/net/PlainSocketImpl.c b/jdk/src/solaris/native/java/net/PlainSocketImpl.c |
68 | index 373c5e3625..9aafbc09e5 100644 | 69 | index 373c5e36..9aafbc09 100644 |
69 | --- a/jdk/src/solaris/native/java/net/PlainSocketImpl.c | 70 | --- a/jdk/src/solaris/native/java/net/PlainSocketImpl.c |
70 | +++ b/jdk/src/solaris/native/java/net/PlainSocketImpl.c | 71 | +++ b/jdk/src/solaris/native/java/net/PlainSocketImpl.c |
71 | @@ -28,7 +28,7 @@ | 72 | @@ -28,7 +28,7 @@ |
@@ -78,7 +79,7 @@ index 373c5e3625..9aafbc09e5 100644 | |||
78 | #include <netinet/tcp.h> /* Defines TCP_NODELAY, needed for 2.6 */ | 79 | #include <netinet/tcp.h> /* Defines TCP_NODELAY, needed for 2.6 */ |
79 | #include <netinet/in.h> | 80 | #include <netinet/in.h> |
80 | diff --git a/jdk/src/solaris/native/java/net/bsd_close.c b/jdk/src/solaris/native/java/net/bsd_close.c | 81 | diff --git a/jdk/src/solaris/native/java/net/bsd_close.c b/jdk/src/solaris/native/java/net/bsd_close.c |
81 | index 89a20707c4..511ab845a8 100644 | 82 | index 89a20707..511ab845 100644 |
82 | --- a/jdk/src/solaris/native/java/net/bsd_close.c | 83 | --- a/jdk/src/solaris/native/java/net/bsd_close.c |
83 | +++ b/jdk/src/solaris/native/java/net/bsd_close.c | 84 | +++ b/jdk/src/solaris/native/java/net/bsd_close.c |
84 | @@ -38,7 +38,7 @@ | 85 | @@ -38,7 +38,7 @@ |
@@ -91,7 +92,7 @@ index 89a20707c4..511ab845a8 100644 | |||
91 | /* | 92 | /* |
92 | * Stack allocated by thread when doing blocking operation | 93 | * Stack allocated by thread when doing blocking operation |
93 | diff --git a/jdk/src/solaris/native/java/net/linux_close.c b/jdk/src/solaris/native/java/net/linux_close.c | 94 | diff --git a/jdk/src/solaris/native/java/net/linux_close.c b/jdk/src/solaris/native/java/net/linux_close.c |
94 | index eacc2afd15..159ca132c4 100644 | 95 | index eacc2afd..159ca132 100644 |
95 | --- a/jdk/src/solaris/native/java/net/linux_close.c | 96 | --- a/jdk/src/solaris/native/java/net/linux_close.c |
96 | +++ b/jdk/src/solaris/native/java/net/linux_close.c | 97 | +++ b/jdk/src/solaris/native/java/net/linux_close.c |
97 | @@ -36,7 +36,7 @@ | 98 | @@ -36,7 +36,7 @@ |
@@ -104,7 +105,7 @@ index eacc2afd15..159ca132c4 100644 | |||
104 | /* | 105 | /* |
105 | * Stack allocated by thread when doing blocking operation | 106 | * Stack allocated by thread when doing blocking operation |
106 | diff --git a/jdk/src/solaris/native/java/net/net_util_md.h b/jdk/src/solaris/native/java/net/net_util_md.h | 107 | diff --git a/jdk/src/solaris/native/java/net/net_util_md.h b/jdk/src/solaris/native/java/net/net_util_md.h |
107 | index a48446de9c..8915b68aae 100644 | 108 | index a48446de..8915b68a 100644 |
108 | --- a/jdk/src/solaris/native/java/net/net_util_md.h | 109 | --- a/jdk/src/solaris/native/java/net/net_util_md.h |
109 | +++ b/jdk/src/solaris/native/java/net/net_util_md.h | 110 | +++ b/jdk/src/solaris/native/java/net/net_util_md.h |
110 | @@ -33,7 +33,7 @@ | 111 | @@ -33,7 +33,7 @@ |
@@ -117,7 +118,7 @@ index a48446de9c..8915b68aae 100644 | |||
117 | 118 | ||
118 | 119 | ||
119 | diff --git a/jdk/src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c b/jdk/src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c | 120 | diff --git a/jdk/src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c b/jdk/src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c |
120 | index 6860a167bb..20849dabcf 100644 | 121 | index 6860a167..20849dab 100644 |
121 | --- a/jdk/src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c | 122 | --- a/jdk/src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c |
122 | +++ b/jdk/src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c | 123 | +++ b/jdk/src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c |
123 | @@ -28,7 +28,7 @@ | 124 | @@ -28,7 +28,7 @@ |
@@ -130,7 +131,7 @@ index 6860a167bb..20849dabcf 100644 | |||
130 | #include <sys/time.h> | 131 | #include <sys/time.h> |
131 | 132 | ||
132 | diff --git a/jdk/src/solaris/native/sun/nio/ch/Net.c b/jdk/src/solaris/native/sun/nio/ch/Net.c | 133 | diff --git a/jdk/src/solaris/native/sun/nio/ch/Net.c b/jdk/src/solaris/native/sun/nio/ch/Net.c |
133 | index 73560ad6c6..a3720055c4 100644 | 134 | index 73560ad6..a3720055 100644 |
134 | --- a/jdk/src/solaris/native/sun/nio/ch/Net.c | 135 | --- a/jdk/src/solaris/native/sun/nio/ch/Net.c |
135 | +++ b/jdk/src/solaris/native/sun/nio/ch/Net.c | 136 | +++ b/jdk/src/solaris/native/sun/nio/ch/Net.c |
136 | @@ -23,7 +23,7 @@ | 137 | @@ -23,7 +23,7 @@ |
@@ -143,7 +144,7 @@ index 73560ad6c6..a3720055c4 100644 | |||
143 | #include <sys/socket.h> | 144 | #include <sys/socket.h> |
144 | #include <string.h> | 145 | #include <string.h> |
145 | diff --git a/jdk/src/solaris/native/sun/nio/fs/LinuxWatchService.c b/jdk/src/solaris/native/sun/nio/fs/LinuxWatchService.c | 146 | diff --git a/jdk/src/solaris/native/sun/nio/fs/LinuxWatchService.c b/jdk/src/solaris/native/sun/nio/fs/LinuxWatchService.c |
146 | index 375aaa4850..7606e9ba82 100644 | 147 | index 375aaa48..7606e9ba 100644 |
147 | --- a/jdk/src/solaris/native/sun/nio/fs/LinuxWatchService.c | 148 | --- a/jdk/src/solaris/native/sun/nio/fs/LinuxWatchService.c |
148 | +++ b/jdk/src/solaris/native/sun/nio/fs/LinuxWatchService.c | 149 | +++ b/jdk/src/solaris/native/sun/nio/fs/LinuxWatchService.c |
149 | @@ -32,7 +32,7 @@ | 150 | @@ -32,7 +32,7 @@ |
@@ -156,7 +157,7 @@ index 375aaa4850..7606e9ba82 100644 | |||
156 | 157 | ||
157 | #include "sun_nio_fs_LinuxWatchService.h" | 158 | #include "sun_nio_fs_LinuxWatchService.h" |
158 | diff --git a/jdk/src/solaris/transport/socket/socket_md.c b/jdk/src/solaris/transport/socket/socket_md.c | 159 | diff --git a/jdk/src/solaris/transport/socket/socket_md.c b/jdk/src/solaris/transport/socket/socket_md.c |
159 | index 33e062e087..819fcabdb8 100644 | 160 | index 33e062e0..819fcabd 100644 |
160 | --- a/jdk/src/solaris/transport/socket/socket_md.c | 161 | --- a/jdk/src/solaris/transport/socket/socket_md.c |
161 | +++ b/jdk/src/solaris/transport/socket/socket_md.c | 162 | +++ b/jdk/src/solaris/transport/socket/socket_md.c |
162 | @@ -37,7 +37,7 @@ | 163 | @@ -37,7 +37,7 @@ |
@@ -168,6 +169,3 @@ index 33e062e087..819fcabdb8 100644 | |||
168 | #endif | 169 | #endif |
169 | 170 | ||
170 | #include "socket_md.h" | 171 | #include "socket_md.h" |
171 | -- | ||
172 | 2.26.2 | ||
173 | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/2005-jdk-use-correct-include-for-signal.patch b/recipes-core/openjdk/patches-openjdk-8/2005-jdk-use-correct-include-for-signal.patch index f1f5102..b38dcb3 100644 --- a/recipes-core/openjdk/patches-openjdk-8/2005-jdk-use-correct-include-for-signal.patch +++ b/recipes-core/openjdk/patches-openjdk-8/2005-jdk-use-correct-include-for-signal.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 385b2007a60c3e792062107d3c4f653fe63d4c63 Mon Sep 17 00:00:00 2001 | 1 | From ddcec385593175ee01b9f000457a34b3d7ab5ab4 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> | 2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> |
3 | Date: Tue, 27 Feb 2018 09:28:06 +0000 | 3 | Date: Tue, 27 Feb 2018 09:28:06 +0000 |
4 | Subject: [PATCH 2005/2009] jdk: use correct include for signal | 4 | Subject: [PATCH] jdk: use correct include for signal |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
6 | Content-Type: text/plain; charset=UTF-8 | 6 | Content-Type: text/plain; charset=UTF-8 |
7 | Content-Transfer-Encoding: 8bit | 7 | Content-Transfer-Encoding: 8bit |
@@ -26,15 +26,16 @@ the following command: | |||
26 | Upstream-Status: Pending | 26 | Upstream-Status: Pending |
27 | Signed-off-by: André Draszik <andre.draszik@jci.com> | 27 | Signed-off-by: André Draszik <andre.draszik@jci.com> |
28 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | 28 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> |
29 | |||
29 | --- | 30 | --- |
30 | src/aix/native/sun/nio/ch/AixNativeThread.c | 2 +- | 31 | jdk/src/aix/native/sun/nio/ch/AixNativeThread.c | 2 +- |
31 | src/macosx/javavm/export/jvm_md.h | 2 +- | 32 | jdk/src/macosx/javavm/export/jvm_md.h | 2 +- |
32 | src/solaris/javavm/export/jvm_md.h | 2 +- | 33 | jdk/src/solaris/javavm/export/jvm_md.h | 2 +- |
33 | src/solaris/native/sun/nio/ch/NativeThread.c | 2 +- | 34 | jdk/src/solaris/native/sun/nio/ch/NativeThread.c | 2 +- |
34 | 4 files changed, 4 insertions(+), 4 deletions(-) | 35 | 4 files changed, 4 insertions(+), 4 deletions(-) |
35 | 36 | ||
36 | diff --git a/jdk/src/aix/native/sun/nio/ch/AixNativeThread.c b/jdk/src/aix/native/sun/nio/ch/AixNativeThread.c | 37 | diff --git a/jdk/src/aix/native/sun/nio/ch/AixNativeThread.c b/jdk/src/aix/native/sun/nio/ch/AixNativeThread.c |
37 | index c0d5857962..c4abb7ae5d 100644 | 38 | index c0d58579..c4abb7ae 100644 |
38 | --- a/jdk/src/aix/native/sun/nio/ch/AixNativeThread.c | 39 | --- a/jdk/src/aix/native/sun/nio/ch/AixNativeThread.c |
39 | +++ b/jdk/src/aix/native/sun/nio/ch/AixNativeThread.c | 40 | +++ b/jdk/src/aix/native/sun/nio/ch/AixNativeThread.c |
40 | @@ -32,7 +32,7 @@ | 41 | @@ -32,7 +32,7 @@ |
@@ -47,7 +48,7 @@ index c0d5857962..c4abb7ae5d 100644 | |||
47 | /* Also defined in src/aix/native/java/net/aix_close.c */ | 48 | /* Also defined in src/aix/native/java/net/aix_close.c */ |
48 | #define INTERRUPT_SIGNAL (SIGRTMAX - 1) | 49 | #define INTERRUPT_SIGNAL (SIGRTMAX - 1) |
49 | diff --git a/jdk/src/macosx/javavm/export/jvm_md.h b/jdk/src/macosx/javavm/export/jvm_md.h | 50 | diff --git a/jdk/src/macosx/javavm/export/jvm_md.h b/jdk/src/macosx/javavm/export/jvm_md.h |
50 | index 012bb1babe..0b57576833 100644 | 51 | index 012bb1ba..0b575768 100644 |
51 | --- a/jdk/src/macosx/javavm/export/jvm_md.h | 52 | --- a/jdk/src/macosx/javavm/export/jvm_md.h |
52 | +++ b/jdk/src/macosx/javavm/export/jvm_md.h | 53 | +++ b/jdk/src/macosx/javavm/export/jvm_md.h |
53 | @@ -60,7 +60,7 @@ | 54 | @@ -60,7 +60,7 @@ |
@@ -60,7 +61,7 @@ index 012bb1babe..0b57576833 100644 | |||
60 | /* O Flags */ | 61 | /* O Flags */ |
61 | 62 | ||
62 | diff --git a/jdk/src/solaris/javavm/export/jvm_md.h b/jdk/src/solaris/javavm/export/jvm_md.h | 63 | diff --git a/jdk/src/solaris/javavm/export/jvm_md.h b/jdk/src/solaris/javavm/export/jvm_md.h |
63 | index 5c681914bb..62415ee255 100644 | 64 | index 5c681914..62415ee2 100644 |
64 | --- a/jdk/src/solaris/javavm/export/jvm_md.h | 65 | --- a/jdk/src/solaris/javavm/export/jvm_md.h |
65 | +++ b/jdk/src/solaris/javavm/export/jvm_md.h | 66 | +++ b/jdk/src/solaris/javavm/export/jvm_md.h |
66 | @@ -65,7 +65,7 @@ | 67 | @@ -65,7 +65,7 @@ |
@@ -73,7 +74,7 @@ index 5c681914bb..62415ee255 100644 | |||
73 | /* O Flags */ | 74 | /* O Flags */ |
74 | 75 | ||
75 | diff --git a/jdk/src/solaris/native/sun/nio/ch/NativeThread.c b/jdk/src/solaris/native/sun/nio/ch/NativeThread.c | 76 | diff --git a/jdk/src/solaris/native/sun/nio/ch/NativeThread.c b/jdk/src/solaris/native/sun/nio/ch/NativeThread.c |
76 | index 5e2a78b7af..204f0441a9 100644 | 77 | index 5e2a78b7..204f0441 100644 |
77 | --- a/jdk/src/solaris/native/sun/nio/ch/NativeThread.c | 78 | --- a/jdk/src/solaris/native/sun/nio/ch/NativeThread.c |
78 | +++ b/jdk/src/solaris/native/sun/nio/ch/NativeThread.c | 79 | +++ b/jdk/src/solaris/native/sun/nio/ch/NativeThread.c |
79 | @@ -34,7 +34,7 @@ | 80 | @@ -34,7 +34,7 @@ |
@@ -85,6 +86,3 @@ index 5e2a78b7af..204f0441a9 100644 | |||
85 | /* Also defined in net/linux_close.c */ | 86 | /* Also defined in net/linux_close.c */ |
86 | #define INTERRUPT_SIGNAL (__SIGRTMAX - 2) | 87 | #define INTERRUPT_SIGNAL (__SIGRTMAX - 2) |
87 | #elif __solaris__ | 88 | #elif __solaris__ |
88 | -- | ||
89 | 2.26.2 | ||
90 | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/2006-jdk-disable-backtrace-musl-build-fix.patch b/recipes-core/openjdk/patches-openjdk-8/2006-jdk-disable-backtrace-musl-build-fix.patch index 6f9c174..4773f20 100644 --- a/recipes-core/openjdk/patches-openjdk-8/2006-jdk-disable-backtrace-musl-build-fix.patch +++ b/recipes-core/openjdk/patches-openjdk-8/2006-jdk-disable-backtrace-musl-build-fix.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 80a07db16d9de0cd875b9c8e86678a51b6e75dbf Mon Sep 17 00:00:00 2001 | 1 | From f27d54f62c5a5667c04b78ea1434a5db36358261 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> | 2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> |
3 | Date: Fri, 2 Mar 2018 13:58:07 +0000 | 3 | Date: Fri, 2 Mar 2018 13:58:07 +0000 |
4 | Subject: [PATCH 2006/2009] jdk: disable backtrace() (musl build fix) | 4 | Subject: [PATCH] jdk: disable backtrace() (musl build fix) |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
6 | Content-Type: text/plain; charset=UTF-8 | 6 | Content-Type: text/plain; charset=UTF-8 |
7 | Content-Transfer-Encoding: 8bit | 7 | Content-Transfer-Encoding: 8bit |
@@ -15,12 +15,13 @@ to fix the build on musl. | |||
15 | Upstream-Status: Pending | 15 | Upstream-Status: Pending |
16 | Signed-off-by: André Draszik <andre.draszik@jci.com> | 16 | Signed-off-by: André Draszik <andre.draszik@jci.com> |
17 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | 17 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> |
18 | |||
18 | --- | 19 | --- |
19 | src/solaris/native/sun/xawt/XToolkit.c | 4 ++-- | 20 | jdk/src/solaris/native/sun/xawt/XToolkit.c | 4 ++-- |
20 | 1 file changed, 2 insertions(+), 2 deletions(-) | 21 | 1 file changed, 2 insertions(+), 2 deletions(-) |
21 | 22 | ||
22 | diff --git a/jdk/src/solaris/native/sun/xawt/XToolkit.c b/jdk/src/solaris/native/sun/xawt/XToolkit.c | 23 | diff --git a/jdk/src/solaris/native/sun/xawt/XToolkit.c b/jdk/src/solaris/native/sun/xawt/XToolkit.c |
23 | index 95d2baff5b..41dfa992a7 100644 | 24 | index 95d2baff..41dfa992 100644 |
24 | --- a/jdk/src/solaris/native/sun/xawt/XToolkit.c | 25 | --- a/jdk/src/solaris/native/sun/xawt/XToolkit.c |
25 | +++ b/jdk/src/solaris/native/sun/xawt/XToolkit.c | 26 | +++ b/jdk/src/solaris/native/sun/xawt/XToolkit.c |
26 | @@ -27,7 +27,7 @@ | 27 | @@ -27,7 +27,7 @@ |
@@ -41,6 +42,3 @@ index 95d2baff5b..41dfa992a7 100644 | |||
41 | void print_stack(void) | 42 | void print_stack(void) |
42 | { | 43 | { |
43 | void *array[10]; | 44 | void *array[10]; |
44 | -- | ||
45 | 2.26.2 | ||
46 | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/2007-jdk-no-genx11-in-headless.patch b/recipes-core/openjdk/patches-openjdk-8/2007-jdk-no-genx11-in-headless.patch index 62c5b98..d205ae5 100644 --- a/recipes-core/openjdk/patches-openjdk-8/2007-jdk-no-genx11-in-headless.patch +++ b/recipes-core/openjdk/patches-openjdk-8/2007-jdk-no-genx11-in-headless.patch | |||
@@ -1,15 +1,16 @@ | |||
1 | From 6f76fb04370713bdae2485261d987448c9350179 Mon Sep 17 00:00:00 2001 | 1 | From 095da0fd8597f0ed8d95d226300e8d6661ac2383 Mon Sep 17 00:00:00 2001 |
2 | From: Jens Rehsack <rehsack@gmail.com> | 2 | From: Jens Rehsack <rehsack@gmail.com> |
3 | Date: Thu, 2 Jan 2020 13:25:12 +0100 | 3 | Date: Thu, 2 Jan 2020 13:25:12 +0100 |
4 | Subject: [PATCH 2007/2009] jdk: no genx11 in headless | 4 | Subject: [PATCH] jdk: no genx11 in headless |
5 | 5 | ||
6 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | 6 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> |
7 | |||
7 | --- | 8 | --- |
8 | make/GenerateSources.gmk | 8 +++++--- | 9 | jdk/make/GenerateSources.gmk | 8 +++++--- |
9 | 1 file changed, 5 insertions(+), 3 deletions(-) | 10 | 1 file changed, 5 insertions(+), 3 deletions(-) |
10 | 11 | ||
11 | diff --git a/jdk/make/GenerateSources.gmk b/jdk/make/GenerateSources.gmk | 12 | diff --git a/jdk/make/GenerateSources.gmk b/jdk/make/GenerateSources.gmk |
12 | index ba443f7da5..2170150aca 100644 | 13 | index ba443f7d..2170150a 100644 |
13 | --- a/jdk/make/GenerateSources.gmk | 14 | --- a/jdk/make/GenerateSources.gmk |
14 | +++ b/jdk/make/GenerateSources.gmk | 15 | +++ b/jdk/make/GenerateSources.gmk |
15 | @@ -73,9 +73,11 @@ ifneq ($(OPENJDK_TARGET_OS), windows) | 16 | @@ -73,9 +73,11 @@ ifneq ($(OPENJDK_TARGET_OS), windows) |
@@ -27,6 +28,3 @@ index ba443f7da5..2170150aca 100644 | |||
27 | endif | 28 | endif |
28 | endif | 29 | endif |
29 | 30 | ||
30 | -- | ||
31 | 2.26.2 | ||
32 | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/2008-jdk-no-unused-deps.patch b/recipes-core/openjdk/patches-openjdk-8/2008-jdk-no-unused-deps.patch index 4c462c4..115914a 100644 --- a/recipes-core/openjdk/patches-openjdk-8/2008-jdk-no-unused-deps.patch +++ b/recipes-core/openjdk/patches-openjdk-8/2008-jdk-no-unused-deps.patch | |||
@@ -1,18 +1,19 @@ | |||
1 | From 335f9891be66e1292509d6a9dc18d41fac0a066c Mon Sep 17 00:00:00 2001 | 1 | From bc6450aaa4b7652ee034423f1d04cb439152eaf6 Mon Sep 17 00:00:00 2001 |
2 | From: Jens Rehsack <rehsack@gmail.com> | 2 | From: Jens Rehsack <rehsack@gmail.com> |
3 | Date: Thu, 2 Jan 2020 13:26:42 +0100 | 3 | Date: Thu, 2 Jan 2020 13:26:42 +0100 |
4 | Subject: [PATCH 2008/2009] jdk: no unused deps | 4 | Subject: [PATCH] jdk: no unused deps |
5 | 5 | ||
6 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | 6 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> |
7 | |||
7 | --- | 8 | --- |
8 | make/CompileNativeLibraries.gmk | 2 ++ | 9 | jdk/make/CompileNativeLibraries.gmk | 2 ++ |
9 | make/lib/Awt2dLibraries.gmk | 30 +++++++++++++++++------ | 10 | jdk/make/lib/Awt2dLibraries.gmk | 30 ++++++++++++++----- |
10 | src/solaris/native/sun/awt/jawt.c | 2 +- | 11 | jdk/src/solaris/native/sun/awt/jawt.c | 2 +- |
11 | src/solaris/native/sun/awt/utility/rect.h | 2 +- | 12 | jdk/src/solaris/native/sun/awt/utility/rect.h | 2 +- |
12 | 4 files changed, 26 insertions(+), 10 deletions(-) | 13 | 4 files changed, 26 insertions(+), 10 deletions(-) |
13 | 14 | ||
14 | diff --git a/jdk/make/CompileNativeLibraries.gmk b/jdk/make/CompileNativeLibraries.gmk | 15 | diff --git a/jdk/make/CompileNativeLibraries.gmk b/jdk/make/CompileNativeLibraries.gmk |
15 | index c23b958b06..2984302f0a 100644 | 16 | index c23b958b..2984302f 100644 |
16 | --- a/jdk/make/CompileNativeLibraries.gmk | 17 | --- a/jdk/make/CompileNativeLibraries.gmk |
17 | +++ b/jdk/make/CompileNativeLibraries.gmk | 18 | +++ b/jdk/make/CompileNativeLibraries.gmk |
18 | @@ -85,7 +85,9 @@ include lib/ServiceabilityLibraries.gmk | 19 | @@ -85,7 +85,9 @@ include lib/ServiceabilityLibraries.gmk |
@@ -26,7 +27,7 @@ index c23b958b06..2984302f0a 100644 | |||
26 | # Include the corresponding custom file, if present. | 27 | # Include the corresponding custom file, if present. |
27 | -include $(CUSTOM_MAKE_DIR)/CompileNativeLibraries.gmk | 28 | -include $(CUSTOM_MAKE_DIR)/CompileNativeLibraries.gmk |
28 | diff --git a/jdk/make/lib/Awt2dLibraries.gmk b/jdk/make/lib/Awt2dLibraries.gmk | 29 | diff --git a/jdk/make/lib/Awt2dLibraries.gmk b/jdk/make/lib/Awt2dLibraries.gmk |
29 | index 7f42e09ce4..10232b61ca 100644 | 30 | index 7f42e09c..10232b61 100644 |
30 | --- a/jdk/make/lib/Awt2dLibraries.gmk | 31 | --- a/jdk/make/lib/Awt2dLibraries.gmk |
31 | +++ b/jdk/make/lib/Awt2dLibraries.gmk | 32 | +++ b/jdk/make/lib/Awt2dLibraries.gmk |
32 | @@ -232,6 +232,10 @@ ifeq ($(OPENJDK_TARGET_OS), aix) | 33 | @@ -232,6 +232,10 @@ ifeq ($(OPENJDK_TARGET_OS), aix) |
@@ -88,7 +89,7 @@ index 7f42e09ce4..10232b61ca 100644 | |||
88 | LIBAWT_HEADLESS_REORDER := | 89 | LIBAWT_HEADLESS_REORDER := |
89 | ifeq ($(OPENJDK_TARGET_OS), solaris) | 90 | ifeq ($(OPENJDK_TARGET_OS), solaris) |
90 | diff --git a/jdk/src/solaris/native/sun/awt/jawt.c b/jdk/src/solaris/native/sun/awt/jawt.c | 91 | diff --git a/jdk/src/solaris/native/sun/awt/jawt.c b/jdk/src/solaris/native/sun/awt/jawt.c |
91 | index 64284bc6e9..b3584c7efe 100644 | 92 | index 64284bc6..b3584c7e 100644 |
92 | --- a/jdk/src/solaris/native/sun/awt/jawt.c | 93 | --- a/jdk/src/solaris/native/sun/awt/jawt.c |
93 | +++ b/jdk/src/solaris/native/sun/awt/jawt.c | 94 | +++ b/jdk/src/solaris/native/sun/awt/jawt.c |
94 | @@ -33,7 +33,7 @@ | 95 | @@ -33,7 +33,7 @@ |
@@ -101,7 +102,7 @@ index 64284bc6e9..b3584c7efe 100644 | |||
101 | return JNI_FALSE; | 102 | return JNI_FALSE; |
102 | #else | 103 | #else |
103 | diff --git a/jdk/src/solaris/native/sun/awt/utility/rect.h b/jdk/src/solaris/native/sun/awt/utility/rect.h | 104 | diff --git a/jdk/src/solaris/native/sun/awt/utility/rect.h b/jdk/src/solaris/native/sun/awt/utility/rect.h |
104 | index ceea38f434..8d85782ba0 100644 | 105 | index ceea38f4..8d85782b 100644 |
105 | --- a/jdk/src/solaris/native/sun/awt/utility/rect.h | 106 | --- a/jdk/src/solaris/native/sun/awt/utility/rect.h |
106 | +++ b/jdk/src/solaris/native/sun/awt/utility/rect.h | 107 | +++ b/jdk/src/solaris/native/sun/awt/utility/rect.h |
107 | @@ -28,7 +28,7 @@ | 108 | @@ -28,7 +28,7 @@ |
@@ -113,6 +114,3 @@ index ceea38f434..8d85782ba0 100644 | |||
113 | #include <X11/Xlib.h> | 114 | #include <X11/Xlib.h> |
114 | typedef XRectangle RECT_T; | 115 | typedef XRectangle RECT_T; |
115 | #else | 116 | #else |
116 | -- | ||
117 | 2.26.2 | ||
118 | |||
diff --git a/recipes-core/openjdk/patches-openjdk-8/2009-jdk-make-use-gcc-instead-of-ld-for-genSocketOptionRe.patch b/recipes-core/openjdk/patches-openjdk-8/2009-jdk-make-use-gcc-instead-of-ld-for-genSocketOptionRe.patch index d75e264..3c7dc24 100644 --- a/recipes-core/openjdk/patches-openjdk-8/2009-jdk-make-use-gcc-instead-of-ld-for-genSocketOptionRe.patch +++ b/recipes-core/openjdk/patches-openjdk-8/2009-jdk-make-use-gcc-instead-of-ld-for-genSocketOptionRe.patch | |||
@@ -1,18 +1,18 @@ | |||
1 | From 2d5e8ce975fb241a825dbf070923ccbdf8b65ee9 Mon Sep 17 00:00:00 2001 | 1 | From 83d3b8427c8996f3a0359d218f174b46fe9120c8 Mon Sep 17 00:00:00 2001 |
2 | From: Richard Leitner <richard.leitner@skidata.com> | 2 | From: Richard Leitner <richard.leitner@skidata.com> |
3 | Date: Thu, 20 Aug 2020 11:24:40 +0200 | 3 | Date: Thu, 20 Aug 2020 11:24:40 +0200 |
4 | Subject: [PATCH 2009/2009] jdk: make: use gcc instead of ld for | 4 | Subject: [PATCH] jdk: make: use gcc instead of ld for genSocketOptionRegistry |
5 | genSocketOptionRegistry | ||
6 | 5 | ||
7 | Upstream-Status: Pending | 6 | Upstream-Status: Pending |
8 | 7 | ||
9 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | 8 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> |
9 | |||
10 | --- | 10 | --- |
11 | make/gensrc/GensrcMisc.gmk | 2 +- | 11 | jdk/make/gensrc/GensrcMisc.gmk | 2 +- |
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | 12 | 1 file changed, 1 insertion(+), 1 deletion(-) |
13 | 13 | ||
14 | diff --git a/jdk/make/gensrc/GensrcMisc.gmk b/jdk/make/gensrc/GensrcMisc.gmk | 14 | diff --git a/jdk/make/gensrc/GensrcMisc.gmk b/jdk/make/gensrc/GensrcMisc.gmk |
15 | index 9db5c9d6f7..84a3c27e7d 100644 | 15 | index 9db5c9d6..84a3c27e 100644 |
16 | --- a/jdk/make/gensrc/GensrcMisc.gmk | 16 | --- a/jdk/make/gensrc/GensrcMisc.gmk |
17 | +++ b/jdk/make/gensrc/GensrcMisc.gmk | 17 | +++ b/jdk/make/gensrc/GensrcMisc.gmk |
18 | @@ -76,7 +76,7 @@ $(eval $(call SetupNativeCompilation,BUILD_GENSRC_SOR_EXE, \ | 18 | @@ -76,7 +76,7 @@ $(eval $(call SetupNativeCompilation,BUILD_GENSRC_SOR_EXE, \ |
@@ -24,6 +24,3 @@ index 9db5c9d6f7..84a3c27e7d 100644 | |||
24 | OBJECT_DIR := $(GENSRC_SOR_BIN), \ | 24 | OBJECT_DIR := $(GENSRC_SOR_BIN), \ |
25 | OUTPUT_DIR := $(GENSRC_SOR_BIN), \ | 25 | OUTPUT_DIR := $(GENSRC_SOR_BIN), \ |
26 | PROGRAM := genSocketOptionRegistry)) | 26 | PROGRAM := genSocketOptionRegistry)) |
27 | -- | ||
28 | 2.26.2 | ||
29 | |||