rpms/java-1.8.0-openjdk
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Add aarch64_FTBFS_rhbz_1307224.patch so as to resolve RHBZ#1307224.

Browse Source 
- 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>
This commit is contained in:
Severin Gehwolf 2016-02-15 11:33:48 +01:00 committed by Jiri Vanek
parent 26fb4d91c2
commit 16c68e0272
2 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
aarch64_FTBFS_rhbz_1307224.patch Normal file
View File

@ -0,0 +1,27 @@
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

10
java-1.8.0-openjdk.spec
View File

@ -735,7 +735,7 @@ Obsoletes: java-1.7.0-openjdk-accessibility%1
Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{updatever}
Release: 5.%{buildver}%{?dist}
Release: 6.%{buildver}%{?dist}
# 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
# also included the epoch in their virtual provides. This created a
@ -812,6 +812,9 @@ Patch100: %{name}-s390-java-opts.patch
Patch102: %{name}-size_t.patch
# Use "%z" for size_t on s390 as size_t != intptr_t
Patch103: s390-size_t_format_flags.patch
# Remove unneccessary template definition in aarch64
# sharedRuntime code. See RHBZ#1307224
Patch104: aarch64_FTBFS_rhbz_1307224.patch
# Patches which need backporting to 8u
# S8073139, RH1191652; fix name of ppc64le architecture
@ -1111,6 +1114,8 @@ sh %{SOURCE12}
%patch102
%patch103
%endif
# Aarch64 build fixes
%patch104
# Zero PPC fixes.
%patch403
@ -1690,6 +1695,9 @@ require "copy_jdk_configs.lua"
%endif
%changelog
* Mon Feb 15 2016 Severin Gehwolf <sgehwolf@redhat.com> - 1:1.8.0.72-6.b15
- Add aarch64_FTBFS_rhbz_1307224.patch so as to resolve RHBZ#1307224.
* Fri Feb 12 2016 Severin Gehwolf <sgehwolf@redhat.com> - 1:1.8.0.72-5.b15
- Add -fno-delete-null-pointer-checks -fno-guess-branch-probability flags to resolve x86/x86_64 crash.