Fixes kernel configuration error.

[openwrt.git] / toolchain / binutils / patches / 2.17 / 500-avr32.patch
diff --git a/toolchain/binutils/patches/2.17/500-avr32.patch b/toolchain/binutils/patches/2.17/500-avr32.patch

index 7ece1c2..3043bd3 100644 (file)
--- a/toolchain/binutils/patches/2.17/500-avr32.patch
+++ b/toolchain/binutils/patches/2.17/500-avr32.patch
@@ -1,6 +1,5 @@
-diff -Nrup binutils-2.17/bfd/aclocal.m4 binutils-2.17.atmel.1.3.0/bfd/aclocal.m4
---- binutils-2.17/bfd/aclocal.m4       2005-09-30 20:38:50.000000000 +0200
-+++ binutils-2.17.atmel.1.3.0/bfd/aclocal.m4   2007-03-26 10:30:51.000000000 +0200
+--- a/bfd/aclocal.m4
++++ b/bfd/aclocal.m4
  @@ -1,4 +1,4 @@
  -# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
  +# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
  @@ -1,4 +1,4 @@
  -# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
  +# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
@@ -16,9 +15,8 @@ diff -Nrup binutils-2.17/bfd/aclocal.m4 binutils-2.17.atmel.1.3.0/bfd/aclocal.m4
   
   # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
   
   
   # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
   
-diff -Nrup binutils-2.17/bfd/archures.c binutils-2.17.atmel.1.3.0/bfd/archures.c
---- binutils-2.17/bfd/archures.c       2006-03-06 14:42:03.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/bfd/archures.c   2007-03-26 10:20:30.000000000 +0200
+--- a/bfd/archures.c
++++ b/bfd/archures.c
  @@ -334,6 +334,9 @@ DESCRIPTION
   .#define bfd_mach_avr3                3
   .#define bfd_mach_avr4                4
  @@ -334,6 +334,9 @@ DESCRIPTION
   .#define bfd_mach_avr3                3
   .#define bfd_mach_avr4                4
@@ -45,9 +43,8 @@ diff -Nrup binutils-2.17/bfd/archures.c binutils-2.17.atmel.1.3.0/bfd/archures.c
       &bfd_bfin_arch,
       &bfd_cr16c_arch,
       &bfd_cris_arch,
       &bfd_bfin_arch,
       &bfd_cr16c_arch,
       &bfd_cris_arch,
-diff -Nrup binutils-2.17/bfd/bfd-in2.h binutils-2.17.atmel.1.3.0/bfd/bfd-in2.h
---- binutils-2.17/bfd/bfd-in2.h        2006-03-26 01:38:42.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/bfd/bfd-in2.h    2007-03-26 10:33:41.000000000 +0200
+--- a/bfd/bfd-in2.h
++++ b/bfd/bfd-in2.h
  @@ -1931,6 +1931,9 @@ enum bfd_architecture
   #define bfd_mach_avr3          3
   #define bfd_mach_avr4          4
  @@ -1931,6 +1931,9 @@ enum bfd_architecture
   #define bfd_mach_avr3          3
   #define bfd_mach_avr4          4
@@ -146,9 +143,8 @@ diff -Nrup binutils-2.17/bfd/bfd-in2.h binutils-2.17.atmel.1.3.0/bfd/bfd-in2.h
   /* Direct 12 bit.  */
     BFD_RELOC_390_12,
   
   /* Direct 12 bit.  */
     BFD_RELOC_390_12,
   
-diff -Nrup binutils-2.17/bfd/config.bfd binutils-2.17.atmel.1.3.0/bfd/config.bfd
---- binutils-2.17/bfd/config.bfd       2006-04-05 14:41:57.000000000 +0200
-+++ binutils-2.17.atmel.1.3.0/bfd/config.bfd   2007-03-26 10:20:30.000000000 +0200
+--- a/bfd/config.bfd
++++ b/bfd/config.bfd
  @@ -317,6 +317,10 @@ case "${targ}" in
       targ_underscore=yes
       ;;
  @@ -317,6 +317,10 @@ case "${targ}" in
       targ_underscore=yes
       ;;
@@ -160,9 +156,8 @@ diff -Nrup binutils-2.17/bfd/config.bfd binutils-2.17.atmel.1.3.0/bfd/config.bfd
     c30-*-*aout* | tic30-*-*aout*)
       targ_defvec=tic30_aout_vec
       ;;
     c30-*-*aout* | tic30-*-*aout*)
       targ_defvec=tic30_aout_vec
       ;;
-diff -Nrup binutils-2.17/bfd/config.in binutils-2.17.atmel.1.3.0/bfd/config.in
---- binutils-2.17/bfd/config.in        2005-11-03 17:06:10.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/bfd/config.in    2007-03-26 10:30:55.000000000 +0200
+--- a/bfd/config.in
++++ b/bfd/config.in
  @@ -313,18 +313,18 @@
   /* Define to the version of this package. */
   #undef PACKAGE_VERSION
  @@ -313,18 +313,18 @@
   /* Define to the version of this package. */
   #undef PACKAGE_VERSION
@@ -197,9 +192,8 @@ diff -Nrup binutils-2.17/bfd/config.in binutils-2.17.atmel.1.3.0/bfd/config.in
  -/* Define to `unsigned' if <sys/types.h> does not define. */
  +/* Define to `unsigned int' if <sys/types.h> does not define. */
   #undef size_t
  -/* Define to `unsigned' if <sys/types.h> does not define. */
  +/* Define to `unsigned int' if <sys/types.h> does not define. */
   #undef size_t
-diff -Nrup binutils-2.17/bfd/configure binutils-2.17.atmel.1.3.0/bfd/configure
---- binutils-2.17/bfd/configure        2006-06-23 20:17:03.000000000 +0200
-+++ binutils-2.17.atmel.1.3.0/bfd/configure    2007-03-26 10:30:54.000000000 +0200
+--- a/bfd/configure
++++ b/bfd/configure
  @@ -1,25 +1,54 @@
   #! /bin/sh
   # Guess values for system-dependent variables and create Makefiles.
  @@ -1,25 +1,54 @@
   #! /bin/sh
   # Guess values for system-dependent variables and create Makefiles.
@@ -3671,15 +3665,6 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17.atmel.1.3.0/bfd/configure
   if test "x$enable_dependency_tracking" != xno; then
     am_depcomp="$ac_aux_dir/depcomp"
     AMDEPBACKSLASH='\'
   if test "x$enable_dependency_tracking" != xno; then
     am_depcomp="$ac_aux_dir/depcomp"
     AMDEPBACKSLASH='\'
-@@ -2836,7 +3321,7 @@ fi
- 
- # Define the identity of the package.
-  PACKAGE=bfd
-- VERSION=2.17
-+ VERSION=2.17.atmel.0.0.99
- 
- 
- cat >>confdefs.h <<_ACEOF
  @@ -2874,8 +3359,8 @@ if test "$cross_compiling" != no; then
     if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
  @@ -2874,8 +3359,8 @@ if test "$cross_compiling" != no; then
     if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
@@ -17291,9 +17276,8 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17.atmel.1.3.0/bfd/configure
   
   { (exit 0); exit 0; }
   _ACEOF
   
   { (exit 0); exit 0; }
   _ACEOF
-diff -Nrup binutils-2.17/bfd/cpu-avr32.c binutils-2.17.atmel.1.3.0/bfd/cpu-avr32.c
---- binutils-2.17/bfd/cpu-avr32.c      1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/bfd/cpu-avr32.c  2007-05-31 17:03:36.000000000 +0200
+--- /dev/null
++++ b/bfd/cpu-avr32.c
  @@ -0,0 +1,49 @@
  +/* BFD library support routines for AVR32.
  +   Copyright 2003-2006 Atmel Corporation.
  @@ -0,0 +1,49 @@
  +/* BFD library support routines for AVR32.
  +   Copyright 2003-2006 Atmel Corporation.
@@ -17344,9 +17328,8 @@ diff -Nrup binutils-2.17/bfd/cpu-avr32.c binutils-2.17.atmel.1.3.0/bfd/cpu-avr32
  +
  +const bfd_arch_info_type bfd_avr32_arch =
  +  N(bfd_mach_avr32_ap, "avr32", TRUE, &cpu_info[0]);
  +
  +const bfd_arch_info_type bfd_avr32_arch =
  +  N(bfd_mach_avr32_ap, "avr32", TRUE, &cpu_info[0]);
-diff -Nrup binutils-2.17/bfd/doc/bfd.info binutils-2.17.atmel.1.3.0/bfd/doc/bfd.info
---- binutils-2.17/bfd/doc/bfd.info     2006-06-12 15:37:32.000000000 +0200
-+++ binutils-2.17.atmel.1.3.0/bfd/doc/bfd.info 2007-03-26 10:34:02.000000000 +0200
+--- a/bfd/doc/bfd.info
++++ b/bfd/doc/bfd.info
  @@ -1,5 +1,7 @@
  -This is ../.././bfd/doc/bfd.info, produced by makeinfo version 4.8 from
  -../.././bfd/doc/bfd.texinfo.
  @@ -1,5 +1,7 @@
  -This is ../.././bfd/doc/bfd.info, produced by makeinfo version 4.8 from
  -../.././bfd/doc/bfd.texinfo.
@@ -17487,9 +17470,8 @@ diff -Nrup binutils-2.17/bfd/doc/bfd.info binutils-2.17.atmel.1.3.0/bfd/doc/bfd.
  +Node: Index\7f339032
   \1f
   End Tag Table
  +Node: Index\7f339032
   \1f
   End Tag Table
-diff -Nrup binutils-2.17/bfd/doc/Makefile.in binutils-2.17.atmel.1.3.0/bfd/doc/Makefile.in
---- binutils-2.17/bfd/doc/Makefile.in  2006-04-06 23:49:26.000000000 +0200
-+++ binutils-2.17.atmel.1.3.0/bfd/doc/Makefile.in      2007-03-26 10:30:55.000000000 +0200
+--- a/bfd/doc/Makefile.in
++++ b/bfd/doc/Makefile.in
  @@ -1,4 +1,4 @@
  -# Makefile.in generated by automake 1.9.5 from Makefile.am.
  +# Makefile.in generated by automake 1.9.6 from Makefile.am.
  @@ -1,4 +1,4 @@
  -# Makefile.in generated by automake 1.9.5 from Makefile.am.
  +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -17580,9 +17562,8 @@ diff -Nrup binutils-2.17/bfd/doc/Makefile.in binutils-2.17.atmel.1.3.0/bfd/doc/M
           done; \
         done
   
           done; \
         done
   
-diff -Nrup binutils-2.17/bfd/elf32-avr32.c binutils-2.17.atmel.1.3.0/bfd/elf32-avr32.c
---- binutils-2.17/bfd/elf32-avr32.c    1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/bfd/elf32-avr32.c        2007-09-28 10:30:44.000000000 +0200
+--- /dev/null
++++ b/bfd/elf32-avr32.c
  @@ -0,0 +1,3881 @@
  +/* AVR32-specific support for 32-bit ELF.
  +   Copyright 2003-2006 Atmel Corporation.
  @@ -0,0 +1,3881 @@
  +/* AVR32-specific support for 32-bit ELF.
  +   Copyright 2003-2006 Atmel Corporation.
@@ -21465,9 +21446,8 @@ diff -Nrup binutils-2.17/bfd/elf32-avr32.c binutils-2.17.atmel.1.3.0/bfd/elf32-a
  +#define elf_backend_got_header_size   AVR32_GOT_HEADER_SIZE
  +
  +#include "elf32-target.h"
  +#define elf_backend_got_header_size   AVR32_GOT_HEADER_SIZE
  +
  +#include "elf32-target.h"
-diff -Nrup binutils-2.17/bfd/elf32-avr32.c.orig binutils-2.17.atmel.1.3.0/bfd/elf32-avr32.c.orig
---- binutils-2.17/bfd/elf32-avr32.c.orig       1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/bfd/elf32-avr32.c.orig   2007-05-31 17:03:36.000000000 +0200
+--- /dev/null
++++ b/bfd/elf32-avr32.c.orig
  @@ -0,0 +1,3880 @@
  +/* AVR32-specific support for 32-bit ELF.
  +   Copyright 2003-2006 Atmel Corporation.
  @@ -0,0 +1,3880 @@
  +/* AVR32-specific support for 32-bit ELF.
  +   Copyright 2003-2006 Atmel Corporation.
@@ -25349,9 +25329,8 @@ diff -Nrup binutils-2.17/bfd/elf32-avr32.c.orig binutils-2.17.atmel.1.3.0/bfd/el
  +#define elf_backend_got_header_size   AVR32_GOT_HEADER_SIZE
  +
  +#include "elf32-target.h"
  +#define elf_backend_got_header_size   AVR32_GOT_HEADER_SIZE
  +
  +#include "elf32-target.h"
-diff -Nrup binutils-2.17/bfd/elf32-avr32.h binutils-2.17.atmel.1.3.0/bfd/elf32-avr32.h
---- binutils-2.17/bfd/elf32-avr32.h    1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/bfd/elf32-avr32.h        2007-09-28 10:30:44.000000000 +0200
+--- /dev/null
++++ b/bfd/elf32-avr32.h
  @@ -0,0 +1,23 @@
  +/* AVR32-specific support for 32-bit ELF.
  +   Copyright 2007 Atmel Corporation.
  @@ -0,0 +1,23 @@
  +/* AVR32-specific support for 32-bit ELF.
  +   Copyright 2007 Atmel Corporation.
@@ -25376,9 +25355,8 @@ diff -Nrup binutils-2.17/bfd/elf32-avr32.h binutils-2.17.atmel.1.3.0/bfd/elf32-a
  +
  +void bfd_elf32_avr32_set_options(struct bfd_link_info *info,
  +                               int direct_data_refs);
  +
  +void bfd_elf32_avr32_set_options(struct bfd_link_info *info,
  +                               int direct_data_refs);
-diff -Nrup binutils-2.17/bfd/elf-bfd.h binutils-2.17.atmel.1.3.0/bfd/elf-bfd.h
---- binutils-2.17/bfd/elf-bfd.h        2006-03-16 13:20:15.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/bfd/elf-bfd.h    2007-03-26 10:20:30.000000000 +0200
+--- a/bfd/elf-bfd.h
++++ b/bfd/elf-bfd.h
  @@ -1307,6 +1307,10 @@ struct elf_obj_tdata
        find_nearest_line.  */
     struct mips_elf_find_line *find_line_info;
  @@ -1307,6 +1307,10 @@ struct elf_obj_tdata
        find_nearest_line.  */
     struct mips_elf_find_line *find_line_info;
@@ -25390,9 +25368,8 @@ diff -Nrup binutils-2.17/bfd/elf-bfd.h binutils-2.17.atmel.1.3.0/bfd/elf-bfd.h
     /* A place to stash dwarf1 info for this bfd.  */
     struct dwarf1_debug *dwarf1_find_line_info;
   
     /* A place to stash dwarf1 info for this bfd.  */
     struct dwarf1_debug *dwarf1_find_line_info;
   
-diff -Nrup binutils-2.17/bfd/libbfd.h binutils-2.17.atmel.1.3.0/bfd/libbfd.h
---- binutils-2.17/bfd/libbfd.h 2006-03-26 01:38:42.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/bfd/libbfd.h     2007-03-26 10:33:41.000000000 +0200
+--- a/bfd/libbfd.h
++++ b/bfd/libbfd.h
  @@ -1518,6 +1518,47 @@ static const char *const bfd_reloc_code_
     "BFD_RELOC_AVR_LDI",
     "BFD_RELOC_AVR_6",
  @@ -1518,6 +1518,47 @@ static const char *const bfd_reloc_code_
     "BFD_RELOC_AVR_LDI",
     "BFD_RELOC_AVR_6",
@@ -25441,9 +25418,8 @@ diff -Nrup binutils-2.17/bfd/libbfd.h binutils-2.17.atmel.1.3.0/bfd/libbfd.h
     "BFD_RELOC_390_12",
     "BFD_RELOC_390_GOT12",
     "BFD_RELOC_390_PLT32",
     "BFD_RELOC_390_12",
     "BFD_RELOC_390_GOT12",
     "BFD_RELOC_390_PLT32",
-diff -Nrup binutils-2.17/bfd/Makefile.am binutils-2.17.atmel.1.3.0/bfd/Makefile.am
---- binutils-2.17/bfd/Makefile.am      2006-06-23 20:17:17.000000000 +0200
-+++ binutils-2.17.atmel.1.3.0/bfd/Makefile.am  2007-03-26 10:20:30.000000000 +0200
+--- a/bfd/Makefile.am
++++ b/bfd/Makefile.am
  @@ -3,7 +3,7 @@
   AUTOMAKE_OPTIONS = 1.9 cygnus
   
  @@ -3,7 +3,7 @@
   AUTOMAKE_OPTIONS = 1.9 cygnus
   
@@ -25480,9 +25456,8 @@ diff -Nrup binutils-2.17/bfd/Makefile.am binutils-2.17.atmel.1.3.0/bfd/Makefile.
   elf32-cr16c.lo: elf32-cr16c.c $(INCDIR)/filenames.h \
     $(INCDIR)/hashtab.h $(INCDIR)/bfdlink.h $(INCDIR)/elf/cr16c.h \
     $(INCDIR)/elf/reloc-macros.h elf-bfd.h $(INCDIR)/elf/common.h \
   elf32-cr16c.lo: elf32-cr16c.c $(INCDIR)/filenames.h \
     $(INCDIR)/hashtab.h $(INCDIR)/bfdlink.h $(INCDIR)/elf/cr16c.h \
     $(INCDIR)/elf/reloc-macros.h elf-bfd.h $(INCDIR)/elf/common.h \
-diff -Nrup binutils-2.17/bfd/Makefile.in binutils-2.17.atmel.1.3.0/bfd/Makefile.in
---- binutils-2.17/bfd/Makefile.in      2006-06-23 20:17:19.000000000 +0200
-+++ binutils-2.17.atmel.1.3.0/bfd/Makefile.in  2007-03-26 10:30:55.000000000 +0200
+--- a/bfd/Makefile.in
++++ b/bfd/Makefile.in
  @@ -1,4 +1,4 @@
  -# Makefile.in generated by automake 1.9.5 from Makefile.am.
  +# Makefile.in generated by automake 1.9.6 from Makefile.am.
  @@ -1,4 +1,4 @@
  -# Makefile.in generated by automake 1.9.5 from Makefile.am.
  +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -25577,9 +25552,8 @@ diff -Nrup binutils-2.17/bfd/Makefile.in binutils-2.17.atmel.1.3.0/bfd/Makefile.
   elf32-cr16c.lo: elf32-cr16c.c $(INCDIR)/filenames.h \
     $(INCDIR)/hashtab.h $(INCDIR)/bfdlink.h $(INCDIR)/elf/cr16c.h \
     $(INCDIR)/elf/reloc-macros.h elf-bfd.h $(INCDIR)/elf/common.h \
   elf32-cr16c.lo: elf32-cr16c.c $(INCDIR)/filenames.h \
     $(INCDIR)/hashtab.h $(INCDIR)/bfdlink.h $(INCDIR)/elf/cr16c.h \
     $(INCDIR)/elf/reloc-macros.h elf-bfd.h $(INCDIR)/elf/common.h \
-diff -Nrup binutils-2.17/bfd/reloc.c binutils-2.17.atmel.1.3.0/bfd/reloc.c
---- binutils-2.17/bfd/reloc.c  2006-03-26 01:38:42.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/bfd/reloc.c      2007-03-26 10:20:30.000000000 +0200
+--- a/bfd/reloc.c
++++ b/bfd/reloc.c
  @@ -3714,6 +3714,129 @@ ENUMDOC
     instructions
   
  @@ -3714,6 +3714,129 @@ ENUMDOC
     instructions
   
@@ -25710,9 +25684,8 @@ diff -Nrup binutils-2.17/bfd/reloc.c binutils-2.17.atmel.1.3.0/bfd/reloc.c
     BFD_RELOC_390_12
   ENUMDOC
      Direct 12 bit.
     BFD_RELOC_390_12
   ENUMDOC
      Direct 12 bit.
-diff -Nrup binutils-2.17/bfd/targets.c binutils-2.17.atmel.1.3.0/bfd/targets.c
---- binutils-2.17/bfd/targets.c        2006-04-05 14:41:57.000000000 +0200
-+++ binutils-2.17.atmel.1.3.0/bfd/targets.c    2007-03-26 10:20:30.000000000 +0200
+--- a/bfd/targets.c
++++ b/bfd/targets.c
  @@ -553,6 +553,7 @@ extern const bfd_target b_out_vec_little
   extern const bfd_target bfd_efi_app_ia32_vec;
   extern const bfd_target bfd_efi_app_ia64_vec;
  @@ -553,6 +553,7 @@ extern const bfd_target b_out_vec_little
   extern const bfd_target bfd_efi_app_ia32_vec;
   extern const bfd_target bfd_efi_app_ia64_vec;
@@ -25729,9 +25702,8 @@ diff -Nrup binutils-2.17/bfd/targets.c binutils-2.17.atmel.1.3.0/bfd/targets.c
         &bfd_elf32_bfin_vec,
         &bfd_elf32_bfinfdpic_vec,
   
         &bfd_elf32_bfin_vec,
         &bfd_elf32_bfinfdpic_vec,
   
-diff -Nrup binutils-2.17/binutils/config.in binutils-2.17.atmel.1.3.0/binutils/config.in
---- binutils-2.17/binutils/config.in   2006-02-14 09:59:10.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/binutils/config.in       2007-03-26 10:32:11.000000000 +0200
+--- a/binutils/config.in
++++ b/binutils/config.in
  @@ -218,7 +218,7 @@
   
   /* If using the C implementation of alloca, define if you know the
  @@ -218,7 +218,7 @@
   
   /* If using the C implementation of alloca, define if you know the
@@ -25752,9 +25724,8 @@ diff -Nrup binutils-2.17/binutils/config.in binutils-2.17.atmel.1.3.0/binutils/c
  -/* Define to `unsigned' if <sys/types.h> does not define. */
  +/* Define to `unsigned int' if <sys/types.h> does not define. */
   #undef size_t
  -/* Define to `unsigned' if <sys/types.h> does not define. */
  +/* Define to `unsigned int' if <sys/types.h> does not define. */
   #undef size_t
-diff -Nrup binutils-2.17/binutils/configure binutils-2.17.atmel.1.3.0/binutils/configure
---- binutils-2.17/binutils/configure   2006-04-06 23:49:29.000000000 +0200
-+++ binutils-2.17.atmel.1.3.0/binutils/configure       2007-03-26 10:32:09.000000000 +0200
+--- a/binutils/configure
++++ b/binutils/configure
  @@ -1,25 +1,54 @@
   #! /bin/sh
   # Guess values for system-dependent variables and create Makefiles.
  @@ -1,25 +1,54 @@
   #! /bin/sh
   # Guess values for system-dependent variables and create Makefiles.
@@ -39245,9 +39216,8 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17.atmel.1.3.0/binutils/c
   
   { (exit 0); exit 0; }
   _ACEOF
   
   { (exit 0); exit 0; }
   _ACEOF
-diff -Nrup binutils-2.17/binutils/doc/binutils.info binutils-2.17.atmel.1.3.0/binutils/doc/binutils.info
---- binutils-2.17/binutils/doc/binutils.info   2006-06-23 20:19:48.000000000 +0200
-+++ binutils-2.17.atmel.1.3.0/binutils/doc/binutils.info       2007-03-26 10:34:44.000000000 +0200
+--- a/binutils/doc/binutils.info
++++ b/binutils/doc/binutils.info
  @@ -1,5 +1,7 @@
  -This is ../.././binutils/doc/binutils.info, produced by makeinfo
  -version 4.8 from ../.././binutils/doc/binutils.texi.
  @@ -1,5 +1,7 @@
  -This is ../.././binutils/doc/binutils.info, produced by makeinfo
  -version 4.8 from ../.././binutils/doc/binutils.texi.
@@ -39320,9 +39290,8 @@ diff -Nrup binutils-2.17/binutils/doc/binutils.info binutils-2.17.atmel.1.3.0/bi
  +Node: Index\7f143907
   \1f
   End Tag Table
  +Node: Index\7f143907
   \1f
   End Tag Table
-diff -Nrup binutils-2.17/binutils/doc/Makefile.in binutils-2.17.atmel.1.3.0/binutils/doc/Makefile.in
---- binutils-2.17/binutils/doc/Makefile.in     2006-06-03 06:45:50.000000000 +0200
-+++ binutils-2.17.atmel.1.3.0/binutils/doc/Makefile.in 2007-03-26 10:32:10.000000000 +0200
+--- a/binutils/doc/Makefile.in
++++ b/binutils/doc/Makefile.in
  @@ -109,6 +109,7 @@ EXEEXT = @EXEEXT@
   EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
   GMOFILES = @GMOFILES@
  @@ -109,6 +109,7 @@ EXEEXT = @EXEEXT@
   EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
   GMOFILES = @GMOFILES@
@@ -39384,9 +39353,8 @@ diff -Nrup binutils-2.17/binutils/doc/Makefile.in binutils-2.17.atmel.1.3.0/binu
           done; \
         done
   
           done; \
         done
   
-diff -Nrup binutils-2.17/binutils/Makefile.am binutils-2.17.atmel.1.3.0/binutils/Makefile.am
---- binutils-2.17/binutils/Makefile.am 2006-04-06 23:49:26.000000000 +0200
-+++ binutils-2.17.atmel.1.3.0/binutils/Makefile.am     2007-03-26 10:20:22.000000000 +0200
+--- a/binutils/Makefile.am
++++ b/binutils/Makefile.am
  @@ -511,7 +511,7 @@ readelf.o: readelf.c dwarf.h ../bfd/bfd.
     $(INCDIR)/symcat.h $(INCDIR)/elf/dwarf2.h $(INCDIR)/elf/common.h \
     $(INCDIR)/elf/external.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/alpha.h \
  @@ -511,7 +511,7 @@ readelf.o: readelf.c dwarf.h ../bfd/bfd.
     $(INCDIR)/symcat.h $(INCDIR)/elf/dwarf2.h $(INCDIR)/elf/common.h \
     $(INCDIR)/elf/external.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/alpha.h \
@@ -39396,9 +39364,8 @@ diff -Nrup binutils-2.17/binutils/Makefile.am binutils-2.17.atmel.1.3.0/binutils
     $(INCDIR)/elf/d10v.h $(INCDIR)/elf/d30v.h $(INCDIR)/elf/dlx.h \
     $(INCDIR)/elf/fr30.h $(INCDIR)/elf/frv.h $(INCDIR)/elf/h8.h \
     $(INCDIR)/elf/hppa.h $(INCDIR)/elf/i386.h $(INCDIR)/elf/i370.h \
     $(INCDIR)/elf/d10v.h $(INCDIR)/elf/d30v.h $(INCDIR)/elf/dlx.h \
     $(INCDIR)/elf/fr30.h $(INCDIR)/elf/frv.h $(INCDIR)/elf/h8.h \
     $(INCDIR)/elf/hppa.h $(INCDIR)/elf/i386.h $(INCDIR)/elf/i370.h \
-diff -Nrup binutils-2.17/binutils/Makefile.in binutils-2.17.atmel.1.3.0/binutils/Makefile.in
---- binutils-2.17/binutils/Makefile.in 2006-06-02 04:21:08.000000000 +0200
-+++ binutils-2.17.atmel.1.3.0/binutils/Makefile.in     2007-03-26 10:32:10.000000000 +0200
+--- a/binutils/Makefile.in
++++ b/binutils/Makefile.in
  @@ -266,6 +266,7 @@ EXEEXT = @EXEEXT@
   EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
   GMOFILES = @GMOFILES@
  @@ -266,6 +266,7 @@ EXEEXT = @EXEEXT@
   EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
   GMOFILES = @GMOFILES@
@@ -39459,9 +39426,8 @@ diff -Nrup binutils-2.17/binutils/Makefile.in binutils-2.17.atmel.1.3.0/binutils
     $(INCDIR)/elf/d10v.h $(INCDIR)/elf/d30v.h $(INCDIR)/elf/dlx.h \
     $(INCDIR)/elf/fr30.h $(INCDIR)/elf/frv.h $(INCDIR)/elf/h8.h \
     $(INCDIR)/elf/hppa.h $(INCDIR)/elf/i386.h $(INCDIR)/elf/i370.h \
     $(INCDIR)/elf/d10v.h $(INCDIR)/elf/d30v.h $(INCDIR)/elf/dlx.h \
     $(INCDIR)/elf/fr30.h $(INCDIR)/elf/frv.h $(INCDIR)/elf/h8.h \
     $(INCDIR)/elf/hppa.h $(INCDIR)/elf/i386.h $(INCDIR)/elf/i370.h \
-diff -Nrup binutils-2.17/binutils/readelf.c binutils-2.17.atmel.1.3.0/binutils/readelf.c
---- binutils-2.17/binutils/readelf.c   2006-03-10 18:20:28.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/binutils/readelf.c       2007-03-26 10:20:22.000000000 +0200
+--- a/binutils/readelf.c
++++ b/binutils/readelf.c
  @@ -71,6 +71,7 @@
   #include "elf/arc.h"
   #include "elf/arm.h"
  @@ -71,6 +71,7 @@
   #include "elf/arc.h"
   #include "elf/arm.h"
@@ -39497,9 +39463,8 @@ diff -Nrup binutils-2.17/binutils/readelf.c binutils-2.17.atmel.1.3.0/binutils/r
       case EM_CRIS:             return "Axis Communications 32-bit embedded processor";
       case EM_JAVELIN:          return "Infineon Technologies 32-bit embedded cpu";
       case EM_FIREPATH:         return "Element 14 64-bit DSP processor";
       case EM_CRIS:             return "Axis Communications 32-bit embedded processor";
       case EM_JAVELIN:          return "Infineon Technologies 32-bit embedded cpu";
       case EM_FIREPATH:         return "Element 14 64-bit DSP processor";
-diff -Nrup binutils-2.17/configure binutils-2.17.atmel.1.3.0/configure
---- binutils-2.17/configure    2006-04-06 23:49:25.000000000 +0200
-+++ binutils-2.17.atmel.1.3.0/configure        2007-03-26 10:30:30.000000000 +0200
+--- a/configure
++++ b/configure
  @@ -899,7 +899,7 @@ host_libs="intl mmalloc libiberty opcode
   # know that we are building the simulator.
   # binutils, gas and ld appear in that order because it makes sense to run
  @@ -899,7 +899,7 @@ host_libs="intl mmalloc libiberty opcode
   # know that we are building the simulator.
   # binutils, gas and ld appear in that order because it makes sense to run
@@ -40736,9 +40701,8 @@ diff -Nrup binutils-2.17/configure binutils-2.17.atmel.1.3.0/configure
   
   
   # Without the "./", some shells look in PATH for config.status.
   
   
   # Without the "./", some shells look in PATH for config.status.
-diff -Nrup binutils-2.17/configure.in binutils-2.17.atmel.1.3.0/configure.in
---- binutils-2.17/configure.in 2006-06-23 20:19:53.000000000 +0200
-+++ binutils-2.17.atmel.1.3.0/configure.in     2007-03-26 10:20:35.000000000 +0200
+--- a/configure.in
++++ b/configure.in
  @@ -269,6 +269,9 @@ unsupported_languages=
   # exist yet.
   
  @@ -269,6 +269,9 @@ unsupported_languages=
   # exist yet.
   
@@ -40749,9 +40713,8 @@ diff -Nrup binutils-2.17/configure.in binutils-2.17.atmel.1.3.0/configure.in
     hppa*64*-*-*)
       noconfigdirs="$noconfigdirs byacc"
       ;;
     hppa*64*-*-*)
       noconfigdirs="$noconfigdirs byacc"
       ;;
-diff -Nrup binutils-2.17/gas/as.c binutils-2.17.atmel.1.3.0/gas/as.c
---- binutils-2.17/gas/as.c     2006-02-09 01:07:41.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/gas/as.c 2007-03-26 10:20:16.000000000 +0200
+--- a/gas/as.c
++++ b/gas/as.c
  @@ -439,10 +439,10 @@ parse_args (int * pargc, char *** pargv)
          the end of the preceeding line so that it is simpler to
          selectively add and remove lines from this list.  */
  @@ -439,10 +439,10 @@ parse_args (int * pargc, char *** pargv)
          the end of the preceeding line so that it is simpler to
          selectively add and remove lines from this list.  */
@@ -40794,9 +40757,8 @@ diff -Nrup binutils-2.17/gas/as.c binutils-2.17.atmel.1.3.0/gas/as.c
   
     input_scrub_end ();
   
   
     input_scrub_end ();
   
-diff -Nrup binutils-2.17/gas/config/bfin-aux.h binutils-2.17.atmel.1.3.0/gas/config/bfin-aux.h
---- binutils-2.17/gas/config/bfin-aux.h        2005-09-30 17:05:06.000000000 +0200
-+++ binutils-2.17.atmel.1.3.0/gas/config/bfin-aux.h    2007-03-26 10:20:14.000000000 +0200
+--- a/gas/config/bfin-aux.h
++++ b/gas/config/bfin-aux.h
  @@ -1,151 +1,151 @@
  -/* bfin-aux.h ADI Blackfin Header file for gas\r
  -   Copyright 2005\r
  @@ -1,151 +1,151 @@
  -/* bfin-aux.h ADI Blackfin Header file for gas\r
  -   Copyright 2005\r
@@ -41100,9 +41062,8 @@ diff -Nrup binutils-2.17/gas/config/bfin-aux.h binutils-2.17.atmel.1.3.0/gas/con
  +
  +INSTR_T
  +bfin_gen_multi_instr (INSTR_T dsp32, INSTR_T dsp16_grp1, INSTR_T dsp16_grp2);
  +
  +INSTR_T
  +bfin_gen_multi_instr (INSTR_T dsp32, INSTR_T dsp16_grp1, INSTR_T dsp16_grp2);
-diff -Nrup binutils-2.17/gas/config/tc-avr32.c binutils-2.17.atmel.1.3.0/gas/config/tc-avr32.c
---- binutils-2.17/gas/config/tc-avr32.c        1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/gas/config/tc-avr32.c    2007-09-28 10:30:46.000000000 +0200
+--- /dev/null
++++ b/gas/config/tc-avr32.c
  @@ -0,0 +1,4726 @@
  +/* Assembler implementation for AVR32.
  +   Copyright 2003-2006 Atmel Corporation.
  @@ -0,0 +1,4726 @@
  +/* Assembler implementation for AVR32.
  +   Copyright 2003-2006 Atmel Corporation.
@@ -45830,9 +45791,8 @@ diff -Nrup binutils-2.17/gas/config/tc-avr32.c binutils-2.17.atmel.1.3.0/gas/con
  +
  +/* vim: syntax=c sw=2
  + */
  +
  +/* vim: syntax=c sw=2
  + */
-diff -Nrup binutils-2.17/gas/config/tc-avr32.h binutils-2.17.atmel.1.3.0/gas/config/tc-avr32.h
---- binutils-2.17/gas/config/tc-avr32.h        1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/gas/config/tc-avr32.h    2007-03-26 10:20:14.000000000 +0200
+--- /dev/null
++++ b/gas/config/tc-avr32.h
  @@ -0,0 +1,313 @@
  +/* Assembler definitions for AVR32.
  +   Copyright 2003-2006 Atmel Corporation.
  @@ -0,0 +1,313 @@
  +/* Assembler definitions for AVR32.
  +   Copyright 2003-2006 Atmel Corporation.
@@ -46147,9 +46107,8 @@ diff -Nrup binutils-2.17/gas/config/tc-avr32.h binutils-2.17.atmel.1.3.0/gas/con
  +      (fixP)->tc_fix_data.max = 0;            \
  +    }                                         \
  +  while (0)
  +      (fixP)->tc_fix_data.max = 0;            \
  +    }                                         \
  +  while (0)
-diff -Nrup binutils-2.17/gas/configure.tgt binutils-2.17.atmel.1.3.0/gas/configure.tgt
---- binutils-2.17/gas/configure.tgt    2006-04-05 14:41:57.000000000 +0200
-+++ binutils-2.17.atmel.1.3.0/gas/configure.tgt        2007-03-26 10:20:16.000000000 +0200
+--- a/gas/configure.tgt
++++ b/gas/configure.tgt
  @@ -33,6 +33,7 @@ case ${cpu} in
     am33_2.0)           cpu_type=mn10300 endian=little ;;
     arm*be|arm*b)               cpu_type=arm endian=big ;;
  @@ -33,6 +33,7 @@ case ${cpu} in
     am33_2.0)           cpu_type=mn10300 endian=little ;;
     arm*be|arm*b)               cpu_type=arm endian=big ;;
@@ -46168,9 +46127,8 @@ diff -Nrup binutils-2.17/gas/configure.tgt binutils-2.17.atmel.1.3.0/gas/configu
     cris-*-linux-* | crisv32-*-linux-*)
                                         fmt=multi em=linux ;;
     cris-*-* | crisv32-*-*)             fmt=multi ;;
     cris-*-linux-* | crisv32-*-linux-*)
                                         fmt=multi em=linux ;;
     cris-*-* | crisv32-*-*)             fmt=multi ;;
-diff -Nrup binutils-2.17/gas/doc/all.texi binutils-2.17.atmel.1.3.0/gas/doc/all.texi
---- binutils-2.17/gas/doc/all.texi     2006-02-17 15:36:25.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/gas/doc/all.texi 2007-03-26 10:19:41.000000000 +0200
+--- a/gas/doc/all.texi
++++ b/gas/doc/all.texi
  @@ -29,6 +29,7 @@
   @set ALPHA
   @set ARC
  @@ -29,6 +29,7 @@
   @set ALPHA
   @set ARC
@@ -46179,9 +46137,8 @@ diff -Nrup binutils-2.17/gas/doc/all.texi binutils-2.17.atmel.1.3.0/gas/doc/all.
   @set BFIN
   @set CRIS
   @set D10V
   @set BFIN
   @set CRIS
   @set D10V
-diff -Nrup binutils-2.17/gas/doc/as.info binutils-2.17.atmel.1.3.0/gas/doc/as.info
---- binutils-2.17/gas/doc/as.info      2006-06-23 20:19:50.000000000 +0200
-+++ binutils-2.17.atmel.1.3.0/gas/doc/as.info  2007-03-26 10:35:18.000000000 +0200
+--- a/gas/doc/as.info
++++ b/gas/doc/as.info
  @@ -1,5 +1,7 @@
  -This is ../.././gas/doc/as.info, produced by makeinfo version 4.8 from
  -../.././gas/doc/as.texinfo.
  @@ -1,5 +1,7 @@
  -This is ../.././gas/doc/as.info, produced by makeinfo version 4.8 from
  -../.././gas/doc/as.texinfo.
@@ -47114,9 +47071,8 @@ diff -Nrup binutils-2.17/gas/doc/as.info binutils-2.17.atmel.1.3.0/gas/doc/as.in
  +Node: Index\7f583359
   \1f
   End Tag Table
  +Node: Index\7f583359
   \1f
   End Tag Table
-diff -Nrup binutils-2.17/gas/doc/as.texinfo binutils-2.17.atmel.1.3.0/gas/doc/as.texinfo
---- binutils-2.17/gas/doc/as.texinfo   2006-04-17 17:16:27.000000000 +0200
-+++ binutils-2.17.atmel.1.3.0/gas/doc/as.texinfo       2007-03-26 10:19:41.000000000 +0200
+--- a/gas/doc/as.texinfo
++++ b/gas/doc/as.texinfo
  @@ -6182,6 +6182,9 @@ subject, see the hardware manufacturer's
   @ifset ARM
   * ARM-Dependent::               ARM Dependent Features
  @@ -6182,6 +6182,9 @@ subject, see the hardware manufacturer's
   @ifset ARM
   * ARM-Dependent::               ARM Dependent Features
@@ -47138,9 +47094,8 @@ diff -Nrup binutils-2.17/gas/doc/as.texinfo binutils-2.17.atmel.1.3.0/gas/doc/as
   @ifset BFIN
   @include c-bfin.texi
   @end ifset
   @ifset BFIN
   @include c-bfin.texi
   @end ifset
-diff -Nrup binutils-2.17/gas/doc/c-avr32.texi binutils-2.17.atmel.1.3.0/gas/doc/c-avr32.texi
---- binutils-2.17/gas/doc/c-avr32.texi 1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/gas/doc/c-avr32.texi     2007-09-28 10:30:46.000000000 +0200
+--- /dev/null
++++ b/gas/doc/c-avr32.texi
  @@ -0,0 +1,254 @@
  +@c Copyright 2005, 2006
  +@c Atmel Corporation
  @@ -0,0 +1,254 @@
  +@c Copyright 2005, 2006
  +@c Atmel Corporation
@@ -47396,9 +47351,8 @@ diff -Nrup binutils-2.17/gas/doc/c-avr32.texi binutils-2.17.atmel.1.3.0/gas/doc/
  +deleting any superfluous constant pool- and GOT-entries.
  +
  +@end table
  +deleting any superfluous constant pool- and GOT-entries.
  +
  +@end table
-diff -Nrup binutils-2.17/gas/doc/Makefile.am binutils-2.17.atmel.1.3.0/gas/doc/Makefile.am
---- binutils-2.17/gas/doc/Makefile.am  2006-06-03 06:45:50.000000000 +0200
-+++ binutils-2.17.atmel.1.3.0/gas/doc/Makefile.am      2007-03-26 10:19:41.000000000 +0200
+--- a/gas/doc/Makefile.am
++++ b/gas/doc/Makefile.am
  @@ -29,6 +29,7 @@ CPU_DOCS = \
         c-alpha.texi \
         c-arc.texi \
  @@ -29,6 +29,7 @@ CPU_DOCS = \
         c-alpha.texi \
         c-arc.texi \
@@ -47407,9 +47361,8 @@ diff -Nrup binutils-2.17/gas/doc/Makefile.am binutils-2.17.atmel.1.3.0/gas/doc/M
         c-bfin.texi \
         c-d10v.texi \
         c-cris.texi \
         c-bfin.texi \
         c-d10v.texi \
         c-cris.texi \
-diff -Nrup binutils-2.17/gas/Makefile.am binutils-2.17.atmel.1.3.0/gas/Makefile.am
---- binutils-2.17/gas/Makefile.am      2006-04-06 23:49:30.000000000 +0200
-+++ binutils-2.17.atmel.1.3.0/gas/Makefile.am  2007-03-26 10:20:16.000000000 +0200
+--- a/gas/Makefile.am
++++ b/gas/Makefile.am
  @@ -45,6 +45,7 @@ CPU_TYPES = \
         arc \
         arm \
  @@ -45,6 +45,7 @@ CPU_TYPES = \
         arc \
         arm \
@@ -47468,9 +47421,8 @@ diff -Nrup binutils-2.17/gas/Makefile.am binutils-2.17.atmel.1.3.0/gas/Makefile.
   DEP_cris_aout = $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-cris.h \
     $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h
   DEP_cris_elf = $(srcdir)/config/obj-elf.h $(INCDIR)/symcat.h \
   DEP_cris_aout = $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-cris.h \
     $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h
   DEP_cris_elf = $(srcdir)/config/obj-elf.h $(INCDIR)/symcat.h \
-diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/aliases.d binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/aliases.d
---- binutils-2.17/gas/testsuite/gas/avr32/aliases.d    1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/aliases.d        2007-03-26 10:19:48.000000000 +0200
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/aliases.d
  @@ -0,0 +1,19 @@
  +#as:
  +#objdump: -dr
  @@ -0,0 +1,19 @@
  +#as:
  +#objdump: -dr
@@ -47491,9 +47443,8 @@ diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/aliases.d binutils-2.17.atmel.1
  +   c: b8 80      [ \t]+st\.b r12\[0x0\],r0
  +   e: b8 00      [ \t]+st\.h r12\[0x0\],r0
  +  10: 99 00      [ \t]+st\.w r12\[0x0\],r0
  +   c: b8 80      [ \t]+st\.b r12\[0x0\],r0
  +   e: b8 00      [ \t]+st\.h r12\[0x0\],r0
  +  10: 99 00      [ \t]+st\.w r12\[0x0\],r0
-diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/aliases.s binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/aliases.s
---- binutils-2.17/gas/testsuite/gas/avr32/aliases.s    1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/aliases.s        2007-03-26 10:19:48.000000000 +0200
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/aliases.s
  @@ -0,0 +1,14 @@
  +      .text
  +      .global ld_nodisp
  @@ -0,0 +1,14 @@
  +      .text
  +      .global ld_nodisp
@@ -47509,9 +47460,8 @@ diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/aliases.s binutils-2.17.atmel.1
  +      st.b    r12, r0
  +      st.h    r12, r0
  +      st.w    r12, r0
  +      st.b    r12, r0
  +      st.h    r12, r0
  +      st.w    r12, r0
-diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/allinsn.d binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/allinsn.d
---- binutils-2.17/gas/testsuite/gas/avr32/allinsn.d    1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/allinsn.d        2007-03-26 10:19:48.000000000 +0200
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/allinsn.d
  @@ -0,0 +1,2900 @@
  +#as:
  +#objdump: -dr
  @@ -0,0 +1,2900 @@
  +#as:
  +#objdump: -dr
@@ -50413,18 +50363,16 @@ diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/allinsn.d binutils-2.17.atmel.1
  + *[0-9a-f]*:  ff df d3 e0     bfins pc,pc,0x1f,0x0
  + *[0-9a-f]*:  ef d8 d1 f0     bfins r7,r8,0xf,0x10
  + *[0-9a-f]*:  f1 d7 d2 0f     bfins r8,r7,0x10,0xf
  + *[0-9a-f]*:  ff df d3 e0     bfins pc,pc,0x1f,0x0
  + *[0-9a-f]*:  ef d8 d1 f0     bfins r7,r8,0xf,0x10
  + *[0-9a-f]*:  f1 d7 d2 0f     bfins r8,r7,0x10,0xf
-diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/allinsn.exp binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/allinsn.exp
---- binutils-2.17/gas/testsuite/gas/avr32/allinsn.exp  1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/allinsn.exp      2007-03-26 10:19:48.000000000 +0200
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/allinsn.exp
  @@ -0,0 +1,5 @@
  +# AVR32 assembler testsuite. -*- Tcl -*-
  +
  +if [istarget avr32-*-*] {
  +    run_dump_test "allinsn"
  +}
  @@ -0,0 +1,5 @@
  +# AVR32 assembler testsuite. -*- Tcl -*-
  +
  +if [istarget avr32-*-*] {
  +    run_dump_test "allinsn"
  +}
-diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/allinsn.s binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/allinsn.s
---- binutils-2.17/gas/testsuite/gas/avr32/allinsn.s    1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/allinsn.s        2007-03-26 10:19:48.000000000 +0200
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/allinsn.s
  @@ -0,0 +1,3242 @@
  + .data
  +foodata: .word 42
  @@ -0,0 +1,3242 @@
  + .data
  +foodata: .word 42
@@ -53668,9 +53616,8 @@ diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/allinsn.s binutils-2.17.atmel.1
  +      bfins pc,pc,31,0
  +      bfins r7,r8,15,16
  +      bfins r8,r7,16,15
  +      bfins pc,pc,31,0
  +      bfins r7,r8,15,16
  +      bfins r8,r7,16,15
-diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/avr32.exp binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/avr32.exp
---- binutils-2.17/gas/testsuite/gas/avr32/avr32.exp    1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/avr32.exp        2007-03-26 10:19:48.000000000 +0200
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/avr32.exp
  @@ -0,0 +1,23 @@
  +# AVR32 assembler testsuite. -*- Tcl -*-
  +
  @@ -0,0 +1,23 @@
  +# AVR32 assembler testsuite. -*- Tcl -*-
  +
@@ -53695,9 +53642,8 @@ diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/avr32.exp binutils-2.17.atmel.1
  +    run_dump_test "symdiff"
  +    run_dump_test "symdiff_linkrelax"
  +}
  +    run_dump_test "symdiff"
  +    run_dump_test "symdiff_linkrelax"
  +}
-diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/call_nopic.d binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/call_nopic.d
---- binutils-2.17/gas/testsuite/gas/avr32/call_nopic.d 1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/call_nopic.d     2007-03-26 10:19:48.000000000 +0200
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/call_nopic.d
  @@ -0,0 +1,36 @@
  +#source: call.s
  +#as:
  @@ -0,0 +1,36 @@
  +#source: call.s
  +#as:
@@ -53735,9 +53681,8 @@ diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/call_nopic.d binutils-2.17.atme
  +
  +00000000 <different_section>:
  +   0: e2 c0 00 00     sub r0,r1,0
  +
  +00000000 <different_section>:
  +   0: e2 c0 00 00     sub r0,r1,0
-diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/call_nopic_linkrelax.d binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/call_nopic_linkrelax.d
---- binutils-2.17/gas/testsuite/gas/avr32/call_nopic_linkrelax.d       1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/call_nopic_linkrelax.d   2007-03-26 10:19:48.000000000 +0200
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/call_nopic_linkrelax.d
  @@ -0,0 +1,43 @@
  +#source: call.s
  +#as: --linkrelax
  @@ -0,0 +1,43 @@
  +#source: call.s
  +#as: --linkrelax
@@ -53782,9 +53727,8 @@ diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/call_nopic_linkrelax.d binutils
  +
  +00000000 <different_section>:
  +   0: e2 c0 00 00     sub r0,r1,0
  +
  +00000000 <different_section>:
  +   0: e2 c0 00 00     sub r0,r1,0
-diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/call_pic.d binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/call_pic.d
---- binutils-2.17/gas/testsuite/gas/avr32/call_pic.d   1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/call_pic.d       2007-03-26 10:19:48.000000000 +0200
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/call_pic.d
  @@ -0,0 +1,36 @@
  +#source: call.s
  +#as: --pic
  @@ -0,0 +1,36 @@
  +#source: call.s
  +#as: --pic
@@ -53822,9 +53766,8 @@ diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/call_pic.d binutils-2.17.atmel.
  +
  +00000000 <different_section>:
  +   0: e2 c0 00 00     sub r0,r1,0
  +
  +00000000 <different_section>:
  +   0: e2 c0 00 00     sub r0,r1,0
-diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/call_pic_linkrelax.d binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/call_pic_linkrelax.d
---- binutils-2.17/gas/testsuite/gas/avr32/call_pic_linkrelax.d 1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/call_pic_linkrelax.d     2007-03-26 10:19:48.000000000 +0200
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/call_pic_linkrelax.d
  @@ -0,0 +1,47 @@
  +#source: call.s
  +#as: --pic --linkrelax
  @@ -0,0 +1,47 @@
  +#source: call.s
  +#as: --pic --linkrelax
@@ -53873,9 +53816,8 @@ diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/call_pic_linkrelax.d binutils-2
  +
  +00000000 <different_section>:
  +   0: e2 c0 00 00     sub r0,r1,0
  +
  +00000000 <different_section>:
  +   0: e2 c0 00 00     sub r0,r1,0
-diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/call.s binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/call.s
---- binutils-2.17/gas/testsuite/gas/avr32/call.s       1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/call.s   2007-03-26 10:19:48.000000000 +0200
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/call.s
  @@ -0,0 +1,30 @@
  +
  +      .text
  @@ -0,0 +1,30 @@
  +
  +      .text
@@ -53907,9 +53849,8 @@ diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/call.s binutils-2.17.atmel.1.3.
  +      .section .text.init,"ax",@progbits
  +different_section:
  +      sub     r0, r1, 0
  +      .section .text.init,"ax",@progbits
  +different_section:
  +      sub     r0, r1, 0
-diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/dwarf2.d binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/dwarf2.d
---- binutils-2.17/gas/testsuite/gas/avr32/dwarf2.d     1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/dwarf2.d 2007-03-26 10:19:48.000000000 +0200
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/dwarf2.d
  @@ -0,0 +1,42 @@
  +#readelf: -wl
  +#name: dwarf2
  @@ -0,0 +1,42 @@
  +#readelf: -wl
  +#name: dwarf2
@@ -53953,9 +53894,8 @@ diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/dwarf2.d binutils-2.17.atmel.1.
  +  Special opcode .*: advance Address by 10 to 0xe and Line by 1 to 112
  +  Advance PC by 530 to 220
  +  Extended opcode 1: End of Sequence
  +  Special opcode .*: advance Address by 10 to 0xe and Line by 1 to 112
  +  Advance PC by 530 to 220
  +  Extended opcode 1: End of Sequence
-diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/dwarf2.s binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/dwarf2.s
---- binutils-2.17/gas/testsuite/gas/avr32/dwarf2.s     1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/dwarf2.s 2007-03-26 10:19:48.000000000 +0200
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/dwarf2.s
  @@ -0,0 +1,67 @@
  +# Source file used to test DWARF2 information for AVR32.
  +
  @@ -0,0 +1,67 @@
  +# Source file used to test DWARF2 information for AVR32.
  +
@@ -54024,9 +53964,8 @@ diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/dwarf2.s binutils-2.17.atmel.1.
  +      .uleb128 0, 0
  +
  +      .byte   0
  +      .uleb128 0, 0
  +
  +      .byte   0
-diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/fpinsn.d binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/fpinsn.d
---- binutils-2.17/gas/testsuite/gas/avr32/fpinsn.d     1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/fpinsn.d 2007-03-26 10:19:48.000000000 +0200
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/fpinsn.d
  @@ -0,0 +1,271 @@
  +#as:
  +#objdump: -dr
  @@ -0,0 +1,271 @@
  +#as:
  +#objdump: -dr
@@ -54299,9 +54238,8 @@ diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/fpinsn.d binutils-2.17.atmel.1.
  + *[0-9a-f]*:  e1 a8 00 f0     cop cp0,cr0,cr15,cr0,0x10
  + *[0-9a-f]*:  e1 a8 08 70     cop cp0,cr8,cr7,cr0,0x10
  + *[0-9a-f]*:  e1 a8 06 80     cop cp0,cr6,cr8,cr0,0x10
  + *[0-9a-f]*:  e1 a8 00 f0     cop cp0,cr0,cr15,cr0,0x10
  + *[0-9a-f]*:  e1 a8 08 70     cop cp0,cr8,cr7,cr0,0x10
  + *[0-9a-f]*:  e1 a8 06 80     cop cp0,cr6,cr8,cr0,0x10
-diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/fpinsn.s binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/fpinsn.s
---- binutils-2.17/gas/testsuite/gas/avr32/fpinsn.s     1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/fpinsn.s 2007-03-26 10:19:48.000000000 +0200
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/fpinsn.s
  @@ -0,0 +1,266 @@
  +
  +      .text
  @@ -0,0 +1,266 @@
  +
  +      .text
@@ -54569,9 +54507,8 @@ diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/fpinsn.s binutils-2.17.atmel.1.
  +      fcastd.s fr0, fr15
  +      fcastd.s fr8, fr7
  +      fcastd.s fr6, fr8
  +      fcastd.s fr0, fr15
  +      fcastd.s fr8, fr7
  +      fcastd.s fr6, fr8
-diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/hwrd-lwrd.d binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/hwrd-lwrd.d
---- binutils-2.17/gas/testsuite/gas/avr32/hwrd-lwrd.d  1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/hwrd-lwrd.d      2007-03-26 10:19:48.000000000 +0200
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/hwrd-lwrd.d
  @@ -0,0 +1,47 @@
  +#as:
  +#objdump: -dr
  @@ -0,0 +1,47 @@
  +#as:
  +#objdump: -dr
@@ -54620,9 +54557,8 @@ diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/hwrd-lwrd.d binutils-2.17.atmel
  +                      58: R_AVR32_LO16        \.text\+0x60
  +  5c: e0 10 00 00     andl r0,0x0
  +                      5c: R_AVR32_LO16        extsym1
  +                      58: R_AVR32_LO16        \.text\+0x60
  +  5c: e0 10 00 00     andl r0,0x0
  +                      5c: R_AVR32_LO16        extsym1
-diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/hwrd-lwrd.s binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/hwrd-lwrd.s
---- binutils-2.17/gas/testsuite/gas/avr32/hwrd-lwrd.s  1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/hwrd-lwrd.s      2007-03-26 10:19:48.000000000 +0200
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/hwrd-lwrd.s
  @@ -0,0 +1,39 @@
  +
  +        .equ    sym1, 0x12345678
  @@ -0,0 +1,39 @@
  +
  +        .equ    sym1, 0x12345678
@@ -54663,9 +54599,8 @@ diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/hwrd-lwrd.s binutils-2.17.atmel
  +        andl  r0, lo(extsym1)
  +
  +sym2:
  +        andl  r0, lo(extsym1)
  +
  +sym2:
-diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/jmptable.d binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/jmptable.d
---- binutils-2.17/gas/testsuite/gas/avr32/jmptable.d   1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/jmptable.d       2007-03-26 10:19:48.000000000 +0200
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/jmptable.d
  @@ -0,0 +1,20 @@
  +#source: jmptable.s
  +#as:
  @@ -0,0 +1,20 @@
  +#source: jmptable.s
  +#as:
@@ -54687,9 +54622,8 @@ diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/jmptable.d binutils-2.17.atmel.
  +  12: d7 03           nop
  +  14: d7 03           nop
  +  16: d7 03           nop
  +  12: d7 03           nop
  +  14: d7 03           nop
  +  16: d7 03           nop
-diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/jmptable_linkrelax.d binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/jmptable_linkrelax.d
---- binutils-2.17/gas/testsuite/gas/avr32/jmptable_linkrelax.d 1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/jmptable_linkrelax.d     2007-03-26 10:19:48.000000000 +0200
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/jmptable_linkrelax.d
  @@ -0,0 +1,25 @@
  +#source: jmptable.s
  +#as: --linkrelax
  @@ -0,0 +1,25 @@
  +#source: jmptable.s
  +#as: --linkrelax
@@ -54716,9 +54650,8 @@ diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/jmptable_linkrelax.d binutils-2
  +  12: d7 03           nop
  +  14: d7 03           nop
  +  16: d7 03           nop
  +  12: d7 03           nop
  +  14: d7 03           nop
  +  16: d7 03           nop
-diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/jmptable.s binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/jmptable.s
---- binutils-2.17/gas/testsuite/gas/avr32/jmptable.s   1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/jmptable.s       2007-03-26 10:19:48.000000000 +0200
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/jmptable.s
  @@ -0,0 +1,14 @@
  +
  +      .text
  @@ -0,0 +1,14 @@
  +
  +      .text
@@ -54734,9 +54667,8 @@ diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/jmptable.s binutils-2.17.atmel.
  +1:    nop
  +2:    nop
  +3:    nop
  +1:    nop
  +2:    nop
  +3:    nop
-diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/lda_nopic.d binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/lda_nopic.d
---- binutils-2.17/gas/testsuite/gas/avr32/lda_nopic.d  1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/lda_nopic.d      2007-03-26 10:19:48.000000000 +0200
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/lda_nopic.d
  @@ -0,0 +1,32 @@
  +#source: lda.s
  +#as:
  @@ -0,0 +1,32 @@
  +#source: lda.s
  +#as:
@@ -54770,9 +54702,8 @@ diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/lda_nopic.d binutils-2.17.atmel
  +      ...
  +0001001c <toofar_positive>:
  +   1001c:     fe ce 00 00     sub lr,pc,0
  +      ...
  +0001001c <toofar_positive>:
  +   1001c:     fe ce 00 00     sub lr,pc,0
-diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/lda_nopic_linkrelax.d binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/lda_nopic_linkrelax.d
---- binutils-2.17/gas/testsuite/gas/avr32/lda_nopic_linkrelax.d        1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/lda_nopic_linkrelax.d    2007-03-26 10:19:48.000000000 +0200
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/lda_nopic_linkrelax.d
  @@ -0,0 +1,41 @@
  +#source: lda.s
  +#as: --linkrelax
  @@ -0,0 +1,41 @@
  +#source: lda.s
  +#as: --linkrelax
@@ -54815,9 +54746,8 @@ diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/lda_nopic_linkrelax.d binutils-
  +      \.\.\.
  +00010020 <toofar_positive>:
  +   10020:     fe ce 00 00     sub lr,pc,0
  +      \.\.\.
  +00010020 <toofar_positive>:
  +   10020:     fe ce 00 00     sub lr,pc,0
-diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/lda_pic.d binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/lda_pic.d
---- binutils-2.17/gas/testsuite/gas/avr32/lda_pic.d    1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/lda_pic.d        2007-03-26 10:19:48.000000000 +0200
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/lda_pic.d
  @@ -0,0 +1,32 @@
  +#source: lda.s
  +#as: --pic
  @@ -0,0 +1,32 @@
  +#source: lda.s
  +#as: --pic
@@ -54851,9 +54781,8 @@ diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/lda_pic.d binutils-2.17.atmel.1
  +      ...
  +00010014 <toofar_positive>:
  +   10014:     fe ce 00 00     sub lr,pc,0
  +      ...
  +00010014 <toofar_positive>:
  +   10014:     fe ce 00 00     sub lr,pc,0
-diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/lda_pic_linkrelax.d binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/lda_pic_linkrelax.d
---- binutils-2.17/gas/testsuite/gas/avr32/lda_pic_linkrelax.d  1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/lda_pic_linkrelax.d      2007-03-26 10:19:48.000000000 +0200
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/lda_pic_linkrelax.d
  @@ -0,0 +1,40 @@
  +#source: lda.s
  +#as: --pic --linkrelax
  @@ -0,0 +1,40 @@
  +#source: lda.s
  +#as: --pic --linkrelax
@@ -54895,9 +54824,8 @@ diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/lda_pic_linkrelax.d binutils-2.
  +      ...
  +0001002c <toofar_positive>:
  +   1002c:     fe ce 00 00     sub lr,pc,0
  +      ...
  +0001002c <toofar_positive>:
  +   1002c:     fe ce 00 00     sub lr,pc,0
-diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/lda.s binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/lda.s
---- binutils-2.17/gas/testsuite/gas/avr32/lda.s        1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/lda.s    2007-03-26 10:19:48.000000000 +0200
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/lda.s
  @@ -0,0 +1,30 @@
  +
  +      .text
  @@ -0,0 +1,30 @@
  +
  +      .text
@@ -54929,9 +54857,8 @@ diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/lda.s binutils-2.17.atmel.1.3.0
  +      .data
  +different_section:
  +      .long   0x12345678
  +      .data
  +different_section:
  +      .long   0x12345678
-diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/pcrel.d binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/pcrel.d
---- binutils-2.17/gas/testsuite/gas/avr32/pcrel.d      1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/pcrel.d  2007-03-26 10:19:48.000000000 +0200
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/pcrel.d
  @@ -0,0 +1,64 @@
  +#as:
  +#objdump: -dr
  @@ -0,0 +1,64 @@
  +#as:
  +#objdump: -dr
@@ -54997,9 +54924,8 @@ diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/pcrel.d binutils-2.17.atmel.1.3
  +   e: d7 03           nop
  +  10: e0 a0 .. ..     rcall [0-9a-f]+ <.*>
  +                      10: R_AVR32_22H_PCREL   \.text\+0xc
  +   e: d7 03           nop
  +  10: e0 a0 .. ..     rcall [0-9a-f]+ <.*>
  +                      10: R_AVR32_22H_PCREL   \.text\+0xc
-diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/pcrel.s binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/pcrel.s
---- binutils-2.17/gas/testsuite/gas/avr32/pcrel.s      1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/pcrel.s  2007-03-26 10:19:48.000000000 +0200
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/pcrel.s
  @@ -0,0 +1,57 @@
  +
  +        .text
  @@ -0,0 +1,57 @@
  +
  +        .text
@@ -55058,9 +54984,8 @@ diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/pcrel.s binutils-2.17.atmel.1.3
  +      rcall   test_rcall2
  +      nop
  +      rcall   test_rcall2
  +      rcall   test_rcall2
  +      nop
  +      rcall   test_rcall2
-diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/pico.d binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/pico.d
---- binutils-2.17/gas/testsuite/gas/avr32/pico.d       1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/pico.d   2007-03-26 10:19:48.000000000 +0200
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/pico.d
  @@ -0,0 +1,149 @@
  +#as:
  +#objdump: -dr
  @@ -0,0 +1,149 @@
  +#as:
  +#objdump: -dr
@@ -55211,9 +55136,8 @@ diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/pico.d binutils-2.17.atmel.1.3.
  + *[0-9a-f]*:  ed a0 33 01     stcm\.w cp1,--r0,cr8
  + *[0-9a-f]*:  ed a7 33 80     stcm\.w cp1,--r7,cr15
  + *[0-9a-f]*:  ed a8 33 7f     stcm\.w cp1,--r8,cr8-cr14
  + *[0-9a-f]*:  ed a0 33 01     stcm\.w cp1,--r0,cr8
  + *[0-9a-f]*:  ed a7 33 80     stcm\.w cp1,--r7,cr15
  + *[0-9a-f]*:  ed a8 33 7f     stcm\.w cp1,--r8,cr8-cr14
-diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/pico.s binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/pico.s
---- binutils-2.17/gas/testsuite/gas/avr32/pico.s       1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/pico.s   2007-03-26 10:19:48.000000000 +0200
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/pico.s
  @@ -0,0 +1,144 @@
  +
  +      .text
  @@ -0,0 +1,144 @@
  +
  +      .text
@@ -55359,9 +55283,8 @@ diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/pico.s binutils-2.17.atmel.1.3.
  +      picostm.w       --r0, coeff1_a
  +      picostm.w       --r7, config
  +      picostm.w       --r8, coeff1_a-vmu2_out
  +      picostm.w       --r0, coeff1_a
  +      picostm.w       --r7, config
  +      picostm.w       --r8, coeff1_a-vmu2_out
-diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/pic_reloc.d binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/pic_reloc.d
---- binutils-2.17/gas/testsuite/gas/avr32/pic_reloc.d  1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/pic_reloc.d      2007-03-26 10:19:48.000000000 +0200
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/pic_reloc.d
  @@ -0,0 +1,27 @@
  +#as:
  +#objdump: -dr
  @@ -0,0 +1,27 @@
  +#as:
  +#objdump: -dr
@@ -55390,9 +55313,8 @@ diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/pic_reloc.d binutils-2.17.atmel
  +                      18: R_AVR32_GOT16S      \.L4
  +  1c: ec f0 00 00     ld.w r0,r6\[0\]
  +                      1c: R_AVR32_GOT16S      ldw_got
  +                      18: R_AVR32_GOT16S      \.L4
  +  1c: ec f0 00 00     ld.w r0,r6\[0\]
  +                      1c: R_AVR32_GOT16S      ldw_got
-diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/pic_reloc.s binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/pic_reloc.s
---- binutils-2.17/gas/testsuite/gas/avr32/pic_reloc.s  1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/pic_reloc.s      2007-03-26 10:19:48.000000000 +0200
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/pic_reloc.s
  @@ -0,0 +1,18 @@
  +
  +      .text
  @@ -0,0 +1,18 @@
  +
  +      .text
@@ -55412,9 +55334,8 @@ diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/pic_reloc.s binutils-2.17.atmel
  +      ld.w    r0,r6[.L4@got]
  +      ld.w    r0,r6[ldw_got@got]
  +.L4:
  +      ld.w    r0,r6[.L4@got]
  +      ld.w    r0,r6[ldw_got@got]
  +.L4:
-diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/symdiff.d binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/symdiff.d
---- binutils-2.17/gas/testsuite/gas/avr32/symdiff.d    1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/symdiff.d        2007-03-26 10:19:48.000000000 +0200
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/symdiff.d
  @@ -0,0 +1,24 @@
  +#source: symdiff.s
  +#as:
  @@ -0,0 +1,24 @@
  +#source: symdiff.s
  +#as:
@@ -55440,9 +55361,8 @@ diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/symdiff.d binutils-2.17.atmel.1
  +   a: d7 03           nop
  +   c: d7 03           nop
  +   e: d7 03           nop
  +   a: d7 03           nop
  +   c: d7 03           nop
  +   e: d7 03           nop
-diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/symdiff_linkrelax.d binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/symdiff_linkrelax.d
---- binutils-2.17/gas/testsuite/gas/avr32/symdiff_linkrelax.d  1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/symdiff_linkrelax.d      2007-03-26 10:19:48.000000000 +0200
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/symdiff_linkrelax.d
  @@ -0,0 +1,28 @@
  +#source: symdiff.s
  +#as: --linkrelax
  @@ -0,0 +1,28 @@
  +#source: symdiff.s
  +#as: --linkrelax
@@ -55472,9 +55392,8 @@ diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/symdiff_linkrelax.d binutils-2.
  +   a: d7 03           nop
  +   c: d7 03           nop
  +   e: d7 03           nop
  +   a: d7 03           nop
  +   c: d7 03           nop
  +   e: d7 03           nop
-diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/symdiff.s binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/symdiff.s
---- binutils-2.17/gas/testsuite/gas/avr32/symdiff.s    1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/gas/testsuite/gas/avr32/symdiff.s        2007-03-26 10:19:48.000000000 +0200
+--- /dev/null
++++ b/gas/testsuite/gas/avr32/symdiff.s
  @@ -0,0 +1,19 @@
  +
  +      .text
  @@ -0,0 +1,19 @@
  +
  +      .text
@@ -55495,9 +55414,8 @@ diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/symdiff.s binutils-2.17.atmel.1
  +.L1:  nop
  +      nop
  +.L2:  nop
  +.L1:  nop
  +      nop
  +.L2:  nop
-diff -Nrup binutils-2.17/gas/write.c binutils-2.17.atmel.1.3.0/gas/write.c
---- binutils-2.17/gas/write.c  2006-05-10 15:43:37.000000000 +0200
-+++ binutils-2.17.atmel.1.3.0/gas/write.c      2007-03-26 10:20:16.000000000 +0200
+--- a/gas/write.c
++++ b/gas/write.c
  @@ -126,7 +126,9 @@ static fixS *fix_new_internal (fragS *, 
                                offsetT offset, int pcrel,
                                RELOC_ENUM r_type);
  @@ -126,7 +126,9 @@ static fixS *fix_new_internal (fragS *, 
                                offsetT offset, int pcrel,
                                RELOC_ENUM r_type);
@@ -55551,9 +55469,8 @@ diff -Nrup binutils-2.17/gas/write.c binutils-2.17.atmel.1.3.0/gas/write.c
   
                   if (fragP->fr_subtype != 0)
                     {
   
                   if (fragP->fr_subtype != 0)
                     {
-diff -Nrup binutils-2.17/include/dis-asm.h binutils-2.17.atmel.1.3.0/include/dis-asm.h
---- binutils-2.17/include/dis-asm.h    2006-02-17 15:36:26.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/include/dis-asm.h        2007-03-26 10:20:18.000000000 +0200
+--- a/include/dis-asm.h
++++ b/include/dis-asm.h
  @@ -223,6 +223,7 @@ extern int print_insn_big_arm              (bfd_vma,
   extern int print_insn_little_arm      (bfd_vma, disassemble_info *);
   extern int print_insn_sparc           (bfd_vma, disassemble_info *);
  @@ -223,6 +223,7 @@ extern int print_insn_big_arm              (bfd_vma,
   extern int print_insn_little_arm      (bfd_vma, disassemble_info *);
   extern int print_insn_sparc           (bfd_vma, disassemble_info *);
@@ -55572,9 +55489,8 @@ diff -Nrup binutils-2.17/include/dis-asm.h binutils-2.17.atmel.1.3.0/include/dis
   extern int get_arm_regname_num_options (void);
   extern int set_arm_regname_option (int);
   extern int get_arm_regnames (int, const char **, const char **, const char *const **);
   extern int get_arm_regname_num_options (void);
   extern int set_arm_regname_option (int);
   extern int get_arm_regnames (int, const char **, const char **, const char *const **);
-diff -Nrup binutils-2.17/include/elf/avr32.h binutils-2.17.atmel.1.3.0/include/elf/avr32.h
---- binutils-2.17/include/elf/avr32.h  1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/include/elf/avr32.h      2007-03-26 10:20:17.000000000 +0200
+--- /dev/null
++++ b/include/elf/avr32.h
  @@ -0,0 +1,95 @@
  +/* AVR32 ELF support for BFD.
  +   Copyright 2003-2006 Atmel Corporation.
  @@ -0,0 +1,95 @@
  +/* AVR32 ELF support for BFD.
  +   Copyright 2003-2006 Atmel Corporation.
@@ -55671,9 +55587,8 @@ diff -Nrup binutils-2.17/include/elf/avr32.h binutils-2.17.atmel.1.3.0/include/e
  +
  +/* The total size in bytes of the Global Offset Table */
  +#define DT_AVR32_GOTSZ                        0x70000001
  +
  +/* The total size in bytes of the Global Offset Table */
  +#define DT_AVR32_GOTSZ                        0x70000001
-diff -Nrup binutils-2.17/include/elf/common.h binutils-2.17.atmel.1.3.0/include/elf/common.h
---- binutils-2.17/include/elf/common.h 2006-02-17 15:36:26.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/include/elf/common.h     2007-03-26 10:20:17.000000000 +0200
+--- a/include/elf/common.h
++++ b/include/elf/common.h
  @@ -256,6 +256,9 @@
   /* V850 backend magic number.  Written in the absense of an ABI.  */
   #define EM_CYGNUS_V850                0x9080
  @@ -256,6 +256,9 @@
   /* V850 backend magic number.  Written in the absense of an ABI.  */
   #define EM_CYGNUS_V850                0x9080
@@ -55684,9 +55599,8 @@ diff -Nrup binutils-2.17/include/elf/common.h binutils-2.17.atmel.1.3.0/include/
   /* old S/390 backend magic number. Written in the absence of an ABI.  */
   #define EM_S390_OLD           0xa390
   
   /* old S/390 backend magic number. Written in the absence of an ABI.  */
   #define EM_S390_OLD           0xa390
   
-diff -Nrup binutils-2.17/ld/configdoc.texi binutils-2.17.atmel.1.3.0/ld/configdoc.texi
---- binutils-2.17/ld/configdoc.texi    2006-05-10 15:43:46.000000000 +0200
-+++ binutils-2.17.atmel.1.3.0/ld/configdoc.texi        2007-09-28 10:30:45.000000000 +0200
+--- a/ld/configdoc.texi
++++ b/ld/configdoc.texi
  @@ -6,6 +6,7 @@
   @set H8300
   @set I960
  @@ -6,6 +6,7 @@
   @set H8300
   @set I960
@@ -55695,9 +55609,8 @@ diff -Nrup binutils-2.17/ld/configdoc.texi binutils-2.17.atmel.1.3.0/ld/configdo
   @set HPPA
   @set MMIX
   @set MSP430
   @set HPPA
   @set MMIX
   @set MSP430
-diff -Nrup binutils-2.17/ld/config.in binutils-2.17.atmel.1.3.0/ld/config.in
---- binutils-2.17/ld/config.in 2006-04-16 20:20:30.000000000 +0200
-+++ binutils-2.17.atmel.1.3.0/ld/config.in     2007-03-26 10:32:23.000000000 +0200
+--- a/ld/config.in
++++ b/ld/config.in
  @@ -187,7 +187,7 @@
   
   /* If using the C implementation of alloca, define if you know the
  @@ -187,7 +187,7 @@
   
   /* If using the C implementation of alloca, define if you know the
@@ -55718,9 +55631,8 @@ diff -Nrup binutils-2.17/ld/config.in binutils-2.17.atmel.1.3.0/ld/config.in
  -/* Define to `unsigned' if <sys/types.h> does not define. */
  +/* Define to `unsigned int' if <sys/types.h> does not define. */
   #undef size_t
  -/* Define to `unsigned' if <sys/types.h> does not define. */
  +/* Define to `unsigned int' if <sys/types.h> does not define. */
   #undef size_t
-diff -Nrup binutils-2.17/ld/configure binutils-2.17.atmel.1.3.0/ld/configure
---- binutils-2.17/ld/configure 2006-04-11 12:36:26.000000000 +0200
-+++ binutils-2.17.atmel.1.3.0/ld/configure     2007-03-26 10:32:22.000000000 +0200
+--- a/ld/configure
++++ b/ld/configure
  @@ -1,25 +1,54 @@
   #! /bin/sh
   # Guess values for system-dependent variables and create Makefiles.
  @@ -1,25 +1,54 @@
   #! /bin/sh
   # Guess values for system-dependent variables and create Makefiles.
@@ -68228,9 +68140,8 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17.atmel.1.3.0/ld/configure
   
   { (exit 0); exit 0; }
   _ACEOF
   
   { (exit 0); exit 0; }
   _ACEOF
-diff -Nrup binutils-2.17/ld/configure.tgt binutils-2.17.atmel.1.3.0/ld/configure.tgt
---- binutils-2.17/ld/configure.tgt     2006-04-05 14:41:57.000000000 +0200
-+++ binutils-2.17.atmel.1.3.0/ld/configure.tgt 2007-05-31 17:03:35.000000000 +0200
+--- a/ld/configure.tgt
++++ b/ld/configure.tgt
  @@ -81,8 +81,10 @@ xscale-*-coff)              targ_emul=armcoff ;;
   xscale-*-elf)         targ_emul=armelf
                         ;;
  @@ -81,8 +81,10 @@ xscale-*-coff)              targ_emul=armcoff ;;
   xscale-*-elf)         targ_emul=armelf
                         ;;
@@ -68244,9 +68155,8 @@ diff -Nrup binutils-2.17/ld/configure.tgt binutils-2.17.atmel.1.3.0/ld/configure
   bfin-*-elf)           targ_emul=elf32bfin; targ_extra_emuls="elf32bfinfd" ;;
   bfin-*-uclinux*)      targ_emul=elf32bfin; targ_extra_emuls="elf32bfinfd" ;;
   cr16c-*-elf*)           targ_emul=elf32cr16c
   bfin-*-elf)           targ_emul=elf32bfin; targ_extra_emuls="elf32bfinfd" ;;
   bfin-*-uclinux*)      targ_emul=elf32bfin; targ_extra_emuls="elf32bfinfd" ;;
   cr16c-*-elf*)           targ_emul=elf32cr16c
-diff -Nrup binutils-2.17/ld/emulparams/avr32elf_ap7000.sh binutils-2.17.atmel.1.3.0/ld/emulparams/avr32elf_ap7000.sh
---- binutils-2.17/ld/emulparams/avr32elf_ap7000.sh     1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/ld/emulparams/avr32elf_ap7000.sh 2007-09-28 10:30:45.000000000 +0200
+--- /dev/null
++++ b/ld/emulparams/avr32elf_ap7000.sh
  @@ -0,0 +1,35 @@
  +MACHINE=ap
  +SCRIPT_NAME=elf_xip
  @@ -0,0 +1,35 @@
  +MACHINE=ap
  +SCRIPT_NAME=elf_xip
@@ -68283,9 +68193,8 @@ diff -Nrup binutils-2.17/ld/emulparams/avr32elf_ap7000.sh binutils-2.17.atmel.1.
  +DATA_SEGMENT_END="__heap_start__ = ALIGN(8);
  +  . = ${STACK_ADDR};
  +  __heap_end__ = .;"
  +DATA_SEGMENT_END="__heap_start__ = ALIGN(8);
  +  . = ${STACK_ADDR};
  +  __heap_end__ = .;"
-diff -Nrup binutils-2.17/ld/emulparams/avr32elf.sh binutils-2.17.atmel.1.3.0/ld/emulparams/avr32elf.sh
---- binutils-2.17/ld/emulparams/avr32elf.sh    1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/ld/emulparams/avr32elf.sh        2007-09-28 10:30:45.000000000 +0200
+--- /dev/null
++++ b/ld/emulparams/avr32elf.sh
  @@ -0,0 +1,25 @@
  +MACHINE=
  +SCRIPT_NAME=elf
  @@ -0,0 +1,25 @@
  +MACHINE=
  +SCRIPT_NAME=elf
@@ -68312,9 +68221,8 @@ diff -Nrup binutils-2.17/ld/emulparams/avr32elf.sh binutils-2.17.atmel.1.3.0/ld/
  +
  +STACK_ADDR=0x82000000
  +
  +
  +STACK_ADDR=0x82000000
  +
-diff -Nrup binutils-2.17/ld/emulparams/avr32elf_uc3a0128.sh binutils-2.17.atmel.1.3.0/ld/emulparams/avr32elf_uc3a0128.sh
---- binutils-2.17/ld/emulparams/avr32elf_uc3a0128.sh   1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/ld/emulparams/avr32elf_uc3a0128.sh       2007-09-28 10:30:45.000000000 +0200
+--- /dev/null
++++ b/ld/emulparams/avr32elf_uc3a0128.sh
  @@ -0,0 +1,40 @@
  +MACHINE=uc
  +SCRIPT_NAME=elf_xip
  @@ -0,0 +1,40 @@
  +MACHINE=uc
  +SCRIPT_NAME=elf_xip
@@ -68357,9 +68265,8 @@ diff -Nrup binutils-2.17/ld/emulparams/avr32elf_uc3a0128.sh binutils-2.17.atmel.
  +  .factorypage :  {   *(.factorypage .factorypage.*)  } >FACTORYPAGE AT>FACTORYPAGE"
  +  
  \ No newline at end of file
  +  .factorypage :  {   *(.factorypage .factorypage.*)  } >FACTORYPAGE AT>FACTORYPAGE"
  +  
  \ No newline at end of file
-diff -Nrup binutils-2.17/ld/emulparams/avr32elf_uc3a0256.sh binutils-2.17.atmel.1.3.0/ld/emulparams/avr32elf_uc3a0256.sh
---- binutils-2.17/ld/emulparams/avr32elf_uc3a0256.sh   1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/ld/emulparams/avr32elf_uc3a0256.sh       2007-09-28 10:30:45.000000000 +0200
+--- /dev/null
++++ b/ld/emulparams/avr32elf_uc3a0256.sh
  @@ -0,0 +1,39 @@
  +MACHINE=uc
  +SCRIPT_NAME=elf_xip
  @@ -0,0 +1,39 @@
  +MACHINE=uc
  +SCRIPT_NAME=elf_xip
@@ -68400,9 +68307,8 @@ diff -Nrup binutils-2.17/ld/emulparams/avr32elf_uc3a0256.sh binutils-2.17.atmel.
  +
  +OTHER_SECTIONS=".userpage :  {        *(.userpage .userpage.*)  } >USERPAGE AT>USERPAGE
  +  .factorypage :  {   *(.factorypage .factorypage.*)  } >FACTORYPAGE AT>FACTORYPAGE"
  +
  +OTHER_SECTIONS=".userpage :  {        *(.userpage .userpage.*)  } >USERPAGE AT>USERPAGE
  +  .factorypage :  {   *(.factorypage .factorypage.*)  } >FACTORYPAGE AT>FACTORYPAGE"
-diff -Nrup binutils-2.17/ld/emulparams/avr32elf_uc3a0512.sh binutils-2.17.atmel.1.3.0/ld/emulparams/avr32elf_uc3a0512.sh
---- binutils-2.17/ld/emulparams/avr32elf_uc3a0512.sh   1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/ld/emulparams/avr32elf_uc3a0512.sh       2007-09-28 10:30:45.000000000 +0200
+--- /dev/null
++++ b/ld/emulparams/avr32elf_uc3a0512.sh
  @@ -0,0 +1,39 @@
  +MACHINE=uc
  +SCRIPT_NAME=elf_xip
  @@ -0,0 +1,39 @@
  +MACHINE=uc
  +SCRIPT_NAME=elf_xip
@@ -68443,9 +68349,8 @@ diff -Nrup binutils-2.17/ld/emulparams/avr32elf_uc3a0512.sh binutils-2.17.atmel.
  +
  +OTHER_SECTIONS=".userpage :  {        *(.userpage .userpage.*)  } >USERPAGE AT>USERPAGE
  +  .factorypage :  {   *(.factorypage .factorypage.*)  } >FACTORYPAGE AT>FACTORYPAGE"
  +
  +OTHER_SECTIONS=".userpage :  {        *(.userpage .userpage.*)  } >USERPAGE AT>USERPAGE
  +  .factorypage :  {   *(.factorypage .factorypage.*)  } >FACTORYPAGE AT>FACTORYPAGE"
-diff -Nrup binutils-2.17/ld/emulparams/avr32elf_uc3a1128.sh binutils-2.17.atmel.1.3.0/ld/emulparams/avr32elf_uc3a1128.sh
---- binutils-2.17/ld/emulparams/avr32elf_uc3a1128.sh   1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/ld/emulparams/avr32elf_uc3a1128.sh       2007-09-28 10:30:45.000000000 +0200
+--- /dev/null
++++ b/ld/emulparams/avr32elf_uc3a1128.sh
  @@ -0,0 +1,39 @@
  +MACHINE=uc
  +SCRIPT_NAME=elf_xip
  @@ -0,0 +1,39 @@
  +MACHINE=uc
  +SCRIPT_NAME=elf_xip
@@ -68486,9 +68391,8 @@ diff -Nrup binutils-2.17/ld/emulparams/avr32elf_uc3a1128.sh binutils-2.17.atmel.
  +
  +OTHER_SECTIONS=".userpage :  {        *(.userpage .userpage.*)  } >USERPAGE AT>USERPAGE
  +  .factorypage :  {   *(.factorypage .factorypage.*)  } >FACTORYPAGE AT>FACTORYPAGE"
  +
  +OTHER_SECTIONS=".userpage :  {        *(.userpage .userpage.*)  } >USERPAGE AT>USERPAGE
  +  .factorypage :  {   *(.factorypage .factorypage.*)  } >FACTORYPAGE AT>FACTORYPAGE"
-diff -Nrup binutils-2.17/ld/emulparams/avr32elf_uc3a1256.sh binutils-2.17.atmel.1.3.0/ld/emulparams/avr32elf_uc3a1256.sh
---- binutils-2.17/ld/emulparams/avr32elf_uc3a1256.sh   1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/ld/emulparams/avr32elf_uc3a1256.sh       2007-09-28 10:30:45.000000000 +0200
+--- /dev/null
++++ b/ld/emulparams/avr32elf_uc3a1256.sh
  @@ -0,0 +1,39 @@
  +MACHINE=uc
  +SCRIPT_NAME=elf_xip
  @@ -0,0 +1,39 @@
  +MACHINE=uc
  +SCRIPT_NAME=elf_xip
@@ -68529,9 +68433,8 @@ diff -Nrup binutils-2.17/ld/emulparams/avr32elf_uc3a1256.sh binutils-2.17.atmel.
  +
  +OTHER_SECTIONS=".userpage :  {        *(.userpage .userpage.*)  } >USERPAGE AT>USERPAGE
  +  .factorypage :  {   *(.factorypage .factorypage.*)  } >FACTORYPAGE AT>FACTORYPAGE"
  +
  +OTHER_SECTIONS=".userpage :  {        *(.userpage .userpage.*)  } >USERPAGE AT>USERPAGE
  +  .factorypage :  {   *(.factorypage .factorypage.*)  } >FACTORYPAGE AT>FACTORYPAGE"
-diff -Nrup binutils-2.17/ld/emulparams/avr32elf_uc3a1512.sh binutils-2.17.atmel.1.3.0/ld/emulparams/avr32elf_uc3a1512.sh
---- binutils-2.17/ld/emulparams/avr32elf_uc3a1512.sh   1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/ld/emulparams/avr32elf_uc3a1512.sh       2007-09-28 10:30:45.000000000 +0200
+--- /dev/null
++++ b/ld/emulparams/avr32elf_uc3a1512.sh
  @@ -0,0 +1,39 @@
  +MACHINE=uc
  +SCRIPT_NAME=elf_xip
  @@ -0,0 +1,39 @@
  +MACHINE=uc
  +SCRIPT_NAME=elf_xip
@@ -68572,9 +68475,8 @@ diff -Nrup binutils-2.17/ld/emulparams/avr32elf_uc3a1512.sh binutils-2.17.atmel.
  +
  +OTHER_SECTIONS=".userpage :  {        *(.userpage .userpage.*)  } >USERPAGE AT>USERPAGE
  +  .factorypage :  {   *(.factorypage .factorypage.*)  } >FACTORYPAGE AT>FACTORYPAGE"
  +
  +OTHER_SECTIONS=".userpage :  {        *(.userpage .userpage.*)  } >USERPAGE AT>USERPAGE
  +  .factorypage :  {   *(.factorypage .factorypage.*)  } >FACTORYPAGE AT>FACTORYPAGE"
-diff -Nrup binutils-2.17/ld/emulparams/avr32elf_uc3b0128.sh binutils-2.17.atmel.1.3.0/ld/emulparams/avr32elf_uc3b0128.sh
---- binutils-2.17/ld/emulparams/avr32elf_uc3b0128.sh   1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/ld/emulparams/avr32elf_uc3b0128.sh       2007-09-28 10:30:45.000000000 +0200
+--- /dev/null
++++ b/ld/emulparams/avr32elf_uc3b0128.sh
  @@ -0,0 +1,39 @@
  +MACHINE=uc
  +SCRIPT_NAME=elf_xip
  @@ -0,0 +1,39 @@
  +MACHINE=uc
  +SCRIPT_NAME=elf_xip
@@ -68615,9 +68517,8 @@ diff -Nrup binutils-2.17/ld/emulparams/avr32elf_uc3b0128.sh binutils-2.17.atmel.
  +
  +OTHER_SECTIONS=".userpage :  {        *(.userpage .userpage.*)  } >USERPAGE AT>USERPAGE
  +  .factorypage :  {   *(.factorypage .factorypage.*)  } >FACTORYPAGE AT>FACTORYPAGE"
  +
  +OTHER_SECTIONS=".userpage :  {        *(.userpage .userpage.*)  } >USERPAGE AT>USERPAGE
  +  .factorypage :  {   *(.factorypage .factorypage.*)  } >FACTORYPAGE AT>FACTORYPAGE"
-diff -Nrup binutils-2.17/ld/emulparams/avr32elf_uc3b0256.sh binutils-2.17.atmel.1.3.0/ld/emulparams/avr32elf_uc3b0256.sh
---- binutils-2.17/ld/emulparams/avr32elf_uc3b0256.sh   1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/ld/emulparams/avr32elf_uc3b0256.sh       2007-09-28 10:30:45.000000000 +0200
+--- /dev/null
++++ b/ld/emulparams/avr32elf_uc3b0256.sh
  @@ -0,0 +1,40 @@
  +MACHINE=uc
  +SCRIPT_NAME=elf_xip
  @@ -0,0 +1,40 @@
  +MACHINE=uc
  +SCRIPT_NAME=elf_xip
@@ -68660,9 +68561,8 @@ diff -Nrup binutils-2.17/ld/emulparams/avr32elf_uc3b0256.sh binutils-2.17.atmel.
  +  .factorypage :  {   *(.factorypage .factorypage.*)  } >FACTORYPAGE AT>FACTORYPAGE"
  +  
  \ No newline at end of file
  +  .factorypage :  {   *(.factorypage .factorypage.*)  } >FACTORYPAGE AT>FACTORYPAGE"
  +  
  \ No newline at end of file
-diff -Nrup binutils-2.17/ld/emulparams/avr32elf_uc3b064.sh binutils-2.17.atmel.1.3.0/ld/emulparams/avr32elf_uc3b064.sh
---- binutils-2.17/ld/emulparams/avr32elf_uc3b064.sh    1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/ld/emulparams/avr32elf_uc3b064.sh        2007-09-28 10:30:45.000000000 +0200
+--- /dev/null
++++ b/ld/emulparams/avr32elf_uc3b064.sh
  @@ -0,0 +1,39 @@
  +MACHINE=uc
  +SCRIPT_NAME=elf_xip
  @@ -0,0 +1,39 @@
  +MACHINE=uc
  +SCRIPT_NAME=elf_xip
@@ -68703,9 +68603,8 @@ diff -Nrup binutils-2.17/ld/emulparams/avr32elf_uc3b064.sh binutils-2.17.atmel.1
  +
  +OTHER_SECTIONS=".userpage :  {        *(.userpage .userpage.*)  } >USERPAGE AT>USERPAGE
  +  .factorypage :  {   *(.factorypage .factorypage.*)  } >FACTORYPAGE AT>FACTORYPAGE"
  +
  +OTHER_SECTIONS=".userpage :  {        *(.userpage .userpage.*)  } >USERPAGE AT>USERPAGE
  +  .factorypage :  {   *(.factorypage .factorypage.*)  } >FACTORYPAGE AT>FACTORYPAGE"
-diff -Nrup binutils-2.17/ld/emulparams/avr32elf_uc3b1128.sh binutils-2.17.atmel.1.3.0/ld/emulparams/avr32elf_uc3b1128.sh
---- binutils-2.17/ld/emulparams/avr32elf_uc3b1128.sh   1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/ld/emulparams/avr32elf_uc3b1128.sh       2007-09-28 10:30:45.000000000 +0200
+--- /dev/null
++++ b/ld/emulparams/avr32elf_uc3b1128.sh
  @@ -0,0 +1,39 @@
  +MACHINE=uc
  +SCRIPT_NAME=elf_xip
  @@ -0,0 +1,39 @@
  +MACHINE=uc
  +SCRIPT_NAME=elf_xip
@@ -68746,9 +68645,8 @@ diff -Nrup binutils-2.17/ld/emulparams/avr32elf_uc3b1128.sh binutils-2.17.atmel.
  +
  +OTHER_SECTIONS=".userpage :  {        *(.userpage .userpage.*)  } >USERPAGE AT>USERPAGE
  +  .factorypage :  {   *(.factorypage .factorypage.*)  } >FACTORYPAGE AT>FACTORYPAGE"
  +
  +OTHER_SECTIONS=".userpage :  {        *(.userpage .userpage.*)  } >USERPAGE AT>USERPAGE
  +  .factorypage :  {   *(.factorypage .factorypage.*)  } >FACTORYPAGE AT>FACTORYPAGE"
-diff -Nrup binutils-2.17/ld/emulparams/avr32elf_uc3b1256.sh binutils-2.17.atmel.1.3.0/ld/emulparams/avr32elf_uc3b1256.sh
---- binutils-2.17/ld/emulparams/avr32elf_uc3b1256.sh   1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/ld/emulparams/avr32elf_uc3b1256.sh       2007-09-28 10:30:45.000000000 +0200
+--- /dev/null
++++ b/ld/emulparams/avr32elf_uc3b1256.sh
  @@ -0,0 +1,39 @@
  +MACHINE=uc
  +SCRIPT_NAME=elf_xip
  @@ -0,0 +1,39 @@
  +MACHINE=uc
  +SCRIPT_NAME=elf_xip
@@ -68789,9 +68687,8 @@ diff -Nrup binutils-2.17/ld/emulparams/avr32elf_uc3b1256.sh binutils-2.17.atmel.
  +
  +OTHER_SECTIONS=".userpage :  {        *(.userpage .userpage.*)  } >USERPAGE AT>USERPAGE
  +  .factorypage :  {   *(.factorypage .factorypage.*)  } >FACTORYPAGE AT>FACTORYPAGE"
  +
  +OTHER_SECTIONS=".userpage :  {        *(.userpage .userpage.*)  } >USERPAGE AT>USERPAGE
  +  .factorypage :  {   *(.factorypage .factorypage.*)  } >FACTORYPAGE AT>FACTORYPAGE"
-diff -Nrup binutils-2.17/ld/emulparams/avr32elf_uc3b164.sh binutils-2.17.atmel.1.3.0/ld/emulparams/avr32elf_uc3b164.sh
---- binutils-2.17/ld/emulparams/avr32elf_uc3b164.sh    1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/ld/emulparams/avr32elf_uc3b164.sh        2007-09-28 10:30:45.000000000 +0200
+--- /dev/null
++++ b/ld/emulparams/avr32elf_uc3b164.sh
  @@ -0,0 +1,40 @@
  +MACHINE=uc
  +SCRIPT_NAME=elf_xip
  @@ -0,0 +1,40 @@
  +MACHINE=uc
  +SCRIPT_NAME=elf_xip
@@ -68834,9 +68731,8 @@ diff -Nrup binutils-2.17/ld/emulparams/avr32elf_uc3b164.sh binutils-2.17.atmel.1
  +  .factorypage :  {   *(.factorypage .factorypage.*)  } >FACTORYPAGE AT>FACTORYPAGE"
  +  
  \ No newline at end of file
  +  .factorypage :  {   *(.factorypage .factorypage.*)  } >FACTORYPAGE AT>FACTORYPAGE"
  +  
  \ No newline at end of file
-diff -Nrup binutils-2.17/ld/emulparams/avr32linux.sh binutils-2.17.atmel.1.3.0/ld/emulparams/avr32linux.sh
---- binutils-2.17/ld/emulparams/avr32linux.sh  1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/ld/emulparams/avr32linux.sh      2007-09-28 10:30:45.000000000 +0200
+--- /dev/null
++++ b/ld/emulparams/avr32linux.sh
  @@ -0,0 +1,14 @@
  +ARCH=avr32
  +SCRIPT_NAME=elf
  @@ -0,0 +1,14 @@
  +ARCH=avr32
  +SCRIPT_NAME=elf
@@ -68852,9 +68748,8 @@ diff -Nrup binutils-2.17/ld/emulparams/avr32linux.sh binutils-2.17.atmel.1.3.0/l
  +# essential for uClinux.  We don't use those .s* sections on AVR32
  +# anyway, so it shouldn't hurt for regular Linux either...
  +NO_SMALL_DATA=yes
  +# essential for uClinux.  We don't use those .s* sections on AVR32
  +# anyway, so it shouldn't hurt for regular Linux either...
  +NO_SMALL_DATA=yes
-diff -Nrup binutils-2.17/ld/emultempl/avr32elf.em binutils-2.17.atmel.1.3.0/ld/emultempl/avr32elf.em
---- binutils-2.17/ld/emultempl/avr32elf.em     1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/ld/emultempl/avr32elf.em 2007-09-28 10:30:44.000000000 +0200
+--- /dev/null
++++ b/ld/emultempl/avr32elf.em
  @@ -0,0 +1,72 @@
  +# This shell script emits a C file. -*- C -*-
  +#   Copyright (C) 2007 Atmel Corporation
  @@ -0,0 +1,72 @@
  +# This shell script emits a C file. -*- C -*-
  +#   Copyright (C) 2007 Atmel Corporation
@@ -68928,9 +68823,8 @@ diff -Nrup binutils-2.17/ld/emultempl/avr32elf.em binutils-2.17.atmel.1.3.0/ld/e
  +# Replace some of the standard ELF functions with our own versions.
  +#
  +LDEMUL_AFTER_OPEN=avr32_elf_after_open
  +# Replace some of the standard ELF functions with our own versions.
  +#
  +LDEMUL_AFTER_OPEN=avr32_elf_after_open
-diff -Nrup binutils-2.17/ld/ld.info binutils-2.17.atmel.1.3.0/ld/ld.info
---- binutils-2.17/ld/ld.info   2006-06-23 20:19:51.000000000 +0200
-+++ binutils-2.17.atmel.1.3.0/ld/ld.info       2007-09-28 10:30:45.000000000 +0200
+--- a/ld/ld.info
++++ b/ld/ld.info
  @@ -1,5 +1,7 @@
  -This is .././ld/ld.info, produced by makeinfo version 4.8 from
  -.././ld/ld.texinfo.
  @@ -1,5 +1,7 @@
  -This is .././ld/ld.info, produced by makeinfo version 4.8 from
  -.././ld/ld.texinfo.
@@ -69311,9 +69205,8 @@ diff -Nrup binutils-2.17/ld/ld.info binutils-2.17.atmel.1.3.0/ld/ld.info
  +>>>>>>> .r31496
   \1f
   End Tag Table
  +>>>>>>> .r31496
   \1f
   End Tag Table
-diff -Nrup binutils-2.17/ld/ld.info.mine binutils-2.17.atmel.1.3.0/ld/ld.info.mine
---- binutils-2.17/ld/ld.info.mine      1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/ld/ld.info.mine  2007-09-28 10:30:44.000000000 +0200
+--- /dev/null
++++ b/ld/ld.info.mine
  @@ -0,0 +1,6693 @@
  +This is
  +/home/hcegtvedt/svnwork/tools/T0243-GNU_Toolchain/50-Source/binutils/trunk/ld/ld.info,
  @@ -0,0 +1,6693 @@
  +This is
  +/home/hcegtvedt/svnwork/tools/T0243-GNU_Toolchain/50-Source/binutils/trunk/ld/ld.info,
@@ -76008,9 +75901,8 @@ diff -Nrup binutils-2.17/ld/ld.info.mine binutils-2.17.atmel.1.3.0/ld/ld.info.mi
  +Node: Index\7f257391
  +\1f
  +End Tag Table
  +Node: Index\7f257391
  +\1f
  +End Tag Table
-diff -Nrup binutils-2.17/ld/ld.info.r27273 binutils-2.17.atmel.1.3.0/ld/ld.info.r27273
---- binutils-2.17/ld/ld.info.r27273    1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/ld/ld.info.r27273        2007-09-28 10:30:45.000000000 +0200
+--- /dev/null
++++ b/ld/ld.info.r27273
  @@ -0,0 +1,6691 @@
  +This is .././ld/ld.info, produced by makeinfo version 4.8 from
  +.././ld/ld.texinfo.
  @@ -0,0 +1,6691 @@
  +This is .././ld/ld.info, produced by makeinfo version 4.8 from
  +.././ld/ld.texinfo.
@@ -82703,9 +82595,8 @@ diff -Nrup binutils-2.17/ld/ld.info.r27273 binutils-2.17.atmel.1.3.0/ld/ld.info.
  +Node: Index\7f257251
  +\1f
  +End Tag Table
  +Node: Index\7f257251
  +\1f
  +End Tag Table
-diff -Nrup binutils-2.17/ld/ld.info.r31496 binutils-2.17.atmel.1.3.0/ld/ld.info.r31496
---- binutils-2.17/ld/ld.info.r31496    1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/ld/ld.info.r31496        2007-09-28 10:30:45.000000000 +0200
+--- /dev/null
++++ b/ld/ld.info.r31496
  @@ -0,0 +1,6721 @@
  +This is .././ld/ld.info, produced by makeinfo version 4.8 from
  +.././ld/ld.texinfo.
  @@ -0,0 +1,6721 @@
  +This is .././ld/ld.info, produced by makeinfo version 4.8 from
  +.././ld/ld.texinfo.
@@ -89428,9 +89319,8 @@ diff -Nrup binutils-2.17/ld/ld.info.r31496 binutils-2.17.atmel.1.3.0/ld/ld.info.
  +Node: Index\7f258241
  +\1f
  +End Tag Table
  +Node: Index\7f258241
  +\1f
  +End Tag Table
-diff -Nrup binutils-2.17/ld/ld.texinfo binutils-2.17.atmel.1.3.0/ld/ld.texinfo
---- binutils-2.17/ld/ld.texinfo        2006-05-10 15:43:47.000000000 +0200
-+++ binutils-2.17.atmel.1.3.0/ld/ld.texinfo    2007-09-28 10:30:45.000000000 +0200
+--- a/ld/ld.texinfo
++++ b/ld/ld.texinfo
  @@ -22,6 +22,7 @@
   @set GENERIC
   @set ARC
  @@ -22,6 +22,7 @@
   @set GENERIC
   @set ARC
@@ -89501,9 +89391,8 @@ diff -Nrup binutils-2.17/ld/ld.texinfo binutils-2.17.atmel.1.3.0/ld/ld.texinfo
   @ifset HPPA
   @ifclear GENERIC
   @raisesections
   @ifset HPPA
   @ifclear GENERIC
   @raisesections
-diff -Nrup binutils-2.17/ld/Makefile.am binutils-2.17.atmel.1.3.0/ld/Makefile.am
---- binutils-2.17/ld/Makefile.am       2006-06-03 06:45:50.000000000 +0200
-+++ binutils-2.17.atmel.1.3.0/ld/Makefile.am   2007-09-28 10:30:45.000000000 +0200
+--- a/ld/Makefile.am
++++ b/ld/Makefile.am
  @@ -133,6 +133,20 @@ ALL_EMULATIONS = \
         eavr3.o \
         eavr4.o \
  @@ -133,6 +133,20 @@ ALL_EMULATIONS = \
         eavr3.o \
         eavr4.o \
@@ -89599,9 +89488,8 @@ diff -Nrup binutils-2.17/ld/Makefile.am binutils-2.17.atmel.1.3.0/ld/Makefile.am
         $(mkinstalldirs) $(DESTDIR)$(scriptdir)/ldscripts
         for f in ldscripts/*; do \
           $(INSTALL_DATA) $$f $(DESTDIR)$(scriptdir)/$$f ; \
         $(mkinstalldirs) $(DESTDIR)$(scriptdir)/ldscripts
         for f in ldscripts/*; do \
           $(INSTALL_DATA) $$f $(DESTDIR)$(scriptdir)/$$f ; \
-diff -Nrup binutils-2.17/ld/Makefile.in binutils-2.17.atmel.1.3.0/ld/Makefile.in
---- binutils-2.17/ld/Makefile.in       2006-06-03 06:45:50.000000000 +0200
-+++ binutils-2.17.atmel.1.3.0/ld/Makefile.in   2007-03-26 10:32:23.000000000 +0200
+--- a/ld/Makefile.in
++++ b/ld/Makefile.in
  @@ -145,6 +145,7 @@ EMUL_EXTRA_OFILES = @EMUL_EXTRA_OFILES@
   EXEEXT = @EXEEXT@
   GMOFILES = @GMOFILES@
  @@ -145,6 +145,7 @@ EMUL_EXTRA_OFILES = @EMUL_EXTRA_OFILES@
   EXEEXT = @EXEEXT@
   GMOFILES = @GMOFILES@
@@ -89708,9 +89596,8 @@ diff -Nrup binutils-2.17/ld/Makefile.in binutils-2.17.atmel.1.3.0/ld/Makefile.in
         $(mkinstalldirs) $(DESTDIR)$(scriptdir)/ldscripts
         for f in ldscripts/*; do \
           $(INSTALL_DATA) $$f $(DESTDIR)$(scriptdir)/$$f ; \
         $(mkinstalldirs) $(DESTDIR)$(scriptdir)/ldscripts
         for f in ldscripts/*; do \
           $(INSTALL_DATA) $$f $(DESTDIR)$(scriptdir)/$$f ; \
-diff -Nrup binutils-2.17/ld/scripttempl/elf_xip.sc binutils-2.17.atmel.1.3.0/ld/scripttempl/elf_xip.sc
---- binutils-2.17/ld/scripttempl/elf_xip.sc    1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/ld/scripttempl/elf_xip.sc        2007-03-26 10:19:40.000000000 +0200
+--- /dev/null
++++ b/ld/scripttempl/elf_xip.sc
  @@ -0,0 +1,456 @@
  +#
  +# Unusual variables checked by this code:
  @@ -0,0 +1,456 @@
  +#
  +# Unusual variables checked by this code:
@@ -90168,9 +90055,8 @@ diff -Nrup binutils-2.17/ld/scripttempl/elf_xip.sc binutils-2.17.atmel.1.3.0/ld/
  +  ${RELOCATING+${STACKNOTE}}
  +}
  +EOF
  +  ${RELOCATING+${STACKNOTE}}
  +}
  +EOF
-diff -Nrup binutils-2.17/ld/testsuite/ld-auto-import/client.c binutils-2.17.atmel.1.3.0/ld/testsuite/ld-auto-import/client.c
---- binutils-2.17/ld/testsuite/ld-auto-import/client.c 2002-12-18 17:05:10.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/ld/testsuite/ld-auto-import/client.c     2007-03-26 10:19:37.000000000 +0200
+--- a/ld/testsuite/ld-auto-import/client.c
++++ b/ld/testsuite/ld-auto-import/client.c
  @@ -1,55 +1,55 @@
  -#include <stdio.h>\r
  -\r
  @@ -1,55 +1,55 @@
  -#include <stdio.h>\r
  -\r
@@ -90282,9 +90168,8 @@ diff -Nrup binutils-2.17/ld/testsuite/ld-auto-import/client.c binutils-2.17.atme
  +
  +  return 0;
  +}
  +
  +  return 0;
  +}
-diff -Nrup binutils-2.17/ld/testsuite/ld-auto-import/dll.c binutils-2.17.atmel.1.3.0/ld/testsuite/ld-auto-import/dll.c
---- binutils-2.17/ld/testsuite/ld-auto-import/dll.c    2002-12-18 17:05:10.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/ld/testsuite/ld-auto-import/dll.c        2007-03-26 10:19:37.000000000 +0200
+--- a/ld/testsuite/ld-auto-import/dll.c
++++ b/ld/testsuite/ld-auto-import/dll.c
  @@ -1,20 +1,20 @@
  -int var = 123;\r
  -int foo = 121;\r
  @@ -1,20 +1,20 @@
  -int var = 123;\r
  -int foo = 121;\r
@@ -90326,9 +90211,8 @@ diff -Nrup binutils-2.17/ld/testsuite/ld-auto-import/dll.c binutils-2.17.atmel.1
  +}
  +
  +void (* func_ptr)(void) = print_foo;
  +}
  +
  +void (* func_ptr)(void) = print_foo;
-diff -Nrup binutils-2.17/ld/testsuite/ld-avr32/avr32.exp binutils-2.17.atmel.1.3.0/ld/testsuite/ld-avr32/avr32.exp
---- binutils-2.17/ld/testsuite/ld-avr32/avr32.exp      1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/ld/testsuite/ld-avr32/avr32.exp  2007-03-26 10:19:30.000000000 +0200
+--- /dev/null
++++ b/ld/testsuite/ld-avr32/avr32.exp
  @@ -0,0 +1,25 @@
  +# Expect script for AVR32 ELF linker tests.
  +#   Copyright 2004-2006 Atmel Corporation.
  @@ -0,0 +1,25 @@
  +# Expect script for AVR32 ELF linker tests.
  +#   Copyright 2004-2006 Atmel Corporation.
@@ -90355,9 +90239,8 @@ diff -Nrup binutils-2.17/ld/testsuite/ld-avr32/avr32.exp binutils-2.17.atmel.1.3
  +}
  +
  +run_dump_test "pcrel"
  +}
  +
  +run_dump_test "pcrel"
-diff -Nrup binutils-2.17/ld/testsuite/ld-avr32/pcrel.d binutils-2.17.atmel.1.3.0/ld/testsuite/ld-avr32/pcrel.d
---- binutils-2.17/ld/testsuite/ld-avr32/pcrel.d        1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/ld/testsuite/ld-avr32/pcrel.d    2007-03-26 10:19:30.000000000 +0200
+--- /dev/null
++++ b/ld/testsuite/ld-avr32/pcrel.d
  @@ -0,0 +1,74 @@
  +#name: AVR32 ELF PC-relative external relocs
  +#source: symbols.s
  @@ -0,0 +1,74 @@
  +#name: AVR32 ELF PC-relative external relocs
  +#source: symbols.s
@@ -90433,9 +90316,8 @@ diff -Nrup binutils-2.17/ld/testsuite/ld-avr32/pcrel.d binutils-2.17.atmel.1.3.0
  +Disassembly of section \.text\.pcrel21:
  +a0200000 <extsym21>:
  +a0200000:     d7 03           nop
  +Disassembly of section \.text\.pcrel21:
  +a0200000 <extsym21>:
  +a0200000:     d7 03           nop
-diff -Nrup binutils-2.17/ld/testsuite/ld-avr32/pcrel.ld binutils-2.17.atmel.1.3.0/ld/testsuite/ld-avr32/pcrel.ld
---- binutils-2.17/ld/testsuite/ld-avr32/pcrel.ld       1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/ld/testsuite/ld-avr32/pcrel.ld   2007-03-26 10:19:30.000000000 +0200
+--- /dev/null
++++ b/ld/testsuite/ld-avr32/pcrel.ld
  @@ -0,0 +1,23 @@
  +ENTRY(_start)
  +SECTIONS
  @@ -0,0 +1,23 @@
  +ENTRY(_start)
  +SECTIONS
@@ -90460,9 +90342,8 @@ diff -Nrup binutils-2.17/ld/testsuite/ld-avr32/pcrel.ld binutils-2.17.atmel.1.3.
  +              *(.text.pcrel21)
  +      }
  +}
  +              *(.text.pcrel21)
  +      }
  +}
-diff -Nrup binutils-2.17/ld/testsuite/ld-avr32/symbols.s binutils-2.17.atmel.1.3.0/ld/testsuite/ld-avr32/symbols.s
---- binutils-2.17/ld/testsuite/ld-avr32/symbols.s      1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/ld/testsuite/ld-avr32/symbols.s  2007-03-26 10:19:30.000000000 +0200
+--- /dev/null
++++ b/ld/testsuite/ld-avr32/symbols.s
  @@ -0,0 +1,20 @@
  +      .text
  +      .global _start
  @@ -0,0 +1,20 @@
  +      .text
  +      .global _start
@@ -90484,9 +90365,8 @@ diff -Nrup binutils-2.17/ld/testsuite/ld-avr32/symbols.s binutils-2.17.atmel.1.3
  +      .global extsym21
  +extsym21:
  +      nop
  +      .global extsym21
  +extsym21:
  +      nop
-diff -Nrup binutils-2.17/opcodes/aclocal.m4 binutils-2.17.atmel.1.3.0/opcodes/aclocal.m4
---- binutils-2.17/opcodes/aclocal.m4   2005-09-30 20:05:59.000000000 +0200
-+++ binutils-2.17.atmel.1.3.0/opcodes/aclocal.m4       2007-03-26 10:31:34.000000000 +0200
+--- a/opcodes/aclocal.m4
++++ b/opcodes/aclocal.m4
  @@ -1,4 +1,4 @@
  -# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
  +# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
  @@ -1,4 +1,4 @@
  -# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
  +# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
@@ -90502,9 +90382,8 @@ diff -Nrup binutils-2.17/opcodes/aclocal.m4 binutils-2.17.atmel.1.3.0/opcodes/ac
   
   # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
   
   
   # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
   
-diff -Nrup binutils-2.17/opcodes/avr32-asm.c binutils-2.17.atmel.1.3.0/opcodes/avr32-asm.c
---- binutils-2.17/opcodes/avr32-asm.c  1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/opcodes/avr32-asm.c      2007-03-26 10:20:34.000000000 +0200
+--- /dev/null
++++ b/opcodes/avr32-asm.c
  @@ -0,0 +1,264 @@
  +/* Assembler interface for AVR32.
  +   Copyright 2005, 2006 Atmel Corporation.
  @@ -0,0 +1,264 @@
  +/* Assembler interface for AVR32.
  +   Copyright 2005, 2006 Atmel Corporation.
@@ -90770,9 +90649,8 @@ diff -Nrup binutils-2.17/opcodes/avr32-asm.c binutils-2.17.atmel.1.3.0/opcodes/a
  +    { cr_table,  AVR32_NR_CPREGS,  NULL, N_("coprocessor register expected") },
  +  };
  +#endif
  +    { cr_table,  AVR32_NR_CPREGS,  NULL, N_("coprocessor register expected") },
  +  };
  +#endif
-diff -Nrup binutils-2.17/opcodes/avr32-asm.h binutils-2.17.atmel.1.3.0/opcodes/avr32-asm.h
---- binutils-2.17/opcodes/avr32-asm.h  1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/opcodes/avr32-asm.h      2007-03-26 10:20:34.000000000 +0200
+--- /dev/null
++++ b/opcodes/avr32-asm.h
  @@ -0,0 +1,42 @@
  +/* Assembler interface for AVR32.
  +   Copyright 2005, 2006 Atmel Corporation.
  @@ -0,0 +1,42 @@
  +/* Assembler interface for AVR32.
  +   Copyright 2005, 2006 Atmel Corporation.
@@ -90816,9 +90694,8 @@ diff -Nrup binutils-2.17/opcodes/avr32-asm.h binutils-2.17.atmel.1.3.0/opcodes/a
  +avr32_make_regmask8(unsigned long regmask16, unsigned long *regmask8);
  +
  +#endif /* __OPCODES_AVR32_ASM_H */
  +avr32_make_regmask8(unsigned long regmask16, unsigned long *regmask8);
  +
  +#endif /* __OPCODES_AVR32_ASM_H */
-diff -Nrup binutils-2.17/opcodes/avr32-dis.c binutils-2.17.atmel.1.3.0/opcodes/avr32-dis.c
---- binutils-2.17/opcodes/avr32-dis.c  1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/opcodes/avr32-dis.c      2007-09-28 10:30:46.000000000 +0200
+--- /dev/null
++++ b/opcodes/avr32-dis.c
  @@ -0,0 +1,891 @@
  +/* Print AVR32 instructions for GDB and objdump.
  +   Copyright 2005, 2006 Atmel Corporation.
  @@ -0,0 +1,891 @@
  +/* Print AVR32 instructions for GDB and objdump.
  +   Copyright 2005, 2006 Atmel Corporation.
@@ -91711,9 +91588,8 @@ diff -Nrup binutils-2.17/opcodes/avr32-dis.c binutils-2.17.atmel.1.3.0/opcodes/a
  +{
  +
  +}
  +{
  +
  +}
-diff -Nrup binutils-2.17/opcodes/avr32-opc.c binutils-2.17.atmel.1.3.0/opcodes/avr32-opc.c
---- binutils-2.17/opcodes/avr32-opc.c  1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/opcodes/avr32-opc.c      2007-03-26 10:20:34.000000000 +0200
+--- /dev/null
++++ b/opcodes/avr32-opc.c
  @@ -0,0 +1,6140 @@
  +/* Opcode tables for AVR32.
  +   Copyright 2005, 2006 Atmel Corporation.
  @@ -0,0 +1,6140 @@
  +/* Opcode tables for AVR32.
  +   Copyright 2005, 2006 Atmel Corporation.
@@ -97855,9 +97731,8 @@ diff -Nrup binutils-2.17/opcodes/avr32-opc.c binutils-2.17.atmel.1.3.0/opcodes/a
  +#undef NORMAL_MNEMONIC
  +#undef ALIAS_MNEMONIC
  +#undef FP_MNEMONIC
  +#undef NORMAL_MNEMONIC
  +#undef ALIAS_MNEMONIC
  +#undef FP_MNEMONIC
-diff -Nrup binutils-2.17/opcodes/avr32-opc.h binutils-2.17.atmel.1.3.0/opcodes/avr32-opc.h
---- binutils-2.17/opcodes/avr32-opc.h  1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/opcodes/avr32-opc.h      2007-03-26 10:20:34.000000000 +0200
+--- /dev/null
++++ b/opcodes/avr32-opc.h
  @@ -0,0 +1,1655 @@
  +/* Opcode tables for AVR32.
  +   Copyright 2005, 2006 Atmel Corporation.
  @@ -0,0 +1,1655 @@
  +/* Opcode tables for AVR32.
  +   Copyright 2005, 2006 Atmel Corporation.
@@ -99514,9 +99389,8 @@ diff -Nrup binutils-2.17/opcodes/avr32-opc.h binutils-2.17.atmel.1.3.0/opcodes/a
  +    AVR32_PARSER__END_
  +  };
  +#define AVR32_NR_PARSERS AVR32_PARSER__END_
  +    AVR32_PARSER__END_
  +  };
  +#define AVR32_NR_PARSERS AVR32_PARSER__END_
-diff -Nrup binutils-2.17/opcodes/config.in binutils-2.17.atmel.1.3.0/opcodes/config.in
---- binutils-2.17/opcodes/config.in    2005-03-31 18:52:53.000000000 +0200
-+++ binutils-2.17.atmel.1.3.0/opcodes/config.in        2007-03-26 10:31:37.000000000 +0200
+--- a/opcodes/config.in
++++ b/opcodes/config.in
  @@ -138,7 +138,7 @@
   
   /* If using the C implementation of alloca, define if you know the
  @@ -138,7 +138,7 @@
   
   /* If using the C implementation of alloca, define if you know the
@@ -99537,9 +99411,8 @@ diff -Nrup binutils-2.17/opcodes/config.in binutils-2.17.atmel.1.3.0/opcodes/con
  -/* Define to `unsigned' if <sys/types.h> does not define. */
  +/* Define to `unsigned int' if <sys/types.h> does not define. */
   #undef size_t
  -/* Define to `unsigned' if <sys/types.h> does not define. */
  +/* Define to `unsigned int' if <sys/types.h> does not define. */
   #undef size_t
-diff -Nrup binutils-2.17/opcodes/configure binutils-2.17.atmel.1.3.0/opcodes/configure
---- binutils-2.17/opcodes/configure    2006-02-17 15:36:28.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/opcodes/configure        2007-03-26 10:31:36.000000000 +0200
+--- a/opcodes/configure
++++ b/opcodes/configure
  @@ -1,25 +1,54 @@
   #! /bin/sh
   # Guess values for system-dependent variables and create Makefiles.
  @@ -1,25 +1,54 @@
   #! /bin/sh
   # Guess values for system-dependent variables and create Makefiles.
@@ -110903,9 +110776,8 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17.atmel.1.3.0/opcodes/con
   
   { (exit 0); exit 0; }
   _ACEOF
   
   { (exit 0); exit 0; }
   _ACEOF
-diff -Nrup binutils-2.17/opcodes/configure.in binutils-2.17.atmel.1.3.0/opcodes/configure.in
---- binutils-2.17/opcodes/configure.in 2006-02-17 15:36:28.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/opcodes/configure.in     2007-03-26 10:20:33.000000000 +0200
+--- a/opcodes/configure.in
++++ b/opcodes/configure.in
  @@ -157,6 +157,7 @@ if test x${all_targets} = xfalse ; then
         bfd_arc_arch)           ta="$ta arc-dis.lo arc-opc.lo arc-ext.lo" ;;
         bfd_arm_arch)           ta="$ta arm-dis.lo" ;;
  @@ -157,6 +157,7 @@ if test x${all_targets} = xfalse ; then
         bfd_arc_arch)           ta="$ta arc-dis.lo arc-opc.lo arc-ext.lo" ;;
         bfd_arm_arch)           ta="$ta arm-dis.lo" ;;
@@ -110914,9 +110786,8 @@ diff -Nrup binutils-2.17/opcodes/configure.in binutils-2.17.atmel.1.3.0/opcodes/
         bfd_bfin_arch)          ta="$ta bfin-dis.lo" ;;
         bfd_cris_arch)          ta="$ta cris-dis.lo cris-opc.lo cgen-bitset.lo" ;;
         bfd_crx_arch)           ta="$ta crx-dis.lo crx-opc.lo" ;;
         bfd_bfin_arch)          ta="$ta bfin-dis.lo" ;;
         bfd_cris_arch)          ta="$ta cris-dis.lo cris-opc.lo cgen-bitset.lo" ;;
         bfd_crx_arch)           ta="$ta crx-dis.lo crx-opc.lo" ;;
-diff -Nrup binutils-2.17/opcodes/disassemble.c binutils-2.17.atmel.1.3.0/opcodes/disassemble.c
---- binutils-2.17/opcodes/disassemble.c        2006-02-17 15:36:28.000000000 +0100
-+++ binutils-2.17.atmel.1.3.0/opcodes/disassemble.c    2007-03-26 10:20:34.000000000 +0200
+--- a/opcodes/disassemble.c
++++ b/opcodes/disassemble.c
  @@ -24,6 +24,7 @@
   #define ARCH_arc
   #define ARCH_arm
  @@ -24,6 +24,7 @@
   #define ARCH_arc
   #define ARCH_arm
@@ -110947,9 +110818,8 @@ diff -Nrup binutils-2.17/opcodes/disassemble.c binutils-2.17.atmel.1.3.0/opcodes
   
     return;
   }
   
     return;
   }
-diff -Nrup binutils-2.17/opcodes/Makefile.am binutils-2.17.atmel.1.3.0/opcodes/Makefile.am
---- binutils-2.17/opcodes/Makefile.am  2006-04-06 23:49:35.000000000 +0200
-+++ binutils-2.17.atmel.1.3.0/opcodes/Makefile.am      2007-03-26 10:20:34.000000000 +0200
+--- a/opcodes/Makefile.am
++++ b/opcodes/Makefile.am
  @@ -29,6 +29,7 @@ LIBIBERTY = ../libiberty/libiberty.a
   # Header files.
   HFILES = \
  @@ -29,6 +29,7 @@ LIBIBERTY = ../libiberty/libiberty.a
   # Header files.
   HFILES = \
@@ -110994,9 +110864,8 @@ diff -Nrup binutils-2.17/opcodes/Makefile.am binutils-2.17.atmel.1.3.0/opcodes/M
   bfin-dis.lo: bfin-dis.c $(INCDIR)/opcode/bfin.h $(INCDIR)/dis-asm.h \
     $(BFD_H) $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h
   cgen-asm.lo: cgen-asm.c sysdep.h config.h $(INCDIR)/ansidecl.h \
   bfin-dis.lo: bfin-dis.c $(INCDIR)/opcode/bfin.h $(INCDIR)/dis-asm.h \
     $(BFD_H) $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h
   cgen-asm.lo: cgen-asm.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-diff -Nrup binutils-2.17/opcodes/Makefile.in binutils-2.17.atmel.1.3.0/opcodes/Makefile.in
---- binutils-2.17/opcodes/Makefile.in  2006-04-06 23:49:35.000000000 +0200
-+++ binutils-2.17.atmel.1.3.0/opcodes/Makefile.in      2007-03-26 10:31:36.000000000 +0200
+--- a/opcodes/Makefile.in
++++ b/opcodes/Makefile.in
  @@ -1,4 +1,4 @@
  -# Makefile.in generated by automake 1.9.5 from Makefile.am.
  +# Makefile.in generated by automake 1.9.6 from Makefile.am.
  @@ -1,4 +1,4 @@
  -# Makefile.in generated by automake 1.9.5 from Makefile.am.
  +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -111108,9 +110977,8 @@ diff -Nrup binutils-2.17/opcodes/Makefile.in binutils-2.17.atmel.1.3.0/opcodes/M
   bfin-dis.lo: bfin-dis.c $(INCDIR)/opcode/bfin.h $(INCDIR)/dis-asm.h \
     $(BFD_H) $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h
   cgen-asm.lo: cgen-asm.c sysdep.h config.h $(INCDIR)/ansidecl.h \
   bfin-dis.lo: bfin-dis.c $(INCDIR)/opcode/bfin.h $(INCDIR)/dis-asm.h \
     $(BFD_H) $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h
   cgen-asm.lo: cgen-asm.c sysdep.h config.h $(INCDIR)/ansidecl.h \
-diff -Nrup binutils-2.17/bfd/configure.in binutils-2.17.atmel.1.3.0/bfd/configure.in
---- binutils-2.17/bfd/configure.in     2006-06-23 20:17:07.000000000 +0200
-+++ binutils-2.17.atmel.1.3.0/bfd/configure.in 2007-09-28 10:30:44.000000000 +0200
+--- a/bfd/configure.in
++++ b/bfd/configure.in
  @@ -583,6 +583,7 @@ do
       bfd_efi_app_ia64_vec)     tb="$tb efi-app-ia64.lo pepigen.lo cofflink.lo"; target_size=64 ;;
       bfd_elf32_am33lin_vec)    tb="$tb elf32-am33lin.lo elf32.lo $elf" ;;
  @@ -583,6 +583,7 @@ do
       bfd_efi_app_ia64_vec)     tb="$tb efi-app-ia64.lo pepigen.lo cofflink.lo"; target_size=64 ;;
       bfd_elf32_am33lin_vec)    tb="$tb elf32-am33lin.lo elf32.lo $elf" ;;