diff --git a/binutils.changes b/binutils.changes
index ad8ec19..fcfe19c 100644
--- a/binutils.changes
+++ b/binutils.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jan  4 12:31:02 UTC 2012 - rguenther@suse.com
+
+- Add patch to fix arm unwind table corruption.  [bso#13449]
+- Canonicalize arm targets.
+- Enable gold for arm.
+
 -------------------------------------------------------------------
 Tue Jan  3 14:42:59 UTC 2012 - rguenther@suse.com
 
diff --git a/binutils.spec b/binutils.spec
index 3b8338c..d10117a 100644
--- a/binutils.spec
+++ b/binutils.spec
@@ -41,7 +41,7 @@ Release:        10
 #
 # handle test suite failures
 #
-%ifarch alpha armv4l hppa mips sh4 %sparc
+%ifarch alpha %arm hppa mips sh4 %sparc
 %define	make_check_handling	true
 %else
 # XXX check again
@@ -91,6 +91,7 @@ Patch14:        binutils-build-as-needed.diff
 Patch15:        fixup-testcase-perturb.diff
 Patch18:        gold-depend-on-opcodes.diff
 Patch19:        bso12451.diff
+Patch20:        bso13449.diff
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -171,7 +172,7 @@ AutoReqProv:    on
 Requires:       binutils = %{version}-%{release}
 Group:          Development/Tools/Building
 %if 0%{suse_version} > 1100
-%define gold_archs %ix86 x86_64 ppc ppc64 %sparc
+%define gold_archs %ix86 %arm x86_64 ppc ppc64 %sparc
 %endif
 
 %description gold
@@ -281,7 +282,7 @@ Authors:
 %if "%{name}" != "binutils"
 %define TARGET %(echo %{name} | sed -e "s/cross-\\(.*\\)-binutils/\\1/;s/-/_/g;s/parisc/hppa/;s/i.86/i586/;s/ppc/powerpc/")
 %endif
-%ifarch %{arm} armv5l armv7l armv8l
+%ifarch %arm
 %define HOST %{_target_cpu}-suse-linux-gnueabi
 %else
 %define HOST %(echo %{_target_cpu} | sed -e "s/parisc/hppa/" -e "s/i.86/i586/" -e "s/ppc/powerpc/" -e "s/sparc64v.*/sparc64/" -e "s/sparcv.*/sparc/")-suse-linux
@@ -305,6 +306,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch15
 %patch18
 %patch19 -p1
+%patch20 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
@@ -343,14 +345,8 @@ EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux"
 %ifarch ppc ppc64
 EXTRA_TARGETS="$EXTRA_TARGETS,spu-elf"
 %endif
-%ifarch armv5l
-EXTRA_TARGETS="$EXTRA_TARGETS,armv5l-suse-linux"
-%endif
-%ifarch armv7l
-EXTRA_TARGETS="$EXTRA_TARGETS,armv7l-suse-linux"
-%endif
-%ifarch armv8l
-EXTRA_TARGETS="$EXTRA_TARGETS,armv8l-suse-linux"
+%ifarch %arm
+EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %endif
 %define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\
@@ -406,7 +402,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux"
 EXTRA_TARGETS="$EXTRA_TARGETS,hppa64-suse-linux"
 %endif
 %if "%{TARGET}" == "arm"
-EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
 TARGET_OS=%{TARGET}
diff --git a/bso13449.diff b/bso13449.diff
new file mode 100644
index 0000000..b2fe29e
--- /dev/null
+++ b/bso13449.diff
@@ -0,0 +1,20 @@
+    PR gas/13449
+    * config/tc-arm.c (create_unwind_entry): Zero allocated table
+    entries.
+
+===================================================================
+RCS file: /cvs/src/src/gas/config/tc-arm.c,v
+retrieving revision 1.512
+retrieving revision 1.513
+diff -u -r1.512 -r1.513
+--- src/gas/config/tc-arm.c	2011/12/15 10:21:49	1.512
++++ src/gas/config/tc-arm.c	2011/12/21 17:07:26	1.513
+@@ -19944,6 +19944,8 @@
+ 
+   /* Allocate the table entry.	*/
+   ptr = frag_more ((size << 2) + 4);
++  /* PR 13449: Zero the table entries in case some of them are not used.  */
++  memset (ptr, 0, (size << 2) + 4);
+   where = frag_now_fix () - ((size << 2) + 4);
+ 
+   switch (unwind.personality_index)
diff --git a/cross-alpha-binutils.changes b/cross-alpha-binutils.changes
index ad8ec19..fcfe19c 100644
--- a/cross-alpha-binutils.changes
+++ b/cross-alpha-binutils.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jan  4 12:31:02 UTC 2012 - rguenther@suse.com
+
+- Add patch to fix arm unwind table corruption.  [bso#13449]
+- Canonicalize arm targets.
+- Enable gold for arm.
+
 -------------------------------------------------------------------
 Tue Jan  3 14:42:59 UTC 2012 - rguenther@suse.com
 
diff --git a/cross-alpha-binutils.spec b/cross-alpha-binutils.spec
index 20bad47..dedb4ac 100644
--- a/cross-alpha-binutils.spec
+++ b/cross-alpha-binutils.spec
@@ -41,7 +41,7 @@ Release:        10
 #
 # handle test suite failures
 #
-%ifarch alpha armv4l hppa mips sh4 %sparc
+%ifarch alpha %arm hppa mips sh4 %sparc
 %define	make_check_handling	true
 %else
 # XXX check again
@@ -91,6 +91,7 @@ Patch14:        binutils-build-as-needed.diff
 Patch15:        fixup-testcase-perturb.diff
 Patch18:        gold-depend-on-opcodes.diff
 Patch19:        bso12451.diff
+Patch20:        bso13449.diff
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -253,7 +254,7 @@ Authors:
 %if "%{name}" != "binutils"
 %define TARGET %(echo %{name} | sed -e "s/cross-\\(.*\\)-binutils/\\1/;s/-/_/g;s/parisc/hppa/;s/i.86/i586/;s/ppc/powerpc/")
 %endif
-%ifarch %{arm} armv5l armv7l armv8l
+%ifarch %arm
 %define HOST %{_target_cpu}-suse-linux-gnueabi
 %else
 %define HOST %(echo %{_target_cpu} | sed -e "s/parisc/hppa/" -e "s/i.86/i586/" -e "s/ppc/powerpc/" -e "s/sparc64v.*/sparc64/" -e "s/sparcv.*/sparc/")-suse-linux
@@ -277,6 +278,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch15
 %patch18
 %patch19 -p1
+%patch20 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
@@ -315,14 +317,8 @@ EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux"
 %ifarch ppc ppc64
 EXTRA_TARGETS="$EXTRA_TARGETS,spu-elf"
 %endif
-%ifarch armv5l
-EXTRA_TARGETS="$EXTRA_TARGETS,armv5l-suse-linux"
-%endif
-%ifarch armv7l
-EXTRA_TARGETS="$EXTRA_TARGETS,armv7l-suse-linux"
-%endif
-%ifarch armv8l
-EXTRA_TARGETS="$EXTRA_TARGETS,armv8l-suse-linux"
+%ifarch %arm
+EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %endif
 %define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\
@@ -375,7 +371,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux"
 EXTRA_TARGETS="$EXTRA_TARGETS,hppa64-suse-linux"
 %endif
 %if "%{TARGET}" == "arm"
-EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
 TARGET_OS=%{TARGET}
diff --git a/cross-arm-binutils.changes b/cross-arm-binutils.changes
index ad8ec19..fcfe19c 100644
--- a/cross-arm-binutils.changes
+++ b/cross-arm-binutils.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jan  4 12:31:02 UTC 2012 - rguenther@suse.com
+
+- Add patch to fix arm unwind table corruption.  [bso#13449]
+- Canonicalize arm targets.
+- Enable gold for arm.
+
 -------------------------------------------------------------------
 Tue Jan  3 14:42:59 UTC 2012 - rguenther@suse.com
 
diff --git a/cross-arm-binutils.spec b/cross-arm-binutils.spec
index f58c9b5..20a46ba 100644
--- a/cross-arm-binutils.spec
+++ b/cross-arm-binutils.spec
@@ -41,7 +41,7 @@ Release:        10
 #
 # handle test suite failures
 #
-%ifarch alpha armv4l hppa mips sh4 %sparc
+%ifarch alpha %arm hppa mips sh4 %sparc
 %define	make_check_handling	true
 %else
 # XXX check again
@@ -91,6 +91,7 @@ Patch14:        binutils-build-as-needed.diff
 Patch15:        fixup-testcase-perturb.diff
 Patch18:        gold-depend-on-opcodes.diff
 Patch19:        bso12451.diff
+Patch20:        bso13449.diff
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -253,7 +254,7 @@ Authors:
 %if "%{name}" != "binutils"
 %define TARGET %(echo %{name} | sed -e "s/cross-\\(.*\\)-binutils/\\1/;s/-/_/g;s/parisc/hppa/;s/i.86/i586/;s/ppc/powerpc/")
 %endif
-%ifarch %{arm} armv5l armv7l armv8l
+%ifarch %arm
 %define HOST %{_target_cpu}-suse-linux-gnueabi
 %else
 %define HOST %(echo %{_target_cpu} | sed -e "s/parisc/hppa/" -e "s/i.86/i586/" -e "s/ppc/powerpc/" -e "s/sparc64v.*/sparc64/" -e "s/sparcv.*/sparc/")-suse-linux
@@ -277,6 +278,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch15
 %patch18
 %patch19 -p1
+%patch20 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
@@ -315,14 +317,8 @@ EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux"
 %ifarch ppc ppc64
 EXTRA_TARGETS="$EXTRA_TARGETS,spu-elf"
 %endif
-%ifarch armv5l
-EXTRA_TARGETS="$EXTRA_TARGETS,armv5l-suse-linux"
-%endif
-%ifarch armv7l
-EXTRA_TARGETS="$EXTRA_TARGETS,armv7l-suse-linux"
-%endif
-%ifarch armv8l
-EXTRA_TARGETS="$EXTRA_TARGETS,armv8l-suse-linux"
+%ifarch %arm
+EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %endif
 %define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\
@@ -375,7 +371,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux"
 EXTRA_TARGETS="$EXTRA_TARGETS,hppa64-suse-linux"
 %endif
 %if "%{TARGET}" == "arm"
-EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
 TARGET_OS=%{TARGET}
diff --git a/cross-hppa-binutils.changes b/cross-hppa-binutils.changes
index ad8ec19..fcfe19c 100644
--- a/cross-hppa-binutils.changes
+++ b/cross-hppa-binutils.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jan  4 12:31:02 UTC 2012 - rguenther@suse.com
+
+- Add patch to fix arm unwind table corruption.  [bso#13449]
+- Canonicalize arm targets.
+- Enable gold for arm.
+
 -------------------------------------------------------------------
 Tue Jan  3 14:42:59 UTC 2012 - rguenther@suse.com
 
diff --git a/cross-hppa-binutils.spec b/cross-hppa-binutils.spec
index 1a50d79..732be02 100644
--- a/cross-hppa-binutils.spec
+++ b/cross-hppa-binutils.spec
@@ -41,7 +41,7 @@ Release:        10
 #
 # handle test suite failures
 #
-%ifarch alpha armv4l hppa mips sh4 %sparc
+%ifarch alpha %arm hppa mips sh4 %sparc
 %define	make_check_handling	true
 %else
 # XXX check again
@@ -91,6 +91,7 @@ Patch14:        binutils-build-as-needed.diff
 Patch15:        fixup-testcase-perturb.diff
 Patch18:        gold-depend-on-opcodes.diff
 Patch19:        bso12451.diff
+Patch20:        bso13449.diff
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -253,7 +254,7 @@ Authors:
 %if "%{name}" != "binutils"
 %define TARGET %(echo %{name} | sed -e "s/cross-\\(.*\\)-binutils/\\1/;s/-/_/g;s/parisc/hppa/;s/i.86/i586/;s/ppc/powerpc/")
 %endif
-%ifarch %{arm} armv5l armv7l armv8l
+%ifarch %arm
 %define HOST %{_target_cpu}-suse-linux-gnueabi
 %else
 %define HOST %(echo %{_target_cpu} | sed -e "s/parisc/hppa/" -e "s/i.86/i586/" -e "s/ppc/powerpc/" -e "s/sparc64v.*/sparc64/" -e "s/sparcv.*/sparc/")-suse-linux
@@ -277,6 +278,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch15
 %patch18
 %patch19 -p1
+%patch20 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
@@ -315,14 +317,8 @@ EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux"
 %ifarch ppc ppc64
 EXTRA_TARGETS="$EXTRA_TARGETS,spu-elf"
 %endif
-%ifarch armv5l
-EXTRA_TARGETS="$EXTRA_TARGETS,armv5l-suse-linux"
-%endif
-%ifarch armv7l
-EXTRA_TARGETS="$EXTRA_TARGETS,armv7l-suse-linux"
-%endif
-%ifarch armv8l
-EXTRA_TARGETS="$EXTRA_TARGETS,armv8l-suse-linux"
+%ifarch %arm
+EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %endif
 %define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\
@@ -375,7 +371,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux"
 EXTRA_TARGETS="$EXTRA_TARGETS,hppa64-suse-linux"
 %endif
 %if "%{TARGET}" == "arm"
-EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
 TARGET_OS=%{TARGET}
diff --git a/cross-hppa64-binutils.changes b/cross-hppa64-binutils.changes
index ad8ec19..fcfe19c 100644
--- a/cross-hppa64-binutils.changes
+++ b/cross-hppa64-binutils.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jan  4 12:31:02 UTC 2012 - rguenther@suse.com
+
+- Add patch to fix arm unwind table corruption.  [bso#13449]
+- Canonicalize arm targets.
+- Enable gold for arm.
+
 -------------------------------------------------------------------
 Tue Jan  3 14:42:59 UTC 2012 - rguenther@suse.com
 
diff --git a/cross-hppa64-binutils.spec b/cross-hppa64-binutils.spec
index 754d71e..5001418 100644
--- a/cross-hppa64-binutils.spec
+++ b/cross-hppa64-binutils.spec
@@ -41,7 +41,7 @@ Release:        10
 #
 # handle test suite failures
 #
-%ifarch alpha armv4l hppa mips sh4 %sparc
+%ifarch alpha %arm hppa mips sh4 %sparc
 %define	make_check_handling	true
 %else
 # XXX check again
@@ -91,6 +91,7 @@ Patch14:        binutils-build-as-needed.diff
 Patch15:        fixup-testcase-perturb.diff
 Patch18:        gold-depend-on-opcodes.diff
 Patch19:        bso12451.diff
+Patch20:        bso13449.diff
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -253,7 +254,7 @@ Authors:
 %if "%{name}" != "binutils"
 %define TARGET %(echo %{name} | sed -e "s/cross-\\(.*\\)-binutils/\\1/;s/-/_/g;s/parisc/hppa/;s/i.86/i586/;s/ppc/powerpc/")
 %endif
-%ifarch %{arm} armv5l armv7l armv8l
+%ifarch %arm
 %define HOST %{_target_cpu}-suse-linux-gnueabi
 %else
 %define HOST %(echo %{_target_cpu} | sed -e "s/parisc/hppa/" -e "s/i.86/i586/" -e "s/ppc/powerpc/" -e "s/sparc64v.*/sparc64/" -e "s/sparcv.*/sparc/")-suse-linux
@@ -277,6 +278,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch15
 %patch18
 %patch19 -p1
+%patch20 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
@@ -315,14 +317,8 @@ EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux"
 %ifarch ppc ppc64
 EXTRA_TARGETS="$EXTRA_TARGETS,spu-elf"
 %endif
-%ifarch armv5l
-EXTRA_TARGETS="$EXTRA_TARGETS,armv5l-suse-linux"
-%endif
-%ifarch armv7l
-EXTRA_TARGETS="$EXTRA_TARGETS,armv7l-suse-linux"
-%endif
-%ifarch armv8l
-EXTRA_TARGETS="$EXTRA_TARGETS,armv8l-suse-linux"
+%ifarch %arm
+EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %endif
 %define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\
@@ -375,7 +371,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux"
 EXTRA_TARGETS="$EXTRA_TARGETS,hppa64-suse-linux"
 %endif
 %if "%{TARGET}" == "arm"
-EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
 TARGET_OS=%{TARGET}
diff --git a/cross-i386-binutils.changes b/cross-i386-binutils.changes
index ad8ec19..fcfe19c 100644
--- a/cross-i386-binutils.changes
+++ b/cross-i386-binutils.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jan  4 12:31:02 UTC 2012 - rguenther@suse.com
+
+- Add patch to fix arm unwind table corruption.  [bso#13449]
+- Canonicalize arm targets.
+- Enable gold for arm.
+
 -------------------------------------------------------------------
 Tue Jan  3 14:42:59 UTC 2012 - rguenther@suse.com
 
diff --git a/cross-i386-binutils.spec b/cross-i386-binutils.spec
index bf74c4a..9869677 100644
--- a/cross-i386-binutils.spec
+++ b/cross-i386-binutils.spec
@@ -41,7 +41,7 @@ Release:        10
 #
 # handle test suite failures
 #
-%ifarch alpha armv4l hppa mips sh4 %sparc
+%ifarch alpha %arm hppa mips sh4 %sparc
 %define	make_check_handling	true
 %else
 # XXX check again
@@ -91,6 +91,7 @@ Patch14:        binutils-build-as-needed.diff
 Patch15:        fixup-testcase-perturb.diff
 Patch18:        gold-depend-on-opcodes.diff
 Patch19:        bso12451.diff
+Patch20:        bso13449.diff
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -253,7 +254,7 @@ Authors:
 %if "%{name}" != "binutils"
 %define TARGET %(echo %{name} | sed -e "s/cross-\\(.*\\)-binutils/\\1/;s/-/_/g;s/parisc/hppa/;s/i.86/i586/;s/ppc/powerpc/")
 %endif
-%ifarch %{arm} armv5l armv7l armv8l
+%ifarch %arm
 %define HOST %{_target_cpu}-suse-linux-gnueabi
 %else
 %define HOST %(echo %{_target_cpu} | sed -e "s/parisc/hppa/" -e "s/i.86/i586/" -e "s/ppc/powerpc/" -e "s/sparc64v.*/sparc64/" -e "s/sparcv.*/sparc/")-suse-linux
@@ -277,6 +278,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch15
 %patch18
 %patch19 -p1
+%patch20 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
@@ -315,14 +317,8 @@ EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux"
 %ifarch ppc ppc64
 EXTRA_TARGETS="$EXTRA_TARGETS,spu-elf"
 %endif
-%ifarch armv5l
-EXTRA_TARGETS="$EXTRA_TARGETS,armv5l-suse-linux"
-%endif
-%ifarch armv7l
-EXTRA_TARGETS="$EXTRA_TARGETS,armv7l-suse-linux"
-%endif
-%ifarch armv8l
-EXTRA_TARGETS="$EXTRA_TARGETS,armv8l-suse-linux"
+%ifarch %arm
+EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %endif
 %define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\
@@ -375,7 +371,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux"
 EXTRA_TARGETS="$EXTRA_TARGETS,hppa64-suse-linux"
 %endif
 %if "%{TARGET}" == "arm"
-EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
 TARGET_OS=%{TARGET}
diff --git a/cross-ia64-binutils.changes b/cross-ia64-binutils.changes
index ad8ec19..fcfe19c 100644
--- a/cross-ia64-binutils.changes
+++ b/cross-ia64-binutils.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jan  4 12:31:02 UTC 2012 - rguenther@suse.com
+
+- Add patch to fix arm unwind table corruption.  [bso#13449]
+- Canonicalize arm targets.
+- Enable gold for arm.
+
 -------------------------------------------------------------------
 Tue Jan  3 14:42:59 UTC 2012 - rguenther@suse.com
 
diff --git a/cross-ia64-binutils.spec b/cross-ia64-binutils.spec
index d5fe381..71c648c 100644
--- a/cross-ia64-binutils.spec
+++ b/cross-ia64-binutils.spec
@@ -41,7 +41,7 @@ Release:        10
 #
 # handle test suite failures
 #
-%ifarch alpha armv4l hppa mips sh4 %sparc
+%ifarch alpha %arm hppa mips sh4 %sparc
 %define	make_check_handling	true
 %else
 # XXX check again
@@ -91,6 +91,7 @@ Patch14:        binutils-build-as-needed.diff
 Patch15:        fixup-testcase-perturb.diff
 Patch18:        gold-depend-on-opcodes.diff
 Patch19:        bso12451.diff
+Patch20:        bso13449.diff
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -253,7 +254,7 @@ Authors:
 %if "%{name}" != "binutils"
 %define TARGET %(echo %{name} | sed -e "s/cross-\\(.*\\)-binutils/\\1/;s/-/_/g;s/parisc/hppa/;s/i.86/i586/;s/ppc/powerpc/")
 %endif
-%ifarch %{arm} armv5l armv7l armv8l
+%ifarch %arm
 %define HOST %{_target_cpu}-suse-linux-gnueabi
 %else
 %define HOST %(echo %{_target_cpu} | sed -e "s/parisc/hppa/" -e "s/i.86/i586/" -e "s/ppc/powerpc/" -e "s/sparc64v.*/sparc64/" -e "s/sparcv.*/sparc/")-suse-linux
@@ -277,6 +278,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch15
 %patch18
 %patch19 -p1
+%patch20 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
@@ -315,14 +317,8 @@ EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux"
 %ifarch ppc ppc64
 EXTRA_TARGETS="$EXTRA_TARGETS,spu-elf"
 %endif
-%ifarch armv5l
-EXTRA_TARGETS="$EXTRA_TARGETS,armv5l-suse-linux"
-%endif
-%ifarch armv7l
-EXTRA_TARGETS="$EXTRA_TARGETS,armv7l-suse-linux"
-%endif
-%ifarch armv8l
-EXTRA_TARGETS="$EXTRA_TARGETS,armv8l-suse-linux"
+%ifarch %arm
+EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %endif
 %define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\
@@ -375,7 +371,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux"
 EXTRA_TARGETS="$EXTRA_TARGETS,hppa64-suse-linux"
 %endif
 %if "%{TARGET}" == "arm"
-EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
 TARGET_OS=%{TARGET}
diff --git a/cross-mips-binutils.changes b/cross-mips-binutils.changes
index ad8ec19..fcfe19c 100644
--- a/cross-mips-binutils.changes
+++ b/cross-mips-binutils.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jan  4 12:31:02 UTC 2012 - rguenther@suse.com
+
+- Add patch to fix arm unwind table corruption.  [bso#13449]
+- Canonicalize arm targets.
+- Enable gold for arm.
+
 -------------------------------------------------------------------
 Tue Jan  3 14:42:59 UTC 2012 - rguenther@suse.com
 
diff --git a/cross-mips-binutils.spec b/cross-mips-binutils.spec
index 89a9ec9..60bda1a 100644
--- a/cross-mips-binutils.spec
+++ b/cross-mips-binutils.spec
@@ -41,7 +41,7 @@ Release:        10
 #
 # handle test suite failures
 #
-%ifarch alpha armv4l hppa mips sh4 %sparc
+%ifarch alpha %arm hppa mips sh4 %sparc
 %define	make_check_handling	true
 %else
 # XXX check again
@@ -91,6 +91,7 @@ Patch14:        binutils-build-as-needed.diff
 Patch15:        fixup-testcase-perturb.diff
 Patch18:        gold-depend-on-opcodes.diff
 Patch19:        bso12451.diff
+Patch20:        bso13449.diff
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -253,7 +254,7 @@ Authors:
 %if "%{name}" != "binutils"
 %define TARGET %(echo %{name} | sed -e "s/cross-\\(.*\\)-binutils/\\1/;s/-/_/g;s/parisc/hppa/;s/i.86/i586/;s/ppc/powerpc/")
 %endif
-%ifarch %{arm} armv5l armv7l armv8l
+%ifarch %arm
 %define HOST %{_target_cpu}-suse-linux-gnueabi
 %else
 %define HOST %(echo %{_target_cpu} | sed -e "s/parisc/hppa/" -e "s/i.86/i586/" -e "s/ppc/powerpc/" -e "s/sparc64v.*/sparc64/" -e "s/sparcv.*/sparc/")-suse-linux
@@ -277,6 +278,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch15
 %patch18
 %patch19 -p1
+%patch20 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
@@ -315,14 +317,8 @@ EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux"
 %ifarch ppc ppc64
 EXTRA_TARGETS="$EXTRA_TARGETS,spu-elf"
 %endif
-%ifarch armv5l
-EXTRA_TARGETS="$EXTRA_TARGETS,armv5l-suse-linux"
-%endif
-%ifarch armv7l
-EXTRA_TARGETS="$EXTRA_TARGETS,armv7l-suse-linux"
-%endif
-%ifarch armv8l
-EXTRA_TARGETS="$EXTRA_TARGETS,armv8l-suse-linux"
+%ifarch %arm
+EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %endif
 %define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\
@@ -375,7 +371,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux"
 EXTRA_TARGETS="$EXTRA_TARGETS,hppa64-suse-linux"
 %endif
 %if "%{TARGET}" == "arm"
-EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
 TARGET_OS=%{TARGET}
diff --git a/cross-ppc-binutils.changes b/cross-ppc-binutils.changes
index ad8ec19..fcfe19c 100644
--- a/cross-ppc-binutils.changes
+++ b/cross-ppc-binutils.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jan  4 12:31:02 UTC 2012 - rguenther@suse.com
+
+- Add patch to fix arm unwind table corruption.  [bso#13449]
+- Canonicalize arm targets.
+- Enable gold for arm.
+
 -------------------------------------------------------------------
 Tue Jan  3 14:42:59 UTC 2012 - rguenther@suse.com
 
diff --git a/cross-ppc-binutils.spec b/cross-ppc-binutils.spec
index 7a41768..db9c10a 100644
--- a/cross-ppc-binutils.spec
+++ b/cross-ppc-binutils.spec
@@ -41,7 +41,7 @@ Release:        10
 #
 # handle test suite failures
 #
-%ifarch alpha armv4l hppa mips sh4 %sparc
+%ifarch alpha %arm hppa mips sh4 %sparc
 %define	make_check_handling	true
 %else
 # XXX check again
@@ -91,6 +91,7 @@ Patch14:        binutils-build-as-needed.diff
 Patch15:        fixup-testcase-perturb.diff
 Patch18:        gold-depend-on-opcodes.diff
 Patch19:        bso12451.diff
+Patch20:        bso13449.diff
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -253,7 +254,7 @@ Authors:
 %if "%{name}" != "binutils"
 %define TARGET %(echo %{name} | sed -e "s/cross-\\(.*\\)-binutils/\\1/;s/-/_/g;s/parisc/hppa/;s/i.86/i586/;s/ppc/powerpc/")
 %endif
-%ifarch %{arm} armv5l armv7l armv8l
+%ifarch %arm
 %define HOST %{_target_cpu}-suse-linux-gnueabi
 %else
 %define HOST %(echo %{_target_cpu} | sed -e "s/parisc/hppa/" -e "s/i.86/i586/" -e "s/ppc/powerpc/" -e "s/sparc64v.*/sparc64/" -e "s/sparcv.*/sparc/")-suse-linux
@@ -277,6 +278,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch15
 %patch18
 %patch19 -p1
+%patch20 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
@@ -315,14 +317,8 @@ EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux"
 %ifarch ppc ppc64
 EXTRA_TARGETS="$EXTRA_TARGETS,spu-elf"
 %endif
-%ifarch armv5l
-EXTRA_TARGETS="$EXTRA_TARGETS,armv5l-suse-linux"
-%endif
-%ifarch armv7l
-EXTRA_TARGETS="$EXTRA_TARGETS,armv7l-suse-linux"
-%endif
-%ifarch armv8l
-EXTRA_TARGETS="$EXTRA_TARGETS,armv8l-suse-linux"
+%ifarch %arm
+EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %endif
 %define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\
@@ -375,7 +371,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux"
 EXTRA_TARGETS="$EXTRA_TARGETS,hppa64-suse-linux"
 %endif
 %if "%{TARGET}" == "arm"
-EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
 TARGET_OS=%{TARGET}
diff --git a/cross-ppc64-binutils.changes b/cross-ppc64-binutils.changes
index ad8ec19..fcfe19c 100644
--- a/cross-ppc64-binutils.changes
+++ b/cross-ppc64-binutils.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jan  4 12:31:02 UTC 2012 - rguenther@suse.com
+
+- Add patch to fix arm unwind table corruption.  [bso#13449]
+- Canonicalize arm targets.
+- Enable gold for arm.
+
 -------------------------------------------------------------------
 Tue Jan  3 14:42:59 UTC 2012 - rguenther@suse.com
 
diff --git a/cross-ppc64-binutils.spec b/cross-ppc64-binutils.spec
index f3a3e9d..487ef5a 100644
--- a/cross-ppc64-binutils.spec
+++ b/cross-ppc64-binutils.spec
@@ -41,7 +41,7 @@ Release:        10
 #
 # handle test suite failures
 #
-%ifarch alpha armv4l hppa mips sh4 %sparc
+%ifarch alpha %arm hppa mips sh4 %sparc
 %define	make_check_handling	true
 %else
 # XXX check again
@@ -91,6 +91,7 @@ Patch14:        binutils-build-as-needed.diff
 Patch15:        fixup-testcase-perturb.diff
 Patch18:        gold-depend-on-opcodes.diff
 Patch19:        bso12451.diff
+Patch20:        bso13449.diff
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -253,7 +254,7 @@ Authors:
 %if "%{name}" != "binutils"
 %define TARGET %(echo %{name} | sed -e "s/cross-\\(.*\\)-binutils/\\1/;s/-/_/g;s/parisc/hppa/;s/i.86/i586/;s/ppc/powerpc/")
 %endif
-%ifarch %{arm} armv5l armv7l armv8l
+%ifarch %arm
 %define HOST %{_target_cpu}-suse-linux-gnueabi
 %else
 %define HOST %(echo %{_target_cpu} | sed -e "s/parisc/hppa/" -e "s/i.86/i586/" -e "s/ppc/powerpc/" -e "s/sparc64v.*/sparc64/" -e "s/sparcv.*/sparc/")-suse-linux
@@ -277,6 +278,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch15
 %patch18
 %patch19 -p1
+%patch20 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
@@ -315,14 +317,8 @@ EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux"
 %ifarch ppc ppc64
 EXTRA_TARGETS="$EXTRA_TARGETS,spu-elf"
 %endif
-%ifarch armv5l
-EXTRA_TARGETS="$EXTRA_TARGETS,armv5l-suse-linux"
-%endif
-%ifarch armv7l
-EXTRA_TARGETS="$EXTRA_TARGETS,armv7l-suse-linux"
-%endif
-%ifarch armv8l
-EXTRA_TARGETS="$EXTRA_TARGETS,armv8l-suse-linux"
+%ifarch %arm
+EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %endif
 %define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\
@@ -375,7 +371,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux"
 EXTRA_TARGETS="$EXTRA_TARGETS,hppa64-suse-linux"
 %endif
 %if "%{TARGET}" == "arm"
-EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
 TARGET_OS=%{TARGET}
diff --git a/cross-s390-binutils.changes b/cross-s390-binutils.changes
index ad8ec19..fcfe19c 100644
--- a/cross-s390-binutils.changes
+++ b/cross-s390-binutils.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jan  4 12:31:02 UTC 2012 - rguenther@suse.com
+
+- Add patch to fix arm unwind table corruption.  [bso#13449]
+- Canonicalize arm targets.
+- Enable gold for arm.
+
 -------------------------------------------------------------------
 Tue Jan  3 14:42:59 UTC 2012 - rguenther@suse.com
 
diff --git a/cross-s390-binutils.spec b/cross-s390-binutils.spec
index 2a33d3e..34519df 100644
--- a/cross-s390-binutils.spec
+++ b/cross-s390-binutils.spec
@@ -41,7 +41,7 @@ Release:        10
 #
 # handle test suite failures
 #
-%ifarch alpha armv4l hppa mips sh4 %sparc
+%ifarch alpha %arm hppa mips sh4 %sparc
 %define	make_check_handling	true
 %else
 # XXX check again
@@ -91,6 +91,7 @@ Patch14:        binutils-build-as-needed.diff
 Patch15:        fixup-testcase-perturb.diff
 Patch18:        gold-depend-on-opcodes.diff
 Patch19:        bso12451.diff
+Patch20:        bso13449.diff
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -253,7 +254,7 @@ Authors:
 %if "%{name}" != "binutils"
 %define TARGET %(echo %{name} | sed -e "s/cross-\\(.*\\)-binutils/\\1/;s/-/_/g;s/parisc/hppa/;s/i.86/i586/;s/ppc/powerpc/")
 %endif
-%ifarch %{arm} armv5l armv7l armv8l
+%ifarch %arm
 %define HOST %{_target_cpu}-suse-linux-gnueabi
 %else
 %define HOST %(echo %{_target_cpu} | sed -e "s/parisc/hppa/" -e "s/i.86/i586/" -e "s/ppc/powerpc/" -e "s/sparc64v.*/sparc64/" -e "s/sparcv.*/sparc/")-suse-linux
@@ -277,6 +278,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch15
 %patch18
 %patch19 -p1
+%patch20 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
@@ -315,14 +317,8 @@ EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux"
 %ifarch ppc ppc64
 EXTRA_TARGETS="$EXTRA_TARGETS,spu-elf"
 %endif
-%ifarch armv5l
-EXTRA_TARGETS="$EXTRA_TARGETS,armv5l-suse-linux"
-%endif
-%ifarch armv7l
-EXTRA_TARGETS="$EXTRA_TARGETS,armv7l-suse-linux"
-%endif
-%ifarch armv8l
-EXTRA_TARGETS="$EXTRA_TARGETS,armv8l-suse-linux"
+%ifarch %arm
+EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %endif
 %define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\
@@ -375,7 +371,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux"
 EXTRA_TARGETS="$EXTRA_TARGETS,hppa64-suse-linux"
 %endif
 %if "%{TARGET}" == "arm"
-EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
 TARGET_OS=%{TARGET}
diff --git a/cross-s390x-binutils.changes b/cross-s390x-binutils.changes
index ad8ec19..fcfe19c 100644
--- a/cross-s390x-binutils.changes
+++ b/cross-s390x-binutils.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jan  4 12:31:02 UTC 2012 - rguenther@suse.com
+
+- Add patch to fix arm unwind table corruption.  [bso#13449]
+- Canonicalize arm targets.
+- Enable gold for arm.
+
 -------------------------------------------------------------------
 Tue Jan  3 14:42:59 UTC 2012 - rguenther@suse.com
 
diff --git a/cross-s390x-binutils.spec b/cross-s390x-binutils.spec
index 4bda7f4..85f1e3a 100644
--- a/cross-s390x-binutils.spec
+++ b/cross-s390x-binutils.spec
@@ -41,7 +41,7 @@ Release:        10
 #
 # handle test suite failures
 #
-%ifarch alpha armv4l hppa mips sh4 %sparc
+%ifarch alpha %arm hppa mips sh4 %sparc
 %define	make_check_handling	true
 %else
 # XXX check again
@@ -91,6 +91,7 @@ Patch14:        binutils-build-as-needed.diff
 Patch15:        fixup-testcase-perturb.diff
 Patch18:        gold-depend-on-opcodes.diff
 Patch19:        bso12451.diff
+Patch20:        bso13449.diff
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -253,7 +254,7 @@ Authors:
 %if "%{name}" != "binutils"
 %define TARGET %(echo %{name} | sed -e "s/cross-\\(.*\\)-binutils/\\1/;s/-/_/g;s/parisc/hppa/;s/i.86/i586/;s/ppc/powerpc/")
 %endif
-%ifarch %{arm} armv5l armv7l armv8l
+%ifarch %arm
 %define HOST %{_target_cpu}-suse-linux-gnueabi
 %else
 %define HOST %(echo %{_target_cpu} | sed -e "s/parisc/hppa/" -e "s/i.86/i586/" -e "s/ppc/powerpc/" -e "s/sparc64v.*/sparc64/" -e "s/sparcv.*/sparc/")-suse-linux
@@ -277,6 +278,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch15
 %patch18
 %patch19 -p1
+%patch20 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
@@ -315,14 +317,8 @@ EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux"
 %ifarch ppc ppc64
 EXTRA_TARGETS="$EXTRA_TARGETS,spu-elf"
 %endif
-%ifarch armv5l
-EXTRA_TARGETS="$EXTRA_TARGETS,armv5l-suse-linux"
-%endif
-%ifarch armv7l
-EXTRA_TARGETS="$EXTRA_TARGETS,armv7l-suse-linux"
-%endif
-%ifarch armv8l
-EXTRA_TARGETS="$EXTRA_TARGETS,armv8l-suse-linux"
+%ifarch %arm
+EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %endif
 %define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\
@@ -375,7 +371,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux"
 EXTRA_TARGETS="$EXTRA_TARGETS,hppa64-suse-linux"
 %endif
 %if "%{TARGET}" == "arm"
-EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
 TARGET_OS=%{TARGET}
diff --git a/cross-sparc-binutils.changes b/cross-sparc-binutils.changes
index ad8ec19..fcfe19c 100644
--- a/cross-sparc-binutils.changes
+++ b/cross-sparc-binutils.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jan  4 12:31:02 UTC 2012 - rguenther@suse.com
+
+- Add patch to fix arm unwind table corruption.  [bso#13449]
+- Canonicalize arm targets.
+- Enable gold for arm.
+
 -------------------------------------------------------------------
 Tue Jan  3 14:42:59 UTC 2012 - rguenther@suse.com
 
diff --git a/cross-sparc-binutils.spec b/cross-sparc-binutils.spec
index fe3dbef..6a62827 100644
--- a/cross-sparc-binutils.spec
+++ b/cross-sparc-binutils.spec
@@ -41,7 +41,7 @@ Release:        10
 #
 # handle test suite failures
 #
-%ifarch alpha armv4l hppa mips sh4 %sparc
+%ifarch alpha %arm hppa mips sh4 %sparc
 %define	make_check_handling	true
 %else
 # XXX check again
@@ -91,6 +91,7 @@ Patch14:        binutils-build-as-needed.diff
 Patch15:        fixup-testcase-perturb.diff
 Patch18:        gold-depend-on-opcodes.diff
 Patch19:        bso12451.diff
+Patch20:        bso13449.diff
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -253,7 +254,7 @@ Authors:
 %if "%{name}" != "binutils"
 %define TARGET %(echo %{name} | sed -e "s/cross-\\(.*\\)-binutils/\\1/;s/-/_/g;s/parisc/hppa/;s/i.86/i586/;s/ppc/powerpc/")
 %endif
-%ifarch %{arm} armv5l armv7l armv8l
+%ifarch %arm
 %define HOST %{_target_cpu}-suse-linux-gnueabi
 %else
 %define HOST %(echo %{_target_cpu} | sed -e "s/parisc/hppa/" -e "s/i.86/i586/" -e "s/ppc/powerpc/" -e "s/sparc64v.*/sparc64/" -e "s/sparcv.*/sparc/")-suse-linux
@@ -277,6 +278,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch15
 %patch18
 %patch19 -p1
+%patch20 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
@@ -315,14 +317,8 @@ EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux"
 %ifarch ppc ppc64
 EXTRA_TARGETS="$EXTRA_TARGETS,spu-elf"
 %endif
-%ifarch armv5l
-EXTRA_TARGETS="$EXTRA_TARGETS,armv5l-suse-linux"
-%endif
-%ifarch armv7l
-EXTRA_TARGETS="$EXTRA_TARGETS,armv7l-suse-linux"
-%endif
-%ifarch armv8l
-EXTRA_TARGETS="$EXTRA_TARGETS,armv8l-suse-linux"
+%ifarch %arm
+EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %endif
 %define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\
@@ -375,7 +371,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux"
 EXTRA_TARGETS="$EXTRA_TARGETS,hppa64-suse-linux"
 %endif
 %if "%{TARGET}" == "arm"
-EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
 TARGET_OS=%{TARGET}
diff --git a/cross-spu-binutils.changes b/cross-spu-binutils.changes
index ad8ec19..fcfe19c 100644
--- a/cross-spu-binutils.changes
+++ b/cross-spu-binutils.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jan  4 12:31:02 UTC 2012 - rguenther@suse.com
+
+- Add patch to fix arm unwind table corruption.  [bso#13449]
+- Canonicalize arm targets.
+- Enable gold for arm.
+
 -------------------------------------------------------------------
 Tue Jan  3 14:42:59 UTC 2012 - rguenther@suse.com
 
diff --git a/cross-spu-binutils.spec b/cross-spu-binutils.spec
index 2e856f8..eb62a57 100644
--- a/cross-spu-binutils.spec
+++ b/cross-spu-binutils.spec
@@ -41,7 +41,7 @@ Release:        10
 #
 # handle test suite failures
 #
-%ifarch alpha armv4l hppa mips sh4 %sparc
+%ifarch alpha %arm hppa mips sh4 %sparc
 %define	make_check_handling	true
 %else
 # XXX check again
@@ -91,6 +91,7 @@ Patch14:        binutils-build-as-needed.diff
 Patch15:        fixup-testcase-perturb.diff
 Patch18:        gold-depend-on-opcodes.diff
 Patch19:        bso12451.diff
+Patch20:        bso13449.diff
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -253,7 +254,7 @@ Authors:
 %if "%{name}" != "binutils"
 %define TARGET %(echo %{name} | sed -e "s/cross-\\(.*\\)-binutils/\\1/;s/-/_/g;s/parisc/hppa/;s/i.86/i586/;s/ppc/powerpc/")
 %endif
-%ifarch %{arm} armv5l armv7l armv8l
+%ifarch %arm
 %define HOST %{_target_cpu}-suse-linux-gnueabi
 %else
 %define HOST %(echo %{_target_cpu} | sed -e "s/parisc/hppa/" -e "s/i.86/i586/" -e "s/ppc/powerpc/" -e "s/sparc64v.*/sparc64/" -e "s/sparcv.*/sparc/")-suse-linux
@@ -277,6 +278,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch15
 %patch18
 %patch19 -p1
+%patch20 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
@@ -315,14 +317,8 @@ EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux"
 %ifarch ppc ppc64
 EXTRA_TARGETS="$EXTRA_TARGETS,spu-elf"
 %endif
-%ifarch armv5l
-EXTRA_TARGETS="$EXTRA_TARGETS,armv5l-suse-linux"
-%endif
-%ifarch armv7l
-EXTRA_TARGETS="$EXTRA_TARGETS,armv7l-suse-linux"
-%endif
-%ifarch armv8l
-EXTRA_TARGETS="$EXTRA_TARGETS,armv8l-suse-linux"
+%ifarch %arm
+EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %endif
 %define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\
@@ -375,7 +371,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux"
 EXTRA_TARGETS="$EXTRA_TARGETS,hppa64-suse-linux"
 %endif
 %if "%{TARGET}" == "arm"
-EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
 TARGET_OS=%{TARGET}
diff --git a/cross-x86_64-binutils.changes b/cross-x86_64-binutils.changes
index ad8ec19..fcfe19c 100644
--- a/cross-x86_64-binutils.changes
+++ b/cross-x86_64-binutils.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jan  4 12:31:02 UTC 2012 - rguenther@suse.com
+
+- Add patch to fix arm unwind table corruption.  [bso#13449]
+- Canonicalize arm targets.
+- Enable gold for arm.
+
 -------------------------------------------------------------------
 Tue Jan  3 14:42:59 UTC 2012 - rguenther@suse.com
 
diff --git a/cross-x86_64-binutils.spec b/cross-x86_64-binutils.spec
index 18d36ea..a7ce37b 100644
--- a/cross-x86_64-binutils.spec
+++ b/cross-x86_64-binutils.spec
@@ -41,7 +41,7 @@ Release:        10
 #
 # handle test suite failures
 #
-%ifarch alpha armv4l hppa mips sh4 %sparc
+%ifarch alpha %arm hppa mips sh4 %sparc
 %define	make_check_handling	true
 %else
 # XXX check again
@@ -91,6 +91,7 @@ Patch14:        binutils-build-as-needed.diff
 Patch15:        fixup-testcase-perturb.diff
 Patch18:        gold-depend-on-opcodes.diff
 Patch19:        bso12451.diff
+Patch20:        bso13449.diff
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -253,7 +254,7 @@ Authors:
 %if "%{name}" != "binutils"
 %define TARGET %(echo %{name} | sed -e "s/cross-\\(.*\\)-binutils/\\1/;s/-/_/g;s/parisc/hppa/;s/i.86/i586/;s/ppc/powerpc/")
 %endif
-%ifarch %{arm} armv5l armv7l armv8l
+%ifarch %arm
 %define HOST %{_target_cpu}-suse-linux-gnueabi
 %else
 %define HOST %(echo %{_target_cpu} | sed -e "s/parisc/hppa/" -e "s/i.86/i586/" -e "s/ppc/powerpc/" -e "s/sparc64v.*/sparc64/" -e "s/sparcv.*/sparc/")-suse-linux
@@ -277,6 +278,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch15
 %patch18
 %patch19 -p1
+%patch20 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
@@ -315,14 +317,8 @@ EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux"
 %ifarch ppc ppc64
 EXTRA_TARGETS="$EXTRA_TARGETS,spu-elf"
 %endif
-%ifarch armv5l
-EXTRA_TARGETS="$EXTRA_TARGETS,armv5l-suse-linux"
-%endif
-%ifarch armv7l
-EXTRA_TARGETS="$EXTRA_TARGETS,armv7l-suse-linux"
-%endif
-%ifarch armv8l
-EXTRA_TARGETS="$EXTRA_TARGETS,armv8l-suse-linux"
+%ifarch %arm
+EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %endif
 %define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\
@@ -375,7 +371,7 @@ EXTRA_TARGETS="$EXTRA_TARGETS,x86_64-suse-linux"
 EXTRA_TARGETS="$EXTRA_TARGETS,hppa64-suse-linux"
 %endif
 %if "%{TARGET}" == "arm"
-EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux"
+EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 %endif
 %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
 TARGET_OS=%{TARGET}