summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorgy Yakovlev <gyakovlev@gentoo.org>2020-08-04 14:44:55 -0700
committerGeorgy Yakovlev <gyakovlev@gentoo.org>2020-08-04 14:58:23 -0700
commitb2e262024d4c564b29a7da88732e2c422234549e (patch)
tree3bed629d843e34126c8351b48a5c3f50420a8e7a /dev-java/openjdk/files
parentdev-java/openjdk: 8.265 ppc64 stable, bug #732624 (diff)
downloadgentoo-b2e262024d4c564b29a7da88732e2c422234549e.tar.gz
gentoo-b2e262024d4c564b29a7da88732e2c422234549e.tar.bz2
gentoo-b2e262024d4c564b29a7da88732e2c422234549e.zip
dev-java/openjdk: drop old
Bug: https://bugs.gentoo.org/732624 Closes: https://bugs.gentoo.org/734320 Closes: https://bugs.gentoo.org/706012 Closes: https://bugs.gentoo.org/713180 Closes: https://bugs.gentoo.org/706638 Package-Manager: Portage-3.0.1, Repoman-2.3.23 Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
Diffstat (limited to 'dev-java/openjdk/files')
-rw-r--r--dev-java/openjdk/files/openjdk-11.0.7_p10-sigsegv.patch55
-rw-r--r--dev-java/openjdk/files/openjdk-8-detect-gcc10.patch49
2 files changed, 0 insertions, 104 deletions
diff --git a/dev-java/openjdk/files/openjdk-11.0.7_p10-sigsegv.patch b/dev-java/openjdk/files/openjdk-11.0.7_p10-sigsegv.patch
deleted file mode 100644
index 04c61c06589e..000000000000
--- a/dev-java/openjdk/files/openjdk-11.0.7_p10-sigsegv.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-
-# HG changeset patch
-# User ccheung
-# Date 1564075552 25200
-# Node ID f1332f6025515e4fc9e42fbf79f983d782abaaf0
-# Parent 966fc6d784a737ec25cd0b1be48109a4a3fa02ad
-8228407: JVM crashes with shared archive file mismatch
-Summary: Stop processing other header fields if initial header check has failed.
-Reviewed-by: dholmes, jiangli
-
-diff -r 966fc6d784a7 -r f1332f602551 src/hotspot/share/memory/filemap.cpp
---- a/src/hotspot/share/memory/filemap.cpp Mon Mar 02 12:30:59 2020 +0100
-+++ b/src/hotspot/share/memory/filemap.cpp Thu Jul 25 10:25:52 2019 -0700
-@@ -1287,7 +1287,9 @@
- }
-
- init_from_file(_fd);
-- if (!validate_header()) {
-+ // UseSharedSpaces could be disabled if the checking of some of the header fields in
-+ // init_from_file has failed.
-+ if (!UseSharedSpaces || !validate_header()) {
- return false;
- }
- return true;
-diff -r 966fc6d784a7 -r f1332f602551 test/hotspot/jtreg/runtime/appcds/SharedArchiveConsistency.java
---- a/test/hotspot/jtreg/runtime/appcds/SharedArchiveConsistency.java Mon Mar 02 12:30:59 2020 +0100
-+++ b/test/hotspot/jtreg/runtime/appcds/SharedArchiveConsistency.java Thu Jul 25 10:25:52 2019 -0700
-@@ -385,8 +385,16 @@
- output.shouldNotContain("Checksum verification failed");
-
- copyFile(orgJsaFile, jsa);
-+ // modify _jvm_ident and run with -Xshare:auto
-+ System.out.println("\n2b. Corrupt _jvm_ident run with -Xshare:auto\n");
-+ modifyJvmIdent();
-+ output = TestCommon.execAuto(execArgs);
-+ output.shouldContain("The shared archive file was created by a different version or build of HotSpot");
-+ output.shouldContain("Hello World");
-+
-+ copyFile(orgJsaFile, jsa);
- // modify _magic and _paths_misc_info_size, test should fail
-- System.out.println("\n2b. Corrupt _magic and _paths_misc_info_size, should fail\n");
-+ System.out.println("\n2c. Corrupt _magic and _paths_misc_info_size, should fail\n");
- modifyHeaderIntField(offset_magic, 0x00000000);
- modifyHeaderIntField(offset_paths_misc_info_size, Integer.MAX_VALUE);
- output = TestCommon.execCommon(execArgs);
-@@ -395,7 +403,7 @@
-
- copyFile(orgJsaFile, jsa);
- // modify _version and _paths_misc_info_size, test should fail
-- System.out.println("\n2c. Corrupt _version and _paths_misc_info_size, should fail\n");
-+ System.out.println("\n2d. Corrupt _version and _paths_misc_info_size, should fail\n");
- modifyHeaderIntField(offset_version, 0x00000000);
- modifyHeaderIntField(offset_paths_misc_info_size, Integer.MAX_VALUE);
- output = TestCommon.execCommon(execArgs);
-
diff --git a/dev-java/openjdk/files/openjdk-8-detect-gcc10.patch b/dev-java/openjdk/files/openjdk-8-detect-gcc10.patch
deleted file mode 100644
index b47e012d4a39..000000000000
--- a/dev-java/openjdk/files/openjdk-8-detect-gcc10.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 6d96aaac5662f734b0a933397ebb8cd4ff66606d Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev <gyakovlev@gentoo.org>
-Date: Sat, 23 May 2020 20:48:10 -0700
-Subject: [PATCH] backport gcc10 fix
-
-https://hg.openjdk.java.net/jdk8u/jdk8u/rev/39a7914e14a0
----
- common/autoconf/generated-configure.sh | 4 ++--
- common/autoconf/toolchain.m4 | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh
-index 5e71c50..90c017d 100644
---- a/common/autoconf/generated-configure.sh
-+++ b/common/autoconf/generated-configure.sh
-@@ -27955,7 +27955,7 @@ $as_echo "$as_me: The result from running with --version was: \"$COMPILER_VERSIO
- COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \
- $SED -e 's/ *Copyright .*//'`
- COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \
-- $SED -e 's/^.* \([1-9]\.[0-9.]*\) .*$/\1/'`
-+ $SED -e 's/^.* \([1-9][0-9]*\.[0-9.]*\) .*$/\1/'`
- elif test "x$TOOLCHAIN_TYPE" = xclang; then
- # clang --version output typically looks like
- # Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn)
-@@ -29696,7 +29696,7 @@ $as_echo "$as_me: The result from running with --version was: \"$COMPILER_VERSIO
- COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \
- $SED -e 's/ *Copyright .*//'`
- COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \
-- $SED -e 's/^.* \([1-9]\.[0-9.]*\) .*$/\1/'`
-+ $SED -e 's/^.* \([1-9][0-9]*\.[0-9.]*\) .*$/\1/'`
- elif test "x$TOOLCHAIN_TYPE" = xclang; then
- # clang --version output typically looks like
- # Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn)
-diff --git a/common/autoconf/toolchain.m4 b/common/autoconf/toolchain.m4
-index e3a82c8..c0a4af5 100644
---- a/common/autoconf/toolchain.m4
-+++ b/common/autoconf/toolchain.m4
-@@ -433,7 +433,7 @@ AC_DEFUN([TOOLCHAIN_EXTRACT_COMPILER_VERSION],
- COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \
- $SED -e 's/ *Copyright .*//'`
- COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \
-- $SED -e 's/^.* \(@<:@1-9@:>@\.@<:@0-9.@:>@*\) .*$/\1/'`
-+ $SED -e 's/^.* \(@<:@1-9@:>@@<:@0-9@:>@*\.@<:@0-9.@:>@*\) .*$/\1/'`
- elif test "x$TOOLCHAIN_TYPE" = xclang; then
- # clang --version output typically looks like
- # Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn)
---
-2.26.2
-