[avr-gcc] New upstream release and fixes

[Thibault North]

commit c68ce6550c00fe2da879827e9a9d1c621e7be975
Author: Thibault North <tnorth at fedoraproject.org>
Date:   Sat Oct 15 16:04:34 2011 -0400

    New upstream release and fixes

 avr-gcc-4.6.1-progmem.patch |   23 +++++++++++++++++++++++
 avr-gcc.spec                |    7 ++++++-
 2 files changed, 29 insertions(+), 1 deletions(-)
---
diff --git a/avr-gcc-4.6.1-progmem.patch b/avr-gcc-4.6.1-progmem.patch
new file mode 100644
index 0000000..c06143c
--- /dev/null
+++ b/avr-gcc-4.6.1-progmem.patch
@@ -0,0 +1,23 @@
+--- gcc/config/avr/avr.c	2011/07/04 12:28:02	175809
++++ gcc/config/avr/avr.c	2011/07/04 12:33:00	175810
+@@ -5049,7 +5049,19 @@
+       && (TREE_STATIC (node) || DECL_EXTERNAL (node))
+       && avr_progmem_p (node, *attributes))
+     {
+-      if (TREE_READONLY (node)) 
++      tree node0 = node;
++
++      /* For C++, we have to peel arrays in order to get correct
++         determination of readonlyness.  */
++      
++      do
++        node0 = TREE_TYPE (node0);
++      while (TREE_CODE (node0) == ARRAY_TYPE);
++
++      if (error_mark_node == node0)
++        return;
++      
++      if (TYPE_READONLY (node0))
+         {
+           static const char dsec[] = ".progmem.data";
+ 
diff --git a/avr-gcc.spec b/avr-gcc.spec
index c367385..556a4bd 100644
--- a/avr-gcc.spec
+++ b/avr-gcc.spec
@@ -2,7 +2,7 @@
 
 Name:           %{target}-gcc
 Version:        4.6.1
-Release:        2%{?dist}.1
+Release:        3%{?dist}
 Summary:        Cross Compiling GNU GCC targeted at %{target}
 Group:          Development/Languages
 License:        GPLv2+
@@ -12,6 +12,7 @@ Source1:        ftp://ftp.gnu.org/gnu/gcc/gcc-%{version}/gcc-g++-%{version}.tar.
 Source2:        README.fedora
 
 Patch0:         avr-gcc-4.5.3-mint8.patch
+Patch1:         avr-gcc-4.6.1-progmem.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
 BuildRequires:  %{target}-binutils >= 2.13, zlib-devel gawk gmp-devel mpfr-devel libmpc-devel
@@ -39,6 +40,7 @@ platform.
 pushd gcc-%{version}
 
 %patch0 -p0
+%patch1 -p0
 
 contrib/gcc_update --touch
 popd
@@ -124,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Oct 15 2011 Thibault North <tnorth at fedoraproject.org> - 4.6.1-3
+- Fix BZ#737950 thanks Jan Wildeboer
+
 * Mon Oct 10 2011 Peter Schiffer <pschiffe at redhat.com> - 4.6.1-2.1
 - rebuild with new gmp