rpms/gcc/devel gcc41-java-bogus-debugline.patch, NONE, 1.1 .cvsignore, 1.199, 1.200 gcc41.spec, 1.150, 1.151 sources, 1.201, 1.202 gcc41-libjava-mandir.patch, 1.1, NONE gcc41-libjava-xpcom.patch, 1.1, NONE gcc41-rh231261.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: jakub

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

Modified Files:
	.cvsignore gcc41.spec sources 
Added Files:
	gcc41-java-bogus-debugline.patch 
Removed Files:
	gcc41-libjava-mandir.patch gcc41-libjava-xpcom.patch 
	gcc41-rh231261.patch 
Log Message:
4.1.2-5

gcc41-java-bogus-debugline.patch:
 0 files changed

--- NEW FILE gcc41-java-bogus-debugline.patch ---
2007-03-16  Andrew Haley  <aph at redhat.com>

	* class.c (push_class): Don't bogusly guess the source filename.

--- gcc/java/class.c	(revision 122746)
+++ gcc/java/class.c	(working copy)
@@ -426,8 +426,7 @@
   tree decl, signature;
   location_t saved_loc = input_location;
 #ifndef USE_MAPPED_LOCATION
-  tree source_name = identifier_subst (class_name, "", '.', '/', ".java");
-  input_filename = IDENTIFIER_POINTER (source_name);
+  input_filename = "<unknown>";
   input_line = 0;
 #endif
   CLASS_P (class_type) = 1;


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- .cvsignore	12 Mar 2007 08:08:02 -0000	1.199
+++ .cvsignore	17 Mar 2007 09:01:19 -0000	1.200
@@ -1 +1 @@
-gcc-4.1.2-20070312.tar.bz2
+gcc-4.1.2-20070317.tar.bz2


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- gcc41.spec	13 Mar 2007 07:15:05 -0000	1.150
+++ gcc41.spec	17 Mar 2007 09:01:19 -0000	1.151
@@ -1,6 +1,6 @@
-%define DATE 20070312
+%define DATE 20070317
 %define gcc_version 4.1.2
-%define gcc_release 4
+%define gcc_release 5
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define include_gappletviewer 1
@@ -142,9 +142,7 @@
 Patch31: gcc41-pr30045.patch
 Patch32: gcc41-rh227376.patch
 Patch33: gcc41-rh231134.patch
-Patch34: gcc41-libjava-xpcom.patch
-Patch35: gcc41-rh231261.patch
-Patch36: gcc41-libjava-mandir.patch
+Patch34: gcc41-java-bogus-debugline.patch
 %define _gnu %{nil}
 %ifarch sparc
 %define gcc_target_platform sparc64-%{_vendor}-%{_target_os}
@@ -454,9 +452,7 @@
 %patch31 -p0 -b .pr30045~
 %patch32 -p0 -b .rh227376~
 %patch33 -p0 -b .rh231134~
-%patch34 -p0 -b .libjava-xpcom~
-%patch35 -p0 -b .rh231261~
-%patch36 -p0 -b .libjava-mandir~
+%patch34 -p0 -b .java-bogus-debugline~
 
 sed -i -e 's/4\.1\.3/4.1.2/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -575,7 +571,7 @@
 	--disable-libgcj \
 %else
 	--enable-java-awt=gtk --disable-dssi --enable-plugin \
-	--with-java-home=%{_prefix}/lib/jvm/java-1.4.2-gcj-1.4.2.0/jre \
+	--with-java-home=%{_prefix}/lib/jvm/java-1.5.0-gcj-1.5.0.0/jre \
 	--enable-libgcj-multifile --enable-java-maintainer-mode \
 	--with-ecj-jar=/usr/share/java/eclipse-ecj.jar \
 %endif
@@ -1570,6 +1566,11 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Sat Mar 17 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-5
+- update from gcc-4_1-branch (-r122833:123011)
+  - PRs debug/29906, middle-end/30364, middle-end/30433, target/31123
+- rebuilt against newer rpm to fix libgcj debuginfo (#232222)
+
 * Mon Mar 12 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-4
 - update from gcc-4_1-branch (-r122219:122833)
   - PRs c++/30852, c++/30895, classpath/28550, classpath/30831,


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/sources,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -r1.201 -r1.202
--- sources	12 Mar 2007 08:08:02 -0000	1.201
+++ sources	17 Mar 2007 09:01:19 -0000	1.202
@@ -1 +1 @@
-83aac73ce88d22b20880a5bcba6bc0e3  gcc-4.1.2-20070312.tar.bz2
+37b9ba44114c5c5905f8f176010d263f  gcc-4.1.2-20070317.tar.bz2


--- gcc41-libjava-mandir.patch DELETED ---


--- gcc41-libjava-xpcom.patch DELETED ---


--- gcc41-rh231261.patch DELETED ---