From 4be2d32258f05e457a151ebb0e2f7ad0d61b5778 Mon Sep 17 00:00:00 2001
From: Ben Allan <baallan@sandia.gov>
Date: Fri, 1 Sep 2017 09:14:50 -0600
Subject: [PATCH] 3.4.4 ldms github release update

added O1 for gcc 4.8.5 bug on toss
---
 cle6.unstable/firerpms         | 2 +-
 toss3/firerpms                 | 2 +-
 toss3/ovis.spec.in             | 9 ++++++---
 toss3/patches/flex_array.3.4.1 | 4 ++--
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/cle6.unstable/firerpms b/cle6.unstable/firerpms
index 5d0409a..0c5feb6 100755
--- a/cle6.unstable/firerpms
+++ b/cle6.unstable/firerpms
@@ -5,7 +5,7 @@ packing=cle6.unstable
 ovis_branch=master
 sos_branch=master
 NetworkRequires=gitlab.opengridcomputing.com
-SOSREPO=gitlab@gitlab.opengridcomputing.com:tom/SOS.git
+#SOSREPO=gitlab@gitlab.opengridcomputing.com:tom/SOS.git
 OVISREPO=gitlab@gitlab.opengridcomputing.com:ovis/ovis.git
 
 . ../support/package-functions
diff --git a/toss3/firerpms b/toss3/firerpms
index e24f6a3..21b887b 100755
--- a/toss3/firerpms
+++ b/toss3/firerpms
@@ -2,7 +2,7 @@
 #
 #
 packing=toss3
-ovis_branch=OVIS-3.4.3
+ovis_branch=OVIS-3.4.4
 sos_branch=master
 NetworkRequires=github.com
 #SOSREPO=gitlab@gitlab.opengridcomputing.com:tom/SOS.git
diff --git a/toss3/ovis.spec.in b/toss3/ovis.spec.in
index 8fe3804..8198353 100644
--- a/toss3/ovis.spec.in
+++ b/toss3/ovis.spec.in
@@ -22,7 +22,7 @@
 Summary: OVIS Commands and Libraries
 Name: ovis
 Version: @VERSION@
-Release: 1.1%{?dist}
+Release: 2.1%{?dist}
 License: GPLv2 or BSD
 Group: %{ldms_all}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -60,7 +60,7 @@ Prefix: /etc
 
 %description
 This package provides the OVIS commands and libraries, OVIS apis and transport libraries, and scalable object store libraries for TOSS 3.
-Configured with @ac_configure_args@ CFLAGS=" @CFLAGS@ %{optflags}"
+Configured with @ac_configure_args@ CFLAGS=" @CFLAGS@ %{optflags} -O1"
 
 
 %prep
@@ -70,7 +70,7 @@ Configured with @ac_configure_args@ CFLAGS=" @CFLAGS@ %{optflags}"
 echo bTMPPATH %{_tmppath}
 rm -rf $RPM_BUILD_ROOT
 echo bBUILDROOT $RPM_BUILD_ROOT
-export CFLAGS="@CFLAGS@ %{optflags}"
+export CFLAGS="@CFLAGS@ %{optflags} -O1"
 %configure @ac_configure_args@
 make V=1 -j 16
 
@@ -470,6 +470,9 @@ done
 @ENABLE_BALER_TRUE@ln -s $RPM_INSTALL_PREFIX/lib/python*/site-packages/baler/bquery.py $RPM_INSTALL_PREFIX/bin/bhquery
 
 %changelog
+* Thu Aug 31 2017 Ben Allan <baallan@sandia.gov> 3.4.4-2.1
+Update for upstream and override -O2 which produces infinite loop bugs
+with toss gcc 4.8.5.
 * Wed Apr 26 2017 Ben Allan <baallan@sandia.gov> 3.4.1-1
 Flex array and swig bug patches. Refactor cython dependent bits.
 * Wed Mar 29 2017 Ben Allan <baallan@sandia.gov> 3.4.0-1
diff --git a/toss3/patches/flex_array.3.4.1 b/toss3/patches/flex_array.3.4.1
index cfb2722..6050bbf 100644
--- a/toss3/patches/flex_array.3.4.1
+++ b/toss3/patches/flex_array.3.4.1
@@ -325,8 +325,8 @@ index a5b6314..f0a5168 100755
 +# These are the cflags defined by Redhat for daemons and other 
 +# security-required applications in /usr/lib/rpm/redhat/macros.
 +# SUSE and Debian define nearly identical sets. They require c99
-+# flexible array syntax in declarations.
-+export RHEL7_CFLAGS="-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches"
++# flexible array syntax in declarations. O1 overrides gcc loop bug.
++export RHEL7_CFLAGS="-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches -O1"
 +export CFLAGS="$RHEL7_CFLAGS"
 +# See also: https://gcc.gnu.org/onlinedocs/gcc/Zero-Length.html for why this is important.