rpms/compat-gcc-32/devel compat-gcc-32.spec,1.39,1.40

[Jakub Jelinek]

Author: jakub

Update of /cvs/pkgs/rpms/compat-gcc-32/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28455

Modified Files:
	compat-gcc-32.spec 
Log Message:
3.2.3-68


Index: compat-gcc-32.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compat-gcc-32/devel/compat-gcc-32.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- compat-gcc-32.spec	28 Jul 2009 13:04:44 -0000	1.39
+++ compat-gcc-32.spec	17 Sep 2009 14:28:03 -0000	1.40
@@ -1,7 +1,7 @@
 %define LIBSTDCXXDATE 20040818
 %define DATE 20040701
 %define gcc_version 3.2.3
-%define gcc_release 67
+%define gcc_release 68
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define build_java 0
@@ -279,6 +279,9 @@ OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-mt
 %ifarch sparc sparcv9 sparc64
 OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-mcpu=ultrasparc/-mtune=ultrasparc/g'`
 %endif
+%ifarch s390 s390x
+OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-march=z9-109//g;s/-mtune=z10//g'`
+%endif
 OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-Wall//g' -e 's/-Wp,-D_FORTIFY_SOURCE=2//g'`
 OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-fexceptions//g' -e 's/-fasynchronous-unwind-tables//g'`
 OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-fstack-protector//g' -e 's/--param=ssp-buffer-size=[0-9]*//g'`
@@ -340,6 +343,11 @@ for d in `pwd`/%{gcc_target_platform}/li
   popd
 done
 
+# Make sure we are using system libgcc_s, as system libc might
+# use unwinding features that require it.
+mv gcc/libgcc_s.so.1{,.bak}
+ln -sf /%{_lib}/libgcc_s.so.1 gcc/libgcc_s.so.1
+
 # run the tests.
 make %{?_smp_mflags} -k check || :
 sed -ie s/libstdc++-v3/libstdc++33-v3/g `find $(find %{gcc_target_platform} -type d -a -name libstdc++33-v3) -name \*.sum`
@@ -437,6 +445,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_prefix}/%{_lib}/libstdc++.so.5*
 
 %changelog
+* Thu Sep 17 2009 Jakub Jelinek  <jakub at redhat.com> 3.2.3-68
+- strip -march=z9-109 and -mtune=z10 from OPT_FLAGS on s390, s390x
+  (#523209)
+- make sure to use system libgcc_s.so.1 instead of gcc32 one during
+  testing
+
 * Tue Jul 28 2009 Jakub Jelinek  <jakub at redhat.com> 3.2.3-67
 - replace -mtune=generic in $RPM_OPT_FLAGS with something that
   GCC 3.2.3 groks