From 43d1f0cd186651f3870efcd435984c117b502612 Mon Sep 17 00:00:00 2001 From: Severin Gehwolf Date: Mon, 27 Jan 2020 16:11:31 +0100 Subject: [PATCH] Account for -fno-common default and dupl. declaration. --- java-1.8.0-openjdk.spec | 7 +++++-- jdk8236829-aarch64_macroasm_call_vm.patch | 13 +++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 jdk8236829-aarch64_macroasm_call_vm.patch diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index 74def62..71f28bc 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -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 # S390 ambiguous log2_intptr calls 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 %patch106 +%patch120 -p2 # x86 fixes %patch105 @@ -1618,8 +1621,8 @@ export CFLAGS="$CFLAGS -mieee" # We use ourcppflags because the OpenJDK build seems to # pass EXTRA_CFLAGS to the HotSpot C++ compiler... -EXTRA_CFLAGS="%ourcppflags -Wno-error" -EXTRA_CPP_FLAGS="%ourcppflags" +EXTRA_CFLAGS="%ourcppflags -Wno-error -fcommon" +EXTRA_CPP_FLAGS="%ourcppflags -fcommon" # Fixes annocheck warnings in assembler files due to missing build notes EXTRA_CPP_FLAGS="$EXTRA_CPP_FLAGS -Wa,--generate-missing-build-notes=yes" EXTRA_CFLAGS="$EXTRA_CFLAGS -Wa,--generate-missing-build-notes=yes" diff --git a/jdk8236829-aarch64_macroasm_call_vm.patch b/jdk8236829-aarch64_macroasm_call_vm.patch new file mode 100644 index 0000000..ecd1ccb --- /dev/null +++ b/jdk8236829-aarch64_macroasm_call_vm.patch @@ -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; +