rpms/gcc/devel gcc41-pr27827-test.patch, NONE, 1.1 gcc41-rh200887.patch, 1.1, 1.2 gcc41.spec, 1.91, 1.92

[fedora-cvs-commits at redhat.com]

Author: jakub

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24599

Modified Files:
	gcc41-rh200887.patch gcc41.spec 
Added Files:
	gcc41-pr27827-test.patch 
Log Message:
4.1.1-16

gcc41-pr27827-test.patch:
 pr27827.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gcc41-pr27827-test.patch ---
2006-08-12  Jakub Jelinek  <jakub at redhat.com>

	* gcc.target/i386/pr27827.c: Only compile on ilp32 target.

--- gcc/testsuite/gcc.target/i386/pr27827.c	2006-08-11 17:30:24.000000000 +0200
+++ gcc/testsuite/gcc.target/i386/pr27827.c	2006-08-12 07:26:17.000000000 +0200
@@ -1,4 +1,4 @@
-/* { dg-do compile } */
+/* { dg-do compile { target ilp32 } } */
 /* { dg-options "-O2" } */
 
 double a, b;

gcc41-rh200887.patch:
 0 files changed

Index: gcc41-rh200887.patch
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41-rh200887.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcc41-rh200887.patch	11 Aug 2006 20:58:28 -0000	1.1
+++ gcc41-rh200887.patch	12 Aug 2006 05:31:39 -0000	1.2
@@ -17,7 +17,7 @@
 +	rm -rf META-INF; \
 +	find -type f | xargs touch -r ../$$JARDIR.stamp; \
 +	find -type d | xargs touch -r ../$$JARDIR.stamp; \
-+	$(JAR) -cf at E ../$@ || exit 1; \
++	find * | LC_ALL=C sort | $(JAR) -cf at E ../$@ || exit 1; \
 +	cd ..; \
 +	rm -rf $$JARDIR $$JARDIR.stamp
  
@@ -42,7 +42,7 @@
 +	rm -rf META-INF; \
 +	find -type f | xargs touch -r ../$$JARDIR.stamp; \
 +	find -type d | xargs touch -r ../$$JARDIR.stamp; \
-+	$(JAR) -cf at E ../$@ || exit 1; \
++	find * | LC_ALL=C sort | $(JAR) -cf at E ../$@ || exit 1; \
 +	cd ..; \
 +	rm -rf $$JARDIR $$JARDIR.stamp
  


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- gcc41.spec	11 Aug 2006 20:58:28 -0000	1.91
+++ gcc41.spec	12 Aug 2006 05:31:39 -0000	1.92
@@ -1,6 +1,6 @@
 %define DATE 20060811
 %define gcc_version 4.1.1
-%define gcc_release 15
+%define gcc_release 16
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %ifarch %{ix86} x86_64 ia64
@@ -138,6 +138,7 @@
 Patch31: gcc41-java-libdotdotlib.patch
 Patch32: gcc41-pr28600.patch
 Patch33: gcc41-rh200887.patch
+Patch34: gcc41-pr27827-test.patch
 
 %define _gnu %{nil}
 %ifarch sparc
@@ -452,6 +453,7 @@
 %patch31 -p0 -b .java-libdotdotlib~
 %patch32 -p0 -b .pr28600~
 %patch33 -p0 -b .rh200887~
+%patch34 -p0 -b .pr27827-test~
 
 sed -i -e 's/4\.1\.2/4.1.1/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1512,6 +1514,9 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Sat Aug 12 2006 Jakub Jelinek <jakub at redhat.com> 4.1.1-16
+- fix multilib conflict in libgcj-tools-4.1.1.jar (#200887)
+
 * Fri Aug 11 2006 Jakub Jelinek <jakub at redhat.com> 4.1.1-15
 - update from gcc-4_1-branch (-r115877:116082)
   - PRs c++/27508, c++/28148, c++/28250, c++/28256, c++/28257, c++/28259,
@@ -1522,7 +1527,6 @@
 	target/27566, target/27827
 - fix Fortran ICE with nested function (Paul Thomas, #200618,
   PR fortran/28600)
-- fix multilib conflict in libgcj-tools-4.1.1.jar (#200887)
 
 * Wed Aug  2 2006 Jakub Jelinek <jakub at redhat.com> 4.1.1-14
 - update from gcc-4_1-branch (-r115644:115877)