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

Account for -fno-common default and dupl. declaration.

Browse Source
This commit is contained in:
Severin Gehwolf 2020-01-27 16:11:31 +01:00
parent 8d461f86a1
commit 43d1f0cd18
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
java-1.8.0-openjdk.spec
View File

@ -1140,6 +1140,8 @@ Patch105: jdk8199936-pr3533-enable_mstackrealign_on_x86_linux_as_well_as_x86_mac
Patch106: pr3519-fix_further_functions_with_a_missing_return_value.patch Patch106: pr3519-fix_further_functions_with_a_missing_return_value.patch
# S390 ambiguous log2_intptr calls # S390 ambiguous log2_intptr calls
Patch107: s390-8214206_fix.patch Patch107: s390-8214206_fix.patch
# JDK-8237885: GCC 10 fix redeclaration
Patch120: jdk8236829-aarch64_macroasm_call_vm.patch
############################################# #############################################
# #
@ -1521,6 +1523,7 @@ sh %{SOURCE12}
# AArch64 fixes # AArch64 fixes
%patch106 %patch106
%patch120 -p2
# x86 fixes # x86 fixes
%patch105 %patch105
@ -1618,8 +1621,8 @@ export CFLAGS="$CFLAGS -mieee"
# We use ourcppflags because the OpenJDK build seems to # We use ourcppflags because the OpenJDK build seems to
# pass EXTRA_CFLAGS to the HotSpot C++ compiler... # pass EXTRA_CFLAGS to the HotSpot C++ compiler...
EXTRA_CFLAGS="%ourcppflags -Wno-error" EXTRA_CFLAGS="%ourcppflags -Wno-error -fcommon"
EXTRA_CPP_FLAGS="%ourcppflags" EXTRA_CPP_FLAGS="%ourcppflags -fcommon"
# Fixes annocheck warnings in assembler files due to missing build notes # Fixes annocheck warnings in assembler files due to missing build notes
EXTRA_CPP_FLAGS="$EXTRA_CPP_FLAGS -Wa,--generate-missing-build-notes=yes" EXTRA_CPP_FLAGS="$EXTRA_CPP_FLAGS -Wa,--generate-missing-build-notes=yes"
EXTRA_CFLAGS="$EXTRA_CFLAGS -Wa,--generate-missing-build-notes=yes" EXTRA_CFLAGS="$EXTRA_CFLAGS -Wa,--generate-missing-build-notes=yes"

13
jdk8236829-aarch64_macroasm_call_vm.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/java-1.8.0-openjdk-1.8.0.242.b06-0.0.ea.fc32.x86_64/openjdk/hotspot/src/cpu/aarch64/vm/interp_masm_aarch64.hpp b/java-1.8.0-openjdk-1.8.0.242.b06-0.0.ea.fc32.x86_64/openjdk/hotspot/src/cpu/aarch64/vm/interp_masm_aarch64.hpp
index 22beab0..f3572e1 100644
--- a/java-1.8.0-openjdk-1.8.0.242.b06-0.0.ea.fc32.x86_64/openjdk/hotspot/src/cpu/aarch64/vm/interp_masm_aarch64.hpp
+++ b/java-1.8.0-openjdk-1.8.0.242.b06-0.0.ea.fc32.x86_64/openjdk/hotspot/src/cpu/aarch64/vm/interp_masm_aarch64.hpp
@@ -40,8 +40,6 @@ class InterpreterMacroAssembler: public MacroAssembler {
protected:
protected:
- using MacroAssembler::call_VM_leaf_base;
-
// Interpreter specific version of call_VM_base
using MacroAssembler::call_VM_leaf_base;