From 7754e85a0331ef3692cfcd0f999ede91bf9c3c35 Mon Sep 17 00:00:00 2001 From: Severin Gehwolf Date: Tue, 16 Feb 2016 17:42:33 +0100 Subject: [PATCH] Use -fno-lifetime-dse over -fno-guess-branch-probability. See RHBZ#1306558. Signed-off-by: Omair Majid --- java-1.8.0-openjdk.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index 68c1cb3..22db542 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -735,7 +735,7 @@ Obsoletes: java-1.7.0-openjdk-accessibility%1 Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever} -Release: 6.%{buildver}%{?dist} +Release: 7.%{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 @@ -1193,8 +1193,8 @@ export CFLAGS="$CFLAGS -mieee" # 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-guess-branch-probability" -EXTRA_CPP_FLAGS="%ourcppflags -std=gnu++98 -fno-delete-null-pointer-checks -fno-guess-branch-probability" +EXTRA_CFLAGS="%ourcppflags -std=gnu++98 -Wno-error -fno-delete-null-pointer-checks -fno-lifetime-dse" +EXTRA_CPP_FLAGS="%ourcppflags -std=gnu++98 -fno-delete-null-pointer-checks -fno-lifetime-dse" %ifarch %{power64} ppc # fix rpmlint warnings EXTRA_CFLAGS="$EXTRA_CFLAGS -fno-strict-aliasing" @@ -1695,6 +1695,10 @@ require "copy_jdk_configs.lua" %endif %changelog +* Tue Feb 16 2016 Severin Gehwolf - 1:1.8.0.72-7.b15 +- Use -fno-lifetime-dse over -fno-guess-branch-probability. + See RHBZ#1306558. + * Mon Feb 15 2016 Severin Gehwolf - 1:1.8.0.72-6.b15 - Add aarch64_FTBFS_rhbz_1307224.patch so as to resolve RHBZ#1307224.