From 5fb67a8f868ab96158ec09905ac417f42566489f Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Thu, 28 Jun 2007 07:20:42 +0000
Subject: [PATCH] remove the custom Build/Prepare override in binutils, use
 PATCH_DIR, refresh patches using quilt

SVN-Revision: 7752
---
 toolchain/binutils/Makefile                   |    9 +-
 .../400-mips-ELF_MAXPAGESIZE-4k.patch         |    0
 .../patches/2.17/100-uclibc-conf.patch        |   68 +-
 .../patches/2.17/110-arm-eabi-conf.patch      |   16 +-
 .../2.17/300-001_ld_makefile_patch.patch      |   14 +-
 .../2.17/300-006_better_file_error.patch      |    9 +-
 .../2.17/300-012_check_ldrunpath_length.patch |   11 +-
 .../2.17/400-mips-ELF_MAXPAGESIZE-4k.patch    |   13 +
 .../binutils/patches/2.17/500-avr32.patch     | 4213 +++++++++--------
 .../patches/2.17/501-avr32-sreldyn-fix.patch  |    6 +-
 ...32-bfd-dont-allow-direct-refs-to-bss.patch |    8 +-
 .../2.17/503-avr32-fix-got-offset-init.patch  |    8 +-
 .../patches/2.17/601-cris-errormsg.patch      |    7 +-
 .../2.17/702-binutils-skip-comments.patch     |   16 +-
 14 files changed, 2268 insertions(+), 2130 deletions(-)
 rename toolchain/binutils/patches/{ => 2.16.1}/400-mips-ELF_MAXPAGESIZE-4k.patch (100%)
 create mode 100644 toolchain/binutils/patches/2.17/400-mips-ELF_MAXPAGESIZE-4k.patch

diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile
index e36758fe4c..902dae85a3 100644
--- a/toolchain/binutils/Makefile
+++ b/toolchain/binutils/Makefile
@@ -20,17 +20,10 @@ PKG_SOURCE:=binutils-$(PKG_VERSION).tar.bz2
 PKG_MD5SUM:=unknown
 PKG_BUILD_DIR:=$(TOOLCHAIN_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_CAT:=bzcat
+PATCH_DIR:=./patches/$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/host-build.mk
 
-
-define Build/Prepare
-	$(call Build/Prepare/Default)
-	if [ -d ./patches/$(PKG_VERSION) ]; then \
-		$(SCRIPT_DIR)/patch-kernel.sh $(PKG_BUILD_DIR) ./patches/$(PKG_VERSION); \
-	fi
-endef
-
 define Build/Configure
 	(cd $(PKG_BUILD_DIR); \
 		./configure \
diff --git a/toolchain/binutils/patches/400-mips-ELF_MAXPAGESIZE-4k.patch b/toolchain/binutils/patches/2.16.1/400-mips-ELF_MAXPAGESIZE-4k.patch
similarity index 100%
rename from toolchain/binutils/patches/400-mips-ELF_MAXPAGESIZE-4k.patch
rename to toolchain/binutils/patches/2.16.1/400-mips-ELF_MAXPAGESIZE-4k.patch
diff --git a/toolchain/binutils/patches/2.17/100-uclibc-conf.patch b/toolchain/binutils/patches/2.17/100-uclibc-conf.patch
index 25222e5df2..bd08d55066 100644
--- a/toolchain/binutils/patches/2.17/100-uclibc-conf.patch
+++ b/toolchain/binutils/patches/2.17/100-uclibc-conf.patch
@@ -1,5 +1,7 @@
---- binutils-2.16.91.0.7/bfd/configure
-+++ binutils-2.16.91.0.7/bfd/configure
+Index: binutils-2.17/bfd/configure
+===================================================================
+--- binutils-2.17.orig/bfd/configure	2007-06-28 09:19:34.892931920 +0200
++++ binutils-2.17/bfd/configure	2007-06-28 09:19:35.023912008 +0200
 @@ -3576,7 +3576,7 @@
    ;;
  
@@ -9,8 +11,10 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
---- binutils-2.16.91.0.7/binutils/configure
-+++ binutils-2.16.91.0.7/binutils/configure
+Index: binutils-2.17/binutils/configure
+===================================================================
+--- binutils-2.17.orig/binutils/configure	2007-06-28 09:19:34.898931008 +0200
++++ binutils-2.17/binutils/configure	2007-06-28 09:19:35.028911248 +0200
 @@ -3411,7 +3411,7 @@
    ;;
  
@@ -20,9 +24,11 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
---- binutils-2.16.91.0.7/configure
-+++ binutils-2.16.91.0.7/configure
-@@ -1270,7 +1270,7 @@
+Index: binutils-2.17/configure
+===================================================================
+--- binutils-2.17.orig/configure	2007-06-28 09:19:34.903930248 +0200
++++ binutils-2.17/configure	2007-06-28 09:19:35.030910944 +0200
+@@ -1276,7 +1276,7 @@
    am33_2.0-*-linux*)
      noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
      ;;
@@ -31,7 +37,7 @@
      noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
      ;;    
    sh*-*-pe|mips*-*-pe|*arm-wince-pe)
-@@ -1578,7 +1578,7 @@
+@@ -1584,7 +1584,7 @@
    romp-*-*)
      noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes target-libgloss ${libgcj}"
      ;;
@@ -40,8 +46,10 @@
      case "${host}" in
        i[3456789]86-*-vsta) ;; # don't add gprof back in
        i[3456789]86-*-go32*) ;; # don't add gprof back in
---- binutils-2.16.91.0.7/configure.in
-+++ binutils-2.16.91.0.7/configure.in
+Index: binutils-2.17/configure.in
+===================================================================
+--- binutils-2.17.orig/configure.in	2007-06-28 09:19:34.909929336 +0200
++++ binutils-2.17/configure.in	2007-06-28 09:19:35.031910792 +0200
 @@ -468,7 +468,7 @@
    am33_2.0-*-linux*)
      noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
@@ -60,8 +68,10 @@
      case "${host}" in
        i[[3456789]]86-*-vsta) ;; # don't add gprof back in
        i[[3456789]]86-*-go32*) ;; # don't add gprof back in
---- binutils-2.16.91.0.7/gas/configure
-+++ binutils-2.16.91.0.7/gas/configure
+Index: binutils-2.17/gas/configure
+===================================================================
+--- binutils-2.17.orig/gas/configure	2007-06-28 09:19:34.915928424 +0200
++++ binutils-2.17/gas/configure	2007-06-28 09:19:35.035910184 +0200
 @@ -3411,7 +3411,7 @@
    ;;
  
@@ -71,10 +81,12 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
---- binutils-2.16.91.0.7/gprof/configure
-+++ binutils-2.16.91.0.7/gprof/configure
-@@ -3419,6 +3419,11 @@
-   lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
+Index: binutils-2.17/gprof/configure
+===================================================================
+--- binutils-2.17.orig/gprof/configure	2007-06-28 09:19:34.921927512 +0200
++++ binutils-2.17/gprof/configure	2007-06-28 09:19:35.042909120 +0200
+@@ -3414,6 +3414,11 @@
+   lt_cv_deplibs_check_method=pass_all
    ;;
  
 +linux-uclibc*)
@@ -85,8 +97,10 @@
  netbsd* | knetbsd*-gnu)
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
      lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
---- binutils-2.16.91.0.7/ld/configure
-+++ binutils-2.16.91.0.7/ld/configure
+Index: binutils-2.17/ld/configure
+===================================================================
+--- binutils-2.17.orig/ld/configure	2007-06-28 09:19:34.927926600 +0200
++++ binutils-2.17/ld/configure	2007-06-28 09:19:35.046908512 +0200
 @@ -3413,7 +3413,7 @@
    ;;
  
@@ -96,8 +110,10 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
---- binutils-2.16.91.0.7/libtool.m4
-+++ binutils-2.16.91.0.7/libtool.m4
+Index: binutils-2.17/libtool.m4
+===================================================================
+--- binutils-2.17.orig/libtool.m4	2007-06-28 09:19:34.933925688 +0200
++++ binutils-2.17/libtool.m4	2007-06-28 09:19:35.047908360 +0200
 @@ -739,7 +739,7 @@
    ;;
  
@@ -107,8 +123,10 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
---- binutils-2.16.91.0.7/ltconfig
-+++ binutils-2.16.91.0.7/ltconfig
+Index: binutils-2.17/ltconfig
+===================================================================
+--- binutils-2.17.orig/ltconfig	2007-06-28 09:19:34.939924776 +0200
++++ binutils-2.17/ltconfig	2007-06-28 09:19:35.048908208 +0200
 @@ -602,6 +602,7 @@
  
  # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
@@ -126,8 +144,10 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
---- binutils-2.16.91.0.7/opcodes/configure
-+++ binutils-2.16.91.0.7/opcodes/configure
+Index: binutils-2.17/opcodes/configure
+===================================================================
+--- binutils-2.17.orig/opcodes/configure	2007-06-28 09:19:34.946923712 +0200
++++ binutils-2.17/opcodes/configure	2007-06-28 09:19:35.051907752 +0200
 @@ -3579,7 +3579,7 @@
    ;;
  
diff --git a/toolchain/binutils/patches/2.17/110-arm-eabi-conf.patch b/toolchain/binutils/patches/2.17/110-arm-eabi-conf.patch
index be85ceb109..8978de7a2d 100644
--- a/toolchain/binutils/patches/2.17/110-arm-eabi-conf.patch
+++ b/toolchain/binutils/patches/2.17/110-arm-eabi-conf.patch
@@ -1,7 +1,8 @@
-diff -urN binutils-2.16.91.0.7.orig/configure binutils-2.16.91.0.7/configure
---- binutils-2.16.91.0.7.orig/configure	2006-05-31 14:54:24.000000000 +0300
-+++ binutils-2.16.91.0.7/configure	2006-05-31 14:55:53.000000000 +0300
-@@ -1299,7 +1299,7 @@
+Index: binutils-2.17/configure
+===================================================================
+--- binutils-2.17.orig/configure	2007-06-28 09:19:35.030910944 +0200
++++ binutils-2.17/configure	2007-06-28 09:19:35.592825520 +0200
+@@ -1305,7 +1305,7 @@
    arm-*-elf* | strongarm-*-elf* | xscale-*-elf* | arm*-*-eabi* )
      noconfigdirs="$noconfigdirs target-libffi target-qthreads"
      ;;
@@ -10,9 +11,10 @@ diff -urN binutils-2.16.91.0.7.orig/configure binutils-2.16.91.0.7/configure
      noconfigdirs="$noconfigdirs target-libffi target-qthreads"
      noconfigdirs="$noconfigdirs target-libjava target-libobjc"
      ;;
-diff -urN binutils-2.16.91.0.7.orig/configure.in binutils-2.16.91.0.7/configure.in
---- binutils-2.16.91.0.7.orig/configure.in	2006-05-31 14:54:24.000000000 +0300
-+++ binutils-2.16.91.0.7/configure.in	2006-05-31 14:55:53.000000000 +0300
+Index: binutils-2.17/configure.in
+===================================================================
+--- binutils-2.17.orig/configure.in	2007-06-28 09:19:35.031910792 +0200
++++ binutils-2.17/configure.in	2007-06-28 09:19:35.593825368 +0200
 @@ -497,7 +497,7 @@
    arm-*-elf* | strongarm-*-elf* | xscale-*-elf* | arm*-*-eabi* )
      noconfigdirs="$noconfigdirs target-libffi target-qthreads"
diff --git a/toolchain/binutils/patches/2.17/300-001_ld_makefile_patch.patch b/toolchain/binutils/patches/2.17/300-001_ld_makefile_patch.patch
index 04a7e61e25..6a490f4336 100644
--- a/toolchain/binutils/patches/2.17/300-001_ld_makefile_patch.patch
+++ b/toolchain/binutils/patches/2.17/300-001_ld_makefile_patch.patch
@@ -26,8 +26,10 @@ esac
 exit 0
 
 @DPATCH@
---- binutils-2.16.91.0.1/ld/Makefile.am
-+++ binutils-2.16.91.0.1/ld/Makefile.am
+Index: binutils-2.17/ld/Makefile.am
+===================================================================
+--- binutils-2.17.orig/ld/Makefile.am	2007-06-28 09:19:34.837940280 +0200
++++ binutils-2.17/ld/Makefile.am	2007-06-28 09:19:35.795794664 +0200
 @@ -20,7 +20,7 @@
  # We put the scripts in the directory $(scriptdir)/ldscripts.
  # We can't put the scripts in $(datadir) because the SEARCH_DIR
@@ -37,9 +39,11 @@ exit 0
  
  EMUL = @EMUL@
  EMULATION_OFILES = @EMULATION_OFILES@
---- binutils-2.16.91.0.1/ld/Makefile.in
-+++ binutils-2.16.91.0.1/ld/Makefile.in
-@@ -268,7 +268,7 @@
+Index: binutils-2.17/ld/Makefile.in
+===================================================================
+--- binutils-2.17.orig/ld/Makefile.in	2007-06-28 09:19:34.844939216 +0200
++++ binutils-2.17/ld/Makefile.in	2007-06-28 09:19:35.796794512 +0200
+@@ -269,7 +269,7 @@
  # We put the scripts in the directory $(scriptdir)/ldscripts.
  # We can't put the scripts in $(datadir) because the SEARCH_DIR
  # directives need to be different for native and cross linkers.
diff --git a/toolchain/binutils/patches/2.17/300-006_better_file_error.patch b/toolchain/binutils/patches/2.17/300-006_better_file_error.patch
index f337611edf..f6a720797d 100644
--- a/toolchain/binutils/patches/2.17/300-006_better_file_error.patch
+++ b/toolchain/binutils/patches/2.17/300-006_better_file_error.patch
@@ -24,10 +24,11 @@ esac
 exit 0
 
 @DPATCH@
-diff -urNad /home/james/debian/packages/binutils/binutils-2.14.90.0.6/bfd/opncls.c binutils-2.14.90.0.6/bfd/opncls.c
---- /home/james/debian/packages/binutils/binutils-2.14.90.0.6/bfd/opncls.c	2003-07-23 16:08:09.000000000 +0100
-+++ binutils-2.14.90.0.6/bfd/opncls.c	2003-09-10 22:35:00.000000000 +0100
-@@ -150,6 +150,13 @@
+Index: binutils-2.17/bfd/opncls.c
+===================================================================
+--- binutils-2.17.orig/bfd/opncls.c	2007-06-28 09:19:34.818943168 +0200
++++ binutils-2.17/bfd/opncls.c	2007-06-28 09:19:35.993764568 +0200
+@@ -158,6 +158,13 @@
  {
    bfd *nbfd;
    const bfd_target *target_vec;
diff --git a/toolchain/binutils/patches/2.17/300-012_check_ldrunpath_length.patch b/toolchain/binutils/patches/2.17/300-012_check_ldrunpath_length.patch
index 498651a90c..c47bcca136 100644
--- a/toolchain/binutils/patches/2.17/300-012_check_ldrunpath_length.patch
+++ b/toolchain/binutils/patches/2.17/300-012_check_ldrunpath_length.patch
@@ -24,10 +24,11 @@ esac
 exit 0
 
 @DPATCH@
-diff -urNad /home/james/debian/packages/binutils/new/binutils-2.15/ld/emultempl/elf32.em binutils-2.15/ld/emultempl/elf32.em
---- /home/james/debian/packages/binutils/new/binutils-2.15/ld/emultempl/elf32.em	2004-05-21 23:12:58.000000000 +0100
-+++ binutils-2.15/ld/emultempl/elf32.em	2004-05-21 23:12:59.000000000 +0100
-@@ -692,6 +692,8 @@
+Index: binutils-2.17/ld/emultempl/elf32.em
+===================================================================
+--- binutils-2.17.orig/ld/emultempl/elf32.em	2007-06-28 09:19:34.796946512 +0200
++++ binutils-2.17/ld/emultempl/elf32.em	2007-06-28 09:19:36.178736448 +0200
+@@ -970,6 +970,8 @@
  	      && command_line.rpath == NULL)
  	    {
  	      lib_path = (const char *) getenv ("LD_RUN_PATH");
@@ -36,7 +37,7 @@ diff -urNad /home/james/debian/packages/binutils/new/binutils-2.15/ld/emultempl/
  	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
  						      force))
  		break;
-@@ -871,6 +873,8 @@
+@@ -1154,6 +1156,8 @@
    rpath = command_line.rpath;
    if (rpath == NULL)
      rpath = (const char *) getenv ("LD_RUN_PATH");
diff --git a/toolchain/binutils/patches/2.17/400-mips-ELF_MAXPAGESIZE-4k.patch b/toolchain/binutils/patches/2.17/400-mips-ELF_MAXPAGESIZE-4k.patch
new file mode 100644
index 0000000000..66bc22c364
--- /dev/null
+++ b/toolchain/binutils/patches/2.17/400-mips-ELF_MAXPAGESIZE-4k.patch
@@ -0,0 +1,13 @@
+Index: binutils-2.17/bfd/elf32-mips.c
+===================================================================
+--- binutils-2.17.orig/bfd/elf32-mips.c	2007-06-28 09:19:34.774949856 +0200
++++ binutils-2.17/bfd/elf32-mips.c	2007-06-28 09:19:36.366707872 +0200
+@@ -1617,7 +1617,7 @@
+ 
+ /* The SVR4 MIPS ABI says that this should be 0x10000, and Linux uses
+    page sizes of up to that limit, so we need to respect it.  */
+-#define ELF_MAXPAGESIZE			0x10000
++#define ELF_MAXPAGESIZE			0x1000
+ #define elf32_bed			elf32_tradbed
+ 
+ /* Include the target file again for this target.  */
diff --git a/toolchain/binutils/patches/2.17/500-avr32.patch b/toolchain/binutils/patches/2.17/500-avr32.patch
index eec6edff23..829e96da47 100644
--- a/toolchain/binutils/patches/2.17/500-avr32.patch
+++ b/toolchain/binutils/patches/2.17/500-avr32.patch
@@ -1,13 +1,14 @@
-diff -Nrup binutils-2.17/bfd/aclocal.m4 binutils-2.17-atmel/bfd/aclocal.m4
---- binutils-2.17/bfd/aclocal.m4	2005-09-30 20:38:50.000000000 +0200
-+++ binutils-2.17-atmel/bfd/aclocal.m4	2007-02-20 16:07:03.000000000 +0100
+Index: binutils-2.17/bfd/aclocal.m4
+===================================================================
+--- binutils-2.17.orig/bfd/aclocal.m4	2007-06-28 09:19:34.137046832 +0200
++++ binutils-2.17/bfd/aclocal.m4	2007-06-28 09:19:36.555679144 +0200
 @@ -1,4 +1,4 @@
 -# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
 +# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
  
  # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
  # 2005  Free Software Foundation, Inc.
-@@ -28,7 +28,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api
+@@ -28,7 +28,7 @@
  # Call AM_AUTOMAKE_VERSION so it can be traced.
  # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
  AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
@@ -16,10 +17,11 @@ diff -Nrup binutils-2.17/bfd/aclocal.m4 binutils-2.17-atmel/bfd/aclocal.m4
  
  # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
  
-diff -Nrup binutils-2.17/bfd/archures.c binutils-2.17-atmel/bfd/archures.c
---- binutils-2.17/bfd/archures.c	2006-03-06 14:42:03.000000000 +0100
-+++ binutils-2.17-atmel/bfd/archures.c	2007-02-12 15:37:09.000000000 +0100
-@@ -334,6 +334,9 @@ DESCRIPTION
+Index: binutils-2.17/bfd/archures.c
+===================================================================
+--- binutils-2.17.orig/bfd/archures.c	2007-06-28 09:19:34.142046072 +0200
++++ binutils-2.17/bfd/archures.c	2007-06-28 09:19:36.556678992 +0200
+@@ -334,6 +334,9 @@
  .#define bfd_mach_avr3		3
  .#define bfd_mach_avr4		4
  .#define bfd_mach_avr5		5
@@ -29,7 +31,7 @@ diff -Nrup binutils-2.17/bfd/archures.c binutils-2.17-atmel/bfd/archures.c
  .  bfd_arch_bfin,        {* ADI Blackfin *}
  .#define bfd_mach_bfin          1
  .  bfd_arch_cr16c,       {* National Semiconductor CompactRISC. *}
-@@ -423,6 +426,7 @@ extern const bfd_arch_info_type bfd_alph
+@@ -423,6 +426,7 @@
  extern const bfd_arch_info_type bfd_arc_arch;
  extern const bfd_arch_info_type bfd_arm_arch;
  extern const bfd_arch_info_type bfd_avr_arch;
@@ -37,7 +39,7 @@ diff -Nrup binutils-2.17/bfd/archures.c binutils-2.17-atmel/bfd/archures.c
  extern const bfd_arch_info_type bfd_bfin_arch;
  extern const bfd_arch_info_type bfd_cr16c_arch;
  extern const bfd_arch_info_type bfd_cris_arch;
-@@ -490,6 +494,7 @@ static const bfd_arch_info_type * const 
+@@ -490,6 +494,7 @@
      &bfd_arc_arch,
      &bfd_arm_arch,
      &bfd_avr_arch,
@@ -45,10 +47,11 @@ diff -Nrup binutils-2.17/bfd/archures.c binutils-2.17-atmel/bfd/archures.c
      &bfd_bfin_arch,
      &bfd_cr16c_arch,
      &bfd_cris_arch,
-diff -Nrup binutils-2.17/bfd/bfd-in2.h binutils-2.17-atmel/bfd/bfd-in2.h
---- binutils-2.17/bfd/bfd-in2.h	2006-03-26 01:38:42.000000000 +0100
-+++ binutils-2.17-atmel/bfd/bfd-in2.h	2007-02-20 16:08:43.000000000 +0100
-@@ -1931,6 +1931,9 @@ enum bfd_architecture
+Index: binutils-2.17/bfd/bfd-in2.h
+===================================================================
+--- binutils-2.17.orig/bfd/bfd-in2.h	2007-06-28 09:19:34.149045008 +0200
++++ binutils-2.17/bfd/bfd-in2.h	2007-06-28 09:19:36.558678688 +0200
+@@ -1931,6 +1931,9 @@
  #define bfd_mach_avr3          3
  #define bfd_mach_avr4          4
  #define bfd_mach_avr5          5
@@ -58,7 +61,7 @@ diff -Nrup binutils-2.17/bfd/bfd-in2.h binutils-2.17-atmel/bfd/bfd-in2.h
    bfd_arch_bfin,        /* ADI Blackfin */
  #define bfd_mach_bfin          1
    bfd_arch_cr16c,       /* National Semiconductor CompactRISC. */
-@@ -3577,6 +3580,87 @@ instructions  */
+@@ -3577,6 +3580,87 @@
  instructions  */
    BFD_RELOC_AVR_6_ADIW,
  
@@ -146,10 +149,11 @@ diff -Nrup binutils-2.17/bfd/bfd-in2.h binutils-2.17-atmel/bfd/bfd-in2.h
  /* Direct 12 bit.  */
    BFD_RELOC_390_12,
  
-diff -Nrup binutils-2.17/bfd/config.bfd binutils-2.17-atmel/bfd/config.bfd
---- binutils-2.17/bfd/config.bfd	2006-04-05 14:41:57.000000000 +0200
-+++ binutils-2.17-atmel/bfd/config.bfd	2007-02-12 15:37:09.000000000 +0100
-@@ -317,6 +317,10 @@ case "${targ}" in
+Index: binutils-2.17/bfd/config.bfd
+===================================================================
+--- binutils-2.17.orig/bfd/config.bfd	2007-06-28 09:19:34.154044248 +0200
++++ binutils-2.17/bfd/config.bfd	2007-06-28 09:19:36.558678688 +0200
+@@ -317,6 +317,10 @@
      targ_underscore=yes
      ;;
  
@@ -160,9 +164,10 @@ diff -Nrup binutils-2.17/bfd/config.bfd binutils-2.17-atmel/bfd/config.bfd
    c30-*-*aout* | tic30-*-*aout*)
      targ_defvec=tic30_aout_vec
      ;;
-diff -Nrup binutils-2.17/bfd/config.in binutils-2.17-atmel/bfd/config.in
---- binutils-2.17/bfd/config.in	2005-11-03 17:06:10.000000000 +0100
-+++ binutils-2.17-atmel/bfd/config.in	2007-02-20 16:07:07.000000000 +0100
+Index: binutils-2.17/bfd/config.in
+===================================================================
+--- binutils-2.17.orig/bfd/config.in	2007-06-28 09:19:34.159043488 +0200
++++ binutils-2.17/bfd/config.in	2007-06-28 09:19:36.559678536 +0200
 @@ -313,18 +313,18 @@
  /* Define to the version of this package. */
  #undef PACKAGE_VERSION
@@ -197,9 +202,10 @@ diff -Nrup binutils-2.17/bfd/config.in binutils-2.17-atmel/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
-diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
---- binutils-2.17/bfd/configure	2006-06-23 20:17:03.000000000 +0200
-+++ binutils-2.17-atmel/bfd/configure	2007-02-20 16:07:06.000000000 +0100
+Index: binutils-2.17/bfd/configure
+===================================================================
+--- binutils-2.17.orig/bfd/configure	2007-06-28 09:19:35.023912008 +0200
++++ binutils-2.17/bfd/configure	2007-06-28 09:19:36.575676104 +0200
 @@ -1,25 +1,54 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
@@ -261,7 +267,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  
  # Support unset when possible.
  if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-@@ -29,8 +58,43 @@ else
+@@ -29,8 +58,43 @@
  fi
  
  
@@ -306,7 +312,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  PS1='$ '
  PS2='> '
  PS4='+ '
-@@ -44,18 +108,19 @@ do
+@@ -44,18 +108,19 @@
    if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
      eval $as_var=C; export $as_var
    else
@@ -329,7 +335,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    as_basename=basename
  else
    as_basename=false
-@@ -63,157 +128,388 @@ fi
+@@ -63,157 +128,388 @@
  
  
  # Name of the executable.
@@ -816,7 +822,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  
  if mkdir -p . 2>/dev/null; then
    as_mkdir_p=:
-@@ -222,7 +518,28 @@ else
+@@ -222,7 +518,28 @@
    as_mkdir_p=false
  fi
  
@@ -846,7 +852,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  
  # Sed expression to map a string onto a valid CPP name.
  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -231,39 +548,27 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P
+@@ -231,39 +548,27 @@
  as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
  
  
@@ -889,7 +895,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  # Identity of this package.
  PACKAGE_NAME=
  PACKAGE_TARNAME=
-@@ -275,42 +580,199 @@ ac_unique_file="libbfd.c"
+@@ -275,42 +580,199 @@
  # Factoring default headers for most tests.
  ac_includes_default="\
  #include <stdio.h>
@@ -1103,7 +1109,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  
  # Initialize some variables set by options.
  ac_init_help=
-@@ -337,34 +799,48 @@ x_libraries=NONE
+@@ -337,34 +799,48 @@
  # and all the variables that are supposed to be based on exec_prefix
  # by default will actually change.
  # Use braces instead of parens because sh, perl, etc. also accept them.
@@ -1159,7 +1165,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  
    -bindir | --bindir | --bindi | --bind | --bin | --bi)
      ac_prev=bindir ;;
-@@ -386,33 +862,45 @@ do
+@@ -386,33 +862,45 @@
    --config-cache | -C)
      cache_file=config.cache ;;
  
@@ -1218,7 +1224,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  
    -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
    | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-@@ -439,6 +927,12 @@ do
+@@ -439,6 +927,12 @@
    -host=* | --host=* | --hos=* | --ho=*)
      host_alias=$ac_optarg ;;
  
@@ -1231,7 +1237,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    -includedir | --includedir | --includedi | --included | --include \
    | --includ | --inclu | --incl | --inc)
      ac_prev=includedir ;;
-@@ -463,13 +957,16 @@ do
+@@ -463,13 +957,16 @@
    | --libexe=* | --libex=* | --libe=*)
      libexecdir=$ac_optarg ;;
  
@@ -1252,7 +1258,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
      localstatedir=$ac_optarg ;;
  
    -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-@@ -534,6 +1031,16 @@ do
+@@ -534,6 +1031,16 @@
    | --progr-tra=* | --program-tr=* | --program-t=*)
      program_transform_name=$ac_optarg ;;
  
@@ -1269,7 +1275,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
    | -silent | --silent | --silen | --sile | --sil)
      silent=yes ;;
-@@ -586,24 +1093,20 @@ do
+@@ -586,24 +1093,20 @@
    -with-* | --with-*)
      ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
      # Reject names that are not valid shell variable names.
@@ -1300,7 +1306,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  
    --x)
      # Obsolete; use --with-x.
-@@ -634,8 +1137,7 @@ Try \`$0 --help' for more information." 
+@@ -634,8 +1137,7 @@
      expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
        { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
     { (exit 1); exit 1; }; }
@@ -1310,7 +1316,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
      export $ac_envvar ;;
  
    *)
-@@ -655,27 +1157,19 @@ if test -n "$ac_prev"; then
+@@ -655,27 +1157,19 @@
     { (exit 1); exit 1; }; }
  fi
  
@@ -1348,7 +1354,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  done
  
  # There might be people who depend on the old broken behavior: `$host'
-@@ -702,74 +1196,76 @@ test -n "$host_alias" && ac_tool_prefix=
+@@ -702,74 +1196,76 @@
  test "$silent" = yes && exec 6>/dev/null
  
  
@@ -1480,7 +1486,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  
  #
  # Report the --help message.
-@@ -798,9 +1294,6 @@ Configuration:
+@@ -798,9 +1294,6 @@
    -n, --no-create         do not create output files
        --srcdir=DIR        find the sources in DIR [configure dir or \`..']
  
@@ -1490,7 +1496,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  Installation directories:
    --prefix=PREFIX         install architecture-independent files in PREFIX
  			  [$ac_default_prefix]
-@@ -818,15 +1311,22 @@ Fine tuning of the installation director
+@@ -818,15 +1311,22 @@
    --bindir=DIR           user executables [EPREFIX/bin]
    --sbindir=DIR          system admin executables [EPREFIX/sbin]
    --libexecdir=DIR       program executables [EPREFIX/libexec]
@@ -1516,7 +1522,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  _ACEOF
  
    cat <<\_ACEOF
-@@ -880,126 +1380,95 @@ Some influential environment variables:
+@@ -880,126 +1380,95 @@
    CFLAGS      C compiler flags
    LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
                nonstandard directory <lib dir>
@@ -1694,7 +1700,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  {
  cat <<_ASUNAME
  ## --------- ##
-@@ -1018,7 +1487,7 @@ uname -v = `(uname -v) 2>/dev/null || ec
+@@ -1018,7 +1487,7 @@
  /bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
  /usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
  /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
@@ -1703,7 +1709,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  /bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
  /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
  /bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-@@ -1032,6 +1501,7 @@ do
+@@ -1032,6 +1501,7 @@
    test -z "$as_dir" && as_dir=.
    echo "PATH: $as_dir"
  done
@@ -1711,7 +1717,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  
  } >&5
  
-@@ -1053,7 +1523,6 @@ _ACEOF
+@@ -1053,7 +1523,6 @@
  ac_configure_args=
  ac_configure_args0=
  ac_configure_args1=
@@ -1719,7 +1725,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  ac_must_keep_next=false
  for ac_pass in 1 2
  do
-@@ -1064,7 +1533,7 @@ do
+@@ -1064,7 +1533,7 @@
      -q | -quiet | --quiet | --quie | --qui | --qu | --q \
      | -silent | --silent | --silen | --sile | --sil)
        continue ;;
@@ -1728,7 +1734,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
        ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
      esac
      case $ac_pass in
-@@ -1086,9 +1555,7 @@ do
+@@ -1086,9 +1555,7 @@
  	  -* ) ac_must_keep_next=true ;;
  	esac
        fi
@@ -1739,7 +1745,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
        ;;
      esac
    done
-@@ -1099,8 +1566,8 @@ $as_unset ac_configure_args1 || test "${
+@@ -1099,8 +1566,8 @@
  # When interrupted or exit'd, cleanup temporary files, and complete
  # config.log.  We remove comments because anyway the quotes in there
  # would cause problems or look ugly.
@@ -1750,7 +1756,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  trap 'exit_status=$?
    # Save into config.log some information that might help in debugging.
    {
-@@ -1113,20 +1580,34 @@ trap 'exit_status=$?
+@@ -1113,20 +1580,34 @@
  _ASBOX
      echo
      # The following way of writing the cache mishandles newlines in values,
@@ -1795,7 +1801,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
      echo
  
      cat <<\_ASBOX
-@@ -1137,22 +1618,28 @@ _ASBOX
+@@ -1137,22 +1618,28 @@
      echo
      for ac_var in $ac_subst_vars
      do
@@ -1831,7 +1837,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
        done | sort
        echo
      fi
-@@ -1164,26 +1651,24 @@ _ASBOX
+@@ -1164,26 +1651,24 @@
  ## ----------- ##
  _ASBOX
        echo
@@ -1863,7 +1869,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  
  # Predefined preprocessor variables.
  
-@@ -1214,14 +1699,17 @@ _ACEOF
+@@ -1214,14 +1699,17 @@
  
  # Let the site file select an alternate cache file if it wants to.
  # Prefer explicitly selected file to automatically selected ones.
@@ -1888,7 +1894,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    if test -r "$ac_site_file"; then
      { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
  echo "$as_me: loading site script $ac_site_file" >&6;}
-@@ -1237,8 +1725,8 @@ if test -r "$cache_file"; then
+@@ -1237,8 +1725,8 @@
      { echo "$as_me:$LINENO: loading cache $cache_file" >&5
  echo "$as_me: loading cache $cache_file" >&6;}
      case $cache_file in
@@ -1899,7 +1905,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
      esac
    fi
  else
-@@ -1250,12 +1738,11 @@ fi
+@@ -1250,12 +1738,11 @@
  # Check that the precious variables saved in the cache have kept the same
  # value.
  ac_cache_corrupted=false
@@ -1915,7 +1921,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    case $ac_old_set,$ac_new_set in
      set,)
        { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-@@ -1280,8 +1767,7 @@ echo "$as_me:   current value: $ac_new_v
+@@ -1280,8 +1767,7 @@
    # Pass precious variables to config.status.
    if test "$ac_new_set" = set; then
      case $ac_new_val in
@@ -1925,7 +1931,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
      *) ac_arg=$ac_var=$ac_new_val ;;
      esac
      case " $ac_configure_args " in
-@@ -1298,12 +1784,6 @@ echo "$as_me: error: run \`make distclea
+@@ -1298,12 +1784,6 @@
     { (exit 1); exit 1; }; }
  fi
  
@@ -1938,7 +1944,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  
  
  
-@@ -1320,109 +1800,164 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -1320,109 +1800,164 @@
  
  
  
@@ -2155,7 +2161,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  
  
  # The aliases save the names the user supplied, while $host etc.
-@@ -1439,8 +1974,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -1439,8 +1974,8 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
  set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -2166,7 +2172,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -1453,32 +1988,34 @@ do
+@@ -1453,32 +1988,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2208,7 +2214,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -1491,36 +2028,51 @@ do
+@@ -1491,36 +2028,51 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2270,7 +2276,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -1533,74 +2085,34 @@ do
+@@ -1533,74 +2085,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2354,7 +2360,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -1614,7 +2126,7 @@ do
+@@ -1614,7 +2126,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2363,7 +2369,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
      if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
         ac_prog_rejected=yes
         continue
-@@ -1625,6 +2137,7 @@ do
+@@ -1625,6 +2137,7 @@
    fi
  done
  done
@@ -2371,7 +2377,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  
  if test $ac_prog_rejected = yes; then
    # We found a bogon in the path, so make sure we never use it.
-@@ -1642,22 +2155,23 @@ fi
+@@ -1642,22 +2155,23 @@
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
@@ -2402,7 +2408,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -1670,36 +2184,38 @@ do
+@@ -1670,36 +2184,38 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2449,7 +2455,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -1712,29 +2228,45 @@ do
+@@ -1712,29 +2228,45 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2501,7 +2507,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  fi
  
  fi
-@@ -1747,21 +2279,35 @@ See \`config.log' for more details." >&2
+@@ -1747,21 +2279,35 @@
     { (exit 1); exit 1; }; }
  
  # Provide some information about the compiler.
@@ -2545,7 +2551,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
-@@ -1786,47 +2332,77 @@ ac_clean_files="$ac_clean_files a.out a.
+@@ -1786,47 +2332,77 @@
  # Try to create an executable without -o first, disregard a.out.
  # It will help us diagnose broken compilers, and finding out an intuition
  # of exeext.
@@ -2645,7 +2651,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
-@@ -1838,19 +2414,21 @@ See \`config.log' for more details." >&2
+@@ -1838,19 +2414,21 @@
  fi
  
  ac_exeext=$ac_cv_exeext
@@ -2674,7 +2680,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -1869,22 +2447,27 @@ See \`config.log' for more details." >&2
+@@ -1869,22 +2447,27 @@
      fi
    fi
  fi
@@ -2714,7 +2720,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
-@@ -1895,9 +2478,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -1895,9 +2478,8 @@
  for ac_file in conftest.exe conftest conftest.*; do
    test -f "$ac_file" || continue
    case $ac_file in
@@ -2725,7 +2731,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  	  break;;
      * ) break;;
    esac
-@@ -1911,14 +2493,14 @@ See \`config.log' for more details." >&2
+@@ -1911,14 +2493,14 @@
  fi
  
  rm -f conftest$ac_cv_exeext
@@ -2744,7 +2750,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_objext+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -1938,14 +2520,20 @@ main ()
+@@ -1938,14 +2520,20 @@
  }
  _ACEOF
  rm -f conftest.o conftest.obj
@@ -2769,7 +2775,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
      *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
         break;;
    esac
-@@ -1963,12 +2551,12 @@ fi
+@@ -1963,12 +2551,12 @@
  
  rm -f conftest.$ac_cv_objext conftest.$ac_ext
  fi
@@ -2786,7 +2792,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_c_compiler_gnu+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -1991,50 +2579,49 @@ main ()
+@@ -1991,50 +2579,49 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -2860,7 +2866,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -2050,38 +2637,118 @@ main ()
+@@ -2050,38 +2637,118 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -2995,7 +3001,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "$ac_test_CFLAGS" = set; then
    CFLAGS=$ac_save_CFLAGS
  elif test $ac_cv_prog_cc_g = yes; then
-@@ -2097,12 +2764,12 @@ else
+@@ -2097,12 +2764,12 @@
      CFLAGS=
    fi
  fi
@@ -3012,7 +3018,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  ac_save_CC=$CC
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -2136,12 +2803,17 @@ static char *f (char * (*g) (char **, in
+@@ -2136,12 +2803,17 @@
  /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
     function prototypes and stuff, but not '\xHH' hex character constants.
     These don't provoke an error unfortunately, instead are silently treated
@@ -3032,7 +3038,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  int test (int i, double x);
  struct s1 {int (*f) (int a);};
  struct s2 {int (*f) (double a);};
-@@ -2156,335 +2828,144 @@ return f (e, argv, 0) != argv[0]  ||  f 
+@@ -2156,335 +2828,144 @@
    return 0;
  }
  _ACEOF
@@ -3455,7 +3461,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  
  fi
  
-@@ -2503,8 +2984,8 @@ am__api_version="1.9"
+@@ -2503,8 +2984,8 @@
  # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
  # OS/2's system install, which has a completely different semantic
  # ./install, which can be erroneously created by make from ./install.sh.
@@ -3466,7 +3472,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test -z "$INSTALL"; then
  if test "${ac_cv_path_install+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2526,7 +3007,7 @@ case $as_dir/ in
+@@ -2526,7 +3007,7 @@
      # by default.
      for ac_prog in ginstall scoinst install; do
        for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3475,7 +3481,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  	  if test $ac_prog = install &&
  	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
  	    # AIX install.  It has an incompatible calling convention.
-@@ -2545,21 +3026,22 @@ case $as_dir/ in
+@@ -2545,21 +3026,22 @@
      ;;
  esac
  done
@@ -3503,7 +3509,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  
  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
  # It thinks the first close brace ends the variable substitution.
-@@ -2569,8 +3051,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
+@@ -2569,8 +3051,8 @@
  
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
@@ -3514,7 +3520,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  # Just in case
  sleep 1
  echo timestamp > conftest.file
-@@ -2612,20 +3094,20 @@ echo "$as_me: error: newly created file 
+@@ -2612,20 +3094,20 @@
  Check your system clock" >&2;}
     { (exit 1); exit 1; }; }
  fi
@@ -3540,7 +3546,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  
  # expand $ac_aux_dir to an absolute path
  am_aux_dir=`cd $ac_aux_dir && pwd`
-@@ -2677,8 +3159,8 @@ for ac_prog in gawk mawk nawk awk
+@@ -2677,8 +3159,8 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -3551,7 +3557,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_prog_AWK+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2691,54 +3173,57 @@ do
+@@ -2691,54 +3173,57 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3630,7 +3636,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    SET_MAKE="MAKE=${MAKE-make}"
  fi
  
-@@ -2753,7 +3238,7 @@ rmdir .tst 2>/dev/null
+@@ -2753,7 +3238,7 @@
  
  DEPDIR="${am__leading_dot}deps"
  
@@ -3639,7 +3645,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  
  
  am_make=${MAKE-make}
-@@ -2763,8 +3248,8 @@ am__doit:
+@@ -2763,8 +3248,8 @@
  .PHONY: am__doit
  END
  # If we don't find an include directive, just comment out the code.
@@ -3650,7 +3656,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  am__include="#"
  am__quote=
  _am_result=none
-@@ -2791,15 +3276,15 @@ if test "$am__include" = "#"; then
+@@ -2791,15 +3276,15 @@
  fi
  
  
@@ -3671,7 +3677,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "x$enable_dependency_tracking" != xno; then
    am_depcomp="$ac_aux_dir/depcomp"
    AMDEPBACKSLASH='\'
-@@ -2836,7 +3321,7 @@ fi
+@@ -2836,7 +3321,7 @@
  
  # Define the identity of the package.
   PACKAGE=bfd
@@ -3680,7 +3686,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  
  
  cat >>confdefs.h <<_ACEOF
-@@ -2874,8 +3359,8 @@ if test "$cross_compiling" != no; then
+@@ -2874,8 +3359,8 @@
    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.
  set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -3691,7 +3697,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_prog_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2888,32 +3373,34 @@ do
+@@ -2888,32 +3373,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3733,7 +3739,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2926,27 +3413,41 @@ do
+@@ -2926,27 +3413,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3782,7 +3788,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  else
    STRIP="$ac_cv_prog_STRIP"
  fi
-@@ -2967,8 +3468,8 @@ am__tar='${AMTAR} chof - "$$tardir"'; am
+@@ -2967,8 +3468,8 @@
  
  depcc="$CC"   am_compiler_list=
  
@@ -3793,7 +3799,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3057,8 +3558,8 @@ else
+@@ -3057,8 +3558,8 @@
  fi
  
  fi
@@ -3804,7 +3810,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
  
  
-@@ -3079,8 +3580,8 @@ fi
+@@ -3079,8 +3580,8 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
  set dummy ${ac_tool_prefix}ar; ac_word=$2
@@ -3815,7 +3821,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_prog_AR+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3093,32 +3594,34 @@ do
+@@ -3093,32 +3594,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3857,7 +3863,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3131,26 +3634,41 @@ do
+@@ -3131,26 +3634,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3905,7 +3911,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  else
    AR="$ac_cv_prog_AR"
  fi
-@@ -3158,8 +3676,8 @@ fi
+@@ -3158,8 +3676,8 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
  set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -3916,7 +3922,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_prog_RANLIB+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3172,32 +3690,34 @@ do
+@@ -3172,32 +3690,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3958,7 +3964,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3210,36 +3730,49 @@ do
+@@ -3210,36 +3730,49 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4018,7 +4024,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  case $enableval in
  yes) enable_shared=yes ;;
  no) enable_shared=no ;;
-@@ -3257,12 +3790,12 @@ no) enable_shared=no ;;
+@@ -3257,12 +3790,12 @@
  esac
  else
    enable_shared=no
@@ -4035,7 +4041,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  case $enableval in
  yes) enable_static=yes ;;
  no) enable_static=no ;;
-@@ -3280,11 +3813,11 @@ no) enable_static=no ;;
+@@ -3280,11 +3813,11 @@
  esac
  else
    enable_static=yes
@@ -4051,7 +4057,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  case $enableval in
  yes) enable_fast_install=yes ;;
  no) enable_fast_install=no ;;
-@@ -3302,20 +3835,21 @@ no) enable_fast_install=no ;;
+@@ -3302,20 +3835,21 @@
  esac
  else
    enable_fast_install=yes
@@ -4080,7 +4086,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    case $host in
    *-*-mingw*)
      # gcc leaves a trailing carriage return which upsets mingw
-@@ -3344,11 +3878,11 @@ echo $ECHO_N "checking for ld used by GC
+@@ -3344,11 +3878,11 @@
      ;;
    esac
  elif test "$with_gnu_ld" = yes; then
@@ -4096,7 +4102,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  fi
  if test "${lt_cv_path_LD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3377,17 +3911,17 @@ fi
+@@ -3377,17 +3911,17 @@
  
  LD="$lt_cv_path_LD"
  if test -n "$LD"; then
@@ -4120,7 +4126,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${lt_cv_prog_gnu_ld+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3398,25 +3932,25 @@ else
+@@ -3398,25 +3932,25 @@
    lt_cv_prog_gnu_ld=no
  fi
  fi
@@ -4154,7 +4160,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${lt_cv_path_NM+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3451,22 +3985,22 @@ fi
+@@ -3451,22 +3985,22 @@
  fi
  
  NM="$lt_cv_path_NM"
@@ -4187,7 +4193,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${lt_cv_deplibs_check_method+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3628,8 +4162,8 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+@@ -3628,8 +4162,8 @@
  esac
  
  fi
@@ -4198,7 +4204,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  file_magic_cmd=$lt_cv_file_magic_cmd
  deplibs_check_method=$lt_cv_deplibs_check_method
  
-@@ -3639,8 +4173,8 @@ deplibs_check_method=$lt_cv_deplibs_chec
+@@ -3639,8 +4173,8 @@
  # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
  
  # find the maximum length of command line arguments
@@ -4209,7 +4215,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${lt_cv_sys_max_cmd_len+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3691,11 +4225,11 @@ else
+@@ -3691,11 +4225,11 @@
  fi
  
  if test -n "$lt_cv_sys_max_cmd_len" ; then
@@ -4225,7 +4231,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  fi
  
  
-@@ -3703,8 +4237,8 @@ fi
+@@ -3703,8 +4237,8 @@
  case $deplibs_check_method in
  file_magic*)
    if test "$file_magic_cmd" = '$MAGIC_CMD'; then
@@ -4236,7 +4242,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3758,17 +4292,17 @@ fi
+@@ -3758,17 +4292,17 @@
  
  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  if test -n "$MAGIC_CMD"; then
@@ -4260,7 +4266,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3822,11 +4356,11 @@ fi
+@@ -3822,11 +4356,11 @@
  
  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  if test -n "$MAGIC_CMD"; then
@@ -4276,7 +4282,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  fi
  
    else
-@@ -3841,8 +4375,8 @@ esac
+@@ -3841,8 +4375,8 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
  set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -4287,7 +4293,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_prog_RANLIB+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3855,32 +4389,34 @@ do
+@@ -3855,32 +4389,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4329,7 +4335,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3893,27 +4429,41 @@ do
+@@ -3893,27 +4429,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4378,7 +4384,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  else
    RANLIB="$ac_cv_prog_RANLIB"
  fi
-@@ -3921,8 +4471,8 @@ fi
+@@ -3921,8 +4471,8 @@
  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.
  set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -4389,7 +4395,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_prog_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3935,32 +4485,34 @@ do
+@@ -3935,32 +4485,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4431,7 +4437,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3973,27 +4525,41 @@ do
+@@ -3973,27 +4525,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4480,7 +4486,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  else
    STRIP="$ac_cv_prog_STRIP"
  fi
-@@ -4008,22 +4574,22 @@ test "$GCC" = yes && libtool_flags="$lib
+@@ -4008,22 +4574,22 @@
  test "$lt_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
  
  
@@ -4510,7 +4516,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  test x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic"
  test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
  
-@@ -4032,7 +4598,7 @@ test x"$pic_mode" = xno && libtool_flags
+@@ -4032,7 +4598,7 @@
  case $host in
  *-*-irix6*)
    # Find out which ABI we are using.
@@ -4519,7 +4525,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-@@ -4137,13 +4703,12 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*li
+@@ -4137,13 +4703,12 @@
    # On SCO OpenServer 5, we need -belf to get full-featured binaries.
    SAVE_CFLAGS="$CFLAGS"
    CFLAGS="$CFLAGS -belf"
@@ -4535,7 +4541,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
       ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4166,35 +4731,32 @@ main ()
+@@ -4166,35 +4731,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -4586,7 +4592,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
        conftest$ac_exeext conftest.$ac_ext
       ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -4203,8 +4765,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
+@@ -4203,8 +4765,8 @@
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  fi
@@ -4597,7 +4603,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    if test x"$lt_cv_cc_needs_belf" != x"yes"; then
      # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
      CFLAGS="$SAVE_CFLAGS"
-@@ -4234,39 +4796,58 @@ _ACEOF
+@@ -4234,39 +4796,58 @@
  
  # The following way of writing the cache mishandles newlines in values,
  # but we know of no workaround that is simple, portable, and efficient.
@@ -4672,7 +4678,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    fi
  fi
  rm -f confcache
-@@ -4292,8 +4873,8 @@ if test -r "$cache_file"; then
+@@ -4292,8 +4873,8 @@
      { echo "$as_me:$LINENO: loading cache $cache_file" >&5
  echo "$as_me: loading cache $cache_file" >&6;}
      case $cache_file in
@@ -4683,7 +4689,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
      esac
    fi
  else
-@@ -4319,10 +4900,9 @@ exec 5>>./config.log
+@@ -4319,10 +4900,9 @@
  
  
  
@@ -4696,7 +4702,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    yes)  want64=true  ;;
    no)   want64=false ;;
    *)    { { echo "$as_me:$LINENO: error: bad value ${enableval} for 64-bit-bfd option" >&5
-@@ -4331,10 +4911,10 @@ echo "$as_me: error: bad value ${enablev
+@@ -4331,10 +4911,10 @@
  esac
  else
    want64=false
@@ -4710,7 +4716,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    yes | "") { { echo "$as_me:$LINENO: error: enable-targets option must specify target names or 'all'" >&5
  echo "$as_me: error: enable-targets option must specify target names or 'all'" >&2;}
     { (exit 1); exit 1; }; }
-@@ -4342,21 +4922,21 @@ echo "$as_me: error: enable-targets opti
+@@ -4342,21 +4922,21 @@
    no)       enable_targets= ;;
    *)        enable_targets=$enableval ;;
  esac
@@ -4739,7 +4745,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    yes)  want_mmap=true ;;
    no)   want_mmap=false ;;
    *)    { { echo "$as_me:$LINENO: error: bad value ${withval} for BFD with-mmap option" >&5
-@@ -4365,11 +4945,11 @@ echo "$as_me: error: bad value ${withval
+@@ -4365,11 +4945,11 @@
  esac
  else
    want_mmap=false
@@ -4755,7 +4761,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    yes)  use_secureplt=true  ;;
    no)   use_secureplt=false ;;
    *)    { { echo "$as_me:$LINENO: error: bad value ${enableval} for secureplt option" >&5
-@@ -4378,7 +4958,8 @@ echo "$as_me: error: bad value ${enablev
+@@ -4378,7 +4958,8 @@
  esac
  else
    use_secureplt=false
@@ -4765,7 +4771,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define USE_SECUREPLT 1
-@@ -4389,17 +4970,17 @@ fi
+@@ -4389,17 +4970,17 @@
  
  GCC_WARN_CFLAGS="-W -Wall -Wstrict-prototypes -Wmissing-prototypes"
  
@@ -4787,7 +4793,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  
  # Enable -Werror by default when using gcc
  if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
-@@ -4416,10 +4997,9 @@ if test "${GCC}" = yes ; then
+@@ -4416,10 +4997,9 @@
    WARN_CFLAGS="${GCC_WARN_CFLAGS}"
  fi
  
@@ -4800,7 +4806,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    yes)	WARN_CFLAGS="${GCC_WARN_CFLAGS}";;
    no)	if test "${GCC}" = yes ; then
  	  WARN_CFLAGS="-w"
-@@ -4430,7 +5010,8 @@ if test "${enable_build_warnings+set}" =
+@@ -4430,7 +5010,8 @@
          WARN_CFLAGS="${t} ${GCC_WARN_CFLAGS}";;
    *)    WARN_CFLAGS=`echo "${enableval}" | sed -e "s/,/ /g"`;;
  esac
@@ -4810,7 +4816,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  
  if test x"$silent" != x"yes" && test x"$WARN_CFLAGS" != x""; then
    echo "Setting warning flags = $WARN_CFLAGS" 6>&1
-@@ -4440,7 +5021,7 @@ fi
+@@ -4440,7 +5021,7 @@
  
  
  
@@ -4819,7 +4825,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  
  
  if test -z "$target" ; then
-@@ -4449,17 +5030,17 @@ echo "$as_me: error: Unrecognized target
+@@ -4449,17 +5030,17 @@
     { (exit 1); exit 1; }; }
  fi
  
@@ -4845,7 +4851,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  
  
  if test $USE_MAINTAINER_MODE = yes; then
-@@ -4488,21 +5069,21 @@ esac
+@@ -4488,21 +5069,21 @@
    *) target_noncanonical=${target_alias} ;;
  esac
  
@@ -4875,7 +4881,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  
  
  if test $install_libbfd_p = yes; then
-@@ -4545,8 +5126,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -4545,8 +5126,8 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
  set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -4886,7 +4892,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4559,32 +5140,34 @@ do
+@@ -4559,32 +5140,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4928,7 +4934,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4597,36 +5180,51 @@ do
+@@ -4597,36 +5180,51 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4990,7 +4996,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4639,74 +5237,34 @@ do
+@@ -4639,74 +5237,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -5074,7 +5080,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4720,7 +5278,7 @@ do
+@@ -4720,7 +5278,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -5083,7 +5089,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
      if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
         ac_prog_rejected=yes
         continue
-@@ -4731,6 +5289,7 @@ do
+@@ -4731,6 +5289,7 @@
    fi
  done
  done
@@ -5091,7 +5097,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  
  if test $ac_prog_rejected = yes; then
    # We found a bogon in the path, so make sure we never use it.
-@@ -4748,22 +5307,23 @@ fi
+@@ -4748,22 +5307,23 @@
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
@@ -5122,7 +5128,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4776,36 +5336,38 @@ do
+@@ -4776,36 +5336,38 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -5169,7 +5175,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4818,29 +5380,45 @@ do
+@@ -4818,29 +5380,45 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -5221,7 +5227,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  fi
  
  fi
-@@ -4853,27 +5431,41 @@ See \`config.log' for more details." >&2
+@@ -4853,27 +5431,41 @@
     { (exit 1); exit 1; }; }
  
  # Provide some information about the compiler.
@@ -5273,7 +5279,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_c_compiler_gnu+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4896,50 +5488,49 @@ main ()
+@@ -4896,50 +5488,49 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -5347,7 +5353,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -4955,46 +5546,126 @@ main ()
+@@ -4955,46 +5546,126 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -5504,7 +5510,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  else
    if test "$GCC" = yes; then
      CFLAGS="-O2"
-@@ -5002,12 +5673,12 @@ else
+@@ -5002,12 +5673,12 @@
      CFLAGS=
    fi
  fi
@@ -5521,7 +5527,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  ac_save_CC=$CC
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -5041,12 +5712,17 @@ static char *f (char * (*g) (char **, in
+@@ -5041,12 +5712,17 @@
  /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
     function prototypes and stuff, but not '\xHH' hex character constants.
     These don't provoke an error unfortunately, instead are silently treated
@@ -5541,7 +5547,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  int test (int i, double x);
  struct s1 {int (*f) (int a);};
  struct s2 {int (*f) (double a);};
-@@ -5061,205 +5737,57 @@ return f (e, argv, 0) != argv[0]  ||  f 
+@@ -5061,205 +5737,57 @@
    return 0;
  }
  _ACEOF
@@ -5777,7 +5783,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -5277,8 +5805,8 @@ ALL_LINGUAS="fr tr ja es sv da zh_CN ro 
+@@ -5277,8 +5805,8 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
  set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -5788,7 +5794,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_prog_RANLIB+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5291,32 +5819,34 @@ do
+@@ -5291,32 +5819,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -5830,7 +5836,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5329,27 +5859,41 @@ do
+@@ -5329,27 +5859,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -5879,7 +5885,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  else
    RANLIB="$ac_cv_prog_RANLIB"
  fi
-@@ -5359,8 +5903,8 @@ ac_cpp='$CPP $CPPFLAGS'
+@@ -5359,8 +5903,8 @@
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -5890,7 +5896,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  # On Suns, sometimes $CPP names a directory.
  if test -n "$CPP" && test -d "$CPP"; then
    CPP=
-@@ -5394,24 +5938,22 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -5394,24 +5938,22 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -5926,7 +5932,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    :
  else
    echo "$as_me: failed program was:" >&5
-@@ -5420,9 +5962,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -5420,9 +5962,10 @@
    # Broken: fails on valid input.
  continue
  fi
@@ -5938,7 +5944,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -5432,24 +5975,22 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -5432,24 +5975,22 @@
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
@@ -5974,7 +5980,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    # Broken: success on invalid input.
  continue
  else
-@@ -5460,6 +6001,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -5460,6 +6001,7 @@
  ac_preproc_ok=:
  break
  fi
@@ -5982,7 +5988,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -5477,8 +6019,8 @@ fi
+@@ -5477,8 +6019,8 @@
  else
    ac_cv_prog_CPP=$CPP
  fi
@@ -5993,7 +5999,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  ac_preproc_ok=false
  for ac_c_preproc_warn_flag in '' yes
  do
-@@ -5501,24 +6043,22 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -5501,24 +6043,22 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -6029,7 +6035,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    :
  else
    echo "$as_me: failed program was:" >&5
-@@ -5527,9 +6067,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -5527,9 +6067,10 @@
    # Broken: fails on valid input.
  continue
  fi
@@ -6041,7 +6047,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -5539,24 +6080,22 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -5539,24 +6080,22 @@
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
@@ -6077,7 +6083,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    # Broken: success on invalid input.
  continue
  else
-@@ -5567,6 +6106,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -5567,6 +6106,7 @@
  ac_preproc_ok=:
  break
  fi
@@ -6085,7 +6091,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -5589,87 +6129,230 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
+@@ -5589,87 +6129,230 @@
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
@@ -6386,7 +6392,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
    $EGREP "memchr" >/dev/null 2>&1; then
    :
-@@ -5713,6 +6396,7 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -5713,6 +6396,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <ctype.h>
@@ -6394,7 +6400,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  #if ((' ' & 0x0FF) == 0x020)
  # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
  # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -5732,18 +6416,27 @@ main ()
+@@ -5732,18 +6416,27 @@
    for (i = 0; i < 256; i++)
      if (XOR (islower (i), ISLOWER (i))
  	|| toupper (i) != TOUPPER (i))
@@ -6428,7 +6434,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5756,12 +6449,14 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -5756,12 +6449,14 @@
  ( exit $ac_status )
  ac_cv_header_stdc=no
  fi
@@ -6446,7 +6452,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test $ac_cv_header_stdc = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -5770,8 +6465,8 @@ _ACEOF
+@@ -5770,8 +6465,8 @@
  
  fi
  
@@ -6457,7 +6463,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_c_const+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5789,10 +6484,10 @@ main ()
+@@ -5789,10 +6484,10 @@
  #ifndef __cplusplus
    /* Ultrix mips cc rejects this.  */
    typedef int charset[2];
@@ -6471,7 +6477,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    /* NEC SVR4.0.2 mips cc rejects this.  */
    struct point {int x, y;};
    static struct point const zero = {0,0};
-@@ -5801,16 +6496,17 @@ main ()
+@@ -5801,16 +6496,17 @@
       an arm of an if-expression whose if-part is not a constant
       expression */
    const char *g = "string";
@@ -6493,7 +6499,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    }
    { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
      int x[] = {25, 17};
-@@ -5829,7 +6525,9 @@ main ()
+@@ -5829,7 +6525,9 @@
    }
    { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
      const int foo = 10;
@@ -6503,7 +6509,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  #endif
  
    ;
-@@ -5837,38 +6535,34 @@ main ()
+@@ -5837,38 +6535,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -6558,7 +6564,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test $ac_cv_c_const = no; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -5877,8 +6571,8 @@ _ACEOF
+@@ -5877,8 +6571,8 @@
  
  fi
  
@@ -6569,7 +6575,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_c_inline+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5898,39 +6592,37 @@ $ac_kw foo_t foo () {return 0; }
+@@ -5898,39 +6592,37 @@
  
  _ACEOF
  rm -f conftest.$ac_objext
@@ -6627,7 +6633,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  
  
  case $ac_cv_c_inline in
-@@ -5962,9 +6654,9 @@ for ac_header in sys/types.h sys/stat.h 
+@@ -5962,9 +6654,9 @@
  		  inttypes.h stdint.h unistd.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -6640,7 +6646,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -5978,38 +6670,35 @@ $ac_includes_default
+@@ -5978,38 +6670,35 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -6696,7 +6702,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -6020,8 +6709,8 @@ fi
+@@ -6020,8 +6709,8 @@
  done
  
  
@@ -6707,7 +6713,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_type_off_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6032,62 +6721,59 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -6032,62 +6721,59 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -6792,7 +6798,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_type_size_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6098,64 +6784,61 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -6098,64 +6784,61 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -6879,7 +6885,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_working_alloca_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6170,44 +6853,42 @@ int
+@@ -6170,44 +6853,42 @@
  main ()
  {
  char *p = (char *) alloca (2 * sizeof (int));
@@ -6942,7 +6948,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test $ac_cv_working_alloca_h = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -6216,8 +6897,8 @@ _ACEOF
+@@ -6216,8 +6897,8 @@
  
  fi
  
@@ -6953,7 +6959,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_func_alloca_works+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6234,7 +6915,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -6234,7 +6915,7 @@
  #  include <malloc.h>
  #  define alloca _alloca
  # else
@@ -6962,7 +6968,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  #   include <alloca.h>
  #  else
  #   ifdef _AIX
-@@ -6252,44 +6933,42 @@ int
+@@ -6252,44 +6933,42 @@
  main ()
  {
  char *p = (char *) alloca (1);
@@ -7025,7 +7031,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  
  if test $ac_cv_func_alloca_works = yes; then
  
-@@ -6303,15 +6982,15 @@ else
+@@ -6303,15 +6982,15 @@
  # contain a buggy version.  If you still want to use their alloca,
  # use ar to extract alloca.o from them instead of compiling alloca.c.
  
@@ -7044,7 +7050,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_os_cray+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6321,7 +7000,7 @@ _ACEOF
+@@ -6321,7 +7000,7 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -7053,7 +7059,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  webecray
  #else
  wenotbecray
-@@ -6337,14 +7016,14 @@ fi
+@@ -6337,14 +7016,14 @@
  rm -f conftest*
  
  fi
@@ -7073,7 +7079,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -6370,68 +7049,60 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -6370,68 +7049,60 @@
  
  #undef $ac_func
  
@@ -7165,7 +7171,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test `eval echo '${'$as_ac_var'}'` = yes; then
  
  cat >>confdefs.h <<_ACEOF
-@@ -6444,8 +7115,8 @@ fi
+@@ -6444,8 +7115,8 @@
    done
  fi
  
@@ -7176,7 +7182,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_c_stack_direction+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6458,6 +7129,7 @@ _ACEOF
+@@ -6458,6 +7129,7 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -7184,7 +7190,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  int
  find_stack_direction ()
  {
-@@ -6475,17 +7147,26 @@ find_stack_direction ()
+@@ -6475,17 +7147,26 @@
  int
  main ()
  {
@@ -7216,7 +7222,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -6498,11 +7179,13 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -6498,11 +7179,13 @@
  ( exit $ac_status )
  ac_cv_c_stack_direction=-1
  fi
@@ -7233,7 +7239,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  
  cat >>confdefs.h <<_ACEOF
  #define STACK_DIRECTION $ac_cv_c_stack_direction
-@@ -6516,18 +7199,19 @@ fi
+@@ -6516,18 +7199,19 @@
  for ac_header in stdlib.h unistd.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -7261,7 +7267,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -6538,41 +7222,37 @@ $ac_includes_default
+@@ -6538,41 +7222,37 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -7321,7 +7327,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -6581,24 +7261,22 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -6581,24 +7261,22 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -7357,7 +7363,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    ac_header_preproc=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -6606,9 +7284,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -6606,9 +7284,10 @@
  
    ac_header_preproc=no
  fi
@@ -7370,7 +7376,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -6632,25 +7311,19 @@ echo "$as_me: WARNING: $ac_header:     s
+@@ -6632,25 +7311,19 @@
  echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -7403,7 +7409,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -6666,9 +7339,9 @@ done
+@@ -6666,9 +7339,9 @@
  for ac_func in getpagesize
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -7416,7 +7422,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -6694,68 +7367,60 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -6694,68 +7367,60 @@
  
  #undef $ac_func
  
@@ -7508,7 +7514,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -6764,8 +7429,8 @@ _ACEOF
+@@ -6764,8 +7429,8 @@
  fi
  done
  
@@ -7519,7 +7525,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6807,21 +7472,21 @@ $ac_includes_default
+@@ -6807,21 +7472,21 @@
  #include <fcntl.h>
  #include <sys/mman.h>
  
@@ -7545,7 +7551,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  #   include <sys/param.h>
  #   ifdef EXEC_PAGESIZE
  #    define getpagesize() EXEC_PAGESIZE
-@@ -6860,15 +7525,15 @@ main ()
+@@ -6860,15 +7525,15 @@
    /* First, make a file with some known garbage in it. */
    data = (char *) malloc (pagesize);
    if (!data)
@@ -7564,7 +7570,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    close (fd);
  
    /* Next, try to mmap the file at a fixed address which already has
-@@ -6876,17 +7541,17 @@ main ()
+@@ -6876,17 +7541,17 @@
       we see the same garbage.  */
    fd = open ("conftest.mmap", O_RDWR);
    if (fd < 0)
@@ -7587,7 +7593,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  
    /* Finally, make sure that changes to the mapped area do not
       percolate back to the file as seen by read().  (This is a bug on
-@@ -6895,24 +7560,33 @@ main ()
+@@ -6895,24 +7560,33 @@
      *(data2 + i) = *(data2 + i) + 1;
    data3 = (char *) malloc (pagesize);
    if (!data3)
@@ -7629,7 +7635,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -6925,11 +7599,13 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -6925,11 +7599,13 @@
  ( exit $ac_status )
  ac_cv_func_mmap_fixed_mapped=no
  fi
@@ -7646,7 +7652,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test $ac_cv_func_mmap_fixed_mapped = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -6953,18 +7629,19 @@ for ac_header in argz.h limits.h locale.
+@@ -6953,18 +7629,19 @@
  unistd.h values.h sys/param.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -7674,7 +7680,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -6975,41 +7652,37 @@ $ac_includes_default
+@@ -6975,41 +7652,37 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -7734,7 +7740,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -7018,24 +7691,22 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -7018,24 +7691,22 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -7770,7 +7776,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    ac_header_preproc=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -7043,9 +7714,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -7043,9 +7714,10 @@
  
    ac_header_preproc=no
  fi
@@ -7783,7 +7789,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -7069,25 +7741,19 @@ echo "$as_me: WARNING: $ac_header:     s
+@@ -7069,25 +7741,19 @@
  echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -7816,7 +7822,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -7113,9 +7779,9 @@ for ac_func in getcwd munmap putenv sete
+@@ -7113,9 +7779,9 @@
  __argz_count __argz_stringify __argz_next
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -7829,7 +7835,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -7141,68 +7807,60 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -7141,68 +7807,60 @@
  
  #undef $ac_func
  
@@ -7921,7 +7927,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -7217,9 +7875,9 @@ done
+@@ -7217,9 +7875,9 @@
  for ac_func in stpcpy
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -7934,7 +7940,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -7245,68 +7903,60 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -7245,68 +7903,60 @@
  
  #undef $ac_func
  
@@ -8026,7 +8032,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -7325,8 +7975,8 @@ _ACEOF
+@@ -7325,8 +7975,8 @@
     fi
  
     if test $ac_cv_header_locale_h = yes; then
@@ -8037,7 +8043,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${am_cv_val_LC_MESSAGES+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7346,39 +7996,36 @@ return LC_MESSAGES
+@@ -7346,39 +7996,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -8094,7 +8100,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
      if test $am_cv_val_LC_MESSAGES = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -7387,34 +8034,34 @@ _ACEOF
+@@ -7387,34 +8034,34 @@
  
      fi
    fi
@@ -8145,7 +8151,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  
        nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
        if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
-@@ -7423,17 +8070,17 @@ echo "${ECHO_T}$nls_cv_force_use_gnu_get
+@@ -7423,17 +8070,17 @@
  	CATOBJEXT=
  
  	if test "${ac_cv_header_libintl_h+set}" = set; then
@@ -8169,7 +8175,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -7444,41 +8091,37 @@ $ac_includes_default
+@@ -7444,41 +8091,37 @@
  #include <libintl.h>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -8229,7 +8235,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -7487,24 +8130,22 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -7487,24 +8130,22 @@
  /* end confdefs.h.  */
  #include <libintl.h>
  _ACEOF
@@ -8265,7 +8271,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    ac_header_preproc=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -7512,9 +8153,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -7512,9 +8153,10 @@
  
    ac_header_preproc=no
  fi
@@ -8278,7 +8284,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -7538,30 +8180,23 @@ echo "$as_me: WARNING: libintl.h:     se
+@@ -7538,30 +8180,23 @@
  echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;}
@@ -8316,7 +8322,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${gt_cv_func_gettext_libc+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7581,43 +8216,40 @@ return (int) gettext ("")
+@@ -7581,43 +8216,40 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -8379,7 +8385,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7630,59 +8262,56 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -7630,59 +8262,56 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -8462,7 +8468,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${gt_cv_func_gettext_libintl+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7702,39 +8331,36 @@ return (int) gettext ("")
+@@ -7702,39 +8331,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -8519,7 +8525,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  fi
  
  	   fi
-@@ -7748,8 +8374,8 @@ _ACEOF
+@@ -7748,8 +8374,8 @@
  
  	      # Extract the first word of "msgfmt", so it can be a program name with args.
  set dummy msgfmt; ac_word=$2
@@ -8530,7 +8536,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_path_MSGFMT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7775,20 +8401,20 @@ esac
+@@ -7775,20 +8401,20 @@
  fi
  MSGFMT="$ac_cv_path_MSGFMT"
  if test -n "$MSGFMT"; then
@@ -8558,7 +8564,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -7814,68 +8440,60 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -7814,68 +8440,60 @@
  
  #undef $ac_func
  
@@ -8650,7 +8656,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -7886,8 +8504,8 @@ done
+@@ -7886,8 +8504,8 @@
  
  		# Extract the first word of "gmsgfmt", so it can be a program name with args.
  set dummy gmsgfmt; ac_word=$2
@@ -8661,7 +8667,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_path_GMSGFMT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7902,32 +8520,33 @@ do
+@@ -7902,32 +8520,33 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8703,7 +8709,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_path_XGETTEXT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7953,11 +8572,11 @@ esac
+@@ -7953,11 +8572,11 @@
  fi
  XGETTEXT="$ac_cv_path_XGETTEXT"
  if test -n "$XGETTEXT"; then
@@ -8719,7 +8725,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  fi
  
  		cat >conftest.$ac_ext <<_ACEOF
-@@ -7977,37 +8596,34 @@ extern int _nl_msg_cat_cntr;
+@@ -7977,37 +8596,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -8772,7 +8778,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
        conftest$ac_exeext conftest.$ac_ext
  		INSTOBJEXT=.mo
  	      fi
-@@ -8029,8 +8645,8 @@ fi
+@@ -8029,8 +8645,8 @@
                  INTLOBJS="\$(GETTOBJS)"
          # Extract the first word of "msgfmt", so it can be a program name with args.
  set dummy msgfmt; ac_word=$2
@@ -8783,7 +8789,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_path_MSGFMT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8056,17 +8672,17 @@ esac
+@@ -8056,17 +8672,17 @@
  fi
  MSGFMT="$ac_cv_path_MSGFMT"
  if test -n "$MSGFMT"; then
@@ -8807,7 +8813,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_path_GMSGFMT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8081,32 +8697,33 @@ do
+@@ -8081,32 +8697,33 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8849,7 +8855,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_path_XGETTEXT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8132,11 +8749,11 @@ esac
+@@ -8132,11 +8749,11 @@
  fi
  XGETTEXT="$ac_cv_path_XGETTEXT"
  if test -n "$XGETTEXT"; then
@@ -8865,7 +8871,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  fi
  
  
-@@ -8155,8 +8772,8 @@ fi
+@@ -8155,8 +8772,8 @@
  			if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
  	  : ;
  	else
@@ -8876,7 +8882,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  	  XGETTEXT=":"
  	fi
        fi
-@@ -8205,8 +8822,8 @@ _ACEOF
+@@ -8205,8 +8822,8 @@
       if test "x$ALL_LINGUAS" = "x"; then
         LINGUAS=
       else
@@ -8887,7 +8893,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
         NEW_LINGUAS=
         for lang in ${LINGUAS=$ALL_LINGUAS}; do
           case "$ALL_LINGUAS" in
-@@ -8214,8 +8831,8 @@ echo $ECHO_N "checking for catalogs to b
+@@ -8214,8 +8831,8 @@
           esac
         done
         LINGUAS=$NEW_LINGUAS
@@ -8898,7 +8904,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
       fi
  
            if test -n "$LINGUAS"; then
-@@ -8234,17 +8851,17 @@ echo "${ECHO_T}$LINGUAS" >&6
+@@ -8234,17 +8851,17 @@
              if test -f $srcdir/po2tbl.sed.in; then
        if test "$CATOBJEXT" = ".cat"; then
  	 if test "${ac_cv_header_linux_version_h+set}" = set; then
@@ -8922,7 +8928,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8255,41 +8872,37 @@ $ac_includes_default
+@@ -8255,41 +8872,37 @@
  #include <linux/version.h>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -8982,7 +8988,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8298,24 +8911,22 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -8298,24 +8911,22 @@
  /* end confdefs.h.  */
  #include <linux/version.h>
  _ACEOF
@@ -9018,7 +9024,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    ac_header_preproc=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -8323,9 +8934,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -8323,9 +8934,10 @@
  
    ac_header_preproc=no
  fi
@@ -9031,7 +9037,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -8349,25 +8961,18 @@ echo "$as_me: WARNING: linux/version.h: 
+@@ -8349,25 +8961,18 @@
  echo "$as_me: WARNING: linux/version.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: linux/version.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: linux/version.h: in the future, the compiler will take precedence" >&2;}
@@ -9062,7 +9068,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  
  fi
  if test $ac_cv_header_linux_version_h = yes; then
-@@ -8434,8 +9039,8 @@ fi
+@@ -8434,8 +9039,8 @@
  # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
  # OS/2's system install, which has a completely different semantic
  # ./install, which can be erroneously created by make from ./install.sh.
@@ -9073,7 +9079,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test -z "$INSTALL"; then
  if test "${ac_cv_path_install+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -8457,7 +9062,7 @@ case $as_dir/ in
+@@ -8457,7 +9062,7 @@
      # by default.
      for ac_prog in ginstall scoinst install; do
        for ac_exec_ext in '' $ac_executable_extensions; do
@@ -9082,7 +9088,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  	  if test $ac_prog = install &&
  	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
  	    # AIX install.  It has an incompatible calling convention.
-@@ -8476,21 +9081,22 @@ case $as_dir/ in
+@@ -8476,21 +9081,22 @@
      ;;
  esac
  done
@@ -9110,7 +9116,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  
  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
  # It thinks the first close brace ends the variable substitution.
-@@ -8507,8 +9113,8 @@ BFD_HOST_64_BIT_DEFINED=0
+@@ -8507,8 +9113,8 @@
  BFD_HOST_64_BIT=
  BFD_HOST_U_64_BIT=
  
@@ -9121,7 +9127,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${bfd_cv_has_long_long+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8528,43 +9134,39 @@ unsigned long long ll = 1844674407370955
+@@ -8528,43 +9134,39 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -9183,7 +9189,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_type_long_long+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8575,61 +9177,57 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -8575,61 +9177,57 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -9270,7 +9276,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
  cat >conftest.$ac_ext <<_ACEOF
-@@ -8639,10 +9237,11 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -8639,10 +9237,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -9283,7 +9289,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  test_array [0] = 0
  
    ;
-@@ -8650,27 +9249,22 @@ test_array [0] = 0
+@@ -8650,27 +9249,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -9322,7 +9328,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    ac_lo=0 ac_mid=0
    while :; do
      cat >conftest.$ac_ext <<_ACEOF
-@@ -8680,10 +9274,11 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -8680,10 +9274,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -9335,7 +9341,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  test_array [0] = 0
  
    ;
-@@ -8691,56 +9286,53 @@ test_array [0] = 0
+@@ -8691,56 +9286,53 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -9414,7 +9420,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  test_array [0] = 0
  
    ;
-@@ -8748,27 +9340,22 @@ test_array [0] = 0
+@@ -8748,27 +9340,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -9453,7 +9459,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    ac_hi=-1 ac_mid=-1
    while :; do
      cat >conftest.$ac_ext <<_ACEOF
-@@ -8778,10 +9365,11 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -8778,10 +9365,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -9466,7 +9472,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  test_array [0] = 0
  
    ;
-@@ -8789,50 +9377,48 @@ test_array [0] = 0
+@@ -8789,50 +9377,48 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -9541,7 +9547,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
    ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -8843,10 +9429,11 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -8843,10 +9429,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -9554,7 +9560,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  test_array [0] = 0
  
    ;
-@@ -8854,52 +9441,45 @@ test_array [0] = 0
+@@ -8854,52 +9441,45 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -9628,7 +9634,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8907,8 +9487,9 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -8907,8 +9487,9 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -9640,7 +9646,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -8917,35 +9498,44 @@ main ()
+@@ -8917,35 +9498,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -9698,7 +9704,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -8956,22 +9546,25 @@ echo "$as_me: failed program was:" >&5
+@@ -8956,22 +9546,25 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  ( exit $ac_status )
@@ -9734,7 +9740,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
  _ACEOF
-@@ -8979,8 +9572,8 @@ _ACEOF
+@@ -8979,8 +9572,8 @@
  
  fi
  
@@ -9745,7 +9751,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_type_long+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8991,61 +9584,57 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -8991,61 +9584,57 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -9832,7 +9838,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
  cat >conftest.$ac_ext <<_ACEOF
-@@ -9055,10 +9644,11 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -9055,10 +9644,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -9845,7 +9851,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  test_array [0] = 0
  
    ;
-@@ -9066,27 +9656,22 @@ test_array [0] = 0
+@@ -9066,27 +9656,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -9884,7 +9890,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    ac_lo=0 ac_mid=0
    while :; do
      cat >conftest.$ac_ext <<_ACEOF
-@@ -9096,10 +9681,11 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -9096,10 +9681,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -9897,7 +9903,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  test_array [0] = 0
  
    ;
-@@ -9107,56 +9693,53 @@ test_array [0] = 0
+@@ -9107,56 +9693,53 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -9976,7 +9982,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  test_array [0] = 0
  
    ;
-@@ -9164,27 +9747,22 @@ test_array [0] = 0
+@@ -9164,27 +9747,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -10015,7 +10021,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    ac_hi=-1 ac_mid=-1
    while :; do
      cat >conftest.$ac_ext <<_ACEOF
-@@ -9194,10 +9772,11 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -9194,10 +9772,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -10028,7 +10034,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  test_array [0] = 0
  
    ;
-@@ -9205,50 +9784,48 @@ test_array [0] = 0
+@@ -9205,50 +9784,48 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -10103,7 +10109,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
    ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -9259,10 +9836,11 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -9259,10 +9836,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -10116,7 +10122,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  test_array [0] = 0
  
    ;
-@@ -9270,52 +9848,45 @@ test_array [0] = 0
+@@ -9270,52 +9848,45 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -10190,7 +10196,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -9323,8 +9894,9 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -9323,8 +9894,9 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -10202,7 +10208,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -9333,35 +9905,44 @@ main ()
+@@ -9333,35 +9905,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -10260,7 +10266,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -9372,22 +9953,25 @@ echo "$as_me: failed program was:" >&5
+@@ -9372,22 +9953,25 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  ( exit $ac_status )
@@ -10296,7 +10302,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_LONG $ac_cv_sizeof_long
  _ACEOF
-@@ -9428,8 +10012,8 @@ fi
+@@ -9428,8 +10012,8 @@
  if test "x$cross_compiling" = "xno"; then
    EXEEXT_FOR_BUILD='$(EXEEXT)'
  else
@@ -10307,7 +10313,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${bfd_cv_build_exeext+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9446,8 +10030,8 @@ else
+@@ -9446,8 +10030,8 @@
       rm -f conftest*
       test x"${bfd_cv_build_exeext}" = x && bfd_cv_build_exeext=no
  fi
@@ -10318,7 +10324,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    EXEEXT_FOR_BUILD=""
    test x"${bfd_cv_build_exeext}" != xno && EXEEXT_FOR_BUILD=${bfd_cv_build_exeext}
  fi
-@@ -9462,18 +10046,19 @@ fi
+@@ -9462,18 +10046,19 @@
  for ac_header in stddef.h string.h strings.h stdlib.h time.h unistd.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -10346,7 +10352,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -9484,41 +10069,37 @@ $ac_includes_default
+@@ -9484,41 +10069,37 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -10406,7 +10412,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -9527,24 +10108,22 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -9527,24 +10108,22 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -10442,7 +10448,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    ac_header_preproc=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -9552,9 +10131,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -9552,9 +10131,10 @@
  
    ac_header_preproc=no
  fi
@@ -10455,7 +10461,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -9578,25 +10158,19 @@ echo "$as_me: WARNING: $ac_header:     s
+@@ -9578,25 +10158,19 @@
  echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -10488,7 +10494,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -9614,18 +10188,19 @@ done
+@@ -9614,18 +10188,19 @@
  for ac_header in fcntl.h sys/file.h sys/time.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -10516,7 +10522,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -9636,41 +10211,37 @@ $ac_includes_default
+@@ -9636,41 +10211,37 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -10576,7 +10582,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -9679,24 +10250,22 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -9679,24 +10250,22 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -10612,7 +10618,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    ac_header_preproc=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -9704,9 +10273,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -9704,9 +10273,10 @@
  
    ac_header_preproc=no
  fi
@@ -10625,7 +10631,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -9730,25 +10300,19 @@ echo "$as_me: WARNING: $ac_header:     s
+@@ -9730,25 +10300,19 @@
  echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -10658,7 +10664,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -9760,8 +10324,8 @@ fi
+@@ -9760,8 +10324,8 @@
  
  done
  
@@ -10669,7 +10675,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_header_time+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9785,38 +10349,34 @@ return 0;
+@@ -9785,38 +10349,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -10724,7 +10730,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test $ac_cv_header_time = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -9833,9 +10393,9 @@ fi
+@@ -9833,9 +10393,9 @@
  ac_header_dirent=no
  for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
    as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
@@ -10737,7 +10743,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -9857,38 +10417,35 @@ return 0;
+@@ -9857,38 +10417,35 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -10793,7 +10799,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
-@@ -9900,13 +10457,12 @@ fi
+@@ -9900,13 +10457,12 @@
  done
  # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
  if test $ac_header_dirent = dirent.h; then
@@ -10809,7 +10815,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -9914,126 +10470,83 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -9914,126 +10470,83 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -10979,7 +10985,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -10041,122 +10554,80 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -10041,122 +10554,80 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -11145,7 +11151,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${gcc_cv_header_string+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -10177,38 +10648,34 @@ main ()
+@@ -10177,38 +10648,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -11200,7 +11206,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test $gcc_cv_header_string = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -10227,9 +10694,9 @@ fi
+@@ -10227,9 +10694,9 @@
  for ac_func in fcntl getpagesize setitimer sysconf fdopen getuid getgid
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -11213,7 +11219,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -10255,68 +10722,60 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -10255,68 +10722,60 @@
  
  #undef $ac_func
  
@@ -11305,7 +11311,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -10329,9 +10788,9 @@ done
+@@ -10329,9 +10788,9 @@
  for ac_func in strtoull
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -11318,7 +11324,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -10357,68 +10816,60 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -10357,68 +10816,60 @@
  
  #undef $ac_func
  
@@ -11410,7 +11416,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -10428,8 +10879,8 @@ fi
+@@ -10428,8 +10879,8 @@
  done
  
  
@@ -11421,7 +11427,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_have_decl_basename+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -10444,7 +10895,7 @@ int
+@@ -10444,7 +10895,7 @@
  main ()
  {
  #ifndef basename
@@ -11430,7 +11436,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  #endif
  
    ;
-@@ -10452,38 +10903,34 @@ main ()
+@@ -10452,38 +10903,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -11485,7 +11491,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test $ac_cv_have_decl_basename = yes; then
  
  cat >>confdefs.h <<_ACEOF
-@@ -10500,8 +10947,8 @@ _ACEOF
+@@ -10500,8 +10947,8 @@
  fi
  
  
@@ -11496,7 +11502,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_have_decl_ftello+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -10516,7 +10963,7 @@ int
+@@ -10516,7 +10963,7 @@
  main ()
  {
  #ifndef ftello
@@ -11505,7 +11511,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  #endif
  
    ;
-@@ -10524,38 +10971,34 @@ main ()
+@@ -10524,38 +10971,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -11560,7 +11566,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test $ac_cv_have_decl_ftello = yes; then
  
  cat >>confdefs.h <<_ACEOF
-@@ -10572,8 +11015,8 @@ _ACEOF
+@@ -10572,8 +11015,8 @@
  fi
  
  
@@ -11571,7 +11577,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_have_decl_ftello64+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -10588,7 +11031,7 @@ int
+@@ -10588,7 +11031,7 @@
  main ()
  {
  #ifndef ftello64
@@ -11580,7 +11586,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  #endif
  
    ;
-@@ -10596,38 +11039,34 @@ main ()
+@@ -10596,38 +11039,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -11635,7 +11641,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test $ac_cv_have_decl_ftello64 = yes; then
  
  cat >>confdefs.h <<_ACEOF
-@@ -10644,8 +11083,8 @@ _ACEOF
+@@ -10644,8 +11083,8 @@
  fi
  
  
@@ -11646,7 +11652,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_have_decl_fseeko+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -10660,7 +11099,7 @@ int
+@@ -10660,7 +11099,7 @@
  main ()
  {
  #ifndef fseeko
@@ -11655,7 +11661,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  #endif
  
    ;
-@@ -10668,38 +11107,34 @@ main ()
+@@ -10668,38 +11107,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -11710,7 +11716,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test $ac_cv_have_decl_fseeko = yes; then
  
  cat >>confdefs.h <<_ACEOF
-@@ -10716,8 +11151,8 @@ _ACEOF
+@@ -10716,8 +11151,8 @@
  fi
  
  
@@ -11721,7 +11727,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_have_decl_fseeko64+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -10732,7 +11167,7 @@ int
+@@ -10732,7 +11167,7 @@
  main ()
  {
  #ifndef fseeko64
@@ -11730,7 +11736,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  #endif
  
    ;
-@@ -10740,38 +11175,34 @@ main ()
+@@ -10740,38 +11175,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -11785,7 +11791,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test $ac_cv_have_decl_fseeko64 = yes; then
  
  cat >>confdefs.h <<_ACEOF
-@@ -10799,8 +11230,8 @@ _ACEOF
+@@ -10799,8 +11230,8 @@
   ;;
  esac
  
@@ -11796,7 +11802,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_have_decl_ffs+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -10815,7 +11246,7 @@ int
+@@ -10815,7 +11246,7 @@
  main ()
  {
  #ifndef ffs
@@ -11805,7 +11811,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  #endif
  
    ;
-@@ -10823,38 +11254,34 @@ main ()
+@@ -10823,38 +11254,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -11860,7 +11866,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test $ac_cv_have_decl_ffs = yes; then
  
  cat >>confdefs.h <<_ACEOF
-@@ -10871,8 +11298,8 @@ _ACEOF
+@@ -10871,8 +11298,8 @@
  fi
  
  
@@ -11871,7 +11877,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_have_decl_free+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -10887,7 +11314,7 @@ int
+@@ -10887,7 +11314,7 @@
  main ()
  {
  #ifndef free
@@ -11880,7 +11886,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  #endif
  
    ;
-@@ -10895,38 +11322,34 @@ main ()
+@@ -10895,38 +11322,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -11935,7 +11941,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test $ac_cv_have_decl_free = yes; then
  
  cat >>confdefs.h <<_ACEOF
-@@ -10943,8 +11366,8 @@ _ACEOF
+@@ -10943,8 +11366,8 @@
  fi
  
  
@@ -11946,7 +11952,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_have_decl_getenv+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -10959,7 +11382,7 @@ int
+@@ -10959,7 +11382,7 @@
  main ()
  {
  #ifndef getenv
@@ -11955,7 +11961,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  #endif
  
    ;
-@@ -10967,38 +11390,34 @@ main ()
+@@ -10967,38 +11390,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -12010,7 +12016,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test $ac_cv_have_decl_getenv = yes; then
  
  cat >>confdefs.h <<_ACEOF
-@@ -11015,8 +11434,8 @@ _ACEOF
+@@ -11015,8 +11434,8 @@
  fi
  
  
@@ -12021,7 +12027,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_have_decl_malloc+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11031,7 +11450,7 @@ int
+@@ -11031,7 +11450,7 @@
  main ()
  {
  #ifndef malloc
@@ -12030,7 +12036,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  #endif
  
    ;
-@@ -11039,38 +11458,34 @@ main ()
+@@ -11039,38 +11458,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -12085,7 +12091,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test $ac_cv_have_decl_malloc = yes; then
  
  cat >>confdefs.h <<_ACEOF
-@@ -11087,8 +11502,8 @@ _ACEOF
+@@ -11087,8 +11502,8 @@
  fi
  
  
@@ -12096,7 +12102,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_have_decl_realloc+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11103,7 +11518,7 @@ int
+@@ -11103,7 +11518,7 @@
  main ()
  {
  #ifndef realloc
@@ -12105,7 +12111,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  #endif
  
    ;
-@@ -11111,38 +11526,34 @@ main ()
+@@ -11111,38 +11526,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -12160,7 +12166,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test $ac_cv_have_decl_realloc = yes; then
  
  cat >>confdefs.h <<_ACEOF
-@@ -11159,8 +11570,8 @@ _ACEOF
+@@ -11159,8 +11570,8 @@
  fi
  
  
@@ -12171,7 +12177,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_have_decl_stpcpy+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11175,7 +11586,7 @@ int
+@@ -11175,7 +11586,7 @@
  main ()
  {
  #ifndef stpcpy
@@ -12180,7 +12186,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  #endif
  
    ;
-@@ -11183,38 +11594,34 @@ main ()
+@@ -11183,38 +11594,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -12235,7 +12241,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test $ac_cv_have_decl_stpcpy = yes; then
  
  cat >>confdefs.h <<_ACEOF
-@@ -11231,8 +11638,8 @@ _ACEOF
+@@ -11231,8 +11638,8 @@
  fi
  
  
@@ -12246,7 +12252,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_have_decl_strstr+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11247,7 +11654,7 @@ int
+@@ -11247,7 +11654,7 @@
  main ()
  {
  #ifndef strstr
@@ -12255,7 +12261,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  #endif
  
    ;
-@@ -11255,38 +11662,34 @@ main ()
+@@ -11255,38 +11662,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -12310,7 +12316,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test $ac_cv_have_decl_strstr = yes; then
  
  cat >>confdefs.h <<_ACEOF
-@@ -11303,8 +11706,8 @@ _ACEOF
+@@ -11303,8 +11706,8 @@
  fi
  
  
@@ -12321,7 +12327,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_have_decl_snprintf+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11319,7 +11722,7 @@ int
+@@ -11319,7 +11722,7 @@
  main ()
  {
  #ifndef snprintf
@@ -12330,7 +12336,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  #endif
  
    ;
-@@ -11327,38 +11730,34 @@ main ()
+@@ -11327,38 +11730,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -12385,7 +12391,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test $ac_cv_have_decl_snprintf = yes; then
  
  cat >>confdefs.h <<_ACEOF
-@@ -11375,8 +11774,8 @@ _ACEOF
+@@ -11375,8 +11774,8 @@
  fi
  
  
@@ -12396,7 +12402,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_have_decl_vsnprintf+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11391,7 +11790,7 @@ int
+@@ -11391,7 +11790,7 @@
  main ()
  {
  #ifndef vsnprintf
@@ -12405,7 +12411,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  #endif
  
    ;
-@@ -11399,38 +11798,34 @@ main ()
+@@ -11399,38 +11798,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -12460,7 +12466,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test $ac_cv_have_decl_vsnprintf = yes; then
  
  cat >>confdefs.h <<_ACEOF
-@@ -11609,8 +12004,8 @@ if test "${target}" = "${host}"; then
+@@ -11609,8 +12004,8 @@
  	COREFLAG="$COREFLAG -DAIX_CORE_DUMPX_CORE"
  	# Not all versions of AIX with -DAIX_CORE_DUMPX_CORE
  	# have c_impl as a member of struct core_dumpx
@@ -12471,7 +12477,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  	cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -11627,42 +12022,38 @@ struct core_dumpx c; c.c_impl = 0;
+@@ -11627,42 +12022,38 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -12531,7 +12537,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  	;;
    rs6000-*-aix4*)	COREFILE=rs6000-core.lo ;;
    rs6000-*-*)		COREFILE=rs6000-core.lo ;;
-@@ -11726,18 +12117,19 @@ rm -f conftest.err conftest.$ac_objext c
+@@ -11726,18 +12117,19 @@
  for ac_header in sys/procfs.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -12559,7 +12565,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -11748,41 +12140,37 @@ $ac_includes_default
+@@ -11748,41 +12140,37 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -12619,7 +12625,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -11791,24 +12179,22 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -11791,24 +12179,22 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -12655,7 +12661,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    ac_header_preproc=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -11816,9 +12202,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -11816,9 +12202,10 @@
  
    ac_header_preproc=no
  fi
@@ -12668,7 +12674,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -11842,25 +12229,19 @@ echo "$as_me: WARNING: $ac_header:     s
+@@ -11842,25 +12229,19 @@
  echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -12701,7 +12707,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -11873,8 +12254,8 @@ fi
+@@ -11873,8 +12254,8 @@
  done
  
    if test "$ac_cv_header_sys_procfs_h" = yes; then
@@ -12712,7 +12718,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
   if test "${bfd_cv_have_sys_procfs_type_prstatus_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11896,36 +12277,32 @@ prstatus_t avar
+@@ -11896,36 +12277,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -12763,7 +12769,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  fi
  
   if test $bfd_cv_have_sys_procfs_type_prstatus_t = yes; then
-@@ -11935,11 +12312,11 @@ cat >>confdefs.h <<\_ACEOF
+@@ -11935,11 +12312,11 @@
  _ACEOF
  
   fi
@@ -12779,7 +12785,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
   if test "${bfd_cv_have_sys_procfs_type_prstatus32_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11961,36 +12338,32 @@ prstatus32_t avar
+@@ -11961,36 +12338,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -12830,7 +12836,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  fi
  
   if test $bfd_cv_have_sys_procfs_type_prstatus32_t = yes; then
-@@ -12000,11 +12373,11 @@ cat >>confdefs.h <<\_ACEOF
+@@ -12000,11 +12373,11 @@
  _ACEOF
  
   fi
@@ -12846,7 +12852,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
   if test "${bfd_cv_have_sys_procfs_type_member_prstatus_t_pr_who+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -12026,36 +12399,32 @@ prstatus_t avar; void* aref = (void*) &a
+@@ -12026,36 +12399,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -12897,7 +12903,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  fi
  
   if test $bfd_cv_have_sys_procfs_type_member_prstatus_t_pr_who = yes; then
-@@ -12065,11 +12434,11 @@ cat >>confdefs.h <<\_ACEOF
+@@ -12065,11 +12434,11 @@
  _ACEOF
  
   fi
@@ -12913,7 +12919,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
   if test "${bfd_cv_have_sys_procfs_type_member_prstatus32_t_pr_who+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -12091,36 +12460,32 @@ prstatus32_t avar; void* aref = (void*) 
+@@ -12091,36 +12460,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -12964,7 +12970,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  fi
  
   if test $bfd_cv_have_sys_procfs_type_member_prstatus32_t_pr_who = yes; then
-@@ -12130,11 +12495,11 @@ cat >>confdefs.h <<\_ACEOF
+@@ -12130,11 +12495,11 @@
  _ACEOF
  
   fi
@@ -12980,7 +12986,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
   if test "${bfd_cv_have_sys_procfs_type_pstatus_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -12156,36 +12521,32 @@ pstatus_t avar
+@@ -12156,36 +12521,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -13031,7 +13037,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  fi
  
   if test $bfd_cv_have_sys_procfs_type_pstatus_t = yes; then
-@@ -12195,11 +12556,11 @@ cat >>confdefs.h <<\_ACEOF
+@@ -12195,11 +12556,11 @@
  _ACEOF
  
   fi
@@ -13047,7 +13053,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
   if test "${bfd_cv_have_sys_procfs_type_pxstatus_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -12221,36 +12582,32 @@ pxstatus_t avar
+@@ -12221,36 +12582,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -13098,7 +13104,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  fi
  
   if test $bfd_cv_have_sys_procfs_type_pxstatus_t = yes; then
-@@ -12260,11 +12617,11 @@ cat >>confdefs.h <<\_ACEOF
+@@ -12260,11 +12617,11 @@
  _ACEOF
  
   fi
@@ -13114,7 +13120,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
   if test "${bfd_cv_have_sys_procfs_type_pstatus32_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -12286,36 +12643,32 @@ pstatus32_t avar
+@@ -12286,36 +12643,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -13165,7 +13171,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  fi
  
   if test $bfd_cv_have_sys_procfs_type_pstatus32_t = yes; then
-@@ -12325,11 +12678,11 @@ cat >>confdefs.h <<\_ACEOF
+@@ -12325,11 +12678,11 @@
  _ACEOF
  
   fi
@@ -13181,7 +13187,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
   if test "${bfd_cv_have_sys_procfs_type_prpsinfo_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -12351,36 +12704,32 @@ prpsinfo_t avar
+@@ -12351,36 +12704,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -13232,7 +13238,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  fi
  
   if test $bfd_cv_have_sys_procfs_type_prpsinfo_t = yes; then
-@@ -12390,11 +12739,11 @@ cat >>confdefs.h <<\_ACEOF
+@@ -12390,11 +12739,11 @@
  _ACEOF
  
   fi
@@ -13248,7 +13254,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
   if test "${bfd_cv_have_sys_procfs_type_prpsinfo32_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -12416,36 +12765,32 @@ prpsinfo32_t avar
+@@ -12416,36 +12765,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -13299,7 +13305,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  fi
  
   if test $bfd_cv_have_sys_procfs_type_prpsinfo32_t = yes; then
-@@ -12455,11 +12800,11 @@ cat >>confdefs.h <<\_ACEOF
+@@ -12455,11 +12800,11 @@
  _ACEOF
  
   fi
@@ -13315,7 +13321,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
   if test "${bfd_cv_have_sys_procfs_type_psinfo_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -12481,36 +12826,32 @@ psinfo_t avar
+@@ -12481,36 +12826,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -13366,7 +13372,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  fi
  
   if test $bfd_cv_have_sys_procfs_type_psinfo_t = yes; then
-@@ -12520,11 +12861,11 @@ cat >>confdefs.h <<\_ACEOF
+@@ -12520,11 +12861,11 @@
  _ACEOF
  
   fi
@@ -13382,7 +13388,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
   if test "${bfd_cv_have_sys_procfs_type_psinfo32_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -12546,36 +12887,32 @@ psinfo32_t avar
+@@ -12546,36 +12887,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -13433,7 +13439,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  fi
  
   if test $bfd_cv_have_sys_procfs_type_psinfo32_t = yes; then
-@@ -12585,11 +12922,11 @@ cat >>confdefs.h <<\_ACEOF
+@@ -12585,11 +12922,11 @@
  _ACEOF
  
   fi
@@ -13449,7 +13455,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
   if test "${bfd_cv_have_sys_procfs_type_lwpstatus_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -12611,36 +12948,32 @@ lwpstatus_t avar
+@@ -12611,36 +12948,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -13500,7 +13506,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  fi
  
   if test $bfd_cv_have_sys_procfs_type_lwpstatus_t = yes; then
-@@ -12650,11 +12983,11 @@ cat >>confdefs.h <<\_ACEOF
+@@ -12650,11 +12983,11 @@
  _ACEOF
  
   fi
@@ -13516,7 +13522,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
   if test "${bfd_cv_have_sys_procfs_type_lwpxstatus_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -12676,36 +13009,32 @@ lwpxstatus_t avar
+@@ -12676,36 +13009,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -13567,7 +13573,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  fi
  
   if test $bfd_cv_have_sys_procfs_type_lwpxstatus_t = yes; then
-@@ -12715,11 +13044,11 @@ cat >>confdefs.h <<\_ACEOF
+@@ -12715,11 +13044,11 @@
  _ACEOF
  
   fi
@@ -13583,7 +13589,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
   if test "${bfd_cv_have_sys_procfs_type_member_lwpstatus_t_pr_context+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -12741,36 +13070,32 @@ lwpstatus_t avar; void* aref = (void*) &
+@@ -12741,36 +13070,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -13634,7 +13640,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  fi
  
   if test $bfd_cv_have_sys_procfs_type_member_lwpstatus_t_pr_context = yes; then
-@@ -12780,11 +13105,11 @@ cat >>confdefs.h <<\_ACEOF
+@@ -12780,11 +13105,11 @@
  _ACEOF
  
   fi
@@ -13650,7 +13656,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
   if test "${bfd_cv_have_sys_procfs_type_member_lwpstatus_t_pr_reg+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -12806,36 +13131,32 @@ lwpstatus_t avar; void* aref = (void*) &
+@@ -12806,36 +13131,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -13701,7 +13707,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  fi
  
   if test $bfd_cv_have_sys_procfs_type_member_lwpstatus_t_pr_reg = yes; then
-@@ -12845,11 +13166,11 @@ cat >>confdefs.h <<\_ACEOF
+@@ -12845,11 +13166,11 @@
  _ACEOF
  
   fi
@@ -13717,7 +13723,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
   if test "${bfd_cv_have_sys_procfs_type_win32_pstatus_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -12871,36 +13192,32 @@ win32_pstatus_t avar
+@@ -12871,36 +13192,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -13768,7 +13774,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  fi
  
   if test $bfd_cv_have_sys_procfs_type_win32_pstatus_t = yes; then
-@@ -12910,8 +13227,8 @@ cat >>confdefs.h <<\_ACEOF
+@@ -12910,8 +13227,8 @@
  _ACEOF
  
   fi
@@ -13779,7 +13785,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  
    fi
  fi
-@@ -13070,6 +13387,7 @@ do
+@@ -13070,6 +13387,7 @@
      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" ;;
      bfd_elf32_avr_vec)		tb="$tb elf32-avr.lo elf32.lo $elf" ;;
@@ -13787,7 +13793,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
      bfd_elf32_bfin_vec)		tb="$tb elf32-bfin.lo elf32.lo $elf" ;;
      bfd_elf32_bfinfdpic_vec)	tb="$tb elf32-bfin.lo elf32.lo $elf" ;;
      bfd_elf32_big_generic_vec) 	tb="$tb elf32-gen.lo elf32.lo $elf" ;;
-@@ -13389,8 +13707,8 @@ echo "$as_me: WARNING: your compiler may
+@@ -13389,8 +13707,8 @@
      fi
      if test -n "$GCC" ; then
         bad_64bit_gcc=no;
@@ -13798,7 +13804,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
         # Add more tests for gcc versions with non-working 64-bit support here.
         cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -13403,11 +13721,11 @@ _ACEOF
+@@ -13403,11 +13721,11 @@
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
    $EGREP ": 2 : 91 : 1 :" >/dev/null 2>&1; then
    bad_64bit_gcc=yes;
@@ -13814,7 +13820,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  fi
  rm -f conftest*
  
-@@ -13445,9 +13763,9 @@ esac
+@@ -13445,9 +13763,9 @@
  for ac_func in ftello ftello64 fseeko fseeko64 fopen64
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -13827,7 +13833,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -13473,68 +13791,60 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -13473,68 +13791,60 @@
  
  #undef $ac_func
  
@@ -13919,7 +13925,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -13544,8 +13854,8 @@ fi
+@@ -13544,8 +13854,8 @@
  done
  
  if test x"$ac_cv_func_ftello" = xyes -a x"$ac_cv_func_fseeko" = xyes; then
@@ -13930,7 +13936,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_type_off_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -13556,61 +13866,57 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -13556,61 +13866,57 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -14017,7 +14023,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
  cat >conftest.$ac_ext <<_ACEOF
-@@ -13620,10 +13926,11 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -13620,10 +13926,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -14030,7 +14036,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  test_array [0] = 0
  
    ;
-@@ -13631,27 +13938,22 @@ test_array [0] = 0
+@@ -13631,27 +13938,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -14069,7 +14075,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    ac_lo=0 ac_mid=0
    while :; do
      cat >conftest.$ac_ext <<_ACEOF
-@@ -13661,10 +13963,11 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -13661,10 +13963,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -14082,7 +14088,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  test_array [0] = 0
  
    ;
-@@ -13672,56 +13975,53 @@ test_array [0] = 0
+@@ -13672,56 +13975,53 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -14161,7 +14167,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  test_array [0] = 0
  
    ;
-@@ -13729,27 +14029,22 @@ test_array [0] = 0
+@@ -13729,27 +14029,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -14200,7 +14206,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    ac_hi=-1 ac_mid=-1
    while :; do
      cat >conftest.$ac_ext <<_ACEOF
-@@ -13759,10 +14054,11 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -13759,10 +14054,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -14213,7 +14219,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  test_array [0] = 0
  
    ;
-@@ -13770,50 +14066,48 @@ test_array [0] = 0
+@@ -13770,50 +14066,48 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -14288,7 +14294,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
    ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -13824,10 +14118,11 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -13824,10 +14118,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -14301,7 +14307,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  test_array [0] = 0
  
    ;
-@@ -13835,52 +14130,45 @@ test_array [0] = 0
+@@ -13835,52 +14130,45 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -14375,7 +14381,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -13888,8 +14176,9 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -13888,8 +14176,9 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -14387,7 +14393,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -13898,35 +14187,44 @@ main ()
+@@ -13898,35 +14187,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -14445,7 +14451,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -13937,30 +14235,33 @@ echo "$as_me: failed program was:" >&5
+@@ -13937,30 +14235,33 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  ( exit $ac_status )
@@ -14491,7 +14497,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  bfd_file_ptr="long"
  bfd_ufile_ptr="unsigned long"
  if test x"$ac_cv_func_ftello64" = xyes -a x"$ac_cv_func_fseeko64" = xyes \
-@@ -13968,8 +14269,8 @@ if test x"$ac_cv_func_ftello64" = xyes -
+@@ -13968,8 +14269,8 @@
      bfd_file_ptr=BFD_HOST_64_BIT
      bfd_ufile_ptr=BFD_HOST_U_64_BIT
  fi
@@ -14502,7 +14508,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  
  
  
-@@ -13987,18 +14288,19 @@ test -n "${havevecs}" && tdefaults="${td
+@@ -13987,18 +14288,19 @@
  for ac_header in stdlib.h unistd.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -14530,7 +14536,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -14009,41 +14311,37 @@ $ac_includes_default
+@@ -14009,41 +14311,37 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -14590,7 +14596,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -14052,24 +14350,22 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -14052,24 +14350,22 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -14626,7 +14632,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    ac_header_preproc=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -14077,9 +14373,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -14077,9 +14373,10 @@
  
    ac_header_preproc=no
  fi
@@ -14639,7 +14645,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -14103,25 +14400,19 @@ echo "$as_me: WARNING: $ac_header:     s
+@@ -14103,25 +14400,19 @@
  echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -14672,7 +14678,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -14137,9 +14428,9 @@ done
+@@ -14137,9 +14428,9 @@
  for ac_func in getpagesize
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -14685,7 +14691,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -14165,68 +14456,60 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -14165,68 +14456,60 @@
  
  #undef $ac_func
  
@@ -14777,7 +14783,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -14235,8 +14518,8 @@ _ACEOF
+@@ -14235,8 +14518,8 @@
  fi
  done
  
@@ -14788,7 +14794,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -14278,21 +14561,21 @@ $ac_includes_default
+@@ -14278,21 +14561,21 @@
  #include <fcntl.h>
  #include <sys/mman.h>
  
@@ -14814,7 +14820,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  #   include <sys/param.h>
  #   ifdef EXEC_PAGESIZE
  #    define getpagesize() EXEC_PAGESIZE
-@@ -14331,15 +14614,15 @@ main ()
+@@ -14331,15 +14614,15 @@
    /* First, make a file with some known garbage in it. */
    data = (char *) malloc (pagesize);
    if (!data)
@@ -14833,7 +14839,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    close (fd);
  
    /* Next, try to mmap the file at a fixed address which already has
-@@ -14347,17 +14630,17 @@ main ()
+@@ -14347,17 +14630,17 @@
       we see the same garbage.  */
    fd = open ("conftest.mmap", O_RDWR);
    if (fd < 0)
@@ -14856,7 +14862,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  
    /* Finally, make sure that changes to the mapped area do not
       percolate back to the file as seen by read().  (This is a bug on
-@@ -14366,24 +14649,33 @@ main ()
+@@ -14366,24 +14649,33 @@
      *(data2 + i) = *(data2 + i) + 1;
    data3 = (char *) malloc (pagesize);
    if (!data3)
@@ -14898,7 +14904,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -14396,11 +14688,13 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -14396,11 +14688,13 @@
  ( exit $ac_status )
  ac_cv_func_mmap_fixed_mapped=no
  fi
@@ -14915,7 +14921,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test $ac_cv_func_mmap_fixed_mapped = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -14415,9 +14709,9 @@ rm -f conftest.mmap
+@@ -14415,9 +14709,9 @@
  for ac_func in madvise mprotect
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -14928,7 +14934,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -14443,68 +14737,60 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -14443,68 +14737,60 @@
  
  #undef $ac_func
  
@@ -15020,7 +15026,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -14522,9 +14808,9 @@ _ACEOF
+@@ -14522,9 +14808,9 @@
  esac
  
  rm -f doc/config.status
@@ -15032,7 +15038,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  
  
  
-@@ -14549,39 +14835,58 @@ _ACEOF
+@@ -14549,39 +14835,58 @@
  
  # The following way of writing the cache mishandles newlines in values,
  # but we know of no workaround that is simple, portable, and efficient.
@@ -15107,7 +15113,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    fi
  fi
  rm -f confcache
-@@ -14590,32 +14895,18 @@ test "x$prefix" = xNONE && prefix=$ac_de
+@@ -14590,32 +14895,18 @@
  # Let make expand exec_prefix.
  test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
  
@@ -15146,7 +15152,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  done
  LIBOBJS=$ac_libobjs
  
-@@ -14674,17 +14965,45 @@ cat >>$CONFIG_STATUS <<\_ACEOF
+@@ -14674,17 +14965,45 @@
  ## M4sh Initialization.  ##
  ## --------------------- ##
  
@@ -15196,7 +15202,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  
  # Support unset when possible.
  if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-@@ -14694,8 +15013,43 @@ else
+@@ -14694,8 +15013,43 @@
  fi
  
  
@@ -15241,7 +15247,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  PS1='$ '
  PS2='> '
  PS4='+ '
-@@ -14709,18 +15063,19 @@ do
+@@ -14709,18 +15063,19 @@
    if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
      eval $as_var=C; export $as_var
    else
@@ -15264,7 +15270,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    as_basename=basename
  else
    as_basename=false
-@@ -14728,159 +15083,120 @@ fi
+@@ -14728,159 +15083,120 @@
  
  
  # Name of the executable.
@@ -15495,7 +15501,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  
  if mkdir -p . 2>/dev/null; then
    as_mkdir_p=:
-@@ -14889,7 +15205,28 @@ else
+@@ -14889,7 +15205,28 @@
    as_mkdir_p=false
  fi
  
@@ -15525,7 +15531,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  
  # Sed expression to map a string onto a valid CPP name.
  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -14898,31 +15235,14 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P
+@@ -14898,31 +15235,14 @@
  as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
  
  
@@ -15561,7 +15567,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -14930,30 +15250,20 @@ generated by GNU Autoconf 2.59.  Invocat
+@@ -14930,30 +15250,20 @@
    CONFIG_COMMANDS = $CONFIG_COMMANDS
    $ $0 $@
  
@@ -15600,7 +15606,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  ac_cs_usage="\
  \`$as_me' instantiates files from templates according to the
  current configuration.
-@@ -14961,7 +15271,7 @@ current configuration.
+@@ -14961,7 +15271,7 @@
  Usage: $0 [OPTIONS] [FILE]...
  
    -h, --help       print this help, then exit
@@ -15609,7 +15615,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    -q, --quiet      do not print progress messages
    -d, --debug      don't remove temporary files
        --recheck    update $as_me by reconfiguring in the same conditions
-@@ -14980,19 +15290,21 @@ Configuration commands:
+@@ -14980,19 +15290,21 @@
  $config_commands
  
  Report bugs to <bug-autoconf@gnu.org>."
@@ -15637,7 +15643,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  _ACEOF
  
  cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -15003,39 +15315,24 @@ while test $# != 0
+@@ -15003,39 +15315,24 @@
  do
    case $1 in
    --*=*)
@@ -15683,7 +15689,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
      debug=: ;;
    --file | --fil | --fi | --f )
      $ac_shift
-@@ -15045,18 +15342,24 @@ Try \`$0 --help' for more information." 
+@@ -15045,18 +15342,24 @@
      $ac_shift
      CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
      ac_need_defaults=false;;
@@ -15713,7 +15719,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  
    esac
    shift
-@@ -15072,42 +15375,54 @@ fi
+@@ -15072,42 +15375,54 @@
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF
  if \$ac_cs_recheck; then
@@ -15783,7 +15789,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  # If the user did not use the arguments to specify the items to instantiate,
  # then the envvar interface is used.  Set only those that are not.
  # We use the long form for the default assignment because of an extremely
-@@ -15119,401 +15434,504 @@ if $ac_need_defaults; then
+@@ -15119,401 +15434,504 @@
  fi
  
  # Have a temporary directory for convenience.  Make it in the build tree
@@ -16629,7 +16635,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  cat >>$CONFIG_STATUS <<_ACEOF
    sed "$ac_vpsub
  $extrasub
-@@ -15521,248 +15939,130 @@ _ACEOF
+@@ -15521,248 +15939,130 @@
  cat >>$CONFIG_STATUS <<\_ACEOF
  :t
  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
@@ -16980,7 +16986,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  # Compute $ac_file's index in $config_headers.
  _am_stamp_count=1
  for _am_header in $config_headers :; do
-@@ -15773,135 +16073,39 @@ for _am_header in $config_headers :; do
+@@ -15773,135 +16073,39 @@
        _am_stamp_count=`expr $_am_stamp_count + 1` ;;
    esac
  done
@@ -17142,7 +17148,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    # Strip MF so we end up with the name of the file.
    mf=`echo "$mf" | sed -e 's/:.*$//'`
    # Check whether this is an Automake generated Makefile or not.
-@@ -15911,18 +16115,29 @@ echo "$as_me: executing $ac_dest command
+@@ -15911,18 +16115,29 @@
    # each Makefile.in and add a new line on top of each file to say so.
    # So let's grep whole file.
    if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
@@ -17180,7 +17186,7 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
    else
      continue
    fi
-@@ -15944,54 +16159,80 @@ echo X"$mf" |
+@@ -15944,54 +16159,80 @@
         sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
      # Make sure the directory exists.
      test -f "$dirpart/$file" && continue
@@ -17291,10 +17297,11 @@ diff -Nrup binutils-2.17/bfd/configure binutils-2.17-atmel/bfd/configure
  
  { (exit 0); exit 0; }
  _ACEOF
-diff -Nrup binutils-2.17/bfd/configure.in binutils-2.17-atmel/bfd/configure.in
---- binutils-2.17/bfd/configure.in	2006-06-23 20:17:07.000000000 +0200
-+++ binutils-2.17-atmel/bfd/configure.in	2007-02-12 15:37:09.000000000 +0100
-@@ -8,7 +8,7 @@ AC_CONFIG_SRCDIR([libbfd.c])
+Index: binutils-2.17/bfd/configure.in
+===================================================================
+--- binutils-2.17.orig/bfd/configure.in	2007-06-28 09:19:34.170041816 +0200
++++ binutils-2.17/bfd/configure.in	2007-06-28 09:19:36.576675952 +0200
+@@ -8,7 +8,7 @@
  AC_CANONICAL_TARGET
  AC_ISC_POSIX
  
@@ -17303,7 +17310,7 @@ diff -Nrup binutils-2.17/bfd/configure.in binutils-2.17-atmel/bfd/configure.in
  
  dnl These must be called before AM_PROG_LIBTOOL, because it may want
  dnl to call AC_CHECK_PROG.
-@@ -583,6 +583,7 @@ do
+@@ -583,6 +583,7 @@
      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" ;;
      bfd_elf32_avr_vec)		tb="$tb elf32-avr.lo elf32.lo $elf" ;;
@@ -17311,9 +17318,10 @@ diff -Nrup binutils-2.17/bfd/configure.in binutils-2.17-atmel/bfd/configure.in
      bfd_elf32_bfin_vec)		tb="$tb elf32-bfin.lo elf32.lo $elf" ;;
      bfd_elf32_bfinfdpic_vec)	tb="$tb elf32-bfin.lo elf32.lo $elf" ;;
      bfd_elf32_big_generic_vec) 	tb="$tb elf32-gen.lo elf32.lo $elf" ;;
-diff -Nrup binutils-2.17/bfd/cpu-avr32.c binutils-2.17-atmel/bfd/cpu-avr32.c
---- binutils-2.17/bfd/cpu-avr32.c	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17-atmel/bfd/cpu-avr32.c	2006-11-10 15:05:48.000000000 +0100
+Index: binutils-2.17/bfd/cpu-avr32.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ binutils-2.17/bfd/cpu-avr32.c	2007-06-28 09:19:36.576675952 +0200
 @@ -0,0 +1,49 @@
 +/* BFD library support routines for AVR32.
 +   Copyright 2003-2006 Atmel Corporation.
@@ -17364,16 +17372,17 @@ diff -Nrup binutils-2.17/bfd/cpu-avr32.c binutils-2.17-atmel/bfd/cpu-avr32.c
 +
 +const bfd_arch_info_type bfd_avr32_arch =
 +  N(bfd_mach_avr32_ap, "avr32:ap", TRUE, &cpu_info[0]);
-diff -Nrup binutils-2.17/bfd/doc/Makefile.in binutils-2.17-atmel/bfd/doc/Makefile.in
---- binutils-2.17/bfd/doc/Makefile.in	2006-04-06 23:49:26.000000000 +0200
-+++ binutils-2.17-atmel/bfd/doc/Makefile.in	2007-02-20 16:07:07.000000000 +0100
+Index: binutils-2.17/bfd/doc/Makefile.in
+===================================================================
+--- binutils-2.17.orig/bfd/doc/Makefile.in	2007-06-28 09:19:34.180040296 +0200
++++ binutils-2.17/bfd/doc/Makefile.in	2007-06-28 09:19:36.577675800 +0200
 @@ -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.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -105,6 +105,7 @@ EXEEXT = @EXEEXT@
+@@ -105,6 +105,7 @@
  EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
  GMOFILES = @GMOFILES@
  GMSGFMT = @GMSGFMT@
@@ -17381,7 +17390,7 @@ diff -Nrup binutils-2.17/bfd/doc/Makefile.in binutils-2.17-atmel/bfd/doc/Makefil
  GT_NO = @GT_NO@
  GT_YES = @GT_YES@
  HDEFINES = @HDEFINES@
-@@ -154,10 +155,7 @@ WARN_CFLAGS = @WARN_CFLAGS@
+@@ -154,10 +155,7 @@
  WIN32LDFLAGS = @WIN32LDFLAGS@
  WIN32LIBADD = @WIN32LIBADD@
  XGETTEXT = @XGETTEXT@
@@ -17392,7 +17401,7 @@ diff -Nrup binutils-2.17/bfd/doc/Makefile.in binutils-2.17-atmel/bfd/doc/Makefil
  all_backends = @all_backends@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -183,6 +181,7 @@ build_vendor = @build_vendor@
+@@ -183,6 +181,7 @@
  datadir = @datadir@
  datarootdir = @datarootdir@
  docdir = @docdir@
@@ -17400,7 +17409,7 @@ diff -Nrup binutils-2.17/bfd/doc/Makefile.in binutils-2.17-atmel/bfd/doc/Makefil
  exec_prefix = @exec_prefix@
  host = @host@
  host_alias = @host_alias@
-@@ -197,12 +196,15 @@ install_sh = @install_sh@
+@@ -197,12 +196,15 @@
  l = @l@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -17416,7 +17425,7 @@ diff -Nrup binutils-2.17/bfd/doc/Makefile.in binutils-2.17-atmel/bfd/doc/Makefil
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
-@@ -364,9 +366,11 @@ distclean-libtool:
+@@ -364,9 +366,11 @@
  	restore=: && backupdir="$(am__leading_dot)am$$$$" && \
  	am__cwd=`pwd` && cd $(srcdir) && \
  	rm -rf $$backupdir && mkdir $$backupdir && \
@@ -17431,7 +17440,7 @@ diff -Nrup binutils-2.17/bfd/doc/Makefile.in binutils-2.17-atmel/bfd/doc/Makefil
  	cd "$$am__cwd"; \
  	if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
  	 -o $@ $<; \
-@@ -408,6 +412,7 @@ bfd.dvi: bfd.texinfo 
+@@ -408,6 +412,7 @@
  bfd.pdf: bfd.texinfo 
  bfd.html: bfd.texinfo 
  .dvi.ps:
@@ -17439,7 +17448,7 @@ diff -Nrup binutils-2.17/bfd/doc/Makefile.in binutils-2.17-atmel/bfd/doc/Makefil
  	$(DVIPS) -o $@ $<
  
  uninstall-info-am:
-@@ -440,10 +445,13 @@ dist-info: $(INFO_DEPS)
+@@ -440,10 +445,13 @@
  	    $(srcdir)/*) base=`echo "$$base" | sed "s|^$$srcdirstrip/||"`;; \
  	  esac; \
  	  if test -f $$base; then d=.; else d=$(srcdir); fi; \
@@ -17457,9 +17466,10 @@ diff -Nrup binutils-2.17/bfd/doc/Makefile.in binutils-2.17-atmel/bfd/doc/Makefil
  	  done; \
  	done
  
-diff -Nrup binutils-2.17/bfd/elf32-avr32.c binutils-2.17-atmel/bfd/elf32-avr32.c
---- binutils-2.17/bfd/elf32-avr32.c	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17-atmel/bfd/elf32-avr32.c	2007-02-12 15:37:09.000000000 +0100
+Index: binutils-2.17/bfd/elf32-avr32.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ binutils-2.17/bfd/elf32-avr32.c	2007-06-28 09:19:36.580675344 +0200
 @@ -0,0 +1,3847 @@
 +/* AVR32-specific support for 32-bit ELF.
 +   Copyright 2003-2006 Atmel Corporation.
@@ -21308,10 +21318,11 @@ diff -Nrup binutils-2.17/bfd/elf32-avr32.c binutils-2.17-atmel/bfd/elf32-avr32.c
 +#define elf_backend_got_header_size	AVR32_GOT_HEADER_SIZE
 +
 +#include "elf32-target.h"
-diff -Nrup binutils-2.17/bfd/elf-bfd.h binutils-2.17-atmel/bfd/elf-bfd.h
---- binutils-2.17/bfd/elf-bfd.h	2006-03-16 13:20:15.000000000 +0100
-+++ binutils-2.17-atmel/bfd/elf-bfd.h	2007-02-12 15:37:09.000000000 +0100
-@@ -1307,6 +1307,10 @@ struct elf_obj_tdata
+Index: binutils-2.17/bfd/elf-bfd.h
+===================================================================
+--- binutils-2.17.orig/bfd/elf-bfd.h	2007-06-28 09:19:34.190038776 +0200
++++ binutils-2.17/bfd/elf-bfd.h	2007-06-28 09:19:36.581675192 +0200
+@@ -1307,6 +1307,10 @@
       find_nearest_line.  */
    struct mips_elf_find_line *find_line_info;
  
@@ -21322,10 +21333,11 @@ diff -Nrup binutils-2.17/bfd/elf-bfd.h binutils-2.17-atmel/bfd/elf-bfd.h
    /* 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/bfd/libbfd.h
---- binutils-2.17/bfd/libbfd.h	2006-03-26 01:38:42.000000000 +0100
-+++ binutils-2.17-atmel/bfd/libbfd.h	2007-02-20 16:08:43.000000000 +0100
-@@ -1518,6 +1518,47 @@ static const char *const bfd_reloc_code_
+Index: binutils-2.17/bfd/libbfd.h
+===================================================================
+--- binutils-2.17.orig/bfd/libbfd.h	2007-06-28 09:19:34.195038016 +0200
++++ binutils-2.17/bfd/libbfd.h	2007-06-28 09:19:36.582675040 +0200
+@@ -1518,6 +1518,47 @@
    "BFD_RELOC_AVR_LDI",
    "BFD_RELOC_AVR_6",
    "BFD_RELOC_AVR_6_ADIW",
@@ -21373,9 +21385,10 @@ diff -Nrup binutils-2.17/bfd/libbfd.h binutils-2.17-atmel/bfd/libbfd.h
    "BFD_RELOC_390_12",
    "BFD_RELOC_390_GOT12",
    "BFD_RELOC_390_PLT32",
-diff -Nrup binutils-2.17/bfd/Makefile.am binutils-2.17-atmel/bfd/Makefile.am
---- binutils-2.17/bfd/Makefile.am	2006-06-23 20:17:17.000000000 +0200
-+++ binutils-2.17-atmel/bfd/Makefile.am	2007-02-12 15:37:09.000000000 +0100
+Index: binutils-2.17/bfd/Makefile.am
+===================================================================
+--- binutils-2.17.orig/bfd/Makefile.am	2007-06-28 09:19:34.201037104 +0200
++++ binutils-2.17/bfd/Makefile.am	2007-06-28 09:19:36.583674888 +0200
 @@ -3,7 +3,7 @@
  AUTOMAKE_OPTIONS = 1.9 cygnus
  
@@ -21385,7 +21398,7 @@ diff -Nrup binutils-2.17/bfd/Makefile.am binutils-2.17-atmel/bfd/Makefile.am
  
  INCDIR = $(srcdir)/../include
  CSEARCH = -I. -I$(srcdir) -I$(INCDIR)
-@@ -62,6 +62,7 @@ ALL_MACHINES = \
+@@ -62,6 +62,7 @@
  	cpu-arc.lo \
  	cpu-arm.lo \
  	cpu-avr.lo \
@@ -21393,7 +21406,7 @@ diff -Nrup binutils-2.17/bfd/Makefile.am binutils-2.17-atmel/bfd/Makefile.am
  	cpu-bfin.lo \
  	cpu-cr16c.lo \
  	cpu-cris.lo \
-@@ -234,6 +235,7 @@ BFD32_BACKENDS = \
+@@ -234,6 +235,7 @@
  	elf32-arc.lo \
  	elf32-arm.lo \
  	elf32-avr.lo \
@@ -21401,7 +21414,7 @@ diff -Nrup binutils-2.17/bfd/Makefile.am binutils-2.17-atmel/bfd/Makefile.am
  	elf32-bfin.lo \
  	elf32-cr16c.lo \
  	elf32-cris.lo \
-@@ -1265,6 +1267,10 @@ elf32-bfin.lo: elf32-bfin.c $(INCDIR)/fi
+@@ -1265,6 +1267,10 @@
    elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \
    $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(INCDIR)/elf/bfin.h \
    $(INCDIR)/elf/reloc-macros.h elf32-target.h
@@ -21412,9 +21425,10 @@ diff -Nrup binutils-2.17/bfd/Makefile.am binutils-2.17-atmel/bfd/Makefile.am
  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/bfd/Makefile.in
---- binutils-2.17/bfd/Makefile.in	2006-06-23 20:17:19.000000000 +0200
-+++ binutils-2.17-atmel/bfd/Makefile.in	2007-02-20 16:07:07.000000000 +0100
+Index: binutils-2.17/bfd/Makefile.in
+===================================================================
+--- binutils-2.17.orig/bfd/Makefile.in	2007-06-28 09:19:34.206036344 +0200
++++ binutils-2.17/bfd/Makefile.in	2007-06-28 09:19:36.584674736 +0200
 @@ -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.
@@ -21430,7 +21444,7 @@ diff -Nrup binutils-2.17/bfd/Makefile.in binutils-2.17-atmel/bfd/Makefile.in
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
  VPATH = @srcdir@
-@@ -141,6 +139,7 @@ EXEEXT = @EXEEXT@
+@@ -141,6 +139,7 @@
  EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
  GMOFILES = @GMOFILES@
  GMSGFMT = @GMSGFMT@
@@ -21438,7 +21452,7 @@ diff -Nrup binutils-2.17/bfd/Makefile.in binutils-2.17-atmel/bfd/Makefile.in
  GT_NO = @GT_NO@
  GT_YES = @GT_YES@
  HDEFINES = @HDEFINES@
-@@ -190,10 +189,7 @@ WARN_CFLAGS = @WARN_CFLAGS@
+@@ -190,10 +189,7 @@
  WIN32LDFLAGS = @WIN32LDFLAGS@
  WIN32LIBADD = @WIN32LIBADD@
  XGETTEXT = @XGETTEXT@
@@ -21449,7 +21463,7 @@ diff -Nrup binutils-2.17/bfd/Makefile.in binutils-2.17-atmel/bfd/Makefile.in
  all_backends = @all_backends@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -219,6 +215,7 @@ build_vendor = @build_vendor@
+@@ -219,6 +215,7 @@
  datadir = @datadir@
  datarootdir = @datarootdir@
  docdir = @docdir@
@@ -21457,7 +21471,7 @@ diff -Nrup binutils-2.17/bfd/Makefile.in binutils-2.17-atmel/bfd/Makefile.in
  exec_prefix = @exec_prefix@
  host = @host@
  host_alias = @host_alias@
-@@ -233,12 +230,15 @@ install_sh = @install_sh@
+@@ -233,12 +230,15 @@
  l = @l@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -21473,7 +21487,7 @@ diff -Nrup binutils-2.17/bfd/Makefile.in binutils-2.17-atmel/bfd/Makefile.in
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
-@@ -253,7 +253,7 @@ wordsize = @wordsize@
+@@ -253,7 +253,7 @@
  AUTOMAKE_OPTIONS = 1.9 cygnus
  
  # Uncomment the following line when doing a release.
@@ -21482,7 +21496,7 @@ diff -Nrup binutils-2.17/bfd/Makefile.in binutils-2.17-atmel/bfd/Makefile.in
  INCDIR = $(srcdir)/../include
  CSEARCH = -I. -I$(srcdir) -I$(INCDIR)
  MKDEP = gcc -MM
-@@ -298,6 +298,7 @@ ALL_MACHINES = \
+@@ -298,6 +298,7 @@
  	cpu-arc.lo \
  	cpu-arm.lo \
  	cpu-avr.lo \
@@ -21490,7 +21504,7 @@ diff -Nrup binutils-2.17/bfd/Makefile.in binutils-2.17-atmel/bfd/Makefile.in
  	cpu-bfin.lo \
  	cpu-cr16c.lo \
  	cpu-cris.lo \
-@@ -471,6 +472,7 @@ BFD32_BACKENDS = \
+@@ -471,6 +472,7 @@
  	elf32-arc.lo \
  	elf32-arm.lo \
  	elf32-avr.lo \
@@ -21498,7 +21512,7 @@ diff -Nrup binutils-2.17/bfd/Makefile.in binutils-2.17-atmel/bfd/Makefile.in
  	elf32-bfin.lo \
  	elf32-cr16c.lo \
  	elf32-cris.lo \
-@@ -1831,6 +1833,10 @@ elf32-bfin.lo: elf32-bfin.c $(INCDIR)/fi
+@@ -1831,6 +1833,10 @@
    elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \
    $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(INCDIR)/elf/bfin.h \
    $(INCDIR)/elf/reloc-macros.h elf32-target.h
@@ -21509,10 +21523,11 @@ diff -Nrup binutils-2.17/bfd/Makefile.in binutils-2.17-atmel/bfd/Makefile.in
  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/bfd/reloc.c
---- binutils-2.17/bfd/reloc.c	2006-03-26 01:38:42.000000000 +0100
-+++ binutils-2.17-atmel/bfd/reloc.c	2007-02-12 15:37:09.000000000 +0100
-@@ -3714,6 +3714,129 @@ ENUMDOC
+Index: binutils-2.17/bfd/reloc.c
+===================================================================
+--- binutils-2.17.orig/bfd/reloc.c	2007-06-28 09:19:34.211035584 +0200
++++ binutils-2.17/bfd/reloc.c	2007-06-28 09:19:36.585674584 +0200
+@@ -3714,6 +3714,129 @@
    instructions
  
  ENUM
@@ -21642,10 +21657,11 @@ diff -Nrup binutils-2.17/bfd/reloc.c binutils-2.17-atmel/bfd/reloc.c
    BFD_RELOC_390_12
  ENUMDOC
     Direct 12 bit.
-diff -Nrup binutils-2.17/bfd/targets.c binutils-2.17-atmel/bfd/targets.c
---- binutils-2.17/bfd/targets.c	2006-04-05 14:41:57.000000000 +0200
-+++ binutils-2.17-atmel/bfd/targets.c	2007-02-12 15:37:09.000000000 +0100
-@@ -553,6 +553,7 @@ extern const bfd_target b_out_vec_little
+Index: binutils-2.17/bfd/targets.c
+===================================================================
+--- binutils-2.17.orig/bfd/targets.c	2007-06-28 09:19:34.218034520 +0200
++++ binutils-2.17/bfd/targets.c	2007-06-28 09:19:36.586674432 +0200
+@@ -553,6 +553,7 @@
  extern const bfd_target bfd_efi_app_ia32_vec;
  extern const bfd_target bfd_efi_app_ia64_vec;
  extern const bfd_target bfd_elf32_avr_vec;
@@ -21653,7 +21669,7 @@ diff -Nrup binutils-2.17/bfd/targets.c binutils-2.17-atmel/bfd/targets.c
  extern const bfd_target bfd_elf32_bfin_vec;
  extern const bfd_target bfd_elf32_bfinfdpic_vec;
  extern const bfd_target bfd_elf32_big_generic_vec;
-@@ -855,6 +856,7 @@ static const bfd_target * const _bfd_tar
+@@ -855,6 +856,7 @@
  	&bfd_efi_app_ia64_vec,
  #endif
  	&bfd_elf32_avr_vec,
@@ -21661,9 +21677,10 @@ diff -Nrup binutils-2.17/bfd/targets.c binutils-2.17-atmel/bfd/targets.c
  	&bfd_elf32_bfin_vec,
  	&bfd_elf32_bfinfdpic_vec,
  
-diff -Nrup binutils-2.17/binutils/config.in binutils-2.17-atmel/binutils/config.in
---- binutils-2.17/binutils/config.in	2006-02-14 09:59:10.000000000 +0100
-+++ binutils-2.17-atmel/binutils/config.in	2007-02-20 16:07:22.000000000 +0100
+Index: binutils-2.17/binutils/config.in
+===================================================================
+--- binutils-2.17.orig/binutils/config.in	2007-06-28 09:19:34.223033760 +0200
++++ binutils-2.17/binutils/config.in	2007-06-28 09:19:36.587674280 +0200
 @@ -218,7 +218,7 @@
  
  /* If using the C implementation of alloca, define if you know the
@@ -21684,9 +21701,10 @@ diff -Nrup binutils-2.17/binutils/config.in binutils-2.17-atmel/binutils/config.
 -/* 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/binutils/configure
---- binutils-2.17/binutils/configure	2006-04-06 23:49:29.000000000 +0200
-+++ binutils-2.17-atmel/binutils/configure	2007-02-20 16:07:20.000000000 +0100
+Index: binutils-2.17/binutils/configure
+===================================================================
+--- binutils-2.17.orig/binutils/configure	2007-06-28 09:19:35.028911248 +0200
++++ binutils-2.17/binutils/configure	2007-06-28 09:19:36.601672152 +0200
 @@ -1,25 +1,54 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
@@ -21748,7 +21766,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  
  # Support unset when possible.
  if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-@@ -29,8 +58,43 @@ else
+@@ -29,8 +58,43 @@
  fi
  
  
@@ -21793,7 +21811,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  PS1='$ '
  PS2='> '
  PS4='+ '
-@@ -44,18 +108,19 @@ do
+@@ -44,18 +108,19 @@
    if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
      eval $as_var=C; export $as_var
    else
@@ -21816,7 +21834,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
    as_basename=basename
  else
    as_basename=false
-@@ -63,157 +128,388 @@ fi
+@@ -63,157 +128,388 @@
  
  
  # Name of the executable.
@@ -22303,7 +22321,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  
  if mkdir -p . 2>/dev/null; then
    as_mkdir_p=:
-@@ -222,7 +518,28 @@ else
+@@ -222,7 +518,28 @@
    as_mkdir_p=false
  fi
  
@@ -22333,7 +22351,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  
  # Sed expression to map a string onto a valid CPP name.
  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -231,39 +548,27 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P
+@@ -231,39 +548,27 @@
  as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
  
  
@@ -22376,7 +22394,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  # Identity of this package.
  PACKAGE_NAME=
  PACKAGE_TARNAME=
-@@ -275,42 +580,193 @@ ac_unique_file="ar.c"
+@@ -275,42 +580,193 @@
  # Factoring default headers for most tests.
  ac_includes_default="\
  #include <stdio.h>
@@ -22584,7 +22602,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  
  # Initialize some variables set by options.
  ac_init_help=
-@@ -337,34 +793,48 @@ x_libraries=NONE
+@@ -337,34 +793,48 @@
  # and all the variables that are supposed to be based on exec_prefix
  # by default will actually change.
  # Use braces instead of parens because sh, perl, etc. also accept them.
@@ -22640,7 +22658,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  
    -bindir | --bindir | --bindi | --bind | --bin | --bi)
      ac_prev=bindir ;;
-@@ -386,33 +856,45 @@ do
+@@ -386,33 +856,45 @@
    --config-cache | -C)
      cache_file=config.cache ;;
  
@@ -22699,7 +22717,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  
    -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
    | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-@@ -439,6 +921,12 @@ do
+@@ -439,6 +921,12 @@
    -host=* | --host=* | --hos=* | --ho=*)
      host_alias=$ac_optarg ;;
  
@@ -22712,7 +22730,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
    -includedir | --includedir | --includedi | --included | --include \
    | --includ | --inclu | --incl | --inc)
      ac_prev=includedir ;;
-@@ -463,13 +951,16 @@ do
+@@ -463,13 +951,16 @@
    | --libexe=* | --libex=* | --libe=*)
      libexecdir=$ac_optarg ;;
  
@@ -22733,7 +22751,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
      localstatedir=$ac_optarg ;;
  
    -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-@@ -534,6 +1025,16 @@ do
+@@ -534,6 +1025,16 @@
    | --progr-tra=* | --program-tr=* | --program-t=*)
      program_transform_name=$ac_optarg ;;
  
@@ -22750,7 +22768,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
    | -silent | --silent | --silen | --sile | --sil)
      silent=yes ;;
-@@ -586,24 +1087,20 @@ do
+@@ -586,24 +1087,20 @@
    -with-* | --with-*)
      ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
      # Reject names that are not valid shell variable names.
@@ -22781,7 +22799,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  
    --x)
      # Obsolete; use --with-x.
-@@ -634,8 +1131,7 @@ Try \`$0 --help' for more information." 
+@@ -634,8 +1131,7 @@
      expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
        { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
     { (exit 1); exit 1; }; }
@@ -22791,7 +22809,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
      export $ac_envvar ;;
  
    *)
-@@ -655,27 +1151,19 @@ if test -n "$ac_prev"; then
+@@ -655,27 +1151,19 @@
     { (exit 1); exit 1; }; }
  fi
  
@@ -22829,7 +22847,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  done
  
  # There might be people who depend on the old broken behavior: `$host'
-@@ -702,74 +1190,76 @@ test -n "$host_alias" && ac_tool_prefix=
+@@ -702,74 +1190,76 @@
  test "$silent" = yes && exec 6>/dev/null
  
  
@@ -22961,7 +22979,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  
  #
  # Report the --help message.
-@@ -798,9 +1288,6 @@ Configuration:
+@@ -798,9 +1288,6 @@
    -n, --no-create         do not create output files
        --srcdir=DIR        find the sources in DIR [configure dir or \`..']
  
@@ -22971,7 +22989,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  Installation directories:
    --prefix=PREFIX         install architecture-independent files in PREFIX
  			  [$ac_default_prefix]
-@@ -818,15 +1305,22 @@ Fine tuning of the installation director
+@@ -818,15 +1305,22 @@
    --bindir=DIR           user executables [EPREFIX/bin]
    --sbindir=DIR          system admin executables [EPREFIX/sbin]
    --libexecdir=DIR       program executables [EPREFIX/libexec]
@@ -22997,7 +23015,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  _ACEOF
  
    cat <<\_ACEOF
-@@ -876,126 +1370,100 @@ Some influential environment variables:
+@@ -876,126 +1370,100 @@
    CFLAGS      C compiler flags
    LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
                nonstandard directory <lib dir>
@@ -23180,7 +23198,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  {
  cat <<_ASUNAME
  ## --------- ##
-@@ -1014,7 +1482,7 @@ uname -v = `(uname -v) 2>/dev/null || ec
+@@ -1014,7 +1482,7 @@
  /bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
  /usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
  /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
@@ -23189,7 +23207,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  /bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
  /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
  /bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-@@ -1028,6 +1496,7 @@ do
+@@ -1028,6 +1496,7 @@
    test -z "$as_dir" && as_dir=.
    echo "PATH: $as_dir"
  done
@@ -23197,7 +23215,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  
  } >&5
  
-@@ -1049,7 +1518,6 @@ _ACEOF
+@@ -1049,7 +1518,6 @@
  ac_configure_args=
  ac_configure_args0=
  ac_configure_args1=
@@ -23205,7 +23223,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  ac_must_keep_next=false
  for ac_pass in 1 2
  do
-@@ -1060,7 +1528,7 @@ do
+@@ -1060,7 +1528,7 @@
      -q | -quiet | --quiet | --quie | --qui | --qu | --q \
      | -silent | --silent | --silen | --sile | --sil)
        continue ;;
@@ -23214,7 +23232,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
        ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
      esac
      case $ac_pass in
-@@ -1082,9 +1550,7 @@ do
+@@ -1082,9 +1550,7 @@
  	  -* ) ac_must_keep_next=true ;;
  	esac
        fi
@@ -23225,7 +23243,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
        ;;
      esac
    done
-@@ -1095,8 +1561,8 @@ $as_unset ac_configure_args1 || test "${
+@@ -1095,8 +1561,8 @@
  # When interrupted or exit'd, cleanup temporary files, and complete
  # config.log.  We remove comments because anyway the quotes in there
  # would cause problems or look ugly.
@@ -23236,7 +23254,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  trap 'exit_status=$?
    # Save into config.log some information that might help in debugging.
    {
-@@ -1109,20 +1575,34 @@ trap 'exit_status=$?
+@@ -1109,20 +1575,34 @@
  _ASBOX
      echo
      # The following way of writing the cache mishandles newlines in values,
@@ -23281,7 +23299,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
      echo
  
      cat <<\_ASBOX
-@@ -1133,22 +1613,28 @@ _ASBOX
+@@ -1133,22 +1613,28 @@
      echo
      for ac_var in $ac_subst_vars
      do
@@ -23317,7 +23335,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
        done | sort
        echo
      fi
-@@ -1160,26 +1646,24 @@ _ASBOX
+@@ -1160,26 +1646,24 @@
  ## ----------- ##
  _ASBOX
        echo
@@ -23349,7 +23367,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  
  # Predefined preprocessor variables.
  
-@@ -1210,14 +1694,17 @@ _ACEOF
+@@ -1210,14 +1694,17 @@
  
  # Let the site file select an alternate cache file if it wants to.
  # Prefer explicitly selected file to automatically selected ones.
@@ -23374,7 +23392,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
    if test -r "$ac_site_file"; then
      { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
  echo "$as_me: loading site script $ac_site_file" >&6;}
-@@ -1233,8 +1720,8 @@ if test -r "$cache_file"; then
+@@ -1233,8 +1720,8 @@
      { echo "$as_me:$LINENO: loading cache $cache_file" >&5
  echo "$as_me: loading cache $cache_file" >&6;}
      case $cache_file in
@@ -23385,7 +23403,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
      esac
    fi
  else
-@@ -1246,12 +1733,11 @@ fi
+@@ -1246,12 +1733,11 @@
  # Check that the precious variables saved in the cache have kept the same
  # value.
  ac_cache_corrupted=false
@@ -23401,7 +23419,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
    case $ac_old_set,$ac_new_set in
      set,)
        { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-@@ -1276,8 +1762,7 @@ echo "$as_me:   current value: $ac_new_v
+@@ -1276,8 +1762,7 @@
    # Pass precious variables to config.status.
    if test "$ac_new_set" = set; then
      case $ac_new_val in
@@ -23411,7 +23429,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
      *) ac_arg=$ac_var=$ac_new_val ;;
      esac
      case " $ac_configure_args " in
-@@ -1294,12 +1779,6 @@ echo "$as_me: error: run \`make distclea
+@@ -1294,12 +1779,6 @@
     { (exit 1); exit 1; }; }
  fi
  
@@ -23424,7 +23442,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  
  
  
-@@ -1316,108 +1795,163 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -1316,108 +1795,163 @@
  
  
  
@@ -23640,7 +23658,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  
  
  # The aliases save the names the user supplied, while $host etc.
-@@ -1434,8 +1968,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -1434,8 +1968,8 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
  set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -23651,7 +23669,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -1448,32 +1982,34 @@ do
+@@ -1448,32 +1982,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -23693,7 +23711,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -1486,36 +2022,51 @@ do
+@@ -1486,36 +2022,51 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -23755,7 +23773,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -1528,74 +2079,34 @@ do
+@@ -1528,74 +2079,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -23839,7 +23857,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -1609,7 +2120,7 @@ do
+@@ -1609,7 +2120,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -23848,7 +23866,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
      if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
         ac_prog_rejected=yes
         continue
-@@ -1620,6 +2131,7 @@ do
+@@ -1620,6 +2131,7 @@
    fi
  done
  done
@@ -23856,7 +23874,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  
  if test $ac_prog_rejected = yes; then
    # We found a bogon in the path, so make sure we never use it.
-@@ -1637,22 +2149,23 @@ fi
+@@ -1637,22 +2149,23 @@
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
@@ -23887,7 +23905,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -1665,36 +2178,38 @@ do
+@@ -1665,36 +2178,38 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -23934,7 +23952,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -1707,29 +2222,45 @@ do
+@@ -1707,29 +2222,45 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -23986,7 +24004,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  fi
  
  fi
-@@ -1742,21 +2273,35 @@ See \`config.log' for more details." >&2
+@@ -1742,21 +2273,35 @@
     { (exit 1); exit 1; }; }
  
  # Provide some information about the compiler.
@@ -24030,7 +24048,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
-@@ -1781,47 +2326,77 @@ ac_clean_files="$ac_clean_files a.out a.
+@@ -1781,47 +2326,77 @@
  # Try to create an executable without -o first, disregard a.out.
  # It will help us diagnose broken compilers, and finding out an intuition
  # of exeext.
@@ -24130,7 +24148,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
-@@ -1833,19 +2408,21 @@ See \`config.log' for more details." >&2
+@@ -1833,19 +2408,21 @@
  fi
  
  ac_exeext=$ac_cv_exeext
@@ -24159,7 +24177,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -1864,22 +2441,27 @@ See \`config.log' for more details." >&2
+@@ -1864,22 +2441,27 @@
      fi
    fi
  fi
@@ -24199,7 +24217,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
-@@ -1890,9 +2472,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -1890,9 +2472,8 @@
  for ac_file in conftest.exe conftest conftest.*; do
    test -f "$ac_file" || continue
    case $ac_file in
@@ -24210,7 +24228,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  	  break;;
      * ) break;;
    esac
-@@ -1906,14 +2487,14 @@ See \`config.log' for more details." >&2
+@@ -1906,14 +2487,14 @@
  fi
  
  rm -f conftest$ac_cv_exeext
@@ -24229,7 +24247,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${ac_cv_objext+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -1933,14 +2514,20 @@ main ()
+@@ -1933,14 +2514,20 @@
  }
  _ACEOF
  rm -f conftest.o conftest.obj
@@ -24254,7 +24272,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
      *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
         break;;
    esac
-@@ -1958,12 +2545,12 @@ fi
+@@ -1958,12 +2545,12 @@
  
  rm -f conftest.$ac_cv_objext conftest.$ac_ext
  fi
@@ -24271,7 +24289,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${ac_cv_c_compiler_gnu+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -1986,50 +2573,49 @@ main ()
+@@ -1986,50 +2573,49 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -24345,7 +24363,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -2045,38 +2631,118 @@ main ()
+@@ -2045,38 +2631,118 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -24480,7 +24498,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "$ac_test_CFLAGS" = set; then
    CFLAGS=$ac_save_CFLAGS
  elif test $ac_cv_prog_cc_g = yes; then
-@@ -2092,12 +2758,12 @@ else
+@@ -2092,12 +2758,12 @@
      CFLAGS=
    fi
  fi
@@ -24497,7 +24515,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  ac_save_CC=$CC
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -2131,12 +2797,17 @@ static char *f (char * (*g) (char **, in
+@@ -2131,12 +2797,17 @@
  /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
     function prototypes and stuff, but not '\xHH' hex character constants.
     These don't provoke an error unfortunately, instead are silently treated
@@ -24517,7 +24535,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  int test (int i, double x);
  struct s1 {int (*f) (int a);};
  struct s2 {int (*f) (double a);};
-@@ -2151,335 +2822,144 @@ return f (e, argv, 0) != argv[0]  ||  f 
+@@ -2151,335 +2822,144 @@
    return 0;
  }
  _ACEOF
@@ -24940,7 +24958,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  
  fi
  
-@@ -2499,8 +2979,8 @@ am__api_version="1.9"
+@@ -2499,8 +2979,8 @@
  # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
  # OS/2's system install, which has a completely different semantic
  # ./install, which can be erroneously created by make from ./install.sh.
@@ -24951,7 +24969,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test -z "$INSTALL"; then
  if test "${ac_cv_path_install+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2522,7 +3002,7 @@ case $as_dir/ in
+@@ -2522,7 +3002,7 @@
      # by default.
      for ac_prog in ginstall scoinst install; do
        for ac_exec_ext in '' $ac_executable_extensions; do
@@ -24960,7 +24978,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  	  if test $ac_prog = install &&
  	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
  	    # AIX install.  It has an incompatible calling convention.
-@@ -2541,21 +3021,22 @@ case $as_dir/ in
+@@ -2541,21 +3021,22 @@
      ;;
  esac
  done
@@ -24988,7 +25006,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  
  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
  # It thinks the first close brace ends the variable substitution.
-@@ -2565,8 +3046,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
+@@ -2565,8 +3046,8 @@
  
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
@@ -24999,7 +25017,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  # Just in case
  sleep 1
  echo timestamp > conftest.file
-@@ -2608,20 +3089,20 @@ echo "$as_me: error: newly created file 
+@@ -2608,20 +3089,20 @@
  Check your system clock" >&2;}
     { (exit 1); exit 1; }; }
  fi
@@ -25025,7 +25043,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  
  # expand $ac_aux_dir to an absolute path
  am_aux_dir=`cd $ac_aux_dir && pwd`
-@@ -2673,8 +3154,8 @@ for ac_prog in gawk mawk nawk awk
+@@ -2673,8 +3154,8 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -25036,7 +25054,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${ac_cv_prog_AWK+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2687,54 +3168,57 @@ do
+@@ -2687,54 +3168,57 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -25115,7 +25133,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
    SET_MAKE="MAKE=${MAKE-make}"
  fi
  
-@@ -2749,7 +3233,7 @@ rmdir .tst 2>/dev/null
+@@ -2749,7 +3233,7 @@
  
  DEPDIR="${am__leading_dot}deps"
  
@@ -25124,7 +25142,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  
  
  am_make=${MAKE-make}
-@@ -2759,8 +3243,8 @@ am__doit:
+@@ -2759,8 +3243,8 @@
  .PHONY: am__doit
  END
  # If we don't find an include directive, just comment out the code.
@@ -25135,7 +25153,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  am__include="#"
  am__quote=
  _am_result=none
-@@ -2787,15 +3271,15 @@ if test "$am__include" = "#"; then
+@@ -2787,15 +3271,15 @@
  fi
  
  
@@ -25156,7 +25174,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "x$enable_dependency_tracking" != xno; then
    am_depcomp="$ac_aux_dir/depcomp"
    AMDEPBACKSLASH='\'
-@@ -2870,8 +3354,8 @@ if test "$cross_compiling" != no; then
+@@ -2870,8 +3354,8 @@
    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.
  set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -25167,7 +25185,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${ac_cv_prog_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2884,32 +3368,34 @@ do
+@@ -2884,32 +3368,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -25209,7 +25227,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2922,27 +3408,41 @@ do
+@@ -2922,27 +3408,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -25258,7 +25276,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  else
    STRIP="$ac_cv_prog_STRIP"
  fi
-@@ -2963,8 +3463,8 @@ am__tar='${AMTAR} chof - "$$tardir"'; am
+@@ -2963,8 +3463,8 @@
  
  depcc="$CC"   am_compiler_list=
  
@@ -25269,7 +25287,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3053,8 +3553,8 @@ else
+@@ -3053,8 +3553,8 @@
  fi
  
  fi
@@ -25280,7 +25298,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
  
  
-@@ -3072,10 +3572,9 @@ fi
+@@ -3072,10 +3572,9 @@
  
  
  
@@ -25293,7 +25311,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  case $enableval in
  yes) enable_shared=yes ;;
  no) enable_shared=no ;;
-@@ -3093,11 +3592,11 @@ no) enable_shared=no ;;
+@@ -3093,11 +3592,11 @@
  esac
  else
    enable_shared=yes
@@ -25309,7 +25327,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  case $enableval in
  yes) enable_static=yes ;;
  no) enable_static=no ;;
-@@ -3115,11 +3614,11 @@ no) enable_static=no ;;
+@@ -3115,11 +3614,11 @@
  esac
  else
    enable_static=yes
@@ -25325,7 +25343,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  case $enableval in
  yes) enable_fast_install=yes ;;
  no) enable_fast_install=no ;;
-@@ -3137,20 +3636,21 @@ no) enable_fast_install=no ;;
+@@ -3137,20 +3636,21 @@
  esac
  else
    enable_fast_install=yes
@@ -25354,7 +25372,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
    case $host in
    *-*-mingw*)
      # gcc leaves a trailing carriage return which upsets mingw
-@@ -3179,11 +3679,11 @@ echo $ECHO_N "checking for ld used by GC
+@@ -3179,11 +3679,11 @@
      ;;
    esac
  elif test "$with_gnu_ld" = yes; then
@@ -25370,7 +25388,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  fi
  if test "${lt_cv_path_LD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3212,17 +3712,17 @@ fi
+@@ -3212,17 +3712,17 @@
  
  LD="$lt_cv_path_LD"
  if test -n "$LD"; then
@@ -25394,7 +25412,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${lt_cv_prog_gnu_ld+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3233,25 +3733,25 @@ else
+@@ -3233,25 +3733,25 @@
    lt_cv_prog_gnu_ld=no
  fi
  fi
@@ -25428,7 +25446,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${lt_cv_path_NM+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3286,22 +3786,22 @@ fi
+@@ -3286,22 +3786,22 @@
  fi
  
  NM="$lt_cv_path_NM"
@@ -25461,7 +25479,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${lt_cv_deplibs_check_method+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3463,8 +3963,8 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+@@ -3463,8 +3963,8 @@
  esac
  
  fi
@@ -25472,7 +25490,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  file_magic_cmd=$lt_cv_file_magic_cmd
  deplibs_check_method=$lt_cv_deplibs_check_method
  
-@@ -3474,8 +3974,8 @@ deplibs_check_method=$lt_cv_deplibs_chec
+@@ -3474,8 +3974,8 @@
  # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
  
  # find the maximum length of command line arguments
@@ -25483,7 +25501,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${lt_cv_sys_max_cmd_len+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3526,11 +4026,11 @@ else
+@@ -3526,11 +4026,11 @@
  fi
  
  if test -n "$lt_cv_sys_max_cmd_len" ; then
@@ -25499,7 +25517,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  fi
  
  
-@@ -3538,8 +4038,8 @@ fi
+@@ -3538,8 +4038,8 @@
  case $deplibs_check_method in
  file_magic*)
    if test "$file_magic_cmd" = '$MAGIC_CMD'; then
@@ -25510,7 +25528,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3593,17 +4093,17 @@ fi
+@@ -3593,17 +4093,17 @@
  
  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  if test -n "$MAGIC_CMD"; then
@@ -25534,7 +25552,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3657,11 +4157,11 @@ fi
+@@ -3657,11 +4157,11 @@
  
  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  if test -n "$MAGIC_CMD"; then
@@ -25550,7 +25568,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  fi
  
    else
-@@ -3676,8 +4176,8 @@ esac
+@@ -3676,8 +4176,8 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
  set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -25561,7 +25579,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${ac_cv_prog_RANLIB+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3690,32 +4190,34 @@ do
+@@ -3690,32 +4190,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -25603,7 +25621,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3728,27 +4230,41 @@ do
+@@ -3728,27 +4230,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -25652,7 +25670,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  else
    RANLIB="$ac_cv_prog_RANLIB"
  fi
-@@ -3756,8 +4272,8 @@ fi
+@@ -3756,8 +4272,8 @@
  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.
  set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -25663,7 +25681,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${ac_cv_prog_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3770,32 +4286,34 @@ do
+@@ -3770,32 +4286,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -25705,7 +25723,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3808,27 +4326,41 @@ do
+@@ -3808,27 +4326,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -25754,7 +25772,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  else
    STRIP="$ac_cv_prog_STRIP"
  fi
-@@ -3843,22 +4375,22 @@ test "$GCC" = yes && libtool_flags="$lib
+@@ -3843,22 +4375,22 @@
  test "$lt_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
  
  
@@ -25784,7 +25802,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  test x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic"
  test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
  
-@@ -3867,7 +4399,7 @@ test x"$pic_mode" = xno && libtool_flags
+@@ -3867,7 +4399,7 @@
  case $host in
  *-*-irix6*)
    # Find out which ABI we are using.
@@ -25793,7 +25811,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-@@ -3972,13 +4504,12 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*li
+@@ -3972,13 +4504,12 @@
    # On SCO OpenServer 5, we need -belf to get full-featured binaries.
    SAVE_CFLAGS="$CFLAGS"
    CFLAGS="$CFLAGS -belf"
@@ -25809,7 +25827,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
       ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4001,35 +4532,32 @@ main ()
+@@ -4001,35 +4532,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -25860,7 +25878,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
        conftest$ac_exeext conftest.$ac_ext
       ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -4038,8 +4566,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
+@@ -4038,8 +4566,8 @@
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  fi
@@ -25871,7 +25889,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
    if test x"$lt_cv_cc_needs_belf" != x"yes"; then
      # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
      CFLAGS="$SAVE_CFLAGS"
-@@ -4069,39 +4597,58 @@ _ACEOF
+@@ -4069,39 +4597,58 @@
  
  # The following way of writing the cache mishandles newlines in values,
  # but we know of no workaround that is simple, portable, and efficient.
@@ -25946,7 +25964,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
    fi
  fi
  rm -f confcache
-@@ -4127,8 +4674,8 @@ if test -r "$cache_file"; then
+@@ -4127,8 +4674,8 @@
      { echo "$as_me:$LINENO: loading cache $cache_file" >&5
  echo "$as_me: loading cache $cache_file" >&6;}
      case $cache_file in
@@ -25957,7 +25975,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
      esac
    fi
  else
-@@ -4154,10 +4701,9 @@ exec 5>>./config.log
+@@ -4154,10 +4701,9 @@
  
  
  
@@ -25970,7 +25988,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
    yes | "") { { echo "$as_me:$LINENO: error: enable-targets option must specify target names or 'all'" >&5
  echo "$as_me: error: enable-targets option must specify target names or 'all'" >&2;}
     { (exit 1); exit 1; }; }
-@@ -4165,31 +4711,32 @@ echo "$as_me: error: enable-targets opti
+@@ -4165,31 +4711,32 @@
    no)       enable_targets= ;;
    *)        enable_targets=$enableval ;;
  esac
@@ -26011,7 +26029,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  
  # Enable -Werror by default when using gcc
  if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
-@@ -4206,10 +4753,9 @@ if test "${GCC}" = yes ; then
+@@ -4206,10 +4753,9 @@
    WARN_CFLAGS="${GCC_WARN_CFLAGS}"
  fi
  
@@ -26024,7 +26042,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
    yes)	WARN_CFLAGS="${GCC_WARN_CFLAGS}";;
    no)	if test "${GCC}" = yes ; then
  	  WARN_CFLAGS="-w"
-@@ -4220,7 +4766,8 @@ if test "${enable_build_warnings+set}" =
+@@ -4220,7 +4766,8 @@
          WARN_CFLAGS="${t} ${GCC_WARN_CFLAGS}";;
    *)    WARN_CFLAGS=`echo "${enableval}" | sed -e "s/,/ /g"`;;
  esac
@@ -26034,7 +26052,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  
  if test x"$silent" != x"yes" && test x"$WARN_CFLAGS" != x""; then
    echo "Setting warning flags = $WARN_CFLAGS" 6>&1
-@@ -4230,7 +4777,7 @@ fi
+@@ -4230,7 +4777,7 @@
  
  
  
@@ -26043,7 +26061,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  
  
  if test -z "$target" ; then
-@@ -4252,8 +4799,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -4252,8 +4799,8 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
  set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -26054,7 +26072,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4266,32 +4813,34 @@ do
+@@ -4266,32 +4813,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -26096,7 +26114,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4304,36 +4853,51 @@ do
+@@ -4304,36 +4853,51 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -26158,7 +26176,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4346,74 +4910,34 @@ do
+@@ -4346,74 +4910,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -26242,7 +26260,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4427,7 +4951,7 @@ do
+@@ -4427,7 +4951,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -26251,7 +26269,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
      if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
         ac_prog_rejected=yes
         continue
-@@ -4438,6 +4962,7 @@ do
+@@ -4438,6 +4962,7 @@
    fi
  done
  done
@@ -26259,7 +26277,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  
  if test $ac_prog_rejected = yes; then
    # We found a bogon in the path, so make sure we never use it.
-@@ -4455,22 +4980,23 @@ fi
+@@ -4455,22 +4980,23 @@
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
@@ -26290,7 +26308,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4483,36 +5009,38 @@ do
+@@ -4483,36 +5009,38 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -26337,7 +26355,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4525,29 +5053,45 @@ do
+@@ -4525,29 +5053,45 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -26389,7 +26407,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  fi
  
  fi
-@@ -4560,27 +5104,41 @@ See \`config.log' for more details." >&2
+@@ -4560,27 +5104,41 @@
     { (exit 1); exit 1; }; }
  
  # Provide some information about the compiler.
@@ -26441,7 +26459,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${ac_cv_c_compiler_gnu+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4603,50 +5161,49 @@ main ()
+@@ -4603,50 +5161,49 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -26515,7 +26533,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -4662,311 +5219,248 @@ main ()
+@@ -4662,311 +5219,248 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -26988,7 +27006,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4984,8 +5478,8 @@ for ac_prog in 'bison -y' byacc
+@@ -4984,8 +5478,8 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -26999,7 +27017,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${ac_cv_prog_YACC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4998,25 +5492,27 @@ do
+@@ -4998,25 +5492,27 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -27032,7 +27050,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
    test -n "$YACC" && break
  done
  test -n "$YACC" || YACC="yacc"
-@@ -5025,8 +5521,8 @@ for ac_prog in flex lex
+@@ -5025,8 +5521,8 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -27043,7 +27061,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${ac_cv_prog_LEX+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5039,253 +5535,182 @@ do
+@@ -5039,253 +5535,182 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -27400,7 +27418,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test $ac_cv_prog_lex_yytext_pointer = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -5293,6 +5718,7 @@ cat >>confdefs.h <<\_ACEOF
+@@ -5293,6 +5718,7 @@
  _ACEOF
  
  fi
@@ -27408,7 +27426,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  
  fi
  if test "$LEX" = :; then
-@@ -5303,8 +5729,8 @@ ALL_LINGUAS="fr tr ja es sv da zh_CN ru 
+@@ -5303,8 +5729,8 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
  set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -27419,7 +27437,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${ac_cv_prog_RANLIB+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5317,32 +5743,34 @@ do
+@@ -5317,32 +5743,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -27461,7 +27479,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5355,27 +5783,41 @@ do
+@@ -5355,27 +5783,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -27510,7 +27528,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  else
    RANLIB="$ac_cv_prog_RANLIB"
  fi
-@@ -5385,8 +5827,8 @@ ac_cpp='$CPP $CPPFLAGS'
+@@ -5385,8 +5827,8 @@
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -27521,7 +27539,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  # On Suns, sometimes $CPP names a directory.
  if test -n "$CPP" && test -d "$CPP"; then
    CPP=
-@@ -5420,24 +5862,22 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -5420,24 +5862,22 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -27557,7 +27575,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
    :
  else
    echo "$as_me: failed program was:" >&5
-@@ -5446,9 +5886,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -5446,9 +5886,10 @@
    # Broken: fails on valid input.
  continue
  fi
@@ -27569,7 +27587,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -5458,24 +5899,22 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -5458,24 +5899,22 @@
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
@@ -27605,7 +27623,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
    # Broken: success on invalid input.
  continue
  else
-@@ -5486,6 +5925,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -5486,6 +5925,7 @@
  ac_preproc_ok=:
  break
  fi
@@ -27613,7 +27631,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -5503,8 +5943,8 @@ fi
+@@ -5503,8 +5943,8 @@
  else
    ac_cv_prog_CPP=$CPP
  fi
@@ -27624,7 +27642,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  ac_preproc_ok=false
  for ac_c_preproc_warn_flag in '' yes
  do
-@@ -5527,24 +5967,22 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -5527,24 +5967,22 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -27660,7 +27678,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
    :
  else
    echo "$as_me: failed program was:" >&5
-@@ -5553,9 +5991,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -5553,9 +5991,10 @@
    # Broken: fails on valid input.
  continue
  fi
@@ -27672,7 +27690,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -5565,24 +6004,22 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -5565,24 +6004,22 @@
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
@@ -27708,7 +27726,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
    # Broken: success on invalid input.
  continue
  else
-@@ -5593,6 +6030,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -5593,6 +6030,7 @@
  ac_preproc_ok=:
  break
  fi
@@ -27716,7 +27734,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -5615,23 +6053,170 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
+@@ -5615,23 +6053,170 @@
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
@@ -27898,7 +27916,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${ac_cv_header_stdc+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5655,35 +6240,31 @@ main ()
+@@ -5655,35 +6240,31 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -27948,7 +27966,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  
  if test $ac_cv_header_stdc = yes; then
    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-@@ -5739,6 +6320,7 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -5739,6 +6320,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <ctype.h>
@@ -27956,7 +27974,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  #if ((' ' & 0x0FF) == 0x020)
  # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
  # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -5758,18 +6340,27 @@ main ()
+@@ -5758,18 +6340,27 @@
    for (i = 0; i < 256; i++)
      if (XOR (islower (i), ISLOWER (i))
  	|| toupper (i) != TOUPPER (i))
@@ -27990,7 +28008,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5782,12 +6373,14 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -5782,12 +6373,14 @@
  ( exit $ac_status )
  ac_cv_header_stdc=no
  fi
@@ -28008,7 +28026,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test $ac_cv_header_stdc = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -5796,8 +6389,8 @@ _ACEOF
+@@ -5796,8 +6389,8 @@
  
  fi
  
@@ -28019,7 +28037,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${ac_cv_c_const+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5815,10 +6408,10 @@ main ()
+@@ -5815,10 +6408,10 @@
  #ifndef __cplusplus
    /* Ultrix mips cc rejects this.  */
    typedef int charset[2];
@@ -28033,7 +28051,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
    /* NEC SVR4.0.2 mips cc rejects this.  */
    struct point {int x, y;};
    static struct point const zero = {0,0};
-@@ -5827,16 +6420,17 @@ main ()
+@@ -5827,16 +6420,17 @@
       an arm of an if-expression whose if-part is not a constant
       expression */
    const char *g = "string";
@@ -28055,7 +28073,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
    }
    { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
      int x[] = {25, 17};
-@@ -5855,7 +6449,9 @@ main ()
+@@ -5855,7 +6449,9 @@
    }
    { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
      const int foo = 10;
@@ -28065,7 +28083,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  #endif
  
    ;
-@@ -5863,38 +6459,34 @@ main ()
+@@ -5863,38 +6459,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -28120,7 +28138,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test $ac_cv_c_const = no; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -5903,8 +6495,8 @@ _ACEOF
+@@ -5903,8 +6495,8 @@
  
  fi
  
@@ -28131,7 +28149,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${ac_cv_c_inline+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5924,39 +6516,37 @@ $ac_kw foo_t foo () {return 0; }
+@@ -5924,39 +6516,37 @@
  
  _ACEOF
  rm -f conftest.$ac_objext
@@ -28189,7 +28207,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  
  
  case $ac_cv_c_inline in
-@@ -5988,9 +6578,9 @@ for ac_header in sys/types.h sys/stat.h 
+@@ -5988,9 +6578,9 @@
  		  inttypes.h stdint.h unistd.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -28202,7 +28220,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -6004,38 +6594,35 @@ $ac_includes_default
+@@ -6004,38 +6594,35 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -28258,7 +28276,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -6046,8 +6633,8 @@ fi
+@@ -6046,8 +6633,8 @@
  done
  
  
@@ -28269,7 +28287,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${ac_cv_type_off_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6058,62 +6645,59 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -6058,62 +6645,59 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -28354,7 +28372,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${ac_cv_type_size_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6124,64 +6708,61 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -6124,64 +6708,61 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -28441,7 +28459,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${ac_cv_working_alloca_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6196,44 +6777,42 @@ int
+@@ -6196,44 +6777,42 @@
  main ()
  {
  char *p = (char *) alloca (2 * sizeof (int));
@@ -28504,7 +28522,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test $ac_cv_working_alloca_h = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -6242,8 +6821,8 @@ _ACEOF
+@@ -6242,8 +6821,8 @@
  
  fi
  
@@ -28515,7 +28533,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${ac_cv_func_alloca_works+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6260,7 +6839,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -6260,7 +6839,7 @@
  #  include <malloc.h>
  #  define alloca _alloca
  # else
@@ -28524,7 +28542,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  #   include <alloca.h>
  #  else
  #   ifdef _AIX
-@@ -6278,44 +6857,42 @@ int
+@@ -6278,44 +6857,42 @@
  main ()
  {
  char *p = (char *) alloca (1);
@@ -28587,7 +28605,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  
  if test $ac_cv_func_alloca_works = yes; then
  
-@@ -6329,15 +6906,15 @@ else
+@@ -6329,15 +6906,15 @@
  # contain a buggy version.  If you still want to use their alloca,
  # use ar to extract alloca.o from them instead of compiling alloca.c.
  
@@ -28606,7 +28624,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${ac_cv_os_cray+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6347,7 +6924,7 @@ _ACEOF
+@@ -6347,7 +6924,7 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -28615,7 +28633,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  webecray
  #else
  wenotbecray
-@@ -6363,14 +6940,14 @@ fi
+@@ -6363,14 +6940,14 @@
  rm -f conftest*
  
  fi
@@ -28635,7 +28653,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -6396,68 +6973,60 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -6396,68 +6973,60 @@
  
  #undef $ac_func
  
@@ -28727,7 +28745,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test `eval echo '${'$as_ac_var'}'` = yes; then
  
  cat >>confdefs.h <<_ACEOF
-@@ -6470,8 +7039,8 @@ fi
+@@ -6470,8 +7039,8 @@
    done
  fi
  
@@ -28738,7 +28756,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${ac_cv_c_stack_direction+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6484,6 +7053,7 @@ _ACEOF
+@@ -6484,6 +7053,7 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -28746,7 +28764,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  int
  find_stack_direction ()
  {
-@@ -6501,17 +7071,26 @@ find_stack_direction ()
+@@ -6501,17 +7071,26 @@
  int
  main ()
  {
@@ -28778,7 +28796,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -6524,11 +7103,13 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -6524,11 +7103,13 @@
  ( exit $ac_status )
  ac_cv_c_stack_direction=-1
  fi
@@ -28795,7 +28813,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  
  cat >>confdefs.h <<_ACEOF
  #define STACK_DIRECTION $ac_cv_c_stack_direction
-@@ -6542,18 +7123,19 @@ fi
+@@ -6542,18 +7123,19 @@
  for ac_header in stdlib.h unistd.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -28823,7 +28841,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -6564,41 +7146,37 @@ $ac_includes_default
+@@ -6564,41 +7146,37 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -28883,7 +28901,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -6607,24 +7185,22 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -6607,24 +7185,22 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -28919,7 +28937,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
    ac_header_preproc=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -6632,9 +7208,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -6632,9 +7208,10 @@
  
    ac_header_preproc=no
  fi
@@ -28932,7 +28950,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -6658,25 +7235,19 @@ echo "$as_me: WARNING: $ac_header:     s
+@@ -6658,25 +7235,19 @@
  echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -28965,7 +28983,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -6692,9 +7263,9 @@ done
+@@ -6692,9 +7263,9 @@
  for ac_func in getpagesize
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -28978,7 +28996,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -6720,68 +7291,60 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -6720,68 +7291,60 @@
  
  #undef $ac_func
  
@@ -29070,7 +29088,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -6790,8 +7353,8 @@ _ACEOF
+@@ -6790,8 +7353,8 @@
  fi
  done
  
@@ -29081,7 +29099,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6833,21 +7396,21 @@ $ac_includes_default
+@@ -6833,21 +7396,21 @@
  #include <fcntl.h>
  #include <sys/mman.h>
  
@@ -29107,7 +29125,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  #   include <sys/param.h>
  #   ifdef EXEC_PAGESIZE
  #    define getpagesize() EXEC_PAGESIZE
-@@ -6886,15 +7449,15 @@ main ()
+@@ -6886,15 +7449,15 @@
    /* First, make a file with some known garbage in it. */
    data = (char *) malloc (pagesize);
    if (!data)
@@ -29126,7 +29144,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
    close (fd);
  
    /* Next, try to mmap the file at a fixed address which already has
-@@ -6902,17 +7465,17 @@ main ()
+@@ -6902,17 +7465,17 @@
       we see the same garbage.  */
    fd = open ("conftest.mmap", O_RDWR);
    if (fd < 0)
@@ -29149,7 +29167,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  
    /* Finally, make sure that changes to the mapped area do not
       percolate back to the file as seen by read().  (This is a bug on
-@@ -6921,24 +7484,33 @@ main ()
+@@ -6921,24 +7484,33 @@
      *(data2 + i) = *(data2 + i) + 1;
    data3 = (char *) malloc (pagesize);
    if (!data3)
@@ -29191,7 +29209,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -6951,11 +7523,13 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -6951,11 +7523,13 @@
  ( exit $ac_status )
  ac_cv_func_mmap_fixed_mapped=no
  fi
@@ -29208,7 +29226,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test $ac_cv_func_mmap_fixed_mapped = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -6979,18 +7553,19 @@ for ac_header in argz.h limits.h locale.
+@@ -6979,18 +7553,19 @@
  unistd.h values.h sys/param.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -29236,7 +29254,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -7001,41 +7576,37 @@ $ac_includes_default
+@@ -7001,41 +7576,37 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -29296,7 +29314,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -7044,24 +7615,22 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -7044,24 +7615,22 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -29332,7 +29350,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
    ac_header_preproc=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -7069,9 +7638,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -7069,9 +7638,10 @@
  
    ac_header_preproc=no
  fi
@@ -29345,7 +29363,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -7095,25 +7665,19 @@ echo "$as_me: WARNING: $ac_header:     s
+@@ -7095,25 +7665,19 @@
  echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -29378,7 +29396,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -7139,9 +7703,9 @@ for ac_func in getcwd munmap putenv sete
+@@ -7139,9 +7703,9 @@
  __argz_count __argz_stringify __argz_next
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -29391,7 +29409,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -7167,68 +7731,60 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -7167,68 +7731,60 @@
  
  #undef $ac_func
  
@@ -29483,7 +29501,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -7243,9 +7799,9 @@ done
+@@ -7243,9 +7799,9 @@
  for ac_func in stpcpy
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -29496,7 +29514,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -7271,68 +7827,60 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -7271,68 +7827,60 @@
  
  #undef $ac_func
  
@@ -29588,7 +29606,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -7351,8 +7899,8 @@ _ACEOF
+@@ -7351,8 +7899,8 @@
     fi
  
     if test $ac_cv_header_locale_h = yes; then
@@ -29599,7 +29617,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${am_cv_val_LC_MESSAGES+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7372,39 +7920,36 @@ return LC_MESSAGES
+@@ -7372,39 +7920,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -29656,7 +29674,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
      if test $am_cv_val_LC_MESSAGES = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -7413,34 +7958,34 @@ _ACEOF
+@@ -7413,34 +7958,34 @@
  
      fi
    fi
@@ -29707,7 +29725,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  
        nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
        if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
-@@ -7449,17 +7994,17 @@ echo "${ECHO_T}$nls_cv_force_use_gnu_get
+@@ -7449,17 +7994,17 @@
  	CATOBJEXT=
  
  	if test "${ac_cv_header_libintl_h+set}" = set; then
@@ -29731,7 +29749,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -7470,41 +8015,37 @@ $ac_includes_default
+@@ -7470,41 +8015,37 @@
  #include <libintl.h>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -29791,7 +29809,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -7513,24 +8054,22 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -7513,24 +8054,22 @@
  /* end confdefs.h.  */
  #include <libintl.h>
  _ACEOF
@@ -29827,7 +29845,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
    ac_header_preproc=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -7538,9 +8077,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -7538,9 +8077,10 @@
  
    ac_header_preproc=no
  fi
@@ -29840,7 +29858,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -7564,30 +8104,23 @@ echo "$as_me: WARNING: libintl.h:     se
+@@ -7564,30 +8104,23 @@
  echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;}
@@ -29878,7 +29896,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${gt_cv_func_gettext_libc+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7607,43 +8140,40 @@ return (int) gettext ("")
+@@ -7607,43 +8140,40 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -29941,7 +29959,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7656,59 +8186,56 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -7656,59 +8186,56 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -30024,7 +30042,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${gt_cv_func_gettext_libintl+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7728,39 +8255,36 @@ return (int) gettext ("")
+@@ -7728,39 +8255,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -30081,7 +30099,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  fi
  
  	   fi
-@@ -7774,8 +8298,8 @@ _ACEOF
+@@ -7774,8 +8298,8 @@
  
  	      # Extract the first word of "msgfmt", so it can be a program name with args.
  set dummy msgfmt; ac_word=$2
@@ -30092,7 +30110,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${ac_cv_path_MSGFMT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7801,20 +8325,20 @@ esac
+@@ -7801,20 +8325,20 @@
  fi
  MSGFMT="$ac_cv_path_MSGFMT"
  if test -n "$MSGFMT"; then
@@ -30120,7 +30138,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -7840,68 +8364,60 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -7840,68 +8364,60 @@
  
  #undef $ac_func
  
@@ -30212,7 +30230,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -7912,8 +8428,8 @@ done
+@@ -7912,8 +8428,8 @@
  
  		# Extract the first word of "gmsgfmt", so it can be a program name with args.
  set dummy gmsgfmt; ac_word=$2
@@ -30223,7 +30241,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${ac_cv_path_GMSGFMT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7928,32 +8444,33 @@ do
+@@ -7928,32 +8444,33 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -30265,7 +30283,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${ac_cv_path_XGETTEXT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7979,11 +8496,11 @@ esac
+@@ -7979,11 +8496,11 @@
  fi
  XGETTEXT="$ac_cv_path_XGETTEXT"
  if test -n "$XGETTEXT"; then
@@ -30281,7 +30299,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  fi
  
  		cat >conftest.$ac_ext <<_ACEOF
-@@ -8003,37 +8520,34 @@ extern int _nl_msg_cat_cntr;
+@@ -8003,37 +8520,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -30334,7 +30352,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
        conftest$ac_exeext conftest.$ac_ext
  		INSTOBJEXT=.mo
  	      fi
-@@ -8055,8 +8569,8 @@ fi
+@@ -8055,8 +8569,8 @@
                  INTLOBJS="\$(GETTOBJS)"
          # Extract the first word of "msgfmt", so it can be a program name with args.
  set dummy msgfmt; ac_word=$2
@@ -30345,7 +30363,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${ac_cv_path_MSGFMT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8082,17 +8596,17 @@ esac
+@@ -8082,17 +8596,17 @@
  fi
  MSGFMT="$ac_cv_path_MSGFMT"
  if test -n "$MSGFMT"; then
@@ -30369,7 +30387,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${ac_cv_path_GMSGFMT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8107,32 +8621,33 @@ do
+@@ -8107,32 +8621,33 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -30411,7 +30429,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${ac_cv_path_XGETTEXT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8158,11 +8673,11 @@ esac
+@@ -8158,11 +8673,11 @@
  fi
  XGETTEXT="$ac_cv_path_XGETTEXT"
  if test -n "$XGETTEXT"; then
@@ -30427,7 +30445,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  fi
  
  
-@@ -8181,8 +8696,8 @@ fi
+@@ -8181,8 +8696,8 @@
  			if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
  	  : ;
  	else
@@ -30438,7 +30456,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  	  XGETTEXT=":"
  	fi
        fi
-@@ -8231,8 +8746,8 @@ _ACEOF
+@@ -8231,8 +8746,8 @@
       if test "x$ALL_LINGUAS" = "x"; then
         LINGUAS=
       else
@@ -30449,7 +30467,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
         NEW_LINGUAS=
         for lang in ${LINGUAS=$ALL_LINGUAS}; do
           case "$ALL_LINGUAS" in
-@@ -8240,8 +8755,8 @@ echo $ECHO_N "checking for catalogs to b
+@@ -8240,8 +8755,8 @@
           esac
         done
         LINGUAS=$NEW_LINGUAS
@@ -30460,7 +30478,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
       fi
  
            if test -n "$LINGUAS"; then
-@@ -8260,17 +8775,17 @@ echo "${ECHO_T}$LINGUAS" >&6
+@@ -8260,17 +8775,17 @@
              if test -f $srcdir/po2tbl.sed.in; then
        if test "$CATOBJEXT" = ".cat"; then
  	 if test "${ac_cv_header_linux_version_h+set}" = set; then
@@ -30484,7 +30502,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8281,41 +8796,37 @@ $ac_includes_default
+@@ -8281,41 +8796,37 @@
  #include <linux/version.h>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -30544,7 +30562,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8324,24 +8835,22 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -8324,24 +8835,22 @@
  /* end confdefs.h.  */
  #include <linux/version.h>
  _ACEOF
@@ -30580,7 +30598,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
    ac_header_preproc=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -8349,9 +8858,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -8349,9 +8858,10 @@
  
    ac_header_preproc=no
  fi
@@ -30593,7 +30611,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -8375,25 +8885,18 @@ echo "$as_me: WARNING: linux/version.h: 
+@@ -8375,25 +8885,18 @@
  echo "$as_me: WARNING: linux/version.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: linux/version.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: linux/version.h: in the future, the compiler will take precedence" >&2;}
@@ -30624,7 +30642,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  
  fi
  if test $ac_cv_header_linux_version_h = yes; then
-@@ -8443,17 +8946,17 @@ fi
+@@ -8443,17 +8946,17 @@
     fi
  
  
@@ -30650,7 +30668,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  
  
  if test $USE_MAINTAINER_MODE = yes; then
-@@ -8493,8 +8996,8 @@ AR=${AR-ar}
+@@ -8493,8 +8996,8 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
  set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -30661,7 +30679,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${ac_cv_prog_RANLIB+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8507,32 +9010,34 @@ do
+@@ -8507,32 +9010,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -30703,7 +30721,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8545,27 +9050,41 @@ do
+@@ -8545,27 +9050,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -30752,7 +30770,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  else
    RANLIB="$ac_cv_prog_RANLIB"
  fi
-@@ -8583,8 +9102,8 @@ fi
+@@ -8583,8 +9102,8 @@
  # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
  # OS/2's system install, which has a completely different semantic
  # ./install, which can be erroneously created by make from ./install.sh.
@@ -30763,7 +30781,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test -z "$INSTALL"; then
  if test "${ac_cv_path_install+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -8606,7 +9125,7 @@ case $as_dir/ in
+@@ -8606,7 +9125,7 @@
      # by default.
      for ac_prog in ginstall scoinst install; do
        for ac_exec_ext in '' $ac_executable_extensions; do
@@ -30772,7 +30790,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  	  if test $ac_prog = install &&
  	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
  	    # AIX install.  It has an incompatible calling convention.
-@@ -8625,21 +9144,22 @@ case $as_dir/ in
+@@ -8625,21 +9144,22 @@
      ;;
  esac
  done
@@ -30800,7 +30818,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  
  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
  # It thinks the first close brace ends the variable substitution.
-@@ -8663,8 +9183,8 @@ fi
+@@ -8663,8 +9183,8 @@
  if test "x$cross_compiling" = "xno"; then
    EXEEXT_FOR_BUILD='$(EXEEXT)'
  else
@@ -30811,7 +30829,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${bfd_cv_build_exeext+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8681,8 +9201,8 @@ else
+@@ -8681,8 +9201,8 @@
       rm -f conftest*
       test x"${bfd_cv_build_exeext}" = x && bfd_cv_build_exeext=no
  fi
@@ -30822,7 +30840,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
    EXEEXT_FOR_BUILD=""
    test x"${bfd_cv_build_exeext}" != xno && EXEEXT_FOR_BUILD=${bfd_cv_build_exeext}
  fi
-@@ -8704,18 +9224,19 @@ esac
+@@ -8704,18 +9224,19 @@
  for ac_header in string.h strings.h stdlib.h unistd.h fcntl.h sys/file.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -30850,7 +30868,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8726,41 +9247,37 @@ $ac_includes_default
+@@ -8726,41 +9247,37 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -30910,7 +30928,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8769,24 +9286,22 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -8769,24 +9286,22 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -30946,7 +30964,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
    ac_header_preproc=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -8794,9 +9309,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -8794,9 +9309,10 @@
  
    ac_header_preproc=no
  fi
@@ -30959,7 +30977,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -8820,25 +9336,19 @@ echo "$as_me: WARNING: $ac_header:     s
+@@ -8820,25 +9336,19 @@
  echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -30992,7 +31010,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -8850,8 +9360,8 @@ fi
+@@ -8850,8 +9360,8 @@
  
  done
  
@@ -31003,7 +31021,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${ac_cv_header_sys_wait_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8864,7 +9374,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -8864,7 +9374,7 @@
  #include <sys/types.h>
  #include <sys/wait.h>
  #ifndef WEXITSTATUS
@@ -31012,7 +31030,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  #endif
  #ifndef WIFEXITED
  # define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
-@@ -8881,38 +9391,34 @@ main ()
+@@ -8881,38 +9391,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -31067,7 +31085,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test $ac_cv_header_sys_wait_h = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -8923,8 +9429,8 @@ fi
+@@ -8923,8 +9429,8 @@
  
  # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
  # for constant arguments.  Useless!
@@ -31078,7 +31096,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${ac_cv_working_alloca_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8939,44 +9445,42 @@ int
+@@ -8939,44 +9445,42 @@
  main ()
  {
  char *p = (char *) alloca (2 * sizeof (int));
@@ -31141,7 +31159,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test $ac_cv_working_alloca_h = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -8985,8 +9489,8 @@ _ACEOF
+@@ -8985,8 +9489,8 @@
  
  fi
  
@@ -31152,7 +31170,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${ac_cv_func_alloca_works+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9003,7 +9507,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -9003,7 +9507,7 @@
  #  include <malloc.h>
  #  define alloca _alloca
  # else
@@ -31161,7 +31179,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  #   include <alloca.h>
  #  else
  #   ifdef _AIX
-@@ -9021,44 +9525,42 @@ int
+@@ -9021,44 +9525,42 @@
  main ()
  {
  char *p = (char *) alloca (1);
@@ -31224,7 +31242,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  
  if test $ac_cv_func_alloca_works = yes; then
  
-@@ -9072,15 +9574,15 @@ else
+@@ -9072,15 +9574,15 @@
  # contain a buggy version.  If you still want to use their alloca,
  # use ar to extract alloca.o from them instead of compiling alloca.c.
  
@@ -31243,7 +31261,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${ac_cv_os_cray+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9090,7 +9592,7 @@ _ACEOF
+@@ -9090,7 +9592,7 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -31252,7 +31270,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  webecray
  #else
  wenotbecray
-@@ -9106,14 +9608,14 @@ fi
+@@ -9106,14 +9608,14 @@
  rm -f conftest*
  
  fi
@@ -31272,7 +31290,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -9139,68 +9641,60 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -9139,68 +9641,60 @@
  
  #undef $ac_func
  
@@ -31364,7 +31382,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test `eval echo '${'$as_ac_var'}'` = yes; then
  
  cat >>confdefs.h <<_ACEOF
-@@ -9213,8 +9707,8 @@ fi
+@@ -9213,8 +9707,8 @@
    done
  fi
  
@@ -31375,7 +31393,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${ac_cv_c_stack_direction+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9227,6 +9721,7 @@ _ACEOF
+@@ -9227,6 +9721,7 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -31383,7 +31401,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  int
  find_stack_direction ()
  {
-@@ -9244,17 +9739,26 @@ find_stack_direction ()
+@@ -9244,17 +9739,26 @@
  int
  main ()
  {
@@ -31415,7 +31433,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -9267,11 +9771,13 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -9267,11 +9771,13 @@
  ( exit $ac_status )
  ac_cv_c_stack_direction=-1
  fi
@@ -31432,7 +31450,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  
  cat >>confdefs.h <<_ACEOF
  #define STACK_DIRECTION $ac_cv_c_stack_direction
-@@ -9288,9 +9794,9 @@ fi
+@@ -9288,9 +9794,9 @@
  for ac_func in sbrk utimes setmode getc_unlocked strcoll
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -31445,7 +31463,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -9316,68 +9822,60 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -9316,68 +9822,60 @@
  
  #undef $ac_func
  
@@ -31537,7 +31555,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -9389,8 +9887,8 @@ done
+@@ -9389,8 +9887,8 @@
  
  # Check whether fopen64 is available and whether _LARGEFILE64_SOURCE
  # needs to be defined for it
@@ -31548,7 +31566,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${bu_cv_have_fopen64+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9410,33 +9908,29 @@ FILE *f = fopen64 ("/tmp/foo","r");
+@@ -9410,33 +9908,29 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -31595,7 +31613,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
   CPPFLAGS="$CPPFLAGS -D_LARGEFILE64_SOURCE"
   cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -9454,44 +9948,42 @@ FILE *f = fopen64 ("/tmp/foo","r");
+@@ -9454,44 +9948,42 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -31659,7 +31677,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "$bu_cv_have_fopen64" != no; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -9499,8 +9991,8 @@ cat >>confdefs.h <<\_ACEOF
+@@ -9499,8 +9991,8 @@
  _ACEOF
  
  fi
@@ -31670,7 +31688,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${bu_cv_have_stat64+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9520,33 +10012,29 @@ struct stat64 st; stat64 ("/tmp/foo", &s
+@@ -9520,33 +10012,29 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -31717,7 +31735,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
   CPPFLAGS="$CPPFLAGS -D_LARGEFILE64_SOURCE"
   cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -9564,191 +10052,146 @@ struct stat64 st; stat64 ("/tmp/foo", &s
+@@ -9564,191 +10052,146 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -31990,7 +32008,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${bu_cv_decl_time_t_time_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9768,39 +10211,35 @@ time_t i;
+@@ -9768,39 +10211,35 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32046,7 +32064,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test $bu_cv_decl_time_t_time_h = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -9809,8 +10248,8 @@ _ACEOF
+@@ -9809,8 +10248,8 @@
  
  fi
  
@@ -32057,7 +32075,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${bu_cv_decl_time_t_types_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9830,39 +10269,35 @@ time_t i;
+@@ -9830,39 +10269,35 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32113,7 +32131,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test $bu_cv_decl_time_t_types_h = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -9871,8 +10306,8 @@ _ACEOF
+@@ -9871,8 +10306,8 @@
  
  fi
  
@@ -32124,7 +32142,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${bu_cv_decl_getopt_unistd_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9892,39 +10327,35 @@ extern int getopt (int, char *const*, co
+@@ -9892,39 +10327,35 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32180,7 +32198,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test $bu_cv_decl_getopt_unistd_h = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -9935,8 +10366,8 @@ fi
+@@ -9935,8 +10366,8 @@
  
  # Under Next 3.2 <utime.h> apparently does not define struct utimbuf
  # by default.
@@ -32191,7 +32209,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${bu_cv_header_utime_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9960,39 +10391,35 @@ struct utimbuf s;
+@@ -9960,39 +10391,35 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32247,7 +32265,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test $bu_cv_header_utime_h = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -10001,8 +10428,8 @@ _ACEOF
+@@ -10001,8 +10428,8 @@
  
  fi
  
@@ -32258,7 +32276,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${ac_cv_have_decl_fprintf+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -10017,7 +10444,7 @@ int
+@@ -10017,7 +10444,7 @@
  main ()
  {
  #ifndef fprintf
@@ -32267,7 +32285,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  #endif
  
    ;
-@@ -10025,38 +10452,34 @@ main ()
+@@ -10025,38 +10452,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32322,7 +32340,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test $ac_cv_have_decl_fprintf = yes; then
  
  cat >>confdefs.h <<_ACEOF
-@@ -10071,8 +10494,8 @@ _ACEOF
+@@ -10071,8 +10494,8 @@
  
  
  fi
@@ -32333,7 +32351,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${ac_cv_have_decl_stpcpy+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -10087,7 +10510,7 @@ int
+@@ -10087,7 +10510,7 @@
  main ()
  {
  #ifndef stpcpy
@@ -32342,7 +32360,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  #endif
  
    ;
-@@ -10095,38 +10518,34 @@ main ()
+@@ -10095,38 +10518,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32397,7 +32415,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test $ac_cv_have_decl_stpcpy = yes; then
  
  cat >>confdefs.h <<_ACEOF
-@@ -10141,8 +10560,8 @@ _ACEOF
+@@ -10141,8 +10560,8 @@
  
  
  fi
@@ -32408,7 +32426,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${ac_cv_have_decl_strstr+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -10157,7 +10576,7 @@ int
+@@ -10157,7 +10576,7 @@
  main ()
  {
  #ifndef strstr
@@ -32417,7 +32435,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  #endif
  
    ;
-@@ -10165,38 +10584,34 @@ main ()
+@@ -10165,38 +10584,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32472,7 +32490,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test $ac_cv_have_decl_strstr = yes; then
  
  cat >>confdefs.h <<_ACEOF
-@@ -10211,8 +10626,8 @@ _ACEOF
+@@ -10211,8 +10626,8 @@
  
  
  fi
@@ -32483,7 +32501,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${ac_cv_have_decl_sbrk+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -10227,7 +10642,7 @@ int
+@@ -10227,7 +10642,7 @@
  main ()
  {
  #ifndef sbrk
@@ -32492,7 +32510,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  #endif
  
    ;
-@@ -10235,38 +10650,34 @@ main ()
+@@ -10235,38 +10650,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32547,7 +32565,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test $ac_cv_have_decl_sbrk = yes; then
  
  cat >>confdefs.h <<_ACEOF
-@@ -10281,8 +10692,8 @@ _ACEOF
+@@ -10281,8 +10692,8 @@
  
  
  fi
@@ -32558,7 +32576,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${ac_cv_have_decl_getenv+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -10297,7 +10708,7 @@ int
+@@ -10297,7 +10708,7 @@
  main ()
  {
  #ifndef getenv
@@ -32567,7 +32585,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  #endif
  
    ;
-@@ -10305,38 +10716,34 @@ main ()
+@@ -10305,38 +10716,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32622,7 +32640,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test $ac_cv_have_decl_getenv = yes; then
  
  cat >>confdefs.h <<_ACEOF
-@@ -10351,8 +10758,8 @@ _ACEOF
+@@ -10351,8 +10758,8 @@
  
  
  fi
@@ -32633,7 +32651,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${ac_cv_have_decl_environ+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -10367,7 +10774,7 @@ int
+@@ -10367,7 +10774,7 @@
  main ()
  {
  #ifndef environ
@@ -32642,7 +32660,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  #endif
  
    ;
-@@ -10375,38 +10782,34 @@ main ()
+@@ -10375,38 +10782,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32697,7 +32715,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test $ac_cv_have_decl_environ = yes; then
  
  cat >>confdefs.h <<_ACEOF
-@@ -10421,8 +10824,8 @@ _ACEOF
+@@ -10421,8 +10824,8 @@
  
  
  fi
@@ -32708,7 +32726,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${ac_cv_have_decl_getc_unlocked+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -10437,7 +10840,7 @@ int
+@@ -10437,7 +10840,7 @@
  main ()
  {
  #ifndef getc_unlocked
@@ -32717,7 +32735,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  #endif
  
    ;
-@@ -10445,38 +10848,34 @@ main ()
+@@ -10445,38 +10848,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32772,7 +32790,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test $ac_cv_have_decl_getc_unlocked = yes; then
  
  cat >>confdefs.h <<_ACEOF
-@@ -10491,8 +10890,8 @@ _ACEOF
+@@ -10491,8 +10890,8 @@
  
  
  fi
@@ -32783,7 +32801,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${ac_cv_have_decl_snprintf+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -10507,7 +10906,7 @@ int
+@@ -10507,7 +10906,7 @@
  main ()
  {
  #ifndef snprintf
@@ -32792,7 +32810,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  #endif
  
    ;
-@@ -10515,38 +10914,34 @@ main ()
+@@ -10515,38 +10914,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32847,7 +32865,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test $ac_cv_have_decl_snprintf = yes; then
  
  cat >>confdefs.h <<_ACEOF
-@@ -10561,8 +10956,8 @@ _ACEOF
+@@ -10561,8 +10956,8 @@
  
  
  fi
@@ -32858,7 +32876,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test "${ac_cv_have_decl_vsnprintf+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -10577,7 +10972,7 @@ int
+@@ -10577,7 +10972,7 @@
  main ()
  {
  #ifndef vsnprintf
@@ -32867,7 +32885,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  #endif
  
    ;
-@@ -10585,38 +10980,34 @@ main ()
+@@ -10585,38 +10980,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32922,7 +32940,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  if test $ac_cv_have_decl_vsnprintf = yes; then
  
  cat >>confdefs.h <<_ACEOF
-@@ -10817,8 +11208,10 @@ done
+@@ -10817,8 +11208,10 @@
  
  
  
@@ -32935,7 +32953,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  cat >confcache <<\_ACEOF
  # This file is a shell script that caches the results of configure
  # tests run on this system so they can be shared between configure
-@@ -10837,39 +11230,58 @@ _ACEOF
+@@ -10837,39 +11230,58 @@
  
  # The following way of writing the cache mishandles newlines in values,
  # but we know of no workaround that is simple, portable, and efficient.
@@ -33010,7 +33028,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
    fi
  fi
  rm -f confcache
-@@ -10878,32 +11290,18 @@ test "x$prefix" = xNONE && prefix=$ac_de
+@@ -10878,32 +11290,18 @@
  # Let make expand exec_prefix.
  test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
  
@@ -33049,7 +33067,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  done
  LIBOBJS=$ac_libobjs
  
-@@ -10955,17 +11353,45 @@ cat >>$CONFIG_STATUS <<\_ACEOF
+@@ -10955,17 +11353,45 @@
  ## M4sh Initialization.  ##
  ## --------------------- ##
  
@@ -33099,7 +33117,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  
  # Support unset when possible.
  if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-@@ -10975,8 +11401,43 @@ else
+@@ -10975,8 +11401,43 @@
  fi
  
  
@@ -33144,7 +33162,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  PS1='$ '
  PS2='> '
  PS4='+ '
-@@ -10990,18 +11451,19 @@ do
+@@ -10990,18 +11451,19 @@
    if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
      eval $as_var=C; export $as_var
    else
@@ -33167,7 +33185,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
    as_basename=basename
  else
    as_basename=false
-@@ -11009,159 +11471,120 @@ fi
+@@ -11009,159 +11471,120 @@
  
  
  # Name of the executable.
@@ -33398,7 +33416,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  
  if mkdir -p . 2>/dev/null; then
    as_mkdir_p=:
-@@ -11170,7 +11593,28 @@ else
+@@ -11170,7 +11593,28 @@
    as_mkdir_p=false
  fi
  
@@ -33428,7 +33446,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  
  # Sed expression to map a string onto a valid CPP name.
  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -11179,31 +11623,14 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P
+@@ -11179,31 +11623,14 @@
  as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
  
  
@@ -33464,7 +33482,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -11211,30 +11638,20 @@ generated by GNU Autoconf 2.59.  Invocat
+@@ -11211,30 +11638,20 @@
    CONFIG_COMMANDS = $CONFIG_COMMANDS
    $ $0 $@
  
@@ -33503,7 +33521,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  ac_cs_usage="\
  \`$as_me' instantiates files from templates according to the
  current configuration.
-@@ -11242,7 +11659,7 @@ current configuration.
+@@ -11242,7 +11659,7 @@
  Usage: $0 [OPTIONS] [FILE]...
  
    -h, --help       print this help, then exit
@@ -33512,7 +33530,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
    -q, --quiet      do not print progress messages
    -d, --debug      don't remove temporary files
        --recheck    update $as_me by reconfiguring in the same conditions
-@@ -11261,19 +11678,21 @@ Configuration commands:
+@@ -11261,19 +11678,21 @@
  $config_commands
  
  Report bugs to <bug-autoconf@gnu.org>."
@@ -33540,7 +33558,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  _ACEOF
  
  cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -11284,39 +11703,24 @@ while test $# != 0
+@@ -11284,39 +11703,24 @@
  do
    case $1 in
    --*=*)
@@ -33586,7 +33604,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
      debug=: ;;
    --file | --fil | --fi | --f )
      $ac_shift
-@@ -11326,18 +11730,24 @@ Try \`$0 --help' for more information." 
+@@ -11326,18 +11730,24 @@
      $ac_shift
      CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
      ac_need_defaults=false;;
@@ -33616,7 +33634,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  
    esac
    shift
-@@ -11353,40 +11763,52 @@ fi
+@@ -11353,40 +11763,52 @@
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF
  if \$ac_cs_recheck; then
@@ -33683,7 +33701,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  # If the user did not use the arguments to specify the items to instantiate,
  # then the envvar interface is used.  Set only those that are not.
  # We use the long form for the default assignment because of an extremely
-@@ -11398,391 +11820,496 @@ if $ac_need_defaults; then
+@@ -11398,391 +11820,496 @@
  fi
  
  # Have a temporary directory for convenience.  Make it in the build tree
@@ -34511,7 +34529,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  cat >>$CONFIG_STATUS <<_ACEOF
    sed "$ac_vpsub
  $extrasub
-@@ -11790,248 +12317,130 @@ _ACEOF
+@@ -11790,248 +12317,130 @@
  cat >>$CONFIG_STATUS <<\_ACEOF
  :t
  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
@@ -34862,7 +34880,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  # Compute $ac_file's index in $config_headers.
  _am_stamp_count=1
  for _am_header in $config_headers :; do
-@@ -12042,135 +12451,39 @@ for _am_header in $config_headers :; do
+@@ -12042,135 +12451,39 @@
        _am_stamp_count=`expr $_am_stamp_count + 1` ;;
    esac
  done
@@ -35024,7 +35042,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
    # Strip MF so we end up with the name of the file.
    mf=`echo "$mf" | sed -e 's/:.*$//'`
    # Check whether this is an Automake generated Makefile or not.
-@@ -12180,18 +12493,29 @@ echo "$as_me: executing $ac_dest command
+@@ -12180,18 +12493,29 @@
    # each Makefile.in and add a new line on top of each file to say so.
    # So let's grep whole file.
    if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
@@ -35062,7 +35080,7 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
    else
      continue
    fi
-@@ -12213,58 +12537,84 @@ echo X"$mf" |
+@@ -12213,58 +12537,84 @@
         sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
      # Make sure the directory exists.
      test -f "$dirpart/$file" && continue
@@ -35177,10 +35195,11 @@ diff -Nrup binutils-2.17/binutils/configure binutils-2.17-atmel/binutils/configu
  
  { (exit 0); exit 0; }
  _ACEOF
-diff -Nrup binutils-2.17/binutils/doc/Makefile.in binutils-2.17-atmel/binutils/doc/Makefile.in
---- binutils-2.17/binutils/doc/Makefile.in	2006-06-03 06:45:50.000000000 +0200
-+++ binutils-2.17-atmel/binutils/doc/Makefile.in	2007-02-20 16:07:21.000000000 +0100
-@@ -109,6 +109,7 @@ EXEEXT = @EXEEXT@
+Index: binutils-2.17/binutils/doc/Makefile.in
+===================================================================
+--- binutils-2.17.orig/binutils/doc/Makefile.in	2007-06-28 09:19:34.235031936 +0200
++++ binutils-2.17/binutils/doc/Makefile.in	2007-06-28 09:19:36.602672000 +0200
+@@ -109,6 +109,7 @@
  EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
  GMOFILES = @GMOFILES@
  GMSGFMT = @GMSGFMT@
@@ -35188,7 +35207,7 @@ diff -Nrup binutils-2.17/binutils/doc/Makefile.in binutils-2.17-atmel/binutils/d
  GT_NO = @GT_NO@
  GT_YES = @GT_YES@
  HDEFINES = @HDEFINES@
-@@ -159,9 +160,8 @@ VERSION = @VERSION@
+@@ -159,9 +160,8 @@
  WARN_CFLAGS = @WARN_CFLAGS@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
@@ -35199,7 +35218,7 @@ diff -Nrup binutils-2.17/binutils/doc/Makefile.in binutils-2.17-atmel/binutils/d
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
  am__include = @am__include@
-@@ -178,6 +178,7 @@ build_vendor = @build_vendor@
+@@ -178,6 +178,7 @@
  datadir = @datadir@
  datarootdir = @datarootdir@
  docdir = @docdir@
@@ -35207,7 +35226,7 @@ diff -Nrup binutils-2.17/binutils/doc/Makefile.in binutils-2.17-atmel/binutils/d
  exec_prefix = @exec_prefix@
  host = @host@
  host_alias = @host_alias@
-@@ -191,12 +192,15 @@ install_sh = @install_sh@
+@@ -191,12 +192,15 @@
  l = @l@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -35223,7 +35242,7 @@ diff -Nrup binutils-2.17/binutils/doc/Makefile.in binutils-2.17-atmel/binutils/d
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
-@@ -368,10 +372,13 @@ dist-info: $(INFO_DEPS)
+@@ -368,10 +372,13 @@
  	    $(srcdir)/*) base=`echo "$$base" | sed "s|^$$srcdirstrip/||"`;; \
  	  esac; \
  	  if test -f $$base; then d=.; else d=$(srcdir); fi; \
@@ -35241,10 +35260,11 @@ diff -Nrup binutils-2.17/binutils/doc/Makefile.in binutils-2.17-atmel/binutils/d
  	  done; \
  	done
  
-diff -Nrup binutils-2.17/binutils/Makefile.am binutils-2.17-atmel/binutils/Makefile.am
---- binutils-2.17/binutils/Makefile.am	2006-04-06 23:49:26.000000000 +0200
-+++ binutils-2.17-atmel/binutils/Makefile.am	2007-02-12 15:37:09.000000000 +0100
-@@ -511,7 +511,7 @@ readelf.o: readelf.c dwarf.h ../bfd/bfd.
+Index: binutils-2.17/binutils/Makefile.am
+===================================================================
+--- binutils-2.17.orig/binutils/Makefile.am	2007-06-28 09:19:34.240031176 +0200
++++ binutils-2.17/binutils/Makefile.am	2007-06-28 09:19:36.602672000 +0200
+@@ -511,7 +511,7 @@
    $(INCDIR)/symcat.h $(INCDIR)/elf/dwarf2.h $(INCDIR)/elf/common.h \
    $(INCDIR)/elf/external.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/alpha.h \
    $(INCDIR)/elf/reloc-macros.h $(INCDIR)/elf/arc.h $(INCDIR)/elf/arm.h \
@@ -35253,10 +35273,11 @@ diff -Nrup binutils-2.17/binutils/Makefile.am binutils-2.17-atmel/binutils/Makef
    $(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/binutils/Makefile.in
---- binutils-2.17/binutils/Makefile.in	2006-06-02 04:21:08.000000000 +0200
-+++ binutils-2.17-atmel/binutils/Makefile.in	2007-02-20 16:07:22.000000000 +0100
-@@ -266,6 +266,7 @@ EXEEXT = @EXEEXT@
+Index: binutils-2.17/binutils/Makefile.in
+===================================================================
+--- binutils-2.17.orig/binutils/Makefile.in	2007-06-28 09:19:34.248029960 +0200
++++ binutils-2.17/binutils/Makefile.in	2007-06-28 09:19:36.603671848 +0200
+@@ -266,6 +266,7 @@
  EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
  GMOFILES = @GMOFILES@
  GMSGFMT = @GMSGFMT@
@@ -35264,7 +35285,7 @@ diff -Nrup binutils-2.17/binutils/Makefile.in binutils-2.17-atmel/binutils/Makef
  GT_NO = @GT_NO@
  GT_YES = @GT_YES@
  HDEFINES = @HDEFINES@
-@@ -316,9 +317,8 @@ VERSION = @VERSION@
+@@ -316,9 +317,8 @@
  WARN_CFLAGS = @WARN_CFLAGS@
  XGETTEXT = @XGETTEXT@
  YACC = `if [ -f ../bison/bison ]; then echo ../bison/bison -y -L$(srcdir)/../bison/; else echo @YACC@; fi`
@@ -35275,7 +35296,7 @@ diff -Nrup binutils-2.17/binutils/Makefile.in binutils-2.17-atmel/binutils/Makef
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
  am__include = @am__include@
-@@ -335,6 +335,7 @@ build_vendor = @build_vendor@
+@@ -335,6 +335,7 @@
  datadir = @datadir@
  datarootdir = @datarootdir@
  docdir = @docdir@
@@ -35283,7 +35304,7 @@ diff -Nrup binutils-2.17/binutils/Makefile.in binutils-2.17-atmel/binutils/Makef
  exec_prefix = @exec_prefix@
  host = @host@
  host_alias = @host_alias@
-@@ -348,12 +349,15 @@ install_sh = @install_sh@
+@@ -348,12 +349,15 @@
  l = @l@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -35299,7 +35320,7 @@ diff -Nrup binutils-2.17/binutils/Makefile.in binutils-2.17-atmel/binutils/Makef
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
-@@ -365,7 +369,6 @@ target_vendor = @target_vendor@
+@@ -365,7 +369,6 @@
  AUTOMAKE_OPTIONS = cygnus dejagnu
  SUBDIRS = doc po
  tooldir = $(exec_prefix)/$(target_alias)
@@ -35307,7 +35328,7 @@ diff -Nrup binutils-2.17/binutils/Makefile.in binutils-2.17-atmel/binutils/Makef
  AM_CFLAGS = $(WARN_CFLAGS)
  
  # these two are almost the same program
-@@ -1264,7 +1267,7 @@ readelf.o: readelf.c dwarf.h ../bfd/bfd.
+@@ -1264,7 +1267,7 @@
    $(INCDIR)/symcat.h $(INCDIR)/elf/dwarf2.h $(INCDIR)/elf/common.h \
    $(INCDIR)/elf/external.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/alpha.h \
    $(INCDIR)/elf/reloc-macros.h $(INCDIR)/elf/arc.h $(INCDIR)/elf/arm.h \
@@ -35316,9 +35337,10 @@ diff -Nrup binutils-2.17/binutils/Makefile.in binutils-2.17-atmel/binutils/Makef
    $(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/binutils/readelf.c
---- binutils-2.17/binutils/readelf.c	2006-03-10 18:20:28.000000000 +0100
-+++ binutils-2.17-atmel/binutils/readelf.c	2007-02-12 15:37:09.000000000 +0100
+Index: binutils-2.17/binutils/readelf.c
+===================================================================
+--- binutils-2.17.orig/binutils/readelf.c	2007-06-28 09:19:34.254029048 +0200
++++ binutils-2.17/binutils/readelf.c	2007-06-28 09:19:36.606671392 +0200
 @@ -71,6 +71,7 @@
  #include "elf/arc.h"
  #include "elf/arm.h"
@@ -35327,7 +35349,7 @@ diff -Nrup binutils-2.17/binutils/readelf.c binutils-2.17-atmel/binutils/readelf
  #include "elf/bfin.h"
  #include "elf/cris.h"
  #include "elf/d10v.h"
-@@ -590,6 +591,7 @@ guess_is_rela (unsigned long e_machine)
+@@ -590,6 +591,7 @@
      case EM_MCORE:
      case EM_IA_64:
      case EM_AVR:
@@ -35335,7 +35357,7 @@ diff -Nrup binutils-2.17/binutils/readelf.c binutils-2.17-atmel/binutils/readelf
      case EM_AVR_OLD:
      case EM_CRIS:
      case EM_860:
-@@ -959,6 +961,10 @@ dump_relocations (FILE *file,
+@@ -959,6 +961,10 @@
  	  rtype = elf_avr_reloc_type (type);
  	  break;
  
@@ -35346,7 +35368,7 @@ diff -Nrup binutils-2.17/binutils/readelf.c binutils-2.17-atmel/binutils/readelf
  	case EM_OLD_SPARCV9:
  	case EM_SPARC32PLUS:
  	case EM_SPARCV9:
-@@ -1670,6 +1676,7 @@ get_machine_name (unsigned e_machine)
+@@ -1670,6 +1676,7 @@
      case EM_VAX:		return "Digital VAX";
      case EM_AVR_OLD:
      case EM_AVR:		return "Atmel AVR 8-bit microcontroller";
@@ -35354,10 +35376,11 @@ diff -Nrup binutils-2.17/binutils/readelf.c binutils-2.17-atmel/binutils/readelf
      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/configure
---- binutils-2.17/configure	2006-04-06 23:49:25.000000000 +0200
-+++ binutils-2.17-atmel/configure	2007-02-20 16:06:36.000000000 +0100
-@@ -899,7 +899,7 @@ host_libs="intl mmalloc libiberty opcode
+Index: binutils-2.17/configure
+===================================================================
+--- binutils-2.17.orig/configure	2007-06-28 09:19:35.592825520 +0200
++++ binutils-2.17/configure	2007-06-28 09:19:36.610670784 +0200
+@@ -899,7 +899,7 @@
  # know that we are building the simulator.
  # binutils, gas and ld appear in that order because it makes sense to run
  # "make check" in that particular order.
@@ -35366,7 +35389,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  
  # libgcj represents the runtime libraries only used by gcj.
  libgcj="target-libffi \
-@@ -1064,6 +1064,9 @@ unsupported_languages=
+@@ -1064,6 +1064,9 @@
  # exist yet.
  
  case "${host}" in
@@ -35376,7 +35399,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
    hppa*64*-*-*)
      noconfigdirs="$noconfigdirs byacc"
      ;;
-@@ -1863,7 +1866,7 @@ else
+@@ -1863,7 +1866,7 @@
    # Extract the first word of "gcc", so it can be a program name with args.
  set dummy gcc; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -35385,7 +35408,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -1893,7 +1896,7 @@ if test -z "$CC"; then
+@@ -1893,7 +1896,7 @@
    # Extract the first word of "cc", so it can be a program name with args.
  set dummy cc; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -35394,7 +35417,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -1944,7 +1947,7 @@ fi
+@@ -1944,7 +1947,7 @@
        # Extract the first word of "cl", so it can be a program name with args.
  set dummy cl; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -35403,7 +35426,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -1976,7 +1979,7 @@ fi
+@@ -1976,7 +1979,7 @@
  fi
  
  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
@@ -35412,7 +35435,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  
  ac_ext=c
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-@@ -1987,12 +1990,12 @@ cross_compiling=$ac_cv_prog_cc_cross
+@@ -1987,12 +1990,12 @@
  
  cat > conftest.$ac_ext << EOF
  
@@ -35427,7 +35450,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
    ac_cv_prog_cc_works=yes
    # If we can't run a trivial program, we are probably using a cross compiler.
    if (./conftest; exit) 2>/dev/null; then
-@@ -2018,12 +2021,12 @@ if test $ac_cv_prog_cc_works = no; then
+@@ -2018,12 +2021,12 @@
    { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
  fi
  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
@@ -35442,7 +35465,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -2032,7 +2035,7 @@ else
+@@ -2032,7 +2035,7 @@
    yes;
  #endif
  EOF
@@ -35451,7 +35474,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
    ac_cv_prog_gcc=yes
  else
    ac_cv_prog_gcc=no
-@@ -2051,7 +2054,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
+@@ -2051,7 +2054,7 @@
  ac_save_CFLAGS="$CFLAGS"
  CFLAGS=
  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
@@ -35460,7 +35483,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -2118,7 +2121,7 @@ fi
+@@ -2118,7 +2121,7 @@
  # Extract the first word of "${ac_tool_prefix}gnatbind", so it can be a program name with args.
  set dummy ${ac_tool_prefix}gnatbind; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -35469,7 +35492,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_GNATBIND'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -2150,7 +2153,7 @@ if test -n "$ac_tool_prefix"; then
+@@ -2150,7 +2153,7 @@
    # Extract the first word of "gnatbind", so it can be a program name with args.
  set dummy gnatbind; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -35478,7 +35501,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_GNATBIND'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -2183,7 +2186,7 @@ fi
+@@ -2183,7 +2186,7 @@
  fi
  
  echo $ac_n "checking whether compiler driver understands Ada""... $ac_c" 1>&6
@@ -35487,7 +35510,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'acx_cv_cc_gcc_supports_ada'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -2215,7 +2218,7 @@ else
+@@ -2215,7 +2218,7 @@
  fi
  
  echo $ac_n "checking how to compare bootstrapped objects""... $ac_c" 1>&6
@@ -35496,7 +35519,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'gcc_cv_prog_cmp_skip'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -2313,9 +2316,9 @@ saved_CFLAGS="$CFLAGS"
+@@ -2313,9 +2316,9 @@
  CFLAGS="$CFLAGS $gmpinc"
  # Check GMP actually works
  echo $ac_n "checking for correct version of gmp.h""... $ac_c" 1>&6
@@ -35508,7 +35531,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  #include "confdefs.h"
  #include "gmp.h"
  int main() {
-@@ -2326,7 +2329,7 @@ choke me
+@@ -2326,7 +2329,7 @@
  
  ; return 0; }
  EOF
@@ -35517,7 +35540,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
    rm -rf conftest*
    echo "$ac_t""yes" 1>&6
  else
-@@ -2339,12 +2342,12 @@ rm -f conftest*
+@@ -2339,12 +2342,12 @@
  
  if test x"$have_gmp" = xyes; then
    echo $ac_n "checking for MPFR""... $ac_c" 1>&6
@@ -35532,7 +35555,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  #include "confdefs.h"
  #include <gmp.h>
  #include <mpfr.h>
-@@ -2352,7 +2355,7 @@ int main() {
+@@ -2352,7 +2355,7 @@
  mpfr_t n; mpfr_init(n);
  ; return 0; }
  EOF
@@ -35541,7 +35564,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
    rm -rf conftest*
    echo "$ac_t""yes" 1>&6
  else
-@@ -3403,7 +3406,7 @@ do
+@@ -3403,7 +3406,7 @@
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -35550,7 +35573,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -3443,7 +3446,7 @@ do
+@@ -3443,7 +3446,7 @@
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -35559,7 +35582,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_BISON'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -3482,7 +3485,7 @@ do
+@@ -3482,7 +3485,7 @@
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -35568,7 +35591,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_M4'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -3521,7 +3524,7 @@ do
+@@ -3521,7 +3524,7 @@
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -35577,7 +35600,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -3561,7 +3564,7 @@ do
+@@ -3561,7 +3564,7 @@
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -35586,7 +35609,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_FLEX'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -3600,7 +3603,7 @@ do
+@@ -3600,7 +3603,7 @@
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -35595,7 +35618,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_MAKEINFO'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -3653,7 +3656,7 @@ do
+@@ -3653,7 +3656,7 @@
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -35604,7 +35627,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_EXPECT'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -3694,7 +3697,7 @@ do
+@@ -3694,7 +3697,7 @@
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -35613,7 +35636,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_RUNTEST'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -3742,7 +3745,7 @@ test -n "$target_alias" && ncn_target_to
+@@ -3742,7 +3745,7 @@
      # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
  set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -35622,7 +35645,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -3773,7 +3776,7 @@ fi
+@@ -3773,7 +3776,7 @@
      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
  set dummy ${ncn_progname}; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -35631,7 +35654,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -3817,7 +3820,7 @@ fi
+@@ -3817,7 +3820,7 @@
      # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
  set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -35640,7 +35663,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -3848,7 +3851,7 @@ fi
+@@ -3848,7 +3851,7 @@
      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
  set dummy ${ncn_progname}; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -35649,7 +35672,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -3892,7 +3895,7 @@ fi
+@@ -3892,7 +3895,7 @@
      # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
  set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -35658,7 +35681,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -3923,7 +3926,7 @@ fi
+@@ -3923,7 +3926,7 @@
      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
  set dummy ${ncn_progname}; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -35667,7 +35690,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -3967,7 +3970,7 @@ fi
+@@ -3967,7 +3970,7 @@
      # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
  set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -35676,7 +35699,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -3998,7 +4001,7 @@ fi
+@@ -3998,7 +4001,7 @@
      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
  set dummy ${ncn_progname}; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -35685,7 +35708,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -4042,7 +4045,7 @@ fi
+@@ -4042,7 +4045,7 @@
      # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
  set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -35694,7 +35717,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_LIPO'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -4073,7 +4076,7 @@ fi
+@@ -4073,7 +4076,7 @@
      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
  set dummy ${ncn_progname}; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -35703,7 +35726,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_LIPO'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -4117,7 +4120,7 @@ fi
+@@ -4117,7 +4120,7 @@
      # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
  set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -35712,7 +35735,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_NM'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -4148,7 +4151,7 @@ fi
+@@ -4148,7 +4151,7 @@
      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
  set dummy ${ncn_progname}; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -35721,7 +35744,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_NM'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -4192,7 +4195,7 @@ fi
+@@ -4192,7 +4195,7 @@
      # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
  set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -35730,7 +35753,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -4223,7 +4226,7 @@ fi
+@@ -4223,7 +4226,7 @@
      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
  set dummy ${ncn_progname}; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -35739,7 +35762,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -4262,7 +4265,7 @@ fi
+@@ -4262,7 +4265,7 @@
      # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
  set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -35748,7 +35771,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -4293,7 +4296,7 @@ fi
+@@ -4293,7 +4296,7 @@
      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
  set dummy ${ncn_progname}; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -35757,7 +35780,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -4332,7 +4335,7 @@ fi
+@@ -4332,7 +4335,7 @@
      # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
  set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -35766,7 +35789,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -4363,7 +4366,7 @@ fi
+@@ -4363,7 +4366,7 @@
      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
  set dummy ${ncn_progname}; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -35775,7 +35798,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -4407,7 +4410,7 @@ fi
+@@ -4407,7 +4410,7 @@
      # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
  set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -35784,7 +35807,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_OBJCOPY'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -4438,7 +4441,7 @@ fi
+@@ -4438,7 +4441,7 @@
      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
  set dummy ${ncn_progname}; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -35793,7 +35816,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_OBJCOPY'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -4482,7 +4485,7 @@ fi
+@@ -4482,7 +4485,7 @@
      # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
  set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -35802,7 +35825,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -4513,7 +4516,7 @@ fi
+@@ -4513,7 +4516,7 @@
      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
  set dummy ${ncn_progname}; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -35811,7 +35834,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -4577,7 +4580,7 @@ fi
+@@ -4577,7 +4580,7 @@
   if test -n "$with_build_time_tools"; then
    for ncn_progname in cc gcc; do
      echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
@@ -35820,7 +35843,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
      if test -x $with_build_time_tools/${ncn_progname}; then
        ac_cv_prog_CC_FOR_TARGET=$with_build_time_tools/${ncn_progname}
        echo "$ac_t""yes" 1>&6
-@@ -4594,7 +4597,7 @@ if test -z "$ac_cv_prog_CC_FOR_TARGET"; 
+@@ -4594,7 +4597,7 @@
        # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
  set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -35829,7 +35852,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_CC_FOR_TARGET'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -4625,7 +4628,7 @@ fi
+@@ -4625,7 +4628,7 @@
        # Extract the first word of "${ncn_progname}", so it can be a program name with args.
  set dummy ${ncn_progname}; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -35838,7 +35861,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_CC_FOR_TARGET'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -4668,7 +4671,7 @@ fi
+@@ -4668,7 +4671,7 @@
   if test -n "$with_build_time_tools"; then
    for ncn_progname in c++ g++ cxx gxx; do
      echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
@@ -35847,7 +35870,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
      if test -x $with_build_time_tools/${ncn_progname}; then
        ac_cv_prog_CXX_FOR_TARGET=$with_build_time_tools/${ncn_progname}
        echo "$ac_t""yes" 1>&6
-@@ -4685,7 +4688,7 @@ if test -z "$ac_cv_prog_CXX_FOR_TARGET";
+@@ -4685,7 +4688,7 @@
        # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
  set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -35856,7 +35879,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_CXX_FOR_TARGET'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -4716,7 +4719,7 @@ fi
+@@ -4716,7 +4719,7 @@
        # Extract the first word of "${ncn_progname}", so it can be a program name with args.
  set dummy ${ncn_progname}; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -35865,7 +35888,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_CXX_FOR_TARGET'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -4759,7 +4762,7 @@ fi
+@@ -4759,7 +4762,7 @@
   if test -n "$with_build_time_tools"; then
    for ncn_progname in gcc; do
      echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
@@ -35874,7 +35897,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
      if test -x $with_build_time_tools/${ncn_progname}; then
        ac_cv_prog_GCC_FOR_TARGET=$with_build_time_tools/${ncn_progname}
        echo "$ac_t""yes" 1>&6
-@@ -4776,7 +4779,7 @@ if test -z "$ac_cv_prog_GCC_FOR_TARGET";
+@@ -4776,7 +4779,7 @@
        # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
  set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -35883,7 +35906,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_GCC_FOR_TARGET'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -4807,7 +4810,7 @@ fi
+@@ -4807,7 +4810,7 @@
        # Extract the first word of "${ncn_progname}", so it can be a program name with args.
  set dummy ${ncn_progname}; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -35892,7 +35915,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_GCC_FOR_TARGET'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -4845,7 +4848,7 @@ fi
+@@ -4845,7 +4848,7 @@
   if test -n "$with_build_time_tools"; then
    for ncn_progname in gcj; do
      echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
@@ -35901,7 +35924,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
      if test -x $with_build_time_tools/${ncn_progname}; then
        ac_cv_prog_GCJ_FOR_TARGET=$with_build_time_tools/${ncn_progname}
        echo "$ac_t""yes" 1>&6
-@@ -4862,7 +4865,7 @@ if test -z "$ac_cv_prog_GCJ_FOR_TARGET";
+@@ -4862,7 +4865,7 @@
        # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
  set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -35910,7 +35933,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_GCJ_FOR_TARGET'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -4893,7 +4896,7 @@ fi
+@@ -4893,7 +4896,7 @@
        # Extract the first word of "${ncn_progname}", so it can be a program name with args.
  set dummy ${ncn_progname}; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -35919,7 +35942,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_GCJ_FOR_TARGET'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -4936,7 +4939,7 @@ fi
+@@ -4936,7 +4939,7 @@
   if test -n "$with_build_time_tools"; then
    for ncn_progname in gfortran; do
      echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
@@ -35928,7 +35951,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
      if test -x $with_build_time_tools/${ncn_progname}; then
        ac_cv_prog_GFORTRAN_FOR_TARGET=$with_build_time_tools/${ncn_progname}
        echo "$ac_t""yes" 1>&6
-@@ -4953,7 +4956,7 @@ if test -z "$ac_cv_prog_GFORTRAN_FOR_TAR
+@@ -4953,7 +4956,7 @@
        # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
  set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -35937,7 +35960,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_GFORTRAN_FOR_TARGET'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -4984,7 +4987,7 @@ fi
+@@ -4984,7 +4987,7 @@
        # Extract the first word of "${ncn_progname}", so it can be a program name with args.
  set dummy ${ncn_progname}; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -35946,7 +35969,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_GFORTRAN_FOR_TARGET'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -5091,7 +5094,7 @@ rm conftest.c
+@@ -5091,7 +5094,7 @@
  if test -z "$ac_cv_path_AR_FOR_TARGET" ; then
    if test -n "$with_build_time_tools"; then
      echo $ac_n "checking for ar in $with_build_time_tools""... $ac_c" 1>&6
@@ -35955,7 +35978,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
      if test -x $with_build_time_tools/ar; then
        AR_FOR_TARGET=`cd $with_build_time_tools && pwd`/ar
        ac_cv_path_AR_FOR_TARGET=$AR_FOR_TARGET
-@@ -5109,7 +5112,7 @@ if test -z "$ac_cv_path_AR_FOR_TARGET" ;
+@@ -5109,7 +5112,7 @@
    # Extract the first word of "ar", so it can be a program name with args.
  set dummy ar; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -35964,7 +35987,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_path_AR_FOR_TARGET'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -5146,7 +5149,7 @@ if test -z "$ac_cv_path_AR_FOR_TARGET" ;
+@@ -5146,7 +5149,7 @@
     if test -n "$with_build_time_tools"; then
    for ncn_progname in ar; do
      echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
@@ -35973,7 +35996,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
      if test -x $with_build_time_tools/${ncn_progname}; then
        ac_cv_prog_AR_FOR_TARGET=$with_build_time_tools/${ncn_progname}
        echo "$ac_t""yes" 1>&6
-@@ -5163,7 +5166,7 @@ if test -z "$ac_cv_prog_AR_FOR_TARGET"; 
+@@ -5163,7 +5166,7 @@
        # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
  set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -35982,7 +36005,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_AR_FOR_TARGET'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -5194,7 +5197,7 @@ fi
+@@ -5194,7 +5197,7 @@
        # Extract the first word of "${ncn_progname}", so it can be a program name with args.
  set dummy ${ncn_progname}; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -35991,7 +36014,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_AR_FOR_TARGET'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -5244,7 +5247,7 @@ fi
+@@ -5244,7 +5247,7 @@
  if test -z "$ac_cv_path_AS_FOR_TARGET" ; then
    if test -n "$with_build_time_tools"; then
      echo $ac_n "checking for as in $with_build_time_tools""... $ac_c" 1>&6
@@ -36000,7 +36023,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
      if test -x $with_build_time_tools/as; then
        AS_FOR_TARGET=`cd $with_build_time_tools && pwd`/as
        ac_cv_path_AS_FOR_TARGET=$AS_FOR_TARGET
-@@ -5262,7 +5265,7 @@ if test -z "$ac_cv_path_AS_FOR_TARGET" ;
+@@ -5262,7 +5265,7 @@
    # Extract the first word of "as", so it can be a program name with args.
  set dummy as; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -36009,7 +36032,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_path_AS_FOR_TARGET'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -5299,7 +5302,7 @@ if test -z "$ac_cv_path_AS_FOR_TARGET" ;
+@@ -5299,7 +5302,7 @@
     if test -n "$with_build_time_tools"; then
    for ncn_progname in as; do
      echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
@@ -36018,7 +36041,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
      if test -x $with_build_time_tools/${ncn_progname}; then
        ac_cv_prog_AS_FOR_TARGET=$with_build_time_tools/${ncn_progname}
        echo "$ac_t""yes" 1>&6
-@@ -5316,7 +5319,7 @@ if test -z "$ac_cv_prog_AS_FOR_TARGET"; 
+@@ -5316,7 +5319,7 @@
        # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
  set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -36027,7 +36050,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_AS_FOR_TARGET'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -5347,7 +5350,7 @@ fi
+@@ -5347,7 +5350,7 @@
        # Extract the first word of "${ncn_progname}", so it can be a program name with args.
  set dummy ${ncn_progname}; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -36036,7 +36059,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_AS_FOR_TARGET'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -5397,7 +5400,7 @@ fi
+@@ -5397,7 +5400,7 @@
  if test -z "$ac_cv_path_DLLTOOL_FOR_TARGET" ; then
    if test -n "$with_build_time_tools"; then
      echo $ac_n "checking for dlltool in $with_build_time_tools""... $ac_c" 1>&6
@@ -36045,7 +36068,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
      if test -x $with_build_time_tools/dlltool; then
        DLLTOOL_FOR_TARGET=`cd $with_build_time_tools && pwd`/dlltool
        ac_cv_path_DLLTOOL_FOR_TARGET=$DLLTOOL_FOR_TARGET
-@@ -5415,7 +5418,7 @@ if test -z "$ac_cv_path_DLLTOOL_FOR_TARG
+@@ -5415,7 +5418,7 @@
    # Extract the first word of "dlltool", so it can be a program name with args.
  set dummy dlltool; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -36054,7 +36077,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_path_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -5452,7 +5455,7 @@ if test -z "$ac_cv_path_DLLTOOL_FOR_TARG
+@@ -5452,7 +5455,7 @@
     if test -n "$with_build_time_tools"; then
    for ncn_progname in dlltool; do
      echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
@@ -36063,7 +36086,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
      if test -x $with_build_time_tools/${ncn_progname}; then
        ac_cv_prog_DLLTOOL_FOR_TARGET=$with_build_time_tools/${ncn_progname}
        echo "$ac_t""yes" 1>&6
-@@ -5469,7 +5472,7 @@ if test -z "$ac_cv_prog_DLLTOOL_FOR_TARG
+@@ -5469,7 +5472,7 @@
        # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
  set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -36072,7 +36095,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -5500,7 +5503,7 @@ fi
+@@ -5500,7 +5503,7 @@
        # Extract the first word of "${ncn_progname}", so it can be a program name with args.
  set dummy ${ncn_progname}; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -36081,7 +36104,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -5550,7 +5553,7 @@ fi
+@@ -5550,7 +5553,7 @@
  if test -z "$ac_cv_path_LD_FOR_TARGET" ; then
    if test -n "$with_build_time_tools"; then
      echo $ac_n "checking for ld in $with_build_time_tools""... $ac_c" 1>&6
@@ -36090,7 +36113,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
      if test -x $with_build_time_tools/ld; then
        LD_FOR_TARGET=`cd $with_build_time_tools && pwd`/ld
        ac_cv_path_LD_FOR_TARGET=$LD_FOR_TARGET
-@@ -5568,7 +5571,7 @@ if test -z "$ac_cv_path_LD_FOR_TARGET" ;
+@@ -5568,7 +5571,7 @@
    # Extract the first word of "ld", so it can be a program name with args.
  set dummy ld; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -36099,7 +36122,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_path_LD_FOR_TARGET'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -5605,7 +5608,7 @@ if test -z "$ac_cv_path_LD_FOR_TARGET" ;
+@@ -5605,7 +5608,7 @@
     if test -n "$with_build_time_tools"; then
    for ncn_progname in ld; do
      echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
@@ -36108,7 +36131,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
      if test -x $with_build_time_tools/${ncn_progname}; then
        ac_cv_prog_LD_FOR_TARGET=$with_build_time_tools/${ncn_progname}
        echo "$ac_t""yes" 1>&6
-@@ -5622,7 +5625,7 @@ if test -z "$ac_cv_prog_LD_FOR_TARGET"; 
+@@ -5622,7 +5625,7 @@
        # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
  set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -36117,7 +36140,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_LD_FOR_TARGET'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -5653,7 +5656,7 @@ fi
+@@ -5653,7 +5656,7 @@
        # Extract the first word of "${ncn_progname}", so it can be a program name with args.
  set dummy ${ncn_progname}; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -36126,7 +36149,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_LD_FOR_TARGET'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -5703,7 +5706,7 @@ fi
+@@ -5703,7 +5706,7 @@
  if test -z "$ac_cv_path_LIPO_FOR_TARGET" ; then
    if test -n "$with_build_time_tools"; then
      echo $ac_n "checking for lipo in $with_build_time_tools""... $ac_c" 1>&6
@@ -36135,7 +36158,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
      if test -x $with_build_time_tools/lipo; then
        LIPO_FOR_TARGET=`cd $with_build_time_tools && pwd`/lipo
        ac_cv_path_LIPO_FOR_TARGET=$LIPO_FOR_TARGET
-@@ -5721,7 +5724,7 @@ if test -z "$ac_cv_path_LIPO_FOR_TARGET"
+@@ -5721,7 +5724,7 @@
    # Extract the first word of "lipo", so it can be a program name with args.
  set dummy lipo; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -36144,7 +36167,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_path_LIPO_FOR_TARGET'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -5758,7 +5761,7 @@ if test -z "$ac_cv_path_LIPO_FOR_TARGET"
+@@ -5758,7 +5761,7 @@
     if test -n "$with_build_time_tools"; then
    for ncn_progname in lipo; do
      echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
@@ -36153,7 +36176,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
      if test -x $with_build_time_tools/${ncn_progname}; then
        ac_cv_prog_LIPO_FOR_TARGET=$with_build_time_tools/${ncn_progname}
        echo "$ac_t""yes" 1>&6
-@@ -5775,7 +5778,7 @@ if test -z "$ac_cv_prog_LIPO_FOR_TARGET"
+@@ -5775,7 +5778,7 @@
        # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
  set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -36162,7 +36185,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_LIPO_FOR_TARGET'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -5806,7 +5809,7 @@ fi
+@@ -5806,7 +5809,7 @@
        # Extract the first word of "${ncn_progname}", so it can be a program name with args.
  set dummy ${ncn_progname}; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -36171,7 +36194,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_LIPO_FOR_TARGET'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -5856,7 +5859,7 @@ fi
+@@ -5856,7 +5859,7 @@
  if test -z "$ac_cv_path_NM_FOR_TARGET" ; then
    if test -n "$with_build_time_tools"; then
      echo $ac_n "checking for nm in $with_build_time_tools""... $ac_c" 1>&6
@@ -36180,7 +36203,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
      if test -x $with_build_time_tools/nm; then
        NM_FOR_TARGET=`cd $with_build_time_tools && pwd`/nm
        ac_cv_path_NM_FOR_TARGET=$NM_FOR_TARGET
-@@ -5874,7 +5877,7 @@ if test -z "$ac_cv_path_NM_FOR_TARGET" ;
+@@ -5874,7 +5877,7 @@
    # Extract the first word of "nm", so it can be a program name with args.
  set dummy nm; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -36189,7 +36212,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_path_NM_FOR_TARGET'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -5911,7 +5914,7 @@ if test -z "$ac_cv_path_NM_FOR_TARGET" ;
+@@ -5911,7 +5914,7 @@
     if test -n "$with_build_time_tools"; then
    for ncn_progname in nm; do
      echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
@@ -36198,7 +36221,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
      if test -x $with_build_time_tools/${ncn_progname}; then
        ac_cv_prog_NM_FOR_TARGET=$with_build_time_tools/${ncn_progname}
        echo "$ac_t""yes" 1>&6
-@@ -5928,7 +5931,7 @@ if test -z "$ac_cv_prog_NM_FOR_TARGET"; 
+@@ -5928,7 +5931,7 @@
        # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
  set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -36207,7 +36230,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_NM_FOR_TARGET'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -5959,7 +5962,7 @@ fi
+@@ -5959,7 +5962,7 @@
        # Extract the first word of "${ncn_progname}", so it can be a program name with args.
  set dummy ${ncn_progname}; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -36216,7 +36239,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_NM_FOR_TARGET'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -6009,7 +6012,7 @@ fi
+@@ -6009,7 +6012,7 @@
  if test -z "$ac_cv_path_OBJDUMP_FOR_TARGET" ; then
    if test -n "$with_build_time_tools"; then
      echo $ac_n "checking for objdump in $with_build_time_tools""... $ac_c" 1>&6
@@ -36225,7 +36248,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
      if test -x $with_build_time_tools/objdump; then
        OBJDUMP_FOR_TARGET=`cd $with_build_time_tools && pwd`/objdump
        ac_cv_path_OBJDUMP_FOR_TARGET=$OBJDUMP_FOR_TARGET
-@@ -6027,7 +6030,7 @@ if test -z "$ac_cv_path_OBJDUMP_FOR_TARG
+@@ -6027,7 +6030,7 @@
    # Extract the first word of "objdump", so it can be a program name with args.
  set dummy objdump; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -36234,7 +36257,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_path_OBJDUMP_FOR_TARGET'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -6064,7 +6067,7 @@ if test -z "$ac_cv_path_OBJDUMP_FOR_TARG
+@@ -6064,7 +6067,7 @@
     if test -n "$with_build_time_tools"; then
    for ncn_progname in objdump; do
      echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
@@ -36243,7 +36266,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
      if test -x $with_build_time_tools/${ncn_progname}; then
        ac_cv_prog_OBJDUMP_FOR_TARGET=$with_build_time_tools/${ncn_progname}
        echo "$ac_t""yes" 1>&6
-@@ -6081,7 +6084,7 @@ if test -z "$ac_cv_prog_OBJDUMP_FOR_TARG
+@@ -6081,7 +6084,7 @@
        # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
  set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -36252,7 +36275,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP_FOR_TARGET'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -6112,7 +6115,7 @@ fi
+@@ -6112,7 +6115,7 @@
        # Extract the first word of "${ncn_progname}", so it can be a program name with args.
  set dummy ${ncn_progname}; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -36261,7 +36284,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP_FOR_TARGET'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -6162,7 +6165,7 @@ fi
+@@ -6162,7 +6165,7 @@
  if test -z "$ac_cv_path_RANLIB_FOR_TARGET" ; then
    if test -n "$with_build_time_tools"; then
      echo $ac_n "checking for ranlib in $with_build_time_tools""... $ac_c" 1>&6
@@ -36270,7 +36293,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
      if test -x $with_build_time_tools/ranlib; then
        RANLIB_FOR_TARGET=`cd $with_build_time_tools && pwd`/ranlib
        ac_cv_path_RANLIB_FOR_TARGET=$RANLIB_FOR_TARGET
-@@ -6180,7 +6183,7 @@ if test -z "$ac_cv_path_RANLIB_FOR_TARGE
+@@ -6180,7 +6183,7 @@
    # Extract the first word of "ranlib", so it can be a program name with args.
  set dummy ranlib; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -36279,7 +36302,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_path_RANLIB_FOR_TARGET'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -6217,7 +6220,7 @@ if test -z "$ac_cv_path_RANLIB_FOR_TARGE
+@@ -6217,7 +6220,7 @@
     if test -n "$with_build_time_tools"; then
    for ncn_progname in ranlib; do
      echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
@@ -36288,7 +36311,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
      if test -x $with_build_time_tools/${ncn_progname}; then
        ac_cv_prog_RANLIB_FOR_TARGET=$with_build_time_tools/${ncn_progname}
        echo "$ac_t""yes" 1>&6
-@@ -6234,7 +6237,7 @@ if test -z "$ac_cv_prog_RANLIB_FOR_TARGE
+@@ -6234,7 +6237,7 @@
        # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
  set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -36297,7 +36320,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_RANLIB_FOR_TARGET'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -6265,7 +6268,7 @@ fi
+@@ -6265,7 +6268,7 @@
        # Extract the first word of "${ncn_progname}", so it can be a program name with args.
  set dummy ${ncn_progname}; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -36306,7 +36329,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_RANLIB_FOR_TARGET'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -6315,7 +6318,7 @@ fi
+@@ -6315,7 +6318,7 @@
  if test -z "$ac_cv_path_STRIP_FOR_TARGET" ; then
    if test -n "$with_build_time_tools"; then
      echo $ac_n "checking for strip in $with_build_time_tools""... $ac_c" 1>&6
@@ -36315,7 +36338,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
      if test -x $with_build_time_tools/strip; then
        STRIP_FOR_TARGET=`cd $with_build_time_tools && pwd`/strip
        ac_cv_path_STRIP_FOR_TARGET=$STRIP_FOR_TARGET
-@@ -6333,7 +6336,7 @@ if test -z "$ac_cv_path_STRIP_FOR_TARGET
+@@ -6333,7 +6336,7 @@
    # Extract the first word of "strip", so it can be a program name with args.
  set dummy strip; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -36324,7 +36347,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_path_STRIP_FOR_TARGET'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -6370,7 +6373,7 @@ if test -z "$ac_cv_path_STRIP_FOR_TARGET
+@@ -6370,7 +6373,7 @@
     if test -n "$with_build_time_tools"; then
    for ncn_progname in strip; do
      echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
@@ -36333,7 +36356,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
      if test -x $with_build_time_tools/${ncn_progname}; then
        ac_cv_prog_STRIP_FOR_TARGET=$with_build_time_tools/${ncn_progname}
        echo "$ac_t""yes" 1>&6
-@@ -6387,7 +6390,7 @@ if test -z "$ac_cv_prog_STRIP_FOR_TARGET
+@@ -6387,7 +6390,7 @@
        # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
  set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -36342,7 +36365,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_STRIP_FOR_TARGET'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -6418,7 +6421,7 @@ fi
+@@ -6418,7 +6421,7 @@
        # Extract the first word of "${ncn_progname}", so it can be a program name with args.
  set dummy ${ncn_progname}; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -36351,7 +36374,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_STRIP_FOR_TARGET'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -6468,7 +6471,7 @@ fi
+@@ -6468,7 +6471,7 @@
  if test -z "$ac_cv_path_WINDRES_FOR_TARGET" ; then
    if test -n "$with_build_time_tools"; then
      echo $ac_n "checking for windres in $with_build_time_tools""... $ac_c" 1>&6
@@ -36360,7 +36383,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
      if test -x $with_build_time_tools/windres; then
        WINDRES_FOR_TARGET=`cd $with_build_time_tools && pwd`/windres
        ac_cv_path_WINDRES_FOR_TARGET=$WINDRES_FOR_TARGET
-@@ -6486,7 +6489,7 @@ if test -z "$ac_cv_path_WINDRES_FOR_TARG
+@@ -6486,7 +6489,7 @@
    # Extract the first word of "windres", so it can be a program name with args.
  set dummy windres; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -36369,7 +36392,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_path_WINDRES_FOR_TARGET'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -6523,7 +6526,7 @@ if test -z "$ac_cv_path_WINDRES_FOR_TARG
+@@ -6523,7 +6526,7 @@
     if test -n "$with_build_time_tools"; then
    for ncn_progname in windres; do
      echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
@@ -36378,7 +36401,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
      if test -x $with_build_time_tools/${ncn_progname}; then
        ac_cv_prog_WINDRES_FOR_TARGET=$with_build_time_tools/${ncn_progname}
        echo "$ac_t""yes" 1>&6
-@@ -6540,7 +6543,7 @@ if test -z "$ac_cv_prog_WINDRES_FOR_TARG
+@@ -6540,7 +6543,7 @@
        # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
  set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -36387,7 +36410,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_WINDRES_FOR_TARGET'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -6571,7 +6574,7 @@ fi
+@@ -6571,7 +6574,7 @@
        # Extract the first word of "${ncn_progname}", so it can be a program name with args.
  set dummy ${ncn_progname}; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -36396,7 +36419,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if eval "test \"`echo '$''{'ac_cv_prog_WINDRES_FOR_TARGET'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -6619,7 +6622,7 @@ fi
+@@ -6619,7 +6622,7 @@
  RAW_CXX_FOR_TARGET="$CXX_FOR_TARGET"
  
  echo $ac_n "checking where to find the target ar""... $ac_c" 1>&6
@@ -36405,7 +36428,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if test "x${build}" != "x${host}" ; then
    if expr "x$AR_FOR_TARGET" : "x/" > /dev/null; then
      # We already found the complete path
-@@ -6652,7 +6655,7 @@ else
+@@ -6652,7 +6655,7 @@
    fi
  fi
  echo $ac_n "checking where to find the target as""... $ac_c" 1>&6
@@ -36414,7 +36437,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if test "x${build}" != "x${host}" ; then
    if expr "x$AS_FOR_TARGET" : "x/" > /dev/null; then
      # We already found the complete path
-@@ -6685,7 +6688,7 @@ else
+@@ -6685,7 +6688,7 @@
    fi
  fi
  echo $ac_n "checking where to find the target cc""... $ac_c" 1>&6
@@ -36423,7 +36446,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if test "x${build}" != "x${host}" ; then
    if expr "x$CC_FOR_TARGET" : "x/" > /dev/null; then
      # We already found the complete path
-@@ -6718,7 +6721,7 @@ else
+@@ -6718,7 +6721,7 @@
    fi
  fi
  echo $ac_n "checking where to find the target c++""... $ac_c" 1>&6
@@ -36432,7 +36455,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if test "x${build}" != "x${host}" ; then
    if expr "x$CXX_FOR_TARGET" : "x/" > /dev/null; then
      # We already found the complete path
-@@ -6754,7 +6757,7 @@ else
+@@ -6754,7 +6757,7 @@
    fi
  fi
  echo $ac_n "checking where to find the target c++ for libstdc++""... $ac_c" 1>&6
@@ -36441,7 +36464,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if test "x${build}" != "x${host}" ; then
    if expr "x$RAW_CXX_FOR_TARGET" : "x/" > /dev/null; then
      # We already found the complete path
-@@ -6790,7 +6793,7 @@ else
+@@ -6790,7 +6793,7 @@
    fi
  fi
  echo $ac_n "checking where to find the target dlltool""... $ac_c" 1>&6
@@ -36450,7 +36473,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if test "x${build}" != "x${host}" ; then
    if expr "x$DLLTOOL_FOR_TARGET" : "x/" > /dev/null; then
      # We already found the complete path
-@@ -6823,7 +6826,7 @@ else
+@@ -6823,7 +6826,7 @@
    fi
  fi
  echo $ac_n "checking where to find the target gcc""... $ac_c" 1>&6
@@ -36459,7 +36482,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if test "x${build}" != "x${host}" ; then
    if expr "x$GCC_FOR_TARGET" : "x/" > /dev/null; then
      # We already found the complete path
-@@ -6856,7 +6859,7 @@ else
+@@ -6856,7 +6859,7 @@
    fi
  fi
  echo $ac_n "checking where to find the target gcj""... $ac_c" 1>&6
@@ -36468,7 +36491,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if test "x${build}" != "x${host}" ; then
    if expr "x$GCJ_FOR_TARGET" : "x/" > /dev/null; then
      # We already found the complete path
-@@ -6892,7 +6895,7 @@ else
+@@ -6892,7 +6895,7 @@
    fi
  fi
  echo $ac_n "checking where to find the target gfortran""... $ac_c" 1>&6
@@ -36477,7 +36500,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if test "x${build}" != "x${host}" ; then
    if expr "x$GFORTRAN_FOR_TARGET" : "x/" > /dev/null; then
      # We already found the complete path
-@@ -6928,7 +6931,7 @@ else
+@@ -6928,7 +6931,7 @@
    fi
  fi
  echo $ac_n "checking where to find the target ld""... $ac_c" 1>&6
@@ -36486,7 +36509,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if test "x${build}" != "x${host}" ; then
    if expr "x$LD_FOR_TARGET" : "x/" > /dev/null; then
      # We already found the complete path
-@@ -6961,7 +6964,7 @@ else
+@@ -6961,7 +6964,7 @@
    fi
  fi
  echo $ac_n "checking where to find the target lipo""... $ac_c" 1>&6
@@ -36495,7 +36518,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if test "x${build}" != "x${host}" ; then
    if expr "x$LIPO_FOR_TARGET" : "x/" > /dev/null; then
      # We already found the complete path
-@@ -6984,7 +6987,7 @@ else
+@@ -6984,7 +6987,7 @@
    fi
  fi
  echo $ac_n "checking where to find the target nm""... $ac_c" 1>&6
@@ -36504,7 +36527,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if test "x${build}" != "x${host}" ; then
    if expr "x$NM_FOR_TARGET" : "x/" > /dev/null; then
      # We already found the complete path
-@@ -7017,7 +7020,7 @@ else
+@@ -7017,7 +7020,7 @@
    fi
  fi
  echo $ac_n "checking where to find the target objdump""... $ac_c" 1>&6
@@ -36513,7 +36536,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if test "x${build}" != "x${host}" ; then
    if expr "x$OBJDUMP_FOR_TARGET" : "x/" > /dev/null; then
      # We already found the complete path
-@@ -7050,7 +7053,7 @@ else
+@@ -7050,7 +7053,7 @@
    fi
  fi
  echo $ac_n "checking where to find the target ranlib""... $ac_c" 1>&6
@@ -36522,7 +36545,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if test "x${build}" != "x${host}" ; then
    if expr "x$RANLIB_FOR_TARGET" : "x/" > /dev/null; then
      # We already found the complete path
-@@ -7083,7 +7086,7 @@ else
+@@ -7083,7 +7086,7 @@
    fi
  fi
  echo $ac_n "checking where to find the target strip""... $ac_c" 1>&6
@@ -36531,7 +36554,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if test "x${build}" != "x${host}" ; then
    if expr "x$STRIP_FOR_TARGET" : "x/" > /dev/null; then
      # We already found the complete path
-@@ -7116,7 +7119,7 @@ else
+@@ -7116,7 +7119,7 @@
    fi
  fi
  echo $ac_n "checking where to find the target windres""... $ac_c" 1>&6
@@ -36540,7 +36563,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  if test "x${build}" != "x${host}" ; then
    if expr "x$WINDRES_FOR_TARGET" : "x/" > /dev/null; then
      # We already found the complete path
-@@ -7177,7 +7180,7 @@ fi
+@@ -7177,7 +7180,7 @@
  
  
  echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
@@ -36549,7 +36572,7 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
  if test "${enable_maintainer_mode+set}" = set; then
    enableval="$enable_maintainer_mode"
-@@ -7334,34 +7337,15 @@ trap 'rm -f $CONFIG_STATUS conftest*; ex
+@@ -7334,34 +7337,15 @@
  # Transform confdefs.h into DEFS.
  # Protect against shell expansion while executing Makefile rules.
  # Protect against Makefile macro expansion.
@@ -36593,10 +36616,11 @@ diff -Nrup binutils-2.17/configure binutils-2.17-atmel/configure
  
  
  # Without the "./", some shells look in PATH for config.status.
-diff -Nrup binutils-2.17/configure.in binutils-2.17-atmel/configure.in
---- binutils-2.17/configure.in	2006-06-23 20:19:53.000000000 +0200
-+++ binutils-2.17-atmel/configure.in	2007-02-12 15:37:09.000000000 +0100
-@@ -269,6 +269,9 @@ unsupported_languages=
+Index: binutils-2.17/configure.in
+===================================================================
+--- binutils-2.17.orig/configure.in	2007-06-28 09:19:35.593825368 +0200
++++ binutils-2.17/configure.in	2007-06-28 09:19:36.611670632 +0200
+@@ -269,6 +269,9 @@
  # exist yet.
  
  case "${host}" in
@@ -36606,10 +36630,11 @@ diff -Nrup binutils-2.17/configure.in binutils-2.17-atmel/configure.in
    hppa*64*-*-*)
      noconfigdirs="$noconfigdirs byacc"
      ;;
-diff -Nrup binutils-2.17/gas/as.c binutils-2.17-atmel/gas/as.c
---- binutils-2.17/gas/as.c	2006-02-09 01:07:41.000000000 +0100
-+++ binutils-2.17-atmel/gas/as.c	2007-02-12 15:37:09.000000000 +0100
-@@ -439,10 +439,10 @@ parse_args (int * pargc, char *** pargv)
+Index: binutils-2.17/gas/as.c
+===================================================================
+--- binutils-2.17.orig/gas/as.c	2007-06-28 09:19:34.271026464 +0200
++++ binutils-2.17/gas/as.c	2007-06-28 09:19:36.612670480 +0200
+@@ -439,10 +439,10 @@
         the end of the preceeding line so that it is simpler to
         selectively add and remove lines from this list.  */
      {"alternate", no_argument, NULL, OPTION_ALTERNATE}
@@ -36624,7 +36649,7 @@ diff -Nrup binutils-2.17/gas/as.c binutils-2.17-atmel/gas/as.c
      ,{"a", optional_argument, NULL, 'a'}
      /* Handle -al=<FILE>.  */
      ,{"al", optional_argument, NULL, OPTION_AL}
-@@ -795,8 +795,15 @@ the GNU General Public License.  This pr
+@@ -795,8 +795,15 @@
  	case 'a':
  	  if (optarg)
  	    {
@@ -36642,7 +36667,7 @@ diff -Nrup binutils-2.17/gas/as.c binutils-2.17-atmel/gas/as.c
  
  	      if (md_parse_option (optc, optarg) != 0)
  		break;
-@@ -1189,7 +1196,7 @@ main (int argc, char ** argv)
+@@ -1189,7 +1196,7 @@
      keep_it = 0;
  
    if (!keep_it)
@@ -36651,9 +36676,10 @@ diff -Nrup binutils-2.17/gas/as.c binutils-2.17-atmel/gas/as.c
  
    input_scrub_end ();
  
-diff -Nrup binutils-2.17/gas/config/bfin-aux.h binutils-2.17-atmel/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/gas/config/bfin-aux.h	2007-02-12 15:37:09.000000000 +0100
+Index: binutils-2.17/gas/config/bfin-aux.h
+===================================================================
+--- binutils-2.17.orig/gas/config/bfin-aux.h	2007-06-28 09:19:34.276025704 +0200
++++ binutils-2.17/gas/config/bfin-aux.h	2007-06-28 09:19:36.612670480 +0200
 @@ -1,151 +1,151 @@
 -/* bfin-aux.h ADI Blackfin Header file for gas
 -   Copyright 2005
@@ -36957,9 +36983,10 @@ diff -Nrup binutils-2.17/gas/config/bfin-aux.h binutils-2.17-atmel/gas/config/bf
 +
 +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/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/gas/config/tc-avr32.c	2007-02-12 15:37:09.000000000 +0100
+Index: binutils-2.17/gas/config/tc-avr32.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ binutils-2.17/gas/config/tc-avr32.c	2007-06-28 09:19:36.616669872 +0200
 @@ -0,0 +1,4714 @@
 +/* Assembler implementation for AVR32.
 +   Copyright 2003-2006 Atmel Corporation.
@@ -41675,9 +41702,10 @@ diff -Nrup binutils-2.17/gas/config/tc-avr32.c binutils-2.17-atmel/gas/config/tc
 +
 +/* vim: syntax=c sw=2
 + */
-diff -Nrup binutils-2.17/gas/config/tc-avr32.h binutils-2.17-atmel/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/gas/config/tc-avr32.h	2007-02-12 15:37:09.000000000 +0100
+Index: binutils-2.17/gas/config/tc-avr32.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ binutils-2.17/gas/config/tc-avr32.h	2007-06-28 09:19:36.617669720 +0200
 @@ -0,0 +1,313 @@
 +/* Assembler definitions for AVR32.
 +   Copyright 2003-2006 Atmel Corporation.
@@ -41992,9 +42020,10 @@ diff -Nrup binutils-2.17/gas/config/tc-avr32.h binutils-2.17-atmel/gas/config/tc
 +      (fixP)->tc_fix_data.max = 0;		\
 +    }						\
 +  while (0)
-diff -Nrup binutils-2.17/gas/config.in binutils-2.17-atmel/gas/config.in
---- binutils-2.17/gas/config.in	2006-02-14 09:59:09.000000000 +0100
-+++ binutils-2.17-atmel/gas/config.in	2007-02-20 16:07:31.000000000 +0100
+Index: binutils-2.17/gas/config.in
+===================================================================
+--- binutils-2.17.orig/gas/config.in	2007-06-28 09:19:34.291023424 +0200
++++ binutils-2.17/gas/config.in	2007-06-28 09:19:36.617669720 +0200
 @@ -246,7 +246,7 @@
  
  /* If using the C implementation of alloca, define if you know the
@@ -42015,9 +42044,10 @@ diff -Nrup binutils-2.17/gas/config.in binutils-2.17-atmel/gas/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
-diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
---- binutils-2.17/gas/configure	2006-04-06 23:49:31.000000000 +0200
-+++ binutils-2.17-atmel/gas/configure	2007-02-20 16:07:29.000000000 +0100
+Index: binutils-2.17/gas/configure
+===================================================================
+--- binutils-2.17.orig/gas/configure	2007-06-28 09:19:35.035910184 +0200
++++ binutils-2.17/gas/configure	2007-06-28 09:19:36.630667744 +0200
 @@ -1,25 +1,54 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
@@ -42079,7 +42109,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  
  # Support unset when possible.
  if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-@@ -29,8 +58,43 @@ else
+@@ -29,8 +58,43 @@
  fi
  
  
@@ -42124,7 +42154,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  PS1='$ '
  PS2='> '
  PS4='+ '
-@@ -44,18 +108,19 @@ do
+@@ -44,18 +108,19 @@
    if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
      eval $as_var=C; export $as_var
    else
@@ -42147,7 +42177,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
    as_basename=basename
  else
    as_basename=false
-@@ -63,157 +128,388 @@ fi
+@@ -63,157 +128,388 @@
  
  
  # Name of the executable.
@@ -42634,7 +42664,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  
  if mkdir -p . 2>/dev/null; then
    as_mkdir_p=:
-@@ -222,7 +518,28 @@ else
+@@ -222,7 +518,28 @@
    as_mkdir_p=false
  fi
  
@@ -42664,7 +42694,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  
  # Sed expression to map a string onto a valid CPP name.
  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -231,39 +548,27 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P
+@@ -231,39 +548,27 @@
  as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
  
  
@@ -42707,7 +42737,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  # Identity of this package.
  PACKAGE_NAME=
  PACKAGE_TARNAME=
-@@ -275,42 +580,190 @@ ac_unique_file="as.h"
+@@ -275,42 +580,190 @@
  # Factoring default headers for most tests.
  ac_includes_default="\
  #include <stdio.h>
@@ -42912,7 +42942,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  
  # Initialize some variables set by options.
  ac_init_help=
-@@ -337,34 +790,48 @@ x_libraries=NONE
+@@ -337,34 +790,48 @@
  # and all the variables that are supposed to be based on exec_prefix
  # by default will actually change.
  # Use braces instead of parens because sh, perl, etc. also accept them.
@@ -42968,7 +42998,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  
    -bindir | --bindir | --bindi | --bind | --bin | --bi)
      ac_prev=bindir ;;
-@@ -386,33 +853,45 @@ do
+@@ -386,33 +853,45 @@
    --config-cache | -C)
      cache_file=config.cache ;;
  
@@ -43027,7 +43057,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  
    -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
    | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-@@ -439,6 +918,12 @@ do
+@@ -439,6 +918,12 @@
    -host=* | --host=* | --hos=* | --ho=*)
      host_alias=$ac_optarg ;;
  
@@ -43040,7 +43070,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
    -includedir | --includedir | --includedi | --included | --include \
    | --includ | --inclu | --incl | --inc)
      ac_prev=includedir ;;
-@@ -463,13 +948,16 @@ do
+@@ -463,13 +948,16 @@
    | --libexe=* | --libex=* | --libe=*)
      libexecdir=$ac_optarg ;;
  
@@ -43061,7 +43091,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
      localstatedir=$ac_optarg ;;
  
    -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-@@ -534,6 +1022,16 @@ do
+@@ -534,6 +1022,16 @@
    | --progr-tra=* | --program-tr=* | --program-t=*)
      program_transform_name=$ac_optarg ;;
  
@@ -43078,7 +43108,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
    | -silent | --silent | --silen | --sile | --sil)
      silent=yes ;;
-@@ -586,24 +1084,20 @@ do
+@@ -586,24 +1084,20 @@
    -with-* | --with-*)
      ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
      # Reject names that are not valid shell variable names.
@@ -43109,7 +43139,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  
    --x)
      # Obsolete; use --with-x.
-@@ -634,8 +1128,7 @@ Try \`$0 --help' for more information." 
+@@ -634,8 +1128,7 @@
      expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
        { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
     { (exit 1); exit 1; }; }
@@ -43119,7 +43149,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
      export $ac_envvar ;;
  
    *)
-@@ -655,27 +1148,19 @@ if test -n "$ac_prev"; then
+@@ -655,27 +1148,19 @@
     { (exit 1); exit 1; }; }
  fi
  
@@ -43157,7 +43187,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  done
  
  # There might be people who depend on the old broken behavior: `$host'
-@@ -702,74 +1187,76 @@ test -n "$host_alias" && ac_tool_prefix=
+@@ -702,74 +1187,76 @@
  test "$silent" = yes && exec 6>/dev/null
  
  
@@ -43289,7 +43319,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  
  #
  # Report the --help message.
-@@ -798,9 +1285,6 @@ Configuration:
+@@ -798,9 +1285,6 @@
    -n, --no-create         do not create output files
        --srcdir=DIR        find the sources in DIR [configure dir or \`..']
  
@@ -43299,7 +43329,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  Installation directories:
    --prefix=PREFIX         install architecture-independent files in PREFIX
  			  [$ac_default_prefix]
-@@ -818,15 +1302,22 @@ Fine tuning of the installation director
+@@ -818,15 +1302,22 @@
    --bindir=DIR           user executables [EPREFIX/bin]
    --sbindir=DIR          system admin executables [EPREFIX/sbin]
    --libexecdir=DIR       program executables [EPREFIX/libexec]
@@ -43325,7 +43355,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  _ACEOF
  
    cat <<\_ACEOF
-@@ -876,126 +1367,100 @@ Some influential environment variables:
+@@ -876,126 +1367,100 @@
    CFLAGS      C compiler flags
    LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
                nonstandard directory <lib dir>
@@ -43508,7 +43538,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  {
  cat <<_ASUNAME
  ## --------- ##
-@@ -1014,7 +1479,7 @@ uname -v = `(uname -v) 2>/dev/null || ec
+@@ -1014,7 +1479,7 @@
  /bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
  /usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
  /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
@@ -43517,7 +43547,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  /bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
  /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
  /bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-@@ -1028,6 +1493,7 @@ do
+@@ -1028,6 +1493,7 @@
    test -z "$as_dir" && as_dir=.
    echo "PATH: $as_dir"
  done
@@ -43525,7 +43555,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  
  } >&5
  
-@@ -1049,7 +1515,6 @@ _ACEOF
+@@ -1049,7 +1515,6 @@
  ac_configure_args=
  ac_configure_args0=
  ac_configure_args1=
@@ -43533,7 +43563,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  ac_must_keep_next=false
  for ac_pass in 1 2
  do
-@@ -1060,7 +1525,7 @@ do
+@@ -1060,7 +1525,7 @@
      -q | -quiet | --quiet | --quie | --qui | --qu | --q \
      | -silent | --silent | --silen | --sile | --sil)
        continue ;;
@@ -43542,7 +43572,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
        ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
      esac
      case $ac_pass in
-@@ -1082,9 +1547,7 @@ do
+@@ -1082,9 +1547,7 @@
  	  -* ) ac_must_keep_next=true ;;
  	esac
        fi
@@ -43553,7 +43583,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
        ;;
      esac
    done
-@@ -1095,8 +1558,8 @@ $as_unset ac_configure_args1 || test "${
+@@ -1095,8 +1558,8 @@
  # When interrupted or exit'd, cleanup temporary files, and complete
  # config.log.  We remove comments because anyway the quotes in there
  # would cause problems or look ugly.
@@ -43564,7 +43594,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  trap 'exit_status=$?
    # Save into config.log some information that might help in debugging.
    {
-@@ -1109,20 +1572,34 @@ trap 'exit_status=$?
+@@ -1109,20 +1572,34 @@
  _ASBOX
      echo
      # The following way of writing the cache mishandles newlines in values,
@@ -43609,7 +43639,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
      echo
  
      cat <<\_ASBOX
-@@ -1133,22 +1610,28 @@ _ASBOX
+@@ -1133,22 +1610,28 @@
      echo
      for ac_var in $ac_subst_vars
      do
@@ -43645,7 +43675,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
        done | sort
        echo
      fi
-@@ -1160,26 +1643,24 @@ _ASBOX
+@@ -1160,26 +1643,24 @@
  ## ----------- ##
  _ASBOX
        echo
@@ -43677,7 +43707,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  
  # Predefined preprocessor variables.
  
-@@ -1210,14 +1691,17 @@ _ACEOF
+@@ -1210,14 +1691,17 @@
  
  # Let the site file select an alternate cache file if it wants to.
  # Prefer explicitly selected file to automatically selected ones.
@@ -43702,7 +43732,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
    if test -r "$ac_site_file"; then
      { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
  echo "$as_me: loading site script $ac_site_file" >&6;}
-@@ -1233,8 +1717,8 @@ if test -r "$cache_file"; then
+@@ -1233,8 +1717,8 @@
      { echo "$as_me:$LINENO: loading cache $cache_file" >&5
  echo "$as_me: loading cache $cache_file" >&6;}
      case $cache_file in
@@ -43713,7 +43743,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
      esac
    fi
  else
-@@ -1246,12 +1730,11 @@ fi
+@@ -1246,12 +1730,11 @@
  # Check that the precious variables saved in the cache have kept the same
  # value.
  ac_cache_corrupted=false
@@ -43729,7 +43759,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
    case $ac_old_set,$ac_new_set in
      set,)
        { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-@@ -1276,8 +1759,7 @@ echo "$as_me:   current value: $ac_new_v
+@@ -1276,8 +1759,7 @@
    # Pass precious variables to config.status.
    if test "$ac_new_set" = set; then
      case $ac_new_val in
@@ -43739,7 +43769,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
      *) ac_arg=$ac_var=$ac_new_val ;;
      esac
      case " $ac_configure_args " in
-@@ -1294,12 +1776,6 @@ echo "$as_me: error: run \`make distclea
+@@ -1294,12 +1776,6 @@
     { (exit 1); exit 1; }; }
  fi
  
@@ -43752,7 +43782,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  
  
  
-@@ -1316,108 +1792,163 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -1316,108 +1792,163 @@
  
  
  
@@ -43968,7 +43998,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  
  
  # The aliases save the names the user supplied, while $host etc.
-@@ -1434,8 +1965,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -1434,8 +1965,8 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
  set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -43979,7 +44009,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -1448,32 +1979,34 @@ do
+@@ -1448,32 +1979,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -44021,7 +44051,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -1486,36 +2019,51 @@ do
+@@ -1486,36 +2019,51 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -44083,7 +44113,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -1528,74 +2076,34 @@ do
+@@ -1528,74 +2076,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -44167,7 +44197,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -1609,7 +2117,7 @@ do
+@@ -1609,7 +2117,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -44176,7 +44206,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
      if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
         ac_prog_rejected=yes
         continue
-@@ -1620,6 +2128,7 @@ do
+@@ -1620,6 +2128,7 @@
    fi
  done
  done
@@ -44184,7 +44214,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  
  if test $ac_prog_rejected = yes; then
    # We found a bogon in the path, so make sure we never use it.
-@@ -1637,22 +2146,23 @@ fi
+@@ -1637,22 +2146,23 @@
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
@@ -44215,7 +44245,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -1665,36 +2175,38 @@ do
+@@ -1665,36 +2175,38 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -44262,7 +44292,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -1707,29 +2219,45 @@ do
+@@ -1707,29 +2219,45 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -44314,7 +44344,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  fi
  
  fi
-@@ -1742,21 +2270,35 @@ See \`config.log' for more details." >&2
+@@ -1742,21 +2270,35 @@
     { (exit 1); exit 1; }; }
  
  # Provide some information about the compiler.
@@ -44358,7 +44388,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
-@@ -1781,47 +2323,77 @@ ac_clean_files="$ac_clean_files a.out a.
+@@ -1781,47 +2323,77 @@
  # Try to create an executable without -o first, disregard a.out.
  # It will help us diagnose broken compilers, and finding out an intuition
  # of exeext.
@@ -44458,7 +44488,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
-@@ -1833,19 +2405,21 @@ See \`config.log' for more details." >&2
+@@ -1833,19 +2405,21 @@
  fi
  
  ac_exeext=$ac_cv_exeext
@@ -44487,7 +44517,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -1864,22 +2438,27 @@ See \`config.log' for more details." >&2
+@@ -1864,22 +2438,27 @@
      fi
    fi
  fi
@@ -44527,7 +44557,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
-@@ -1890,9 +2469,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -1890,9 +2469,8 @@
  for ac_file in conftest.exe conftest conftest.*; do
    test -f "$ac_file" || continue
    case $ac_file in
@@ -44538,7 +44568,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  	  break;;
      * ) break;;
    esac
-@@ -1906,14 +2484,14 @@ See \`config.log' for more details." >&2
+@@ -1906,14 +2484,14 @@
  fi
  
  rm -f conftest$ac_cv_exeext
@@ -44557,7 +44587,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "${ac_cv_objext+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -1933,14 +2511,20 @@ main ()
+@@ -1933,14 +2511,20 @@
  }
  _ACEOF
  rm -f conftest.o conftest.obj
@@ -44582,7 +44612,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
      *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
         break;;
    esac
-@@ -1958,12 +2542,12 @@ fi
+@@ -1958,12 +2542,12 @@
  
  rm -f conftest.$ac_cv_objext conftest.$ac_ext
  fi
@@ -44599,7 +44629,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "${ac_cv_c_compiler_gnu+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -1986,50 +2570,49 @@ main ()
+@@ -1986,50 +2570,49 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -44673,7 +44703,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -2045,38 +2628,118 @@ main ()
+@@ -2045,38 +2628,118 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -44808,7 +44838,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "$ac_test_CFLAGS" = set; then
    CFLAGS=$ac_save_CFLAGS
  elif test $ac_cv_prog_cc_g = yes; then
-@@ -2092,12 +2755,12 @@ else
+@@ -2092,12 +2755,12 @@
      CFLAGS=
    fi
  fi
@@ -44825,7 +44855,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  ac_save_CC=$CC
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -2131,12 +2794,17 @@ static char *f (char * (*g) (char **, in
+@@ -2131,12 +2794,17 @@
  /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
     function prototypes and stuff, but not '\xHH' hex character constants.
     These don't provoke an error unfortunately, instead are silently treated
@@ -44845,7 +44875,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  int test (int i, double x);
  struct s1 {int (*f) (int a);};
  struct s2 {int (*f) (double a);};
-@@ -2151,335 +2819,144 @@ return f (e, argv, 0) != argv[0]  ||  f 
+@@ -2151,335 +2819,144 @@
    return 0;
  }
  _ACEOF
@@ -45268,7 +45298,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  
  fi
  
-@@ -2499,8 +2976,8 @@ am__api_version="1.9"
+@@ -2499,8 +2976,8 @@
  # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
  # OS/2's system install, which has a completely different semantic
  # ./install, which can be erroneously created by make from ./install.sh.
@@ -45279,7 +45309,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test -z "$INSTALL"; then
  if test "${ac_cv_path_install+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2522,7 +2999,7 @@ case $as_dir/ in
+@@ -2522,7 +2999,7 @@
      # by default.
      for ac_prog in ginstall scoinst install; do
        for ac_exec_ext in '' $ac_executable_extensions; do
@@ -45288,7 +45318,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  	  if test $ac_prog = install &&
  	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
  	    # AIX install.  It has an incompatible calling convention.
-@@ -2541,21 +3018,22 @@ case $as_dir/ in
+@@ -2541,21 +3018,22 @@
      ;;
  esac
  done
@@ -45316,7 +45346,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  
  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
  # It thinks the first close brace ends the variable substitution.
-@@ -2565,8 +3043,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
+@@ -2565,8 +3043,8 @@
  
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
@@ -45327,7 +45357,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  # Just in case
  sleep 1
  echo timestamp > conftest.file
-@@ -2608,20 +3086,20 @@ echo "$as_me: error: newly created file 
+@@ -2608,20 +3086,20 @@
  Check your system clock" >&2;}
     { (exit 1); exit 1; }; }
  fi
@@ -45353,7 +45383,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  
  # expand $ac_aux_dir to an absolute path
  am_aux_dir=`cd $ac_aux_dir && pwd`
-@@ -2673,8 +3151,8 @@ for ac_prog in gawk mawk nawk awk
+@@ -2673,8 +3151,8 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -45364,7 +45394,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "${ac_cv_prog_AWK+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2687,54 +3165,57 @@ do
+@@ -2687,54 +3165,57 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -45443,7 +45473,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
    SET_MAKE="MAKE=${MAKE-make}"
  fi
  
-@@ -2749,7 +3230,7 @@ rmdir .tst 2>/dev/null
+@@ -2749,7 +3230,7 @@
  
  DEPDIR="${am__leading_dot}deps"
  
@@ -45452,7 +45482,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  
  
  am_make=${MAKE-make}
-@@ -2759,8 +3240,8 @@ am__doit:
+@@ -2759,8 +3240,8 @@
  .PHONY: am__doit
  END
  # If we don't find an include directive, just comment out the code.
@@ -45463,7 +45493,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  am__include="#"
  am__quote=
  _am_result=none
-@@ -2787,15 +3268,15 @@ if test "$am__include" = "#"; then
+@@ -2787,15 +3268,15 @@
  fi
  
  
@@ -45484,7 +45514,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "x$enable_dependency_tracking" != xno; then
    am_depcomp="$ac_aux_dir/depcomp"
    AMDEPBACKSLASH='\'
-@@ -2870,8 +3351,8 @@ if test "$cross_compiling" != no; then
+@@ -2870,8 +3351,8 @@
    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.
  set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -45495,7 +45525,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "${ac_cv_prog_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2884,32 +3365,34 @@ do
+@@ -2884,32 +3365,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -45537,7 +45567,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2922,27 +3405,41 @@ do
+@@ -2922,27 +3405,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -45586,7 +45616,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  else
    STRIP="$ac_cv_prog_STRIP"
  fi
-@@ -2963,8 +3460,8 @@ am__tar='${AMTAR} chof - "$$tardir"'; am
+@@ -2963,8 +3460,8 @@
  
  depcc="$CC"   am_compiler_list=
  
@@ -45597,7 +45627,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3053,8 +3550,8 @@ else
+@@ -3053,8 +3550,8 @@
  fi
  
  fi
@@ -45608,7 +45638,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
  
  
-@@ -3072,10 +3569,9 @@ fi
+@@ -3072,10 +3569,9 @@
  
  
  
@@ -45621,7 +45651,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  case $enableval in
  yes) enable_shared=yes ;;
  no) enable_shared=no ;;
-@@ -3093,11 +3589,11 @@ no) enable_shared=no ;;
+@@ -3093,11 +3589,11 @@
  esac
  else
    enable_shared=yes
@@ -45637,7 +45667,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  case $enableval in
  yes) enable_static=yes ;;
  no) enable_static=no ;;
-@@ -3115,11 +3611,11 @@ no) enable_static=no ;;
+@@ -3115,11 +3611,11 @@
  esac
  else
    enable_static=yes
@@ -45653,7 +45683,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  case $enableval in
  yes) enable_fast_install=yes ;;
  no) enable_fast_install=no ;;
-@@ -3137,20 +3633,21 @@ no) enable_fast_install=no ;;
+@@ -3137,20 +3633,21 @@
  esac
  else
    enable_fast_install=yes
@@ -45682,7 +45712,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
    case $host in
    *-*-mingw*)
      # gcc leaves a trailing carriage return which upsets mingw
-@@ -3179,11 +3676,11 @@ echo $ECHO_N "checking for ld used by GC
+@@ -3179,11 +3676,11 @@
      ;;
    esac
  elif test "$with_gnu_ld" = yes; then
@@ -45698,7 +45728,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  fi
  if test "${lt_cv_path_LD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3212,17 +3709,17 @@ fi
+@@ -3212,17 +3709,17 @@
  
  LD="$lt_cv_path_LD"
  if test -n "$LD"; then
@@ -45722,7 +45752,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "${lt_cv_prog_gnu_ld+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3233,25 +3730,25 @@ else
+@@ -3233,25 +3730,25 @@
    lt_cv_prog_gnu_ld=no
  fi
  fi
@@ -45756,7 +45786,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "${lt_cv_path_NM+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3286,22 +3783,22 @@ fi
+@@ -3286,22 +3783,22 @@
  fi
  
  NM="$lt_cv_path_NM"
@@ -45789,7 +45819,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "${lt_cv_deplibs_check_method+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3463,8 +3960,8 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+@@ -3463,8 +3960,8 @@
  esac
  
  fi
@@ -45800,7 +45830,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  file_magic_cmd=$lt_cv_file_magic_cmd
  deplibs_check_method=$lt_cv_deplibs_check_method
  
-@@ -3474,8 +3971,8 @@ deplibs_check_method=$lt_cv_deplibs_chec
+@@ -3474,8 +3971,8 @@
  # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
  
  # find the maximum length of command line arguments
@@ -45811,7 +45841,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "${lt_cv_sys_max_cmd_len+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3526,11 +4023,11 @@ else
+@@ -3526,11 +4023,11 @@
  fi
  
  if test -n "$lt_cv_sys_max_cmd_len" ; then
@@ -45827,7 +45857,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  fi
  
  
-@@ -3538,8 +4035,8 @@ fi
+@@ -3538,8 +4035,8 @@
  case $deplibs_check_method in
  file_magic*)
    if test "$file_magic_cmd" = '$MAGIC_CMD'; then
@@ -45838,7 +45868,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3593,17 +4090,17 @@ fi
+@@ -3593,17 +4090,17 @@
  
  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  if test -n "$MAGIC_CMD"; then
@@ -45862,7 +45892,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3657,11 +4154,11 @@ fi
+@@ -3657,11 +4154,11 @@
  
  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  if test -n "$MAGIC_CMD"; then
@@ -45878,7 +45908,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  fi
  
    else
-@@ -3676,8 +4173,8 @@ esac
+@@ -3676,8 +4173,8 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
  set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -45889,7 +45919,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "${ac_cv_prog_RANLIB+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3690,32 +4187,34 @@ do
+@@ -3690,32 +4187,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -45931,7 +45961,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3728,27 +4227,41 @@ do
+@@ -3728,27 +4227,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -45980,7 +46010,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  else
    RANLIB="$ac_cv_prog_RANLIB"
  fi
-@@ -3756,8 +4269,8 @@ fi
+@@ -3756,8 +4269,8 @@
  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.
  set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -45991,7 +46021,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "${ac_cv_prog_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3770,32 +4283,34 @@ do
+@@ -3770,32 +4283,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -46033,7 +46063,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3808,27 +4323,41 @@ do
+@@ -3808,27 +4323,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -46082,7 +46112,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  else
    STRIP="$ac_cv_prog_STRIP"
  fi
-@@ -3843,22 +4372,22 @@ test "$GCC" = yes && libtool_flags="$lib
+@@ -3843,22 +4372,22 @@
  test "$lt_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
  
  
@@ -46112,7 +46142,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  test x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic"
  test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
  
-@@ -3867,7 +4396,7 @@ test x"$pic_mode" = xno && libtool_flags
+@@ -3867,7 +4396,7 @@
  case $host in
  *-*-irix6*)
    # Find out which ABI we are using.
@@ -46121,7 +46151,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-@@ -3972,13 +4501,12 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*li
+@@ -3972,13 +4501,12 @@
    # On SCO OpenServer 5, we need -belf to get full-featured binaries.
    SAVE_CFLAGS="$CFLAGS"
    CFLAGS="$CFLAGS -belf"
@@ -46137,7 +46167,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
       ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4001,35 +4529,32 @@ main ()
+@@ -4001,35 +4529,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -46188,7 +46218,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
        conftest$ac_exeext conftest.$ac_ext
       ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -4038,8 +4563,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
+@@ -4038,8 +4563,8 @@
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  fi
@@ -46199,7 +46229,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
    if test x"$lt_cv_cc_needs_belf" != x"yes"; then
      # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
      CFLAGS="$SAVE_CFLAGS"
-@@ -4069,39 +4594,58 @@ _ACEOF
+@@ -4069,39 +4594,58 @@
  
  # The following way of writing the cache mishandles newlines in values,
  # but we know of no workaround that is simple, portable, and efficient.
@@ -46274,7 +46304,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
    fi
  fi
  rm -f confcache
-@@ -4127,8 +4671,8 @@ if test -r "$cache_file"; then
+@@ -4127,8 +4671,8 @@
      { echo "$as_me:$LINENO: loading cache $cache_file" >&5
  echo "$as_me: loading cache $cache_file" >&6;}
      case $cache_file in
@@ -46285,7 +46315,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
      esac
    fi
  else
-@@ -4154,10 +4698,9 @@ exec 5>>./config.log
+@@ -4154,10 +4698,9 @@
  
  
  
@@ -46298,7 +46328,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
    yes | "") { { echo "$as_me:$LINENO: error: enable-targets option must specify target names or 'all'" >&5
  echo "$as_me: error: enable-targets option must specify target names or 'all'" >&2;}
     { (exit 1); exit 1; }; }
-@@ -4165,33 +4708,34 @@ echo "$as_me: error: enable-targets opti
+@@ -4165,33 +4708,34 @@
    no)	    enable_targets= ;;
    *)	    enable_targets=$enableval ;;
  esac
@@ -46341,7 +46371,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  
  # Enable -Werror by default when using gcc
  if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
-@@ -4208,10 +4752,9 @@ if test "${GCC}" = yes ; then
+@@ -4208,10 +4752,9 @@
    WARN_CFLAGS="${GCC_WARN_CFLAGS}"
  fi
  
@@ -46354,7 +46384,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
    yes)	WARN_CFLAGS="${GCC_WARN_CFLAGS}";;
    no)	if test "${GCC}" = yes ; then
  	  WARN_CFLAGS="-w"
-@@ -4222,7 +4765,8 @@ if test "${enable_build_warnings+set}" =
+@@ -4222,7 +4765,8 @@
          WARN_CFLAGS="${t} ${GCC_WARN_CFLAGS}";;
    *)    WARN_CFLAGS=`echo "${enableval}" | sed -e "s/,/ /g"`;;
  esac
@@ -46364,7 +46394,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  
  if test x"$silent" != x"yes" && test x"$WARN_CFLAGS" != x""; then
    echo "Setting warning flags = $WARN_CFLAGS" 6>&1
-@@ -4233,7 +4777,7 @@ fi
+@@ -4233,7 +4777,7 @@
  
  
  # Generate a header file
@@ -46373,7 +46403,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  
  
  # If we are on a DOS filesystem, we must use gdb.ini rather than
-@@ -4241,789 +4785,913 @@ fi
+@@ -4241,789 +4785,913 @@
  case "${host}" in
    *-*-msdos* | *-*-go32* | *-*-mingw32* | *-*-windows*)
      GDBINIT="gdb.ini"
@@ -47902,7 +47932,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  _gas_uniq_newlist=""
  for _gas_uniq_i in _gas_uniq_dummy $_gas_uniq_list ; do
    case $_gas_uniq_i in
-@@ -5034,883 +5702,871 @@ for _gas_uniq_i in _gas_uniq_dummy $_gas
+@@ -5034,883 +5702,871 @@
       esac ;;
    esac
  done
@@ -49539,7 +49569,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  else
  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  for as_dir in $PATH
-@@ -5918,40 +6574,43 @@ do
+@@ -5918,40 +6574,43 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -49600,7 +49630,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  else
  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  for as_dir in $PATH
-@@ -5959,277 +6618,432 @@ do
+@@ -5959,277 +6618,432 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -50209,7 +50239,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  else
  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  for as_dir in $PATH
-@@ -6237,37 +7051,42 @@ do
+@@ -6237,37 +7051,42 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -50270,7 +50300,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  else
  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  for as_dir in $PATH
-@@ -6275,449 +7094,295 @@ do
+@@ -6275,449 +7094,295 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -50936,7 +50966,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "${ac_cv_c_const+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6735,10 +7400,10 @@ main ()
+@@ -6735,10 +7400,10 @@
  #ifndef __cplusplus
    /* Ultrix mips cc rejects this.  */
    typedef int charset[2];
@@ -50950,7 +50980,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
    /* NEC SVR4.0.2 mips cc rejects this.  */
    struct point {int x, y;};
    static struct point const zero = {0,0};
-@@ -6747,16 +7412,17 @@ main ()
+@@ -6747,16 +7412,17 @@
       an arm of an if-expression whose if-part is not a constant
       expression */
    const char *g = "string";
@@ -50972,7 +51002,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
    }
    { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
      int x[] = {25, 17};
-@@ -6775,7 +7441,9 @@ main ()
+@@ -6775,7 +7441,9 @@
    }
    { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
      const int foo = 10;
@@ -50982,7 +51012,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  #endif
  
    ;
-@@ -6783,38 +7451,34 @@ main ()
+@@ -6783,38 +7451,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -51037,7 +51067,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test $ac_cv_c_const = no; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -6823,8 +7487,8 @@ _ACEOF
+@@ -6823,8 +7487,8 @@
  
  fi
  
@@ -51048,7 +51078,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "${ac_cv_c_inline+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6844,39 +7508,37 @@ $ac_kw foo_t foo () {return 0; }
+@@ -6844,39 +7508,37 @@
  
  _ACEOF
  rm -f conftest.$ac_objext
@@ -51106,7 +51136,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  
  
  case $ac_cv_c_inline in
-@@ -6894,80 +7556,8 @@ _ACEOF
+@@ -6894,80 +7556,8 @@
      ;;
  esac
  
@@ -51189,7 +51219,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "${ac_cv_type_off_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6978,62 +7568,59 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -6978,62 +7568,59 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -51274,7 +51304,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "${ac_cv_type_size_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7044,64 +7631,61 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -7044,64 +7631,61 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -51361,7 +51391,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "${ac_cv_working_alloca_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7116,44 +7700,42 @@ int
+@@ -7116,44 +7700,42 @@
  main ()
  {
  char *p = (char *) alloca (2 * sizeof (int));
@@ -51424,7 +51454,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test $ac_cv_working_alloca_h = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -7162,8 +7744,8 @@ _ACEOF
+@@ -7162,8 +7744,8 @@
  
  fi
  
@@ -51435,7 +51465,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "${ac_cv_func_alloca_works+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7180,7 +7762,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -7180,7 +7762,7 @@
  #  include <malloc.h>
  #  define alloca _alloca
  # else
@@ -51444,7 +51474,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  #   include <alloca.h>
  #  else
  #   ifdef _AIX
-@@ -7198,44 +7780,42 @@ int
+@@ -7198,44 +7780,42 @@
  main ()
  {
  char *p = (char *) alloca (1);
@@ -51507,7 +51537,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  
  if test $ac_cv_func_alloca_works = yes; then
  
-@@ -7249,15 +7829,15 @@ else
+@@ -7249,15 +7829,15 @@
  # contain a buggy version.  If you still want to use their alloca,
  # use ar to extract alloca.o from them instead of compiling alloca.c.
  
@@ -51526,7 +51556,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "${ac_cv_os_cray+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7267,7 +7847,7 @@ _ACEOF
+@@ -7267,7 +7847,7 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -51535,7 +51565,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  webecray
  #else
  wenotbecray
-@@ -7283,14 +7863,14 @@ fi
+@@ -7283,14 +7863,14 @@
  rm -f conftest*
  
  fi
@@ -51555,7 +51585,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -7316,68 +7896,60 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -7316,68 +7896,60 @@
  
  #undef $ac_func
  
@@ -51647,7 +51677,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test `eval echo '${'$as_ac_var'}'` = yes; then
  
  cat >>confdefs.h <<_ACEOF
-@@ -7390,8 +7962,8 @@ fi
+@@ -7390,8 +7962,8 @@
    done
  fi
  
@@ -51658,7 +51688,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "${ac_cv_c_stack_direction+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7404,6 +7976,7 @@ _ACEOF
+@@ -7404,6 +7976,7 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -51666,7 +51696,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  int
  find_stack_direction ()
  {
-@@ -7421,17 +7994,26 @@ find_stack_direction ()
+@@ -7421,17 +7994,26 @@
  int
  main ()
  {
@@ -51698,7 +51728,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -7444,11 +8026,13 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -7444,11 +8026,13 @@
  ( exit $ac_status )
  ac_cv_c_stack_direction=-1
  fi
@@ -51715,7 +51745,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  
  cat >>confdefs.h <<_ACEOF
  #define STACK_DIRECTION $ac_cv_c_stack_direction
-@@ -7462,18 +8046,19 @@ fi
+@@ -7462,18 +8046,19 @@
  for ac_header in stdlib.h unistd.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -51743,7 +51773,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -7484,41 +8069,37 @@ $ac_includes_default
+@@ -7484,41 +8069,37 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -51803,7 +51833,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -7527,24 +8108,22 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -7527,24 +8108,22 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -51839,7 +51869,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
    ac_header_preproc=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -7552,9 +8131,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -7552,9 +8131,10 @@
  
    ac_header_preproc=no
  fi
@@ -51852,7 +51882,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -7578,25 +8158,19 @@ echo "$as_me: WARNING: $ac_header:     s
+@@ -7578,25 +8158,19 @@
  echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -51885,7 +51915,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -7612,9 +8186,9 @@ done
+@@ -7612,9 +8186,9 @@
  for ac_func in getpagesize
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -51898,7 +51928,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -7640,68 +8214,60 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -7640,68 +8214,60 @@
  
  #undef $ac_func
  
@@ -51990,7 +52020,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -7710,8 +8276,8 @@ _ACEOF
+@@ -7710,8 +8276,8 @@
  fi
  done
  
@@ -52001,7 +52031,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7753,21 +8319,21 @@ $ac_includes_default
+@@ -7753,21 +8319,21 @@
  #include <fcntl.h>
  #include <sys/mman.h>
  
@@ -52027,7 +52057,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  #   include <sys/param.h>
  #   ifdef EXEC_PAGESIZE
  #    define getpagesize() EXEC_PAGESIZE
-@@ -7806,15 +8372,15 @@ main ()
+@@ -7806,15 +8372,15 @@
    /* First, make a file with some known garbage in it. */
    data = (char *) malloc (pagesize);
    if (!data)
@@ -52046,7 +52076,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
    close (fd);
  
    /* Next, try to mmap the file at a fixed address which already has
-@@ -7822,17 +8388,17 @@ main ()
+@@ -7822,17 +8388,17 @@
       we see the same garbage.  */
    fd = open ("conftest.mmap", O_RDWR);
    if (fd < 0)
@@ -52069,7 +52099,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  
    /* Finally, make sure that changes to the mapped area do not
       percolate back to the file as seen by read().  (This is a bug on
-@@ -7841,24 +8407,33 @@ main ()
+@@ -7841,24 +8407,33 @@
      *(data2 + i) = *(data2 + i) + 1;
    data3 = (char *) malloc (pagesize);
    if (!data3)
@@ -52111,7 +52141,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -7871,11 +8446,13 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -7871,11 +8446,13 @@
  ( exit $ac_status )
  ac_cv_func_mmap_fixed_mapped=no
  fi
@@ -52128,7 +52158,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test $ac_cv_func_mmap_fixed_mapped = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -7899,18 +8476,19 @@ for ac_header in argz.h limits.h locale.
+@@ -7899,18 +8476,19 @@
  unistd.h values.h sys/param.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -52156,7 +52186,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -7921,41 +8499,37 @@ $ac_includes_default
+@@ -7921,41 +8499,37 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -52216,7 +52246,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -7964,24 +8538,22 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -7964,24 +8538,22 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -52252,7 +52282,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
    ac_header_preproc=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -7989,9 +8561,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -7989,9 +8561,10 @@
  
    ac_header_preproc=no
  fi
@@ -52265,7 +52295,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -8015,25 +8588,19 @@ echo "$as_me: WARNING: $ac_header:     s
+@@ -8015,25 +8588,19 @@
  echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -52298,7 +52328,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -8059,9 +8626,9 @@ for ac_func in getcwd munmap putenv sete
+@@ -8059,9 +8626,9 @@
  __argz_count __argz_stringify __argz_next
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -52311,7 +52341,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -8087,68 +8654,60 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -8087,68 +8654,60 @@
  
  #undef $ac_func
  
@@ -52403,7 +52433,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -8163,9 +8722,9 @@ done
+@@ -8163,9 +8722,9 @@
  for ac_func in stpcpy
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -52416,7 +52446,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -8191,68 +8750,60 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -8191,68 +8750,60 @@
  
  #undef $ac_func
  
@@ -52508,7 +52538,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -8271,8 +8822,8 @@ _ACEOF
+@@ -8271,8 +8822,8 @@
     fi
  
     if test $ac_cv_header_locale_h = yes; then
@@ -52519,7 +52549,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "${am_cv_val_LC_MESSAGES+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8292,39 +8843,36 @@ return LC_MESSAGES
+@@ -8292,39 +8843,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -52576,7 +52606,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
      if test $am_cv_val_LC_MESSAGES = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -8333,34 +8881,34 @@ _ACEOF
+@@ -8333,34 +8881,34 @@
  
      fi
    fi
@@ -52627,7 +52657,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  
        nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
        if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
-@@ -8369,17 +8917,17 @@ echo "${ECHO_T}$nls_cv_force_use_gnu_get
+@@ -8369,17 +8917,17 @@
  	CATOBJEXT=
  
  	if test "${ac_cv_header_libintl_h+set}" = set; then
@@ -52651,7 +52681,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8390,41 +8938,37 @@ $ac_includes_default
+@@ -8390,41 +8938,37 @@
  #include <libintl.h>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -52711,7 +52741,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8433,24 +8977,22 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -8433,24 +8977,22 @@
  /* end confdefs.h.  */
  #include <libintl.h>
  _ACEOF
@@ -52747,7 +52777,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
    ac_header_preproc=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -8458,9 +9000,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -8458,9 +9000,10 @@
  
    ac_header_preproc=no
  fi
@@ -52760,7 +52790,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -8484,30 +9027,23 @@ echo "$as_me: WARNING: libintl.h:     se
+@@ -8484,30 +9027,23 @@
  echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;}
@@ -52798,7 +52828,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "${gt_cv_func_gettext_libc+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8527,43 +9063,40 @@ return (int) gettext ("")
+@@ -8527,43 +9063,40 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -52861,7 +52891,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8576,59 +9109,56 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -8576,59 +9109,56 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -52944,7 +52974,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "${gt_cv_func_gettext_libintl+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8648,39 +9178,36 @@ return (int) gettext ("")
+@@ -8648,39 +9178,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -53001,7 +53031,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  fi
  
  	   fi
-@@ -8694,8 +9221,8 @@ _ACEOF
+@@ -8694,8 +9221,8 @@
  
  	      # Extract the first word of "msgfmt", so it can be a program name with args.
  set dummy msgfmt; ac_word=$2
@@ -53012,7 +53042,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "${ac_cv_path_MSGFMT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8721,20 +9248,20 @@ esac
+@@ -8721,20 +9248,20 @@
  fi
  MSGFMT="$ac_cv_path_MSGFMT"
  if test -n "$MSGFMT"; then
@@ -53040,7 +53070,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -8760,68 +9287,60 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -8760,68 +9287,60 @@
  
  #undef $ac_func
  
@@ -53132,7 +53162,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -8832,8 +9351,8 @@ done
+@@ -8832,8 +9351,8 @@
  
  		# Extract the first word of "gmsgfmt", so it can be a program name with args.
  set dummy gmsgfmt; ac_word=$2
@@ -53143,7 +53173,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "${ac_cv_path_GMSGFMT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8848,32 +9367,33 @@ do
+@@ -8848,32 +9367,33 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -53185,7 +53215,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "${ac_cv_path_XGETTEXT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8899,11 +9419,11 @@ esac
+@@ -8899,11 +9419,11 @@
  fi
  XGETTEXT="$ac_cv_path_XGETTEXT"
  if test -n "$XGETTEXT"; then
@@ -53201,7 +53231,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  fi
  
  		cat >conftest.$ac_ext <<_ACEOF
-@@ -8923,37 +9443,34 @@ extern int _nl_msg_cat_cntr;
+@@ -8923,37 +9443,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -53254,7 +53284,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
        conftest$ac_exeext conftest.$ac_ext
  		INSTOBJEXT=.mo
  	      fi
-@@ -8975,8 +9492,8 @@ fi
+@@ -8975,8 +9492,8 @@
                  INTLOBJS="\$(GETTOBJS)"
          # Extract the first word of "msgfmt", so it can be a program name with args.
  set dummy msgfmt; ac_word=$2
@@ -53265,7 +53295,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "${ac_cv_path_MSGFMT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9002,17 +9519,17 @@ esac
+@@ -9002,17 +9519,17 @@
  fi
  MSGFMT="$ac_cv_path_MSGFMT"
  if test -n "$MSGFMT"; then
@@ -53289,7 +53319,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "${ac_cv_path_GMSGFMT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9027,32 +9544,33 @@ do
+@@ -9027,32 +9544,33 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -53331,7 +53361,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "${ac_cv_path_XGETTEXT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9078,11 +9596,11 @@ esac
+@@ -9078,11 +9596,11 @@
  fi
  XGETTEXT="$ac_cv_path_XGETTEXT"
  if test -n "$XGETTEXT"; then
@@ -53347,7 +53377,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  fi
  
  
-@@ -9101,8 +9619,8 @@ fi
+@@ -9101,8 +9619,8 @@
  			if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
  	  : ;
  	else
@@ -53358,7 +53388,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  	  XGETTEXT=":"
  	fi
        fi
-@@ -9151,8 +9669,8 @@ _ACEOF
+@@ -9151,8 +9669,8 @@
       if test "x$ALL_LINGUAS" = "x"; then
         LINGUAS=
       else
@@ -53369,7 +53399,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
         NEW_LINGUAS=
         for lang in ${LINGUAS=$ALL_LINGUAS}; do
           case "$ALL_LINGUAS" in
-@@ -9160,8 +9678,8 @@ echo $ECHO_N "checking for catalogs to b
+@@ -9160,8 +9678,8 @@
           esac
         done
         LINGUAS=$NEW_LINGUAS
@@ -53380,7 +53410,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
       fi
  
            if test -n "$LINGUAS"; then
-@@ -9180,17 +9698,17 @@ echo "${ECHO_T}$LINGUAS" >&6
+@@ -9180,17 +9698,17 @@
              if test -f $srcdir/po2tbl.sed.in; then
        if test "$CATOBJEXT" = ".cat"; then
  	 if test "${ac_cv_header_linux_version_h+set}" = set; then
@@ -53404,7 +53434,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -9201,41 +9719,37 @@ $ac_includes_default
+@@ -9201,41 +9719,37 @@
  #include <linux/version.h>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -53464,7 +53494,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -9244,24 +9758,22 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -9244,24 +9758,22 @@
  /* end confdefs.h.  */
  #include <linux/version.h>
  _ACEOF
@@ -53500,7 +53530,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
    ac_header_preproc=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -9269,9 +9781,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -9269,9 +9781,10 @@
  
    ac_header_preproc=no
  fi
@@ -53513,7 +53543,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -9295,25 +9808,18 @@ echo "$as_me: WARNING: linux/version.h: 
+@@ -9295,25 +9808,18 @@
  echo "$as_me: WARNING: linux/version.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: linux/version.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: linux/version.h: in the future, the compiler will take precedence" >&2;}
@@ -53544,7 +53574,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  
  fi
  if test $ac_cv_header_linux_version_h = yes; then
-@@ -9363,17 +9869,17 @@ fi
+@@ -9363,17 +9869,17 @@
     fi
  
  
@@ -53570,7 +53600,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  
  
  if test $USE_MAINTAINER_MODE = yes; then
-@@ -9401,18 +9907,19 @@ fi
+@@ -9401,18 +9907,19 @@
  for ac_header in string.h stdlib.h memory.h strings.h unistd.h stdarg.h varargs.h errno.h sys/types.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -53598,7 +53628,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -9423,41 +9930,37 @@ $ac_includes_default
+@@ -9423,41 +9930,37 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -53658,7 +53688,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -9466,24 +9969,22 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -9466,24 +9969,22 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -53694,7 +53724,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
    ac_header_preproc=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -9491,9 +9992,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -9491,9 +9992,10 @@
  
    ac_header_preproc=no
  fi
@@ -53707,7 +53737,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -9517,25 +10019,19 @@ echo "$as_me: WARNING: $ac_header:     s
+@@ -9517,25 +10019,19 @@
  echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -53740,7 +53770,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -9550,8 +10046,8 @@ done
+@@ -9550,8 +10046,8 @@
  
  # Put this here so that autoconf's "cross-compiling" message doesn't confuse
  # people who are not cross-compiling but are compiling cross-assemblers.
@@ -53751,7 +53781,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "${host}" = "${target}"; then
    cross_gas=no
  else
-@@ -9562,13 +10058,13 @@ cat >>confdefs.h <<\_ACEOF
+@@ -9562,13 +10058,13 @@
  _ACEOF
  
  fi
@@ -53769,7 +53799,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "${ac_cv_working_alloca_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9583,44 +10079,42 @@ int
+@@ -9583,44 +10079,42 @@
  main ()
  {
  char *p = (char *) alloca (2 * sizeof (int));
@@ -53832,7 +53862,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test $ac_cv_working_alloca_h = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -9629,8 +10123,8 @@ _ACEOF
+@@ -9629,8 +10123,8 @@
  
  fi
  
@@ -53843,7 +53873,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "${ac_cv_func_alloca_works+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9647,7 +10141,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -9647,7 +10141,7 @@
  #  include <malloc.h>
  #  define alloca _alloca
  # else
@@ -53852,7 +53882,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  #   include <alloca.h>
  #  else
  #   ifdef _AIX
-@@ -9665,44 +10159,42 @@ int
+@@ -9665,44 +10159,42 @@
  main ()
  {
  char *p = (char *) alloca (1);
@@ -53915,7 +53945,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  
  if test $ac_cv_func_alloca_works = yes; then
  
-@@ -9716,15 +10208,15 @@ else
+@@ -9716,15 +10208,15 @@
  # contain a buggy version.  If you still want to use their alloca,
  # use ar to extract alloca.o from them instead of compiling alloca.c.
  
@@ -53934,7 +53964,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "${ac_cv_os_cray+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9734,7 +10226,7 @@ _ACEOF
+@@ -9734,7 +10226,7 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -53943,7 +53973,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  webecray
  #else
  wenotbecray
-@@ -9750,14 +10242,14 @@ fi
+@@ -9750,14 +10242,14 @@
  rm -f conftest*
  
  fi
@@ -53963,7 +53993,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -9783,68 +10275,60 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -9783,68 +10275,60 @@
  
  #undef $ac_func
  
@@ -54055,7 +54085,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test `eval echo '${'$as_ac_var'}'` = yes; then
  
  cat >>confdefs.h <<_ACEOF
-@@ -9857,8 +10341,8 @@ fi
+@@ -9857,8 +10341,8 @@
    done
  fi
  
@@ -54066,7 +54096,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "${ac_cv_c_stack_direction+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9871,6 +10355,7 @@ _ACEOF
+@@ -9871,6 +10355,7 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -54074,7 +54104,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  int
  find_stack_direction ()
  {
-@@ -9888,17 +10373,26 @@ find_stack_direction ()
+@@ -9888,17 +10373,26 @@
  int
  main ()
  {
@@ -54106,7 +54136,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -9911,11 +10405,13 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -9911,11 +10405,13 @@
  ( exit $ac_status )
  ac_cv_c_stack_direction=-1
  fi
@@ -54123,7 +54153,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  
  cat >>confdefs.h <<_ACEOF
  #define STACK_DIRECTION $ac_cv_c_stack_direction
-@@ -9924,8 +10420,8 @@ _ACEOF
+@@ -9924,8 +10420,8 @@
  
  fi
  
@@ -54134,7 +54164,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "${ac_cv_c_inline+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9945,39 +10441,37 @@ $ac_kw foo_t foo () {return 0; }
+@@ -9945,39 +10441,37 @@
  
  _ACEOF
  rm -f conftest.$ac_objext
@@ -54192,7 +54222,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  
  
  case $ac_cv_c_inline in
-@@ -10002,9 +10496,9 @@ esac
+@@ -10002,9 +10496,9 @@
  for ac_func in unlink remove
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -54205,7 +54235,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -10030,68 +10524,60 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -10030,68 +10524,60 @@
  
  #undef $ac_func
  
@@ -54297,7 +54327,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -10106,9 +10592,9 @@ done
+@@ -10106,9 +10592,9 @@
  for ac_func in sbrk
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -54310,7 +54340,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -10134,68 +10620,60 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -10134,68 +10620,60 @@
  
  #undef $ac_func
  
@@ -54402,7 +54432,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -10215,8 +10693,8 @@ case $host in
+@@ -10215,8 +10693,8 @@
    # on darwin the libm is a symbolic link to libSystem.dylib
    ;;
  *-ncr-sysv4.3*)
@@ -54413,7 +54443,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "${ac_cv_lib_mw__mwvalidcheckl+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -10229,62 +10707,59 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -10229,62 +10707,59 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -54499,7 +54529,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "${ac_cv_lib_m_main+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -10301,54 +10776,51 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -10301,54 +10776,51 @@
  int
  main ()
  {
@@ -54574,7 +54604,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "${ac_cv_lib_m_main+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -10365,46 +10837,43 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -10365,46 +10837,43 @@
  int
  main ()
  {
@@ -54639,7 +54669,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test $ac_cv_lib_m_main = yes; then
    LIBM="-lm"
  fi
-@@ -10419,8 +10888,8 @@ esac
+@@ -10419,8 +10888,8 @@
  # Some non-ANSI preprocessors botch requoting inside strings.  That's bad
  # enough, but on some of those systems, the assert macro relies on requoting
  # working properly!
@@ -54650,7 +54680,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "${gas_cv_assert_ok+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -10449,39 +10918,36 @@ assert (a == b
+@@ -10449,39 +10918,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -54707,7 +54737,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  test $gas_cv_assert_ok = yes ||
  cat >>confdefs.h <<\_ACEOF
  #define BROKEN_ASSERT 1
-@@ -10514,8 +10980,8 @@ gas_test_headers="
+@@ -10514,8 +10980,8 @@
  # Does errno.h declare errno, or do we have to add a separate declaration
  # for it?
  
@@ -54718,7 +54748,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "${gas_cv_decl_needed_errno+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -10543,39 +11009,36 @@ x = (f) errno;
+@@ -10543,39 +11009,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -54775,7 +54805,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test $gas_cv_decl_needed_errno = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -10585,8 +11048,8 @@ _ACEOF
+@@ -10585,8 +11048,8 @@
  fi
  
  
@@ -54786,7 +54816,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "${gas_cv_decl_getopt_unistd_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -10606,39 +11069,35 @@ extern int getopt (int, char *const*, co
+@@ -10606,39 +11069,35 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -54842,7 +54872,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test $gas_cv_decl_getopt_unistd_h = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -10648,8 +11107,8 @@ _ACEOF
+@@ -10648,8 +11107,8 @@
  fi
  
  
@@ -54853,7 +54883,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "${gas_cv_decl_needed_environ+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -10673,39 +11132,36 @@ x = (f) environ;
+@@ -10673,39 +11132,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -54910,7 +54940,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test $gas_cv_decl_needed_environ = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -10715,8 +11171,8 @@ _ACEOF
+@@ -10715,8 +11171,8 @@
  fi
  
  
@@ -54921,7 +54951,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "${gas_cv_decl_needed_ffs+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -10740,39 +11196,36 @@ x = (f) ffs;
+@@ -10740,39 +11196,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -54978,7 +55008,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test $gas_cv_decl_needed_ffs = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -10782,8 +11235,8 @@ _ACEOF
+@@ -10782,8 +11235,8 @@
  fi
  
  
@@ -54989,7 +55019,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "${gas_cv_decl_needed_free+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -10807,39 +11260,36 @@ x = (f) free;
+@@ -10807,39 +11260,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -55046,7 +55076,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test $gas_cv_decl_needed_free = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -10849,8 +11299,8 @@ _ACEOF
+@@ -10849,8 +11299,8 @@
  fi
  
  
@@ -55057,7 +55087,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "${gas_cv_decl_needed_malloc+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -10874,39 +11324,36 @@ x = (f) malloc;
+@@ -10874,39 +11324,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -55114,7 +55144,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test $gas_cv_decl_needed_malloc = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -10916,8 +11363,8 @@ _ACEOF
+@@ -10916,8 +11363,8 @@
  fi
  
  
@@ -55125,7 +55155,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "${gas_cv_decl_needed_sbrk+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -10941,39 +11388,36 @@ x = (f) sbrk;
+@@ -10941,39 +11388,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -55182,7 +55212,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test $gas_cv_decl_needed_sbrk = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -10983,8 +11427,8 @@ _ACEOF
+@@ -10983,8 +11427,8 @@
  fi
  
  
@@ -55193,7 +55223,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "${gas_cv_decl_needed_strstr+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11008,39 +11452,36 @@ x = (f) strstr;
+@@ -11008,39 +11452,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -55250,7 +55280,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test $gas_cv_decl_needed_strstr = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -11050,8 +11491,8 @@ _ACEOF
+@@ -11050,8 +11491,8 @@
  fi
  
  
@@ -55261,7 +55291,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test "${ac_cv_have_decl_vsnprintf+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11066,7 +11507,7 @@ int
+@@ -11066,7 +11507,7 @@
  main ()
  {
  #ifndef vsnprintf
@@ -55270,7 +55300,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  #endif
  
    ;
-@@ -11074,38 +11515,34 @@ main ()
+@@ -11074,38 +11515,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -55325,7 +55355,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  if test $ac_cv_have_decl_vsnprintf = yes; then
  
  cat >>confdefs.h <<_ACEOF
-@@ -11129,9 +11566,9 @@ fi
+@@ -11129,9 +11566,9 @@
  
  
  
@@ -55337,7 +55367,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  
  
  cat >confcache <<\_ACEOF
-@@ -11152,39 +11589,58 @@ _ACEOF
+@@ -11152,39 +11589,58 @@
  
  # The following way of writing the cache mishandles newlines in values,
  # but we know of no workaround that is simple, portable, and efficient.
@@ -55412,7 +55442,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
    fi
  fi
  rm -f confcache
-@@ -11193,32 +11649,18 @@ test "x$prefix" = xNONE && prefix=$ac_de
+@@ -11193,32 +11649,18 @@
  # Let make expand exec_prefix.
  test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
  
@@ -55451,7 +55481,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  done
  LIBOBJS=$ac_libobjs
  
-@@ -11270,17 +11712,45 @@ cat >>$CONFIG_STATUS <<\_ACEOF
+@@ -11270,17 +11712,45 @@
  ## M4sh Initialization.  ##
  ## --------------------- ##
  
@@ -55501,7 +55531,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  
  # Support unset when possible.
  if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-@@ -11290,8 +11760,43 @@ else
+@@ -11290,8 +11760,43 @@
  fi
  
  
@@ -55546,7 +55576,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  PS1='$ '
  PS2='> '
  PS4='+ '
-@@ -11305,18 +11810,19 @@ do
+@@ -11305,18 +11810,19 @@
    if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
      eval $as_var=C; export $as_var
    else
@@ -55569,7 +55599,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
    as_basename=basename
  else
    as_basename=false
-@@ -11324,159 +11830,120 @@ fi
+@@ -11324,159 +11830,120 @@
  
  
  # Name of the executable.
@@ -55800,7 +55830,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  
  if mkdir -p . 2>/dev/null; then
    as_mkdir_p=:
-@@ -11485,7 +11952,28 @@ else
+@@ -11485,7 +11952,28 @@
    as_mkdir_p=false
  fi
  
@@ -55830,7 +55860,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  
  # Sed expression to map a string onto a valid CPP name.
  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -11493,32 +11981,15 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P
+@@ -11493,32 +11981,15 @@
  # Sed expression to map a string onto a valid variable name.
  as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
  
@@ -55868,7 +55898,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -11526,30 +11997,20 @@ generated by GNU Autoconf 2.59.  Invocat
+@@ -11526,30 +11997,20 @@
    CONFIG_COMMANDS = $CONFIG_COMMANDS
    $ $0 $@
  
@@ -55907,7 +55937,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  ac_cs_usage="\
  \`$as_me' instantiates files from templates according to the
  current configuration.
-@@ -11557,7 +12018,7 @@ current configuration.
+@@ -11557,7 +12018,7 @@
  Usage: $0 [OPTIONS] [FILE]...
  
    -h, --help       print this help, then exit
@@ -55916,7 +55946,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
    -q, --quiet      do not print progress messages
    -d, --debug      don't remove temporary files
        --recheck    update $as_me by reconfiguring in the same conditions
-@@ -11576,19 +12037,21 @@ Configuration commands:
+@@ -11576,19 +12037,21 @@
  $config_commands
  
  Report bugs to <bug-autoconf@gnu.org>."
@@ -55944,7 +55974,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  _ACEOF
  
  cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -11599,39 +12062,24 @@ while test $# != 0
+@@ -11599,39 +12062,24 @@
  do
    case $1 in
    --*=*)
@@ -55990,7 +56020,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
      debug=: ;;
    --file | --fil | --fi | --f )
      $ac_shift
-@@ -11641,18 +12089,24 @@ Try \`$0 --help' for more information." 
+@@ -11641,18 +12089,24 @@
      $ac_shift
      CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
      ac_need_defaults=false;;
@@ -56020,7 +56050,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  
    esac
    shift
-@@ -11668,17 +12122,28 @@ fi
+@@ -11668,17 +12122,28 @@
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF
  if \$ac_cs_recheck; then
@@ -56053,7 +56083,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
  target_cpu_type=${target_cpu_type}
   cgen_cpu_prefix=${cgen_cpu_prefix}
-@@ -11687,27 +12152,28 @@ target_cpu_type=${target_cpu_type}
+@@ -11687,27 +12152,28 @@
  
  _ACEOF
  
@@ -56094,7 +56124,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  # If the user did not use the arguments to specify the items to instantiate,
  # then the envvar interface is used.  Set only those that are not.
  # We use the long form for the default assignment because of an extremely
-@@ -11719,388 +12185,493 @@ if $ac_need_defaults; then
+@@ -11719,388 +12185,493 @@
  fi
  
  # Have a temporary directory for convenience.  Make it in the build tree
@@ -56916,7 +56946,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  cat >>$CONFIG_STATUS <<_ACEOF
    sed "$ac_vpsub
  $extrasub
-@@ -12108,248 +12679,130 @@ _ACEOF
+@@ -12108,248 +12679,130 @@
  cat >>$CONFIG_STATUS <<\_ACEOF
  :t
  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
@@ -57267,7 +57297,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  # Compute $ac_file's index in $config_headers.
  _am_stamp_count=1
  for _am_header in $config_headers :; do
-@@ -12360,135 +12813,39 @@ for _am_header in $config_headers :; do
+@@ -12360,135 +12813,39 @@
        _am_stamp_count=`expr $_am_stamp_count + 1` ;;
    esac
  done
@@ -57429,7 +57459,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
    # Strip MF so we end up with the name of the file.
    mf=`echo "$mf" | sed -e 's/:.*$//'`
    # Check whether this is an Automake generated Makefile or not.
-@@ -12498,18 +12855,29 @@ echo "$as_me: executing $ac_dest command
+@@ -12498,18 +12855,29 @@
    # each Makefile.in and add a new line on top of each file to say so.
    # So let's grep whole file.
    if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
@@ -57467,7 +57497,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
    else
      continue
    fi
-@@ -12531,49 +12899,76 @@ echo X"$mf" |
+@@ -12531,49 +12899,76 @@
         sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
      # Make sure the directory exists.
      test -f "$dirpart/$file" && continue
@@ -57571,7 +57601,7 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
   echo '#include "tc-'"${target_cpu_type}"'.h"' > targ-cpu.h
   echo '#include "obj-'"${obj_format}"'.h"' > obj-format.h
   echo '#include "te-'"${te_file}"'.h"' > targ-env.h
-@@ -12583,11 +12978,10 @@ done
+@@ -12583,11 +12978,10 @@
   fi
  
   sed -e '/POTFILES =/r po/POTFILES' po/Makefile.in > po/Makefile ;;
@@ -57585,10 +57615,11 @@ diff -Nrup binutils-2.17/gas/configure binutils-2.17-atmel/gas/configure
  
  { (exit 0); exit 0; }
  _ACEOF
-diff -Nrup binutils-2.17/gas/configure.tgt binutils-2.17-atmel/gas/configure.tgt
---- binutils-2.17/gas/configure.tgt	2006-04-05 14:41:57.000000000 +0200
-+++ binutils-2.17-atmel/gas/configure.tgt	2007-02-12 15:37:09.000000000 +0100
-@@ -33,6 +33,7 @@ case ${cpu} in
+Index: binutils-2.17/gas/configure.tgt
+===================================================================
+--- binutils-2.17.orig/gas/configure.tgt	2007-06-28 09:19:34.396007464 +0200
++++ binutils-2.17/gas/configure.tgt	2007-06-28 09:19:36.631667592 +0200
+@@ -33,6 +33,7 @@
    am33_2.0)		cpu_type=mn10300 endian=little ;;
    arm*be|arm*b)		cpu_type=arm endian=big ;;
    arm*)			cpu_type=arm endian=little ;;
@@ -57596,7 +57627,7 @@ diff -Nrup binutils-2.17/gas/configure.tgt binutils-2.17-atmel/gas/configure.tgt
    bfin*)		cpu_type=bfin endian=little ;;
    c4x*)			cpu_type=tic4x ;;
    crisv32)		cpu_type=cris arch=crisv32 ;;
-@@ -122,6 +123,9 @@ case ${generic_target} in
+@@ -122,6 +123,9 @@
    bfin-*-*)				fmt=elf bfd_gas=yes ;;
    bfin-*elf)				fmt=elf ;;
  
@@ -57606,9 +57637,10 @@ diff -Nrup binutils-2.17/gas/configure.tgt binutils-2.17-atmel/gas/configure.tgt
    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/gas/doc/all.texi
---- binutils-2.17/gas/doc/all.texi	2006-02-17 15:36:25.000000000 +0100
-+++ binutils-2.17-atmel/gas/doc/all.texi	2007-02-12 15:37:09.000000000 +0100
+Index: binutils-2.17/gas/doc/all.texi
+===================================================================
+--- binutils-2.17.orig/gas/doc/all.texi	2007-06-28 09:19:34.401006704 +0200
++++ binutils-2.17/gas/doc/all.texi	2007-06-28 09:19:36.631667592 +0200
 @@ -29,6 +29,7 @@
  @set ALPHA
  @set ARC
@@ -57617,10 +57649,11 @@ diff -Nrup binutils-2.17/gas/doc/all.texi binutils-2.17-atmel/gas/doc/all.texi
  @set BFIN
  @set CRIS
  @set D10V
-diff -Nrup binutils-2.17/gas/doc/as.texinfo binutils-2.17-atmel/gas/doc/as.texinfo
---- binutils-2.17/gas/doc/as.texinfo	2006-04-17 17:16:27.000000000 +0200
-+++ binutils-2.17-atmel/gas/doc/as.texinfo	2007-02-12 15:37:09.000000000 +0100
-@@ -6182,6 +6182,9 @@ subject, see the hardware manufacturer's
+Index: binutils-2.17/gas/doc/as.texinfo
+===================================================================
+--- binutils-2.17.orig/gas/doc/as.texinfo	2007-06-28 09:19:34.407005792 +0200
++++ binutils-2.17/gas/doc/as.texinfo	2007-06-28 09:19:36.634667136 +0200
+@@ -6182,6 +6182,9 @@
  @ifset ARM
  * ARM-Dependent::               ARM Dependent Features
  @end ifset
@@ -57630,7 +57663,7 @@ diff -Nrup binutils-2.17/gas/doc/as.texinfo binutils-2.17-atmel/gas/doc/as.texin
  @ifset BFIN
  * BFIN-Dependent::		BFIN Dependent Features
  @end ifset
-@@ -6298,6 +6301,10 @@ subject, see the hardware manufacturer's
+@@ -6298,6 +6301,10 @@
  @include c-arm.texi
  @end ifset
  
@@ -57641,9 +57674,10 @@ diff -Nrup binutils-2.17/gas/doc/as.texinfo binutils-2.17-atmel/gas/doc/as.texin
  @ifset BFIN
  @include c-bfin.texi
  @end ifset
-diff -Nrup binutils-2.17/gas/doc/c-avr32.texi binutils-2.17-atmel/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/gas/doc/c-avr32.texi	2006-09-25 10:30:13.000000000 +0200
+Index: binutils-2.17/gas/doc/c-avr32.texi
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ binutils-2.17/gas/doc/c-avr32.texi	2007-06-28 09:19:36.634667136 +0200
 @@ -0,0 +1,247 @@
 +@c Copyright 2005, 2006
 +@c Atmel Corporation
@@ -57892,10 +57926,11 @@ diff -Nrup binutils-2.17/gas/doc/c-avr32.texi binutils-2.17-atmel/gas/doc/c-avr3
 +deleting any superfluous constant pool- and GOT-entries.
 +
 +@end table
-diff -Nrup binutils-2.17/gas/doc/Makefile.am binutils-2.17-atmel/gas/doc/Makefile.am
---- binutils-2.17/gas/doc/Makefile.am	2006-06-03 06:45:50.000000000 +0200
-+++ binutils-2.17-atmel/gas/doc/Makefile.am	2007-02-12 15:37:09.000000000 +0100
-@@ -29,6 +29,7 @@ CPU_DOCS = \
+Index: binutils-2.17/gas/doc/Makefile.am
+===================================================================
+--- binutils-2.17.orig/gas/doc/Makefile.am	2007-06-28 09:19:34.416004424 +0200
++++ binutils-2.17/gas/doc/Makefile.am	2007-06-28 09:19:36.635666984 +0200
+@@ -29,6 +29,7 @@
  	c-alpha.texi \
  	c-arc.texi \
  	c-arm.texi \
@@ -57903,10 +57938,11 @@ diff -Nrup binutils-2.17/gas/doc/Makefile.am binutils-2.17-atmel/gas/doc/Makefil
  	c-bfin.texi \
  	c-d10v.texi \
  	c-cris.texi \
-diff -Nrup binutils-2.17/gas/doc/Makefile.in binutils-2.17-atmel/gas/doc/Makefile.in
---- binutils-2.17/gas/doc/Makefile.in	2006-06-03 06:45:50.000000000 +0200
-+++ binutils-2.17-atmel/gas/doc/Makefile.in	2007-02-20 16:07:30.000000000 +0100
-@@ -97,6 +97,7 @@ EXEEXT = @EXEEXT@
+Index: binutils-2.17/gas/doc/Makefile.in
+===================================================================
+--- binutils-2.17.orig/gas/doc/Makefile.in	2007-06-28 09:19:34.422003512 +0200
++++ binutils-2.17/gas/doc/Makefile.in	2007-06-28 09:19:36.635666984 +0200
+@@ -97,6 +97,7 @@
  GDBINIT = @GDBINIT@
  GMOFILES = @GMOFILES@
  GMSGFMT = @GMSGFMT@
@@ -57914,7 +57950,7 @@ diff -Nrup binutils-2.17/gas/doc/Makefile.in binutils-2.17-atmel/gas/doc/Makefil
  GT_NO = @GT_NO@
  GT_YES = @GT_YES@
  INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
-@@ -146,9 +147,8 @@ VERSION = @VERSION@
+@@ -146,9 +147,8 @@
  WARN_CFLAGS = @WARN_CFLAGS@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
@@ -57925,7 +57961,7 @@ diff -Nrup binutils-2.17/gas/doc/Makefile.in binutils-2.17-atmel/gas/doc/Makefil
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
  am__include = @am__include@
-@@ -167,6 +167,7 @@ cgen_cpu_prefix = @cgen_cpu_prefix@
+@@ -167,6 +167,7 @@
  datadir = @datadir@
  datarootdir = @datarootdir@
  docdir = @docdir@
@@ -57933,7 +57969,7 @@ diff -Nrup binutils-2.17/gas/doc/Makefile.in binutils-2.17-atmel/gas/doc/Makefil
  exec_prefix = @exec_prefix@
  extra_objects = @extra_objects@
  host = @host@
-@@ -182,13 +183,16 @@ install_tooldir = @install_tooldir@
+@@ -182,13 +183,16 @@
  l = @l@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -57950,7 +57986,7 @@ diff -Nrup binutils-2.17/gas/doc/Makefile.in binutils-2.17-atmel/gas/doc/Makefil
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
-@@ -218,6 +222,7 @@ CPU_DOCS = \
+@@ -218,6 +222,7 @@
  	c-alpha.texi \
  	c-arc.texi \
  	c-arm.texi \
@@ -57958,7 +57994,7 @@ diff -Nrup binutils-2.17/gas/doc/Makefile.in binutils-2.17-atmel/gas/doc/Makefil
  	c-bfin.texi \
  	c-d10v.texi \
  	c-cris.texi \
-@@ -384,10 +389,13 @@ dist-info: $(INFO_DEPS)
+@@ -384,10 +389,13 @@
  	    $(srcdir)/*) base=`echo "$$base" | sed "s|^$$srcdirstrip/||"`;; \
  	  esac; \
  	  if test -f $$base; then d=.; else d=$(srcdir); fi; \
@@ -57976,10 +58012,11 @@ diff -Nrup binutils-2.17/gas/doc/Makefile.in binutils-2.17-atmel/gas/doc/Makefil
  	  done; \
  	done
  
-diff -Nrup binutils-2.17/gas/Makefile.am binutils-2.17-atmel/gas/Makefile.am
---- binutils-2.17/gas/Makefile.am	2006-04-06 23:49:30.000000000 +0200
-+++ binutils-2.17-atmel/gas/Makefile.am	2007-02-12 15:37:09.000000000 +0100
-@@ -45,6 +45,7 @@ CPU_TYPES = \
+Index: binutils-2.17/gas/Makefile.am
+===================================================================
+--- binutils-2.17.orig/gas/Makefile.am	2007-06-28 09:19:34.428002600 +0200
++++ binutils-2.17/gas/Makefile.am	2007-06-28 09:19:36.636666832 +0200
+@@ -45,6 +45,7 @@
  	arc \
  	arm \
  	avr \
@@ -57987,7 +58024,7 @@ diff -Nrup binutils-2.17/gas/Makefile.am binutils-2.17-atmel/gas/Makefile.am
  	bfin \
  	cris \
  	crx \
-@@ -229,6 +230,7 @@ TARGET_CPU_CFILES = \
+@@ -229,6 +230,7 @@
  	config/tc-arc.c \
  	config/tc-arm.c \
  	config/tc-avr.c \
@@ -57995,7 +58032,7 @@ diff -Nrup binutils-2.17/gas/Makefile.am binutils-2.17-atmel/gas/Makefile.am
  	config/tc-bfin.c \
  	config/tc-cris.c \
  	config/tc-crx.c \
-@@ -280,6 +282,7 @@ TARGET_CPU_HFILES = \
+@@ -280,6 +282,7 @@
  	config/tc-arc.h \
  	config/tc-arm.h \
  	config/tc-avr.h \
@@ -58003,7 +58040,7 @@ diff -Nrup binutils-2.17/gas/Makefile.am binutils-2.17-atmel/gas/Makefile.am
  	config/tc-bfin.h \
  	config/tc-cris.h \
  	config/tc-crx.h \
-@@ -1046,6 +1049,11 @@ DEPTC_avr_elf = $(INCDIR)/symcat.h $(src
+@@ -1046,6 +1049,11 @@
    $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-avr.h \
    dwarf2dbg.h $(INCDIR)/safe-ctype.h subsegs.h $(INCDIR)/obstack.h \
    $(INCDIR)/opcode/avr.h
@@ -58015,7 +58052,7 @@ diff -Nrup binutils-2.17/gas/Makefile.am binutils-2.17-atmel/gas/Makefile.am
  DEPTC_bfin_coff = $(INCDIR)/symcat.h $(srcdir)/config/obj-coff.h \
    $(srcdir)/config/tc-bfin.h $(INCDIR)/coff/internal.h \
    $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h struc-symbol.h \
-@@ -1628,6 +1636,11 @@ DEPOBJ_bfin_elf = $(INCDIR)/symcat.h $(s
+@@ -1628,6 +1636,11 @@
    $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-bfin.h \
    dwarf2dbg.h $(INCDIR)/safe-ctype.h subsegs.h $(INCDIR)/obstack.h \
    struc-symbol.h $(INCDIR)/aout/aout64.h
@@ -58027,7 +58064,7 @@ diff -Nrup binutils-2.17/gas/Makefile.am binutils-2.17-atmel/gas/Makefile.am
  DEPOBJ_cris_aout = $(INCDIR)/symcat.h $(srcdir)/config/obj-aout.h \
    $(srcdir)/config/tc-cris.h $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h \
    $(INCDIR)/aout/aout64.h $(INCDIR)/obstack.h
-@@ -2095,6 +2108,9 @@ DEP_bfin_elf = $(srcdir)/config/obj-elf.
+@@ -2095,6 +2108,9 @@
    $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \
    $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-bfin.h \
    dwarf2dbg.h
@@ -58037,10 +58074,11 @@ diff -Nrup binutils-2.17/gas/Makefile.am binutils-2.17-atmel/gas/Makefile.am
  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/Makefile.in binutils-2.17-atmel/gas/Makefile.in
---- binutils-2.17/gas/Makefile.in	2006-04-17 17:59:40.000000000 +0200
-+++ binutils-2.17-atmel/gas/Makefile.in	2007-02-20 16:07:31.000000000 +0100
-@@ -143,6 +143,7 @@ EXEEXT = @EXEEXT@
+Index: binutils-2.17/gas/Makefile.in
+===================================================================
+--- binutils-2.17.orig/gas/Makefile.in	2007-06-28 09:19:34.433001840 +0200
++++ binutils-2.17/gas/Makefile.in	2007-06-28 09:19:36.638666528 +0200
+@@ -143,6 +143,7 @@
  GDBINIT = @GDBINIT@
  GMOFILES = @GMOFILES@
  GMSGFMT = @GMSGFMT@
@@ -58048,7 +58086,7 @@ diff -Nrup binutils-2.17/gas/Makefile.in binutils-2.17-atmel/gas/Makefile.in
  GT_NO = @GT_NO@
  GT_YES = @GT_YES@
  INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
-@@ -192,9 +193,8 @@ VERSION = @VERSION@
+@@ -192,9 +193,8 @@
  WARN_CFLAGS = @WARN_CFLAGS@
  XGETTEXT = @XGETTEXT@
  YACC = `if [ -f ../bison/bison ] ; then echo ../bison/bison -y -L../bison/bison ; else echo @YACC@ ; fi`
@@ -58059,7 +58097,7 @@ diff -Nrup binutils-2.17/gas/Makefile.in binutils-2.17-atmel/gas/Makefile.in
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
  am__include = @am__include@
-@@ -213,6 +213,7 @@ cgen_cpu_prefix = @cgen_cpu_prefix@
+@@ -213,6 +213,7 @@
  datadir = @datadir@
  datarootdir = @datarootdir@
  docdir = @docdir@
@@ -58067,7 +58105,7 @@ diff -Nrup binutils-2.17/gas/Makefile.in binutils-2.17-atmel/gas/Makefile.in
  exec_prefix = @exec_prefix@
  extra_objects = @extra_objects@
  host = @host@
-@@ -228,13 +229,16 @@ install_tooldir = @install_tooldir@
+@@ -228,13 +229,16 @@
  l = @l@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -58084,7 +58122,7 @@ diff -Nrup binutils-2.17/gas/Makefile.in binutils-2.17-atmel/gas/Makefile.in
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
-@@ -276,6 +280,7 @@ CPU_TYPES = \
+@@ -276,6 +280,7 @@
  	arc \
  	arm \
  	avr \
@@ -58092,7 +58130,7 @@ diff -Nrup binutils-2.17/gas/Makefile.in binutils-2.17-atmel/gas/Makefile.in
  	bfin \
  	cris \
  	crx \
-@@ -458,6 +463,7 @@ TARGET_CPU_CFILES = \
+@@ -458,6 +463,7 @@
  	config/tc-arc.c \
  	config/tc-arm.c \
  	config/tc-avr.c \
@@ -58100,7 +58138,7 @@ diff -Nrup binutils-2.17/gas/Makefile.in binutils-2.17-atmel/gas/Makefile.in
  	config/tc-bfin.c \
  	config/tc-cris.c \
  	config/tc-crx.c \
-@@ -509,6 +515,7 @@ TARGET_CPU_HFILES = \
+@@ -509,6 +515,7 @@
  	config/tc-arc.h \
  	config/tc-arm.h \
  	config/tc-avr.h \
@@ -58108,7 +58146,7 @@ diff -Nrup binutils-2.17/gas/Makefile.in binutils-2.17-atmel/gas/Makefile.in
  	config/tc-bfin.h \
  	config/tc-cris.h \
  	config/tc-crx.h \
-@@ -798,6 +805,12 @@ DEPTC_avr_elf = $(INCDIR)/symcat.h $(src
+@@ -798,6 +805,12 @@
    dwarf2dbg.h $(INCDIR)/safe-ctype.h subsegs.h $(INCDIR)/obstack.h \
    $(INCDIR)/opcode/avr.h
  
@@ -58121,7 +58159,7 @@ diff -Nrup binutils-2.17/gas/Makefile.in binutils-2.17-atmel/gas/Makefile.in
  DEPTC_bfin_coff = $(INCDIR)/symcat.h $(srcdir)/config/obj-coff.h \
    $(srcdir)/config/tc-bfin.h $(INCDIR)/coff/internal.h \
    $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h struc-symbol.h \
-@@ -1491,6 +1504,12 @@ DEPOBJ_bfin_elf = $(INCDIR)/symcat.h $(s
+@@ -1491,6 +1504,12 @@
    dwarf2dbg.h $(INCDIR)/safe-ctype.h subsegs.h $(INCDIR)/obstack.h \
    struc-symbol.h $(INCDIR)/aout/aout64.h
  
@@ -58134,7 +58172,7 @@ diff -Nrup binutils-2.17/gas/Makefile.in binutils-2.17-atmel/gas/Makefile.in
  DEPOBJ_cris_aout = $(INCDIR)/symcat.h $(srcdir)/config/obj-aout.h \
    $(srcdir)/config/tc-cris.h $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h \
    $(INCDIR)/aout/aout64.h $(INCDIR)/obstack.h
-@@ -2066,6 +2085,10 @@ DEP_bfin_elf = $(srcdir)/config/obj-elf.
+@@ -2066,6 +2085,10 @@
    $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-bfin.h \
    dwarf2dbg.h
  
@@ -58145,9 +58183,10 @@ diff -Nrup binutils-2.17/gas/Makefile.in binutils-2.17-atmel/gas/Makefile.in
  DEP_cris_aout = $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-cris.h \
    $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h
  
-diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/aliases.d binutils-2.17-atmel/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/gas/testsuite/gas/avr32/aliases.d	2006-08-04 14:51:13.000000000 +0200
+Index: binutils-2.17/gas/testsuite/gas/avr32/aliases.d
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ binutils-2.17/gas/testsuite/gas/avr32/aliases.d	2007-06-28 09:19:36.638666528 +0200
 @@ -0,0 +1,19 @@
 +#as:
 +#objdump: -dr
@@ -58168,9 +58207,10 @@ diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/aliases.d binutils-2.17-atmel/g
 +   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/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/gas/testsuite/gas/avr32/aliases.s	2006-08-04 14:51:13.000000000 +0200
+Index: binutils-2.17/gas/testsuite/gas/avr32/aliases.s
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ binutils-2.17/gas/testsuite/gas/avr32/aliases.s	2007-06-28 09:19:36.639666376 +0200
 @@ -0,0 +1,14 @@
 +	.text
 +	.global	ld_nodisp
@@ -58186,9 +58226,10 @@ diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/aliases.s binutils-2.17-atmel/g
 +	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/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/gas/testsuite/gas/avr32/allinsn.d	2006-08-04 14:51:13.000000000 +0200
+Index: binutils-2.17/gas/testsuite/gas/avr32/allinsn.d
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ binutils-2.17/gas/testsuite/gas/avr32/allinsn.d	2007-06-28 09:19:36.641666072 +0200
 @@ -0,0 +1,2900 @@
 +#as:
 +#objdump: -dr
@@ -61090,18 +61131,20 @@ diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/allinsn.d binutils-2.17-atmel/g
 + *[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/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/gas/testsuite/gas/avr32/allinsn.exp	2006-08-04 14:51:13.000000000 +0200
+Index: binutils-2.17/gas/testsuite/gas/avr32/allinsn.exp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ binutils-2.17/gas/testsuite/gas/avr32/allinsn.exp	2007-06-28 09:19:36.642665920 +0200
 @@ -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/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/gas/testsuite/gas/avr32/allinsn.s	2006-08-04 14:51:13.000000000 +0200
+Index: binutils-2.17/gas/testsuite/gas/avr32/allinsn.s
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ binutils-2.17/gas/testsuite/gas/avr32/allinsn.s	2007-06-28 09:19:36.643665768 +0200
 @@ -0,0 +1,3242 @@
 + .data
 +foodata: .word 42
@@ -64345,9 +64388,10 @@ diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/allinsn.s binutils-2.17-atmel/g
 +	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/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/gas/testsuite/gas/avr32/avr32.exp	2006-10-03 17:19:02.000000000 +0200
+Index: binutils-2.17/gas/testsuite/gas/avr32/avr32.exp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ binutils-2.17/gas/testsuite/gas/avr32/avr32.exp	2007-06-28 09:19:36.643665768 +0200
 @@ -0,0 +1,23 @@
 +# AVR32 assembler testsuite. -*- Tcl -*-
 +
@@ -64372,9 +64416,10 @@ diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/avr32.exp binutils-2.17-atmel/g
 +    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/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/gas/testsuite/gas/avr32/call_nopic.d	2006-08-04 14:51:13.000000000 +0200
+Index: binutils-2.17/gas/testsuite/gas/avr32/call_nopic.d
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ binutils-2.17/gas/testsuite/gas/avr32/call_nopic.d	2007-06-28 09:19:36.644665616 +0200
 @@ -0,0 +1,36 @@
 +#source: call.s
 +#as:
@@ -64412,9 +64457,10 @@ 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
-diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/call_nopic_linkrelax.d binutils-2.17-atmel/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/gas/testsuite/gas/avr32/call_nopic_linkrelax.d	2006-08-04 14:51:13.000000000 +0200
+Index: binutils-2.17/gas/testsuite/gas/avr32/call_nopic_linkrelax.d
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ binutils-2.17/gas/testsuite/gas/avr32/call_nopic_linkrelax.d	2007-06-28 09:19:36.644665616 +0200
 @@ -0,0 +1,43 @@
 +#source: call.s
 +#as: --linkrelax
@@ -64459,9 +64505,10 @@ 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
-diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/call_pic.d binutils-2.17-atmel/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/gas/testsuite/gas/avr32/call_pic.d	2006-08-04 14:51:13.000000000 +0200
+Index: binutils-2.17/gas/testsuite/gas/avr32/call_pic.d
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ binutils-2.17/gas/testsuite/gas/avr32/call_pic.d	2007-06-28 09:19:36.644665616 +0200
 @@ -0,0 +1,36 @@
 +#source: call.s
 +#as: --pic
@@ -64499,9 +64546,10 @@ 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
-diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/call_pic_linkrelax.d binutils-2.17-atmel/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/gas/testsuite/gas/avr32/call_pic_linkrelax.d	2006-08-04 14:51:13.000000000 +0200
+Index: binutils-2.17/gas/testsuite/gas/avr32/call_pic_linkrelax.d
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ binutils-2.17/gas/testsuite/gas/avr32/call_pic_linkrelax.d	2007-06-28 09:19:36.644665616 +0200
 @@ -0,0 +1,47 @@
 +#source: call.s
 +#as: --pic --linkrelax
@@ -64550,9 +64598,10 @@ 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
-diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/call.s binutils-2.17-atmel/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/gas/testsuite/gas/avr32/call.s	2006-08-04 14:51:13.000000000 +0200
+Index: binutils-2.17/gas/testsuite/gas/avr32/call.s
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ binutils-2.17/gas/testsuite/gas/avr32/call.s	2007-06-28 09:19:36.645665464 +0200
 @@ -0,0 +1,30 @@
 +
 +	.text
@@ -64584,9 +64633,10 @@ diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/call.s binutils-2.17-atmel/gas/
 +	.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/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/gas/testsuite/gas/avr32/dwarf2.d	2006-08-04 14:51:13.000000000 +0200
+Index: binutils-2.17/gas/testsuite/gas/avr32/dwarf2.d
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ binutils-2.17/gas/testsuite/gas/avr32/dwarf2.d	2007-06-28 09:19:36.645665464 +0200
 @@ -0,0 +1,42 @@
 +#readelf: -wl
 +#name: dwarf2
@@ -64630,9 +64680,10 @@ diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/dwarf2.d binutils-2.17-atmel/ga
 +  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/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/gas/testsuite/gas/avr32/dwarf2.s	2006-08-04 14:51:13.000000000 +0200
+Index: binutils-2.17/gas/testsuite/gas/avr32/dwarf2.s
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ binutils-2.17/gas/testsuite/gas/avr32/dwarf2.s	2007-06-28 09:19:36.645665464 +0200
 @@ -0,0 +1,67 @@
 +# Source file used to test DWARF2 information for AVR32.
 +
@@ -64701,9 +64752,10 @@ diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/dwarf2.s binutils-2.17-atmel/ga
 +	.uleb128 0, 0
 +
 +	.byte	0
-diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/fpinsn.d binutils-2.17-atmel/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/gas/testsuite/gas/avr32/fpinsn.d	2006-08-04 14:51:13.000000000 +0200
+Index: binutils-2.17/gas/testsuite/gas/avr32/fpinsn.d
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ binutils-2.17/gas/testsuite/gas/avr32/fpinsn.d	2007-06-28 09:19:36.645665464 +0200
 @@ -0,0 +1,271 @@
 +#as:
 +#objdump: -dr
@@ -64976,9 +65028,10 @@ diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/fpinsn.d binutils-2.17-atmel/ga
 + *[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/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/gas/testsuite/gas/avr32/fpinsn.s	2006-08-04 14:51:13.000000000 +0200
+Index: binutils-2.17/gas/testsuite/gas/avr32/fpinsn.s
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ binutils-2.17/gas/testsuite/gas/avr32/fpinsn.s	2007-06-28 09:19:36.646665312 +0200
 @@ -0,0 +1,266 @@
 +
 +	.text
@@ -65246,9 +65299,10 @@ diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/fpinsn.s binutils-2.17-atmel/ga
 +	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/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/gas/testsuite/gas/avr32/hwrd-lwrd.d	2006-08-04 14:51:13.000000000 +0200
+Index: binutils-2.17/gas/testsuite/gas/avr32/hwrd-lwrd.d
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ binutils-2.17/gas/testsuite/gas/avr32/hwrd-lwrd.d	2007-06-28 09:19:36.646665312 +0200
 @@ -0,0 +1,47 @@
 +#as:
 +#objdump: -dr
@@ -65297,9 +65351,10 @@ 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
-diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/hwrd-lwrd.s binutils-2.17-atmel/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/gas/testsuite/gas/avr32/hwrd-lwrd.s	2006-08-04 14:51:13.000000000 +0200
+Index: binutils-2.17/gas/testsuite/gas/avr32/hwrd-lwrd.s
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ binutils-2.17/gas/testsuite/gas/avr32/hwrd-lwrd.s	2007-06-28 09:19:36.646665312 +0200
 @@ -0,0 +1,39 @@
 +
 +        .equ    sym1, 0x12345678
@@ -65340,9 +65395,10 @@ diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/hwrd-lwrd.s binutils-2.17-atmel
 +        andl	r0, lo(extsym1)
 +
 +sym2:
-diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/jmptable.d binutils-2.17-atmel/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/gas/testsuite/gas/avr32/jmptable.d	2006-08-04 14:51:13.000000000 +0200
+Index: binutils-2.17/gas/testsuite/gas/avr32/jmptable.d
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ binutils-2.17/gas/testsuite/gas/avr32/jmptable.d	2007-06-28 09:19:36.646665312 +0200
 @@ -0,0 +1,20 @@
 +#source: jmptable.s
 +#as:
@@ -65364,9 +65420,10 @@ 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
-diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/jmptable_linkrelax.d binutils-2.17-atmel/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/gas/testsuite/gas/avr32/jmptable_linkrelax.d	2006-08-04 14:51:13.000000000 +0200
+Index: binutils-2.17/gas/testsuite/gas/avr32/jmptable_linkrelax.d
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ binutils-2.17/gas/testsuite/gas/avr32/jmptable_linkrelax.d	2007-06-28 09:19:36.646665312 +0200
 @@ -0,0 +1,25 @@
 +#source: jmptable.s
 +#as: --linkrelax
@@ -65393,9 +65450,10 @@ 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
-diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/jmptable.s binutils-2.17-atmel/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/gas/testsuite/gas/avr32/jmptable.s	2006-08-04 14:51:13.000000000 +0200
+Index: binutils-2.17/gas/testsuite/gas/avr32/jmptable.s
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ binutils-2.17/gas/testsuite/gas/avr32/jmptable.s	2007-06-28 09:19:36.647665160 +0200
 @@ -0,0 +1,14 @@
 +
 +	.text
@@ -65411,9 +65469,10 @@ diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/jmptable.s binutils-2.17-atmel/
 +1:	nop
 +2:	nop
 +3:	nop
-diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/lda_nopic.d binutils-2.17-atmel/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/gas/testsuite/gas/avr32/lda_nopic.d	2006-08-04 14:51:13.000000000 +0200
+Index: binutils-2.17/gas/testsuite/gas/avr32/lda_nopic.d
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ binutils-2.17/gas/testsuite/gas/avr32/lda_nopic.d	2007-06-28 09:19:36.647665160 +0200
 @@ -0,0 +1,32 @@
 +#source: lda.s
 +#as:
@@ -65447,9 +65506,10 @@ 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
-diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/lda_nopic_linkrelax.d binutils-2.17-atmel/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/gas/testsuite/gas/avr32/lda_nopic_linkrelax.d	2006-08-04 14:51:13.000000000 +0200
+Index: binutils-2.17/gas/testsuite/gas/avr32/lda_nopic_linkrelax.d
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ binutils-2.17/gas/testsuite/gas/avr32/lda_nopic_linkrelax.d	2007-06-28 09:19:36.647665160 +0200
 @@ -0,0 +1,41 @@
 +#source: lda.s
 +#as: --linkrelax
@@ -65492,9 +65552,10 @@ 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
-diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/lda_pic.d binutils-2.17-atmel/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/gas/testsuite/gas/avr32/lda_pic.d	2006-08-04 14:51:13.000000000 +0200
+Index: binutils-2.17/gas/testsuite/gas/avr32/lda_pic.d
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ binutils-2.17/gas/testsuite/gas/avr32/lda_pic.d	2007-06-28 09:19:36.648665008 +0200
 @@ -0,0 +1,32 @@
 +#source: lda.s
 +#as: --pic
@@ -65528,9 +65589,10 @@ diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/lda_pic.d binutils-2.17-atmel/g
 +	...
 +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/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/gas/testsuite/gas/avr32/lda_pic_linkrelax.d	2006-08-04 14:51:13.000000000 +0200
+Index: binutils-2.17/gas/testsuite/gas/avr32/lda_pic_linkrelax.d
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ binutils-2.17/gas/testsuite/gas/avr32/lda_pic_linkrelax.d	2007-06-28 09:19:36.648665008 +0200
 @@ -0,0 +1,40 @@
 +#source: lda.s
 +#as: --pic --linkrelax
@@ -65572,9 +65634,10 @@ 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
-diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/lda.s binutils-2.17-atmel/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/gas/testsuite/gas/avr32/lda.s	2006-08-04 14:51:13.000000000 +0200
+Index: binutils-2.17/gas/testsuite/gas/avr32/lda.s
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ binutils-2.17/gas/testsuite/gas/avr32/lda.s	2007-06-28 09:19:36.648665008 +0200
 @@ -0,0 +1,30 @@
 +
 +	.text
@@ -65606,9 +65669,10 @@ diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/lda.s binutils-2.17-atmel/gas/t
 +	.data
 +different_section:
 +	.long	0x12345678
-diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/pcrel.d binutils-2.17-atmel/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/gas/testsuite/gas/avr32/pcrel.d	2006-08-04 14:51:13.000000000 +0200
+Index: binutils-2.17/gas/testsuite/gas/avr32/pcrel.d
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ binutils-2.17/gas/testsuite/gas/avr32/pcrel.d	2007-06-28 09:19:36.648665008 +0200
 @@ -0,0 +1,64 @@
 +#as:
 +#objdump: -dr
@@ -65674,9 +65738,10 @@ diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/pcrel.d binutils-2.17-atmel/gas
 +   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/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/gas/testsuite/gas/avr32/pcrel.s	2006-08-04 14:51:13.000000000 +0200
+Index: binutils-2.17/gas/testsuite/gas/avr32/pcrel.s
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ binutils-2.17/gas/testsuite/gas/avr32/pcrel.s	2007-06-28 09:19:36.649664856 +0200
 @@ -0,0 +1,57 @@
 +
 +        .text
@@ -65735,9 +65800,10 @@ diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/pcrel.s binutils-2.17-atmel/gas
 +	rcall	test_rcall2
 +	nop
 +	rcall	test_rcall2
-diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/pico.d binutils-2.17-atmel/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/gas/testsuite/gas/avr32/pico.d	2007-01-29 12:21:57.000000000 +0100
+Index: binutils-2.17/gas/testsuite/gas/avr32/pico.d
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ binutils-2.17/gas/testsuite/gas/avr32/pico.d	2007-06-28 09:19:36.649664856 +0200
 @@ -0,0 +1,149 @@
 +#as:
 +#objdump: -dr
@@ -65888,9 +65954,10 @@ diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/pico.d binutils-2.17-atmel/gas/
 + *[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/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/gas/testsuite/gas/avr32/pico.s	2007-01-29 12:21:57.000000000 +0100
+Index: binutils-2.17/gas/testsuite/gas/avr32/pico.s
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ binutils-2.17/gas/testsuite/gas/avr32/pico.s	2007-06-28 09:19:36.649664856 +0200
 @@ -0,0 +1,144 @@
 +
 +	.text
@@ -66036,9 +66103,10 @@ diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/pico.s binutils-2.17-atmel/gas/
 +	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/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/gas/testsuite/gas/avr32/pic_reloc.d	2006-08-04 14:51:13.000000000 +0200
+Index: binutils-2.17/gas/testsuite/gas/avr32/pic_reloc.d
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ binutils-2.17/gas/testsuite/gas/avr32/pic_reloc.d	2007-06-28 09:19:36.649664856 +0200
 @@ -0,0 +1,27 @@
 +#as:
 +#objdump: -dr
@@ -66067,9 +66135,10 @@ 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
-diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/pic_reloc.s binutils-2.17-atmel/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/gas/testsuite/gas/avr32/pic_reloc.s	2006-08-04 14:51:13.000000000 +0200
+Index: binutils-2.17/gas/testsuite/gas/avr32/pic_reloc.s
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ binutils-2.17/gas/testsuite/gas/avr32/pic_reloc.s	2007-06-28 09:19:36.649664856 +0200
 @@ -0,0 +1,18 @@
 +
 +	.text
@@ -66089,9 +66158,10 @@ 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:
-diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/symdiff.d binutils-2.17-atmel/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/gas/testsuite/gas/avr32/symdiff.d	2006-08-04 14:51:13.000000000 +0200
+Index: binutils-2.17/gas/testsuite/gas/avr32/symdiff.d
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ binutils-2.17/gas/testsuite/gas/avr32/symdiff.d	2007-06-28 09:19:36.650664704 +0200
 @@ -0,0 +1,24 @@
 +#source: symdiff.s
 +#as:
@@ -66117,9 +66187,10 @@ diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/symdiff.d binutils-2.17-atmel/g
 +   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/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/gas/testsuite/gas/avr32/symdiff_linkrelax.d	2006-08-04 14:51:13.000000000 +0200
+Index: binutils-2.17/gas/testsuite/gas/avr32/symdiff_linkrelax.d
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ binutils-2.17/gas/testsuite/gas/avr32/symdiff_linkrelax.d	2007-06-28 09:19:36.650664704 +0200
 @@ -0,0 +1,28 @@
 +#source: symdiff.s
 +#as: --linkrelax
@@ -66149,9 +66220,10 @@ 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
-diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/symdiff.s binutils-2.17-atmel/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/gas/testsuite/gas/avr32/symdiff.s	2006-08-04 14:51:13.000000000 +0200
+Index: binutils-2.17/gas/testsuite/gas/avr32/symdiff.s
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ binutils-2.17/gas/testsuite/gas/avr32/symdiff.s	2007-06-28 09:19:36.650664704 +0200
 @@ -0,0 +1,19 @@
 +
 +	.text
@@ -66172,10 +66244,11 @@ diff -Nrup binutils-2.17/gas/testsuite/gas/avr32/symdiff.s binutils-2.17-atmel/g
 +.L1:	nop
 +	nop
 +.L2:	nop
-diff -Nrup binutils-2.17/gas/write.c binutils-2.17-atmel/gas/write.c
---- binutils-2.17/gas/write.c	2006-05-10 15:43:37.000000000 +0200
-+++ binutils-2.17-atmel/gas/write.c	2007-02-12 15:37:09.000000000 +0100
-@@ -126,7 +126,9 @@ static fixS *fix_new_internal (fragS *, 
+Index: binutils-2.17/gas/write.c
+===================================================================
+--- binutils-2.17.orig/gas/write.c	2007-06-28 09:19:34.590977824 +0200
++++ binutils-2.17/gas/write.c	2007-06-28 09:19:36.651664552 +0200
+@@ -126,7 +126,9 @@
  			       offsetT offset, int pcrel,
  			       RELOC_ENUM r_type);
  static long fixup_segment (fixS *, segT);
@@ -66185,7 +66258,7 @@ diff -Nrup binutils-2.17/gas/write.c binutils-2.17-atmel/gas/write.c
  static fragS *chain_frchains_together_1 (segT, struct frchain *);
  static void chain_frchains_together (bfd *, segT, PTR);
  static void cvt_frag_to_fill (segT, fragS *);
-@@ -1684,6 +1686,10 @@ relax_frag (segT segment, fragS *fragP, 
+@@ -1684,6 +1686,10 @@
  
  #endif /* defined (TC_GENERIC_RELAX_TABLE)  */
  
@@ -66196,7 +66269,7 @@ diff -Nrup binutils-2.17/gas/write.c binutils-2.17-atmel/gas/write.c
  /* Relax_align. Advance location counter to next address that has 'alignment'
     lowest order bits all 0s, return size of adjustment made.  */
  static relax_addressT
-@@ -1703,6 +1709,7 @@ relax_align (register relax_addressT add
+@@ -1703,6 +1709,7 @@
  #endif
    return (new_address - address);
  }
@@ -66204,7 +66277,7 @@ diff -Nrup binutils-2.17/gas/write.c binutils-2.17-atmel/gas/write.c
  
  /* Now we have a segment, not a crowd of sub-segments, we can make
     fr_address values.
-@@ -1746,7 +1753,7 @@ relax_segment (struct frag *segment_frag
+@@ -1746,7 +1753,7 @@
  	case rs_align_code:
  	case rs_align_test:
  	  {
@@ -66213,7 +66286,7 @@ diff -Nrup binutils-2.17/gas/write.c binutils-2.17-atmel/gas/write.c
  
  	    if (fragP->fr_subtype != 0 && offset > fragP->fr_subtype)
  	      offset = 0;
-@@ -1922,10 +1929,10 @@ relax_segment (struct frag *segment_frag
+@@ -1922,10 +1929,10 @@
  		{
  		  addressT oldoff, newoff;
  
@@ -66228,10 +66301,11 @@ diff -Nrup binutils-2.17/gas/write.c binutils-2.17-atmel/gas/write.c
  
  		  if (fragP->fr_subtype != 0)
  		    {
-diff -Nrup binutils-2.17/include/dis-asm.h binutils-2.17-atmel/include/dis-asm.h
---- binutils-2.17/include/dis-asm.h	2006-02-17 15:36:26.000000000 +0100
-+++ binutils-2.17-atmel/include/dis-asm.h	2007-02-12 15:37:09.000000000 +0100
-@@ -223,6 +223,7 @@ extern int print_insn_big_arm		(bfd_vma,
+Index: binutils-2.17/include/dis-asm.h
+===================================================================
+--- binutils-2.17.orig/include/dis-asm.h	2007-06-28 09:19:34.596976912 +0200
++++ binutils-2.17/include/dis-asm.h	2007-06-28 09:19:36.651664552 +0200
+@@ -223,6 +223,7 @@
  extern int print_insn_little_arm	(bfd_vma, disassemble_info *);
  extern int print_insn_sparc		(bfd_vma, disassemble_info *);
  extern int print_insn_avr		(bfd_vma, disassemble_info *);
@@ -66239,7 +66313,7 @@ diff -Nrup binutils-2.17/include/dis-asm.h binutils-2.17-atmel/include/dis-asm.h
  extern int print_insn_bfin		(bfd_vma, disassemble_info *);
  extern int print_insn_d10v		(bfd_vma, disassemble_info *);
  extern int print_insn_d30v		(bfd_vma, disassemble_info *);
-@@ -276,7 +277,9 @@ extern disassembler_ftype cris_get_disas
+@@ -276,7 +277,9 @@
  extern void print_mips_disassembler_options (FILE *);
  extern void print_ppc_disassembler_options (FILE *);
  extern void print_arm_disassembler_options (FILE *);
@@ -66249,9 +66323,10 @@ diff -Nrup binutils-2.17/include/dis-asm.h binutils-2.17-atmel/include/dis-asm.h
  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/include/elf/avr32.h
---- binutils-2.17/include/elf/avr32.h	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17-atmel/include/elf/avr32.h	2006-08-04 14:50:43.000000000 +0200
+Index: binutils-2.17/include/elf/avr32.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ binutils-2.17/include/elf/avr32.h	2007-06-28 09:19:36.652664400 +0200
 @@ -0,0 +1,95 @@
 +/* AVR32 ELF support for BFD.
 +   Copyright 2003-2006 Atmel Corporation.
@@ -66348,9 +66423,10 @@ diff -Nrup binutils-2.17/include/elf/avr32.h binutils-2.17-atmel/include/elf/avr
 +
 +/* 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/include/elf/common.h
---- binutils-2.17/include/elf/common.h	2006-02-17 15:36:26.000000000 +0100
-+++ binutils-2.17-atmel/include/elf/common.h	2007-02-12 15:37:09.000000000 +0100
+Index: binutils-2.17/include/elf/common.h
+===================================================================
+--- binutils-2.17.orig/include/elf/common.h	2007-06-28 09:19:34.607975240 +0200
++++ binutils-2.17/include/elf/common.h	2007-06-28 09:19:36.652664400 +0200
 @@ -256,6 +256,9 @@
  /* V850 backend magic number.  Written in the absense of an ABI.  */
  #define EM_CYGNUS_V850		0x9080
@@ -66361,9 +66437,10 @@ diff -Nrup binutils-2.17/include/elf/common.h binutils-2.17-atmel/include/elf/co
  /* old S/390 backend magic number. Written in the absence of an ABI.  */
  #define EM_S390_OLD		0xa390
  
-diff -Nrup binutils-2.17/ld/config.in binutils-2.17-atmel/ld/config.in
---- binutils-2.17/ld/config.in	2006-04-16 20:20:30.000000000 +0200
-+++ binutils-2.17-atmel/ld/config.in	2007-02-20 16:07:39.000000000 +0100
+Index: binutils-2.17/ld/config.in
+===================================================================
+--- binutils-2.17.orig/ld/config.in	2007-06-28 09:19:34.612974480 +0200
++++ binutils-2.17/ld/config.in	2007-06-28 09:19:36.653664248 +0200
 @@ -187,7 +187,7 @@
  
  /* If using the C implementation of alloca, define if you know the
@@ -66384,9 +66461,10 @@ diff -Nrup binutils-2.17/ld/config.in binutils-2.17-atmel/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
-diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
---- binutils-2.17/ld/configure	2006-04-11 12:36:26.000000000 +0200
-+++ binutils-2.17-atmel/ld/configure	2007-02-20 16:07:37.000000000 +0100
+Index: binutils-2.17/ld/configure
+===================================================================
+--- binutils-2.17.orig/ld/configure	2007-06-28 09:19:35.046908512 +0200
++++ binutils-2.17/ld/configure	2007-06-28 09:19:36.664662576 +0200
 @@ -1,25 +1,54 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
@@ -66448,7 +66526,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  
  # Support unset when possible.
  if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-@@ -29,8 +58,43 @@ else
+@@ -29,8 +58,43 @@
  fi
  
  
@@ -66493,7 +66571,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  PS1='$ '
  PS2='> '
  PS4='+ '
-@@ -44,18 +108,19 @@ do
+@@ -44,18 +108,19 @@
    if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
      eval $as_var=C; export $as_var
    else
@@ -66516,7 +66594,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
    as_basename=basename
  else
    as_basename=false
-@@ -63,157 +128,388 @@ fi
+@@ -63,157 +128,388 @@
  
  
  # Name of the executable.
@@ -67003,7 +67081,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  
  if mkdir -p . 2>/dev/null; then
    as_mkdir_p=:
-@@ -222,7 +518,28 @@ else
+@@ -222,7 +518,28 @@
    as_mkdir_p=false
  fi
  
@@ -67033,7 +67111,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  
  # Sed expression to map a string onto a valid CPP name.
  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -231,39 +548,27 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P
+@@ -231,39 +548,27 @@
  as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
  
  
@@ -67076,7 +67154,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  # Identity of this package.
  PACKAGE_NAME=
  PACKAGE_TARNAME=
-@@ -275,42 +580,191 @@ ac_unique_file="ldmain.c"
+@@ -275,42 +580,191 @@
  # Factoring default headers for most tests.
  ac_includes_default="\
  #include <stdio.h>
@@ -67282,7 +67360,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  
  # Initialize some variables set by options.
  ac_init_help=
-@@ -337,34 +791,48 @@ x_libraries=NONE
+@@ -337,34 +791,48 @@
  # and all the variables that are supposed to be based on exec_prefix
  # by default will actually change.
  # Use braces instead of parens because sh, perl, etc. also accept them.
@@ -67338,7 +67416,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  
    -bindir | --bindir | --bindi | --bind | --bin | --bi)
      ac_prev=bindir ;;
-@@ -386,33 +854,45 @@ do
+@@ -386,33 +854,45 @@
    --config-cache | -C)
      cache_file=config.cache ;;
  
@@ -67397,7 +67475,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  
    -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
    | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-@@ -439,6 +919,12 @@ do
+@@ -439,6 +919,12 @@
    -host=* | --host=* | --hos=* | --ho=*)
      host_alias=$ac_optarg ;;
  
@@ -67410,7 +67488,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
    -includedir | --includedir | --includedi | --included | --include \
    | --includ | --inclu | --incl | --inc)
      ac_prev=includedir ;;
-@@ -463,13 +949,16 @@ do
+@@ -463,13 +949,16 @@
    | --libexe=* | --libex=* | --libe=*)
      libexecdir=$ac_optarg ;;
  
@@ -67431,7 +67509,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
      localstatedir=$ac_optarg ;;
  
    -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-@@ -534,6 +1023,16 @@ do
+@@ -534,6 +1023,16 @@
    | --progr-tra=* | --program-tr=* | --program-t=*)
      program_transform_name=$ac_optarg ;;
  
@@ -67448,7 +67526,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
    | -silent | --silent | --silen | --sile | --sil)
      silent=yes ;;
-@@ -586,24 +1085,20 @@ do
+@@ -586,24 +1085,20 @@
    -with-* | --with-*)
      ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
      # Reject names that are not valid shell variable names.
@@ -67479,7 +67557,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  
    --x)
      # Obsolete; use --with-x.
-@@ -634,8 +1129,7 @@ Try \`$0 --help' for more information." 
+@@ -634,8 +1129,7 @@
      expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
        { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
     { (exit 1); exit 1; }; }
@@ -67489,7 +67567,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
      export $ac_envvar ;;
  
    *)
-@@ -655,27 +1149,19 @@ if test -n "$ac_prev"; then
+@@ -655,27 +1149,19 @@
     { (exit 1); exit 1; }; }
  fi
  
@@ -67527,7 +67605,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  done
  
  # There might be people who depend on the old broken behavior: `$host'
-@@ -702,74 +1188,76 @@ test -n "$host_alias" && ac_tool_prefix=
+@@ -702,74 +1188,76 @@
  test "$silent" = yes && exec 6>/dev/null
  
  
@@ -67659,7 +67737,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  
  #
  # Report the --help message.
-@@ -798,9 +1286,6 @@ Configuration:
+@@ -798,9 +1286,6 @@
    -n, --no-create         do not create output files
        --srcdir=DIR        find the sources in DIR [configure dir or \`..']
  
@@ -67669,7 +67747,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  Installation directories:
    --prefix=PREFIX         install architecture-independent files in PREFIX
  			  [$ac_default_prefix]
-@@ -818,15 +1303,22 @@ Fine tuning of the installation director
+@@ -818,15 +1303,22 @@
    --bindir=DIR           user executables [EPREFIX/bin]
    --sbindir=DIR          system admin executables [EPREFIX/sbin]
    --libexecdir=DIR       program executables [EPREFIX/libexec]
@@ -67695,7 +67773,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  _ACEOF
  
    cat <<\_ACEOF
-@@ -878,126 +1370,100 @@ Some influential environment variables:
+@@ -878,126 +1370,100 @@
    CFLAGS      C compiler flags
    LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
                nonstandard directory <lib dir>
@@ -67878,7 +67956,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  {
  cat <<_ASUNAME
  ## --------- ##
-@@ -1016,7 +1482,7 @@ uname -v = `(uname -v) 2>/dev/null || ec
+@@ -1016,7 +1482,7 @@
  /bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
  /usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
  /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
@@ -67887,7 +67965,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  /bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
  /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
  /bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-@@ -1030,6 +1496,7 @@ do
+@@ -1030,6 +1496,7 @@
    test -z "$as_dir" && as_dir=.
    echo "PATH: $as_dir"
  done
@@ -67895,7 +67973,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  
  } >&5
  
-@@ -1051,7 +1518,6 @@ _ACEOF
+@@ -1051,7 +1518,6 @@
  ac_configure_args=
  ac_configure_args0=
  ac_configure_args1=
@@ -67903,7 +67981,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  ac_must_keep_next=false
  for ac_pass in 1 2
  do
-@@ -1062,7 +1528,7 @@ do
+@@ -1062,7 +1528,7 @@
      -q | -quiet | --quiet | --quie | --qui | --qu | --q \
      | -silent | --silent | --silen | --sile | --sil)
        continue ;;
@@ -67912,7 +67990,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
        ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
      esac
      case $ac_pass in
-@@ -1084,9 +1550,7 @@ do
+@@ -1084,9 +1550,7 @@
  	  -* ) ac_must_keep_next=true ;;
  	esac
        fi
@@ -67923,7 +68001,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
        ;;
      esac
    done
-@@ -1097,8 +1561,8 @@ $as_unset ac_configure_args1 || test "${
+@@ -1097,8 +1561,8 @@
  # When interrupted or exit'd, cleanup temporary files, and complete
  # config.log.  We remove comments because anyway the quotes in there
  # would cause problems or look ugly.
@@ -67934,7 +68012,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  trap 'exit_status=$?
    # Save into config.log some information that might help in debugging.
    {
-@@ -1111,20 +1575,34 @@ trap 'exit_status=$?
+@@ -1111,20 +1575,34 @@
  _ASBOX
      echo
      # The following way of writing the cache mishandles newlines in values,
@@ -67979,7 +68057,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
      echo
  
      cat <<\_ASBOX
-@@ -1135,22 +1613,28 @@ _ASBOX
+@@ -1135,22 +1613,28 @@
      echo
      for ac_var in $ac_subst_vars
      do
@@ -68015,7 +68093,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
        done | sort
        echo
      fi
-@@ -1162,26 +1646,24 @@ _ASBOX
+@@ -1162,26 +1646,24 @@
  ## ----------- ##
  _ASBOX
        echo
@@ -68047,7 +68125,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  
  # Predefined preprocessor variables.
  
-@@ -1212,14 +1694,17 @@ _ACEOF
+@@ -1212,14 +1694,17 @@
  
  # Let the site file select an alternate cache file if it wants to.
  # Prefer explicitly selected file to automatically selected ones.
@@ -68072,7 +68150,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
    if test -r "$ac_site_file"; then
      { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
  echo "$as_me: loading site script $ac_site_file" >&6;}
-@@ -1235,8 +1720,8 @@ if test -r "$cache_file"; then
+@@ -1235,8 +1720,8 @@
      { echo "$as_me:$LINENO: loading cache $cache_file" >&5
  echo "$as_me: loading cache $cache_file" >&6;}
      case $cache_file in
@@ -68083,7 +68161,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
      esac
    fi
  else
-@@ -1248,12 +1733,11 @@ fi
+@@ -1248,12 +1733,11 @@
  # Check that the precious variables saved in the cache have kept the same
  # value.
  ac_cache_corrupted=false
@@ -68099,7 +68177,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
    case $ac_old_set,$ac_new_set in
      set,)
        { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-@@ -1278,8 +1762,7 @@ echo "$as_me:   current value: $ac_new_v
+@@ -1278,8 +1762,7 @@
    # Pass precious variables to config.status.
    if test "$ac_new_set" = set; then
      case $ac_new_val in
@@ -68109,7 +68187,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
      *) ac_arg=$ac_var=$ac_new_val ;;
      esac
      case " $ac_configure_args " in
-@@ -1296,12 +1779,6 @@ echo "$as_me: error: run \`make distclea
+@@ -1296,12 +1779,6 @@
     { (exit 1); exit 1; }; }
  fi
  
@@ -68122,7 +68200,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  
  
  
-@@ -1318,108 +1795,163 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -1318,108 +1795,163 @@
  
  
  
@@ -68338,7 +68416,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  
  
  # The aliases save the names the user supplied, while $host etc.
-@@ -1436,8 +1968,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -1436,8 +1968,8 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
  set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -68349,7 +68427,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -1450,32 +1982,34 @@ do
+@@ -1450,32 +1982,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -68391,7 +68469,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -1488,36 +2022,51 @@ do
+@@ -1488,36 +2022,51 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -68453,7 +68531,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -1530,74 +2079,34 @@ do
+@@ -1530,74 +2079,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -68537,7 +68615,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -1611,7 +2120,7 @@ do
+@@ -1611,7 +2120,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -68546,7 +68624,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
      if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
         ac_prog_rejected=yes
         continue
-@@ -1622,6 +2131,7 @@ do
+@@ -1622,6 +2131,7 @@
    fi
  done
  done
@@ -68554,7 +68632,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  
  if test $ac_prog_rejected = yes; then
    # We found a bogon in the path, so make sure we never use it.
-@@ -1639,22 +2149,23 @@ fi
+@@ -1639,22 +2149,23 @@
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
@@ -68585,7 +68663,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -1667,36 +2178,38 @@ do
+@@ -1667,36 +2178,38 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -68632,7 +68710,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -1709,29 +2222,45 @@ do
+@@ -1709,29 +2222,45 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -68684,7 +68762,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  fi
  
  fi
-@@ -1744,21 +2273,35 @@ See \`config.log' for more details." >&2
+@@ -1744,21 +2273,35 @@
     { (exit 1); exit 1; }; }
  
  # Provide some information about the compiler.
@@ -68728,7 +68806,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
-@@ -1783,47 +2326,77 @@ ac_clean_files="$ac_clean_files a.out a.
+@@ -1783,47 +2326,77 @@
  # Try to create an executable without -o first, disregard a.out.
  # It will help us diagnose broken compilers, and finding out an intuition
  # of exeext.
@@ -68828,7 +68906,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
-@@ -1835,19 +2408,21 @@ See \`config.log' for more details." >&2
+@@ -1835,19 +2408,21 @@
  fi
  
  ac_exeext=$ac_cv_exeext
@@ -68857,7 +68935,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -1866,22 +2441,27 @@ See \`config.log' for more details." >&2
+@@ -1866,22 +2441,27 @@
      fi
    fi
  fi
@@ -68897,7 +68975,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
-@@ -1892,9 +2472,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -1892,9 +2472,8 @@
  for ac_file in conftest.exe conftest conftest.*; do
    test -f "$ac_file" || continue
    case $ac_file in
@@ -68908,7 +68986,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  	  break;;
      * ) break;;
    esac
-@@ -1908,14 +2487,14 @@ See \`config.log' for more details." >&2
+@@ -1908,14 +2487,14 @@
  fi
  
  rm -f conftest$ac_cv_exeext
@@ -68927,7 +69005,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "${ac_cv_objext+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -1935,14 +2514,20 @@ main ()
+@@ -1935,14 +2514,20 @@
  }
  _ACEOF
  rm -f conftest.o conftest.obj
@@ -68952,7 +69030,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
      *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
         break;;
    esac
-@@ -1960,12 +2545,12 @@ fi
+@@ -1960,12 +2545,12 @@
  
  rm -f conftest.$ac_cv_objext conftest.$ac_ext
  fi
@@ -68969,7 +69047,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "${ac_cv_c_compiler_gnu+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -1988,50 +2573,49 @@ main ()
+@@ -1988,50 +2573,49 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -69043,7 +69121,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -2047,38 +2631,118 @@ main ()
+@@ -2047,38 +2631,118 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -69178,7 +69256,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "$ac_test_CFLAGS" = set; then
    CFLAGS=$ac_save_CFLAGS
  elif test $ac_cv_prog_cc_g = yes; then
-@@ -2094,12 +2758,12 @@ else
+@@ -2094,12 +2758,12 @@
      CFLAGS=
    fi
  fi
@@ -69195,7 +69273,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  ac_save_CC=$CC
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -2133,12 +2797,17 @@ static char *f (char * (*g) (char **, in
+@@ -2133,12 +2797,17 @@
  /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
     function prototypes and stuff, but not '\xHH' hex character constants.
     These don't provoke an error unfortunately, instead are silently treated
@@ -69215,7 +69293,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  int test (int i, double x);
  struct s1 {int (*f) (int a);};
  struct s2 {int (*f) (double a);};
-@@ -2153,335 +2822,144 @@ return f (e, argv, 0) != argv[0]  ||  f 
+@@ -2153,335 +2822,144 @@
    return 0;
  }
  _ACEOF
@@ -69638,7 +69716,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  
  fi
  
-@@ -2501,8 +2979,8 @@ am__api_version="1.9"
+@@ -2501,8 +2979,8 @@
  # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
  # OS/2's system install, which has a completely different semantic
  # ./install, which can be erroneously created by make from ./install.sh.
@@ -69649,7 +69727,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test -z "$INSTALL"; then
  if test "${ac_cv_path_install+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2524,7 +3002,7 @@ case $as_dir/ in
+@@ -2524,7 +3002,7 @@
      # by default.
      for ac_prog in ginstall scoinst install; do
        for ac_exec_ext in '' $ac_executable_extensions; do
@@ -69658,7 +69736,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  	  if test $ac_prog = install &&
  	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
  	    # AIX install.  It has an incompatible calling convention.
-@@ -2543,21 +3021,22 @@ case $as_dir/ in
+@@ -2543,21 +3021,22 @@
      ;;
  esac
  done
@@ -69686,7 +69764,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  
  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
  # It thinks the first close brace ends the variable substitution.
-@@ -2567,8 +3046,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
+@@ -2567,8 +3046,8 @@
  
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
@@ -69697,7 +69775,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  # Just in case
  sleep 1
  echo timestamp > conftest.file
-@@ -2610,20 +3089,20 @@ echo "$as_me: error: newly created file 
+@@ -2610,20 +3089,20 @@
  Check your system clock" >&2;}
     { (exit 1); exit 1; }; }
  fi
@@ -69723,7 +69801,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  
  # expand $ac_aux_dir to an absolute path
  am_aux_dir=`cd $ac_aux_dir && pwd`
-@@ -2675,8 +3154,8 @@ for ac_prog in gawk mawk nawk awk
+@@ -2675,8 +3154,8 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -69734,7 +69812,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "${ac_cv_prog_AWK+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2689,54 +3168,57 @@ do
+@@ -2689,54 +3168,57 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -69813,7 +69891,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
    SET_MAKE="MAKE=${MAKE-make}"
  fi
  
-@@ -2751,7 +3233,7 @@ rmdir .tst 2>/dev/null
+@@ -2751,7 +3233,7 @@
  
  DEPDIR="${am__leading_dot}deps"
  
@@ -69822,7 +69900,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  
  
  am_make=${MAKE-make}
-@@ -2761,8 +3243,8 @@ am__doit:
+@@ -2761,8 +3243,8 @@
  .PHONY: am__doit
  END
  # If we don't find an include directive, just comment out the code.
@@ -69833,7 +69911,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  am__include="#"
  am__quote=
  _am_result=none
-@@ -2789,15 +3271,15 @@ if test "$am__include" = "#"; then
+@@ -2789,15 +3271,15 @@
  fi
  
  
@@ -69854,7 +69932,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "x$enable_dependency_tracking" != xno; then
    am_depcomp="$ac_aux_dir/depcomp"
    AMDEPBACKSLASH='\'
-@@ -2872,8 +3354,8 @@ if test "$cross_compiling" != no; then
+@@ -2872,8 +3354,8 @@
    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.
  set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -69865,7 +69943,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "${ac_cv_prog_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2886,32 +3368,34 @@ do
+@@ -2886,32 +3368,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -69907,7 +69985,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2924,27 +3408,41 @@ do
+@@ -2924,27 +3408,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -69956,7 +70034,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  else
    STRIP="$ac_cv_prog_STRIP"
  fi
-@@ -2965,8 +3463,8 @@ am__tar='${AMTAR} chof - "$$tardir"'; am
+@@ -2965,8 +3463,8 @@
  
  depcc="$CC"   am_compiler_list=
  
@@ -69967,7 +70045,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3055,8 +3553,8 @@ else
+@@ -3055,8 +3553,8 @@
  fi
  
  fi
@@ -69978,7 +70056,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
  
  
-@@ -3074,10 +3572,9 @@ fi
+@@ -3074,10 +3572,9 @@
  
  
  
@@ -69991,7 +70069,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  case $enableval in
  yes) enable_shared=yes ;;
  no) enable_shared=no ;;
-@@ -3095,11 +3592,11 @@ no) enable_shared=no ;;
+@@ -3095,11 +3592,11 @@
  esac
  else
    enable_shared=yes
@@ -70007,7 +70085,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  case $enableval in
  yes) enable_static=yes ;;
  no) enable_static=no ;;
-@@ -3117,11 +3614,11 @@ no) enable_static=no ;;
+@@ -3117,11 +3614,11 @@
  esac
  else
    enable_static=yes
@@ -70023,7 +70101,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  case $enableval in
  yes) enable_fast_install=yes ;;
  no) enable_fast_install=no ;;
-@@ -3139,20 +3636,21 @@ no) enable_fast_install=no ;;
+@@ -3139,20 +3636,21 @@
  esac
  else
    enable_fast_install=yes
@@ -70052,7 +70130,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
    case $host in
    *-*-mingw*)
      # gcc leaves a trailing carriage return which upsets mingw
-@@ -3181,11 +3679,11 @@ echo $ECHO_N "checking for ld used by GC
+@@ -3181,11 +3679,11 @@
      ;;
    esac
  elif test "$with_gnu_ld" = yes; then
@@ -70068,7 +70146,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  fi
  if test "${lt_cv_path_LD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3214,17 +3712,17 @@ fi
+@@ -3214,17 +3712,17 @@
  
  LD="$lt_cv_path_LD"
  if test -n "$LD"; then
@@ -70092,7 +70170,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "${lt_cv_prog_gnu_ld+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3235,25 +3733,25 @@ else
+@@ -3235,25 +3733,25 @@
    lt_cv_prog_gnu_ld=no
  fi
  fi
@@ -70126,7 +70204,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "${lt_cv_path_NM+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3288,22 +3786,22 @@ fi
+@@ -3288,22 +3786,22 @@
  fi
  
  NM="$lt_cv_path_NM"
@@ -70159,7 +70237,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "${lt_cv_deplibs_check_method+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3465,8 +3963,8 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+@@ -3465,8 +3963,8 @@
  esac
  
  fi
@@ -70170,7 +70248,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  file_magic_cmd=$lt_cv_file_magic_cmd
  deplibs_check_method=$lt_cv_deplibs_check_method
  
-@@ -3476,8 +3974,8 @@ deplibs_check_method=$lt_cv_deplibs_chec
+@@ -3476,8 +3974,8 @@
  # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
  
  # find the maximum length of command line arguments
@@ -70181,7 +70259,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "${lt_cv_sys_max_cmd_len+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3528,11 +4026,11 @@ else
+@@ -3528,11 +4026,11 @@
  fi
  
  if test -n "$lt_cv_sys_max_cmd_len" ; then
@@ -70197,7 +70275,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  fi
  
  
-@@ -3540,8 +4038,8 @@ fi
+@@ -3540,8 +4038,8 @@
  case $deplibs_check_method in
  file_magic*)
    if test "$file_magic_cmd" = '$MAGIC_CMD'; then
@@ -70208,7 +70286,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3595,17 +4093,17 @@ fi
+@@ -3595,17 +4093,17 @@
  
  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  if test -n "$MAGIC_CMD"; then
@@ -70232,7 +70310,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3659,11 +4157,11 @@ fi
+@@ -3659,11 +4157,11 @@
  
  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  if test -n "$MAGIC_CMD"; then
@@ -70248,7 +70326,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  fi
  
    else
-@@ -3678,8 +4176,8 @@ esac
+@@ -3678,8 +4176,8 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
  set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -70259,7 +70337,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "${ac_cv_prog_RANLIB+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3692,32 +4190,34 @@ do
+@@ -3692,32 +4190,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -70301,7 +70379,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3730,27 +4230,41 @@ do
+@@ -3730,27 +4230,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -70350,7 +70428,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  else
    RANLIB="$ac_cv_prog_RANLIB"
  fi
-@@ -3758,8 +4272,8 @@ fi
+@@ -3758,8 +4272,8 @@
  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.
  set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -70361,7 +70439,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "${ac_cv_prog_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3772,32 +4286,34 @@ do
+@@ -3772,32 +4286,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -70403,7 +70481,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3810,27 +4326,41 @@ do
+@@ -3810,27 +4326,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -70452,7 +70530,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  else
    STRIP="$ac_cv_prog_STRIP"
  fi
-@@ -3845,22 +4375,22 @@ test "$GCC" = yes && libtool_flags="$lib
+@@ -3845,22 +4375,22 @@
  test "$lt_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
  
  
@@ -70482,7 +70560,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  test x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic"
  test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
  
-@@ -3869,7 +4399,7 @@ test x"$pic_mode" = xno && libtool_flags
+@@ -3869,7 +4399,7 @@
  case $host in
  *-*-irix6*)
    # Find out which ABI we are using.
@@ -70491,7 +70569,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-@@ -3974,13 +4504,12 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*li
+@@ -3974,13 +4504,12 @@
    # On SCO OpenServer 5, we need -belf to get full-featured binaries.
    SAVE_CFLAGS="$CFLAGS"
    CFLAGS="$CFLAGS -belf"
@@ -70507,7 +70585,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
       ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4003,35 +4532,32 @@ main ()
+@@ -4003,35 +4532,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -70558,7 +70636,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
        conftest$ac_exeext conftest.$ac_ext
       ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -4040,8 +4566,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
+@@ -4040,8 +4566,8 @@
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  fi
@@ -70569,7 +70647,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
    if test x"$lt_cv_cc_needs_belf" != x"yes"; then
      # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
      CFLAGS="$SAVE_CFLAGS"
-@@ -4071,39 +4597,58 @@ _ACEOF
+@@ -4071,39 +4597,58 @@
  
  # The following way of writing the cache mishandles newlines in values,
  # but we know of no workaround that is simple, portable, and efficient.
@@ -70644,7 +70722,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
    fi
  fi
  rm -f confcache
-@@ -4129,8 +4674,8 @@ if test -r "$cache_file"; then
+@@ -4129,8 +4674,8 @@
      { echo "$as_me:$LINENO: loading cache $cache_file" >&5
  echo "$as_me: loading cache $cache_file" >&6;}
      case $cache_file in
@@ -70655,7 +70733,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
      esac
    fi
  else
-@@ -4157,15 +4702,14 @@ exec 5>>./config.log
+@@ -4157,15 +4702,14 @@
  
  
  
@@ -70677,7 +70755,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
    yes | "") { { echo "$as_me:$LINENO: error: enable-targets option must specify target names or 'all'" >&5
  echo "$as_me: error: enable-targets option must specify target names or 'all'" >&2;}
     { (exit 1); exit 1; }; }
-@@ -4173,10 +4717,10 @@ echo "$as_me: error: enable-targets opti
+@@ -4173,10 +4717,10 @@
    no)       enable_targets= ;;
    *)        enable_targets=$enableval ;;
  esac
@@ -70691,7 +70769,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
    yes)  want64=true  ;;
    no)   want64=false ;;
    *)    { { echo "$as_me:$LINENO: error: bad value ${enableval} for 64-bit-bfd option" >&5
-@@ -4185,12 +4729,12 @@ echo "$as_me: error: bad value ${enablev
+@@ -4185,12 +4729,12 @@
  esac
  else
    want64=false
@@ -70708,7 +70786,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
   case ${with_sysroot} in
   yes) TARGET_SYSTEM_ROOT='${exec_prefix}/${target_alias}/sys-root' ;;
   *) TARGET_SYSTEM_ROOT=$with_sysroot ;;
-@@ -4222,7 +4766,8 @@ else
+@@ -4222,7 +4766,8 @@
   TARGET_SYSTEM_ROOT=
   TARGET_SYSTEM_ROOT_DEFINE='-DTARGET_SYSTEM_ROOT=\"\"'
  
@@ -70718,7 +70796,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  
  
  
-@@ -4230,17 +4775,17 @@ fi;
+@@ -4230,17 +4775,17 @@
  
  GCC_WARN_CFLAGS="-W -Wall -Wstrict-prototypes -Wmissing-prototypes"
  
@@ -70740,7 +70818,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  
  # Enable -Werror by default when using gcc
  if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
-@@ -4257,10 +4802,9 @@ if test "${GCC}" = yes ; then
+@@ -4257,10 +4802,9 @@
    WARN_CFLAGS="${GCC_WARN_CFLAGS}"
  fi
  
@@ -70753,7 +70831,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
    yes)	WARN_CFLAGS="${GCC_WARN_CFLAGS}";;
    no)	if test "${GCC}" = yes ; then
  	  WARN_CFLAGS="-w"
-@@ -4271,7 +4815,8 @@ if test "${enable_build_warnings+set}" =
+@@ -4271,7 +4815,8 @@
          WARN_CFLAGS="${t} ${GCC_WARN_CFLAGS}";;
    *)    WARN_CFLAGS=`echo "${enableval}" | sed -e "s/,/ /g"`;;
  esac
@@ -70763,7 +70841,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  
  if test x"$silent" != x"yes" && test x"$WARN_CFLAGS" != x""; then
    echo "Setting warning flags = $WARN_CFLAGS" 6>&1
-@@ -4281,7 +4826,7 @@ fi
+@@ -4281,7 +4826,7 @@
  
  
  
@@ -70772,7 +70850,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  
  
  if test -z "$target" ; then
-@@ -4305,8 +4850,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -4305,8 +4850,8 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
  set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -70783,7 +70861,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4319,32 +4864,34 @@ do
+@@ -4319,32 +4864,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -70825,7 +70903,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4357,36 +4904,51 @@ do
+@@ -4357,36 +4904,51 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -70887,7 +70965,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4399,74 +4961,34 @@ do
+@@ -4399,74 +4961,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -70971,7 +71049,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4480,7 +5002,7 @@ do
+@@ -4480,7 +5002,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -70980,7 +71058,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
      if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
         ac_prog_rejected=yes
         continue
-@@ -4491,6 +5013,7 @@ do
+@@ -4491,6 +5013,7 @@
    fi
  done
  done
@@ -70988,7 +71066,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  
  if test $ac_prog_rejected = yes; then
    # We found a bogon in the path, so make sure we never use it.
-@@ -4508,22 +5031,23 @@ fi
+@@ -4508,22 +5031,23 @@
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
@@ -71019,7 +71097,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4536,36 +5060,38 @@ do
+@@ -4536,36 +5060,38 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -71066,7 +71144,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4578,29 +5104,45 @@ do
+@@ -4578,29 +5104,45 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -71118,7 +71196,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  fi
  
  fi
-@@ -4613,27 +5155,41 @@ See \`config.log' for more details." >&2
+@@ -4613,27 +5155,41 @@
     { (exit 1); exit 1; }; }
  
  # Provide some information about the compiler.
@@ -71170,7 +71248,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "${ac_cv_c_compiler_gnu+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4656,50 +5212,49 @@ main ()
+@@ -4656,50 +5212,49 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -71244,7 +71322,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -4715,59 +5270,139 @@ main ()
+@@ -4715,59 +5270,139 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -71427,7 +71505,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  ac_save_CC=$CC
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -4801,12 +5436,17 @@ static char *f (char * (*g) (char **, in
+@@ -4801,12 +5436,17 @@
  /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
     function prototypes and stuff, but not '\xHH' hex character constants.
     These don't provoke an error unfortunately, instead are silently treated
@@ -71447,7 +71525,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  int test (int i, double x);
  struct s1 {int (*f) (int a);};
  struct s2 {int (*f) (double a);};
-@@ -4821,205 +5461,57 @@ return f (e, argv, 0) != argv[0]  ||  f 
+@@ -4821,205 +5461,57 @@
    return 0;
  }
  _ACEOF
@@ -71683,7 +71761,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -5039,8 +5531,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -5039,8 +5531,8 @@
  # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
  # OS/2's system install, which has a completely different semantic
  # ./install, which can be erroneously created by make from ./install.sh.
@@ -71694,7 +71772,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test -z "$INSTALL"; then
  if test "${ac_cv_path_install+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5062,7 +5554,7 @@ case $as_dir/ in
+@@ -5062,7 +5554,7 @@
      # by default.
      for ac_prog in ginstall scoinst install; do
        for ac_exec_ext in '' $ac_executable_extensions; do
@@ -71703,7 +71781,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  	  if test $ac_prog = install &&
  	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
  	    # AIX install.  It has an incompatible calling convention.
-@@ -5081,21 +5573,22 @@ case $as_dir/ in
+@@ -5081,21 +5573,22 @@
      ;;
  esac
  done
@@ -71731,7 +71809,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  
  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
  # It thinks the first close brace ends the variable substitution.
-@@ -5110,8 +5603,8 @@ ALL_LINGUAS="fr sv tr es da vi zh_CN"
+@@ -5110,8 +5603,8 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
  set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -71742,7 +71820,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "${ac_cv_prog_RANLIB+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5124,32 +5617,34 @@ do
+@@ -5124,32 +5617,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -71784,7 +71862,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5162,27 +5657,41 @@ do
+@@ -5162,27 +5657,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -71833,7 +71911,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  else
    RANLIB="$ac_cv_prog_RANLIB"
  fi
-@@ -5192,8 +5701,8 @@ ac_cpp='$CPP $CPPFLAGS'
+@@ -5192,8 +5701,8 @@
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -71844,7 +71922,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  # On Suns, sometimes $CPP names a directory.
  if test -n "$CPP" && test -d "$CPP"; then
    CPP=
-@@ -5227,24 +5736,22 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -5227,24 +5736,22 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -71880,7 +71958,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
    :
  else
    echo "$as_me: failed program was:" >&5
-@@ -5253,9 +5760,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -5253,9 +5760,10 @@
    # Broken: fails on valid input.
  continue
  fi
@@ -71892,7 +71970,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -5265,24 +5773,22 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -5265,24 +5773,22 @@
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
@@ -71928,7 +72006,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
    # Broken: success on invalid input.
  continue
  else
-@@ -5293,6 +5799,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -5293,6 +5799,7 @@
  ac_preproc_ok=:
  break
  fi
@@ -71936,7 +72014,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -5310,8 +5817,8 @@ fi
+@@ -5310,8 +5817,8 @@
  else
    ac_cv_prog_CPP=$CPP
  fi
@@ -71947,7 +72025,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  ac_preproc_ok=false
  for ac_c_preproc_warn_flag in '' yes
  do
-@@ -5334,24 +5841,22 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -5334,24 +5841,22 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -71983,7 +72061,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
    :
  else
    echo "$as_me: failed program was:" >&5
-@@ -5360,9 +5865,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -5360,9 +5865,10 @@
    # Broken: fails on valid input.
  continue
  fi
@@ -71995,7 +72073,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -5372,24 +5878,22 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -5372,24 +5878,22 @@
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
@@ -72031,7 +72109,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
    # Broken: success on invalid input.
  continue
  else
-@@ -5400,6 +5904,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -5400,6 +5904,7 @@
  ac_preproc_ok=:
  break
  fi
@@ -72039,7 +72117,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -5422,79 +5927,222 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
+@@ -5422,79 +5927,222 @@
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
@@ -72325,7 +72403,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -5546,6 +6194,7 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -5546,6 +6194,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <ctype.h>
@@ -72333,7 +72411,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  #if ((' ' & 0x0FF) == 0x020)
  # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
  # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -5565,18 +6214,27 @@ main ()
+@@ -5565,18 +6214,27 @@
    for (i = 0; i < 256; i++)
      if (XOR (islower (i), ISLOWER (i))
  	|| toupper (i) != TOUPPER (i))
@@ -72367,7 +72445,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5589,12 +6247,14 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -5589,12 +6247,14 @@
  ( exit $ac_status )
  ac_cv_header_stdc=no
  fi
@@ -72385,7 +72463,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test $ac_cv_header_stdc = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -5603,8 +6263,8 @@ _ACEOF
+@@ -5603,8 +6263,8 @@
  
  fi
  
@@ -72396,7 +72474,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "${ac_cv_c_const+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5622,10 +6282,10 @@ main ()
+@@ -5622,10 +6282,10 @@
  #ifndef __cplusplus
    /* Ultrix mips cc rejects this.  */
    typedef int charset[2];
@@ -72410,7 +72488,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
    /* NEC SVR4.0.2 mips cc rejects this.  */
    struct point {int x, y;};
    static struct point const zero = {0,0};
-@@ -5634,16 +6294,17 @@ main ()
+@@ -5634,16 +6294,17 @@
       an arm of an if-expression whose if-part is not a constant
       expression */
    const char *g = "string";
@@ -72432,7 +72510,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
    }
    { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
      int x[] = {25, 17};
-@@ -5662,7 +6323,9 @@ main ()
+@@ -5662,7 +6323,9 @@
    }
    { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
      const int foo = 10;
@@ -72442,7 +72520,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  #endif
  
    ;
-@@ -5670,38 +6333,34 @@ main ()
+@@ -5670,38 +6333,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -72497,7 +72575,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test $ac_cv_c_const = no; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -5710,8 +6369,8 @@ _ACEOF
+@@ -5710,8 +6369,8 @@
  
  fi
  
@@ -72508,7 +72586,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "${ac_cv_c_inline+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5731,39 +6390,37 @@ $ac_kw foo_t foo () {return 0; }
+@@ -5731,39 +6390,37 @@
  
  _ACEOF
  rm -f conftest.$ac_objext
@@ -72566,7 +72644,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  
  
  case $ac_cv_c_inline in
-@@ -5795,9 +6452,9 @@ for ac_header in sys/types.h sys/stat.h 
+@@ -5795,9 +6452,9 @@
  		  inttypes.h stdint.h unistd.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -72579,7 +72657,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -5811,38 +6468,35 @@ $ac_includes_default
+@@ -5811,38 +6468,35 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -72635,7 +72713,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -5853,8 +6507,8 @@ fi
+@@ -5853,8 +6507,8 @@
  done
  
  
@@ -72646,7 +72724,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "${ac_cv_type_off_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5865,62 +6519,59 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -5865,62 +6519,59 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -72731,7 +72809,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "${ac_cv_type_size_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5931,64 +6582,61 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -5931,64 +6582,61 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -72818,7 +72896,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "${ac_cv_working_alloca_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6003,44 +6651,42 @@ int
+@@ -6003,44 +6651,42 @@
  main ()
  {
  char *p = (char *) alloca (2 * sizeof (int));
@@ -72881,7 +72959,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test $ac_cv_working_alloca_h = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -6049,8 +6695,8 @@ _ACEOF
+@@ -6049,8 +6695,8 @@
  
  fi
  
@@ -72892,7 +72970,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "${ac_cv_func_alloca_works+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6067,7 +6713,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -6067,7 +6713,7 @@
  #  include <malloc.h>
  #  define alloca _alloca
  # else
@@ -72901,7 +72979,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  #   include <alloca.h>
  #  else
  #   ifdef _AIX
-@@ -6085,44 +6731,42 @@ int
+@@ -6085,44 +6731,42 @@
  main ()
  {
  char *p = (char *) alloca (1);
@@ -72964,7 +73042,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  
  if test $ac_cv_func_alloca_works = yes; then
  
-@@ -6136,15 +6780,15 @@ else
+@@ -6136,15 +6780,15 @@
  # contain a buggy version.  If you still want to use their alloca,
  # use ar to extract alloca.o from them instead of compiling alloca.c.
  
@@ -72983,7 +73061,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "${ac_cv_os_cray+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6154,7 +6798,7 @@ _ACEOF
+@@ -6154,7 +6798,7 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -72992,7 +73070,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  webecray
  #else
  wenotbecray
-@@ -6170,14 +6814,14 @@ fi
+@@ -6170,14 +6814,14 @@
  rm -f conftest*
  
  fi
@@ -73012,7 +73090,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -6203,68 +6847,60 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -6203,68 +6847,60 @@
  
  #undef $ac_func
  
@@ -73104,7 +73182,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test `eval echo '${'$as_ac_var'}'` = yes; then
  
  cat >>confdefs.h <<_ACEOF
-@@ -6277,8 +6913,8 @@ fi
+@@ -6277,8 +6913,8 @@
    done
  fi
  
@@ -73115,7 +73193,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "${ac_cv_c_stack_direction+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6291,6 +6927,7 @@ _ACEOF
+@@ -6291,6 +6927,7 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -73123,7 +73201,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  int
  find_stack_direction ()
  {
-@@ -6308,17 +6945,26 @@ find_stack_direction ()
+@@ -6308,17 +6945,26 @@
  int
  main ()
  {
@@ -73155,7 +73233,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -6331,11 +6977,13 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -6331,11 +6977,13 @@
  ( exit $ac_status )
  ac_cv_c_stack_direction=-1
  fi
@@ -73172,7 +73250,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  
  cat >>confdefs.h <<_ACEOF
  #define STACK_DIRECTION $ac_cv_c_stack_direction
-@@ -6349,18 +6997,19 @@ fi
+@@ -6349,18 +6997,19 @@
  for ac_header in stdlib.h unistd.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -73200,7 +73278,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -6371,41 +7020,37 @@ $ac_includes_default
+@@ -6371,41 +7020,37 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -73260,7 +73338,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -6414,24 +7059,22 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -6414,24 +7059,22 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -73296,7 +73374,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
    ac_header_preproc=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -6439,9 +7082,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -6439,9 +7082,10 @@
  
    ac_header_preproc=no
  fi
@@ -73309,7 +73387,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -6465,25 +7109,19 @@ echo "$as_me: WARNING: $ac_header:     s
+@@ -6465,25 +7109,19 @@
  echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -73342,7 +73420,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -6499,9 +7137,9 @@ done
+@@ -6499,9 +7137,9 @@
  for ac_func in getpagesize
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -73355,7 +73433,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -6527,68 +7165,60 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -6527,68 +7165,60 @@
  
  #undef $ac_func
  
@@ -73447,7 +73525,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -6597,8 +7227,8 @@ _ACEOF
+@@ -6597,8 +7227,8 @@
  fi
  done
  
@@ -73458,7 +73536,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6640,21 +7270,21 @@ $ac_includes_default
+@@ -6640,21 +7270,21 @@
  #include <fcntl.h>
  #include <sys/mman.h>
  
@@ -73484,7 +73562,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  #   include <sys/param.h>
  #   ifdef EXEC_PAGESIZE
  #    define getpagesize() EXEC_PAGESIZE
-@@ -6693,15 +7323,15 @@ main ()
+@@ -6693,15 +7323,15 @@
    /* First, make a file with some known garbage in it. */
    data = (char *) malloc (pagesize);
    if (!data)
@@ -73503,7 +73581,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
    close (fd);
  
    /* Next, try to mmap the file at a fixed address which already has
-@@ -6709,17 +7339,17 @@ main ()
+@@ -6709,17 +7339,17 @@
       we see the same garbage.  */
    fd = open ("conftest.mmap", O_RDWR);
    if (fd < 0)
@@ -73526,7 +73604,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  
    /* Finally, make sure that changes to the mapped area do not
       percolate back to the file as seen by read().  (This is a bug on
-@@ -6728,24 +7358,33 @@ main ()
+@@ -6728,24 +7358,33 @@
      *(data2 + i) = *(data2 + i) + 1;
    data3 = (char *) malloc (pagesize);
    if (!data3)
@@ -73568,7 +73646,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -6758,11 +7397,13 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -6758,11 +7397,13 @@
  ( exit $ac_status )
  ac_cv_func_mmap_fixed_mapped=no
  fi
@@ -73585,7 +73663,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test $ac_cv_func_mmap_fixed_mapped = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -6786,18 +7427,19 @@ for ac_header in argz.h limits.h locale.
+@@ -6786,18 +7427,19 @@
  unistd.h values.h sys/param.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -73613,7 +73691,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -6808,41 +7450,37 @@ $ac_includes_default
+@@ -6808,41 +7450,37 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -73673,7 +73751,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -6851,24 +7489,22 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -6851,24 +7489,22 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -73709,7 +73787,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
    ac_header_preproc=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -6876,9 +7512,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -6876,9 +7512,10 @@
  
    ac_header_preproc=no
  fi
@@ -73722,7 +73800,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -6902,25 +7539,19 @@ echo "$as_me: WARNING: $ac_header:     s
+@@ -6902,25 +7539,19 @@
  echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -73755,7 +73833,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -6946,9 +7577,9 @@ for ac_func in getcwd munmap putenv sete
+@@ -6946,9 +7577,9 @@
  __argz_count __argz_stringify __argz_next
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -73768,7 +73846,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -6974,68 +7605,60 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -6974,68 +7605,60 @@
  
  #undef $ac_func
  
@@ -73860,7 +73938,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -7050,9 +7673,9 @@ done
+@@ -7050,9 +7673,9 @@
  for ac_func in stpcpy
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -73873,7 +73951,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -7078,68 +7701,60 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -7078,68 +7701,60 @@
  
  #undef $ac_func
  
@@ -73965,7 +74043,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -7158,8 +7773,8 @@ _ACEOF
+@@ -7158,8 +7773,8 @@
     fi
  
     if test $ac_cv_header_locale_h = yes; then
@@ -73976,7 +74054,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "${am_cv_val_LC_MESSAGES+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7179,39 +7794,36 @@ return LC_MESSAGES
+@@ -7179,39 +7794,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -74033,7 +74111,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
      if test $am_cv_val_LC_MESSAGES = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -7220,34 +7832,34 @@ _ACEOF
+@@ -7220,34 +7832,34 @@
  
      fi
    fi
@@ -74084,7 +74162,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  
        nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
        if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
-@@ -7256,17 +7868,17 @@ echo "${ECHO_T}$nls_cv_force_use_gnu_get
+@@ -7256,17 +7868,17 @@
  	CATOBJEXT=
  
  	if test "${ac_cv_header_libintl_h+set}" = set; then
@@ -74108,7 +74186,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -7277,41 +7889,37 @@ $ac_includes_default
+@@ -7277,41 +7889,37 @@
  #include <libintl.h>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -74168,7 +74246,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -7320,24 +7928,22 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -7320,24 +7928,22 @@
  /* end confdefs.h.  */
  #include <libintl.h>
  _ACEOF
@@ -74204,7 +74282,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
    ac_header_preproc=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -7345,9 +7951,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -7345,9 +7951,10 @@
  
    ac_header_preproc=no
  fi
@@ -74217,7 +74295,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -7371,30 +7978,23 @@ echo "$as_me: WARNING: libintl.h:     se
+@@ -7371,30 +7978,23 @@
  echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;}
@@ -74255,7 +74333,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "${gt_cv_func_gettext_libc+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7414,43 +8014,40 @@ return (int) gettext ("")
+@@ -7414,43 +8014,40 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -74318,7 +74396,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7463,59 +8060,56 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -7463,59 +8060,56 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -74401,7 +74479,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "${gt_cv_func_gettext_libintl+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7535,39 +8129,36 @@ return (int) gettext ("")
+@@ -7535,39 +8129,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -74458,7 +74536,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  fi
  
  	   fi
-@@ -7581,8 +8172,8 @@ _ACEOF
+@@ -7581,8 +8172,8 @@
  
  	      # Extract the first word of "msgfmt", so it can be a program name with args.
  set dummy msgfmt; ac_word=$2
@@ -74469,7 +74547,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "${ac_cv_path_MSGFMT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7608,20 +8199,20 @@ esac
+@@ -7608,20 +8199,20 @@
  fi
  MSGFMT="$ac_cv_path_MSGFMT"
  if test -n "$MSGFMT"; then
@@ -74497,7 +74575,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -7647,68 +8238,60 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -7647,68 +8238,60 @@
  
  #undef $ac_func
  
@@ -74589,7 +74667,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -7719,8 +8302,8 @@ done
+@@ -7719,8 +8302,8 @@
  
  		# Extract the first word of "gmsgfmt", so it can be a program name with args.
  set dummy gmsgfmt; ac_word=$2
@@ -74600,7 +74678,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "${ac_cv_path_GMSGFMT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7735,32 +8318,33 @@ do
+@@ -7735,32 +8318,33 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -74642,7 +74720,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "${ac_cv_path_XGETTEXT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7786,11 +8370,11 @@ esac
+@@ -7786,11 +8370,11 @@
  fi
  XGETTEXT="$ac_cv_path_XGETTEXT"
  if test -n "$XGETTEXT"; then
@@ -74658,7 +74736,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  fi
  
  		cat >conftest.$ac_ext <<_ACEOF
-@@ -7810,37 +8394,34 @@ extern int _nl_msg_cat_cntr;
+@@ -7810,37 +8394,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -74711,7 +74789,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
        conftest$ac_exeext conftest.$ac_ext
  		INSTOBJEXT=.mo
  	      fi
-@@ -7862,8 +8443,8 @@ fi
+@@ -7862,8 +8443,8 @@
                  INTLOBJS="\$(GETTOBJS)"
          # Extract the first word of "msgfmt", so it can be a program name with args.
  set dummy msgfmt; ac_word=$2
@@ -74722,7 +74800,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "${ac_cv_path_MSGFMT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7889,17 +8470,17 @@ esac
+@@ -7889,17 +8470,17 @@
  fi
  MSGFMT="$ac_cv_path_MSGFMT"
  if test -n "$MSGFMT"; then
@@ -74746,7 +74824,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "${ac_cv_path_GMSGFMT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7914,32 +8495,33 @@ do
+@@ -7914,32 +8495,33 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -74788,7 +74866,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "${ac_cv_path_XGETTEXT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7965,11 +8547,11 @@ esac
+@@ -7965,11 +8547,11 @@
  fi
  XGETTEXT="$ac_cv_path_XGETTEXT"
  if test -n "$XGETTEXT"; then
@@ -74804,7 +74882,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  fi
  
  
-@@ -7988,8 +8570,8 @@ fi
+@@ -7988,8 +8570,8 @@
  			if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
  	  : ;
  	else
@@ -74815,7 +74893,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  	  XGETTEXT=":"
  	fi
        fi
-@@ -8038,8 +8620,8 @@ _ACEOF
+@@ -8038,8 +8620,8 @@
       if test "x$ALL_LINGUAS" = "x"; then
         LINGUAS=
       else
@@ -74826,7 +74904,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
         NEW_LINGUAS=
         for lang in ${LINGUAS=$ALL_LINGUAS}; do
           case "$ALL_LINGUAS" in
-@@ -8047,8 +8629,8 @@ echo $ECHO_N "checking for catalogs to b
+@@ -8047,8 +8629,8 @@
           esac
         done
         LINGUAS=$NEW_LINGUAS
@@ -74837,7 +74915,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
       fi
  
            if test -n "$LINGUAS"; then
-@@ -8067,17 +8649,17 @@ echo "${ECHO_T}$LINGUAS" >&6
+@@ -8067,17 +8649,17 @@
              if test -f $srcdir/po2tbl.sed.in; then
        if test "$CATOBJEXT" = ".cat"; then
  	 if test "${ac_cv_header_linux_version_h+set}" = set; then
@@ -74861,7 +74939,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8088,41 +8670,37 @@ $ac_includes_default
+@@ -8088,41 +8670,37 @@
  #include <linux/version.h>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -74921,7 +74999,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8131,24 +8709,22 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -8131,24 +8709,22 @@
  /* end confdefs.h.  */
  #include <linux/version.h>
  _ACEOF
@@ -74957,7 +75035,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
    ac_header_preproc=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -8156,9 +8732,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -8156,9 +8732,10 @@
  
    ac_header_preproc=no
  fi
@@ -74970,7 +75048,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -8182,25 +8759,18 @@ echo "$as_me: WARNING: linux/version.h: 
+@@ -8182,25 +8759,18 @@
  echo "$as_me: WARNING: linux/version.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: linux/version.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: linux/version.h: in the future, the compiler will take precedence" >&2;}
@@ -75001,7 +75079,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  
  fi
  if test $ac_cv_header_linux_version_h = yes; then
-@@ -8256,8 +8826,8 @@ for ac_prog in 'bison -y' byacc
+@@ -8256,8 +8826,8 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -75012,7 +75090,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "${ac_cv_prog_YACC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8270,25 +8840,27 @@ do
+@@ -8270,25 +8840,27 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -75045,7 +75123,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
    test -n "$YACC" && break
  done
  test -n "$YACC" || YACC="yacc"
-@@ -8297,8 +8869,8 @@ for ac_prog in flex lex
+@@ -8297,8 +8869,8 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -75056,7 +75134,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "${ac_cv_prog_LEX+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8311,253 +8883,182 @@ do
+@@ -8311,253 +8883,182 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -75410,7 +75488,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test $ac_cv_prog_lex_yytext_pointer = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -8565,23 +9066,24 @@ cat >>confdefs.h <<\_ACEOF
+@@ -8565,23 +9066,24 @@
  _ACEOF
  
  fi
@@ -75443,7 +75521,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  
  
  if test $USE_MAINTAINER_MODE = yes; then
-@@ -8611,18 +9113,19 @@ fi
+@@ -8611,18 +9113,19 @@
  for ac_header in string.h strings.h stdlib.h unistd.h elf-hints.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -75471,7 +75549,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8633,41 +9136,37 @@ $ac_includes_default
+@@ -8633,41 +9136,37 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -75531,7 +75609,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8676,24 +9175,22 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -8676,24 +9175,22 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -75567,7 +75645,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
    ac_header_preproc=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -8701,9 +9198,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -8701,9 +9198,10 @@
  
    ac_header_preproc=no
  fi
@@ -75580,7 +75658,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -8727,25 +9225,19 @@ echo "$as_me: WARNING: $ac_header:     s
+@@ -8727,25 +9225,19 @@
  echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -75613,7 +75691,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -8763,9 +9255,9 @@ done
+@@ -8763,9 +9255,9 @@
  for ac_func in sbrk realpath glob
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -75626,7 +75704,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -8791,68 +9283,60 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -8791,68 +9283,60 @@
  
  #undef $ac_func
  
@@ -75718,7 +75796,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -8869,9 +9353,9 @@ done
+@@ -8869,9 +9353,9 @@
  ac_header_dirent=no
  for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
    as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
@@ -75731,7 +75809,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -8893,38 +9377,35 @@ return 0;
+@@ -8893,38 +9377,35 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -75787,7 +75865,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
-@@ -8936,13 +9417,12 @@ fi
+@@ -8936,13 +9417,12 @@
  done
  # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
  if test $ac_header_dirent = dirent.h; then
@@ -75803,7 +75881,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8950,126 +9430,83 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -8950,126 +9430,83 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -75973,7 +76051,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -9077,123 +9514,81 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -9077,123 +9514,81 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -76140,7 +76218,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "${ld_cv_decl_getopt_unistd_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9213,39 +9608,35 @@ extern int getopt (int, char *const*, co
+@@ -9213,39 +9608,35 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -76196,7 +76274,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test $ld_cv_decl_getopt_unistd_h = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -9264,8 +9655,8 @@ _ACEOF
+@@ -9264,8 +9655,8 @@
   ;;
  esac
  
@@ -76207,7 +76285,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "${ac_cv_have_decl_strstr+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9280,7 +9671,7 @@ int
+@@ -9280,7 +9671,7 @@
  main ()
  {
  #ifndef strstr
@@ -76216,7 +76294,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  #endif
  
    ;
-@@ -9288,38 +9679,34 @@ main ()
+@@ -9288,38 +9679,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -76271,7 +76349,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test $ac_cv_have_decl_strstr = yes; then
  
  cat >>confdefs.h <<_ACEOF
-@@ -9334,8 +9721,8 @@ _ACEOF
+@@ -9334,8 +9721,8 @@
  
  
  fi
@@ -76282,7 +76360,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "${ac_cv_have_decl_free+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9350,7 +9737,7 @@ int
+@@ -9350,7 +9737,7 @@
  main ()
  {
  #ifndef free
@@ -76291,7 +76369,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  #endif
  
    ;
-@@ -9358,38 +9745,34 @@ main ()
+@@ -9358,38 +9745,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -76346,7 +76424,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test $ac_cv_have_decl_free = yes; then
  
  cat >>confdefs.h <<_ACEOF
-@@ -9404,8 +9787,8 @@ _ACEOF
+@@ -9404,8 +9787,8 @@
  
  
  fi
@@ -76357,7 +76435,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "${ac_cv_have_decl_sbrk+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9420,7 +9803,7 @@ int
+@@ -9420,7 +9803,7 @@
  main ()
  {
  #ifndef sbrk
@@ -76366,7 +76444,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  #endif
  
    ;
-@@ -9428,38 +9811,34 @@ main ()
+@@ -9428,38 +9811,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -76421,7 +76499,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test $ac_cv_have_decl_sbrk = yes; then
  
  cat >>confdefs.h <<_ACEOF
-@@ -9474,8 +9853,8 @@ _ACEOF
+@@ -9474,8 +9853,8 @@
  
  
  fi
@@ -76432,7 +76510,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "${ac_cv_have_decl_getenv+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9490,7 +9869,7 @@ int
+@@ -9490,7 +9869,7 @@
  main ()
  {
  #ifndef getenv
@@ -76441,7 +76519,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  #endif
  
    ;
-@@ -9498,38 +9877,34 @@ main ()
+@@ -9498,38 +9877,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -76496,7 +76574,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test $ac_cv_have_decl_getenv = yes; then
  
  cat >>confdefs.h <<_ACEOF
-@@ -9544,8 +9919,8 @@ _ACEOF
+@@ -9544,8 +9919,8 @@
  
  
  fi
@@ -76507,7 +76585,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "${ac_cv_have_decl_environ+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9560,7 +9935,7 @@ int
+@@ -9560,7 +9935,7 @@
  main ()
  {
  #ifndef environ
@@ -76516,7 +76594,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  #endif
  
    ;
-@@ -9568,38 +9943,34 @@ main ()
+@@ -9568,38 +9943,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -76571,7 +76649,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test $ac_cv_have_decl_environ = yes; then
  
  cat >>confdefs.h <<_ACEOF
-@@ -9623,8 +9994,8 @@ fi
+@@ -9623,8 +9994,8 @@
  # broken Microsoft MSVC compiler, which limits the length of string
  # constants, while still supporting pre-ANSI compilers which do not
  # support string concatenation.
@@ -76582,7 +76660,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "${ld_cv_string_concatenation+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9644,39 +10015,35 @@ char *a = "a" "a";
+@@ -9644,39 +10015,35 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -76638,7 +76716,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  if test "$ld_cv_string_concatenation" = "yes"; then
    STRINGIFY=astring.sed
  else
-@@ -9801,8 +10168,10 @@ fi
+@@ -9801,8 +10168,10 @@
  
  
  
@@ -76651,7 +76729,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  cat >confcache <<\_ACEOF
  # This file is a shell script that caches the results of configure
  # tests run on this system so they can be shared between configure
-@@ -9821,39 +10190,58 @@ _ACEOF
+@@ -9821,39 +10190,58 @@
  
  # The following way of writing the cache mishandles newlines in values,
  # but we know of no workaround that is simple, portable, and efficient.
@@ -76726,7 +76804,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
    fi
  fi
  rm -f confcache
-@@ -9862,32 +10250,18 @@ test "x$prefix" = xNONE && prefix=$ac_de
+@@ -9862,32 +10250,18 @@
  # Let make expand exec_prefix.
  test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
  
@@ -76765,7 +76843,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  done
  LIBOBJS=$ac_libobjs
  
-@@ -9939,17 +10313,45 @@ cat >>$CONFIG_STATUS <<\_ACEOF
+@@ -9939,17 +10313,45 @@
  ## M4sh Initialization.  ##
  ## --------------------- ##
  
@@ -76815,7 +76893,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  
  # Support unset when possible.
  if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-@@ -9959,8 +10361,43 @@ else
+@@ -9959,8 +10361,43 @@
  fi
  
  
@@ -76860,7 +76938,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  PS1='$ '
  PS2='> '
  PS4='+ '
-@@ -9974,18 +10411,19 @@ do
+@@ -9974,18 +10411,19 @@
    if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
      eval $as_var=C; export $as_var
    else
@@ -76883,7 +76961,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
    as_basename=basename
  else
    as_basename=false
-@@ -9993,159 +10431,120 @@ fi
+@@ -9993,159 +10431,120 @@
  
  
  # Name of the executable.
@@ -77114,7 +77192,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  
  if mkdir -p . 2>/dev/null; then
    as_mkdir_p=:
-@@ -10154,7 +10553,28 @@ else
+@@ -10154,7 +10553,28 @@
    as_mkdir_p=false
  fi
  
@@ -77144,7 +77222,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  
  # Sed expression to map a string onto a valid CPP name.
  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -10163,31 +10583,14 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P
+@@ -10163,31 +10583,14 @@
  as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
  
  
@@ -77180,7 +77258,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -10195,30 +10598,20 @@ generated by GNU Autoconf 2.59.  Invocat
+@@ -10195,30 +10598,20 @@
    CONFIG_COMMANDS = $CONFIG_COMMANDS
    $ $0 $@
  
@@ -77219,7 +77297,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  ac_cs_usage="\
  \`$as_me' instantiates files from templates according to the
  current configuration.
-@@ -10226,7 +10619,7 @@ current configuration.
+@@ -10226,7 +10619,7 @@
  Usage: $0 [OPTIONS] [FILE]...
  
    -h, --help       print this help, then exit
@@ -77228,7 +77306,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
    -q, --quiet      do not print progress messages
    -d, --debug      don't remove temporary files
        --recheck    update $as_me by reconfiguring in the same conditions
-@@ -10245,19 +10638,21 @@ Configuration commands:
+@@ -10245,19 +10638,21 @@
  $config_commands
  
  Report bugs to <bug-autoconf@gnu.org>."
@@ -77256,7 +77334,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  _ACEOF
  
  cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -10268,39 +10663,24 @@ while test $# != 0
+@@ -10268,39 +10663,24 @@
  do
    case $1 in
    --*=*)
@@ -77302,7 +77380,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
      debug=: ;;
    --file | --fil | --fi | --f )
      $ac_shift
-@@ -10310,18 +10690,24 @@ Try \`$0 --help' for more information." 
+@@ -10310,18 +10690,24 @@
      $ac_shift
      CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
      ac_need_defaults=false;;
@@ -77332,7 +77410,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  
    esac
    shift
-@@ -10337,39 +10723,51 @@ fi
+@@ -10337,39 +10723,51 @@
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF
  if \$ac_cs_recheck; then
@@ -77397,7 +77475,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  # If the user did not use the arguments to specify the items to instantiate,
  # then the envvar interface is used.  Set only those that are not.
  # We use the long form for the default assignment because of an extremely
-@@ -10381,640 +10779,634 @@ if $ac_need_defaults; then
+@@ -10381,640 +10779,634 @@
  fi
  
  # Have a temporary directory for convenience.  Make it in the build tree
@@ -78583,7 +78661,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  # Compute $ac_file's index in $config_headers.
  _am_stamp_count=1
  for _am_header in $config_headers :; do
-@@ -11025,135 +11417,39 @@ for _am_header in $config_headers :; do
+@@ -11025,135 +11417,39 @@
        _am_stamp_count=`expr $_am_stamp_count + 1` ;;
    esac
  done
@@ -78745,7 +78823,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
    # Strip MF so we end up with the name of the file.
    mf=`echo "$mf" | sed -e 's/:.*$//'`
    # Check whether this is an Automake generated Makefile or not.
-@@ -11163,18 +11459,29 @@ echo "$as_me: executing $ac_dest command
+@@ -11163,18 +11459,29 @@
    # each Makefile.in and add a new line on top of each file to say so.
    # So let's grep whole file.
    if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
@@ -78783,7 +78861,7 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
    else
      continue
    fi
-@@ -11196,54 +11503,80 @@ echo X"$mf" |
+@@ -11196,54 +11503,80 @@
         sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
      # Make sure the directory exists.
      test -f "$dirpart/$file" && continue
@@ -78894,10 +78972,11 @@ diff -Nrup binutils-2.17/ld/configure binutils-2.17-atmel/ld/configure
  
  { (exit 0); exit 0; }
  _ACEOF
-diff -Nrup binutils-2.17/ld/configure.tgt binutils-2.17-atmel/ld/configure.tgt
---- binutils-2.17/ld/configure.tgt	2006-04-05 14:41:57.000000000 +0200
-+++ binutils-2.17-atmel/ld/configure.tgt	2007-02-12 15:37:09.000000000 +0100
-@@ -81,8 +81,10 @@ xscale-*-coff)		targ_emul=armcoff ;;
+Index: binutils-2.17/ld/configure.tgt
+===================================================================
+--- binutils-2.17.orig/ld/configure.tgt	2007-06-28 09:19:34.623972808 +0200
++++ binutils-2.17/ld/configure.tgt	2007-06-28 09:19:36.665662424 +0200
+@@ -81,8 +81,10 @@
  xscale-*-elf)		targ_emul=armelf
  			;;
  avr-*-*)		targ_emul=avr2
@@ -78910,9 +78989,10 @@ diff -Nrup binutils-2.17/ld/configure.tgt binutils-2.17-atmel/ld/configure.tgt
  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/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/ld/emulparams/avr32elf_ap7000.sh	2006-11-10 15:11:19.000000000 +0100
+Index: binutils-2.17/ld/emulparams/avr32elf_ap7000.sh
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ binutils-2.17/ld/emulparams/avr32elf_ap7000.sh	2007-06-28 09:19:36.665662424 +0200
 @@ -0,0 +1,34 @@
 +MACHINE=ap
 +SCRIPT_NAME=elf_xip
@@ -78948,9 +79028,10 @@ diff -Nrup binutils-2.17/ld/emulparams/avr32elf_ap7000.sh binutils-2.17-atmel/ld
 +DATA_SEGMENT_END="__heap_start__ = ALIGN(8);
 +  . = ${STACK_ADDR};
 +  __heap_end__ = .;"
-diff -Nrup binutils-2.17/ld/emulparams/avr32elf.sh binutils-2.17-atmel/ld/emulparams/avr32elf.sh
---- binutils-2.17/ld/emulparams/avr32elf.sh	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17-atmel/ld/emulparams/avr32elf.sh	2006-08-04 14:51:23.000000000 +0200
+Index: binutils-2.17/ld/emulparams/avr32elf.sh
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ binutils-2.17/ld/emulparams/avr32elf.sh	2007-06-28 09:19:36.665662424 +0200
 @@ -0,0 +1,24 @@
 +MACHINE=
 +SCRIPT_NAME=elf
@@ -78976,9 +79057,10 @@ diff -Nrup binutils-2.17/ld/emulparams/avr32elf.sh binutils-2.17-atmel/ld/emulpa
 +
 +STACK_ADDR=0x82000000
 +
-diff -Nrup binutils-2.17/ld/emulparams/avr32elf_uc3a0512.sh binutils-2.17-atmel/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/ld/emulparams/avr32elf_uc3a0512.sh	2006-11-10 15:11:19.000000000 +0100
+Index: binutils-2.17/ld/emulparams/avr32elf_uc3a0512.sh
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ binutils-2.17/ld/emulparams/avr32elf_uc3a0512.sh	2007-06-28 09:19:36.666662272 +0200
 @@ -0,0 +1,34 @@
 +MACHINE=uc
 +SCRIPT_NAME=elf_xip
@@ -79014,9 +79096,10 @@ diff -Nrup binutils-2.17/ld/emulparams/avr32elf_uc3a0512.sh binutils-2.17-atmel/
 +DATA_SEGMENT_END="__heap_start__ = ALIGN(8);
 +  . = ${STACK_ADDR};
 +  __heap_end__ = .;"
-diff -Nrup binutils-2.17/ld/emulparams/avr32linux.sh binutils-2.17-atmel/ld/emulparams/avr32linux.sh
---- binutils-2.17/ld/emulparams/avr32linux.sh	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17-atmel/ld/emulparams/avr32linux.sh	2006-08-04 14:51:23.000000000 +0200
+Index: binutils-2.17/ld/emulparams/avr32linux.sh
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ binutils-2.17/ld/emulparams/avr32linux.sh	2007-06-28 09:19:36.666662272 +0200
 @@ -0,0 +1,13 @@
 +ARCH=avr32
 +SCRIPT_NAME=elf
@@ -79031,10 +79114,11 @@ diff -Nrup binutils-2.17/ld/emulparams/avr32linux.sh binutils-2.17-atmel/ld/emul
 +# 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/Makefile.am binutils-2.17-atmel/ld/Makefile.am
---- binutils-2.17/ld/Makefile.am	2006-06-03 06:45:50.000000000 +0200
-+++ binutils-2.17-atmel/ld/Makefile.am	2007-02-12 15:37:09.000000000 +0100
-@@ -133,6 +133,9 @@ ALL_EMULATIONS = \
+Index: binutils-2.17/ld/Makefile.am
+===================================================================
+--- binutils-2.17.orig/ld/Makefile.am	2007-06-28 09:19:35.795794664 +0200
++++ binutils-2.17/ld/Makefile.am	2007-06-28 09:19:36.667662120 +0200
+@@ -133,6 +133,9 @@
  	eavr3.o \
  	eavr4.o \
  	eavr5.o \
@@ -79044,7 +79128,7 @@ diff -Nrup binutils-2.17/ld/Makefile.am binutils-2.17-atmel/ld/Makefile.am
  	ecoff_i860.o \
  	ecoff_sparc.o \
  	ecrisaout.o \
-@@ -595,6 +598,15 @@ eavr5.c: $(srcdir)/emulparams/avr5.sh \
+@@ -595,6 +598,15 @@
    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/avr.sc \
    ${GEN_DEPENDS}
  	${GENSCRIPTS} avr5 "$(tdir_avr2)"
@@ -79060,7 +79144,7 @@ diff -Nrup binutils-2.17/ld/Makefile.am binutils-2.17-atmel/ld/Makefile.am
  ecoff_i860.c: $(srcdir)/emulparams/coff_i860.sh \
    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/i860coff.sc ${GEN_DEPENDS}
  	${GENSCRIPTS} coff_i860 "$(tdir_coff_i860)"
-@@ -1800,7 +1812,9 @@ install-exec-local: ld-new$(EXEEXT)
+@@ -1800,7 +1812,9 @@
  	  || $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) ld-new$(EXEEXT) $(DESTDIR)$(tooldir)/bin/ld$(EXEEXT); \
  	fi
  
@@ -79071,10 +79155,11 @@ diff -Nrup binutils-2.17/ld/Makefile.am binutils-2.17-atmel/ld/Makefile.am
  	$(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/ld/Makefile.in
---- binutils-2.17/ld/Makefile.in	2006-06-03 06:45:50.000000000 +0200
-+++ binutils-2.17-atmel/ld/Makefile.in	2007-02-20 16:07:38.000000000 +0100
-@@ -145,6 +145,7 @@ EMUL_EXTRA_OFILES = @EMUL_EXTRA_OFILES@
+Index: binutils-2.17/ld/Makefile.in
+===================================================================
+--- binutils-2.17.orig/ld/Makefile.in	2007-06-28 09:19:35.796794512 +0200
++++ binutils-2.17/ld/Makefile.in	2007-06-28 09:19:36.668661968 +0200
+@@ -145,6 +145,7 @@
  EXEEXT = @EXEEXT@
  GMOFILES = @GMOFILES@
  GMSGFMT = @GMSGFMT@
@@ -79082,7 +79167,7 @@ diff -Nrup binutils-2.17/ld/Makefile.in binutils-2.17-atmel/ld/Makefile.in
  GT_NO = @GT_NO@
  GT_YES = @GT_YES@
  HDEFINES = @HDEFINES@
-@@ -213,9 +214,8 @@ VERSION = @VERSION@
+@@ -213,9 +214,8 @@
  WARN_CFLAGS = @WARN_CFLAGS@
  XGETTEXT = @XGETTEXT@
  YACC = `if [ -f ../bison/bison ]; then echo ../bison/bison -y -L$(srcdir)/../bison/; else echo @YACC@; fi`
@@ -79093,7 +79178,7 @@ diff -Nrup binutils-2.17/ld/Makefile.in binutils-2.17-atmel/ld/Makefile.in
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
  am__include = @am__include@
-@@ -232,6 +232,7 @@ build_vendor = @build_vendor@
+@@ -232,6 +232,7 @@
  datadir = @datadir@
  datarootdir = @datarootdir@
  docdir = @docdir@
@@ -79101,7 +79186,7 @@ diff -Nrup binutils-2.17/ld/Makefile.in binutils-2.17-atmel/ld/Makefile.in
  exec_prefix = @exec_prefix@
  host = @host@
  host_alias = @host_alias@
-@@ -245,12 +246,15 @@ install_sh = @install_sh@
+@@ -245,12 +246,15 @@
  l = @l@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -79117,7 +79202,7 @@ diff -Nrup binutils-2.17/ld/Makefile.in binutils-2.17-atmel/ld/Makefile.in
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
-@@ -263,7 +267,6 @@ use_sysroot = @use_sysroot@
+@@ -263,7 +267,6 @@
  AUTOMAKE_OPTIONS = cygnus dejagnu
  SUBDIRS = po
  tooldir = $(exec_prefix)/$(target_alias)
@@ -79125,7 +79210,7 @@ diff -Nrup binutils-2.17/ld/Makefile.in binutils-2.17-atmel/ld/Makefile.in
  AM_CFLAGS = $(WARN_CFLAGS)
  
  # We put the scripts in the directory $(scriptdir)/ldscripts.
-@@ -357,6 +360,9 @@ ALL_EMULATIONS = \
+@@ -357,6 +360,9 @@
  	eavr3.o \
  	eavr4.o \
  	eavr5.o \
@@ -79135,7 +79220,7 @@ diff -Nrup binutils-2.17/ld/Makefile.in binutils-2.17-atmel/ld/Makefile.in
  	ecoff_i860.o \
  	ecoff_sparc.o \
  	ecrisaout.o \
-@@ -878,10 +884,13 @@ dist-info: $(INFO_DEPS)
+@@ -878,10 +884,13 @@
  	    $(srcdir)/*) base=`echo "$$base" | sed "s|^$$srcdirstrip/||"`;; \
  	  esac; \
  	  if test -f $$base; then d=.; else d=$(srcdir); fi; \
@@ -79153,7 +79238,7 @@ diff -Nrup binutils-2.17/ld/Makefile.in binutils-2.17-atmel/ld/Makefile.in
  	  done; \
  	done
  
-@@ -1406,6 +1415,15 @@ eavr5.c: $(srcdir)/emulparams/avr5.sh \
+@@ -1406,6 +1415,15 @@
    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/avr.sc \
    ${GEN_DEPENDS}
  	${GENSCRIPTS} avr5 "$(tdir_avr2)"
@@ -79169,7 +79254,7 @@ diff -Nrup binutils-2.17/ld/Makefile.in binutils-2.17-atmel/ld/Makefile.in
  ecoff_i860.c: $(srcdir)/emulparams/coff_i860.sh \
    $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/i860coff.sc ${GEN_DEPENDS}
  	${GENSCRIPTS} coff_i860 "$(tdir_coff_i860)"
-@@ -2587,7 +2605,9 @@ install-exec-local: ld-new$(EXEEXT)
+@@ -2587,7 +2605,9 @@
  	  || $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) ld-new$(EXEEXT) $(DESTDIR)$(tooldir)/bin/ld$(EXEEXT); \
  	fi
  
@@ -79180,9 +79265,10 @@ diff -Nrup binutils-2.17/ld/Makefile.in binutils-2.17-atmel/ld/Makefile.in
  	$(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/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/ld/scripttempl/elf_xip.sc	2006-08-04 14:51:49.000000000 +0200
+Index: binutils-2.17/ld/scripttempl/elf_xip.sc
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ binutils-2.17/ld/scripttempl/elf_xip.sc	2007-06-28 09:19:36.669661816 +0200
 @@ -0,0 +1,456 @@
 +#
 +# Unusual variables checked by this code:
@@ -79640,9 +79726,10 @@ diff -Nrup binutils-2.17/ld/scripttempl/elf_xip.sc binutils-2.17-atmel/ld/script
 +  ${RELOCATING+${STACKNOTE}}
 +}
 +EOF
-diff -Nrup binutils-2.17/ld/testsuite/ld-auto-import/client.c binutils-2.17-atmel/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/ld/testsuite/ld-auto-import/client.c	2006-08-04 14:21:01.000000000 +0200
+Index: binutils-2.17/ld/testsuite/ld-auto-import/client.c
+===================================================================
+--- binutils-2.17.orig/ld/testsuite/ld-auto-import/client.c	2007-06-28 09:19:34.662966880 +0200
++++ binutils-2.17/ld/testsuite/ld-auto-import/client.c	2007-06-28 09:19:36.669661816 +0200
 @@ -1,55 +1,55 @@
 -#include <stdio.h>
 -
@@ -79754,9 +79841,10 @@ diff -Nrup binutils-2.17/ld/testsuite/ld-auto-import/client.c binutils-2.17-atme
 +
 +  return 0;
 +}
-diff -Nrup binutils-2.17/ld/testsuite/ld-auto-import/dll.c binutils-2.17-atmel/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/ld/testsuite/ld-auto-import/dll.c	2006-08-04 14:21:01.000000000 +0200
+Index: binutils-2.17/ld/testsuite/ld-auto-import/dll.c
+===================================================================
+--- binutils-2.17.orig/ld/testsuite/ld-auto-import/dll.c	2007-06-28 09:19:34.669965816 +0200
++++ binutils-2.17/ld/testsuite/ld-auto-import/dll.c	2007-06-28 09:19:36.670661664 +0200
 @@ -1,20 +1,20 @@
 -int var = 123;
 -int foo = 121;
@@ -79798,9 +79886,10 @@ diff -Nrup binutils-2.17/ld/testsuite/ld-auto-import/dll.c binutils-2.17-atmel/l
 +}
 +
 +void (* func_ptr)(void) = print_foo;
-diff -Nrup binutils-2.17/ld/testsuite/ld-avr32/avr32.exp binutils-2.17-atmel/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/ld/testsuite/ld-avr32/avr32.exp	2006-08-04 14:51:39.000000000 +0200
+Index: binutils-2.17/ld/testsuite/ld-avr32/avr32.exp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ binutils-2.17/ld/testsuite/ld-avr32/avr32.exp	2007-06-28 09:19:36.670661664 +0200
 @@ -0,0 +1,25 @@
 +# Expect script for AVR32 ELF linker tests.
 +#   Copyright 2004-2006 Atmel Corporation.
@@ -79827,9 +79916,10 @@ diff -Nrup binutils-2.17/ld/testsuite/ld-avr32/avr32.exp binutils-2.17-atmel/ld/
 +}
 +
 +run_dump_test "pcrel"
-diff -Nrup binutils-2.17/ld/testsuite/ld-avr32/pcrel.d binutils-2.17-atmel/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/ld/testsuite/ld-avr32/pcrel.d	2006-08-04 14:51:39.000000000 +0200
+Index: binutils-2.17/ld/testsuite/ld-avr32/pcrel.d
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ binutils-2.17/ld/testsuite/ld-avr32/pcrel.d	2007-06-28 09:19:36.670661664 +0200
 @@ -0,0 +1,74 @@
 +#name: AVR32 ELF PC-relative external relocs
 +#source: symbols.s
@@ -79905,9 +79995,10 @@ diff -Nrup binutils-2.17/ld/testsuite/ld-avr32/pcrel.d binutils-2.17-atmel/ld/te
 +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/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/ld/testsuite/ld-avr32/pcrel.ld	2006-08-04 14:51:39.000000000 +0200
+Index: binutils-2.17/ld/testsuite/ld-avr32/pcrel.ld
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ binutils-2.17/ld/testsuite/ld-avr32/pcrel.ld	2007-06-28 09:19:36.670661664 +0200
 @@ -0,0 +1,23 @@
 +ENTRY(_start)
 +SECTIONS
@@ -79932,9 +80023,10 @@ diff -Nrup binutils-2.17/ld/testsuite/ld-avr32/pcrel.ld binutils-2.17-atmel/ld/t
 +		*(.text.pcrel21)
 +	}
 +}
-diff -Nrup binutils-2.17/ld/testsuite/ld-avr32/symbols.s binutils-2.17-atmel/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/ld/testsuite/ld-avr32/symbols.s	2006-08-04 14:51:39.000000000 +0200
+Index: binutils-2.17/ld/testsuite/ld-avr32/symbols.s
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ binutils-2.17/ld/testsuite/ld-avr32/symbols.s	2007-06-28 09:19:36.670661664 +0200
 @@ -0,0 +1,20 @@
 +	.text
 +	.global _start
@@ -79956,16 +80048,17 @@ diff -Nrup binutils-2.17/ld/testsuite/ld-avr32/symbols.s binutils-2.17-atmel/ld/
 +	.global extsym21
 +extsym21:
 +	nop
-diff -Nrup binutils-2.17/opcodes/aclocal.m4 binutils-2.17-atmel/opcodes/aclocal.m4
---- binutils-2.17/opcodes/aclocal.m4	2005-09-30 20:05:59.000000000 +0200
-+++ binutils-2.17-atmel/opcodes/aclocal.m4	2007-02-20 16:07:44.000000000 +0100
+Index: binutils-2.17/opcodes/aclocal.m4
+===================================================================
+--- binutils-2.17.orig/opcodes/aclocal.m4	2007-06-28 09:19:34.693962168 +0200
++++ binutils-2.17/opcodes/aclocal.m4	2007-06-28 09:19:36.671661512 +0200
 @@ -1,4 +1,4 @@
 -# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
 +# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
  
  # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
  # 2005  Free Software Foundation, Inc.
-@@ -28,7 +28,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api
+@@ -28,7 +28,7 @@
  # Call AM_AUTOMAKE_VERSION so it can be traced.
  # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
  AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
@@ -79974,9 +80067,10 @@ diff -Nrup binutils-2.17/opcodes/aclocal.m4 binutils-2.17-atmel/opcodes/aclocal.
  
  # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
  
-diff -Nrup binutils-2.17/opcodes/avr32-asm.c binutils-2.17-atmel/opcodes/avr32-asm.c
---- binutils-2.17/opcodes/avr32-asm.c	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17-atmel/opcodes/avr32-asm.c	2006-10-03 17:19:02.000000000 +0200
+Index: binutils-2.17/opcodes/avr32-asm.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ binutils-2.17/opcodes/avr32-asm.c	2007-06-28 09:19:36.671661512 +0200
 @@ -0,0 +1,264 @@
 +/* Assembler interface for AVR32.
 +   Copyright 2005, 2006 Atmel Corporation.
@@ -80242,9 +80336,10 @@ diff -Nrup binutils-2.17/opcodes/avr32-asm.c binutils-2.17-atmel/opcodes/avr32-a
 +    { cr_table,  AVR32_NR_CPREGS,  NULL, N_("coprocessor register expected") },
 +  };
 +#endif
-diff -Nrup binutils-2.17/opcodes/avr32-asm.h binutils-2.17-atmel/opcodes/avr32-asm.h
---- binutils-2.17/opcodes/avr32-asm.h	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17-atmel/opcodes/avr32-asm.h	2006-10-03 17:19:02.000000000 +0200
+Index: binutils-2.17/opcodes/avr32-asm.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ binutils-2.17/opcodes/avr32-asm.h	2007-06-28 09:19:36.672661360 +0200
 @@ -0,0 +1,42 @@
 +/* Assembler interface for AVR32.
 +   Copyright 2005, 2006 Atmel Corporation.
@@ -80288,9 +80383,10 @@ diff -Nrup binutils-2.17/opcodes/avr32-asm.h binutils-2.17-atmel/opcodes/avr32-a
 +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/opcodes/avr32-dis.c
---- binutils-2.17/opcodes/avr32-dis.c	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17-atmel/opcodes/avr32-dis.c	2006-08-04 14:50:49.000000000 +0200
+Index: binutils-2.17/opcodes/avr32-dis.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ binutils-2.17/opcodes/avr32-dis.c	2007-06-28 09:19:36.672661360 +0200
 @@ -0,0 +1,891 @@
 +/* Print AVR32 instructions for GDB and objdump.
 +   Copyright 2005, 2006 Atmel Corporation.
@@ -81183,9 +81279,10 @@ diff -Nrup binutils-2.17/opcodes/avr32-dis.c binutils-2.17-atmel/opcodes/avr32-d
 +{
 +
 +}
-diff -Nrup binutils-2.17/opcodes/avr32-opc.c binutils-2.17-atmel/opcodes/avr32-opc.c
---- binutils-2.17/opcodes/avr32-opc.c	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17-atmel/opcodes/avr32-opc.c	2007-01-29 12:21:57.000000000 +0100
+Index: binutils-2.17/opcodes/avr32-opc.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ binutils-2.17/opcodes/avr32-opc.c	2007-06-28 09:19:36.677660600 +0200
 @@ -0,0 +1,6140 @@
 +/* Opcode tables for AVR32.
 +   Copyright 2005, 2006 Atmel Corporation.
@@ -87327,9 +87424,10 @@ diff -Nrup binutils-2.17/opcodes/avr32-opc.c binutils-2.17-atmel/opcodes/avr32-o
 +#undef NORMAL_MNEMONIC
 +#undef ALIAS_MNEMONIC
 +#undef FP_MNEMONIC
-diff -Nrup binutils-2.17/opcodes/avr32-opc.h binutils-2.17-atmel/opcodes/avr32-opc.h
---- binutils-2.17/opcodes/avr32-opc.h	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.17-atmel/opcodes/avr32-opc.h	2007-01-29 12:21:57.000000000 +0100
+Index: binutils-2.17/opcodes/avr32-opc.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ binutils-2.17/opcodes/avr32-opc.h	2007-06-28 09:19:36.679660296 +0200
 @@ -0,0 +1,1655 @@
 +/* Opcode tables for AVR32.
 +   Copyright 2005, 2006 Atmel Corporation.
@@ -88986,9 +89084,10 @@ diff -Nrup binutils-2.17/opcodes/avr32-opc.h binutils-2.17-atmel/opcodes/avr32-o
 +    AVR32_PARSER__END_
 +  };
 +#define AVR32_NR_PARSERS AVR32_PARSER__END_
-diff -Nrup binutils-2.17/opcodes/config.in binutils-2.17-atmel/opcodes/config.in
---- binutils-2.17/opcodes/config.in	2005-03-31 18:52:53.000000000 +0200
-+++ binutils-2.17-atmel/opcodes/config.in	2007-02-20 16:07:47.000000000 +0100
+Index: binutils-2.17/opcodes/config.in
+===================================================================
+--- binutils-2.17.orig/opcodes/config.in	2007-06-28 09:19:34.719958216 +0200
++++ binutils-2.17/opcodes/config.in	2007-06-28 09:19:36.679660296 +0200
 @@ -138,7 +138,7 @@
  
  /* If using the C implementation of alloca, define if you know the
@@ -89009,9 +89108,10 @@ diff -Nrup binutils-2.17/opcodes/config.in binutils-2.17-atmel/opcodes/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
-diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
---- binutils-2.17/opcodes/configure	2006-02-17 15:36:28.000000000 +0100
-+++ binutils-2.17-atmel/opcodes/configure	2007-02-20 16:07:46.000000000 +0100
+Index: binutils-2.17/opcodes/configure
+===================================================================
+--- binutils-2.17.orig/opcodes/configure	2007-06-28 09:19:35.051907752 +0200
++++ binutils-2.17/opcodes/configure	2007-06-28 09:19:36.690658624 +0200
 @@ -1,25 +1,54 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
@@ -89073,7 +89173,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  
  # Support unset when possible.
  if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-@@ -29,8 +58,43 @@ else
+@@ -29,8 +58,43 @@
  fi
  
  
@@ -89118,7 +89218,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  PS1='$ '
  PS2='> '
  PS4='+ '
-@@ -44,18 +108,19 @@ do
+@@ -44,18 +108,19 @@
    if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
      eval $as_var=C; export $as_var
    else
@@ -89141,7 +89241,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
    as_basename=basename
  else
    as_basename=false
-@@ -63,157 +128,388 @@ fi
+@@ -63,157 +128,388 @@
  
  
  # Name of the executable.
@@ -89628,7 +89728,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  
  if mkdir -p . 2>/dev/null; then
    as_mkdir_p=:
-@@ -222,7 +518,28 @@ else
+@@ -222,7 +518,28 @@
    as_mkdir_p=false
  fi
  
@@ -89658,7 +89758,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  
  # Sed expression to map a string onto a valid CPP name.
  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -231,39 +548,27 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P
+@@ -231,39 +548,27 @@
  as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
  
  
@@ -89701,7 +89801,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  # Identity of this package.
  PACKAGE_NAME=
  PACKAGE_TARNAME=
-@@ -275,42 +580,187 @@ ac_unique_file="z8k-dis.c"
+@@ -275,42 +580,187 @@
  # Factoring default headers for most tests.
  ac_includes_default="\
  #include <stdio.h>
@@ -89903,7 +90003,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  
  # Initialize some variables set by options.
  ac_init_help=
-@@ -337,34 +787,48 @@ x_libraries=NONE
+@@ -337,34 +787,48 @@
  # and all the variables that are supposed to be based on exec_prefix
  # by default will actually change.
  # Use braces instead of parens because sh, perl, etc. also accept them.
@@ -89959,7 +90059,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  
    -bindir | --bindir | --bindi | --bind | --bin | --bi)
      ac_prev=bindir ;;
-@@ -386,33 +850,45 @@ do
+@@ -386,33 +850,45 @@
    --config-cache | -C)
      cache_file=config.cache ;;
  
@@ -90018,7 +90118,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  
    -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
    | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-@@ -439,6 +915,12 @@ do
+@@ -439,6 +915,12 @@
    -host=* | --host=* | --hos=* | --ho=*)
      host_alias=$ac_optarg ;;
  
@@ -90031,7 +90131,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
    -includedir | --includedir | --includedi | --included | --include \
    | --includ | --inclu | --incl | --inc)
      ac_prev=includedir ;;
-@@ -463,13 +945,16 @@ do
+@@ -463,13 +945,16 @@
    | --libexe=* | --libex=* | --libe=*)
      libexecdir=$ac_optarg ;;
  
@@ -90052,7 +90152,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
      localstatedir=$ac_optarg ;;
  
    -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-@@ -534,6 +1019,16 @@ do
+@@ -534,6 +1019,16 @@
    | --progr-tra=* | --program-tr=* | --program-t=*)
      program_transform_name=$ac_optarg ;;
  
@@ -90069,7 +90169,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
    | -silent | --silent | --silen | --sile | --sil)
      silent=yes ;;
-@@ -586,24 +1081,20 @@ do
+@@ -586,24 +1081,20 @@
    -with-* | --with-*)
      ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
      # Reject names that are not valid shell variable names.
@@ -90100,7 +90200,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  
    --x)
      # Obsolete; use --with-x.
-@@ -634,8 +1125,7 @@ Try \`$0 --help' for more information." 
+@@ -634,8 +1125,7 @@
      expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
        { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
     { (exit 1); exit 1; }; }
@@ -90110,7 +90210,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
      export $ac_envvar ;;
  
    *)
-@@ -655,27 +1145,19 @@ if test -n "$ac_prev"; then
+@@ -655,27 +1145,19 @@
     { (exit 1); exit 1; }; }
  fi
  
@@ -90148,7 +90248,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  done
  
  # There might be people who depend on the old broken behavior: `$host'
-@@ -702,74 +1184,76 @@ test -n "$host_alias" && ac_tool_prefix=
+@@ -702,74 +1184,76 @@
  test "$silent" = yes && exec 6>/dev/null
  
  
@@ -90280,7 +90380,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  
  #
  # Report the --help message.
-@@ -798,9 +1282,6 @@ Configuration:
+@@ -798,9 +1282,6 @@
    -n, --no-create         do not create output files
        --srcdir=DIR        find the sources in DIR [configure dir or \`..']
  
@@ -90290,7 +90390,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  Installation directories:
    --prefix=PREFIX         install architecture-independent files in PREFIX
  			  [$ac_default_prefix]
-@@ -818,15 +1299,22 @@ Fine tuning of the installation director
+@@ -818,15 +1299,22 @@
    --bindir=DIR           user executables [EPREFIX/bin]
    --sbindir=DIR          system admin executables [EPREFIX/sbin]
    --libexecdir=DIR       program executables [EPREFIX/libexec]
@@ -90316,7 +90416,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  _ACEOF
  
    cat <<\_ACEOF
-@@ -878,126 +1366,95 @@ Some influential environment variables:
+@@ -878,126 +1366,95 @@
    CFLAGS      C compiler flags
    LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
                nonstandard directory <lib dir>
@@ -90494,7 +90594,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  {
  cat <<_ASUNAME
  ## --------- ##
-@@ -1016,7 +1473,7 @@ uname -v = `(uname -v) 2>/dev/null || ec
+@@ -1016,7 +1473,7 @@
  /bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
  /usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
  /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
@@ -90503,7 +90603,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  /bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
  /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
  /bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-@@ -1030,6 +1487,7 @@ do
+@@ -1030,6 +1487,7 @@
    test -z "$as_dir" && as_dir=.
    echo "PATH: $as_dir"
  done
@@ -90511,7 +90611,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  
  } >&5
  
-@@ -1051,7 +1509,6 @@ _ACEOF
+@@ -1051,7 +1509,6 @@
  ac_configure_args=
  ac_configure_args0=
  ac_configure_args1=
@@ -90519,7 +90619,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  ac_must_keep_next=false
  for ac_pass in 1 2
  do
-@@ -1062,7 +1519,7 @@ do
+@@ -1062,7 +1519,7 @@
      -q | -quiet | --quiet | --quie | --qui | --qu | --q \
      | -silent | --silent | --silen | --sile | --sil)
        continue ;;
@@ -90528,7 +90628,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
        ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
      esac
      case $ac_pass in
-@@ -1084,9 +1541,7 @@ do
+@@ -1084,9 +1541,7 @@
  	  -* ) ac_must_keep_next=true ;;
  	esac
        fi
@@ -90539,7 +90639,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
        ;;
      esac
    done
-@@ -1097,8 +1552,8 @@ $as_unset ac_configure_args1 || test "${
+@@ -1097,8 +1552,8 @@
  # When interrupted or exit'd, cleanup temporary files, and complete
  # config.log.  We remove comments because anyway the quotes in there
  # would cause problems or look ugly.
@@ -90550,7 +90650,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  trap 'exit_status=$?
    # Save into config.log some information that might help in debugging.
    {
-@@ -1111,20 +1566,34 @@ trap 'exit_status=$?
+@@ -1111,20 +1566,34 @@
  _ASBOX
      echo
      # The following way of writing the cache mishandles newlines in values,
@@ -90595,7 +90695,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
      echo
  
      cat <<\_ASBOX
-@@ -1135,22 +1604,28 @@ _ASBOX
+@@ -1135,22 +1604,28 @@
      echo
      for ac_var in $ac_subst_vars
      do
@@ -90631,7 +90731,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
        done | sort
        echo
      fi
-@@ -1162,26 +1637,24 @@ _ASBOX
+@@ -1162,26 +1637,24 @@
  ## ----------- ##
  _ASBOX
        echo
@@ -90663,7 +90763,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  
  # Predefined preprocessor variables.
  
-@@ -1212,14 +1685,17 @@ _ACEOF
+@@ -1212,14 +1685,17 @@
  
  # Let the site file select an alternate cache file if it wants to.
  # Prefer explicitly selected file to automatically selected ones.
@@ -90688,7 +90788,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
    if test -r "$ac_site_file"; then
      { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
  echo "$as_me: loading site script $ac_site_file" >&6;}
-@@ -1235,8 +1711,8 @@ if test -r "$cache_file"; then
+@@ -1235,8 +1711,8 @@
      { echo "$as_me:$LINENO: loading cache $cache_file" >&5
  echo "$as_me: loading cache $cache_file" >&6;}
      case $cache_file in
@@ -90699,7 +90799,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
      esac
    fi
  else
-@@ -1248,12 +1724,11 @@ fi
+@@ -1248,12 +1724,11 @@
  # Check that the precious variables saved in the cache have kept the same
  # value.
  ac_cache_corrupted=false
@@ -90715,7 +90815,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
    case $ac_old_set,$ac_new_set in
      set,)
        { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-@@ -1278,8 +1753,7 @@ echo "$as_me:   current value: $ac_new_v
+@@ -1278,8 +1753,7 @@
    # Pass precious variables to config.status.
    if test "$ac_new_set" = set; then
      case $ac_new_val in
@@ -90725,7 +90825,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
      *) ac_arg=$ac_var=$ac_new_val ;;
      esac
      case " $ac_configure_args " in
-@@ -1296,12 +1770,6 @@ echo "$as_me: error: run \`make distclea
+@@ -1296,12 +1770,6 @@
     { (exit 1); exit 1; }; }
  fi
  
@@ -90738,7 +90838,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  
  
  
-@@ -1318,109 +1786,164 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -1318,109 +1786,164 @@
  
  
  
@@ -90955,7 +91055,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  
  
  # The aliases save the names the user supplied, while $host etc.
-@@ -1437,8 +1960,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -1437,8 +1960,8 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
  set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -90966,7 +91066,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -1451,32 +1974,34 @@ do
+@@ -1451,32 +1974,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -91008,7 +91108,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -1489,36 +2014,51 @@ do
+@@ -1489,36 +2014,51 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -91070,7 +91170,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -1531,74 +2071,34 @@ do
+@@ -1531,74 +2071,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -91154,7 +91254,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -1612,7 +2112,7 @@ do
+@@ -1612,7 +2112,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -91163,7 +91263,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
      if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
         ac_prog_rejected=yes
         continue
-@@ -1623,6 +2123,7 @@ do
+@@ -1623,6 +2123,7 @@
    fi
  done
  done
@@ -91171,7 +91271,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  
  if test $ac_prog_rejected = yes; then
    # We found a bogon in the path, so make sure we never use it.
-@@ -1640,22 +2141,23 @@ fi
+@@ -1640,22 +2141,23 @@
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
@@ -91202,7 +91302,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -1668,36 +2170,38 @@ do
+@@ -1668,36 +2170,38 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -91249,7 +91349,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -1710,29 +2214,45 @@ do
+@@ -1710,29 +2214,45 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -91301,7 +91401,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  fi
  
  fi
-@@ -1745,21 +2265,35 @@ See \`config.log' for more details." >&2
+@@ -1745,21 +2265,35 @@
     { (exit 1); exit 1; }; }
  
  # Provide some information about the compiler.
@@ -91345,7 +91445,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
-@@ -1784,47 +2318,77 @@ ac_clean_files="$ac_clean_files a.out a.
+@@ -1784,47 +2318,77 @@
  # Try to create an executable without -o first, disregard a.out.
  # It will help us diagnose broken compilers, and finding out an intuition
  # of exeext.
@@ -91445,7 +91545,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
-@@ -1836,19 +2400,21 @@ See \`config.log' for more details." >&2
+@@ -1836,19 +2400,21 @@
  fi
  
  ac_exeext=$ac_cv_exeext
@@ -91474,7 +91574,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -1867,22 +2433,27 @@ See \`config.log' for more details." >&2
+@@ -1867,22 +2433,27 @@
      fi
    fi
  fi
@@ -91514,7 +91614,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
-@@ -1893,9 +2464,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -1893,9 +2464,8 @@
  for ac_file in conftest.exe conftest conftest.*; do
    test -f "$ac_file" || continue
    case $ac_file in
@@ -91525,7 +91625,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  	  break;;
      * ) break;;
    esac
-@@ -1909,14 +2479,14 @@ See \`config.log' for more details." >&2
+@@ -1909,14 +2479,14 @@
  fi
  
  rm -f conftest$ac_cv_exeext
@@ -91544,7 +91644,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test "${ac_cv_objext+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -1936,14 +2506,20 @@ main ()
+@@ -1936,14 +2506,20 @@
  }
  _ACEOF
  rm -f conftest.o conftest.obj
@@ -91569,7 +91669,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
      *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
         break;;
    esac
-@@ -1961,12 +2537,12 @@ fi
+@@ -1961,12 +2537,12 @@
  
  rm -f conftest.$ac_cv_objext conftest.$ac_ext
  fi
@@ -91586,7 +91686,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test "${ac_cv_c_compiler_gnu+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -1989,50 +2565,49 @@ main ()
+@@ -1989,50 +2565,49 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -91660,7 +91760,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -2048,38 +2623,118 @@ main ()
+@@ -2048,38 +2623,118 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -91795,7 +91895,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test "$ac_test_CFLAGS" = set; then
    CFLAGS=$ac_save_CFLAGS
  elif test $ac_cv_prog_cc_g = yes; then
-@@ -2095,12 +2750,12 @@ else
+@@ -2095,12 +2750,12 @@
      CFLAGS=
    fi
  fi
@@ -91812,7 +91912,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  ac_save_CC=$CC
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -2134,12 +2789,17 @@ static char *f (char * (*g) (char **, in
+@@ -2134,12 +2789,17 @@
  /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
     function prototypes and stuff, but not '\xHH' hex character constants.
     These don't provoke an error unfortunately, instead are silently treated
@@ -91832,7 +91932,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  int test (int i, double x);
  struct s1 {int (*f) (int a);};
  struct s2 {int (*f) (double a);};
-@@ -2154,335 +2814,144 @@ return f (e, argv, 0) != argv[0]  ||  f 
+@@ -2154,335 +2814,144 @@
    return 0;
  }
  _ACEOF
@@ -92255,7 +92355,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  
  fi
  
-@@ -2506,8 +2975,8 @@ am__api_version="1.9"
+@@ -2506,8 +2975,8 @@
  # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
  # OS/2's system install, which has a completely different semantic
  # ./install, which can be erroneously created by make from ./install.sh.
@@ -92266,7 +92366,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test -z "$INSTALL"; then
  if test "${ac_cv_path_install+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2529,7 +2998,7 @@ case $as_dir/ in
+@@ -2529,7 +2998,7 @@
      # by default.
      for ac_prog in ginstall scoinst install; do
        for ac_exec_ext in '' $ac_executable_extensions; do
@@ -92275,7 +92375,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  	  if test $ac_prog = install &&
  	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
  	    # AIX install.  It has an incompatible calling convention.
-@@ -2548,21 +3017,22 @@ case $as_dir/ in
+@@ -2548,21 +3017,22 @@
      ;;
  esac
  done
@@ -92303,7 +92403,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  
  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
  # It thinks the first close brace ends the variable substitution.
-@@ -2572,8 +3042,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
+@@ -2572,8 +3042,8 @@
  
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
@@ -92314,7 +92414,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  # Just in case
  sleep 1
  echo timestamp > conftest.file
-@@ -2615,20 +3085,20 @@ echo "$as_me: error: newly created file 
+@@ -2615,20 +3085,20 @@
  Check your system clock" >&2;}
     { (exit 1); exit 1; }; }
  fi
@@ -92340,7 +92440,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  
  # expand $ac_aux_dir to an absolute path
  am_aux_dir=`cd $ac_aux_dir && pwd`
-@@ -2680,8 +3150,8 @@ for ac_prog in gawk mawk nawk awk
+@@ -2680,8 +3150,8 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -92351,7 +92451,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test "${ac_cv_prog_AWK+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2694,54 +3164,57 @@ do
+@@ -2694,54 +3164,57 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -92430,7 +92530,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
    SET_MAKE="MAKE=${MAKE-make}"
  fi
  
-@@ -2756,7 +3229,7 @@ rmdir .tst 2>/dev/null
+@@ -2756,7 +3229,7 @@
  
  DEPDIR="${am__leading_dot}deps"
  
@@ -92439,7 +92539,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  
  
  am_make=${MAKE-make}
-@@ -2766,8 +3239,8 @@ am__doit:
+@@ -2766,8 +3239,8 @@
  .PHONY: am__doit
  END
  # If we don't find an include directive, just comment out the code.
@@ -92450,7 +92550,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  am__include="#"
  am__quote=
  _am_result=none
-@@ -2794,15 +3267,15 @@ if test "$am__include" = "#"; then
+@@ -2794,15 +3267,15 @@
  fi
  
  
@@ -92471,7 +92571,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test "x$enable_dependency_tracking" != xno; then
    am_depcomp="$ac_aux_dir/depcomp"
    AMDEPBACKSLASH='\'
-@@ -2877,8 +3350,8 @@ if test "$cross_compiling" != no; then
+@@ -2877,8 +3350,8 @@
    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.
  set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -92482,7 +92582,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test "${ac_cv_prog_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2891,32 +3364,34 @@ do
+@@ -2891,32 +3364,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -92524,7 +92624,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2929,27 +3404,41 @@ do
+@@ -2929,27 +3404,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -92573,7 +92673,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  else
    STRIP="$ac_cv_prog_STRIP"
  fi
-@@ -2970,8 +3459,8 @@ am__tar='${AMTAR} chof - "$$tardir"'; am
+@@ -2970,8 +3459,8 @@
  
  depcc="$CC"   am_compiler_list=
  
@@ -92584,7 +92684,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3060,8 +3549,8 @@ else
+@@ -3060,8 +3549,8 @@
  fi
  
  fi
@@ -92595,7 +92695,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
  
  
-@@ -3082,8 +3571,8 @@ fi
+@@ -3082,8 +3571,8 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
  set dummy ${ac_tool_prefix}ar; ac_word=$2
@@ -92606,7 +92706,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test "${ac_cv_prog_AR+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3096,32 +3585,34 @@ do
+@@ -3096,32 +3585,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -92648,7 +92748,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3134,26 +3625,41 @@ do
+@@ -3134,26 +3625,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -92696,7 +92796,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  else
    AR="$ac_cv_prog_AR"
  fi
-@@ -3161,8 +3667,8 @@ fi
+@@ -3161,8 +3667,8 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
  set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -92707,7 +92807,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test "${ac_cv_prog_RANLIB+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3175,32 +3681,34 @@ do
+@@ -3175,32 +3681,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -92749,7 +92849,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3213,36 +3721,49 @@ do
+@@ -3213,36 +3721,49 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -92809,7 +92909,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  case $enableval in
  yes) enable_shared=yes ;;
  no) enable_shared=no ;;
-@@ -3260,12 +3781,12 @@ no) enable_shared=no ;;
+@@ -3260,12 +3781,12 @@
  esac
  else
    enable_shared=no
@@ -92826,7 +92926,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  case $enableval in
  yes) enable_static=yes ;;
  no) enable_static=no ;;
-@@ -3283,11 +3804,11 @@ no) enable_static=no ;;
+@@ -3283,11 +3804,11 @@
  esac
  else
    enable_static=yes
@@ -92842,7 +92942,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  case $enableval in
  yes) enable_fast_install=yes ;;
  no) enable_fast_install=no ;;
-@@ -3305,20 +3826,21 @@ no) enable_fast_install=no ;;
+@@ -3305,20 +3826,21 @@
  esac
  else
    enable_fast_install=yes
@@ -92871,7 +92971,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
    case $host in
    *-*-mingw*)
      # gcc leaves a trailing carriage return which upsets mingw
-@@ -3347,11 +3869,11 @@ echo $ECHO_N "checking for ld used by GC
+@@ -3347,11 +3869,11 @@
      ;;
    esac
  elif test "$with_gnu_ld" = yes; then
@@ -92887,7 +92987,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  fi
  if test "${lt_cv_path_LD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3380,17 +3902,17 @@ fi
+@@ -3380,17 +3902,17 @@
  
  LD="$lt_cv_path_LD"
  if test -n "$LD"; then
@@ -92911,7 +93011,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test "${lt_cv_prog_gnu_ld+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3401,25 +3923,25 @@ else
+@@ -3401,25 +3923,25 @@
    lt_cv_prog_gnu_ld=no
  fi
  fi
@@ -92945,7 +93045,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test "${lt_cv_path_NM+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3454,22 +3976,22 @@ fi
+@@ -3454,22 +3976,22 @@
  fi
  
  NM="$lt_cv_path_NM"
@@ -92978,7 +93078,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test "${lt_cv_deplibs_check_method+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3631,8 +4153,8 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+@@ -3631,8 +4153,8 @@
  esac
  
  fi
@@ -92989,7 +93089,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  file_magic_cmd=$lt_cv_file_magic_cmd
  deplibs_check_method=$lt_cv_deplibs_check_method
  
-@@ -3642,8 +4164,8 @@ deplibs_check_method=$lt_cv_deplibs_chec
+@@ -3642,8 +4164,8 @@
  # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
  
  # find the maximum length of command line arguments
@@ -93000,7 +93100,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test "${lt_cv_sys_max_cmd_len+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3694,11 +4216,11 @@ else
+@@ -3694,11 +4216,11 @@
  fi
  
  if test -n "$lt_cv_sys_max_cmd_len" ; then
@@ -93016,7 +93116,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  fi
  
  
-@@ -3706,8 +4228,8 @@ fi
+@@ -3706,8 +4228,8 @@
  case $deplibs_check_method in
  file_magic*)
    if test "$file_magic_cmd" = '$MAGIC_CMD'; then
@@ -93027,7 +93127,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3761,17 +4283,17 @@ fi
+@@ -3761,17 +4283,17 @@
  
  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  if test -n "$MAGIC_CMD"; then
@@ -93051,7 +93151,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3825,11 +4347,11 @@ fi
+@@ -3825,11 +4347,11 @@
  
  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  if test -n "$MAGIC_CMD"; then
@@ -93067,7 +93167,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  fi
  
    else
-@@ -3844,8 +4366,8 @@ esac
+@@ -3844,8 +4366,8 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
  set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -93078,7 +93178,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test "${ac_cv_prog_RANLIB+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3858,32 +4380,34 @@ do
+@@ -3858,32 +4380,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -93120,7 +93220,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3896,27 +4420,41 @@ do
+@@ -3896,27 +4420,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -93169,7 +93269,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  else
    RANLIB="$ac_cv_prog_RANLIB"
  fi
-@@ -3924,8 +4462,8 @@ fi
+@@ -3924,8 +4462,8 @@
  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.
  set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -93180,7 +93280,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test "${ac_cv_prog_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3938,32 +4476,34 @@ do
+@@ -3938,32 +4476,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -93222,7 +93322,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3976,27 +4516,41 @@ do
+@@ -3976,27 +4516,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -93271,7 +93371,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  else
    STRIP="$ac_cv_prog_STRIP"
  fi
-@@ -4011,22 +4565,22 @@ test "$GCC" = yes && libtool_flags="$lib
+@@ -4011,22 +4565,22 @@
  test "$lt_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
  
  
@@ -93301,7 +93401,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  test x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic"
  test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
  
-@@ -4035,7 +4589,7 @@ test x"$pic_mode" = xno && libtool_flags
+@@ -4035,7 +4589,7 @@
  case $host in
  *-*-irix6*)
    # Find out which ABI we are using.
@@ -93310,7 +93410,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-@@ -4140,13 +4694,12 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*li
+@@ -4140,13 +4694,12 @@
    # On SCO OpenServer 5, we need -belf to get full-featured binaries.
    SAVE_CFLAGS="$CFLAGS"
    CFLAGS="$CFLAGS -belf"
@@ -93326,7 +93426,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
       ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4169,35 +4722,32 @@ main ()
+@@ -4169,35 +4722,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -93377,7 +93477,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
        conftest$ac_exeext conftest.$ac_ext
       ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -4206,8 +4756,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
+@@ -4206,8 +4756,8 @@
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  fi
@@ -93388,7 +93488,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
    if test x"$lt_cv_cc_needs_belf" != x"yes"; then
      # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
      CFLAGS="$SAVE_CFLAGS"
-@@ -4237,39 +4787,58 @@ _ACEOF
+@@ -4237,39 +4787,58 @@
  
  # The following way of writing the cache mishandles newlines in values,
  # but we know of no workaround that is simple, portable, and efficient.
@@ -93463,7 +93563,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
    fi
  fi
  rm -f confcache
-@@ -4295,8 +4864,8 @@ if test -r "$cache_file"; then
+@@ -4295,8 +4864,8 @@
      { echo "$as_me:$LINENO: loading cache $cache_file" >&5
  echo "$as_me: loading cache $cache_file" >&6;}
      case $cache_file in
@@ -93474,7 +93574,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
      esac
    fi
  else
-@@ -4322,10 +4891,9 @@ exec 5>>./config.log
+@@ -4322,10 +4891,9 @@
  
  
  
@@ -93487,7 +93587,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
    yes | "") { { echo "$as_me:$LINENO: error: enable-targets option must specify target names or 'all'" >&5
  echo "$as_me: error: enable-targets option must specify target names or 'all'" >&2;}
     { (exit 1); exit 1; }; }
-@@ -4333,31 +4901,32 @@ echo "$as_me: error: enable-targets opti
+@@ -4333,31 +4901,32 @@
    no)       enable_targets= ;;
    *)        enable_targets=$enableval ;;
  esac
@@ -93528,7 +93628,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  
  # Enable -Werror by default when using gcc
  if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
-@@ -4374,10 +4943,9 @@ if test "${GCC}" = yes ; then
+@@ -4374,10 +4943,9 @@
    WARN_CFLAGS="${GCC_WARN_CFLAGS}"
  fi
  
@@ -93541,7 +93641,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
    yes)	WARN_CFLAGS="${GCC_WARN_CFLAGS}";;
    no)	if test "${GCC}" = yes ; then
  	  WARN_CFLAGS="-w"
-@@ -4388,7 +4956,8 @@ if test "${enable_build_warnings+set}" =
+@@ -4388,7 +4956,8 @@
          WARN_CFLAGS="${t} ${GCC_WARN_CFLAGS}";;
    *)    WARN_CFLAGS=`echo "${enableval}" | sed -e "s/,/ /g"`;;
  esac
@@ -93551,7 +93651,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  
  if test x"$silent" != x"yes" && test x"$WARN_CFLAGS" != x""; then
    echo "Setting warning flags = $WARN_CFLAGS" 6>&1
-@@ -4398,7 +4967,7 @@ fi
+@@ -4398,7 +4967,7 @@
  
  
  
@@ -93560,7 +93660,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  
  
  if test -z "$target" ; then
-@@ -4407,17 +4976,17 @@ echo "$as_me: error: Unrecognized target
+@@ -4407,17 +4976,17 @@
     { (exit 1); exit 1; }; }
  fi
  
@@ -93586,7 +93686,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  
  
  if test $USE_MAINTAINER_MODE = yes; then
-@@ -4446,21 +5015,21 @@ esac
+@@ -4446,21 +5015,21 @@
    *) target_noncanonical=${target_alias} ;;
  esac
  
@@ -93616,7 +93716,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  
  
  if test $install_libbfd_p = yes; then
-@@ -4499,8 +5068,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -4499,8 +5068,8 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
  set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -93627,7 +93727,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4513,32 +5082,34 @@ do
+@@ -4513,32 +5082,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -93669,7 +93769,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4551,36 +5122,51 @@ do
+@@ -4551,36 +5122,51 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -93731,7 +93831,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4593,74 +5179,34 @@ do
+@@ -4593,74 +5179,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -93815,7 +93915,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4674,7 +5220,7 @@ do
+@@ -4674,7 +5220,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -93824,7 +93924,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
      if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
         ac_prog_rejected=yes
         continue
-@@ -4685,6 +5231,7 @@ do
+@@ -4685,6 +5231,7 @@
    fi
  done
  done
@@ -93832,7 +93932,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  
  if test $ac_prog_rejected = yes; then
    # We found a bogon in the path, so make sure we never use it.
-@@ -4702,22 +5249,23 @@ fi
+@@ -4702,22 +5249,23 @@
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
@@ -93863,7 +93963,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4730,36 +5278,38 @@ do
+@@ -4730,36 +5278,38 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -93910,7 +94010,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4772,29 +5322,45 @@ do
+@@ -4772,29 +5322,45 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -93962,7 +94062,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  fi
  
  fi
-@@ -4807,27 +5373,41 @@ See \`config.log' for more details." >&2
+@@ -4807,27 +5373,41 @@
     { (exit 1); exit 1; }; }
  
  # Provide some information about the compiler.
@@ -94014,7 +94114,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test "${ac_cv_c_compiler_gnu+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4850,50 +5430,49 @@ main ()
+@@ -4850,50 +5430,49 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -94088,7 +94188,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -4909,59 +5488,139 @@ main ()
+@@ -4909,59 +5488,139 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -94264,7 +94364,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  ac_save_CC=$CC
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -4995,12 +5654,17 @@ static char *f (char * (*g) (char **, in
+@@ -4995,12 +5654,17 @@
  /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
     function prototypes and stuff, but not '\xHH' hex character constants.
     These don't provoke an error unfortunately, instead are silently treated
@@ -94284,7 +94384,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  int test (int i, double x);
  struct s1 {int (*f) (int a);};
  struct s2 {int (*f) (double a);};
-@@ -5015,205 +5679,57 @@ return f (e, argv, 0) != argv[0]  ||  f 
+@@ -5015,205 +5679,57 @@
    return 0;
  }
  _ACEOF
@@ -94520,7 +94620,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -5225,8 +5741,8 @@ ALL_LINGUAS="fr sv tr es da de id pt_BR 
+@@ -5225,8 +5741,8 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
  set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -94531,7 +94631,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test "${ac_cv_prog_RANLIB+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5239,32 +5755,34 @@ do
+@@ -5239,32 +5755,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -94573,7 +94673,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5277,27 +5795,41 @@ do
+@@ -5277,27 +5795,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -94622,7 +94722,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  else
    RANLIB="$ac_cv_prog_RANLIB"
  fi
-@@ -5307,8 +5839,8 @@ ac_cpp='$CPP $CPPFLAGS'
+@@ -5307,8 +5839,8 @@
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -94633,7 +94733,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  # On Suns, sometimes $CPP names a directory.
  if test -n "$CPP" && test -d "$CPP"; then
    CPP=
-@@ -5342,24 +5874,22 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -5342,24 +5874,22 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -94669,7 +94769,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
    :
  else
    echo "$as_me: failed program was:" >&5
-@@ -5368,9 +5898,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -5368,9 +5898,10 @@
    # Broken: fails on valid input.
  continue
  fi
@@ -94681,7 +94781,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -5380,24 +5911,22 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -5380,24 +5911,22 @@
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
@@ -94717,7 +94817,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
    # Broken: success on invalid input.
  continue
  else
-@@ -5408,6 +5937,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -5408,6 +5937,7 @@
  ac_preproc_ok=:
  break
  fi
@@ -94725,7 +94825,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -5425,8 +5955,8 @@ fi
+@@ -5425,8 +5955,8 @@
  else
    ac_cv_prog_CPP=$CPP
  fi
@@ -94736,7 +94836,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  ac_preproc_ok=false
  for ac_c_preproc_warn_flag in '' yes
  do
-@@ -5449,24 +5979,22 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -5449,24 +5979,22 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -94772,7 +94872,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
    :
  else
    echo "$as_me: failed program was:" >&5
-@@ -5475,9 +6003,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -5475,9 +6003,10 @@
    # Broken: fails on valid input.
  continue
  fi
@@ -94784,7 +94884,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -5487,24 +6016,22 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -5487,24 +6016,22 @@
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
@@ -94820,7 +94920,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
    # Broken: success on invalid input.
  continue
  else
-@@ -5515,6 +6042,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -5515,6 +6042,7 @@
  ac_preproc_ok=:
  break
  fi
@@ -94828,7 +94928,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -5537,79 +6065,222 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
+@@ -5537,79 +6065,222 @@
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
@@ -95113,7 +95213,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -5661,6 +6332,7 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -5661,6 +6332,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <ctype.h>
@@ -95121,7 +95221,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  #if ((' ' & 0x0FF) == 0x020)
  # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
  # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -5680,18 +6352,27 @@ main ()
+@@ -5680,18 +6352,27 @@
    for (i = 0; i < 256; i++)
      if (XOR (islower (i), ISLOWER (i))
  	|| toupper (i) != TOUPPER (i))
@@ -95155,7 +95255,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5704,12 +6385,14 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -5704,12 +6385,14 @@
  ( exit $ac_status )
  ac_cv_header_stdc=no
  fi
@@ -95173,7 +95273,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test $ac_cv_header_stdc = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -5718,8 +6401,8 @@ _ACEOF
+@@ -5718,8 +6401,8 @@
  
  fi
  
@@ -95184,7 +95284,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test "${ac_cv_c_const+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5737,10 +6420,10 @@ main ()
+@@ -5737,10 +6420,10 @@
  #ifndef __cplusplus
    /* Ultrix mips cc rejects this.  */
    typedef int charset[2];
@@ -95198,7 +95298,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
    /* NEC SVR4.0.2 mips cc rejects this.  */
    struct point {int x, y;};
    static struct point const zero = {0,0};
-@@ -5749,16 +6432,17 @@ main ()
+@@ -5749,16 +6432,17 @@
       an arm of an if-expression whose if-part is not a constant
       expression */
    const char *g = "string";
@@ -95220,7 +95320,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
    }
    { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
      int x[] = {25, 17};
-@@ -5777,7 +6461,9 @@ main ()
+@@ -5777,7 +6461,9 @@
    }
    { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
      const int foo = 10;
@@ -95230,7 +95330,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  #endif
  
    ;
-@@ -5785,38 +6471,34 @@ main ()
+@@ -5785,38 +6471,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -95285,7 +95385,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test $ac_cv_c_const = no; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -5825,8 +6507,8 @@ _ACEOF
+@@ -5825,8 +6507,8 @@
  
  fi
  
@@ -95296,7 +95396,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test "${ac_cv_c_inline+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5846,39 +6528,37 @@ $ac_kw foo_t foo () {return 0; }
+@@ -5846,39 +6528,37 @@
  
  _ACEOF
  rm -f conftest.$ac_objext
@@ -95354,7 +95454,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  
  
  case $ac_cv_c_inline in
-@@ -5910,9 +6590,9 @@ for ac_header in sys/types.h sys/stat.h 
+@@ -5910,9 +6590,9 @@
  		  inttypes.h stdint.h unistd.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -95367,7 +95467,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -5926,38 +6606,35 @@ $ac_includes_default
+@@ -5926,38 +6606,35 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -95423,7 +95523,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -5968,8 +6645,8 @@ fi
+@@ -5968,8 +6645,8 @@
  done
  
  
@@ -95434,7 +95534,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test "${ac_cv_type_off_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5980,62 +6657,59 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -5980,62 +6657,59 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -95519,7 +95619,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test "${ac_cv_type_size_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6046,64 +6720,61 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -6046,64 +6720,61 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -95606,7 +95706,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test "${ac_cv_working_alloca_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6118,44 +6789,42 @@ int
+@@ -6118,44 +6789,42 @@
  main ()
  {
  char *p = (char *) alloca (2 * sizeof (int));
@@ -95669,7 +95769,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test $ac_cv_working_alloca_h = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -6164,8 +6833,8 @@ _ACEOF
+@@ -6164,8 +6833,8 @@
  
  fi
  
@@ -95680,7 +95780,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test "${ac_cv_func_alloca_works+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6182,7 +6851,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -6182,7 +6851,7 @@
  #  include <malloc.h>
  #  define alloca _alloca
  # else
@@ -95689,7 +95789,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  #   include <alloca.h>
  #  else
  #   ifdef _AIX
-@@ -6200,44 +6869,42 @@ int
+@@ -6200,44 +6869,42 @@
  main ()
  {
  char *p = (char *) alloca (1);
@@ -95752,7 +95852,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  
  if test $ac_cv_func_alloca_works = yes; then
  
-@@ -6251,15 +6918,15 @@ else
+@@ -6251,15 +6918,15 @@
  # contain a buggy version.  If you still want to use their alloca,
  # use ar to extract alloca.o from them instead of compiling alloca.c.
  
@@ -95771,7 +95871,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test "${ac_cv_os_cray+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6269,7 +6936,7 @@ _ACEOF
+@@ -6269,7 +6936,7 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -95780,7 +95880,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  webecray
  #else
  wenotbecray
-@@ -6285,14 +6952,14 @@ fi
+@@ -6285,14 +6952,14 @@
  rm -f conftest*
  
  fi
@@ -95800,7 +95900,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -6318,68 +6985,60 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -6318,68 +6985,60 @@
  
  #undef $ac_func
  
@@ -95892,7 +95992,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test `eval echo '${'$as_ac_var'}'` = yes; then
  
  cat >>confdefs.h <<_ACEOF
-@@ -6392,8 +7051,8 @@ fi
+@@ -6392,8 +7051,8 @@
    done
  fi
  
@@ -95903,7 +96003,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test "${ac_cv_c_stack_direction+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6406,6 +7065,7 @@ _ACEOF
+@@ -6406,6 +7065,7 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -95911,7 +96011,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  int
  find_stack_direction ()
  {
-@@ -6423,17 +7083,26 @@ find_stack_direction ()
+@@ -6423,17 +7083,26 @@
  int
  main ()
  {
@@ -95943,7 +96043,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -6446,11 +7115,13 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -6446,11 +7115,13 @@
  ( exit $ac_status )
  ac_cv_c_stack_direction=-1
  fi
@@ -95960,7 +96060,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  
  cat >>confdefs.h <<_ACEOF
  #define STACK_DIRECTION $ac_cv_c_stack_direction
-@@ -6464,18 +7135,19 @@ fi
+@@ -6464,18 +7135,19 @@
  for ac_header in stdlib.h unistd.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -95988,7 +96088,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -6486,41 +7158,37 @@ $ac_includes_default
+@@ -6486,41 +7158,37 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -96048,7 +96148,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -6529,24 +7197,22 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -6529,24 +7197,22 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -96084,7 +96184,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
    ac_header_preproc=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -6554,9 +7220,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -6554,9 +7220,10 @@
  
    ac_header_preproc=no
  fi
@@ -96097,7 +96197,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -6580,25 +7247,19 @@ echo "$as_me: WARNING: $ac_header:     s
+@@ -6580,25 +7247,19 @@
  echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -96130,7 +96230,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -6614,9 +7275,9 @@ done
+@@ -6614,9 +7275,9 @@
  for ac_func in getpagesize
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -96143,7 +96243,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -6642,68 +7303,60 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -6642,68 +7303,60 @@
  
  #undef $ac_func
  
@@ -96235,7 +96335,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -6712,8 +7365,8 @@ _ACEOF
+@@ -6712,8 +7365,8 @@
  fi
  done
  
@@ -96246,7 +96346,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6755,21 +7408,21 @@ $ac_includes_default
+@@ -6755,21 +7408,21 @@
  #include <fcntl.h>
  #include <sys/mman.h>
  
@@ -96272,7 +96372,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  #   include <sys/param.h>
  #   ifdef EXEC_PAGESIZE
  #    define getpagesize() EXEC_PAGESIZE
-@@ -6808,15 +7461,15 @@ main ()
+@@ -6808,15 +7461,15 @@
    /* First, make a file with some known garbage in it. */
    data = (char *) malloc (pagesize);
    if (!data)
@@ -96291,7 +96391,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
    close (fd);
  
    /* Next, try to mmap the file at a fixed address which already has
-@@ -6824,17 +7477,17 @@ main ()
+@@ -6824,17 +7477,17 @@
       we see the same garbage.  */
    fd = open ("conftest.mmap", O_RDWR);
    if (fd < 0)
@@ -96314,7 +96414,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  
    /* Finally, make sure that changes to the mapped area do not
       percolate back to the file as seen by read().  (This is a bug on
-@@ -6843,24 +7496,33 @@ main ()
+@@ -6843,24 +7496,33 @@
      *(data2 + i) = *(data2 + i) + 1;
    data3 = (char *) malloc (pagesize);
    if (!data3)
@@ -96356,7 +96456,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -6873,11 +7535,13 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -6873,11 +7535,13 @@
  ( exit $ac_status )
  ac_cv_func_mmap_fixed_mapped=no
  fi
@@ -96373,7 +96473,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test $ac_cv_func_mmap_fixed_mapped = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -6901,18 +7565,19 @@ for ac_header in argz.h limits.h locale.
+@@ -6901,18 +7565,19 @@
  unistd.h values.h sys/param.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -96401,7 +96501,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -6923,41 +7588,37 @@ $ac_includes_default
+@@ -6923,41 +7588,37 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -96461,7 +96561,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -6966,24 +7627,22 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -6966,24 +7627,22 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -96497,7 +96597,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
    ac_header_preproc=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -6991,9 +7650,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -6991,9 +7650,10 @@
  
    ac_header_preproc=no
  fi
@@ -96510,7 +96610,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -7017,25 +7677,19 @@ echo "$as_me: WARNING: $ac_header:     s
+@@ -7017,25 +7677,19 @@
  echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -96543,7 +96643,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -7061,9 +7715,9 @@ for ac_func in getcwd munmap putenv sete
+@@ -7061,9 +7715,9 @@
  __argz_count __argz_stringify __argz_next
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -96556,7 +96656,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -7089,68 +7743,60 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -7089,68 +7743,60 @@
  
  #undef $ac_func
  
@@ -96648,7 +96748,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -7165,9 +7811,9 @@ done
+@@ -7165,9 +7811,9 @@
  for ac_func in stpcpy
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -96661,7 +96761,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -7193,68 +7839,60 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -7193,68 +7839,60 @@
  
  #undef $ac_func
  
@@ -96753,7 +96853,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -7273,8 +7911,8 @@ _ACEOF
+@@ -7273,8 +7911,8 @@
     fi
  
     if test $ac_cv_header_locale_h = yes; then
@@ -96764,7 +96864,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test "${am_cv_val_LC_MESSAGES+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7294,39 +7932,36 @@ return LC_MESSAGES
+@@ -7294,39 +7932,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -96821,7 +96921,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
      if test $am_cv_val_LC_MESSAGES = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -7335,34 +7970,34 @@ _ACEOF
+@@ -7335,34 +7970,34 @@
  
      fi
    fi
@@ -96872,7 +96972,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  
        nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
        if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
-@@ -7371,17 +8006,17 @@ echo "${ECHO_T}$nls_cv_force_use_gnu_get
+@@ -7371,17 +8006,17 @@
  	CATOBJEXT=
  
  	if test "${ac_cv_header_libintl_h+set}" = set; then
@@ -96896,7 +96996,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -7392,41 +8027,37 @@ $ac_includes_default
+@@ -7392,41 +8027,37 @@
  #include <libintl.h>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -96956,7 +97056,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -7435,24 +8066,22 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -7435,24 +8066,22 @@
  /* end confdefs.h.  */
  #include <libintl.h>
  _ACEOF
@@ -96992,7 +97092,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
    ac_header_preproc=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -7460,9 +8089,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -7460,9 +8089,10 @@
  
    ac_header_preproc=no
  fi
@@ -97005,7 +97105,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -7486,30 +8116,23 @@ echo "$as_me: WARNING: libintl.h:     se
+@@ -7486,30 +8116,23 @@
  echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;}
@@ -97043,7 +97143,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test "${gt_cv_func_gettext_libc+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7529,43 +8152,40 @@ return (int) gettext ("")
+@@ -7529,43 +8152,40 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -97106,7 +97206,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7578,59 +8198,56 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -7578,59 +8198,56 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -97189,7 +97289,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test "${gt_cv_func_gettext_libintl+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7650,39 +8267,36 @@ return (int) gettext ("")
+@@ -7650,39 +8267,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -97246,7 +97346,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  fi
  
  	   fi
-@@ -7696,8 +8310,8 @@ _ACEOF
+@@ -7696,8 +8310,8 @@
  
  	      # Extract the first word of "msgfmt", so it can be a program name with args.
  set dummy msgfmt; ac_word=$2
@@ -97257,7 +97357,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test "${ac_cv_path_MSGFMT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7723,20 +8337,20 @@ esac
+@@ -7723,20 +8337,20 @@
  fi
  MSGFMT="$ac_cv_path_MSGFMT"
  if test -n "$MSGFMT"; then
@@ -97285,7 +97385,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -7762,68 +8376,60 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -7762,68 +8376,60 @@
  
  #undef $ac_func
  
@@ -97377,7 +97477,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -7834,8 +8440,8 @@ done
+@@ -7834,8 +8440,8 @@
  
  		# Extract the first word of "gmsgfmt", so it can be a program name with args.
  set dummy gmsgfmt; ac_word=$2
@@ -97388,7 +97488,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test "${ac_cv_path_GMSGFMT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7850,32 +8456,33 @@ do
+@@ -7850,32 +8456,33 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -97430,7 +97530,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test "${ac_cv_path_XGETTEXT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7901,11 +8508,11 @@ esac
+@@ -7901,11 +8508,11 @@
  fi
  XGETTEXT="$ac_cv_path_XGETTEXT"
  if test -n "$XGETTEXT"; then
@@ -97446,7 +97546,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  fi
  
  		cat >conftest.$ac_ext <<_ACEOF
-@@ -7925,37 +8532,34 @@ extern int _nl_msg_cat_cntr;
+@@ -7925,37 +8532,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -97499,7 +97599,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
        conftest$ac_exeext conftest.$ac_ext
  		INSTOBJEXT=.mo
  	      fi
-@@ -7977,8 +8581,8 @@ fi
+@@ -7977,8 +8581,8 @@
                  INTLOBJS="\$(GETTOBJS)"
          # Extract the first word of "msgfmt", so it can be a program name with args.
  set dummy msgfmt; ac_word=$2
@@ -97510,7 +97610,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test "${ac_cv_path_MSGFMT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8004,17 +8608,17 @@ esac
+@@ -8004,17 +8608,17 @@
  fi
  MSGFMT="$ac_cv_path_MSGFMT"
  if test -n "$MSGFMT"; then
@@ -97534,7 +97634,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test "${ac_cv_path_GMSGFMT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8029,32 +8633,33 @@ do
+@@ -8029,32 +8633,33 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -97576,7 +97676,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test "${ac_cv_path_XGETTEXT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8080,11 +8685,11 @@ esac
+@@ -8080,11 +8685,11 @@
  fi
  XGETTEXT="$ac_cv_path_XGETTEXT"
  if test -n "$XGETTEXT"; then
@@ -97592,7 +97692,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  fi
  
  
-@@ -8103,8 +8708,8 @@ fi
+@@ -8103,8 +8708,8 @@
  			if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
  	  : ;
  	else
@@ -97603,7 +97703,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  	  XGETTEXT=":"
  	fi
        fi
-@@ -8153,8 +8758,8 @@ _ACEOF
+@@ -8153,8 +8758,8 @@
       if test "x$ALL_LINGUAS" = "x"; then
         LINGUAS=
       else
@@ -97614,7 +97714,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
         NEW_LINGUAS=
         for lang in ${LINGUAS=$ALL_LINGUAS}; do
           case "$ALL_LINGUAS" in
-@@ -8162,8 +8767,8 @@ echo $ECHO_N "checking for catalogs to b
+@@ -8162,8 +8767,8 @@
           esac
         done
         LINGUAS=$NEW_LINGUAS
@@ -97625,7 +97725,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
       fi
  
            if test -n "$LINGUAS"; then
-@@ -8182,17 +8787,17 @@ echo "${ECHO_T}$LINGUAS" >&6
+@@ -8182,17 +8787,17 @@
              if test -f $srcdir/po2tbl.sed.in; then
        if test "$CATOBJEXT" = ".cat"; then
  	 if test "${ac_cv_header_linux_version_h+set}" = set; then
@@ -97649,7 +97749,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8203,41 +8808,37 @@ $ac_includes_default
+@@ -8203,41 +8808,37 @@
  #include <linux/version.h>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -97709,7 +97809,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8246,24 +8847,22 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -8246,24 +8847,22 @@
  /* end confdefs.h.  */
  #include <linux/version.h>
  _ACEOF
@@ -97745,7 +97845,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
    ac_header_preproc=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -8271,9 +8870,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -8271,9 +8870,10 @@
  
    ac_header_preproc=no
  fi
@@ -97758,7 +97858,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -8297,25 +8897,18 @@ echo "$as_me: WARNING: linux/version.h: 
+@@ -8297,25 +8897,18 @@
  echo "$as_me: WARNING: linux/version.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: linux/version.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: linux/version.h: in the future, the compiler will take precedence" >&2;}
@@ -97789,7 +97889,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  
  fi
  if test $ac_cv_header_linux_version_h = yes; then
-@@ -8380,8 +8973,8 @@ fi
+@@ -8380,8 +8973,8 @@
  if test "x$cross_compiling" = "xno"; then
    EXEEXT_FOR_BUILD='$(EXEEXT)'
  else
@@ -97800,7 +97900,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test "${bfd_cv_build_exeext+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8398,8 +8991,8 @@ else
+@@ -8398,8 +8991,8 @@
       rm -f conftest*
       test x"${bfd_cv_build_exeext}" = x && bfd_cv_build_exeext=no
  fi
@@ -97811,7 +97911,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
    EXEEXT_FOR_BUILD=""
    test x"${bfd_cv_build_exeext}" != xno && EXEEXT_FOR_BUILD=${bfd_cv_build_exeext}
  fi
-@@ -8419,8 +9012,8 @@ fi
+@@ -8419,8 +9012,8 @@
  # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
  # OS/2's system install, which has a completely different semantic
  # ./install, which can be erroneously created by make from ./install.sh.
@@ -97822,7 +97922,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test -z "$INSTALL"; then
  if test "${ac_cv_path_install+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -8442,7 +9035,7 @@ case $as_dir/ in
+@@ -8442,7 +9035,7 @@
      # by default.
      for ac_prog in ginstall scoinst install; do
        for ac_exec_ext in '' $ac_executable_extensions; do
@@ -97831,7 +97931,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  	  if test $ac_prog = install &&
  	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
  	    # AIX install.  It has an incompatible calling convention.
-@@ -8461,21 +9054,22 @@ case $as_dir/ in
+@@ -8461,21 +9054,22 @@
      ;;
  esac
  done
@@ -97859,7 +97959,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  
  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
  # It thinks the first close brace ends the variable substitution.
-@@ -8492,18 +9086,19 @@ test -z "$INSTALL_DATA" && INSTALL_DATA=
+@@ -8492,18 +9086,19 @@
  for ac_header in string.h strings.h stdlib.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -97887,7 +97987,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8514,41 +9109,37 @@ $ac_includes_default
+@@ -8514,41 +9109,37 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -97947,7 +98047,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8557,24 +9148,22 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -8557,24 +9148,22 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -97983,7 +98083,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
    ac_header_preproc=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -8582,9 +9171,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -8582,9 +9171,10 @@
  
    ac_header_preproc=no
  fi
@@ -97996,7 +98096,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -8608,25 +9198,19 @@ echo "$as_me: WARNING: $ac_header:     s
+@@ -8608,25 +9198,19 @@
  echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -98029,7 +98129,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -8639,8 +9223,8 @@ fi
+@@ -8639,8 +9223,8 @@
  done
  
  
@@ -98040,7 +98140,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test "${ac_cv_have_decl_basename+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8655,7 +9239,7 @@ int
+@@ -8655,7 +9239,7 @@
  main ()
  {
  #ifndef basename
@@ -98049,7 +98149,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  #endif
  
    ;
-@@ -8663,38 +9247,34 @@ main ()
+@@ -8663,38 +9247,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -98104,7 +98204,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  if test $ac_cv_have_decl_basename = yes; then
  
  cat >>confdefs.h <<_ACEOF
-@@ -8715,10 +9295,9 @@ fi
+@@ -8715,10 +9295,9 @@
  cgen_maint=no
  cgendir='$(srcdir)/../cgen'
  
@@ -98117,7 +98217,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
    yes)	cgen_maint=yes ;;
    no)	cgen_maint=no ;;
    *)
-@@ -8729,7 +9308,8 @@ if test "${enable_cgen_maint+set}" = set
+@@ -8729,7 +9308,8 @@
  	cgendir=${cgen_maint}/lib/cgen
  	;;
  esac
@@ -98127,7 +98227,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  
  if test x${cgen_maint} = xyes; then
    CGEN_MAINT_TRUE=
-@@ -8805,6 +9385,7 @@ if test x${all_targets} = xfalse ; then
+@@ -8805,6 +9385,7 @@
  	bfd_arc_arch)		ta="$ta arc-dis.lo arc-opc.lo arc-ext.lo" ;;
  	bfd_arm_arch)		ta="$ta arm-dis.lo" ;;
  	bfd_avr_arch)		ta="$ta avr-dis.lo" ;;
@@ -98135,7 +98235,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  	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" ;;
-@@ -8922,9 +9503,9 @@ fi
+@@ -8922,9 +9503,9 @@
  
  
  
@@ -98147,7 +98247,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  
  cat >confcache <<\_ACEOF
  # This file is a shell script that caches the results of configure
-@@ -8944,39 +9525,58 @@ _ACEOF
+@@ -8944,39 +9525,58 @@
  
  # The following way of writing the cache mishandles newlines in values,
  # but we know of no workaround that is simple, portable, and efficient.
@@ -98222,7 +98322,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
    fi
  fi
  rm -f confcache
-@@ -8985,32 +9585,18 @@ test "x$prefix" = xNONE && prefix=$ac_de
+@@ -8985,32 +9585,18 @@
  # Let make expand exec_prefix.
  test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
  
@@ -98261,7 +98361,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  done
  LIBOBJS=$ac_libobjs
  
-@@ -9076,17 +9662,45 @@ cat >>$CONFIG_STATUS <<\_ACEOF
+@@ -9076,17 +9662,45 @@
  ## M4sh Initialization.  ##
  ## --------------------- ##
  
@@ -98311,7 +98411,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  
  # Support unset when possible.
  if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-@@ -9096,8 +9710,43 @@ else
+@@ -9096,8 +9710,43 @@
  fi
  
  
@@ -98356,7 +98456,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  PS1='$ '
  PS2='> '
  PS4='+ '
-@@ -9111,18 +9760,19 @@ do
+@@ -9111,18 +9760,19 @@
    if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
      eval $as_var=C; export $as_var
    else
@@ -98379,7 +98479,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
    as_basename=basename
  else
    as_basename=false
-@@ -9130,159 +9780,120 @@ fi
+@@ -9130,159 +9780,120 @@
  
  
  # Name of the executable.
@@ -98610,7 +98710,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  
  if mkdir -p . 2>/dev/null; then
    as_mkdir_p=:
-@@ -9291,7 +9902,28 @@ else
+@@ -9291,7 +9902,28 @@
    as_mkdir_p=false
  fi
  
@@ -98640,7 +98740,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  
  # Sed expression to map a string onto a valid CPP name.
  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -9300,31 +9932,14 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P
+@@ -9300,31 +9932,14 @@
  as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
  
  
@@ -98676,7 +98776,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -9332,30 +9947,20 @@ generated by GNU Autoconf 2.59.  Invocat
+@@ -9332,30 +9947,20 @@
    CONFIG_COMMANDS = $CONFIG_COMMANDS
    $ $0 $@
  
@@ -98715,7 +98815,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  ac_cs_usage="\
  \`$as_me' instantiates files from templates according to the
  current configuration.
-@@ -9363,7 +9968,7 @@ current configuration.
+@@ -9363,7 +9968,7 @@
  Usage: $0 [OPTIONS] [FILE]...
  
    -h, --help       print this help, then exit
@@ -98724,7 +98824,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
    -q, --quiet      do not print progress messages
    -d, --debug      don't remove temporary files
        --recheck    update $as_me by reconfiguring in the same conditions
-@@ -9382,19 +9987,21 @@ Configuration commands:
+@@ -9382,19 +9987,21 @@
  $config_commands
  
  Report bugs to <bug-autoconf@gnu.org>."
@@ -98752,7 +98852,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  _ACEOF
  
  cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -9405,39 +10012,24 @@ while test $# != 0
+@@ -9405,39 +10012,24 @@
  do
    case $1 in
    --*=*)
@@ -98798,7 +98898,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
      debug=: ;;
    --file | --fil | --fi | --f )
      $ac_shift
-@@ -9447,18 +10039,24 @@ Try \`$0 --help' for more information." 
+@@ -9447,18 +10039,24 @@
      $ac_shift
      CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
      ac_need_defaults=false;;
@@ -98828,7 +98928,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  
    esac
    shift
-@@ -9474,40 +10072,52 @@ fi
+@@ -9474,40 +10072,52 @@
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF
  if \$ac_cs_recheck; then
@@ -98894,7 +98994,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  # If the user did not use the arguments to specify the items to instantiate,
  # then the envvar interface is used.  Set only those that are not.
  # We use the long form for the default assignment because of an extremely
-@@ -9519,635 +10129,623 @@ if $ac_need_defaults; then
+@@ -9519,635 +10129,623 @@
  fi
  
  # Have a temporary directory for convenience.  Make it in the build tree
@@ -100064,7 +100164,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  # Compute $ac_file's index in $config_headers.
  _am_stamp_count=1
  for _am_header in $config_headers :; do
-@@ -10158,135 +10756,39 @@ for _am_header in $config_headers :; do
+@@ -10158,135 +10756,39 @@
        _am_stamp_count=`expr $_am_stamp_count + 1` ;;
    esac
  done
@@ -100226,7 +100326,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
    # Strip MF so we end up with the name of the file.
    mf=`echo "$mf" | sed -e 's/:.*$//'`
    # Check whether this is an Automake generated Makefile or not.
-@@ -10296,18 +10798,29 @@ echo "$as_me: executing $ac_dest command
+@@ -10296,18 +10798,29 @@
    # each Makefile.in and add a new line on top of each file to say so.
    # So let's grep whole file.
    if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
@@ -100264,7 +100364,7 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
    else
      continue
    fi
-@@ -10329,54 +10842,80 @@ echo X"$mf" |
+@@ -10329,54 +10842,80 @@
         sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
      # Make sure the directory exists.
      test -f "$dirpart/$file" && continue
@@ -100375,10 +100475,11 @@ diff -Nrup binutils-2.17/opcodes/configure binutils-2.17-atmel/opcodes/configure
  
  { (exit 0); exit 0; }
  _ACEOF
-diff -Nrup binutils-2.17/opcodes/configure.in binutils-2.17-atmel/opcodes/configure.in
---- binutils-2.17/opcodes/configure.in	2006-02-17 15:36:28.000000000 +0100
-+++ binutils-2.17-atmel/opcodes/configure.in	2007-02-12 15:37:09.000000000 +0100
-@@ -157,6 +157,7 @@ if test x${all_targets} = xfalse ; then
+Index: binutils-2.17/opcodes/configure.in
+===================================================================
+--- binutils-2.17.orig/opcodes/configure.in	2007-06-28 09:19:34.730956544 +0200
++++ binutils-2.17/opcodes/configure.in	2007-06-28 09:19:36.691658472 +0200
+@@ -157,6 +157,7 @@
  	bfd_arc_arch)		ta="$ta arc-dis.lo arc-opc.lo arc-ext.lo" ;;
  	bfd_arm_arch)		ta="$ta arm-dis.lo" ;;
  	bfd_avr_arch)		ta="$ta avr-dis.lo" ;;
@@ -100386,9 +100487,10 @@ diff -Nrup binutils-2.17/opcodes/configure.in binutils-2.17-atmel/opcodes/config
  	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/opcodes/disassemble.c
---- binutils-2.17/opcodes/disassemble.c	2006-02-17 15:36:28.000000000 +0100
-+++ binutils-2.17-atmel/opcodes/disassemble.c	2007-02-12 15:37:09.000000000 +0100
+Index: binutils-2.17/opcodes/disassemble.c
+===================================================================
+--- binutils-2.17.orig/opcodes/disassemble.c	2007-06-28 09:19:34.735955784 +0200
++++ binutils-2.17/opcodes/disassemble.c	2007-06-28 09:19:36.691658472 +0200
 @@ -24,6 +24,7 @@
  #define ARCH_arc
  #define ARCH_arm
@@ -100397,7 +100499,7 @@ diff -Nrup binutils-2.17/opcodes/disassemble.c binutils-2.17-atmel/opcodes/disas
  #define ARCH_bfin
  #define ARCH_cris
  #define ARCH_crx
-@@ -121,6 +122,11 @@ disassembler (abfd)
+@@ -121,6 +122,11 @@
        disassemble = print_insn_avr;
        break;
  #endif
@@ -100409,7 +100511,7 @@ diff -Nrup binutils-2.17/opcodes/disassemble.c binutils-2.17-atmel/opcodes/disas
  #ifdef ARCH_bfin
      case bfd_arch_bfin:
        disassemble = print_insn_bfin;
-@@ -433,6 +439,9 @@ disassembler_usage (stream)
+@@ -433,6 +439,9 @@
  #ifdef ARCH_powerpc
    print_ppc_disassembler_options (stream);
  #endif
@@ -100419,10 +100521,11 @@ diff -Nrup binutils-2.17/opcodes/disassemble.c binutils-2.17-atmel/opcodes/disas
  
    return;
  }
-diff -Nrup binutils-2.17/opcodes/Makefile.am binutils-2.17-atmel/opcodes/Makefile.am
---- binutils-2.17/opcodes/Makefile.am	2006-04-06 23:49:35.000000000 +0200
-+++ binutils-2.17-atmel/opcodes/Makefile.am	2007-02-12 15:37:09.000000000 +0100
-@@ -29,6 +29,7 @@ LIBIBERTY = ../libiberty/libiberty.a
+Index: binutils-2.17/opcodes/Makefile.am
+===================================================================
+--- binutils-2.17.orig/opcodes/Makefile.am	2007-06-28 09:19:34.741954872 +0200
++++ binutils-2.17/opcodes/Makefile.am	2007-06-28 09:19:36.692658320 +0200
+@@ -29,6 +29,7 @@
  # Header files.
  HFILES = \
  	cgen-ops.h cgen-types.h \
@@ -100430,7 +100533,7 @@ diff -Nrup binutils-2.17/opcodes/Makefile.am binutils-2.17-atmel/opcodes/Makefil
  	fr30-desc.h fr30-opc.h \
  	frv-desc.h frv-opc.h \
  	h8500-opc.h \
-@@ -58,6 +59,9 @@ CFILES = \
+@@ -58,6 +59,9 @@
  	arc-ext.c \
  	arm-dis.c \
  	avr-dis.c \
@@ -100440,7 +100543,7 @@ diff -Nrup binutils-2.17/opcodes/Makefile.am binutils-2.17-atmel/opcodes/Makefil
  	bfin-dis.c \
  	cgen-asm.c \
  	cgen-bitset.c \
-@@ -200,6 +204,9 @@ ALL_MACHINES = \
+@@ -200,6 +204,9 @@
  	arc-ext.lo \
  	arm-dis.lo \
  	avr-dis.lo \
@@ -100450,7 +100553,7 @@ diff -Nrup binutils-2.17/opcodes/Makefile.am binutils-2.17-atmel/opcodes/Makefil
  	bfin-dis.lo \
  	cgen-asm.lo \
  	cgen-bitset.lo \
-@@ -624,6 +631,15 @@ arm-dis.lo: arm-dis.c sysdep.h config.h 
+@@ -624,6 +631,15 @@
  avr-dis.lo: avr-dis.c sysdep.h config.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/dis-asm.h $(BFD_H) $(INCDIR)/symcat.h opintl.h \
    $(INCDIR)/libiberty.h $(INCDIR)/opcode/avr.h
@@ -100466,9 +100569,10 @@ diff -Nrup binutils-2.17/opcodes/Makefile.am binutils-2.17-atmel/opcodes/Makefil
  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/opcodes/Makefile.in
---- binutils-2.17/opcodes/Makefile.in	2006-04-06 23:49:35.000000000 +0200
-+++ binutils-2.17-atmel/opcodes/Makefile.in	2007-02-20 16:07:47.000000000 +0100
+Index: binutils-2.17/opcodes/Makefile.in
+===================================================================
+--- binutils-2.17.orig/opcodes/Makefile.in	2007-06-28 09:19:34.747953960 +0200
++++ binutils-2.17/opcodes/Makefile.in	2007-06-28 09:19:36.693658168 +0200
 @@ -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.
@@ -100484,7 +100588,7 @@ diff -Nrup binutils-2.17/opcodes/Makefile.in binutils-2.17-atmel/opcodes/Makefil
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
  VPATH = @srcdir@
-@@ -132,6 +130,7 @@ EXEEXT = @EXEEXT@
+@@ -132,6 +130,7 @@
  EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
  GMOFILES = @GMOFILES@
  GMSGFMT = @GMSGFMT@
@@ -100492,7 +100596,7 @@ diff -Nrup binutils-2.17/opcodes/Makefile.in binutils-2.17-atmel/opcodes/Makefil
  GT_NO = @GT_NO@
  GT_YES = @GT_YES@
  HDEFINES = @HDEFINES@
-@@ -180,10 +179,7 @@ WARN_CFLAGS = @WARN_CFLAGS@
+@@ -180,10 +179,7 @@
  WIN32LDFLAGS = @WIN32LDFLAGS@
  WIN32LIBADD = @WIN32LIBADD@
  XGETTEXT = @XGETTEXT@
@@ -100503,7 +100607,7 @@ diff -Nrup binutils-2.17/opcodes/Makefile.in binutils-2.17-atmel/opcodes/Makefil
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
  am__include = @am__include@
-@@ -202,6 +198,9 @@ build_os = @build_os@
+@@ -202,6 +198,9 @@
  build_vendor = @build_vendor@
  cgendir = @cgendir@
  datadir = @datadir@
@@ -100513,7 +100617,7 @@ diff -Nrup binutils-2.17/opcodes/Makefile.in binutils-2.17-atmel/opcodes/Makefil
  exec_prefix = @exec_prefix@
  host = @host@
  host_alias = @host_alias@
-@@ -209,18 +208,22 @@ host_cpu = @host_cpu@
+@@ -209,18 +208,22 @@
  host_noncanonical = @host_noncanonical@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -100536,7 +100640,7 @@ diff -Nrup binutils-2.17/opcodes/Makefile.in binutils-2.17-atmel/opcodes/Makefil
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
-@@ -247,6 +250,7 @@ LIBIBERTY = ../libiberty/libiberty.a
+@@ -247,6 +250,7 @@
  # Header files.
  HFILES = \
  	cgen-ops.h cgen-types.h \
@@ -100544,7 +100648,7 @@ diff -Nrup binutils-2.17/opcodes/Makefile.in binutils-2.17-atmel/opcodes/Makefil
  	fr30-desc.h fr30-opc.h \
  	frv-desc.h frv-opc.h \
  	h8500-opc.h \
-@@ -277,6 +281,9 @@ CFILES = \
+@@ -277,6 +281,9 @@
  	arc-ext.c \
  	arm-dis.c \
  	avr-dis.c \
@@ -100554,7 +100658,7 @@ diff -Nrup binutils-2.17/opcodes/Makefile.in binutils-2.17-atmel/opcodes/Makefil
  	bfin-dis.c \
  	cgen-asm.c \
  	cgen-bitset.c \
-@@ -419,6 +426,9 @@ ALL_MACHINES = \
+@@ -419,6 +426,9 @@
  	arc-ext.lo \
  	arm-dis.lo \
  	avr-dis.lo \
@@ -100564,7 +100668,7 @@ diff -Nrup binutils-2.17/opcodes/Makefile.in binutils-2.17-atmel/opcodes/Makefil
  	bfin-dis.lo \
  	cgen-asm.lo \
  	cgen-bitset.lo \
-@@ -1166,6 +1176,15 @@ arm-dis.lo: arm-dis.c sysdep.h config.h 
+@@ -1166,6 +1176,15 @@
  avr-dis.lo: avr-dis.c sysdep.h config.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/dis-asm.h $(BFD_H) $(INCDIR)/symcat.h opintl.h \
    $(INCDIR)/libiberty.h $(INCDIR)/opcode/avr.h
@@ -100580,9 +100684,10 @@ diff -Nrup binutils-2.17/opcodes/Makefile.in binutils-2.17-atmel/opcodes/Makefil
  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 -Nur binutils-2.17/config.sub binutils-2.17-owrt/config.sub
---- binutils-2.17/config.sub	2006-01-16 18:34:37.000000000 +0100
-+++ binutils-2.17-owrt/config.sub	2007-06-04 16:30:34.000000000 +0200
+Index: binutils-2.17/config.sub
+===================================================================
+--- binutils-2.17.orig/config.sub	2007-06-28 09:19:34.753953048 +0200
++++ binutils-2.17/config.sub	2007-06-28 09:19:36.694658016 +0200
 @@ -241,6 +241,7 @@
  	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
  	| am33_2.0 \
diff --git a/toolchain/binutils/patches/2.17/501-avr32-sreldyn-fix.patch b/toolchain/binutils/patches/2.17/501-avr32-sreldyn-fix.patch
index 4331cb0fe0..84e295b736 100644
--- a/toolchain/binutils/patches/2.17/501-avr32-sreldyn-fix.patch
+++ b/toolchain/binutils/patches/2.17/501-avr32-sreldyn-fix.patch
@@ -1,7 +1,7 @@
-Index: binutils/bfd/elf32-avr32.c
+Index: binutils-2.17/bfd/elf32-avr32.c
 ===================================================================
---- binutils/bfd/elf32-avr32.c	(revision 8769)
-+++ binutils/bfd/elf32-avr32.c	(working copy)
+--- binutils-2.17.orig/bfd/elf32-avr32.c	2007-06-28 09:19:36.580675344 +0200
++++ binutils-2.17/bfd/elf32-avr32.c	2007-06-28 09:19:38.494384416 +0200
 @@ -298,7 +298,7 @@
    /* Shortcuts to get to dynamic linker sections.  */
    asection *sgot;
diff --git a/toolchain/binutils/patches/2.17/502-avr32-bfd-dont-allow-direct-refs-to-bss.patch b/toolchain/binutils/patches/2.17/502-avr32-bfd-dont-allow-direct-refs-to-bss.patch
index 0a99091a3d..847f269be0 100644
--- a/toolchain/binutils/patches/2.17/502-avr32-bfd-dont-allow-direct-refs-to-bss.patch
+++ b/toolchain/binutils/patches/2.17/502-avr32-bfd-dont-allow-direct-refs-to-bss.patch
@@ -1,8 +1,8 @@
-Index: binutils/bfd/elf32-avr32.c
+Index: binutils-2.17/bfd/elf32-avr32.c
 ===================================================================
---- binutils/bfd/elf32-avr32.c	(revision 24565)
-+++ binutils/bfd/elf32-avr32.c	(working copy)
-@@ -2446,9 +2446,13 @@
+--- binutils-2.17.orig/bfd/elf32-avr32.c	2007-06-28 09:19:38.494384416 +0200
++++ binutils-2.17/bfd/elf32-avr32.c	2007-06-28 09:19:38.682355840 +0200
+@@ -2449,9 +2449,13 @@
  	     after the relaxation code is done, so we can't really
  	     trust that our "distance" is correct.  There's really no
  	     easy solution to this problem, so we'll just disallow
diff --git a/toolchain/binutils/patches/2.17/503-avr32-fix-got-offset-init.patch b/toolchain/binutils/patches/2.17/503-avr32-fix-got-offset-init.patch
index d39492cdc5..f35550d8e0 100644
--- a/toolchain/binutils/patches/2.17/503-avr32-fix-got-offset-init.patch
+++ b/toolchain/binutils/patches/2.17/503-avr32-fix-got-offset-init.patch
@@ -1,6 +1,8 @@
---- a/bfd/elf32-avr32.c	2007-05-31 17:00:13.000000000 +0200
-+++ b/bfd/elf32-avr32.c	2007-05-30 14:07:25.000000000 +0200
-@@ -395,6 +395,8 @@ avr32_elf_link_hash_table_create(bfd *ab
+Index: binutils-2.17/bfd/elf32-avr32.c
+===================================================================
+--- binutils-2.17.orig/bfd/elf32-avr32.c	2007-06-28 09:19:38.682355840 +0200
++++ binutils-2.17/bfd/elf32-avr32.c	2007-06-28 09:19:38.869327416 +0200
+@@ -395,6 +395,8 @@
    /* Prevent the BFD core from creating bogus got_entry pointers */
    ret->root.init_got_refcount.glist = NULL;
    ret->root.init_plt_refcount.glist = NULL;
diff --git a/toolchain/binutils/patches/2.17/601-cris-errormsg.patch b/toolchain/binutils/patches/2.17/601-cris-errormsg.patch
index 97564b9afa..ff5bcd73dc 100644
--- a/toolchain/binutils/patches/2.17/601-cris-errormsg.patch
+++ b/toolchain/binutils/patches/2.17/601-cris-errormsg.patch
@@ -1,6 +1,7 @@
-diff -urN binutils-2.17.orig/bfd/elf32-cris.c binutils-2.17/bfd/elf32-cris.c
---- binutils-2.17.orig/bfd/elf32-cris.c	2007-06-12 22:23:24.000000000 +0200
-+++ binutils-2.17/bfd/elf32-cris.c	2007-06-12 22:28:54.000000000 +0200
+Index: binutils-2.17/bfd/elf32-cris.c
+===================================================================
+--- binutils-2.17.orig/bfd/elf32-cris.c	2007-06-28 09:19:34.053059600 +0200
++++ binutils-2.17/bfd/elf32-cris.c	2007-06-28 09:19:39.058298688 +0200
 @@ -2709,12 +2709,12 @@
  	      && (sec->flags & SEC_READONLY) != 0)
  	    {
diff --git a/toolchain/binutils/patches/2.17/702-binutils-skip-comments.patch b/toolchain/binutils/patches/2.17/702-binutils-skip-comments.patch
index 9ef7a7c9ec..16b2dafd58 100644
--- a/toolchain/binutils/patches/2.17/702-binutils-skip-comments.patch
+++ b/toolchain/binutils/patches/2.17/702-binutils-skip-comments.patch
@@ -57,9 +57,11 @@ Andreas.
 	* read.c (read_a_source_file): Ignore unknown text after line
 	comment character.  Fix misleading comment.
 
---- binutils/gas/read.c.~1.78.~	2004-04-23 08:58:23.000000000 +0200
-+++ binutils/gas/read.c	2004-04-23 21:49:01.000000000 +0200
-@@ -950,10 +950,14 @@ read_a_source_file (char *name)
+Index: binutils-2.17/gas/read.c
+===================================================================
+--- binutils-2.17.orig/gas/read.c	2007-06-28 09:19:34.031062944 +0200
++++ binutils-2.17/gas/read.c	2007-06-28 09:19:39.244270416 +0200
+@@ -1008,10 +1008,14 @@
  	      unsigned int new_length;
  	      char *tmp_buf = 0;
  
@@ -76,7 +78,7 @@ Andreas.
  	      s += 4;
  
  	      sb_new (&sbuf);
-@@ -1052,7 +1056,7 @@ read_a_source_file (char *name)
+@@ -1110,7 +1114,7 @@
  	    continue;
  #endif
  	  input_line_pointer--;
@@ -85,9 +87,3 @@ Andreas.
  	  demand_empty_rest_of_line ();
  	}
  
-
--- 
-Andreas Schwab, SuSE Labs, schwab@suse.de
-SuSE Linux AG, Maxfeldstra&#xC3;e 5, 90409 N&#xC3;rnberg, Germany
-Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
-"And now for something completely different."
-- 
2.30.2