[sdcc/f15/master] fix build loop

Roy Rankin rrankin at fedoraproject.org
Wed Apr 13 03:17:50 UTC 2011


commit 462dac40fd4bda9ad1a5c19762c92481585bf200
Author: Roy Rankin <rrankin at ihug.com.au>
Date:   Wed Apr 13 13:17:53 2011 +1000

    fix build loop

 sdcc-3.0.0-gcc_loop.diff |   22 ++++++++++++++++++++++
 sdcc.spec                |    7 ++++++-
 2 files changed, 28 insertions(+), 1 deletions(-)
---
diff --git a/sdcc-3.0.0-gcc_loop.diff b/sdcc-3.0.0-gcc_loop.diff
new file mode 100644
index 0000000..c3508c1
--- /dev/null
+++ b/sdcc-3.0.0-gcc_loop.diff
@@ -0,0 +1,22 @@
+diff --git a/src/SDCCicode.c b/src/SDCCicode.c
+index 8b40945..df12a1d 100644
+--- a/src/SDCCicode.c
++++ b/src/SDCCicode.c
+@@ -1130,6 +1130,9 @@ iCode *getBuiltinParms (iCode *ic, int *pcount, operand **parms)
+     return ic;
+ }
+ 
++#pragma GCC push_options
++#pragma GCC optimize ("O0")
++
+ /*-----------------------------------------------------------------*/
+ /* operandOperation - performs operations on operands             */
+ /*-----------------------------------------------------------------*/
+@@ -1405,6 +1408,7 @@ operandOperation (operand * left, operand * right,
+ 
+   return retval;
+ }
++#pragma GCC pop_options
+ 
+ 
+ /*-----------------------------------------------------------------*/
diff --git a/sdcc.spec b/sdcc.spec
index e3e892e..3b08fab 100644
--- a/sdcc.spec
+++ b/sdcc.spec
@@ -1,12 +1,13 @@
 Name:           sdcc
 Version:        3.0.0
-Release:        0%{?dist}
+Release:        1%{?dist}
 Summary:        Small Device C Compiler
 Group:          Applications/Engineering
 License:        GPLv2+
 URL:            http://sdcc.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/sdcc/sdcc-src-%{version}.tar.bz2
 Source1:        README.fedora
+Patch:		%{name}-%{version}-gcc_loop.diff 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  autoconf
@@ -51,6 +52,7 @@ Emacs extensions for SDCC.
 %prep
 %setup -q -n sdcc
 find -name '*.[ch]' -exec chmod -x '{}' \;
+%patch -p1
 
 # Disable brp-strip-static-archive for now because it errors trying to
 # strip foreign binaries.
@@ -115,6 +117,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Apr 13 2011 Roy Rankin <rrankin at ihug.com.au> - 3.0.0-1
+- Patch for infinite loop in gcc during build
+
 * Sun Mar 20 2011 Roy Rankin <rrankin at ihug.com.au> - 3.0.0-0
 - Upstrem release 3.0.0, do not use gc
 


More information about the scm-commits mailing list