rpms/arm-gp2x-linux-gcc/devel gcc-4.1.2-gcc_eh.patch, NONE, 1.1 arm-gp2x-linux-gcc.spec, 1.1, 1.2

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/arm-gp2x-linux-gcc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16335

Modified Files:
	arm-gp2x-linux-gcc.spec 
Added Files:
	gcc-4.1.2-gcc_eh.patch 
Log Message:
* Fri Aug 3 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.2-6
- Disable bootstrap
- Add "GP2X" to VERSUFFIX
- Link C++ against -lgcc_eh to fix undefined references
- Specify GPL version in License tag


gcc-4.1.2-gcc_eh.patch:

--- NEW FILE gcc-4.1.2-gcc_eh.patch ---
diff -ur gcc-4.1.2/gcc/cp/g++spec.c gcc-4.1.2-gcc_eh/gcc/cp/g++spec.c
--- gcc-4.1.2/gcc/cp/g++spec.c	2005-06-25 02:59:41.000000000 +0200
+++ gcc-4.1.2-gcc_eh/gcc/cp/g++spec.c	2007-08-03 14:46:03.000000000 +0200
@@ -251,7 +251,7 @@
 #endif
 
   /* Make sure to have room for the trailing NULL argument.  */
-  num_args = argc + added + need_math + shared_libgcc + (library > 0) + 1;
+  num_args = argc + added + need_math + shared_libgcc + 2 * (library > 0) + 1;
   arglist = xmalloc (num_args * sizeof (char *));
 
   i = 0;
@@ -311,7 +311,10 @@
     {
       arglist[j] = saw_profile_flag ? LIBSTDCXX_PROFILE : LIBSTDCXX;
       if (arglist[j][0] != '-' || arglist[j][1] == 'l')
-	added_libraries++;
+      {
+	arglist[++j] = "-lgcc_eh";
+	added_libraries += 2;
+      }
       j++;
     }
   if (saw_math)


Index: arm-gp2x-linux-gcc.spec
===================================================================
RCS file: /cvs/extras/rpms/arm-gp2x-linux-gcc/devel/arm-gp2x-linux-gcc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- arm-gp2x-linux-gcc.spec	28 Jul 2007 21:10:36 -0000	1.1
+++ arm-gp2x-linux-gcc.spec	3 Aug 2007 18:04:20 -0000	1.2
@@ -1,13 +1,13 @@
 %define target arm-gp2x-linux
 %define glibcversion 2.3.6
-%define bootstrap 1
+%define bootstrap 0
 
 Name:           %{target}-gcc
 Version:        4.1.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Cross Compiling GNU GCC targeted at %{target}
 Group:          Development/Languages
-License:        GPL
+License:        GPLv2+
 URL:            http://gcc.gnu.org/
 Source0:        ftp://ftp.gnu.org/gnu/gcc/gcc-%{version}/gcc-core-%{version}.tar.bz2
 %if !%{bootstrap}
@@ -19,6 +19,7 @@
 Source3:        README.fedora
 Patch0:         arm-linux-soft-float.patch
 Patch1:         gcc40-cross-build-fixes.patch
+Patch2:         gcc-4.1.2-gcc_eh.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
 BuildRequires:  %{target}-binutils zlib-devel
 Requires:       %{target}-binutils
@@ -56,7 +57,10 @@
 pushd gcc-%{version}
 %patch0 -p1
 %patch1 -p1
-sed -i 's/VERSUFFIX ""/VERSUFFIX " (Fedora %{version}-%{release})"/' \
+%if !%{bootstrap}
+%patch2 -p1
+%endif
+sed -i 's/VERSUFFIX ""/VERSUFFIX " (Fedora GP2X %{version}-%{release})"/' \
   gcc/version.c
 contrib/gcc_update --touch
 popd
@@ -186,6 +190,12 @@
 
 
 %changelog
+* Fri Aug 3 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.2-6
+- Disable bootstrap
+- Add "GP2X" to VERSUFFIX
+- Link C++ against -lgcc_eh to fix undefined references
+- Specify GPL version in License tag
+
 * Thu May 31 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 4.1.2-5
 - Merge in avr-gcc cross compile changes