Sync from SUSE:SLFO:Main java-1_8_0-openjdk revision 2af961609da9448853cbdd9421740a0d
This commit is contained in:
commit
29cd22aa2d
23
.gitattributes
vendored
Normal file
23
.gitattributes
vendored
Normal file
@ -0,0 +1,23 @@
|
||||
## Default LFS
|
||||
*.7z filter=lfs diff=lfs merge=lfs -text
|
||||
*.bsp filter=lfs diff=lfs merge=lfs -text
|
||||
*.bz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.gem filter=lfs diff=lfs merge=lfs -text
|
||||
*.gz filter=lfs diff=lfs merge=lfs -text
|
||||
*.jar filter=lfs diff=lfs merge=lfs -text
|
||||
*.lz filter=lfs diff=lfs merge=lfs -text
|
||||
*.lzma filter=lfs diff=lfs merge=lfs -text
|
||||
*.obscpio filter=lfs diff=lfs merge=lfs -text
|
||||
*.oxt filter=lfs diff=lfs merge=lfs -text
|
||||
*.pdf filter=lfs diff=lfs merge=lfs -text
|
||||
*.png filter=lfs diff=lfs merge=lfs -text
|
||||
*.rpm filter=lfs diff=lfs merge=lfs -text
|
||||
*.tbz filter=lfs diff=lfs merge=lfs -text
|
||||
*.tbz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.tgz filter=lfs diff=lfs merge=lfs -text
|
||||
*.ttf filter=lfs diff=lfs merge=lfs -text
|
||||
*.txz filter=lfs diff=lfs merge=lfs -text
|
||||
*.whl filter=lfs diff=lfs merge=lfs -text
|
||||
*.xz filter=lfs diff=lfs merge=lfs -text
|
||||
*.zip filter=lfs diff=lfs merge=lfs -text
|
||||
*.zst filter=lfs diff=lfs merge=lfs -text
|
23
1015432.patch
Normal file
23
1015432.patch
Normal file
@ -0,0 +1,23 @@
|
||||
--- openjdk/hotspot/src/os/linux/vm/os_linux.cpp Wed Oct 23 15:44:12 2013 -0700
|
||||
+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp Thu Dec 19 16:03:33 2013 +0000
|
||||
@@ -4797,9 +4797,19 @@
|
||||
// size. Add a page for compiler2 recursion in main thread.
|
||||
// Add in 2*BytesPerWord times page size to account for VM stack during
|
||||
// class initialization depending on 32 or 64 bit VM.
|
||||
+
|
||||
+
|
||||
os::Linux::min_stack_allowed = MAX2(os::Linux::min_stack_allowed,
|
||||
(size_t)(StackYellowPages+StackRedPages+StackShadowPages) * Linux::page_size() +
|
||||
- (2*BytesPerWord COMPILER2_PRESENT(+1)) * Linux::vm_default_page_size());
|
||||
+ (2*BytesPerWord COMPILER2_PRESENT(+1))
|
||||
+ *
|
||||
+#ifdef PPC
|
||||
+ NOT_ZERO ( Linux::vm_default_page_size() )
|
||||
+ ZERO_ONLY ( Linux::page_size() )
|
||||
+#else
|
||||
+ ( Linux::vm_default_page_size() )
|
||||
+#endif
|
||||
+ );
|
||||
|
||||
size_t threadStackSizeInBytes = ThreadStackSize * K;
|
||||
if (threadStackSizeInBytes != 0 &&
|
93
JDK_1_8_0-8208602.patch
Normal file
93
JDK_1_8_0-8208602.patch
Normal file
@ -0,0 +1,93 @@
|
||||
|
||||
# HG changeset patch
|
||||
# User weijun
|
||||
# Date 1533101708 -28800
|
||||
# Node ID 9d92ff04a29c12a5d47f2ca4e772f7716bfdb8ff
|
||||
# Parent b6e0bfe4a6ec5d8d9d9476c05627dfb47f2263e1
|
||||
8208602: Cannot read PEM X.509 cert if there is whitespace after the header or footer
|
||||
Reviewed-by: xuelei
|
||||
|
||||
diff -r b6e0bfe4a6ec -r 9d92ff04a29c src/java.base/share/classes/sun/security/provider/X509Factory.java
|
||||
--- openjdk/jdk/src/share/classes/sun/security/provider/X509Factory.java Wed Aug 01 01:40:44 2018 -0400
|
||||
+++ openjdk/jdk/src/share/classes/sun/security/provider/X509Factory.java Wed Aug 01 13:35:08 2018 +0800
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
- * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
|
||||
+ * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
@@ -635,7 +635,8 @@
|
||||
if (next != '\r') footer.append((char)next);
|
||||
}
|
||||
|
||||
- checkHeaderFooter(header.toString(), footer.toString());
|
||||
+ checkHeaderFooter(header.toString().replaceFirst("\\s++$", ""),
|
||||
+ footer.toString().replaceFirst("\\s++$", ""));
|
||||
|
||||
return Pem.decode(new String(data, 0, pos));
|
||||
}
|
||||
diff -r b6e0bfe4a6ec -r 9d92ff04a29c test/jdk/sun/security/provider/X509Factory/BadPem.java
|
||||
--- openjdk/jdk/test/sun/security/provider/X509Factory/BadPem.java Wed Aug 01 01:40:44 2018 -0400
|
||||
+++ openjdk/jdk/test/sun/security/provider/X509Factory/BadPem.java Wed Aug 01 13:35:08 2018 +0800
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
+ * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
@@ -23,14 +23,13 @@
|
||||
|
||||
/*
|
||||
* @test
|
||||
- * @bug 8074935
|
||||
- * @summary jdk8 keytool doesn't validate pem files for RFC 1421 correctness, as jdk7 did
|
||||
+ * @bug 8074935 8208602
|
||||
+ * @summary X.509 cert PEM format read
|
||||
*/
|
||||
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.FileInputStream;
|
||||
-import java.io.FileOutputStream;
|
||||
import java.io.PrintStream;
|
||||
import java.security.KeyStore;
|
||||
import java.security.cert.CertificateException;
|
||||
import java.util.Arrays;
|
||||
@@ -49,10 +48,12 @@
|
||||
String pass = "passphrase";
|
||||
String alias = "dummy";
|
||||
|
||||
+ CertificateFactory cf = CertificateFactory.getInstance("X.509");
|
||||
KeyStore keyStore = KeyStore.getInstance("JKS");
|
||||
keyStore.load(new FileInputStream(ks), pass.toCharArray());
|
||||
byte[] cert = keyStore.getCertificate(alias).getEncoded();
|
||||
|
||||
+ // 8074935
|
||||
ByteArrayOutputStream bout = new ByteArrayOutputStream();
|
||||
PrintStream pout = new PrintStream(bout);
|
||||
byte[] CRLF = new byte[] {'\r', '\n'};
|
||||
@@ -64,14 +65,20 @@
|
||||
}
|
||||
pout.println(X509Factory.END_CERT);
|
||||
|
||||
- CertificateFactory cf = CertificateFactory.getInstance("X.509");
|
||||
-
|
||||
try {
|
||||
cf.generateCertificate(new ByteArrayInputStream(bout.toByteArray()));
|
||||
throw new Exception("Should fail");
|
||||
} catch (CertificateException e) {
|
||||
// Good
|
||||
}
|
||||
+
|
||||
+ // 8208602
|
||||
+ bout.reset();
|
||||
+ pout.println(X509Factory.BEGIN_CERT + " ");
|
||||
+ pout.println(Base64.getMimeEncoder().encodeToString(cert));
|
||||
+ pout.println(X509Factory.END_CERT + " ");
|
||||
+
|
||||
+ cf.generateCertificate(new ByteArrayInputStream(bout.toByteArray()));
|
||||
}
|
||||
}
|
||||
|
||||
|
11
_constraints
Normal file
11
_constraints
Normal file
@ -0,0 +1,11 @@
|
||||
<constraints>
|
||||
<hardware>
|
||||
<physicalmemory>
|
||||
<size unit="M">4096</size>
|
||||
</physicalmemory>
|
||||
<disk>
|
||||
<size unit="G">20</size>
|
||||
</disk>
|
||||
</hardware>
|
||||
|
||||
</constraints>
|
BIN
aarch32-git.tar.xz
(Stored with Git LFS)
Normal file
BIN
aarch32-git.tar.xz
(Stored with Git LFS)
Normal file
Binary file not shown.
10
adlc-parser.patch
Normal file
10
adlc-parser.patch
Normal file
@ -0,0 +1,10 @@
|
||||
--- openjdk/hotspot/src/share/vm/adlc/formsopt.cpp 2014-07-03 21:56:12.000000000 +0200
|
||||
+++ openjdk/hotspot/src/share/vm/adlc/formsopt.cpp 2014-07-14 11:43:21.900408570 +0200
|
||||
@@ -347,6 +347,7 @@
|
||||
_return_value = NULL;
|
||||
_c_return_value = NULL;
|
||||
_interpreter_frame_pointer_reg = NULL;
|
||||
+ _cisc_spilling_operand_name = NULL;
|
||||
}
|
||||
|
||||
FrameForm::~FrameForm() {
|
15
bsc1211968.patch
Normal file
15
bsc1211968.patch
Normal file
@ -0,0 +1,15 @@
|
||||
--- openjdk/jdk/src/share/classes/sun/security/ssl/DHKeyExchange.java 2023-11-14 07:18:11.483931806 +0100
|
||||
+++ openjdk/jdk/src/share/classes/sun/security/ssl/DHKeyExchange.java 2023-11-14 07:20:21.018138340 +0100
|
||||
@@ -253,11 +253,7 @@
|
||||
static {
|
||||
String property = GetPropertyAction.privilegedGetProperty(
|
||||
"jdk.tls.ephemeralDHKeySize");
|
||||
- if (property == null || property.isEmpty()) {
|
||||
- useLegacyEphemeralDHKeys = false;
|
||||
- useSmartEphemeralDHKeys = false;
|
||||
- customizedDHKeySize = -1;
|
||||
- } else if ("matched".equals(property)) {
|
||||
+ if (property == null || property.isEmpty() || "matched".equals(property)) {
|
||||
useLegacyEphemeralDHKeys = false;
|
||||
useSmartEphemeralDHKeys = true;
|
||||
customizedDHKeySize = -1;
|
58
disable-doclint-by-default.patch
Normal file
58
disable-doclint-by-default.patch
Normal file
@ -0,0 +1,58 @@
|
||||
Disable doclint by default
|
||||
|
||||
OpenJDK 8 adds and enables doclint by default. This catches issues in
|
||||
javadoc comments. It is too strict, breaks javadoc compilation and, in
|
||||
general, breaks the build for old code known to build with previous
|
||||
versions of OpenJDK.
|
||||
|
||||
See: http://blog.joda.org/2014/02/turning-off-doclint-in-jdk-8-javadoc.html
|
||||
See: https://lists.fedoraproject.org/pipermail/java-devel/2014-February/005150.html
|
||||
|
||||
Author: Andrew John Hughes <ahughes@redhat.com>
|
||||
Author: Emmanuel Bourg <ebourg@apache.org>
|
||||
--- openjdk/langtools/src/share/classes/com/sun/tools/javadoc/DocEnv.java
|
||||
+++ openjdk/langtools/src/share/classes/com/sun/tools/javadoc/DocEnv.java
|
||||
@@ -811,10 +811,9 @@
|
||||
doclintOpts.add(opt == null ? DocLint.XMSGS_OPTION : DocLint.XMSGS_CUSTOM_PREFIX + opt);
|
||||
}
|
||||
|
||||
- if (doclintOpts.isEmpty()) {
|
||||
- doclintOpts.add(DocLint.XMSGS_OPTION);
|
||||
- } else if (doclintOpts.size() == 1
|
||||
- && doclintOpts.get(0).equals(DocLint.XMSGS_CUSTOM_PREFIX + "none")) {
|
||||
+ if (doclintOpts.isEmpty() ||
|
||||
+ (doclintOpts.size() == 1
|
||||
+ && doclintOpts.get(0).equals(DocLint.XMSGS_CUSTOM_PREFIX + "none"))) {
|
||||
return;
|
||||
}
|
||||
|
||||
--- openjdk/langtools/test/tools/javadoc/doclint/DocLintTest.java
|
||||
+++ openjdk/langtools/test/tools/javadoc/doclint/DocLintTest.java
|
||||
@@ -130,12 +130,12 @@
|
||||
};
|
||||
|
||||
test(Collections.<String>emptyList(),
|
||||
- Main.Result.ERROR,
|
||||
- EnumSet.of(Message.DL_ERR9A, Message.DL_WRN12A));
|
||||
+ Main.Result.OK,
|
||||
+ EnumSet.of(Message.JD_WRN10, Message.JD_WRN13));
|
||||
|
||||
test(Arrays.asList(rawDiags),
|
||||
- Main.Result.ERROR,
|
||||
- EnumSet.of(Message.DL_ERR9, Message.DL_WRN12));
|
||||
+ Main.Result.OK,
|
||||
+ EnumSet.of(Message.JD_WRN10, Message.JD_WRN13));
|
||||
|
||||
test(Arrays.asList("-Xdoclint:none"),
|
||||
Main.Result.OK,
|
||||
@@ -158,8 +158,8 @@
|
||||
EnumSet.of(Message.DL_WRN12));
|
||||
|
||||
test(Arrays.asList(rawDiags, "-private"),
|
||||
- Main.Result.ERROR,
|
||||
- EnumSet.of(Message.DL_ERR6, Message.DL_ERR9, Message.DL_WRN12));
|
||||
+ Main.Result.OK,
|
||||
+ EnumSet.of(Message.JD_WRN10, Message.JD_WRN13));
|
||||
|
||||
test(Arrays.asList(rawDiags, "-Xdoclint:syntax", "-private"),
|
||||
Main.Result.ERROR,
|
1428
fips.patch
Normal file
1428
fips.patch
Normal file
File diff suppressed because it is too large
Load Diff
BIN
icedtea-3.30.0.tar.xz
(Stored with Git LFS)
Normal file
BIN
icedtea-3.30.0.tar.xz
(Stored with Git LFS)
Normal file
Binary file not shown.
11
icedtea-3.8.0-s390.patch
Normal file
11
icedtea-3.8.0-s390.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- icedtea-3.8.0/javac.in 2018-05-29 18:11:09.984573705 +0200
|
||||
+++ icedtea-3.8.0/javac.in 2018-09-21 15:08:36.603644127 +0200
|
||||
@@ -22,7 +22,7 @@
|
||||
unless grep {$_ eq '-bootclasspath'} @ARGV;
|
||||
my @ecj_parms = ($ECJ_WARNINGS, @bcoption);
|
||||
my @javac_parms = ($JAVAC_WARNINGS, '-Xprefer:source',
|
||||
- '-XDignore.symbol.file=true', '-J-Xmx1024m');
|
||||
+ '-XDignore.symbol.file=true', '-J-Xmx786m');
|
||||
|
||||
# Work around ecj's inability to handle duplicate command-line
|
||||
# options and unknown javac options.
|
24
java-1_8_0-openjdk-suse-desktop-files.patch
Normal file
24
java-1_8_0-openjdk-suse-desktop-files.patch
Normal file
@ -0,0 +1,24 @@
|
||||
--- icedtea-3.0.1/jconsole.desktop.in 2016-04-24 08:37:01.989304092 +0200
|
||||
+++ icedtea-3.0.1/jconsole.desktop.in 2016-04-27 09:46:17.592085490 +0200
|
||||
@@ -1,5 +1,6 @@
|
||||
[Desktop Entry]
|
||||
Name=OpenJDK @JAVA_VER@ for @target_cpu@ Monitoring & Management Console (@OPENJDK_VER@)
|
||||
+GenericName=OpenJDK @JAVA_VER@ Policy Tool
|
||||
Comment=Monitor and manage OpenJDK applications
|
||||
Exec=_SDKBINDIR_/jconsole
|
||||
Icon=java-@JAVA_VER@-@JAVA_VENDOR@
|
||||
--- icedtea-3.0.1/policytool.desktop.in 2016-04-24 08:37:02.001303877 +0200
|
||||
+++ icedtea-3.0.1/policytool.desktop.in 2016-04-27 09:45:32.061111551 +0200
|
||||
@@ -1,10 +1,11 @@
|
||||
[Desktop Entry]
|
||||
Name=OpenJDK @JAVA_VER@ for @target_cpu@ Policy Tool (@OPENJDK_VER@)
|
||||
+GenericName=OpenJDK @JAVA_VER@ Policy Tool
|
||||
Comment=Manage OpenJDK policy files
|
||||
Exec=_JREBINDIR_/policytool
|
||||
Icon=java-@JAVA_VER@-@JAVA_VENDOR@
|
||||
Terminal=false
|
||||
Type=Application
|
||||
StartupWMClass=sun-security-tools-PolicyTool
|
||||
-Categories=Settings;Java;
|
||||
+Categories=System;DesktopSettings;Security;
|
||||
Version=1.0
|
9672
java-1_8_0-openjdk.changes
Normal file
9672
java-1_8_0-openjdk.changes
Normal file
File diff suppressed because it is too large
Load Diff
1147
java-1_8_0-openjdk.spec
Normal file
1147
java-1_8_0-openjdk.spec
Normal file
File diff suppressed because it is too large
Load Diff
24
java-atk-wrapper-security.patch
Normal file
24
java-atk-wrapper-security.patch
Normal file
@ -0,0 +1,24 @@
|
||||
--- openjdk/jdk/src/share/lib/security/java.security-linux 2014-07-15 23:08:27.000000000 +0200
|
||||
+++ openjdk/jdk/src/share/lib/security/java.security-linux 2014-07-18 09:04:45.127566697 +0200
|
||||
@@ -227,7 +227,9 @@
|
||||
com.sun.activation.registries.,\
|
||||
jdk.jfr.events.,\
|
||||
jdk.jfr.internal.,\
|
||||
- jdk.management.jfr.internal.
|
||||
+ jdk.management.jfr.internal.,\
|
||||
+ org.GNOME.Accessibility.,\
|
||||
+ org.GNOME.Bonobo.
|
||||
|
||||
#
|
||||
# List of comma-separated packages that start with or equal this string
|
||||
@@ -280,7 +282,9 @@
|
||||
com.sun.activation.registries.,\
|
||||
jdk.jfr.events.,\
|
||||
jdk.jfr.internal.,\
|
||||
- jdk.management.jfr.internal.
|
||||
+ jdk.management.jfr.internal.,\
|
||||
+ org.GNOME.Accessibility.,\
|
||||
+ org.GNOME.Bonobo.
|
||||
|
||||
#
|
||||
# Determines whether this properties file can be appended to
|
13
make-jobserver-detection.patch
Normal file
13
make-jobserver-detection.patch
Normal file
@ -0,0 +1,13 @@
|
||||
Index: openjdk/make/MakeHelpers.gmk
|
||||
===================================================================
|
||||
--- openjdk/make/MakeHelpers.gmk.orig
|
||||
+++ openjdk/make/MakeHelpers.gmk
|
||||
@@ -145,7 +145,7 @@ endef
|
||||
|
||||
# Hook to be called as the very first thing when running a normal build
|
||||
define AtMakeStart
|
||||
- $(if $(findstring --jobserver,$(MAKEFLAGS)),$(error make -j is not supported, use make JOBS=n))
|
||||
+ $(if $(findstring jobserver,$(.FEATURES)),,$(error make -j is not supported, use make JOBS=n))
|
||||
$(call CheckEnvironment)
|
||||
@$(PRINTF) $(LOG_INFO) "Running make as '$(MAKE) $(MFLAGS) $(MAKE_ARGS)'\n"
|
||||
@$(PRINTF) "Building $(PRODUCT_NAME) for target '$(call GetRealTarget)' in configuration '$(CONF_NAME)'\n\n"
|
6
nss.fips.cfg.in
Normal file
6
nss.fips.cfg.in
Normal file
@ -0,0 +1,6 @@
|
||||
name = NSS-FIPS
|
||||
nssLibraryDirectory = @NSS_LIBDIR@
|
||||
nssSecmodDirectory = @NSS_SECMOD@
|
||||
nssDbMode = readOnly
|
||||
nssModule = fips
|
||||
|
BIN
openjdk-git.tar.xz
(Stored with Git LFS)
Normal file
BIN
openjdk-git.tar.xz
(Stored with Git LFS)
Normal file
Binary file not shown.
22
ppc-zero-hotspot.patch
Normal file
22
ppc-zero-hotspot.patch
Normal file
@ -0,0 +1,22 @@
|
||||
diff -up openjdk/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp.ppc64 openjdk/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp
|
||||
--- openjdk/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp.ppc64 2013-02-22 19:02:06.000000000 +0100
|
||||
+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp 2013-04-18 16:21:24.897403406 +0200
|
||||
@@ -32,11 +32,15 @@
|
||||
//
|
||||
|
||||
define_pd_global(bool, DontYieldALot, false);
|
||||
-define_pd_global(intx, ThreadStackSize, 1536);
|
||||
+define_pd_global(intx, ThreadStackSize, 1664);
|
||||
#ifdef _LP64
|
||||
-define_pd_global(intx, VMThreadStackSize, 1024);
|
||||
+#if defined (_LITTLE_ENDIAN) && defined (__powerpc64__)
|
||||
+define_pd_global(intx, VMThreadStackSize, 1920);
|
||||
#else
|
||||
-define_pd_global(intx, VMThreadStackSize, 512);
|
||||
+define_pd_global(intx, VMThreadStackSize, 1280);
|
||||
+#endif
|
||||
+#else
|
||||
+define_pd_global(intx, VMThreadStackSize, 640);
|
||||
#endif // _LP64
|
||||
define_pd_global(intx, CompilerThreadStackSize, 0);
|
||||
define_pd_global(uintx, JVMInvokeMethodSlack, 8192);
|
86
riscv64-zero.patch
Normal file
86
riscv64-zero.patch
Normal file
@ -0,0 +1,86 @@
|
||||
Index: openjdk/common/autoconf/build-aux/autoconf-config.sub
|
||||
===================================================================
|
||||
--- openjdk/common/autoconf/build-aux/autoconf-config.sub.orig
|
||||
+++ openjdk/common/autoconf/build-aux/autoconf-config.sub
|
||||
@@ -302,6 +302,7 @@ case $basic_machine in
|
||||
| pdp10 | pdp11 | pj | pjl \
|
||||
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
|
||||
| pyramid \
|
||||
+ | riscv32 | riscv64 \
|
||||
| score \
|
||||
| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
|
||||
| sh64 | sh64le \
|
||||
@@ -383,6 +384,7 @@ case $basic_machine in
|
||||
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
|
||||
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
|
||||
| pyramid-* \
|
||||
+ | riscv32-* | riscv64-* \
|
||||
| romp-* | rs6000-* \
|
||||
| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
|
||||
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
|
||||
Index: openjdk/common/autoconf/platform.m4
|
||||
===================================================================
|
||||
--- openjdk/common/autoconf/platform.m4.orig
|
||||
+++ openjdk/common/autoconf/platform.m4
|
||||
@@ -96,6 +96,12 @@ AC_DEFUN([PLATFORM_EXTRACT_VARS_FROM_CPU
|
||||
VAR_CPU_BITS=64
|
||||
VAR_CPU_ENDIAN=big
|
||||
;;
|
||||
+ riscv64)
|
||||
+ VAR_CPU=riscv64
|
||||
+ VAR_CPU_ARCH=riscv
|
||||
+ VAR_CPU_BITS=64
|
||||
+ VAR_CPU_ENDIAN=little
|
||||
+ ;;
|
||||
*)
|
||||
AC_MSG_ERROR([unsupported cpu $1])
|
||||
;;
|
||||
@@ -391,6 +397,7 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS],
|
||||
sparc*) ZERO_ARCHDEF=SPARC ;;
|
||||
x86_64*) ZERO_ARCHDEF=AMD64 ;;
|
||||
x86) ZERO_ARCHDEF=IA32 ;;
|
||||
+ riscv*) ZERO_ARCHDEF=RISCV ;;
|
||||
*) ZERO_ARCHDEF=$(echo "${OPENJDK_TARGET_CPU_LEGACY_LIB}" | tr a-z A-Z)
|
||||
esac
|
||||
AC_SUBST(ZERO_ARCHDEF)
|
||||
Index: openjdk/hotspot/src/os/linux/vm/os_linux.cpp
|
||||
===================================================================
|
||||
--- openjdk/hotspot/src/os/linux/vm/os_linux.cpp.orig
|
||||
+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp
|
||||
@@ -369,7 +369,7 @@ void os::init_system_properties_values()
|
||||
// 1: ...
|
||||
// ...
|
||||
// 7: The default directories, normally /lib and /usr/lib.
|
||||
-#if defined(AMD64) || defined(_LP64) && (defined(SPARC) || defined(PPC) || defined(S390))
|
||||
+#if defined(AMD64) || defined(_LP64) && (defined(SPARC) || defined(PPC) || defined(S390) || defined(RISCV))
|
||||
#define DEFAULT_LIBPATH "/usr/lib64:/lib64:/lib:/usr/lib"
|
||||
#else
|
||||
#define DEFAULT_LIBPATH "/lib:/usr/lib"
|
||||
@@ -1960,6 +1960,10 @@ void * os::dll_load(const char *filename
|
||||
#define EM_AARCH64 183
|
||||
#endif
|
||||
|
||||
+ #ifndef EM_RISCV
|
||||
+ #define EM_RISCV 243
|
||||
+ #endif
|
||||
+
|
||||
static const arch_t arch_array[]={
|
||||
{EM_386, EM_386, ELFCLASS32, ELFDATA2LSB, (char*)"IA 32"},
|
||||
{EM_486, EM_386, ELFCLASS32, ELFDATA2LSB, (char*)"IA 32"},
|
||||
@@ -1982,6 +1986,7 @@ void * os::dll_load(const char *filename
|
||||
{EM_PARISC, EM_PARISC, ELFCLASS32, ELFDATA2MSB, (char*)"PARISC"},
|
||||
{EM_68K, EM_68K, ELFCLASS32, ELFDATA2MSB, (char*)"M68k"},
|
||||
{EM_AARCH64, EM_AARCH64, ELFCLASS64, ELFDATA2LSB, (char*)"AARCH64"},
|
||||
+ {EM_RISCV, EM_RISCV, ELFCLASS64, ELFDATA2LSB, (char*)"RISCV"},
|
||||
};
|
||||
|
||||
#if (defined IA32)
|
||||
@@ -2014,6 +2019,8 @@ void * os::dll_load(const char *filename
|
||||
static Elf32_Half running_arch_code=EM_68K;
|
||||
#elif (defined AARCH64)
|
||||
static Elf32_Half running_arch_code=EM_AARCH64;
|
||||
+#elif (defined RISCV)
|
||||
+ static Elf32_Half running_arch_code=EM_RISCV;
|
||||
#else
|
||||
#error Method os::dll_load requires that one of following is defined:\
|
||||
IA32, AMD64, IA64, __sparc, __powerpc__, ARM, S390, ALPHA, MIPS, MIPSEL, PARISC, M68K, AARCH64
|
BIN
shenandoah-git.tar.xz
(Stored with Git LFS)
Normal file
BIN
shenandoah-git.tar.xz
(Stored with Git LFS)
Normal file
Binary file not shown.
20
tls13extensions.patch
Normal file
20
tls13extensions.patch
Normal file
@ -0,0 +1,20 @@
|
||||
--- openjdk/jdk/src/share/classes/sun/security/ssl/SSLExtension.java 2021-05-21 08:10:00.830159018 +0200
|
||||
+++ openjdk/jdk/src/share/classes/sun/security/ssl/SSLExtension.java 2021-05-21 08:11:40.258772361 +0200
|
||||
@@ -198,7 +198,7 @@
|
||||
|
||||
CH_SIGNATURE_ALGORITHMS_CERT (0x0032, "signature_algorithms_cert",
|
||||
SSLHandshake.CLIENT_HELLO,
|
||||
- ProtocolVersion.PROTOCOLS_12_13,
|
||||
+ ProtocolVersion.PROTOCOLS_OF_13,
|
||||
CertSignAlgsExtension.chNetworkProducer,
|
||||
CertSignAlgsExtension.chOnLoadConsumer,
|
||||
null,
|
||||
@@ -319,7 +319,7 @@
|
||||
|
||||
CH_SUPPORTED_VERSIONS (0x002B, "supported_versions",
|
||||
SSLHandshake.CLIENT_HELLO,
|
||||
- ProtocolVersion.PROTOCOLS_TO_13,
|
||||
+ ProtocolVersion.PROTOCOLS_OF_13,
|
||||
SupportedVersionsExtension.chNetworkProducer,
|
||||
SupportedVersionsExtension.chOnLoadConsumer,
|
||||
null,
|
10
zero-javadoc-verbose.patch
Normal file
10
zero-javadoc-verbose.patch
Normal file
@ -0,0 +1,10 @@
|
||||
--- openjdk/make/Javadoc.gmk
|
||||
+++ openjdk/make/Javadoc.gmk
|
||||
@@ -260,7 +260,6 @@ $(call CopyrightLine,$(COPYRIGHT_URL),$(
|
||||
# Common javadoc options used by all
|
||||
COMMON_JAVADOCFLAGS = \
|
||||
-XDignore.symbol.file=true \
|
||||
- -quiet \
|
||||
-use \
|
||||
-keywords \
|
||||
-Xdoclint:none \
|
Loading…
Reference in New Issue
Block a user