rpms/avr-gcc/F-11 avr-gcc-4.3.3-progmem.patch, NONE, 1.1 avr-gcc.spec, 1.6, 1.7 import.log, 1.1, 1.2

[Thibault North]

Author: tnorth

Update of /cvs/pkgs/rpms/avr-gcc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25995/F-11

Modified Files:
	avr-gcc.spec import.log 
Added Files:
	avr-gcc-4.3.3-progmem.patch 
Log Message:
Bugfix release


avr-gcc-4.3.3-progmem.patch:
 avr.c |    3 +++
 avr.h |    4 ----
 2 files changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE avr-gcc-4.3.3-progmem.patch ---
--- gcc/config/avr/avr.c	2008/09/14 12:33:40	140359
+++ gcc/config/avr/avr.c	2008/09/14 12:50:10	140360
@@ -1089,6 +1089,8 @@
 		 true_regnum (XEXP (x, 0)));
       debug_rtx (x);
     }
+  if (!strict && GET_CODE (x) == SUBREG)
+	x = SUBREG_REG (x);
   if (REG_P (x) && (strict ? REG_OK_FOR_BASE_STRICT_P (x)
                     : REG_OK_FOR_BASE_NOSTRICT_P (x)))
     r = POINTER_REGS;
@@ -1103,6 +1105,7 @@
       if (fit)
 	{
 	  if (! strict
+	      || REGNO (XEXP (x,0)) == REG_X
 	      || REGNO (XEXP (x,0)) == REG_Y
 	      || REGNO (XEXP (x,0)) == REG_Z)
 	    r = BASE_POINTER_REGS;
--- gcc/config/avr/avr.h	2008/09/14 12:33:40	140359
+++ gcc/config/avr/avr.h	2008/09/14 12:50:10	140360
@@ -483,10 +483,6 @@
 		           OPNUM, TYPE);				    \
 	      goto WIN;							    \
 	    }								    \
-	  push_reload (XEXP (X, 0), NULL_RTX, &XEXP (X, 0), NULL,	    \
-		       BASE_POINTER_REGS, GET_MODE (X), VOIDmode, 0, 0,	    \
-		       OPNUM, TYPE);					    \
-          goto WIN;							    \
 	}								    \
       else if (! (frame_pointer_needed && XEXP (X,0) == frame_pointer_rtx)) \
 	{								    \



Index: avr-gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/avr-gcc/F-11/avr-gcc.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- avr-gcc.spec	24 Feb 2009 03:41:20 -0000	1.6
+++ avr-gcc.spec	20 Jan 2010 21:18:04 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:           %{target}-gcc
 Version:        4.3.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Cross Compiling GNU GCC targeted at %{target}
 Group:          Development/Languages
 License:        GPLv2+
@@ -11,7 +11,8 @@ Source0:        ftp://ftp.gnu.org/gnu/gc
 Source1:        ftp://ftp.gnu.org/gnu/gcc/gcc-%{version}/gcc-g++-%{version}.tar.bz2
 Source2:        README.fedora
 
-Patch0:		avr-gcc-4.3.3-inline-change.patch
+Patch0:         avr-gcc-4.3.3-inline-change.patch
+Patch1:         avr-gcc-4.3.3-progmem.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
 BuildRequires:  %{target}-binutils >= 2.13, zlib-devel gawk gmp-devel mpfr-devel
 Requires:       %{target}-binutils >= 2.13
@@ -38,6 +39,7 @@ platform.
 pushd gcc-%{version}
 
 %patch0 -p0
+%patch1 -p0
 sed -i 's/VERSUFFIX ""/VERSUFFIX " (Fedora %{version}-%{release})"/' \
   gcc/version.c
 contrib/gcc_update --touch
@@ -122,6 +124,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Jan 20 2010 Thibault North <tnorth AT fedoraproject DOT org> - 4.3.3-3
+- Progmem patch (thanks Benedikt Gollatz)
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.3.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/avr-gcc/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	14 Feb 2009 18:21:10 -0000	1.1
+++ import.log	20 Jan 2010 21:18:04 -0000	1.2
@@ -1 +1,2 @@
 avr-gcc-4_3_3-1_fc11:HEAD:avr-gcc-4.3.3-1.fc11.src.rpm:1234635624
+avr-gcc-4_3_3-3_fc11:F-11:avr-gcc-4.3.3-3.fc11.src.rpm:1264022245