16c68e0272
- Remove unneeded template which fails to compile with GNU C std 98 - Fix jvm.cfg so as to use server JVM and ignore client JVM Signed-off-by: Jiri Vanek <jvanek@redhat.com>
28 lines
1.3 KiB
Diff
28 lines
1.3 KiB
Diff
diff --git openjdk/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp b/java-1.8.0-openjdk-1.8.0.72-5.b15.fc24.x86_64/openjdk/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp
|
|
index ef50802..9d604d5 100644
|
|
--- openjdk/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp
|
|
+++ openjdk/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp
|
|
@@ -194,10 +194,6 @@ static int reg2offset_out(VMReg r) {
|
|
return (r->reg2stack() + SharedRuntime::out_preserve_stack_slots()) * VMRegImpl::stack_slot_size;
|
|
}
|
|
|
|
-template <class T> static const T& min (const T& a, const T& b) {
|
|
- return (a > b) ? b : a;
|
|
-}
|
|
-
|
|
// ---------------------------------------------------------------------------
|
|
// Read the array of BasicTypes from a signature, and compute where the
|
|
// arguments should go. Values in the VMRegPair regs array refer to 4-byte
|
|
diff --git a/java-1.8.0-openjdk-1.8.0.72-6.b15.fc24.x86_64/openjdk/jdk/src/solaris/bin/aarch64/jvm.cfg b/java-1.8.0-openjdk-1.8.0.72-6.b15.fc24.x86_64/openjdk/jdk/src/solaris/bin/aarch64/jvm.cfg
|
|
index d20c3f4..17c4be3 100644
|
|
--- openjdk/jdk/src/solaris/bin/aarch64/jvm.cfg
|
|
+++ openjdk/jdk/src/solaris/bin/aarch64/jvm.cfg
|
|
@@ -31,6 +31,5 @@
|
|
# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
|
|
# and may not be available in a future release.
|
|
#
|
|
--client IF_SERVER_CLASS -server
|
|
-server KNOWN
|
|
--minimal KNOWN
|
|
+-client IGNORE
|