diff --git a/README.First-for.SuSE.packagers b/README.First-for.SuSE.packagers
index e5967c0..affa1e7 100644
--- a/README.First-for.SuSE.packagers
+++ b/README.First-for.SuSE.packagers
@@ -6,6 +6,9 @@ cross version and pre_checkin.sh (called automatically by checkin too)
 copies over the binutils.spec and changes the Name field, so you shouldn't
 need to worry too much about the cross packages
 
+Updating to some branch head:
+> cvs -z 9 -d :pserver:anoncvs@stravinsky:/cvs/src export -r binutils-2_23-branch binutils
+
 Thanks,
 Stephan Kulow
 
diff --git a/avr-binutils-relocs.patch b/avr-binutils-relocs.patch
deleted file mode 100644
index aba5c43..0000000
--- a/avr-binutils-relocs.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-===================================================================
-RCS file: /cvs/src/src/bfd/elf32-avr.c,v
-retrieving revision 1.51
-retrieving revision 1.51.2.1
-diff -u -r1.51 -r1.51.2.1
---- src/bfd/elf32-avr.c	2011/06/02 13:43:14	1.51
-+++ src/bfd/elf32-avr.c	2012/02/01 17:07:37	1.51.2.1
-@@ -1503,11 +1503,18 @@
-        bfd_vma symval;
-        bfd_vma shrinked_insn_address;
- 
-+       if (isec->reloc_count == 0)
-+	 continue;
-+
-        shrinked_insn_address = (sec->output_section->vma
-                                 + sec->output_offset + addr - count);
- 
--       irelend = elf_section_data (isec)->relocs + isec->reloc_count;
--       for (irel = elf_section_data (isec)->relocs;
-+       irel = elf_section_data (isec)->relocs;
-+       /* PR 12161: Read in the relocs for this section if necessary.  */
-+       if (irel == NULL)
-+	 irel = _bfd_elf_link_read_relocs (abfd, isec, NULL, NULL, FALSE);
-+
-+       for (irelend = irel + isec->reloc_count;
-             irel < irelend;
-             irel++)
-          {
-@@ -1564,6 +1571,9 @@
- 	   /* else...Reference symbol is extern.  No need for adjusting
- 	      the addend.  */
- 	 }
-+
-+       if (elf_section_data (isec)->relocs == NULL)
-+	 free (irelend - isec->reloc_count);
-      }
-   }
- 
diff --git a/binutils-2.22.tar.bz2 b/binutils-2.22.tar.bz2
deleted file mode 100644
index 099b968..0000000
--- a/binutils-2.22.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6c7af8ed1c8cf9b4b9d6e6fe09a3e1d3d479fe63984ba8b9b26bf356b6313ca9
-size 19973532
diff --git a/binutils-2.23.0.tar.bz2 b/binutils-2.23.0.tar.bz2
new file mode 100644
index 0000000..f153681
--- /dev/null
+++ b/binutils-2.23.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:77f1c8a96434f8e094ae475857bd596124bf13aa655a3898cafdfd7b2cdac2ff
+size 19514452
diff --git a/binutils-build-as-needed.diff b/binutils-build-as-needed.diff
index 8fe41de..3f1401c 100644
--- a/binutils-build-as-needed.diff
+++ b/binutils-build-as-needed.diff
@@ -1,13 +1,13 @@
 Index: ld/ldmain.c
 ===================================================================
---- ld/ldmain.c.orig	2011-01-11 11:10:59.000000000 +0100
-+++ ld/ldmain.c	2011-01-11 11:20:56.000000000 +0100
-@@ -284,6 +284,8 @@ main (int argc, char **argv)
+--- ld/ldmain.c.orig	2012-09-14 14:10:47.347146972 +0200
++++ ld/ldmain.c	2012-09-14 14:20:50.004126111 +0200
+@@ -290,6 +290,8 @@ main (int argc, char **argv)
    link_info.pei386_auto_import = -1;
    link_info.spare_dynamic_tags = 5;
    link_info.path_separator = ':';
 +  if (getenv ("SUSE_ASNEEDED") && atoi(getenv ("SUSE_ASNEEDED")) > 0)
-+    add_DT_NEEDED_for_regular = TRUE;
++    input_flags.add_DT_NEEDED_for_regular = TRUE;
  
    ldfile_add_arch ("");
    emulation = get_emulation (argc, argv);
diff --git a/binutils-skip-rpaths.patch b/binutils-skip-rpaths.patch
index e34d5ae..cbc861e 100644
--- a/binutils-skip-rpaths.patch
+++ b/binutils-skip-rpaths.patch
@@ -1,8 +1,8 @@
 Index: ld/emultempl/elf32.em
 ===================================================================
---- ld/emultempl/elf32.em.orig	2010-10-29 14:10:36.000000000 +0200
-+++ ld/emultempl/elf32.em	2011-01-10 17:42:31.000000000 +0100
-@@ -1432,8 +1432,38 @@ if test x"$LDEMUL_BEFORE_ALLOCATION" !=
+--- ld/emultempl/elf32.em.orig	2012-07-13 15:20:27.000000000 +0200
++++ ld/emultempl/elf32.em	2012-09-14 13:55:57.829177770 +0200
+@@ -1436,8 +1436,38 @@ if test x"$LDEMUL_BEFORE_ALLOCATION" !=
    else
      ELF_INTERPRETER_SET_DEFAULT=
    fi
@@ -41,7 +41,7 @@ Index: ld/emultempl/elf32.em
  /* used by before_allocation and handle_option. */
  static void 
  gld${EMULATION_NAME}_append_to_separated_string (char **to, char *op_arg)
-@@ -1480,7 +1510,7 @@ gld${EMULATION_NAME}_append_to_separated
+@@ -1484,7 +1514,7 @@ gld${EMULATION_NAME}_append_to_separated
  static void
  gld${EMULATION_NAME}_before_allocation (void)
  {
@@ -50,7 +50,7 @@ Index: ld/emultempl/elf32.em
    asection *sinterp;
    bfd *abfd;
  
-@@ -1496,7 +1526,65 @@ gld${EMULATION_NAME}_before_allocation (
+@@ -1500,7 +1530,65 @@ gld${EMULATION_NAME}_before_allocation (
       by dynamic linking.  */
    rpath = command_line.rpath;
    if (rpath == NULL)
@@ -117,3 +117,4 @@ Index: ld/emultempl/elf32.em
  
    for (abfd = link_info.input_bfds; abfd; abfd = abfd->link_next)
      if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
+
diff --git a/binutils.changes b/binutils.changes
index 9aab506..308aba6 100644
--- a/binutils.changes
+++ b/binutils.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Oct 24 11:03:16 UTC 2012 - rguenther@suse.com
+
+- Update to binutils 2.23 branch head.
+  * Includes binutils 2.23 release.
+
+-------------------------------------------------------------------
+Mon Sep 17 13:57:11 UTC 2012 - rguenther@suse.com
+
+- Update to binutils 2.23 release candidate.
+- Remove no longer applying AVR patch.
+
 -------------------------------------------------------------------
 Fri Sep  7 12:42:18 UTC 2012 - coolo@suse.com
 
diff --git a/binutils.spec b/binutils.spec
index f8afb0d..03e4ce2 100644
--- a/binutils.spec
+++ b/binutils.spec
@@ -35,7 +35,7 @@ BuildRequires:  zlib-devel-static
 %else
 BuildRequires:  zlib-devel
 %endif
-Version:        2.22
+Version:        2.23.0
 Release:        0
 #
 # RUN_TESTS
@@ -92,14 +92,10 @@ Patch9:         testsuite.diff
 Patch10:        enable-targets-gold.diff
 Patch11:        use-hashtype-both-by-default.diff
 Patch14:        binutils-build-as-needed.diff
-Patch15:        fixup-testcase-perturb.diff
 Patch18:        gold-depend-on-opcodes.diff
-Patch19:        bso12451.diff
-Patch20:        bso13449.diff
 Patch21:        binutils-2.22-objalloc.patch
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
-Patch93:        avr-binutils-relocs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -160,16 +156,12 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch10
 %patch11
 %patch14
-%patch15
 %patch18
-%patch19 -p1
-%patch20 -p1
 %patch21
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
 %patch92
-%patch93 -p1
 %endif
 #
 # test_vanilla
diff --git a/bso12451.diff b/bso12451.diff
deleted file mode 100644
index 77fcc64..0000000
--- a/bso12451.diff
+++ /dev/null
@@ -1,68 +0,0 @@
-    PR ld/12451
-    * elfcode.h (elf_checksum_contents): Read in the section's
-    contents if they are not already available.
-    * compress.c (bfd_get_full_section_contents): Use zmalloc to
-    allocate the buffers so that excess bytes are guaranteed to be
-    zero.
-
-===================================================================
-RCS file: /cvs/src/src/bfd/elfcode.h,v
-retrieving revision 1.109
-retrieving revision 1.110
-diff -u -r1.109 -r1.110
---- src/bfd/elfcode.h	2011/06/06 01:26:01	1.109
-+++ src/bfd/elfcode.h	2011/12/14 11:50:13	1.110
-@@ -1097,8 +1097,28 @@
-       elf_swap_shdr_out (abfd, &i_shdr, &x_shdr);
-       (*process) (&x_shdr, sizeof x_shdr, arg);
- 
-+      /* PR ld/12451:
-+	 Process the section's contents; reading them in if necessary.  */
-       if (i_shdr.contents)
- 	(*process) (i_shdr.contents, i_shdr.sh_size, arg);
-+      else
-+	{
-+	  asection *sec;
-+
-+	  sec = bfd_section_from_elf_index (abfd, count);
-+	  if (sec != NULL)
-+	    {
-+	      if (sec->contents == NULL)
-+		{
-+		  /* Force rereading from file.  */
-+		  sec->flags &= ~SEC_IN_MEMORY;
-+		  if (! bfd_malloc_and_get_section (abfd, sec, & sec->contents))
-+		    continue;
-+		}
-+	      if (sec->contents != NULL)
-+		(*process) (sec->contents, i_shdr.sh_size, arg);
-+	    }
-+	}
-     }
- 
-   return TRUE;
-===================================================================
-RCS file: /cvs/src/src/bfd/compress.c,v
-retrieving revision 1.9
-retrieving revision 1.10
-diff -u -r1.9 -r1.10
---- src/bfd/compress.c	2011/04/11 04:08:12	1.9
-+++ src/bfd/compress.c	2011/12/14 11:50:13	1.10
-@@ -181,7 +181,7 @@
-     case COMPRESS_SECTION_NONE:
-       if (p == NULL)
- 	{
--	  p = (bfd_byte *) bfd_malloc (sz);
-+	  p = (bfd_byte *) bfd_zmalloc (sz);
- 	  if (p == NULL)
- 	    return FALSE;
- 	}
-@@ -221,7 +221,7 @@
-       if (!ret)
- 	goto fail_compressed;
- 
--      uncompressed_buffer = (bfd_byte *) bfd_malloc (uncompressed_size);
-+      uncompressed_buffer = (bfd_byte *) bfd_zmalloc (uncompressed_size);
-       if (uncompressed_buffer == NULL)
- 	goto fail_compressed;
- 
diff --git a/bso13449.diff b/bso13449.diff
deleted file mode 100644
index 06411a9..0000000
--- a/bso13449.diff
+++ /dev/null
@@ -1,61 +0,0 @@
-    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.511
-retrieving revision 1.512
-diff -u -r1.511 -r1.512
---- src/gas/config/tc-arm.c	2011/12/07 16:58:34	1.511
-+++ src/gas/config/tc-arm.c	2011/12/15 10:21:49	1.512
-@@ -3540,6 +3540,7 @@
-   record_alignment (now_seg, 2);
- 
-   ptr = frag_more (8);
-+  memset (ptr, 0, 8);
-   where = frag_now_fix () - 8;
- 
-   /* Self relative offset of the function start.  */
-@@ -19926,8 +19927,12 @@
- 	size = unwind.opcode_count - 2;
-     }
-   else
--    /* An extra byte is required for the opcode count.	*/
--    size = unwind.opcode_count + 1;
-+    {
-+      gas_assert (unwind.personality_index == -1);
-+
-+      /* An extra byte is required for the opcode count.	*/
-+      size = unwind.opcode_count + 1;
-+    }
- 
-   size = (size + 3) >> 2;
-   if (size > 0xff)
-@@ -19953,7 +19958,7 @@
-       ptr += 4;
- 
-       /* Set the first byte to the number of additional words.	*/
--      data = size - 1;
-+      data = size > 0 ? size - 1 : 0;
-       n = 3;
-       break;
- 
-===================================================================
-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 9aab506..308aba6 100644
--- a/cross-alpha-binutils.changes
+++ b/cross-alpha-binutils.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Oct 24 11:03:16 UTC 2012 - rguenther@suse.com
+
+- Update to binutils 2.23 branch head.
+  * Includes binutils 2.23 release.
+
+-------------------------------------------------------------------
+Mon Sep 17 13:57:11 UTC 2012 - rguenther@suse.com
+
+- Update to binutils 2.23 release candidate.
+- Remove no longer applying AVR patch.
+
 -------------------------------------------------------------------
 Fri Sep  7 12:42:18 UTC 2012 - coolo@suse.com
 
diff --git a/cross-alpha-binutils.spec b/cross-alpha-binutils.spec
index cd4d774..c927c31 100644
--- a/cross-alpha-binutils.spec
+++ b/cross-alpha-binutils.spec
@@ -38,7 +38,7 @@ BuildRequires:  zlib-devel-static
 %else
 BuildRequires:  zlib-devel
 %endif
-Version:        2.22
+Version:        2.23.0
 Release:        0
 #
 # RUN_TESTS
@@ -95,14 +95,10 @@ Patch9:         testsuite.diff
 Patch10:        enable-targets-gold.diff
 Patch11:        use-hashtype-both-by-default.diff
 Patch14:        binutils-build-as-needed.diff
-Patch15:        fixup-testcase-perturb.diff
 Patch18:        gold-depend-on-opcodes.diff
-Patch19:        bso12451.diff
-Patch20:        bso13449.diff
 Patch21:        binutils-2.22-objalloc.patch
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
-Patch93:        avr-binutils-relocs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -163,16 +159,12 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch10
 %patch11
 %patch14
-%patch15
 %patch18
-%patch19 -p1
-%patch20 -p1
 %patch21
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
 %patch92
-%patch93 -p1
 %endif
 #
 # test_vanilla
diff --git a/cross-arm-binutils.changes b/cross-arm-binutils.changes
index 9aab506..308aba6 100644
--- a/cross-arm-binutils.changes
+++ b/cross-arm-binutils.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Oct 24 11:03:16 UTC 2012 - rguenther@suse.com
+
+- Update to binutils 2.23 branch head.
+  * Includes binutils 2.23 release.
+
+-------------------------------------------------------------------
+Mon Sep 17 13:57:11 UTC 2012 - rguenther@suse.com
+
+- Update to binutils 2.23 release candidate.
+- Remove no longer applying AVR patch.
+
 -------------------------------------------------------------------
 Fri Sep  7 12:42:18 UTC 2012 - coolo@suse.com
 
diff --git a/cross-arm-binutils.spec b/cross-arm-binutils.spec
index 916a34d..4b0669f 100644
--- a/cross-arm-binutils.spec
+++ b/cross-arm-binutils.spec
@@ -38,7 +38,7 @@ BuildRequires:  zlib-devel-static
 %else
 BuildRequires:  zlib-devel
 %endif
-Version:        2.22
+Version:        2.23.0
 Release:        0
 #
 # RUN_TESTS
@@ -95,14 +95,10 @@ Patch9:         testsuite.diff
 Patch10:        enable-targets-gold.diff
 Patch11:        use-hashtype-both-by-default.diff
 Patch14:        binutils-build-as-needed.diff
-Patch15:        fixup-testcase-perturb.diff
 Patch18:        gold-depend-on-opcodes.diff
-Patch19:        bso12451.diff
-Patch20:        bso13449.diff
 Patch21:        binutils-2.22-objalloc.patch
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
-Patch93:        avr-binutils-relocs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -163,16 +159,12 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch10
 %patch11
 %patch14
-%patch15
 %patch18
-%patch19 -p1
-%patch20 -p1
 %patch21
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
 %patch92
-%patch93 -p1
 %endif
 #
 # test_vanilla
diff --git a/cross-avr-binutils.changes b/cross-avr-binutils.changes
index 9aab506..308aba6 100644
--- a/cross-avr-binutils.changes
+++ b/cross-avr-binutils.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Oct 24 11:03:16 UTC 2012 - rguenther@suse.com
+
+- Update to binutils 2.23 branch head.
+  * Includes binutils 2.23 release.
+
+-------------------------------------------------------------------
+Mon Sep 17 13:57:11 UTC 2012 - rguenther@suse.com
+
+- Update to binutils 2.23 release candidate.
+- Remove no longer applying AVR patch.
+
 -------------------------------------------------------------------
 Fri Sep  7 12:42:18 UTC 2012 - coolo@suse.com
 
diff --git a/cross-avr-binutils.spec b/cross-avr-binutils.spec
index df1ef83..781ff2f 100644
--- a/cross-avr-binutils.spec
+++ b/cross-avr-binutils.spec
@@ -38,7 +38,7 @@ BuildRequires:  zlib-devel-static
 %else
 BuildRequires:  zlib-devel
 %endif
-Version:        2.22
+Version:        2.23.0
 Release:        0
 #
 # RUN_TESTS
@@ -95,14 +95,10 @@ Patch9:         testsuite.diff
 Patch10:        enable-targets-gold.diff
 Patch11:        use-hashtype-both-by-default.diff
 Patch14:        binutils-build-as-needed.diff
-Patch15:        fixup-testcase-perturb.diff
 Patch18:        gold-depend-on-opcodes.diff
-Patch19:        bso12451.diff
-Patch20:        bso13449.diff
 Patch21:        binutils-2.22-objalloc.patch
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
-Patch93:        avr-binutils-relocs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -163,16 +159,12 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch10
 %patch11
 %patch14
-%patch15
 %patch18
-%patch19 -p1
-%patch20 -p1
 %patch21
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
 %patch92
-%patch93 -p1
 %endif
 #
 # test_vanilla
diff --git a/cross-hppa-binutils.changes b/cross-hppa-binutils.changes
index 9aab506..308aba6 100644
--- a/cross-hppa-binutils.changes
+++ b/cross-hppa-binutils.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Oct 24 11:03:16 UTC 2012 - rguenther@suse.com
+
+- Update to binutils 2.23 branch head.
+  * Includes binutils 2.23 release.
+
+-------------------------------------------------------------------
+Mon Sep 17 13:57:11 UTC 2012 - rguenther@suse.com
+
+- Update to binutils 2.23 release candidate.
+- Remove no longer applying AVR patch.
+
 -------------------------------------------------------------------
 Fri Sep  7 12:42:18 UTC 2012 - coolo@suse.com
 
diff --git a/cross-hppa-binutils.spec b/cross-hppa-binutils.spec
index 09883d2..7c7a7d0 100644
--- a/cross-hppa-binutils.spec
+++ b/cross-hppa-binutils.spec
@@ -38,7 +38,7 @@ BuildRequires:  zlib-devel-static
 %else
 BuildRequires:  zlib-devel
 %endif
-Version:        2.22
+Version:        2.23.0
 Release:        0
 #
 # RUN_TESTS
@@ -95,14 +95,10 @@ Patch9:         testsuite.diff
 Patch10:        enable-targets-gold.diff
 Patch11:        use-hashtype-both-by-default.diff
 Patch14:        binutils-build-as-needed.diff
-Patch15:        fixup-testcase-perturb.diff
 Patch18:        gold-depend-on-opcodes.diff
-Patch19:        bso12451.diff
-Patch20:        bso13449.diff
 Patch21:        binutils-2.22-objalloc.patch
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
-Patch93:        avr-binutils-relocs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -163,16 +159,12 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch10
 %patch11
 %patch14
-%patch15
 %patch18
-%patch19 -p1
-%patch20 -p1
 %patch21
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
 %patch92
-%patch93 -p1
 %endif
 #
 # test_vanilla
diff --git a/cross-hppa64-binutils.changes b/cross-hppa64-binutils.changes
index 9aab506..308aba6 100644
--- a/cross-hppa64-binutils.changes
+++ b/cross-hppa64-binutils.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Oct 24 11:03:16 UTC 2012 - rguenther@suse.com
+
+- Update to binutils 2.23 branch head.
+  * Includes binutils 2.23 release.
+
+-------------------------------------------------------------------
+Mon Sep 17 13:57:11 UTC 2012 - rguenther@suse.com
+
+- Update to binutils 2.23 release candidate.
+- Remove no longer applying AVR patch.
+
 -------------------------------------------------------------------
 Fri Sep  7 12:42:18 UTC 2012 - coolo@suse.com
 
diff --git a/cross-hppa64-binutils.spec b/cross-hppa64-binutils.spec
index 5eb38a6..876c639 100644
--- a/cross-hppa64-binutils.spec
+++ b/cross-hppa64-binutils.spec
@@ -38,7 +38,7 @@ BuildRequires:  zlib-devel-static
 %else
 BuildRequires:  zlib-devel
 %endif
-Version:        2.22
+Version:        2.23.0
 Release:        0
 #
 # RUN_TESTS
@@ -95,14 +95,10 @@ Patch9:         testsuite.diff
 Patch10:        enable-targets-gold.diff
 Patch11:        use-hashtype-both-by-default.diff
 Patch14:        binutils-build-as-needed.diff
-Patch15:        fixup-testcase-perturb.diff
 Patch18:        gold-depend-on-opcodes.diff
-Patch19:        bso12451.diff
-Patch20:        bso13449.diff
 Patch21:        binutils-2.22-objalloc.patch
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
-Patch93:        avr-binutils-relocs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -163,16 +159,12 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch10
 %patch11
 %patch14
-%patch15
 %patch18
-%patch19 -p1
-%patch20 -p1
 %patch21
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
 %patch92
-%patch93 -p1
 %endif
 #
 # test_vanilla
diff --git a/cross-i386-binutils.changes b/cross-i386-binutils.changes
index 9aab506..308aba6 100644
--- a/cross-i386-binutils.changes
+++ b/cross-i386-binutils.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Oct 24 11:03:16 UTC 2012 - rguenther@suse.com
+
+- Update to binutils 2.23 branch head.
+  * Includes binutils 2.23 release.
+
+-------------------------------------------------------------------
+Mon Sep 17 13:57:11 UTC 2012 - rguenther@suse.com
+
+- Update to binutils 2.23 release candidate.
+- Remove no longer applying AVR patch.
+
 -------------------------------------------------------------------
 Fri Sep  7 12:42:18 UTC 2012 - coolo@suse.com
 
diff --git a/cross-i386-binutils.spec b/cross-i386-binutils.spec
index d34cc72..eae7007 100644
--- a/cross-i386-binutils.spec
+++ b/cross-i386-binutils.spec
@@ -38,7 +38,7 @@ BuildRequires:  zlib-devel-static
 %else
 BuildRequires:  zlib-devel
 %endif
-Version:        2.22
+Version:        2.23.0
 Release:        0
 #
 # RUN_TESTS
@@ -95,14 +95,10 @@ Patch9:         testsuite.diff
 Patch10:        enable-targets-gold.diff
 Patch11:        use-hashtype-both-by-default.diff
 Patch14:        binutils-build-as-needed.diff
-Patch15:        fixup-testcase-perturb.diff
 Patch18:        gold-depend-on-opcodes.diff
-Patch19:        bso12451.diff
-Patch20:        bso13449.diff
 Patch21:        binutils-2.22-objalloc.patch
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
-Patch93:        avr-binutils-relocs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -163,16 +159,12 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch10
 %patch11
 %patch14
-%patch15
 %patch18
-%patch19 -p1
-%patch20 -p1
 %patch21
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
 %patch92
-%patch93 -p1
 %endif
 #
 # test_vanilla
diff --git a/cross-ia64-binutils.changes b/cross-ia64-binutils.changes
index 9aab506..308aba6 100644
--- a/cross-ia64-binutils.changes
+++ b/cross-ia64-binutils.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Oct 24 11:03:16 UTC 2012 - rguenther@suse.com
+
+- Update to binutils 2.23 branch head.
+  * Includes binutils 2.23 release.
+
+-------------------------------------------------------------------
+Mon Sep 17 13:57:11 UTC 2012 - rguenther@suse.com
+
+- Update to binutils 2.23 release candidate.
+- Remove no longer applying AVR patch.
+
 -------------------------------------------------------------------
 Fri Sep  7 12:42:18 UTC 2012 - coolo@suse.com
 
diff --git a/cross-ia64-binutils.spec b/cross-ia64-binutils.spec
index 6faa541..395eb7d 100644
--- a/cross-ia64-binutils.spec
+++ b/cross-ia64-binutils.spec
@@ -38,7 +38,7 @@ BuildRequires:  zlib-devel-static
 %else
 BuildRequires:  zlib-devel
 %endif
-Version:        2.22
+Version:        2.23.0
 Release:        0
 #
 # RUN_TESTS
@@ -95,14 +95,10 @@ Patch9:         testsuite.diff
 Patch10:        enable-targets-gold.diff
 Patch11:        use-hashtype-both-by-default.diff
 Patch14:        binutils-build-as-needed.diff
-Patch15:        fixup-testcase-perturb.diff
 Patch18:        gold-depend-on-opcodes.diff
-Patch19:        bso12451.diff
-Patch20:        bso13449.diff
 Patch21:        binutils-2.22-objalloc.patch
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
-Patch93:        avr-binutils-relocs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -163,16 +159,12 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch10
 %patch11
 %patch14
-%patch15
 %patch18
-%patch19 -p1
-%patch20 -p1
 %patch21
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
 %patch92
-%patch93 -p1
 %endif
 #
 # test_vanilla
diff --git a/cross-mips-binutils.changes b/cross-mips-binutils.changes
index 9aab506..308aba6 100644
--- a/cross-mips-binutils.changes
+++ b/cross-mips-binutils.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Oct 24 11:03:16 UTC 2012 - rguenther@suse.com
+
+- Update to binutils 2.23 branch head.
+  * Includes binutils 2.23 release.
+
+-------------------------------------------------------------------
+Mon Sep 17 13:57:11 UTC 2012 - rguenther@suse.com
+
+- Update to binutils 2.23 release candidate.
+- Remove no longer applying AVR patch.
+
 -------------------------------------------------------------------
 Fri Sep  7 12:42:18 UTC 2012 - coolo@suse.com
 
diff --git a/cross-mips-binutils.spec b/cross-mips-binutils.spec
index 566c467..b099997 100644
--- a/cross-mips-binutils.spec
+++ b/cross-mips-binutils.spec
@@ -38,7 +38,7 @@ BuildRequires:  zlib-devel-static
 %else
 BuildRequires:  zlib-devel
 %endif
-Version:        2.22
+Version:        2.23.0
 Release:        0
 #
 # RUN_TESTS
@@ -95,14 +95,10 @@ Patch9:         testsuite.diff
 Patch10:        enable-targets-gold.diff
 Patch11:        use-hashtype-both-by-default.diff
 Patch14:        binutils-build-as-needed.diff
-Patch15:        fixup-testcase-perturb.diff
 Patch18:        gold-depend-on-opcodes.diff
-Patch19:        bso12451.diff
-Patch20:        bso13449.diff
 Patch21:        binutils-2.22-objalloc.patch
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
-Patch93:        avr-binutils-relocs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -163,16 +159,12 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch10
 %patch11
 %patch14
-%patch15
 %patch18
-%patch19 -p1
-%patch20 -p1
 %patch21
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
 %patch92
-%patch93 -p1
 %endif
 #
 # test_vanilla
diff --git a/cross-ppc-binutils.changes b/cross-ppc-binutils.changes
index 9aab506..308aba6 100644
--- a/cross-ppc-binutils.changes
+++ b/cross-ppc-binutils.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Oct 24 11:03:16 UTC 2012 - rguenther@suse.com
+
+- Update to binutils 2.23 branch head.
+  * Includes binutils 2.23 release.
+
+-------------------------------------------------------------------
+Mon Sep 17 13:57:11 UTC 2012 - rguenther@suse.com
+
+- Update to binutils 2.23 release candidate.
+- Remove no longer applying AVR patch.
+
 -------------------------------------------------------------------
 Fri Sep  7 12:42:18 UTC 2012 - coolo@suse.com
 
diff --git a/cross-ppc-binutils.spec b/cross-ppc-binutils.spec
index 83cecd3..a6ac8a8 100644
--- a/cross-ppc-binutils.spec
+++ b/cross-ppc-binutils.spec
@@ -38,7 +38,7 @@ BuildRequires:  zlib-devel-static
 %else
 BuildRequires:  zlib-devel
 %endif
-Version:        2.22
+Version:        2.23.0
 Release:        0
 #
 # RUN_TESTS
@@ -95,14 +95,10 @@ Patch9:         testsuite.diff
 Patch10:        enable-targets-gold.diff
 Patch11:        use-hashtype-both-by-default.diff
 Patch14:        binutils-build-as-needed.diff
-Patch15:        fixup-testcase-perturb.diff
 Patch18:        gold-depend-on-opcodes.diff
-Patch19:        bso12451.diff
-Patch20:        bso13449.diff
 Patch21:        binutils-2.22-objalloc.patch
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
-Patch93:        avr-binutils-relocs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -163,16 +159,12 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch10
 %patch11
 %patch14
-%patch15
 %patch18
-%patch19 -p1
-%patch20 -p1
 %patch21
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
 %patch92
-%patch93 -p1
 %endif
 #
 # test_vanilla
diff --git a/cross-ppc64-binutils.changes b/cross-ppc64-binutils.changes
index 9aab506..308aba6 100644
--- a/cross-ppc64-binutils.changes
+++ b/cross-ppc64-binutils.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Oct 24 11:03:16 UTC 2012 - rguenther@suse.com
+
+- Update to binutils 2.23 branch head.
+  * Includes binutils 2.23 release.
+
+-------------------------------------------------------------------
+Mon Sep 17 13:57:11 UTC 2012 - rguenther@suse.com
+
+- Update to binutils 2.23 release candidate.
+- Remove no longer applying AVR patch.
+
 -------------------------------------------------------------------
 Fri Sep  7 12:42:18 UTC 2012 - coolo@suse.com
 
diff --git a/cross-ppc64-binutils.spec b/cross-ppc64-binutils.spec
index ea17d12..9d26881 100644
--- a/cross-ppc64-binutils.spec
+++ b/cross-ppc64-binutils.spec
@@ -38,7 +38,7 @@ BuildRequires:  zlib-devel-static
 %else
 BuildRequires:  zlib-devel
 %endif
-Version:        2.22
+Version:        2.23.0
 Release:        0
 #
 # RUN_TESTS
@@ -95,14 +95,10 @@ Patch9:         testsuite.diff
 Patch10:        enable-targets-gold.diff
 Patch11:        use-hashtype-both-by-default.diff
 Patch14:        binutils-build-as-needed.diff
-Patch15:        fixup-testcase-perturb.diff
 Patch18:        gold-depend-on-opcodes.diff
-Patch19:        bso12451.diff
-Patch20:        bso13449.diff
 Patch21:        binutils-2.22-objalloc.patch
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
-Patch93:        avr-binutils-relocs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -163,16 +159,12 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch10
 %patch11
 %patch14
-%patch15
 %patch18
-%patch19 -p1
-%patch20 -p1
 %patch21
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
 %patch92
-%patch93 -p1
 %endif
 #
 # test_vanilla
diff --git a/cross-s390-binutils.changes b/cross-s390-binutils.changes
index 9aab506..308aba6 100644
--- a/cross-s390-binutils.changes
+++ b/cross-s390-binutils.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Oct 24 11:03:16 UTC 2012 - rguenther@suse.com
+
+- Update to binutils 2.23 branch head.
+  * Includes binutils 2.23 release.
+
+-------------------------------------------------------------------
+Mon Sep 17 13:57:11 UTC 2012 - rguenther@suse.com
+
+- Update to binutils 2.23 release candidate.
+- Remove no longer applying AVR patch.
+
 -------------------------------------------------------------------
 Fri Sep  7 12:42:18 UTC 2012 - coolo@suse.com
 
diff --git a/cross-s390-binutils.spec b/cross-s390-binutils.spec
index 9cf1628..d226bcc 100644
--- a/cross-s390-binutils.spec
+++ b/cross-s390-binutils.spec
@@ -38,7 +38,7 @@ BuildRequires:  zlib-devel-static
 %else
 BuildRequires:  zlib-devel
 %endif
-Version:        2.22
+Version:        2.23.0
 Release:        0
 #
 # RUN_TESTS
@@ -95,14 +95,10 @@ Patch9:         testsuite.diff
 Patch10:        enable-targets-gold.diff
 Patch11:        use-hashtype-both-by-default.diff
 Patch14:        binutils-build-as-needed.diff
-Patch15:        fixup-testcase-perturb.diff
 Patch18:        gold-depend-on-opcodes.diff
-Patch19:        bso12451.diff
-Patch20:        bso13449.diff
 Patch21:        binutils-2.22-objalloc.patch
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
-Patch93:        avr-binutils-relocs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -163,16 +159,12 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch10
 %patch11
 %patch14
-%patch15
 %patch18
-%patch19 -p1
-%patch20 -p1
 %patch21
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
 %patch92
-%patch93 -p1
 %endif
 #
 # test_vanilla
diff --git a/cross-s390x-binutils.changes b/cross-s390x-binutils.changes
index 9aab506..308aba6 100644
--- a/cross-s390x-binutils.changes
+++ b/cross-s390x-binutils.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Oct 24 11:03:16 UTC 2012 - rguenther@suse.com
+
+- Update to binutils 2.23 branch head.
+  * Includes binutils 2.23 release.
+
+-------------------------------------------------------------------
+Mon Sep 17 13:57:11 UTC 2012 - rguenther@suse.com
+
+- Update to binutils 2.23 release candidate.
+- Remove no longer applying AVR patch.
+
 -------------------------------------------------------------------
 Fri Sep  7 12:42:18 UTC 2012 - coolo@suse.com
 
diff --git a/cross-s390x-binutils.spec b/cross-s390x-binutils.spec
index ff1600d..2eeba05 100644
--- a/cross-s390x-binutils.spec
+++ b/cross-s390x-binutils.spec
@@ -38,7 +38,7 @@ BuildRequires:  zlib-devel-static
 %else
 BuildRequires:  zlib-devel
 %endif
-Version:        2.22
+Version:        2.23.0
 Release:        0
 #
 # RUN_TESTS
@@ -95,14 +95,10 @@ Patch9:         testsuite.diff
 Patch10:        enable-targets-gold.diff
 Patch11:        use-hashtype-both-by-default.diff
 Patch14:        binutils-build-as-needed.diff
-Patch15:        fixup-testcase-perturb.diff
 Patch18:        gold-depend-on-opcodes.diff
-Patch19:        bso12451.diff
-Patch20:        bso13449.diff
 Patch21:        binutils-2.22-objalloc.patch
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
-Patch93:        avr-binutils-relocs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -163,16 +159,12 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch10
 %patch11
 %patch14
-%patch15
 %patch18
-%patch19 -p1
-%patch20 -p1
 %patch21
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
 %patch92
-%patch93 -p1
 %endif
 #
 # test_vanilla
diff --git a/cross-sparc-binutils.changes b/cross-sparc-binutils.changes
index 9aab506..308aba6 100644
--- a/cross-sparc-binutils.changes
+++ b/cross-sparc-binutils.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Oct 24 11:03:16 UTC 2012 - rguenther@suse.com
+
+- Update to binutils 2.23 branch head.
+  * Includes binutils 2.23 release.
+
+-------------------------------------------------------------------
+Mon Sep 17 13:57:11 UTC 2012 - rguenther@suse.com
+
+- Update to binutils 2.23 release candidate.
+- Remove no longer applying AVR patch.
+
 -------------------------------------------------------------------
 Fri Sep  7 12:42:18 UTC 2012 - coolo@suse.com
 
diff --git a/cross-sparc-binutils.spec b/cross-sparc-binutils.spec
index 706c2ce..40c0c15 100644
--- a/cross-sparc-binutils.spec
+++ b/cross-sparc-binutils.spec
@@ -38,7 +38,7 @@ BuildRequires:  zlib-devel-static
 %else
 BuildRequires:  zlib-devel
 %endif
-Version:        2.22
+Version:        2.23.0
 Release:        0
 #
 # RUN_TESTS
@@ -95,14 +95,10 @@ Patch9:         testsuite.diff
 Patch10:        enable-targets-gold.diff
 Patch11:        use-hashtype-both-by-default.diff
 Patch14:        binutils-build-as-needed.diff
-Patch15:        fixup-testcase-perturb.diff
 Patch18:        gold-depend-on-opcodes.diff
-Patch19:        bso12451.diff
-Patch20:        bso13449.diff
 Patch21:        binutils-2.22-objalloc.patch
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
-Patch93:        avr-binutils-relocs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -163,16 +159,12 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch10
 %patch11
 %patch14
-%patch15
 %patch18
-%patch19 -p1
-%patch20 -p1
 %patch21
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
 %patch92
-%patch93 -p1
 %endif
 #
 # test_vanilla
diff --git a/cross-spu-binutils.changes b/cross-spu-binutils.changes
index 9aab506..308aba6 100644
--- a/cross-spu-binutils.changes
+++ b/cross-spu-binutils.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Oct 24 11:03:16 UTC 2012 - rguenther@suse.com
+
+- Update to binutils 2.23 branch head.
+  * Includes binutils 2.23 release.
+
+-------------------------------------------------------------------
+Mon Sep 17 13:57:11 UTC 2012 - rguenther@suse.com
+
+- Update to binutils 2.23 release candidate.
+- Remove no longer applying AVR patch.
+
 -------------------------------------------------------------------
 Fri Sep  7 12:42:18 UTC 2012 - coolo@suse.com
 
diff --git a/cross-spu-binutils.spec b/cross-spu-binutils.spec
index 06740e9..1c4cdf6 100644
--- a/cross-spu-binutils.spec
+++ b/cross-spu-binutils.spec
@@ -38,7 +38,7 @@ BuildRequires:  zlib-devel-static
 %else
 BuildRequires:  zlib-devel
 %endif
-Version:        2.22
+Version:        2.23.0
 Release:        0
 #
 # RUN_TESTS
@@ -95,14 +95,10 @@ Patch9:         testsuite.diff
 Patch10:        enable-targets-gold.diff
 Patch11:        use-hashtype-both-by-default.diff
 Patch14:        binutils-build-as-needed.diff
-Patch15:        fixup-testcase-perturb.diff
 Patch18:        gold-depend-on-opcodes.diff
-Patch19:        bso12451.diff
-Patch20:        bso13449.diff
 Patch21:        binutils-2.22-objalloc.patch
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
-Patch93:        avr-binutils-relocs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -163,16 +159,12 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch10
 %patch11
 %patch14
-%patch15
 %patch18
-%patch19 -p1
-%patch20 -p1
 %patch21
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
 %patch92
-%patch93 -p1
 %endif
 #
 # test_vanilla
diff --git a/cross-x86_64-binutils.changes b/cross-x86_64-binutils.changes
index 9aab506..308aba6 100644
--- a/cross-x86_64-binutils.changes
+++ b/cross-x86_64-binutils.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Oct 24 11:03:16 UTC 2012 - rguenther@suse.com
+
+- Update to binutils 2.23 branch head.
+  * Includes binutils 2.23 release.
+
+-------------------------------------------------------------------
+Mon Sep 17 13:57:11 UTC 2012 - rguenther@suse.com
+
+- Update to binutils 2.23 release candidate.
+- Remove no longer applying AVR patch.
+
 -------------------------------------------------------------------
 Fri Sep  7 12:42:18 UTC 2012 - coolo@suse.com
 
diff --git a/cross-x86_64-binutils.spec b/cross-x86_64-binutils.spec
index 6eb8cad..cec390f 100644
--- a/cross-x86_64-binutils.spec
+++ b/cross-x86_64-binutils.spec
@@ -38,7 +38,7 @@ BuildRequires:  zlib-devel-static
 %else
 BuildRequires:  zlib-devel
 %endif
-Version:        2.22
+Version:        2.23.0
 Release:        0
 #
 # RUN_TESTS
@@ -95,14 +95,10 @@ Patch9:         testsuite.diff
 Patch10:        enable-targets-gold.diff
 Patch11:        use-hashtype-both-by-default.diff
 Patch14:        binutils-build-as-needed.diff
-Patch15:        fixup-testcase-perturb.diff
 Patch18:        gold-depend-on-opcodes.diff
-Patch19:        bso12451.diff
-Patch20:        bso13449.diff
 Patch21:        binutils-2.22-objalloc.patch
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
-Patch93:        avr-binutils-relocs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -163,16 +159,12 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch10
 %patch11
 %patch14
-%patch15
 %patch18
-%patch19 -p1
-%patch20 -p1
 %patch21
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
 %patch92
-%patch93 -p1
 %endif
 #
 # test_vanilla
diff --git a/fixup-testcase-perturb.diff b/fixup-testcase-perturb.diff
deleted file mode 100644
index 22fc00e..0000000
--- a/fixup-testcase-perturb.diff
+++ /dev/null
@@ -1,38 +0,0 @@
-MALLOC_PERTURB_ will make inval-equ-1.l fail, because with errors fixups aren't
-run, which means the space for displacement operands remains uninitialized.
-The testcase invalidly expects zeros there.  See bnc #590820 .
-
---- gas/testsuite/gas/i386/inval-equ-1.l.mm	2008-03-03 15:28:58.000000000 +0000
-+++ gas/testsuite/gas/i386/inval-equ-1.l	2010-03-24 16:16:30.000000000 +0000
-@@ -9,6 +9,6 @@ GAS LISTING .*
- [ 	]*3[ 	]+\.equ    bar1,%eax
- [ 	]*4[ 	]+\.equ    bar2,%eax
- [ 	]*5[ 	]+\.globl  bar2
--[ 	]*6[ 	]+\?\?\?\? A1000000 		mov bar1,%eax
--[ 	]*6[ 	]+00
--[ 	]*7[ 	]+\?\?\?\? 89C0     		mov bar2,%eax
-+[ 	]*6[ 	]+.*[ 	]+mov bar1,%eax
-+[ 	]*6[ 	]+.*
-+[ 	]*7[ 	]+.*[ 	]+mov bar2,%eax
---- gas/testsuite/gas/i386/inval-equ-2.l.mm	2008-03-03 15:28:58.000000000 +0000
-+++ gas/testsuite/gas/i386/inval-equ-2.l	2010-03-24 16:18:05.000000000 +0000
-@@ -7,13 +7,13 @@ GAS LISTING .*
- 
- [ 	]*1[ 	]+\.globl  bar1
- [ 	]*2[ 	]+\.set    bar1,\(%eax\+1\)
--[ 	]*3[ 	]+\?\?\?\? A12A0000 		mov bar1,%eax
--[ 	]*3[ 	]+00
-+[ 	]*3[ 	]+.*[ 	]+mov bar1,%eax
-+[ 	]*3[ 	]+.*
- [ 	]*4[ 	]+\.set    bar2,\(%eax\+1\)
--[ 	]*5[ 	]+\?\?\?\? A12A0000 		mov bar2,%eax
--[ 	]*5[ 	]+00
-+[ 	]*5[ 	]+.*[ 	]+mov bar2,%eax
-+[ 	]*5[ 	]+.*
- [ 	]*6[ 	]+\.globl  bar2
- [ 	]*7[ 	]+\.set    bar3,\(%eax\+1\)
--[ 	]*8[ 	]+\?\?\?\? A12A0000 		mov bar3,%eax
-+[ 	]*8[ 	]+.*[ 	]+mov bar3,%eax
- \*\*\*\*  Error:can't make global register symbol `bar3'
--[ 	]*8[ 	]+00
-+[ 	]*8[ 	]+.*
diff --git a/ld-relro.diff b/ld-relro.diff
index b911f49..8c8e07e 100644
--- a/ld-relro.diff
+++ b/ld-relro.diff
@@ -1,8 +1,8 @@
 Index: ld/lexsup.c
 ===================================================================
---- ld/lexsup.c.orig	2009-11-23 14:02:48.000000000 +0100
-+++ ld/lexsup.c	2009-11-23 14:03:09.000000000 +0100
-@@ -687,6 +687,9 @@ parse_args (unsigned argc, char **argv)
+--- ld/lexsup.c.orig	2012-07-13 15:20:26.000000000 +0200
++++ ld/lexsup.c	2012-09-14 14:00:57.262167402 +0200
+@@ -608,6 +608,9 @@ parse_args (unsigned argc, char **argv)
  	}
      }
  
@@ -14,8 +14,8 @@ Index: ld/lexsup.c
      {
 Index: ld/testsuite/config/default.exp
 ===================================================================
---- ld/testsuite/config/default.exp.orig	2009-11-23 14:02:48.000000000 +0100
-+++ ld/testsuite/config/default.exp	2009-11-23 14:03:09.000000000 +0100
+--- ld/testsuite/config/default.exp.orig	2012-03-15 02:57:57.000000000 +0100
++++ ld/testsuite/config/default.exp	2012-09-14 14:00:57.263167402 +0200
 @@ -23,7 +23,7 @@
  #
  
@@ -25,16 +25,16 @@ Index: ld/testsuite/config/default.exp
  }
  
  if ![info exists as] then {
-@@ -68,7 +68,7 @@ if {![file isdirectory tmpdir/ld]} then
-     catch "exec mkdir tmpdir/ld" status
+@@ -69,7 +69,7 @@ if {![file isdirectory tmpdir/ld]} then
      catch "exec ln -s ../../ld-new tmpdir/ld/ld" status
+     catch "exec ln -s ld tmpdir/ld/collect-ld" status
  }
 -set gcc_ld_flag "-B[pwd]/tmpdir/ld/"
 +set gcc_ld_flag "-B[pwd]/tmpdir/ld/ -Wl,-z,norelro"
  
  # load the linker path
  if {[file exists tmpdir/libpath.exp]} {
-@@ -270,7 +270,7 @@ if ![info exists READELFFLAGS] then {
+@@ -279,7 +279,7 @@ if ![info exists READELFFLAGS] then {
  }
  
  if ![info exists LD] then {
@@ -45,9 +45,9 @@ Index: ld/testsuite/config/default.exp
  if ![info exists LDFLAGS] then {
 Index: ld/testsuite/ld-bootstrap/bootstrap.exp
 ===================================================================
---- ld/testsuite/ld-bootstrap/bootstrap.exp.orig	2009-11-23 14:02:48.000000000 +0100
-+++ ld/testsuite/ld-bootstrap/bootstrap.exp	2009-11-23 14:03:09.000000000 +0100
-@@ -56,7 +56,12 @@ foreach flags {"" "strip" "--static" "--
+--- ld/testsuite/ld-bootstrap/bootstrap.exp.orig	2011-12-03 18:13:01.000000000 +0100
++++ ld/testsuite/ld-bootstrap/bootstrap.exp	2012-09-14 14:00:57.263167402 +0200
+@@ -71,7 +71,12 @@ foreach flags {"" "strip" "--static" "--
  
      # This test can only be run if we have the ld build directory,
      # since we need the object files.
diff --git a/s390-biarch.diff b/s390-biarch.diff
index a38afac..d893885 100644
--- a/s390-biarch.diff
+++ b/s390-biarch.diff
@@ -3,9 +3,9 @@ Index: ld/emulparams/elf_s390.sh
 --- ld/emulparams/elf_s390.sh.orig	2009-11-23 14:02:48.000000000 +0100
 +++ ld/emulparams/elf_s390.sh	2009-11-23 14:03:08.000000000 +0100
 @@ -11,3 +11,18 @@ TEMPLATE_NAME=elf32
- GENERATE_SHLIB_SCRIPT=yes 
  GENERATE_PIE_SCRIPT=yes 
  NO_SMALL_DATA=yes
+ IREL_IN_PLT=
 +
 +# Treat a host that matches the target with the possible exception of "x"
 +# in the name as if it were native.
diff --git a/use-hashtype-both-by-default.diff b/use-hashtype-both-by-default.diff
index 48c68ce..aab39a6 100644
--- a/use-hashtype-both-by-default.diff
+++ b/use-hashtype-both-by-default.diff
@@ -1,8 +1,8 @@
 Index: ld/ldmain.c
 ===================================================================
---- ld/ldmain.c.orig	2009-11-23 14:03:08.000000000 +0100
-+++ ld/ldmain.c	2009-11-23 14:03:09.000000000 +0100
-@@ -266,6 +266,7 @@ main (int argc, char **argv)
+--- ld/ldmain.c.orig	2012-09-14 14:01:52.209165500 +0200
++++ ld/ldmain.c	2012-09-14 14:01:52.273165498 +0200
+@@ -279,6 +279,7 @@ main (int argc, char **argv)
    link_info.combreloc = TRUE;
    link_info.strip_discarded = TRUE;
    link_info.emit_hash = TRUE;
@@ -12,8 +12,8 @@ Index: ld/ldmain.c
    /* SVR4 linkers seem to set DT_INIT and DT_FINI based on magic _init
 Index: ld/testsuite/config/default.exp
 ===================================================================
---- ld/testsuite/config/default.exp.orig	2009-11-23 14:03:09.000000000 +0100
-+++ ld/testsuite/config/default.exp	2009-11-23 14:03:09.000000000 +0100
+--- ld/testsuite/config/default.exp.orig	2012-09-14 14:01:52.223165499 +0200
++++ ld/testsuite/config/default.exp	2012-09-14 14:01:52.273165498 +0200
 @@ -23,7 +23,7 @@
  #
  
@@ -23,16 +23,16 @@ Index: ld/testsuite/config/default.exp
  }
  
  if ![info exists as] then {
-@@ -68,7 +68,7 @@ if {![file isdirectory tmpdir/ld]} then
-     catch "exec mkdir tmpdir/ld" status
+@@ -69,7 +69,7 @@ if {![file isdirectory tmpdir/ld]} then
      catch "exec ln -s ../../ld-new tmpdir/ld/ld" status
+     catch "exec ln -s ld tmpdir/ld/collect-ld" status
  }
 -set gcc_ld_flag "-B[pwd]/tmpdir/ld/ -Wl,-z,norelro"
 +set gcc_ld_flag "-B[pwd]/tmpdir/ld/ -Wl,-z,norelro -Wl,--hash-style=sysv"
  
  # load the linker path
  if {[file exists tmpdir/libpath.exp]} {
-@@ -270,7 +270,7 @@ if ![info exists READELFFLAGS] then {
+@@ -279,7 +279,7 @@ if ![info exists READELFFLAGS] then {
  }
  
  if ![info exists LD] then {
diff --git a/x86-64-biarch.patch b/x86-64-biarch.patch
index 81a50b9..4f7ebe9 100644
--- a/x86-64-biarch.patch
+++ b/x86-64-biarch.patch
@@ -1,15 +1,13 @@
 Index: ld/emulparams/elf_i386.sh
 ===================================================================
---- ld/emulparams/elf_i386.sh.orig	2009-07-29 16:59:23.000000000 +0200
-+++ ld/emulparams/elf_i386.sh	2011-04-19 14:51:40.000000000 +0200
-@@ -12,4 +12,9 @@ GENERATE_SHLIB_SCRIPT=yes
- GENERATE_PIE_SCRIPT=yes
+--- ld/emulparams/elf_i386.sh.orig	2012-06-11 15:23:50.000000000 +0200
++++ ld/emulparams/elf_i386.sh	2012-09-14 14:00:17.501168779 +0200
+@@ -13,3 +13,8 @@ GENERATE_PIE_SCRIPT=yes
  NO_SMALL_DATA=yes
- SEPARATE_GOTPLT=12
+ SEPARATE_GOTPLT="SIZEOF (.got.plt) >= 12 ? 12 : 0"
+ IREL_IN_PLT=
 +
 +# Look for 64 bit target libraries in /lib64, /usr/lib64 etc., first.
 +case "$EMULATION_NAME" in
 +  *64*) LIBPATH_SUFFIX=64 ;;
 +esac
- IREL_IN_PLT=
-