This commit is contained in:
Jakub Jelinek 2007-03-17 09:01:19 +00:00
parent 17ad1f415d
commit 23208a98eb
4 changed files with 28 additions and 11 deletions

View File

@ -1 +1 @@
gcc-4.1.2-20070312.tar.bz2 gcc-4.1.2-20070317.tar.bz2

View File

@ -0,0 +1,16 @@
2007-03-16 Andrew Haley <aph@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;

View File

@ -1,6 +1,6 @@
%define DATE 20070312 %define DATE 20070317
%define gcc_version 4.1.2 %define gcc_version 4.1.2
%define gcc_release 4 %define gcc_release 5
%define _unpackaged_files_terminate_build 0 %define _unpackaged_files_terminate_build 0
%define multilib_64_archs sparc64 ppc64 s390x x86_64 %define multilib_64_archs sparc64 ppc64 s390x x86_64
%define include_gappletviewer 1 %define include_gappletviewer 1
@ -142,9 +142,7 @@ Patch30: gcc41-rh228769.patch
Patch31: gcc41-pr30045.patch Patch31: gcc41-pr30045.patch
Patch32: gcc41-rh227376.patch Patch32: gcc41-rh227376.patch
Patch33: gcc41-rh231134.patch Patch33: gcc41-rh231134.patch
Patch34: gcc41-libjava-xpcom.patch Patch34: gcc41-java-bogus-debugline.patch
Patch35: gcc41-rh231261.patch
Patch36: gcc41-libjava-mandir.patch
%define _gnu %{nil} %define _gnu %{nil}
%ifarch sparc %ifarch sparc
%define gcc_target_platform sparc64-%{_vendor}-%{_target_os} %define gcc_target_platform sparc64-%{_vendor}-%{_target_os}
@ -454,9 +452,7 @@ which are required to run programs compiled with the GNAT.
%patch31 -p0 -b .pr30045~ %patch31 -p0 -b .pr30045~
%patch32 -p0 -b .rh227376~ %patch32 -p0 -b .rh227376~
%patch33 -p0 -b .rh231134~ %patch33 -p0 -b .rh231134~
%patch34 -p0 -b .libjava-xpcom~ %patch34 -p0 -b .java-bogus-debugline~
%patch35 -p0 -b .rh231261~
%patch36 -p0 -b .libjava-mandir~
sed -i -e 's/4\.1\.3/4.1.2/' gcc/BASE-VER gcc/version.c 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 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@ -575,7 +571,7 @@ CC="$CC" CFLAGS="$OPT_FLAGS" CXXFLAGS="$OPT_FLAGS" XCFLAGS="$OPT_FLAGS" TCFLAGS=
--disable-libgcj \ --disable-libgcj \
%else %else
--enable-java-awt=gtk --disable-dssi --enable-plugin \ --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 \ --enable-libgcj-multifile --enable-java-maintainer-mode \
--with-ecj-jar=/usr/share/java/eclipse-ecj.jar \ --with-ecj-jar=/usr/share/java/eclipse-ecj.jar \
%endif %endif
@ -1570,6 +1566,11 @@ fi
%doc rpm.doc/changelogs/libmudflap/ChangeLog* %doc rpm.doc/changelogs/libmudflap/ChangeLog*
%changelog %changelog
* Sat Mar 17 2007 Jakub Jelinek <jakub@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@redhat.com> 4.1.2-4 * Mon Mar 12 2007 Jakub Jelinek <jakub@redhat.com> 4.1.2-4
- update from gcc-4_1-branch (-r122219:122833) - update from gcc-4_1-branch (-r122219:122833)
- PRs c++/30852, c++/30895, classpath/28550, classpath/30831, - PRs c++/30852, c++/30895, classpath/28550, classpath/30831,

View File

@ -1 +1 @@
83aac73ce88d22b20880a5bcba6bc0e3 gcc-4.1.2-20070312.tar.bz2 37b9ba44114c5c5905f8f176010d263f gcc-4.1.2-20070317.tar.bz2