jvanek pushed to java-1.8.0-openjdk (f22). "Merge branch 'f22' of ssh://pkgs.fedoraproject.org/java-1.8.0-openjdk into f22 (..more)"

[notifications at fedoraproject.org]

>From 3db367d4b04fd53cf5e069efd786c1cf91cb7957 Mon Sep 17 00:00:00 2001
From: Omair Majid <omajid at redhat.com>
Date: Tue, 14 Apr 2015 20:49:54 -0400
Subject: Add -fno-tree-vrp to cflags to fix miscompilation

Resolves: RHBZ#120836

diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index 4183243..52da0db 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -1077,9 +1077,11 @@ export CFLAGS="$CFLAGS -mieee"
 %endif
 
 EXTRA_CFLAGS="-fstack-protector-strong"
-#see https://bugzilla.redhat.com/show_bug.cgi?id=1120792
-EXTRA_CFLAGS="$EXTRA_CFLAGS -fno-devirtualize -Wno-return-local-addr"
-EXTRA_CPP_FLAGS="-fno-devirtualize -Wno-return-local-addr"
+# Disable various optimizations to fix miscompliation. See:
+# - https://bugzilla.redhat.com/show_bug.cgi?id=1120792
+# - https://bugzilla.redhat.com/show_bug.cgi?id=1208369
+EXTRA_CFLAGS="$EXTRA_CFLAGS -fno-devirtualize -fno-tree-vrp"
+EXTRA_CPP_FLAGS="-fno-devirtualize -fno-tree-vrp"
 # PPC/PPC64 needs -fno-tree-vectorize since -O3 would
 # otherwise generate wrong code producing segfaults.
 %ifarch %{power64} ppc
@@ -1708,6 +1710,10 @@ end
 
 
 %changelog
+* Tue Apr 14 2015 Omair Majid <omajid at redhat.com> - 1:1.8.0.40-27.b25
+- Add -fno-tree-vrp to flags to prevent hotspot miscompilation.
+- Resolves: RHBZ#1208369
+
 * Thu Apr 02 2015 Jiri Vanek <jvanek at redhat.com> - 1:1.8.0.40-27.b25
 - bumped release. Needed rebuild by itself on arm
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/java-1.8.0-openjdk.git/commit/?h=f22&id=10fb4ee0a80dedc3b6ee06174d1542feb9383908