From 8ebdc0d602ba298a07c8af7368fb1973cdc38ce1 Mon Sep 17 00:00:00 2001 From: Severin Gehwolf Date: Tue, 24 Mar 2020 13:21:53 +0100 Subject: [PATCH] Revert GCC 10 workaround on s390x Resolves: RHBZ#1799087 --- java-11-openjdk.spec | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec index 67497c0..26609d4 100644 --- a/java-11-openjdk.spec +++ b/java-11-openjdk.spec @@ -223,7 +223,7 @@ %global top_level_dir_name %{origin} %global minorver 0 %global buildver 2 -%global rpmrelease 2 +%global rpmrelease 3 #%%global tagsuffix "" # priority must be 8 digits in total; untill openjdk 1.8 we were using 18..... so when moving to 11 we had to add another digit %if %is_system_jdk @@ -1372,16 +1372,11 @@ export ARCH_DATA_MODEL=64 export CFLAGS="$CFLAGS -mieee" %endif -GCC_10_WORKAROUND_S390x="-fno-tree-coalesce-vars -fno-tree-copy-prop -fno-tree-dce -fno-tree-dominator-opts -fno-tree-dse -fno-tree-forwprop -fno-tree-fre -fno-tree-loop-distribute-patterns -fno-tree-loop-distribution -fno-tree-loop-vectorize -fno-tree-partial-pre -fno-tree-phiprop -fno-tree-pre -fno-tree-pta -fno-tree-scev-cprop -fno-tree-sink -fno-tree-slp-vectorize -fno-tree-slsr -fno-tree-sra -fno-tree-switch-conversion -fno-tree-tail-merge -fno-tree-ter -fno-tree-vrp -fno-unit-at-a-time -fno-unswitch-loops -fno-vect-cost-model -fno-version-loops-for-strides" # We use ourcppflags because the OpenJDK build seems to # pass EXTRA_CFLAGS to the HotSpot C++ compiler... # Explicitly set the C++ standard as the default has changed on GCC >= 6 EXTRA_CFLAGS="%ourcppflags -std=gnu++98 -Wno-error -fno-delete-null-pointer-checks -fno-lifetime-dse -fcommon" EXTRA_CPP_FLAGS="%ourcppflags -std=gnu++98 -fno-delete-null-pointer-checks -fno-lifetime-dse -fcommon" -%ifarch s390x -EXTRA_CFLAGS="$EXTRA_CFLAGS $GCC_10_WORKAROUND_S390x" -EXTRA_CPP_FLAGS="$EXTRA_CPP_FLAGS $GCC_10_WORKAROUND_S390x" -%endif %ifarch %{power64} ppc # fix rpmlint warnings @@ -1855,6 +1850,10 @@ require "copy_jdk_configs.lua" %changelog +* Tue Mar 24 2020 Severin Gehwolf - 1:11.0.7.2-0.3.ea +- Revert GCC 10 workaround for s390x. +- Resolves RHBZ#1799087. + * Fri Mar 20 2020 Andrew John Hughes - 1:11.0.7.2-0.2.ea - Backport JDK-8241296 to fix segfaults when active_handles is NULL (RH1813550)