Package early access release, JDK 11 b16.
No longer explicitly invoke autogen.sh
This commit is contained in:
parent
9d3d932930
commit
759059a6c7
|
@ -2,3 +2,4 @@
|
||||||
/systemtap-tapset-3.6.0pre02.tar.xz
|
/systemtap-tapset-3.6.0pre02.tar.xz
|
||||||
/jdk-jdk10-jdk-10+46.tar.xz
|
/jdk-jdk10-jdk-10+46.tar.xz
|
||||||
/jdk-updates-jdk10u-jdk-10.0.1+10.tar.xz
|
/jdk-updates-jdk10u-jdk-10.0.1+10.tar.xz
|
||||||
|
/jdk-jdk-jdk-11+16.tar.xz
|
||||||
|
|
|
@ -1,72 +0,0 @@
|
||||||
# HG changeset patch
|
|
||||||
# User sherman
|
|
||||||
# Date 1525080541 -7200
|
|
||||||
# Mon Apr 30 11:29:01 2018 +0200
|
|
||||||
# Node ID c3e284205e149a6d786ff5aa7dca9338cf70ba60
|
|
||||||
# Parent e541eaa797070bafe8c3dc41f4beec8395c78276
|
|
||||||
8193802: NullPointerException from JarFileSystem.getVersionMap()
|
|
||||||
Reviewed-by: mchung
|
|
||||||
|
|
||||||
diff --git a/src/jdk.zipfs/share/classes/jdk/nio/zipfs/JarFileSystem.java b/src/jdk.zipfs/share/classes/jdk/nio/zipfs/JarFileSystem.java
|
|
||||||
--- a/src/jdk.zipfs/share/classes/jdk/nio/zipfs/JarFileSystem.java
|
|
||||||
+++ b/src/jdk.zipfs/share/classes/jdk/nio/zipfs/JarFileSystem.java
|
|
||||||
@@ -1,5 +1,5 @@
|
|
||||||
/*
|
|
||||||
- * Copyright (c) 2015, 2017, 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
|
|
||||||
@@ -109,7 +109,9 @@
|
|
||||||
*/
|
|
||||||
private Function<byte[],byte[]> createVersionedLinks(int version) {
|
|
||||||
HashMap<IndexNode,byte[]> aliasMap = new HashMap<>();
|
|
||||||
- getVersionMap(version, getInode(getBytes("/META-INF/versions"))).values()
|
|
||||||
+ IndexNode verdir = getInode(getBytes("/META-INF/versions"));
|
|
||||||
+ if (verdir != null) {
|
|
||||||
+ getVersionMap(version, verdir).values()
|
|
||||||
.forEach(versionNode -> { // for each META-INF/versions/{n} directory
|
|
||||||
// put all the leaf inodes, i.e. entries, into the alias map
|
|
||||||
// possibly shadowing lower versioned entries
|
|
||||||
@@ -124,6 +126,7 @@
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
|
||||||
+ }
|
|
||||||
return path -> aliasMap.get(IndexNode.keyOf(path));
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/test/jdk/jdk/nio/zipfs/MultiReleaseJarTest.java b/test/jdk/jdk/nio/zipfs/MultiReleaseJarTest.java
|
|
||||||
--- a/test/jdk/jdk/nio/zipfs/MultiReleaseJarTest.java
|
|
||||||
+++ b/test/jdk/jdk/nio/zipfs/MultiReleaseJarTest.java
|
|
||||||
@@ -23,7 +23,7 @@
|
|
||||||
|
|
||||||
/*
|
|
||||||
* @test
|
|
||||||
- * @bug 8144355 8144062 8176709
|
|
||||||
+ * @bug 8144355 8144062 8176709 8193802
|
|
||||||
* @summary Test aliasing additions to ZipFileSystem for multi-release jar files
|
|
||||||
* @library /lib/testlibrary/java/util/jar
|
|
||||||
* @build Compiler JarBuilder CreateMultiReleaseTestJars
|
|
||||||
@@ -205,6 +205,21 @@
|
|
||||||
//testCustomMultiReleaseValue("true\r\n true", false);
|
|
||||||
}
|
|
||||||
|
|
||||||
+ @Test
|
|
||||||
+ public void testMultiReleaseJarWithNonVersionDir() throws Exception {
|
|
||||||
+ String jfname = "multi-release-non-ver.jar";
|
|
||||||
+ Path jfpath = Paths.get(jfname);
|
|
||||||
+ URI uri = new URI("jar", jfpath.toUri().toString() , null);
|
|
||||||
+ JarBuilder jb = new JarBuilder(jfname);
|
|
||||||
+ jb.addAttribute("Multi-Release", "true");
|
|
||||||
+ jb.build();
|
|
||||||
+ Map<String,String> env = Map.of("multi-release", "runtime");
|
|
||||||
+ try (FileSystem fs = FileSystems.newFileSystem(uri, env)) {
|
|
||||||
+ Assert.assertTrue(true);
|
|
||||||
+ }
|
|
||||||
+ Files.delete(jfpath);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
private static final AtomicInteger JAR_COUNT = new AtomicInteger(0);
|
|
||||||
|
|
||||||
private void testCustomMultiReleaseValue(String value, boolean expected)
|
|
|
@ -1,14 +0,0 @@
|
||||||
diff -r 214a94e9366c src/cpu/aarch64/vm/nativeInst_aarch64.cpp
|
|
||||||
--- openjdk/src/hotspot/cpu/aarch64/nativeInst_aarch64.cpp Mon Jul 17 12:11:32 2017 +0000
|
|
||||||
+++ openjdk/src/hotspot/cpu/aarch64/nativeInst_aarch64.cpp Mon Jul 24 16:23:14 2017 +0100
|
|
||||||
@@ -343,7 +343,7 @@
|
|
||||||
CodeBuffer cb(code_pos, instruction_size);
|
|
||||||
MacroAssembler a(&cb);
|
|
||||||
|
|
||||||
- a.mov(rscratch1, entry);
|
|
||||||
+ a.movptr(rscratch1, (uintptr_t)entry);
|
|
||||||
a.br(rscratch1);
|
|
||||||
|
|
||||||
ICache::invalidate_range(code_pos, instruction_size);
|
|
||||||
|
|
||||||
|
|
|
@ -1,18 +0,0 @@
|
||||||
diff --git a/src/hotspot/os_cpu/linux_zero/os_linux_zero.hpp b/src/hotspot/os_cpu/linux_zero/os_linux_zero.hpp
|
|
||||||
--- a/src/hotspot/os_cpu/linux_zero/os_linux_zero.hpp
|
|
||||||
+++ b/src/hotspot/os_cpu/linux_zero/os_linux_zero.hpp
|
|
||||||
@@ -50,10 +50,10 @@
|
|
||||||
: "Q"(*(volatile long*)src));
|
|
||||||
#elif defined(S390) && !defined(_LP64)
|
|
||||||
double tmp;
|
|
||||||
- asm volatile ("ld %0, 0(%1)\n"
|
|
||||||
- "std %0, 0(%2)\n"
|
|
||||||
- : "=r"(tmp)
|
|
||||||
- : "a"(src), "a"(dst));
|
|
||||||
+ asm volatile ("ld %0, %2\n"
|
|
||||||
+ "std %0, %1\n"
|
|
||||||
+ : "=&f"(tmp), "=Q"(*(volatile double*)dst)
|
|
||||||
+ : "Q"(*(volatile double*)src));
|
|
||||||
#else
|
|
||||||
*(jlong *) dst = *(const jlong *) src;
|
|
||||||
#endif
|
|
|
@ -1,27 +0,0 @@
|
||||||
# HG changeset patch
|
|
||||||
# User sgehwolf
|
|
||||||
# Date 1524152606 -7200
|
|
||||||
# Thu Apr 19 17:43:26 2018 +0200
|
|
||||||
# Node ID f7a3ca673e9cc831848fc890a2df3ae9acb447e4
|
|
||||||
# Parent dd26184768b0a1c4103a2e9eaa8b4d852a9eca1b
|
|
||||||
8201788: Number of make jobs wrong for bootcycle-images target
|
|
||||||
Reviewed-by: erikj, ihse
|
|
||||||
|
|
||||||
diff --git a/make/Init.gmk b/make/Init.gmk
|
|
||||||
--- a/make/Init.gmk
|
|
||||||
+++ b/make/Init.gmk
|
|
||||||
@@ -310,9 +310,13 @@
|
|
||||||
ifneq ($(PARALLEL_TARGETS), )
|
|
||||||
$(call StartGlobalTimer)
|
|
||||||
$(call PrepareSmartJavac)
|
|
||||||
+ # JOBS will only be empty for a bootcycle-images recursive call
|
|
||||||
+ # or if specified via a make argument directly. In those cases
|
|
||||||
+ # treat it as NOT using jobs at all.
|
|
||||||
( cd $(TOPDIR) && \
|
|
||||||
$(NICE) $(MAKE) $(MAKE_ARGS) $(OUTPUT_SYNC_FLAG) \
|
|
||||||
- -j $(JOBS) -f make/Main.gmk $(USER_MAKE_VARS) \
|
|
||||||
+ $(if $(JOBS), -j $(JOBS)) \
|
|
||||||
+ -f make/Main.gmk $(USER_MAKE_VARS) \
|
|
||||||
$(PARALLEL_TARGETS) $(COMPARE_BUILD_MAKE) $(BUILD_LOG_PIPE) || \
|
|
||||||
( exitcode=$$? && \
|
|
||||||
$(PRINTF) "\nERROR: Build failed for $(TARGET_DESCRIPTION) (exit code $$exitcode) \n" \
|
|
|
@ -1,21 +0,0 @@
|
||||||
# HG changeset patch
|
|
||||||
# User sgehwolf
|
|
||||||
# Date 1524663215 -7200
|
|
||||||
# Wed Apr 25 15:33:35 2018 +0200
|
|
||||||
# Node ID c000e94e3d789bcb30d18541a3be33856bb3fe17
|
|
||||||
# Parent a29fc1f5b37d344c771f83f528dcd223ad240e6c
|
|
||||||
8202262: libjsig.so not linked with extra linker flags from configure
|
|
||||||
Reviewed-by: duke
|
|
||||||
|
|
||||||
diff --git a/make/hotspot/lib/CompileLibjsig.gmk b/make/hotspot/lib/CompileLibjsig.gmk
|
|
||||||
--- a/make/hotspot/lib/CompileLibjsig.gmk
|
|
||||||
+++ b/make/hotspot/lib/CompileLibjsig.gmk
|
|
||||||
@@ -36,7 +36,7 @@
|
|
||||||
ifeq ($(STATIC_BUILD), false)
|
|
||||||
ifeq ($(OPENJDK_TARGET_OS), linux)
|
|
||||||
LIBJSIG_CFLAGS := -fPIC -D_GNU_SOURCE -D_REENTRANT $(EXTRA_CFLAGS)
|
|
||||||
- LIBJSIG_LDFLAGS := $(LDFLAGS_HASH_STYLE) ${LDFLAGS_NO_EXEC_STACK} $(EXTRA_CFLAGS)
|
|
||||||
+ LIBJSIG_LDFLAGS := $(LDFLAGS_HASH_STYLE) ${LDFLAGS_NO_EXEC_STACK} $(EXTRA_LDFLAGS)
|
|
||||||
LIBJSIG_LIBS := $(LIBDL)
|
|
||||||
|
|
||||||
# NOTE: The old build compiled this library without -soname.
|
|
|
@ -0,0 +1,186 @@
|
||||||
|
# HG changeset patch
|
||||||
|
# User chrisphi
|
||||||
|
# Date 1528295658 14400
|
||||||
|
# Wed Jun 06 10:34:18 2018 -0400
|
||||||
|
# Branch JDK-8203030
|
||||||
|
# Node ID 191d4ac3ee244c4f21f2e87e44d34172ae8b37b4
|
||||||
|
# Parent b06f330492cd627a332c4933a0f3ad5df0351d50
|
||||||
|
8203030: Zero s390 31 bit size_t type conflicts in shared code
|
||||||
|
Summary: Cast to size_t or change to size_t foe compatibility with other archs.
|
||||||
|
Reviewed-by: Duke
|
||||||
|
Contributed-by: chrisphi
|
||||||
|
|
||||||
|
diff --git a/src/hotspot/share/code/codeCache.cpp b/src/hotspot/share/code/codeCache.cpp
|
||||||
|
--- a/src/hotspot/share/code/codeCache.cpp
|
||||||
|
+++ b/src/hotspot/share/code/codeCache.cpp
|
||||||
|
@@ -409,7 +409,7 @@
|
||||||
|
add_heap(heap);
|
||||||
|
|
||||||
|
// Reserve Space
|
||||||
|
- size_t size_initial = MIN2(InitialCodeCacheSize, rs.size());
|
||||||
|
+ size_t size_initial = MIN2((size_t)InitialCodeCacheSize, rs.size());
|
||||||
|
size_initial = align_up(size_initial, os::vm_page_size());
|
||||||
|
if (!heap->reserve(rs, size_initial, CodeCacheSegmentSize)) {
|
||||||
|
vm_exit_during_initialization(err_msg("Could not reserve enough space in %s (" SIZE_FORMAT "K)",
|
||||||
|
diff --git a/src/hotspot/share/gc/cms/cms_globals.hpp b/src/hotspot/share/gc/cms/cms_globals.hpp
|
||||||
|
--- a/src/hotspot/share/gc/cms/cms_globals.hpp
|
||||||
|
+++ b/src/hotspot/share/gc/cms/cms_globals.hpp
|
||||||
|
@@ -410,7 +410,7 @@
|
||||||
|
"An `interval' counter that determines how frequently " \
|
||||||
|
"we simulate overflow; a smaller number increases frequency") \
|
||||||
|
\
|
||||||
|
- product(uintx, ParGCDesiredObjsFromOverflowList, 20, \
|
||||||
|
+ product(size_t, ParGCDesiredObjsFromOverflowList, 20, \
|
||||||
|
"The desired number of objects to claim from the overflow list") \
|
||||||
|
range(0, max_uintx) \
|
||||||
|
\
|
||||||
|
diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
|
||||||
|
--- a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
|
||||||
|
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
|
||||||
|
@@ -2344,7 +2344,7 @@
|
||||||
|
// of things to do) or totally (at the very end).
|
||||||
|
size_t target_size;
|
||||||
|
if (partially) {
|
||||||
|
- target_size = MIN2((size_t)_task_queue->max_elems()/3, GCDrainStackTargetSize);
|
||||||
|
+ target_size = MIN2((size_t)_task_queue->max_elems()/3, (size_t)GCDrainStackTargetSize);
|
||||||
|
} else {
|
||||||
|
target_size = 0;
|
||||||
|
}
|
||||||
|
diff --git a/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.hpp b/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.hpp
|
||||||
|
--- a/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.hpp
|
||||||
|
+++ b/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.hpp
|
||||||
|
@@ -91,7 +91,7 @@
|
||||||
|
void pretouch_internal(size_t start_page, size_t end_page);
|
||||||
|
|
||||||
|
// Returns the index of the page which contains the given address.
|
||||||
|
- uintptr_t addr_to_page_index(char* addr) const;
|
||||||
|
+ size_t addr_to_page_index(char* addr) const;
|
||||||
|
// Returns the address of the given page index.
|
||||||
|
char* page_start(size_t index) const;
|
||||||
|
|
||||||
|
diff --git a/src/hotspot/share/gc/g1/g1StringDedupTable.hpp b/src/hotspot/share/gc/g1/g1StringDedupTable.hpp
|
||||||
|
--- a/src/hotspot/share/gc/g1/g1StringDedupTable.hpp
|
||||||
|
+++ b/src/hotspot/share/gc/g1/g1StringDedupTable.hpp
|
||||||
|
@@ -1,5 +1,5 @@
|
||||||
|
/*
|
||||||
|
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
|
||||||
|
+ * Copyright (c) 2014, 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
|
||||||
|
@@ -122,7 +122,7 @@
|
||||||
|
|
||||||
|
G1StringDedupEntry** _buckets;
|
||||||
|
size_t _size;
|
||||||
|
- uintx _entries;
|
||||||
|
+ size_t _entries;
|
||||||
|
uintx _shrink_threshold;
|
||||||
|
uintx _grow_threshold;
|
||||||
|
bool _rehash_needed;
|
||||||
|
diff --git a/src/hotspot/share/gc/parallel/parallel_globals.hpp b/src/hotspot/share/gc/parallel/parallel_globals.hpp
|
||||||
|
--- a/src/hotspot/share/gc/parallel/parallel_globals.hpp
|
||||||
|
+++ b/src/hotspot/share/gc/parallel/parallel_globals.hpp
|
||||||
|
@@ -57,7 +57,7 @@
|
||||||
|
"limiter (a number between 0-100)") \
|
||||||
|
range(0, 100) \
|
||||||
|
\
|
||||||
|
- product(uintx, ParallelOldDeadWoodLimiterStdDev, 80, \
|
||||||
|
+ product(size_t, ParallelOldDeadWoodLimiterStdDev, 80, \
|
||||||
|
"The standard deviation used by the parallel compact dead wood " \
|
||||||
|
"limiter (a number between 0-100)") \
|
||||||
|
range(0, 100) \
|
||||||
|
diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.cpp b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
|
||||||
|
--- a/src/hotspot/share/gc/parallel/psParallelCompact.cpp
|
||||||
|
+++ b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
|
||||||
|
@@ -907,8 +907,8 @@
|
||||||
|
void PSParallelCompact::initialize_dead_wood_limiter()
|
||||||
|
{
|
||||||
|
const size_t max = 100;
|
||||||
|
- _dwl_mean = double(MIN2(ParallelOldDeadWoodLimiterMean, max)) / 100.0;
|
||||||
|
- _dwl_std_dev = double(MIN2(ParallelOldDeadWoodLimiterStdDev, max)) / 100.0;
|
||||||
|
+ _dwl_mean = double(MIN2((size_t)ParallelOldDeadWoodLimiterMean, max)) / 100.0;
|
||||||
|
+ _dwl_std_dev = double(MIN2((size_t)ParallelOldDeadWoodLimiterStdDev, max)) / 100.0;
|
||||||
|
_dwl_first_term = 1.0 / (sqrt(2.0 * M_PI) * _dwl_std_dev);
|
||||||
|
DEBUG_ONLY(_dwl_initialized = true;)
|
||||||
|
_dwl_adjustment = normal_distribution(1.0);
|
||||||
|
diff --git a/src/hotspot/share/gc/shared/gc_globals.hpp b/src/hotspot/share/gc/shared/gc_globals.hpp
|
||||||
|
--- a/src/hotspot/share/gc/shared/gc_globals.hpp
|
||||||
|
+++ b/src/hotspot/share/gc/shared/gc_globals.hpp
|
||||||
|
@@ -311,7 +311,7 @@
|
||||||
|
experimental(uintx, WorkStealingSpinToYieldRatio, 10, \
|
||||||
|
"Ratio of hard spins to calls to yield") \
|
||||||
|
\
|
||||||
|
- develop(uintx, ObjArrayMarkingStride, 2048, \
|
||||||
|
+ develop(size_t, ObjArrayMarkingStride, 2048, \
|
||||||
|
"Number of object array elements to push onto the marking stack " \
|
||||||
|
"before pushing a continuation entry") \
|
||||||
|
\
|
||||||
|
diff --git a/src/hotspot/share/gc/shared/plab.cpp b/src/hotspot/share/gc/shared/plab.cpp
|
||||||
|
--- a/src/hotspot/share/gc/shared/plab.cpp
|
||||||
|
+++ b/src/hotspot/share/gc/shared/plab.cpp
|
||||||
|
@@ -1,5 +1,5 @@
|
||||||
|
/*
|
||||||
|
- * Copyright (c) 2001, 2017, Oracle and/or its affiliates. All rights reserved.
|
||||||
|
+ * Copyright (c) 2001, 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
|
||||||
|
@@ -32,7 +32,7 @@
|
||||||
|
|
||||||
|
size_t PLAB::min_size() {
|
||||||
|
// Make sure that we return something that is larger than AlignmentReserve
|
||||||
|
- return align_object_size(MAX2(MinTLABSize / HeapWordSize, (uintx)oopDesc::header_size())) + AlignmentReserve;
|
||||||
|
+ return align_object_size(MAX2(MinTLABSize / HeapWordSize, (size_t)oopDesc::header_size())) + AlignmentReserve;
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t PLAB::max_size() {
|
||||||
|
diff --git a/src/hotspot/share/prims/whitebox.cpp b/src/hotspot/share/prims/whitebox.cpp
|
||||||
|
--- a/src/hotspot/share/prims/whitebox.cpp
|
||||||
|
+++ b/src/hotspot/share/prims/whitebox.cpp
|
||||||
|
@@ -1111,7 +1111,7 @@
|
||||||
|
WB_END
|
||||||
|
|
||||||
|
WB_ENTRY(jobject, WB_GetSizeTVMFlag(JNIEnv* env, jobject o, jstring name))
|
||||||
|
- uintx result;
|
||||||
|
+ size_t result;
|
||||||
|
if (GetVMFlag <size_t> (thread, env, name, &result, &JVMFlag::size_tAt)) {
|
||||||
|
ThreadToNativeFromVM ttnfv(thread); // can't be in VM when we call JNI
|
||||||
|
return longBox(thread, env, result);
|
||||||
|
diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
|
||||||
|
--- a/src/hotspot/share/runtime/arguments.cpp
|
||||||
|
+++ b/src/hotspot/share/runtime/arguments.cpp
|
||||||
|
@@ -1635,7 +1635,7 @@
|
||||||
|
// Increase the code cache size - tiered compiles a lot more.
|
||||||
|
if (FLAG_IS_DEFAULT(ReservedCodeCacheSize)) {
|
||||||
|
FLAG_SET_ERGO(uintx, ReservedCodeCacheSize,
|
||||||
|
- MIN2(CODE_CACHE_DEFAULT_LIMIT, ReservedCodeCacheSize * 5));
|
||||||
|
+ MIN2(CODE_CACHE_DEFAULT_LIMIT, (size_t)ReservedCodeCacheSize * 5));
|
||||||
|
}
|
||||||
|
// Enable SegmentedCodeCache if TieredCompilation is enabled and ReservedCodeCacheSize >= 240M
|
||||||
|
if (FLAG_IS_DEFAULT(SegmentedCodeCache) && ReservedCodeCacheSize >= 240*M) {
|
||||||
|
diff --git a/src/hotspot/share/runtime/arguments.hpp b/src/hotspot/share/runtime/arguments.hpp
|
||||||
|
--- a/src/hotspot/share/runtime/arguments.hpp
|
||||||
|
+++ b/src/hotspot/share/runtime/arguments.hpp
|
||||||
|
@@ -332,7 +332,7 @@
|
||||||
|
// Value of the conservative maximum heap alignment needed
|
||||||
|
static size_t _conservative_max_heap_alignment;
|
||||||
|
|
||||||
|
- static uintx _min_heap_size;
|
||||||
|
+ static size_t _min_heap_size;
|
||||||
|
|
||||||
|
// -Xrun arguments
|
||||||
|
static AgentLibraryList _libraryList;
|
||||||
|
diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
|
||||||
|
--- a/src/hotspot/share/runtime/globals.hpp
|
||||||
|
+++ b/src/hotspot/share/runtime/globals.hpp
|
||||||
|
@@ -85,8 +85,8 @@
|
||||||
|
define_pd_global(size_t, NewSizeThreadIncrease, 4*K);
|
||||||
|
define_pd_global(bool, InlineClassNatives, true);
|
||||||
|
define_pd_global(bool, InlineUnsafeOps, true);
|
||||||
|
-define_pd_global(uintx, InitialCodeCacheSize, 160*K);
|
||||||
|
-define_pd_global(uintx, ReservedCodeCacheSize, 32*M);
|
||||||
|
+define_pd_global(size_t, InitialCodeCacheSize, 160*K);
|
||||||
|
+define_pd_global(size_t, ReservedCodeCacheSize, 32*M);
|
||||||
|
define_pd_global(uintx, NonProfiledCodeHeapSize, 0);
|
||||||
|
define_pd_global(uintx, ProfiledCodeHeapSize, 0);
|
||||||
|
define_pd_global(uintx, NonNMethodCodeHeapSize, 32*M);
|
|
@ -1,7 +1,7 @@
|
||||||
diff --git openjdk/make/autoconf/jdk-options.m4 openjdk/make/autoconf/jdk-options.m4
|
diff --git a/make/autoconf/jdk-options.m4 b/make/autoconf/jdk-options.m4
|
||||||
--- openjdk/make/autoconf/jdk-options.m4
|
--- a/make/autoconf/jdk-options.m4
|
||||||
+++ openjdk/make/autoconf/jdk-options.m4
|
+++ b/make/autoconf/jdk-options.m4
|
||||||
@@ -264,9 +264,10 @@
|
@@ -267,9 +267,10 @@
|
||||||
#
|
#
|
||||||
AC_DEFUN_ONCE([JDKOPT_DETECT_INTREE_EC],
|
AC_DEFUN_ONCE([JDKOPT_DETECT_INTREE_EC],
|
||||||
[
|
[
|
||||||
|
@ -13,10 +13,10 @@ diff --git openjdk/make/autoconf/jdk-options.m4 openjdk/make/autoconf/jdk-option
|
||||||
ENABLE_INTREE_EC=true
|
ENABLE_INTREE_EC=true
|
||||||
AC_MSG_RESULT([yes])
|
AC_MSG_RESULT([yes])
|
||||||
else
|
else
|
||||||
diff --git openjdk/make/autoconf/libraries.m4 openjdk/make/autoconf/libraries.m4
|
diff --git a/make/autoconf/libraries.m4 b/make/autoconf/libraries.m4
|
||||||
--- openjdk/make/autoconf/libraries.m4
|
--- a/make/autoconf/libraries.m4
|
||||||
+++ openjdk/make/autoconf/libraries.m4
|
+++ b/make/autoconf/libraries.m4
|
||||||
@@ -175,6 +175,48 @@
|
@@ -178,6 +178,48 @@
|
||||||
AC_SUBST(LIBDL)
|
AC_SUBST(LIBDL)
|
||||||
LIBS="$save_LIBS"
|
LIBS="$save_LIBS"
|
||||||
|
|
||||||
|
@ -65,10 +65,10 @@ diff --git openjdk/make/autoconf/libraries.m4 openjdk/make/autoconf/libraries.m4
|
||||||
# Deprecated libraries, keep the flags for backwards compatibility
|
# Deprecated libraries, keep the flags for backwards compatibility
|
||||||
if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
|
if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
|
||||||
BASIC_DEPRECATED_ARG_WITH([dxsdk])
|
BASIC_DEPRECATED_ARG_WITH([dxsdk])
|
||||||
diff --git openjdk/make/autoconf/spec.gmk.in openjdk/make/autoconf/spec.gmk.in
|
diff --git a/make/autoconf/spec.gmk.in b/make/autoconf/spec.gmk.in
|
||||||
--- openjdk/make/autoconf/spec.gmk.in
|
--- a/make/autoconf/spec.gmk.in
|
||||||
+++ openjdk/make/autoconf/spec.gmk.in
|
+++ b/make/autoconf/spec.gmk.in
|
||||||
@@ -764,6 +764,10 @@
|
@@ -795,6 +795,10 @@
|
||||||
# Libraries
|
# Libraries
|
||||||
#
|
#
|
||||||
|
|
||||||
|
@ -79,9 +79,9 @@ diff --git openjdk/make/autoconf/spec.gmk.in openjdk/make/autoconf/spec.gmk.in
|
||||||
USE_EXTERNAL_LCMS:=@USE_EXTERNAL_LCMS@
|
USE_EXTERNAL_LCMS:=@USE_EXTERNAL_LCMS@
|
||||||
LCMS_CFLAGS:=@LCMS_CFLAGS@
|
LCMS_CFLAGS:=@LCMS_CFLAGS@
|
||||||
LCMS_LIBS:=@LCMS_LIBS@
|
LCMS_LIBS:=@LCMS_LIBS@
|
||||||
diff --git openjdk/make/lib/Lib-jdk.crypto.ec.gmk openjdk/make/lib/Lib-jdk.crypto.ec.gmk
|
diff --git a/make/lib/Lib-jdk.crypto.ec.gmk b/make/lib/Lib-jdk.crypto.ec.gmk
|
||||||
--- openjdk/make/lib/Lib-jdk.crypto.ec.gmk
|
--- a/make/lib/Lib-jdk.crypto.ec.gmk
|
||||||
+++ openjdk/make/lib/Lib-jdk.crypto.ec.gmk
|
+++ b/make/lib/Lib-jdk.crypto.ec.gmk
|
||||||
@@ -29,9 +29,15 @@
|
@@ -29,9 +29,15 @@
|
||||||
|
|
||||||
ifeq ($(ENABLE_INTREE_EC), true)
|
ifeq ($(ENABLE_INTREE_EC), true)
|
||||||
|
@ -99,30 +99,18 @@ diff --git openjdk/make/lib/Lib-jdk.crypto.ec.gmk openjdk/make/lib/Lib-jdk.crypt
|
||||||
#
|
#
|
||||||
# On sol-sparc...all libraries are compiled with -xregs=no%appl
|
# On sol-sparc...all libraries are compiled with -xregs=no%appl
|
||||||
# (set in CFLAGS_REQUIRED_sparc)
|
# (set in CFLAGS_REQUIRED_sparc)
|
||||||
@@ -60,7 +66,7 @@
|
@@ -58,6 +64,7 @@
|
||||||
LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \
|
LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \
|
||||||
LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_ORIGIN), \
|
LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_ORIGIN), \
|
||||||
LIBS := $(LIBCXX), \
|
LIBS := $(LIBCXX), \
|
||||||
- LIBS_linux := -lc, \
|
|
||||||
+ LIBS_linux := -lc $(NSS_LIBS), \
|
+ LIBS_linux := -lc $(NSS_LIBS), \
|
||||||
LIBS_solaris := -lc, \
|
))
|
||||||
VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
|
|
||||||
RC_FLAGS := $(RC_FLAGS) \
|
TARGETS += $(BUILD_LIBSUNEC)
|
||||||
diff --git openjdk/make/mapfiles/libsunec/mapfile-vers openjdk/make/mapfiles/libsunec/mapfile-vers
|
diff --git a/src/java.base/unix/native/include/jni_md.h b/src/java.base/unix/native/include/jni_md.h
|
||||||
--- openjdk/make/mapfiles/libsunec/mapfile-vers
|
--- a/src/java.base/unix/native/include/jni_md.h
|
||||||
+++ openjdk/make/mapfiles/libsunec/mapfile-vers
|
+++ b/src/java.base/unix/native/include/jni_md.h
|
||||||
@@ -31,6 +31,7 @@
|
@@ -41,6 +41,11 @@
|
||||||
Java_sun_security_ec_ECDSASignature_signDigest;
|
|
||||||
Java_sun_security_ec_ECDSASignature_verifySignedDigest;
|
|
||||||
Java_sun_security_ec_ECDHKeyAgreement_deriveKey;
|
|
||||||
+ Java_sun_security_ec_SunEC_initialize;
|
|
||||||
local:
|
|
||||||
*;
|
|
||||||
};
|
|
||||||
diff --git openjdk/src/java.base/unix/native/include/jni_md.h openjdk/src/java.base/unix/native/include/jni_md.h
|
|
||||||
--- openjdk/src/java.base/unix/native/include/jni_md.h
|
|
||||||
+++ openjdk/src/java.base/unix/native/include/jni_md.h
|
|
||||||
@@ -36,6 +36,11 @@
|
|
||||||
#define JNIEXPORT
|
#define JNIEXPORT
|
||||||
#define JNIIMPORT
|
#define JNIIMPORT
|
||||||
#endif
|
#endif
|
||||||
|
@ -134,9 +122,9 @@ diff --git openjdk/src/java.base/unix/native/include/jni_md.h openjdk/src/java.b
|
||||||
|
|
||||||
#define JNICALL
|
#define JNICALL
|
||||||
|
|
||||||
diff --git openjdk/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java openjdk/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java
|
diff --git a/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java b/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java
|
||||||
--- openjdk/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java
|
--- a/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java
|
||||||
+++ openjdk/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java
|
+++ b/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java
|
||||||
@@ -61,6 +61,7 @@
|
@@ -61,6 +61,7 @@
|
||||||
AccessController.doPrivileged(new PrivilegedAction<Void>() {
|
AccessController.doPrivileged(new PrivilegedAction<Void>() {
|
||||||
public Void run() {
|
public Void run() {
|
||||||
|
@ -145,19 +133,21 @@ diff --git openjdk/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java op
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -272,4 +273,9 @@
|
@@ -293,6 +294,11 @@
|
||||||
putService(new ProviderService(this, "KeyAgreement",
|
|
||||||
"ECDH", "sun.security.ec.ECDHKeyAgreement", null, ATTRS));
|
"ECDH", "sun.security.ec.ECDHKeyAgreement", null, ATTRS));
|
||||||
}
|
}
|
||||||
+
|
|
||||||
+ /**
|
+ /**
|
||||||
+ * Initialize the native code.
|
+ * Initialize the native code.
|
||||||
+ */
|
+ */
|
||||||
+ private static native void initialize();
|
+ private static native void initialize();
|
||||||
}
|
+
|
||||||
diff --git openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp
|
private void putXDHEntries() {
|
||||||
--- openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp
|
|
||||||
+++ openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp
|
HashMap<String, String> ATTRS = new HashMap<>(1);
|
||||||
|
diff --git a/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp b/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp
|
||||||
|
--- a/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp
|
||||||
|
+++ b/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp
|
||||||
@@ -25,7 +25,11 @@
|
@@ -25,7 +25,11 @@
|
||||||
|
|
||||||
#include <jni.h>
|
#include <jni.h>
|
||||||
|
@ -207,7 +197,7 @@ diff --git openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp openjdk/s
|
||||||
}
|
}
|
||||||
|
|
||||||
jbyteArray getEncodedBytes(JNIEnv *env, SECItem *hSECItem)
|
jbyteArray getEncodedBytes(JNIEnv *env, SECItem *hSECItem)
|
||||||
@@ -95,7 +112,7 @@
|
@@ -139,7 +156,7 @@
|
||||||
*/
|
*/
|
||||||
JNIEXPORT jobjectArray
|
JNIEXPORT jobjectArray
|
||||||
JNICALL Java_sun_security_ec_ECKeyPairGenerator_generateECKeyPair
|
JNICALL Java_sun_security_ec_ECKeyPairGenerator_generateECKeyPair
|
||||||
|
@ -216,7 +206,7 @@ diff --git openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp openjdk/s
|
||||||
{
|
{
|
||||||
ECPrivateKey *privKey = NULL; // contains both public and private values
|
ECPrivateKey *privKey = NULL; // contains both public and private values
|
||||||
ECParams *ecparams = NULL;
|
ECParams *ecparams = NULL;
|
||||||
@@ -127,8 +144,17 @@
|
@@ -171,8 +188,17 @@
|
||||||
env->GetByteArrayRegion(seed, 0, jSeedLength, pSeedBuffer);
|
env->GetByteArrayRegion(seed, 0, jSeedLength, pSeedBuffer);
|
||||||
|
|
||||||
// Generate the new keypair (using the supplied seed)
|
// Generate the new keypair (using the supplied seed)
|
||||||
|
@ -234,7 +224,7 @@ diff --git openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp openjdk/s
|
||||||
ThrowException(env, KEY_EXCEPTION);
|
ThrowException(env, KEY_EXCEPTION);
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
}
|
}
|
||||||
@@ -175,10 +201,15 @@
|
@@ -219,10 +245,15 @@
|
||||||
}
|
}
|
||||||
if (privKey) {
|
if (privKey) {
|
||||||
FreeECParams(&privKey->ecParams, false);
|
FreeECParams(&privKey->ecParams, false);
|
||||||
|
@ -250,7 +240,7 @@ diff --git openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp openjdk/s
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pSeedBuffer) {
|
if (pSeedBuffer) {
|
||||||
@@ -196,7 +227,7 @@
|
@@ -240,7 +271,7 @@
|
||||||
*/
|
*/
|
||||||
JNIEXPORT jbyteArray
|
JNIEXPORT jbyteArray
|
||||||
JNICALL Java_sun_security_ec_ECDSASignature_signDigest
|
JNICALL Java_sun_security_ec_ECDSASignature_signDigest
|
||||||
|
@ -259,7 +249,7 @@ diff --git openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp openjdk/s
|
||||||
{
|
{
|
||||||
jbyte* pDigestBuffer = NULL;
|
jbyte* pDigestBuffer = NULL;
|
||||||
jint jDigestLength = env->GetArrayLength(digest);
|
jint jDigestLength = env->GetArrayLength(digest);
|
||||||
@@ -255,8 +286,18 @@
|
@@ -299,8 +330,18 @@
|
||||||
env->GetByteArrayRegion(seed, 0, jSeedLength, pSeedBuffer);
|
env->GetByteArrayRegion(seed, 0, jSeedLength, pSeedBuffer);
|
||||||
|
|
||||||
// Sign the digest (using the supplied seed)
|
// Sign the digest (using the supplied seed)
|
||||||
|
@ -278,7 +268,7 @@ diff --git openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp openjdk/s
|
||||||
ThrowException(env, KEY_EXCEPTION);
|
ThrowException(env, KEY_EXCEPTION);
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
}
|
}
|
||||||
@@ -305,7 +346,7 @@
|
@@ -349,7 +390,7 @@
|
||||||
*/
|
*/
|
||||||
JNIEXPORT jboolean
|
JNIEXPORT jboolean
|
||||||
JNICALL Java_sun_security_ec_ECDSASignature_verifySignedDigest
|
JNICALL Java_sun_security_ec_ECDSASignature_verifySignedDigest
|
||||||
|
@ -287,7 +277,7 @@ diff --git openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp openjdk/s
|
||||||
{
|
{
|
||||||
jboolean isValid = false;
|
jboolean isValid = false;
|
||||||
|
|
||||||
@@ -362,9 +403,10 @@
|
@@ -406,9 +447,10 @@
|
||||||
|
|
||||||
cleanup:
|
cleanup:
|
||||||
{
|
{
|
||||||
|
@ -299,7 +289,7 @@ diff --git openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp openjdk/s
|
||||||
|
|
||||||
if (pubKey.publicValue.data)
|
if (pubKey.publicValue.data)
|
||||||
env->ReleaseByteArrayElements(publicKey,
|
env->ReleaseByteArrayElements(publicKey,
|
||||||
@@ -390,7 +432,7 @@
|
@@ -434,7 +476,7 @@
|
||||||
*/
|
*/
|
||||||
JNIEXPORT jbyteArray
|
JNIEXPORT jbyteArray
|
||||||
JNICALL Java_sun_security_ec_ECDHKeyAgreement_deriveKey
|
JNICALL Java_sun_security_ec_ECDHKeyAgreement_deriveKey
|
||||||
|
@ -308,7 +298,7 @@ diff --git openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp openjdk/s
|
||||||
{
|
{
|
||||||
jbyteArray jSecret = NULL;
|
jbyteArray jSecret = NULL;
|
||||||
ECParams *ecparams = NULL;
|
ECParams *ecparams = NULL;
|
||||||
@@ -466,9 +508,10 @@
|
@@ -510,9 +552,10 @@
|
||||||
env->ReleaseByteArrayElements(publicKey,
|
env->ReleaseByteArrayElements(publicKey,
|
||||||
(jbyte *) publicValue_item.data, JNI_ABORT);
|
(jbyte *) publicValue_item.data, JNI_ABORT);
|
||||||
|
|
||||||
|
@ -320,7 +310,7 @@ diff --git openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp openjdk/s
|
||||||
|
|
||||||
if (ecparams)
|
if (ecparams)
|
||||||
FreeECParams(ecparams, true);
|
FreeECParams(ecparams, true);
|
||||||
@@ -477,4 +520,28 @@
|
@@ -521,4 +564,28 @@
|
||||||
return jSecret;
|
return jSecret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -349,10 +339,10 @@ diff --git openjdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp openjdk/s
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
} /* extern "C" */
|
} /* extern "C" */
|
||||||
diff --git openjdk/src/jdk.crypto.ec/share/native/libsunec/ecc_impl.h openjdk/src/jdk.crypto.ec/share/native/libsunec/ecc_impl.h
|
diff --git a/src/jdk.crypto.ec/share/native/libsunec/ecc_impl.h b/src/jdk.crypto.ec/share/native/libsunec/ecc_impl.h
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ openjdk/src/jdk.crypto.ec/share/native/libsunec/ecc_impl.h
|
+++ b/src/jdk.crypto.ec/share/native/libsunec/ecc_impl.h
|
||||||
@@ -0,0 +1,298 @@
|
@@ -0,0 +1,298 @@
|
||||||
+/*
|
+/*
|
||||||
+ * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
|
+ * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
|
||||||
|
|
|
@ -1,134 +0,0 @@
|
||||||
diff --git a/src/hotspot/share/code/codeCache.cpp b/src/hotspot/share/code/codeCache.cpp
|
|
||||||
--- a/src/hotspot/share/code/codeCache.cpp
|
|
||||||
+++ b/src/hotspot/share/code/codeCache.cpp
|
|
||||||
@@ -405,7 +405,7 @@
|
|
||||||
add_heap(heap);
|
|
||||||
|
|
||||||
// Reserve Space
|
|
||||||
- size_t size_initial = MIN2(InitialCodeCacheSize, rs.size());
|
|
||||||
+ size_t size_initial = MIN2((size_t)InitialCodeCacheSize, rs.size());
|
|
||||||
size_initial = align_up(size_initial, os::vm_page_size());
|
|
||||||
if (!heap->reserve(rs, size_initial, CodeCacheSegmentSize)) {
|
|
||||||
vm_exit_during_initialization(err_msg("Could not reserve enough space in %s (" SIZE_FORMAT "K)",
|
|
||||||
diff --git a/src/hotspot/share/gc/cms/parNewGeneration.cpp b/src/hotspot/share/gc/cms/parNewGeneration.cpp
|
|
||||||
--- a/src/hotspot/share/gc/cms/parNewGeneration.cpp
|
|
||||||
+++ b/src/hotspot/share/gc/cms/parNewGeneration.cpp
|
|
||||||
@@ -200,7 +200,7 @@
|
|
||||||
const size_t num_overflow_elems = of_stack->size();
|
|
||||||
const size_t space_available = queue->max_elems() - queue->size();
|
|
||||||
const size_t num_take_elems = MIN3(space_available / 4,
|
|
||||||
- ParGCDesiredObjsFromOverflowList,
|
|
||||||
+ (size_t)ParGCDesiredObjsFromOverflowList,
|
|
||||||
num_overflow_elems);
|
|
||||||
// Transfer the most recent num_take_elems from the overflow
|
|
||||||
// stack to our work queue.
|
|
||||||
diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
|
|
||||||
--- a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
|
|
||||||
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
|
|
||||||
@@ -2296,7 +2296,7 @@
|
|
||||||
// of things to do) or totally (at the very end).
|
|
||||||
size_t target_size;
|
|
||||||
if (partially) {
|
|
||||||
- target_size = MIN2((size_t)_task_queue->max_elems()/3, GCDrainStackTargetSize);
|
|
||||||
+ target_size = MIN2((size_t)_task_queue->max_elems()/3, (size_t)GCDrainStackTargetSize);
|
|
||||||
} else {
|
|
||||||
target_size = 0;
|
|
||||||
}
|
|
||||||
diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.cpp b/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.cpp
|
|
||||||
--- a/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.cpp
|
|
||||||
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.cpp
|
|
||||||
@@ -31,7 +31,7 @@
|
|
||||||
}
|
|
||||||
|
|
||||||
size_t G1CMObjArrayProcessor::process_array_slice(objArrayOop obj, HeapWord* start_from, size_t remaining) {
|
|
||||||
- size_t words_to_scan = MIN2(remaining, ObjArrayMarkingStride);
|
|
||||||
+ size_t words_to_scan = MIN2(remaining, (size_t)ObjArrayMarkingStride);
|
|
||||||
|
|
||||||
if (remaining > ObjArrayMarkingStride) {
|
|
||||||
push_array_slice(start_from + ObjArrayMarkingStride);
|
|
||||||
diff --git a/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.cpp b/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.cpp
|
|
||||||
--- a/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.cpp
|
|
||||||
+++ b/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.cpp
|
|
||||||
@@ -100,7 +100,7 @@
|
|
||||||
return reserved_size() - committed_size();
|
|
||||||
}
|
|
||||||
|
|
||||||
-size_t G1PageBasedVirtualSpace::addr_to_page_index(char* addr) const {
|
|
||||||
+uintptr_t G1PageBasedVirtualSpace::addr_to_page_index(char* addr) const {
|
|
||||||
return (addr - _low_boundary) / _page_size;
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp b/src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp
|
|
||||||
--- a/src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp
|
|
||||||
+++ b/src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp
|
|
||||||
@@ -115,7 +115,7 @@
|
|
||||||
const size_t beg_index = size_t(index);
|
|
||||||
assert(beg_index < len || len == 0, "index too large");
|
|
||||||
|
|
||||||
- const size_t stride = MIN2(len - beg_index, ObjArrayMarkingStride);
|
|
||||||
+ const size_t stride = MIN2(len - beg_index, (size_t)ObjArrayMarkingStride);
|
|
||||||
const size_t end_index = beg_index + stride;
|
|
||||||
T* const base = (T*)obj->base();
|
|
||||||
T* const beg = base + beg_index;
|
|
||||||
diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.cpp b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
|
|
||||||
--- a/src/hotspot/share/gc/parallel/psParallelCompact.cpp
|
|
||||||
+++ b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
|
|
||||||
@@ -905,8 +905,8 @@
|
|
||||||
void PSParallelCompact::initialize_dead_wood_limiter()
|
|
||||||
{
|
|
||||||
const size_t max = 100;
|
|
||||||
- _dwl_mean = double(MIN2(ParallelOldDeadWoodLimiterMean, max)) / 100.0;
|
|
||||||
- _dwl_std_dev = double(MIN2(ParallelOldDeadWoodLimiterStdDev, max)) / 100.0;
|
|
||||||
+ _dwl_mean = double(MIN2((size_t)ParallelOldDeadWoodLimiterMean, max)) / 100.0;
|
|
||||||
+ _dwl_std_dev = double(MIN2((size_t)ParallelOldDeadWoodLimiterStdDev, max)) / 100.0;
|
|
||||||
_dwl_first_term = 1.0 / (sqrt(2.0 * M_PI) * _dwl_std_dev);
|
|
||||||
DEBUG_ONLY(_dwl_initialized = true;)
|
|
||||||
_dwl_adjustment = normal_distribution(1.0);
|
|
||||||
diff --git a/src/hotspot/share/gc/shared/plab.cpp b/src/hotspot/share/gc/shared/plab.cpp
|
|
||||||
--- a/src/hotspot/share/gc/shared/plab.cpp
|
|
||||||
+++ b/src/hotspot/share/gc/shared/plab.cpp
|
|
||||||
@@ -32,7 +32,7 @@
|
|
||||||
|
|
||||||
size_t PLAB::min_size() {
|
|
||||||
// Make sure that we return something that is larger than AlignmentReserve
|
|
||||||
- return align_object_size(MAX2(MinTLABSize / HeapWordSize, (uintx)oopDesc::header_size())) + AlignmentReserve;
|
|
||||||
+ return align_object_size(MAX2(MinTLABSize / HeapWordSize, (size_t)oopDesc::header_size())) + AlignmentReserve;
|
|
||||||
}
|
|
||||||
|
|
||||||
size_t PLAB::max_size() {
|
|
||||||
diff --git a/src/hotspot/share/prims/whitebox.cpp b/src/hotspot/share/prims/whitebox.cpp
|
|
||||||
--- a/src/hotspot/share/prims/whitebox.cpp
|
|
||||||
+++ b/src/hotspot/share/prims/whitebox.cpp
|
|
||||||
@@ -1096,7 +1096,7 @@
|
|
||||||
WB_END
|
|
||||||
|
|
||||||
WB_ENTRY(jobject, WB_GetSizeTVMFlag(JNIEnv* env, jobject o, jstring name))
|
|
||||||
- uintx result;
|
|
||||||
+ size_t result;
|
|
||||||
if (GetVMFlag <size_t> (thread, env, name, &result, &CommandLineFlags::size_tAt)) {
|
|
||||||
ThreadToNativeFromVM ttnfv(thread); // can't be in VM when we call JNI
|
|
||||||
return longBox(thread, env, result);
|
|
||||||
diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
|
|
||||||
--- a/src/hotspot/share/runtime/arguments.cpp
|
|
||||||
+++ b/src/hotspot/share/runtime/arguments.cpp
|
|
||||||
@@ -1586,7 +1586,7 @@
|
|
||||||
// Increase the code cache size - tiered compiles a lot more.
|
|
||||||
if (FLAG_IS_DEFAULT(ReservedCodeCacheSize)) {
|
|
||||||
FLAG_SET_ERGO(uintx, ReservedCodeCacheSize,
|
|
||||||
- MIN2(CODE_CACHE_DEFAULT_LIMIT, ReservedCodeCacheSize * 5));
|
|
||||||
+ MIN2(CODE_CACHE_DEFAULT_LIMIT, (size_t)(ReservedCodeCacheSize * 5)));
|
|
||||||
}
|
|
||||||
// Enable SegmentedCodeCache if TieredCompilation is enabled and ReservedCodeCacheSize >= 240M
|
|
||||||
if (FLAG_IS_DEFAULT(SegmentedCodeCache) && ReservedCodeCacheSize >= 240*M) {
|
|
||||||
diff --git a/src/hotspot/share/runtime/arguments.hpp b/src/hotspot/share/runtime/arguments.hpp
|
|
||||||
--- a/src/hotspot/share/runtime/arguments.hpp
|
|
||||||
+++ b/src/hotspot/share/runtime/arguments.hpp
|
|
||||||
@@ -328,7 +328,7 @@
|
|
||||||
// Value of the conservative maximum heap alignment needed
|
|
||||||
static size_t _conservative_max_heap_alignment;
|
|
||||||
|
|
||||||
- static uintx _min_heap_size;
|
|
||||||
+ static size_t _min_heap_size;
|
|
||||||
|
|
||||||
// -Xrun arguments
|
|
||||||
static AgentLibraryList _libraryList;
|
|
|
@ -89,7 +89,7 @@
|
||||||
|
|
||||||
|
|
||||||
# fix for https://bugzilla.redhat.com/show_bug.cgi?id=1111349
|
# fix for https://bugzilla.redhat.com/show_bug.cgi?id=1111349
|
||||||
%global _privatelibs libjsoundalsa[.]so.*|libsplashscreen[.]so.*|libawt_xawt[.]so.*|libjawt[.]so.*|libjli[.]so.*|libattach[.]so.*|libawt[.]so.*|libextnet[.]so.*|libjsig[.]so.*|libawt_headless[.]so.*|libdt_socket[.]so.*|libfontmanager[.]so.*|libinstrument[.]so.*|libj2gss[.]so.*|libj2pcsc[.]so.*|libj2pkcs11[.]so.*|libjaas_unix[.]so.*|libjava[.]so.*|libjavajpeg[.]so.*|libjdwp[.]so.*|libjimage[.]so.*|libjsound[.]so.*|liblcms[.]so.*|libmanagement[.]so.*|libmanagement_agent[.]so.*|libmanagement_ext[.]so.*|libmlib_image[.]so.*|libnet[.]so.*|libnio[.]so.*|libprefs[.]so.*|librmi[.]so.*|libsaproc[.]so.*|libsctp[.]so.*|libsunec[.]so.*|libunpack[.]so.*|libverify[.]so.*|libzip[.]so.*
|
%global _privatelibs libsplashscreen[.]so.*|libawt_xawt[.]so.*|libjawt[.]so.*|libjli[.]so.*|libattach[.]so.*|libawt[.]so.*|libextnet[.]so.*|libjsig[.]so.*|libawt_headless[.]so.*|libdt_socket[.]so.*|libfontmanager[.]so.*|libinstrument[.]so.*|libj2gss[.]so.*|libj2pcsc[.]so.*|libj2pkcs11[.]so.*|libjaas[.]so.*|libjava[.]so.*|libjavajpeg[.]so.*|libjdwp[.]so.*|libjimage[.]so.*|libjsound[.]so.*|liblcms[.]so.*|libmanagement[.]so.*|libmanagement_agent[.]so.*|libmanagement_ext[.]so.*|libmlib_image[.]so.*|libnet[.]so.*|libnio[.]so.*|libprefs[.]so.*|librmi[.]so.*|libsaproc[.]so.*|libsctp[.]so.*|libsunec[.]so.*|libunpack[.]so.*|libverify[.]so.*|libzip[.]so.*
|
||||||
|
|
||||||
%global __provides_exclude ^(%{_privatelibs})$
|
%global __provides_exclude ^(%{_privatelibs})$
|
||||||
%global __requires_exclude ^(%{_privatelibs})$
|
%global __requires_exclude ^(%{_privatelibs})$
|
||||||
|
@ -149,15 +149,15 @@
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# New Version-String scheme-style defines
|
# New Version-String scheme-style defines
|
||||||
%global majorver 10
|
%global majorver 11
|
||||||
%global securityver 1
|
%global securityver ea
|
||||||
|
|
||||||
# Standard JPackage naming and versioning defines
|
# Standard JPackage naming and versioning defines
|
||||||
%global origin openjdk
|
%global origin openjdk
|
||||||
%global origin_nice OpenJDK
|
%global origin_nice OpenJDK
|
||||||
%global top_level_dir_name %{origin}
|
%global top_level_dir_name %{origin}
|
||||||
%global minorver 0
|
%global minorver 0
|
||||||
%global buildver 10
|
%global buildver 16
|
||||||
# priority must be 7 digits in total
|
# priority must be 7 digits in total
|
||||||
# setting to 1, so debug ones can have 0
|
# setting to 1, so debug ones can have 0
|
||||||
%global priority 00000%{minorver}1
|
%global priority 00000%{minorver}1
|
||||||
|
@ -234,12 +234,9 @@ alternatives \\
|
||||||
--slave %{_jvmdir}/jre jre %{_jvmdir}/%{sdkdir -- %{?1}} \\
|
--slave %{_jvmdir}/jre jre %{_jvmdir}/%{sdkdir -- %{?1}} \\
|
||||||
--slave %{_bindir}/jjs jjs %{jrebindir -- %{?1}}/jjs \\
|
--slave %{_bindir}/jjs jjs %{jrebindir -- %{?1}}/jjs \\
|
||||||
--slave %{_bindir}/keytool keytool %{jrebindir -- %{?1}}/keytool \\
|
--slave %{_bindir}/keytool keytool %{jrebindir -- %{?1}}/keytool \\
|
||||||
--slave %{_bindir}/orbd orbd %{jrebindir -- %{?1}}/orbd \\
|
|
||||||
--slave %{_bindir}/pack200 pack200 %{jrebindir -- %{?1}}/pack200 \\
|
--slave %{_bindir}/pack200 pack200 %{jrebindir -- %{?1}}/pack200 \\
|
||||||
--slave %{_bindir}/rmid rmid %{jrebindir -- %{?1}}/rmid \\
|
--slave %{_bindir}/rmid rmid %{jrebindir -- %{?1}}/rmid \\
|
||||||
--slave %{_bindir}/rmiregistry rmiregistry %{jrebindir -- %{?1}}/rmiregistry \\
|
--slave %{_bindir}/rmiregistry rmiregistry %{jrebindir -- %{?1}}/rmiregistry \\
|
||||||
--slave %{_bindir}/servertool servertool %{jrebindir -- %{?1}}/servertool \\
|
|
||||||
--slave %{_bindir}/tnameserv tnameserv %{jrebindir -- %{?1}}/tnameserv \\
|
|
||||||
--slave %{_bindir}/unpack200 unpack200 %{jrebindir -- %{?1}}/unpack200 \\
|
--slave %{_bindir}/unpack200 unpack200 %{jrebindir -- %{?1}}/unpack200 \\
|
||||||
--slave %{_mandir}/man1/java.1$ext java.1$ext \\
|
--slave %{_mandir}/man1/java.1$ext java.1$ext \\
|
||||||
%{_mandir}/man1/java-%{uniquesuffix -- %{?1}}.1$ext \\
|
%{_mandir}/man1/java-%{uniquesuffix -- %{?1}}.1$ext \\
|
||||||
|
@ -247,18 +244,12 @@ alternatives \\
|
||||||
%{_mandir}/man1/jjs-%{uniquesuffix -- %{?1}}.1$ext \\
|
%{_mandir}/man1/jjs-%{uniquesuffix -- %{?1}}.1$ext \\
|
||||||
--slave %{_mandir}/man1/keytool.1$ext keytool.1$ext \\
|
--slave %{_mandir}/man1/keytool.1$ext keytool.1$ext \\
|
||||||
%{_mandir}/man1/keytool-%{uniquesuffix -- %{?1}}.1$ext \\
|
%{_mandir}/man1/keytool-%{uniquesuffix -- %{?1}}.1$ext \\
|
||||||
--slave %{_mandir}/man1/orbd.1$ext orbd.1$ext \\
|
|
||||||
%{_mandir}/man1/orbd-%{uniquesuffix -- %{?1}}.1$ext \\
|
|
||||||
--slave %{_mandir}/man1/pack200.1$ext pack200.1$ext \\
|
--slave %{_mandir}/man1/pack200.1$ext pack200.1$ext \\
|
||||||
%{_mandir}/man1/pack200-%{uniquesuffix -- %{?1}}.1$ext \\
|
%{_mandir}/man1/pack200-%{uniquesuffix -- %{?1}}.1$ext \\
|
||||||
--slave %{_mandir}/man1/rmid.1$ext rmid.1$ext \\
|
--slave %{_mandir}/man1/rmid.1$ext rmid.1$ext \\
|
||||||
%{_mandir}/man1/rmid-%{uniquesuffix -- %{?1}}.1$ext \\
|
%{_mandir}/man1/rmid-%{uniquesuffix -- %{?1}}.1$ext \\
|
||||||
--slave %{_mandir}/man1/rmiregistry.1$ext rmiregistry.1$ext \\
|
--slave %{_mandir}/man1/rmiregistry.1$ext rmiregistry.1$ext \\
|
||||||
%{_mandir}/man1/rmiregistry-%{uniquesuffix -- %{?1}}.1$ext \\
|
%{_mandir}/man1/rmiregistry-%{uniquesuffix -- %{?1}}.1$ext \\
|
||||||
--slave %{_mandir}/man1/servertool.1$ext servertool.1$ext \\
|
|
||||||
%{_mandir}/man1/servertool-%{uniquesuffix -- %{?1}}.1$ext \\
|
|
||||||
--slave %{_mandir}/man1/tnameserv.1$ext tnameserv.1$ext \\
|
|
||||||
%{_mandir}/man1/tnameserv-%{uniquesuffix -- %{?1}}.1$ext \\
|
|
||||||
--slave %{_mandir}/man1/unpack200.1$ext unpack200.1$ext \\
|
--slave %{_mandir}/man1/unpack200.1$ext unpack200.1$ext \\
|
||||||
%{_mandir}/man1/unpack200-%{uniquesuffix -- %{?1}}.1$ext
|
%{_mandir}/man1/unpack200-%{uniquesuffix -- %{?1}}.1$ext
|
||||||
|
|
||||||
|
@ -315,14 +306,12 @@ ext=.gz
|
||||||
alternatives \\
|
alternatives \\
|
||||||
--install %{_bindir}/javac javac %{sdkbindir -- %{?1}}/javac $PRIORITY --family %{name}.%{_arch} \\
|
--install %{_bindir}/javac javac %{sdkbindir -- %{?1}}/javac $PRIORITY --family %{name}.%{_arch} \\
|
||||||
--slave %{_jvmdir}/java java_sdk %{_jvmdir}/%{sdkdir -- %{?1}} \\
|
--slave %{_jvmdir}/java java_sdk %{_jvmdir}/%{sdkdir -- %{?1}} \\
|
||||||
--slave %{_bindir}/appletviewer appletviewer %{sdkbindir -- %{?1}}/appletviewer \\
|
|
||||||
%ifarch %{aot_arches}
|
%ifarch %{aot_arches}
|
||||||
--slave %{_bindir}/jaotc jaotc %{sdkbindir -- %{?1}}/jaotc \\
|
--slave %{_bindir}/jaotc jaotc %{sdkbindir -- %{?1}}/jaotc \\
|
||||||
%endif
|
%endif
|
||||||
--slave %{_bindir}/jlink jlink %{sdkbindir -- %{?1}}/jlink \\
|
--slave %{_bindir}/jlink jlink %{sdkbindir -- %{?1}}/jlink \\
|
||||||
--slave %{_bindir}/jmod jmod %{sdkbindir -- %{?1}}/jmod \\
|
--slave %{_bindir}/jmod jmod %{sdkbindir -- %{?1}}/jmod \\
|
||||||
--slave %{_bindir}/jhsdb jhsdb %{sdkbindir -- %{?1}}/jhsdb \\
|
--slave %{_bindir}/jhsdb jhsdb %{sdkbindir -- %{?1}}/jhsdb \\
|
||||||
--slave %{_bindir}/idlj idlj %{sdkbindir -- %{?1}}/idlj \\
|
|
||||||
--slave %{_bindir}/jar jar %{sdkbindir -- %{?1}}/jar \\
|
--slave %{_bindir}/jar jar %{sdkbindir -- %{?1}}/jar \\
|
||||||
--slave %{_bindir}/jarsigner jarsigner %{sdkbindir -- %{?1}}/jarsigner \\
|
--slave %{_bindir}/jarsigner jarsigner %{sdkbindir -- %{?1}}/jarsigner \\
|
||||||
--slave %{_bindir}/javadoc javadoc %{sdkbindir -- %{?1}}/javadoc \\
|
--slave %{_bindir}/javadoc javadoc %{sdkbindir -- %{?1}}/javadoc \\
|
||||||
|
@ -342,15 +331,7 @@ alternatives \\
|
||||||
--slave %{_bindir}/jstat jstat %{sdkbindir -- %{?1}}/jstat \\
|
--slave %{_bindir}/jstat jstat %{sdkbindir -- %{?1}}/jstat \\
|
||||||
--slave %{_bindir}/jstatd jstatd %{sdkbindir -- %{?1}}/jstatd \\
|
--slave %{_bindir}/jstatd jstatd %{sdkbindir -- %{?1}}/jstatd \\
|
||||||
--slave %{_bindir}/rmic rmic %{sdkbindir -- %{?1}}/rmic \\
|
--slave %{_bindir}/rmic rmic %{sdkbindir -- %{?1}}/rmic \\
|
||||||
--slave %{_bindir}/schemagen schemagen %{sdkbindir -- %{?1}}/schemagen \\
|
|
||||||
--slave %{_bindir}/serialver serialver %{sdkbindir -- %{?1}}/serialver \\
|
--slave %{_bindir}/serialver serialver %{sdkbindir -- %{?1}}/serialver \\
|
||||||
--slave %{_bindir}/wsgen wsgen %{sdkbindir -- %{?1}}/wsgen \\
|
|
||||||
--slave %{_bindir}/wsimport wsimport %{sdkbindir -- %{?1}}/wsimport \\
|
|
||||||
--slave %{_bindir}/xjc xjc %{sdkbindir -- %{?1}}/xjc \\
|
|
||||||
--slave %{_mandir}/man1/appletviewer.1$ext appletviewer.1$ext \\
|
|
||||||
%{_mandir}/man1/appletviewer-%{uniquesuffix -- %{?1}}.1$ext \\
|
|
||||||
--slave %{_mandir}/man1/idlj.1$ext idlj.1$ext \\
|
|
||||||
%{_mandir}/man1/idlj-%{uniquesuffix -- %{?1}}.1$ext \\
|
|
||||||
--slave %{_mandir}/man1/jar.1$ext jar.1$ext \\
|
--slave %{_mandir}/man1/jar.1$ext jar.1$ext \\
|
||||||
%{_mandir}/man1/jar-%{uniquesuffix -- %{?1}}.1$ext \\
|
%{_mandir}/man1/jar-%{uniquesuffix -- %{?1}}.1$ext \\
|
||||||
--slave %{_mandir}/man1/jarsigner.1$ext jarsigner.1$ext \\
|
--slave %{_mandir}/man1/jarsigner.1$ext jarsigner.1$ext \\
|
||||||
|
@ -385,16 +366,8 @@ alternatives \\
|
||||||
%{_mandir}/man1/jstatd-%{uniquesuffix -- %{?1}}.1$ext \\
|
%{_mandir}/man1/jstatd-%{uniquesuffix -- %{?1}}.1$ext \\
|
||||||
--slave %{_mandir}/man1/rmic.1$ext rmic.1$ext \\
|
--slave %{_mandir}/man1/rmic.1$ext rmic.1$ext \\
|
||||||
%{_mandir}/man1/rmic-%{uniquesuffix -- %{?1}}.1$ext \\
|
%{_mandir}/man1/rmic-%{uniquesuffix -- %{?1}}.1$ext \\
|
||||||
--slave %{_mandir}/man1/schemagen.1$ext schemagen.1$ext \\
|
|
||||||
%{_mandir}/man1/schemagen-%{uniquesuffix -- %{?1}}.1$ext \\
|
|
||||||
--slave %{_mandir}/man1/serialver.1$ext serialver.1$ext \\
|
--slave %{_mandir}/man1/serialver.1$ext serialver.1$ext \\
|
||||||
%{_mandir}/man1/serialver-%{uniquesuffix -- %{?1}}.1$ext \\
|
%{_mandir}/man1/serialver-%{uniquesuffix -- %{?1}}.1$ext \\
|
||||||
--slave %{_mandir}/man1/wsgen.1$ext wsgen.1$ext \\
|
|
||||||
%{_mandir}/man1/wsgen-%{uniquesuffix -- %{?1}}.1$ext \\
|
|
||||||
--slave %{_mandir}/man1/wsimport.1$ext wsimport.1$ext \\
|
|
||||||
%{_mandir}/man1/wsimport-%{uniquesuffix -- %{?1}}.1$ext \\
|
|
||||||
--slave %{_mandir}/man1/xjc.1$ext xjc.1$ext \\
|
|
||||||
%{_mandir}/man1/xjc-%{uniquesuffix -- %{?1}}.1$ext
|
|
||||||
|
|
||||||
for X in %{origin} %{javaver} ; do
|
for X in %{origin} %{javaver} ; do
|
||||||
alternatives \\
|
alternatives \\
|
||||||
|
@ -466,7 +439,6 @@ exit 0
|
||||||
|
|
||||||
%define files_jre() %{expand:
|
%define files_jre() %{expand:
|
||||||
%{_datadir}/icons/hicolor/*x*/apps/java-%{javaver}-%{origin}.png
|
%{_datadir}/icons/hicolor/*x*/apps/java-%{javaver}-%{origin}.png
|
||||||
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libjsoundalsa.so
|
|
||||||
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libsplashscreen.so
|
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libsplashscreen.so
|
||||||
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libawt_xawt.so
|
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libawt_xawt.so
|
||||||
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libjawt.so
|
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libjawt.so
|
||||||
|
@ -485,12 +457,9 @@ exit 0
|
||||||
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/java
|
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/java
|
||||||
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jjs
|
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jjs
|
||||||
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/keytool
|
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/keytool
|
||||||
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/orbd
|
|
||||||
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/pack200
|
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/pack200
|
||||||
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/rmid
|
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/rmid
|
||||||
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/rmiregistry
|
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/rmiregistry
|
||||||
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/servertool
|
|
||||||
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/tnameserv
|
|
||||||
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/unpack200
|
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/unpack200
|
||||||
%dir %{_jvmdir}/%{sdkdir -- %{?1}}/lib
|
%dir %{_jvmdir}/%{sdkdir -- %{?1}}/lib
|
||||||
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/classlist
|
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/classlist
|
||||||
|
@ -514,7 +483,7 @@ exit 0
|
||||||
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libj2gss.so
|
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libj2gss.so
|
||||||
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libj2pcsc.so
|
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libj2pcsc.so
|
||||||
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libj2pkcs11.so
|
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libj2pkcs11.so
|
||||||
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libjaas_unix.so
|
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libjaas.so
|
||||||
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libjava.so
|
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libjava.so
|
||||||
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libjavajpeg.so
|
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libjavajpeg.so
|
||||||
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libjdwp.so
|
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libjdwp.so
|
||||||
|
@ -535,15 +504,18 @@ exit 0
|
||||||
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libunpack.so
|
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libunpack.so
|
||||||
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libverify.so
|
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libverify.so
|
||||||
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libzip.so
|
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libzip.so
|
||||||
|
# Zero does not have JFR
|
||||||
|
%ifarch %{jit_arches}
|
||||||
|
%dir %{_jvmdir}/%{sdkdir -- %{?1}}/lib/jfr
|
||||||
|
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/jfr/default.jfc
|
||||||
|
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/jfr/profile.jfc
|
||||||
|
%endif
|
||||||
%{_mandir}/man1/java-%{uniquesuffix -- %{?1}}.1*
|
%{_mandir}/man1/java-%{uniquesuffix -- %{?1}}.1*
|
||||||
%{_mandir}/man1/jjs-%{uniquesuffix -- %{?1}}.1*
|
%{_mandir}/man1/jjs-%{uniquesuffix -- %{?1}}.1*
|
||||||
%{_mandir}/man1/keytool-%{uniquesuffix -- %{?1}}.1*
|
%{_mandir}/man1/keytool-%{uniquesuffix -- %{?1}}.1*
|
||||||
%{_mandir}/man1/orbd-%{uniquesuffix -- %{?1}}.1*
|
|
||||||
%{_mandir}/man1/pack200-%{uniquesuffix -- %{?1}}.1*
|
%{_mandir}/man1/pack200-%{uniquesuffix -- %{?1}}.1*
|
||||||
%{_mandir}/man1/rmid-%{uniquesuffix -- %{?1}}.1*
|
%{_mandir}/man1/rmid-%{uniquesuffix -- %{?1}}.1*
|
||||||
%{_mandir}/man1/rmiregistry-%{uniquesuffix -- %{?1}}.1*
|
%{_mandir}/man1/rmiregistry-%{uniquesuffix -- %{?1}}.1*
|
||||||
%{_mandir}/man1/servertool-%{uniquesuffix -- %{?1}}.1*
|
|
||||||
%{_mandir}/man1/tnameserv-%{uniquesuffix -- %{?1}}.1*
|
|
||||||
%{_mandir}/man1/unpack200-%{uniquesuffix -- %{?1}}.1*
|
%{_mandir}/man1/unpack200-%{uniquesuffix -- %{?1}}.1*
|
||||||
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/server/
|
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/server/
|
||||||
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/client/
|
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/client/
|
||||||
|
@ -591,8 +563,6 @@ exit 0
|
||||||
%define files_devel() %{expand:
|
%define files_devel() %{expand:
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%dir %{_jvmdir}/%{sdkdir -- %{?1}}/bin
|
%dir %{_jvmdir}/%{sdkdir -- %{?1}}/bin
|
||||||
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/appletviewer
|
|
||||||
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/idlj
|
|
||||||
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jar
|
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jar
|
||||||
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jarsigner
|
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jarsigner
|
||||||
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/javac
|
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/javac
|
||||||
|
@ -616,11 +586,7 @@ exit 0
|
||||||
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jstat
|
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jstat
|
||||||
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jstatd
|
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jstatd
|
||||||
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/rmic
|
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/rmic
|
||||||
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/schemagen
|
|
||||||
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/serialver
|
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/serialver
|
||||||
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/wsgen
|
|
||||||
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/wsimport
|
|
||||||
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/xjc
|
|
||||||
%ifarch %{aot_arches}
|
%ifarch %{aot_arches}
|
||||||
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jaotc
|
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jaotc
|
||||||
%endif
|
%endif
|
||||||
|
@ -630,8 +596,6 @@ exit 0
|
||||||
%{_jvmdir}/%{sdkdir -- %{?1}}/tapset
|
%{_jvmdir}/%{sdkdir -- %{?1}}/tapset
|
||||||
%endif
|
%endif
|
||||||
%{_datadir}/applications/*jconsole%{?1}.desktop
|
%{_datadir}/applications/*jconsole%{?1}.desktop
|
||||||
%{_mandir}/man1/appletviewer-%{uniquesuffix -- %{?1}}.1*
|
|
||||||
%{_mandir}/man1/idlj-%{uniquesuffix -- %{?1}}.1*
|
|
||||||
%{_mandir}/man1/jar-%{uniquesuffix -- %{?1}}.1*
|
%{_mandir}/man1/jar-%{uniquesuffix -- %{?1}}.1*
|
||||||
%{_mandir}/man1/jarsigner-%{uniquesuffix -- %{?1}}.1*
|
%{_mandir}/man1/jarsigner-%{uniquesuffix -- %{?1}}.1*
|
||||||
%{_mandir}/man1/javac-%{uniquesuffix -- %{?1}}.1*
|
%{_mandir}/man1/javac-%{uniquesuffix -- %{?1}}.1*
|
||||||
|
@ -649,11 +613,7 @@ exit 0
|
||||||
%{_mandir}/man1/jstat-%{uniquesuffix -- %{?1}}.1*
|
%{_mandir}/man1/jstat-%{uniquesuffix -- %{?1}}.1*
|
||||||
%{_mandir}/man1/jstatd-%{uniquesuffix -- %{?1}}.1*
|
%{_mandir}/man1/jstatd-%{uniquesuffix -- %{?1}}.1*
|
||||||
%{_mandir}/man1/rmic-%{uniquesuffix -- %{?1}}.1*
|
%{_mandir}/man1/rmic-%{uniquesuffix -- %{?1}}.1*
|
||||||
%{_mandir}/man1/schemagen-%{uniquesuffix -- %{?1}}.1*
|
|
||||||
%{_mandir}/man1/serialver-%{uniquesuffix -- %{?1}}.1*
|
%{_mandir}/man1/serialver-%{uniquesuffix -- %{?1}}.1*
|
||||||
%{_mandir}/man1/wsgen-%{uniquesuffix -- %{?1}}.1*
|
|
||||||
%{_mandir}/man1/wsimport-%{uniquesuffix -- %{?1}}.1*
|
|
||||||
%{_mandir}/man1/xjc-%{uniquesuffix -- %{?1}}.1*
|
|
||||||
%if %{with_systemtap}
|
%if %{with_systemtap}
|
||||||
%dir %{tapsetroot}
|
%dir %{tapsetroot}
|
||||||
%dir %{tapsetdirttapset}
|
%dir %{tapsetdirttapset}
|
||||||
|
@ -832,7 +792,7 @@ Provides: java-%{javaver}-%{origin}-src%{?1} = %{epoch}:%{version}-%{release}
|
||||||
|
|
||||||
Name: java-%{origin}
|
Name: java-%{origin}
|
||||||
Version: %{newjavaver}.%{buildver}
|
Version: %{newjavaver}.%{buildver}
|
||||||
Release: 9%{?dist}
|
Release: 1%{?dist}
|
||||||
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
|
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
|
||||||
# and this change was brought into RHEL-4. java-1.5.0-ibm packages
|
# and this change was brought into RHEL-4. java-1.5.0-ibm packages
|
||||||
# also included the epoch in their virtual provides. This created a
|
# also included the epoch in their virtual provides. This created a
|
||||||
|
@ -860,7 +820,7 @@ Group: Development/Languages
|
||||||
License: ASL 1.1 and ASL 2.0 and BSD and BSD with advertising and GPL+ and GPLv2 and GPLv2 with exceptions and IJG and LGPLv2+ and MIT and MPLv2.0 and Public Domain and W3C and zlib
|
License: ASL 1.1 and ASL 2.0 and BSD and BSD with advertising and GPL+ and GPLv2 and GPLv2 with exceptions and IJG and LGPLv2+ and MIT and MPLv2.0 and Public Domain and W3C and zlib
|
||||||
URL: http://openjdk.java.net/
|
URL: http://openjdk.java.net/
|
||||||
|
|
||||||
Source0: jdk-updates-jdk%{majorver}u-jdk-%{newjavaver}+%{buildver}.tar.xz
|
Source0: jdk-jdk-jdk-%{majorver}+%{buildver}.tar.xz
|
||||||
|
|
||||||
# Use 'generate_tarballs.sh' to generate the following tarballs
|
# Use 'generate_tarballs.sh' to generate the following tarballs
|
||||||
# They are based on code contained in the IcedTea7 project
|
# They are based on code contained in the IcedTea7 project
|
||||||
|
@ -909,30 +869,9 @@ Patch5: RHBZ-1565658-system-nss-SunEC.patch
|
||||||
#
|
#
|
||||||
#############################################
|
#############################################
|
||||||
|
|
||||||
# s390 (Zero) build does not bootcycle without this patch
|
# Type fixing for s390 (Zero). In progress of
|
||||||
# Already in JDK-11. Missing backports.
|
# getting into upstream JDK 11.
|
||||||
Patch100: JDK-8201495-s390-java-opts.patch
|
Patch100: JDK-8203030-s390-size_t.patch
|
||||||
# See JDK-8198844. This won't be needed any more in
|
|
||||||
# JDK 11+
|
|
||||||
Patch101: sorted-diff.patch
|
|
||||||
# Type fixing for s390 (Zero). Not upstream.
|
|
||||||
Patch102: java-openjdk-s390-size_t.patch
|
|
||||||
# bootcycle-images target may run out of ressources
|
|
||||||
# due to bad jobs config. Missing backports.
|
|
||||||
Patch103: JDK-8201788-bootcycle-images-jobs.patch
|
|
||||||
# s390 (Zero) build fix. Pending upstream.
|
|
||||||
Patch104: JDK-8201509-s390-atomic_store.patch
|
|
||||||
# libjsig.so does not receive extra ld flags when
|
|
||||||
# being built. Not an issue on JDK 11. Missing fix for
|
|
||||||
# 10 upstream.
|
|
||||||
Patch105: JDK-8202262-libjsig.so-extra-link-flags.patch
|
|
||||||
# NPE from JarFileSystem.getVersionMap. Fixed in JDK 11,
|
|
||||||
# not backported to JDK 10. See RHBZ#1557375 for the
|
|
||||||
# downstream issue. Not applicable for JDK 8.
|
|
||||||
Patch106: JDK-8193802-npe-jar-getVersionMap.patch
|
|
||||||
|
|
||||||
# aarch64 slowdebug build fix. Pending upstream
|
|
||||||
Patch400: JDK-8200556-aarch64-slowdebug-crash.patch
|
|
||||||
|
|
||||||
BuildRequires: autoconf
|
BuildRequires: autoconf
|
||||||
BuildRequires: automake
|
BuildRequires: automake
|
||||||
|
@ -1197,14 +1136,7 @@ pushd %{top_level_dir_name}
|
||||||
%patch4 -p1
|
%patch4 -p1
|
||||||
%patch5 -p1
|
%patch5 -p1
|
||||||
|
|
||||||
%patch101 -p1
|
%patch100 -p1
|
||||||
%patch102 -p1
|
|
||||||
%patch103 -p1
|
|
||||||
%patch104 -p1
|
|
||||||
%patch105 -p1
|
|
||||||
%patch106 -p1
|
|
||||||
|
|
||||||
%patch400 -p1
|
|
||||||
|
|
||||||
popd # openjdk
|
popd # openjdk
|
||||||
|
|
||||||
|
@ -1283,10 +1215,6 @@ EXTRA_CFLAGS="$EXTRA_CFLAGS -fno-strict-aliasing"
|
||||||
%endif
|
%endif
|
||||||
export EXTRA_CFLAGS
|
export EXTRA_CFLAGS
|
||||||
|
|
||||||
(cd %{top_level_dir_name}/make/autoconf
|
|
||||||
bash ./autogen.sh
|
|
||||||
)
|
|
||||||
|
|
||||||
for suffix in %{build_loop} ; do
|
for suffix in %{build_loop} ; do
|
||||||
if [ "x$suffix" = "x" ] ; then
|
if [ "x$suffix" = "x" ] ; then
|
||||||
debugbuild=release
|
debugbuild=release
|
||||||
|
@ -1306,9 +1234,9 @@ bash ../configure \
|
||||||
--with-jobs=1 \
|
--with-jobs=1 \
|
||||||
%endif
|
%endif
|
||||||
--with-version-build=%{buildver} \
|
--with-version-build=%{buildver} \
|
||||||
--with-version-pre="" \
|
--with-version-pre="ea" \
|
||||||
--with-version-opt="" \
|
--with-version-opt="" \
|
||||||
--with-boot-jdk=/usr/lib/jvm/java-%{majorver}-openjdk \
|
--with-boot-jdk=/usr/lib/jvm/java-10-openjdk \
|
||||||
--with-debug-level=$debugbuild \
|
--with-debug-level=$debugbuild \
|
||||||
--with-native-debug-symbols=internal \
|
--with-native-debug-symbols=internal \
|
||||||
--enable-unlimited-crypto \
|
--enable-unlimited-crypto \
|
||||||
|
@ -1522,7 +1450,7 @@ popd
|
||||||
# Install Javadoc documentation
|
# Install Javadoc documentation
|
||||||
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}
|
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}
|
||||||
cp -a %{buildoutputdir -- $suffix}/images/docs $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}
|
cp -a %{buildoutputdir -- $suffix}/images/docs $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}
|
||||||
cp -a %{buildoutputdir -- $suffix}/bundles/jdk-%{newjavaver}+%{buildver}-docs.zip $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip
|
cp -a %{buildoutputdir -- $suffix}/bundles/jdk-%{majorver}-ea+%{buildver}-docs.zip $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip
|
||||||
|
|
||||||
# Install icons and menu entries
|
# Install icons and menu entries
|
||||||
for s in 16 24 32 48 ; do
|
for s in 16 24 32 48 ; do
|
||||||
|
@ -1761,6 +1689,19 @@ require "copy_jdk_configs.lua"
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jun 11 2018 Severin Gehwolf <sgehwolf@redhat.com> - 1:11.0.ea.16-1
|
||||||
|
- Initial version of JDK 11 ea based on tag jdk-11+16.
|
||||||
|
- Removed patches no longer needed or upstream:
|
||||||
|
sorted-diff.patch (see JDK-8198844)
|
||||||
|
JDK-8201788-bootcycle-images-jobs.patch
|
||||||
|
JDK-8201509-s390-atomic_store.patch
|
||||||
|
JDK-8202262-libjsig.so-extra-link-flags.patch (never was an issue on 11)
|
||||||
|
JDK-8193802-npe-jar-getVersionMap.patch
|
||||||
|
- Updated and renamed patches:
|
||||||
|
java-openjdk-s390-size_t.patch => JDK-8203030-s390-size_t.patch
|
||||||
|
- Updated patches for JDK 11:
|
||||||
|
RHBZ-1565658-system-nss-SunEC.patch
|
||||||
|
|
||||||
* Tue Jun 12 2018 Severin Gehwolf <sgehwolf@redhat.com> - 1:10.0.1.10-9
|
* Tue Jun 12 2018 Severin Gehwolf <sgehwolf@redhat.com> - 1:10.0.1.10-9
|
||||||
- Use proper private_libs expression for filtering requires/provides.
|
- Use proper private_libs expression for filtering requires/provides.
|
||||||
|
|
||||||
|
|
|
@ -1,12 +0,0 @@
|
||||||
--- openjdk/make/gensrc/GensrcX11Wrappers.gmk
|
|
||||||
+++ openjdk/make/gensrc/GensrcX11Wrappers.gmk
|
|
||||||
@@ -117,7 +117,8 @@
|
|
||||||
$(call LogInfo, Verifying X11 wrapper sizes)
|
|
||||||
$(call MakeDir, $(@D))
|
|
||||||
$(GENSRC_X11WRAPPERS_TMP)/sizer.$*.exe | $(SORT) > $@.tmp
|
|
||||||
- $(DIFF) $(GENSRC_X11WRAPPERS_TMP)/sizes.$*.verification.tmp $(GENSRC_X11WRAPPERS_TMP)/sizes.$*
|
|
||||||
+ $(SORT) $(GENSRC_X11WRAPPERS_TMP)/sizes.$* > $@-orig.tmp
|
|
||||||
+ $(DIFF) $(GENSRC_X11WRAPPERS_TMP)/sizes.$*.verification.tmp $(GENSRC_X11WRAPPERS_TMP)/sizes.$*.verification-orig.tmp
|
|
||||||
mv $@.tmp $@
|
|
||||||
|
|
||||||
GENSRC_X11WRAPPERS += $(GENSRC_X11WRAPPERS_TMP)/sizes.$(OPENJDK_TARGET_CPU_BITS).verification
|
|
2
sources
2
sources
|
@ -1,2 +1,2 @@
|
||||||
SHA512 (systemtap-tapset-3.6.0pre02.tar.xz) = 848f42ef7ca751e723fd50e3a6da14c0965ad4da37ea3331568658e27497b7a7e4b9aad3dedd264ad0bb5566c37a92302b905f10258a4e2c89dc4ba609e55481
|
SHA512 (systemtap-tapset-3.6.0pre02.tar.xz) = 848f42ef7ca751e723fd50e3a6da14c0965ad4da37ea3331568658e27497b7a7e4b9aad3dedd264ad0bb5566c37a92302b905f10258a4e2c89dc4ba609e55481
|
||||||
SHA512 (jdk-updates-jdk10u-jdk-10.0.1+10.tar.xz) = e57810a4208bb12a6b37f5e8313e30c489e6611ec6be8e7a8fb3c0ae9f1842803a3775bc7cc1f597064444fb4fabae5798a4447712fbf547f7021dd0da384613
|
SHA512 (jdk-jdk-jdk-11+16.tar.xz) = 3f8c9aac270c2096f0260114531dc4224ca77d448e22fc452704ce0e85bba2a067a83a2c2e0db5117632d34e454b57179144d3d508f1b9603dc3805f6c7ec86d
|
||||||
|
|
Loading…
Reference in New Issue