Merge branch 'master' of git+ssh://openadk.org/git/openadk

263 files changed, 6790 insertions, 110435 deletions

diff --git a/BUGS b/BUGS
index e8cfe7fd2..f964caf6b 100644
--- a/BUGS
+++ b/BUGS
@@ -1,2 +1,3 @@
 - uclibc N64 ABI on mips64{,el} targets does not work, nptl fork problem
-- cris foxboard-lx is broken, binutils failure
+- microblaze big endian: network card emulation fails
+- microblaze: qemu reboot not working
diff --git a/Config.in b/Config.in
index d0d151222..ece9ea287 100644
--- a/Config.in
+++ b/Config.in
@@ -18,8 +18,6 @@ mainmenu "OpenADK Configuration"
 config ADK_CHOOSE_TARGET_SYSTEM
 	boolean
 	default y if ADK_CHOOSE_TARGET_SYSTEM_ARM
-	default y if ADK_CHOOSE_TARGET_SYSTEM_AVR32
-	default y if ADK_CHOOSE_TARGET_SYSTEM_CRIS
 	default y if ADK_CHOOSE_TARGET_SYSTEM_M68K
 	default y if ADK_CHOOSE_TARGET_SYSTEM_MICROBLAZE
 	default y if ADK_CHOOSE_TARGET_SYSTEM_MIPS
diff --git a/Makefile b/Makefile
index c0032b4cc..4a8da9685 100644
--- a/Makefile
+++ b/Makefile
@@ -211,11 +211,9 @@ NO_ERROR=0
 	    -e 's/armeb.*/armeb/g' \
 	    -e 's/arm.*/arm/g' \
 	    -e 's/m68k.*/m68k/' \
-	    -e 's/v850.*/v850/g' \
 	    -e 's/sh[234]/sh/' \
 	    -e 's/mips-.*/mips/' \
 	    -e 's/mipsel-.*/mipsel/' \
-	    -e 's/cris.*/cris/' \
 	    -e 's/i[3-9]86/x86/' \
 	    )" >>prereq.mk
 	@echo 'CC_FOR_BUILD:=${CC}' >>prereq.mk
diff --git a/mk/build.mk b/mk/build.mk
index 5286212ce..400125694 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -22,6 +22,8 @@ DEFCONFIG=		ADK_DEBUG=n \
 			ADK_PACKAGE_E2FSCK_STATIC=n \
 			ADK_PACKAGE_KEXECINIT=n \
 			ADK_PACKAGE_INSTALLER=n \
+			ADK_PACKAGE_HEIMDAL_SERVER=n \
+			ADK_PACKAGE_LIBHEIMDAL=n \
 			ADK_PACKAGE_LM_SENSORS_DETECT=n \
 			ADK_PACKAGE_PACEMAKER=n \
 			ADK_PACKAGE_PACEMAKER_MGMTD=n \
@@ -575,7 +577,7 @@ release:
 bulk:
 	for libc in uclibc eglibc glibc musl;do \
 	  while read arch; do \
-	      systems=$$(./scripts/getsystems $$arch|grep -v toolchain|grep -v qemu-cris|grep -v foxboard-lx); \
+	      systems=$$(./scripts/getsystems $$arch|grep -v toolchain); \
 	      for system in $$systems;do \
 		mkdir -p $(TOPDIR)/bin/$${system}_$${arch}_$$libc; \
 	    ( \
@@ -595,7 +597,7 @@ bulk:
 bulkall:
 	for libc in uclibc eglibc glibc musl;do \
 	  while read arch; do \
-	      systems=$$(./scripts/getsystems $$arch| grep -v toolchain|grep -v qemu-cris|grep -v foxboard-lx); \
+	      systems=$$(./scripts/getsystems $$arch| grep -v toolchain); \
 	      for system in $$systems;do \
 		mkdir -p $(TOPDIR)/bin/$${system}_$${arch}_$$libc; \
 	    ( \
@@ -615,7 +617,7 @@ bulkall:
 bulkallmod:
 	for libc in uclibc eglibc glibc musl;do \
 	  while read arch; do \
-	      systems=$$(./scripts/getsystems $$arch| grep -v toolchain|grep -v qemu-cris|grep -v foxboard-lx); \
+	      systems=$$(./scripts/getsystems $$arch| grep -v toolchain); \
 	      for system in $$systems;do \
 		mkdir -p $(TOPDIR)/bin/$${system}_$${arch}_$$libc; \
 	    ( \
diff --git a/mk/modules.mk b/mk/modules.mk
index 22afead3b..62d1abd45 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -1092,6 +1092,7 @@ $(eval $(call KMOD_template,SUNRPC,sunrpc,\
 ,24))
 
 $(eval $(call KMOD_template,SUNRPC_GSS,sunrpc-gss,\
+	$(MODULES_DIR)/kernel/lib/oid_registry \
 	$(MODULES_DIR)/kernel/net/sunrpc/auth_gss/auth_rpcgss \
 ,25))
 
@@ -1106,7 +1107,7 @@ $(eval $(call KMOD_template,LOCKD,lockd,\
 ifneq ($(ADK_KERNEL_NFS_FS),y)
 $(eval $(call KMOD_template,NFS_FS,nfs-fs,\
 	$(MODULES_DIR)/kernel/fs/nfs/nfs \
-,30))
+,30, kmod-sunrpc))
 endif
 
 #$(eval $(call KMOD_template,EXPORTFS,exportfs,\
@@ -1287,11 +1288,9 @@ USBMODULES:=
 USBMODULES+=drivers/usb/usb-common
 USBMODULES+=drivers/usb/core/usbcore
 
-ifeq ($(ADK_TARGET_SYSTEM_FOXBOARD_LX),)
 $(eval $(call KMOD_template,USB,usb,\
 	$(foreach mod, $(USBMODULES),$(MODULES_DIR)/kernel/$(mod)) \
 ,50))
-endif
 
 $(eval $(call KMOD_template,USB_EHCI_HCD,usb-ehci-hcd,\
 	$(MODULES_DIR)/kernel/drivers/usb/host/ehci-hcd \
diff --git a/mk/package.mk b/mk/package.mk
index 01db36030..da04288c1 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -18,6 +18,7 @@ AUTOTOOL_ENV+=		AUTOM4TE='${STAGING_HOST_DIR}/usr/bin/autom4te' \
 CONFIGURE_ENV+=		GCC_HONOUR_COPTS=s \
 			AUTOM4TE=${STAGING_HOST_DIR}/usr/bin/autom4te \
 			M4='${STAGING_HOST_DIR}/usr/bin/m4' \
+			LIBTOOLIZE='${STAGING_HOST_DIR}/usr/bin/libtoolize -q' \
 			PATH='${TARGET_PATH}' \
 			CONFIG_SHELL='$(strip ${SHELL})' \
 			CFLAGS='$(strip ${TARGET_CFLAGS})' \
@@ -47,6 +48,8 @@ INSTALL_TARGET?=	install
 
 MAKE_ENV+=		$(GCC_CHECK) \
 			PATH='${TARGET_PATH}' \
+			LIBTOOLIZE='${STAGING_HOST_DIR}/usr/bin/libtoolize -q' \
+			M4='${STAGING_HOST_DIR}/usr/bin/m4' \
 			WRKDIR='${WRKDIR}' WRKDIST='${WRKDIST}' \
 			WRKSRC='${WRKSRC}' WRKBUILD='${WRKBUILD}' \
 			CFLAGS='$(strip ${TARGET_CFLAGS})' \
diff --git a/mk/rootfs.mk b/mk/rootfs.mk
index 3bbe31f25..f1d0bdf3a 100644
--- a/mk/rootfs.mk
+++ b/mk/rootfs.mk
@@ -32,10 +32,6 @@ ifeq ($(ADK_TARGET_SYSTEM_SHARP_ZAURUS),y)
 ROOTFS:=	root=/dev/sda1 rootwait
 endif
 
-ifeq ($(ADK_TARGET_SYSTEM_FOXBOARD_LX),y)
-ROOTFS:=	root=/dev/mtdblock1
-endif
-
 ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y)
 USB:=		rootwait
 else
diff --git a/mk/vars.mk b/mk/vars.mk
index fcd22a5e6..e217a9dca 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -84,7 +84,7 @@ TARGET_CXXFLAGS:=	$(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident
 TARGET_LDFLAGS:=	-L$(STAGING_TARGET_DIR)/lib -L$(STAGING_TARGET_DIR)/usr/lib \
 			-Wl,-O2 -Wl,-rpath -Wl,/usr/lib \
 			-Wl,-rpath-link -Wl,${STAGING_TARGET_DIR}/usr/lib \
-			$(ADK_TARGET_ABI_LDFLAGS)
+			$(ADK_TARGET_ABI_LDFLAGS) $(TARGET_CFLAGS_ARCH)
 
 ifneq ($(ADK_NATIVE),)
 TARGET_CPPFLAGS:=
diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile
index 71f91f564..b5e9d119f 100644
--- a/package/MesaLib/Makefile
+++ b/package/MesaLib/Makefile
@@ -28,9 +28,13 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,MESALIB,mesalib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 include $(TOPDIR)/mk/python.mk
+
 ifeq ($(ADK_HOST_DARWIN),y)
 PYTHON:=/opt/local/bin/python2.7
 endif
+ifeq ($(ADK_HOST_OPENBSD),y)
+PYTHON:=/usr/local/bin/python2.7
+endif
 
 ifeq (${ADK_TARGET_SYSTEM_IBM_X40},y)
 DRI_DRIVERS:=i915
diff --git a/package/alsa-utils/Makefile b/package/alsa-utils/Makefile
index 721c5757d..e2311e221 100644
--- a/package/alsa-utils/Makefile
+++ b/package/alsa-utils/Makefile
@@ -5,9 +5,9 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		alsa-utils
 PKG_VERSION:=		1.0.27.2
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		b65e9a04181bd7c9db7667a4566f8dc3
-PKG_DESCR:=		ALSA mixer utility
+PKG_DESCR:=		ALSA mixer/player utility
 PKG_SECTION:=		multimedia
 PKG_DEPENDS:=		alsa-lib libpthread libgcc librt
 PKG_BUILDDEP:=		alsa-lib
@@ -35,7 +35,7 @@ endif
 
 alsa-utils-install:
 	${INSTALL_DIR} ${IDIR_ALSA_UTILS}/usr/bin
-	${CP} ${WRKINST}/usr/bin/amixer ${IDIR_ALSA_UTILS}/usr/bin
+	${CP} ${WRKINST}/usr/bin/{aplay,amixer} ${IDIR_ALSA_UTILS}/usr/bin
 ifeq (${ADK_PACKAGE_ALSA_UTILS_WITH_ALSAMIXER},y)
 	${INSTALL_BIN} ${WRKINST}/usr/bin/alsamixer \
 		${IDIR_ALSA_UTILS}/usr/bin
diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile
index 413744638..f436d9ef7 100644
--- a/package/asterisk/Makefile
+++ b/package/asterisk/Makefile
@@ -17,7 +17,6 @@ PKG_MULTI:=		1
 PKG_NOPARALLEL:=	1
 PKG_NEED_CXX:=		1
 
-PKG_ARCH_DEPENDS:=	!cris
 PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
 
 PKG_SUBPKGS:=		ASTERISK ASTERISK_PGSQL ASTERISK_VOICEMAIL ASTERISK_SOUNDS
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 7f68bad96..f1e0d0666 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk
 
 PKG_NAME:=		base-files
 PKG_VERSION:=		1.0
-PKG_RELEASE:=		62
+PKG_RELEASE:=		63
 PKG_SECTION:=		base
 PKG_DESCR:=		basic files and scripts
 PKG_BUILDDEP:=		pkgconf-host file-host
diff --git a/package/base-files/src/etc/init.d/boot b/package/base-files/src/etc/init.d/boot
index ed55ccc88..df2c493d7 100644
--- a/package/base-files/src/etc/init.d/boot
+++ b/package/base-files/src/etc/init.d/boot
@@ -10,12 +10,10 @@ touch /var/log/lastlog
 touch /var/log/wtmp
 ln -s /tmp /var/tmp
 
-echo 0 > /proc/sys/kernel/printk
-
 HOSTNAME=
 [[ -s /etc/hostname ]] && HOSTNAME=$(cat /etc/hostname)
 HOSTNAME=${HOSTNAME%%.*}
-echo ${HOSTNAME:=linux} >/proc/sys/kernel/hostname
+echo ${HOSTNAME:=openadk} >/proc/sys/kernel/hostname
 
 chown 0:0 /tmp; chmod 1777 /tmp
 
diff --git a/package/base-files/src/init b/package/base-files/src/init
index 003808452..ad519e96d 100755
--- a/package/base-files/src/init
+++ b/package/base-files/src/init
@@ -3,6 +3,7 @@ echo "System initialization ..."
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 mount -t devtmpfs devtmpfs /dev >/dev/null 2>&1
 mount -nt proc proc /proc
+echo 0 > /proc/sys/kernel/printk
 mount -o nosuid,nodev,noexec -t sysfs sysfs /sys
 [ ! -f /etc/notmpfs ] && {
   size=$(cat /etc/tmpfs 2>/dev/null)
diff --git a/package/bc/Makefile b/package/bc/Makefile
index d4af2f264..2a5c59900 100644
--- a/package/bc/Makefile
+++ b/package/bc/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		d44b5dddebd8a7a7309aea6c36fda117
 PKG_DESCR:=		An arbitrary precision calculator language
 PKG_SECTION:=		utils
-PKG_BUILDDEP:=		flex-host
+PKG_BUILDDEP:=		m4-host flex-host
 PKG_URL:=		http://www.gnu.org/software/bc/
 PKG_SITES:=		http://ftp.gnu.org/pub/gnu/bc/
 
diff --git a/package/bcm2835-firmware/Makefile b/package/bcm2835-firmware/Makefile
index 18f9a3197..a67d1a3ad 100644
--- a/package/bcm2835-firmware/Makefile
+++ b/package/bcm2835-firmware/Makefile
@@ -5,9 +5,9 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		bcm2835-firmware
 # actually f46e6d9cb9a6bf419fe2a428a8a586239e93aa2d from 07.01.2014
-PKG_VERSION:=		0.5
+PKG_VERSION:=		0.6
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		0de84bd4fe70b7767026aef5313dd868
+PKG_MD5SUM:=		e4c1b8f3dd13ae8742a7831c19d212b0
 PKG_DESCR:=		firmware for raspberry pi (bcm2835)
 PKG_SECTION:=		base
 PKG_SITES:=		http://openadk.org/distfiles/
diff --git a/package/binutils/Makefile b/package/binutils/Makefile
index 3abf670cd..19b945f41 100644
--- a/package/binutils/Makefile
+++ b/package/binutils/Makefile
@@ -15,7 +15,6 @@ PKGSD_LIBBFD:=		Binary File Descriptor library
 PKGSC_LIBBFD:=		libs
 
 PKG_HOST_DEPENDS:=      !cygwin
-PKG_ARCH_DEPENDS:=	!avr32
 
 ifeq ($(ADK_STATIC),y)
 PKG_OPTS+=		libmix
diff --git a/package/bison/Makefile b/package/bison/Makefile
index 16c31b94e..ee268b641 100644
--- a/package/bison/Makefile
+++ b/package/bison/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		032a7b7b9f1a6e278ccde73f82cec5c2
 PKG_DESCR:=		GNU parser generator
 PKG_SECTION:=		lang
-PKG_BUILDDEP:=		flex-host bison-host
+PKG_BUILDDEP:=		m4-host flex-host bison-host
 PKG_URL:=		http://www.gnu.org/software/bison/
 PKG_SITES:=		${MASTER_SITE_GNU:=${PKG_NAME}/}
 
diff --git a/package/bison/patches/patch-Makefile_in b/package/bison/patches/patch-Makefile_in
index 98e7f3de3..cf6ade9c5 100644
--- a/package/bison/patches/patch-Makefile_in
+++ b/package/bison/patches/patch-Makefile_in
@@ -6,8 +6,8 @@
  $(top_srcdir)/doc/bison.help: src/bison$(EXEEXT)
 -	$(AM_V_GEN)src/bison$(EXEEXT) --version >doc/bison.help.tmp
 -	$(AM_V_at) src/bison$(EXEEXT) --help   >>doc/bison.help.tmp
-+	bison$(EXEEXT) --version >doc/bison.help.tmp
-+	bison$(EXEEXT) --help   >>doc/bison.help.tmp
++	echo "3.0.1" >doc/bison.help.tmp
++	echo "no help"   >>doc/bison.help.tmp
  	$(AM_V_at)$(top_srcdir)/build-aux/move-if-change doc/bison.help.tmp $@
  
  # Depend on configure to get version number changes.
diff --git a/package/bluez/Makefile b/package/bluez/Makefile
index e86eac36a..ec9024d81 100644
--- a/package/bluez/Makefile
+++ b/package/bluez/Makefile
@@ -15,8 +15,6 @@ PKG_URL:=		http://www.bluez.org/
 PKG_SITES:=		http://mirror.anl.gov/pub/linux/bluetooth/
 PKG_OPTS:=		dev
 
-PKG_ARCH_DEPENDS:=	!avr32
-
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,BLUEZ,bluez,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/boost/Makefile b/package/boost/Makefile
index f204ccebe..d5f4325fc 100644
--- a/package/boost/Makefile
+++ b/package/boost/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		boost
 PKG_VERSION:=		1.55.0
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		93780777cfbf999a600f62883bd54b17
 PKG_DESCR:=		boost C++ library
 PKG_SECTION:=		libs
@@ -13,7 +13,7 @@ PKG_URL:=		http://www.boost.org/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=boost/}
 PKG_OPTS:=		dev
 
-PKG_ARCH_DEPENDS:=	!avr32 !m68k
+PKG_ARCH_DEPENDS:=	!m68k
 
 DISTFILES:=		boost_1_55_0.tar.gz
 WRKDIST=		${WRKDIR}/${PKG_NAME}_1_55_0
@@ -97,6 +97,12 @@ ifeq (${ADK_PACKAGE_BOOST_WAVE},)
 	CONFIGURE_ARGS+=--without-wave
 endif
 
+ifeq ($(ARCH),x86_64)
+BOOST_ARCH:=	x86
+else
+BOOST_ARCH:=	$(ARCH)
+endif
+
 # some variables for build
 GPP_PATH:=	${STAGING_HOST_DIR}/bin/${GNU_TARGET_NAME}-g++
 GPP_VERSION:=	"`${GPP_PATH} -v 2>&1 | tail -1 | awk '{print $$3}'`"
@@ -128,7 +134,7 @@ endif
 			-sBUILD=release \
 			-d 2 \
 			target-os=linux \
-			architecture=$(CPU_ARCH) \
+			architecture=$(BOOST_ARCH) \
 			binary-format=elf \
 			toolset=gcc-${GPP_VERSION} \
 			--build-type=minimal \
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 7941fff37..0cde4bca5 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		busybox
 PKG_VERSION:=		1.21.1
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		795394f83903b5eec6567d51eebb417e
 PKG_DESCR:=		core utilities for embedded systems
 PKG_SECTION:=		base
diff --git a/package/busybox/patches/017-remove-alloca.patch b/package/busybox/patches/017-remove-alloca.patch
new file mode 100644
index 000000000..ca27f8fb7
--- /dev/null
+++ b/package/busybox/patches/017-remove-alloca.patch
@@ -0,0 +1,22 @@
+diff -Nur busybox-1.21.1.orig/scripts/basic/docproc.c busybox-1.21.1/scripts/basic/docproc.c
+--- busybox-1.21.1.orig/scripts/basic/docproc.c	Sat May 11 17:30:44 2013
++++ busybox-1.21.1/scripts/basic/docproc.c	Thu Jan 16 03:00:39 2014
+@@ -39,7 +39,6 @@
+ #include <limits.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
+-#include <alloca.h>
+ 
+ /* exitstatus is used to keep track of any failing calls to kernel-doc,
+  * but execution continues. */
+diff -Nur busybox-1.21.1.orig/scripts/basic/fixdep.c busybox-1.21.1/scripts/basic/fixdep.c
+--- busybox-1.21.1.orig/scripts/basic/fixdep.c	Sat May 11 17:30:44 2013
++++ busybox-1.21.1/scripts/basic/fixdep.c	Thu Jan 16 03:00:33 2014
+@@ -113,7 +113,6 @@
+ #include <limits.h>
+ #include <ctype.h>
+ #include <arpa/inet.h>
+-#include <alloca.h>
+ 
+ /* bbox: not needed
+ #define INT_CONF ntohl(0x434f4e46)
diff --git a/package/bzip2/Makefile b/package/bzip2/Makefile
index a2cb7a709..5585ae0c1 100644
--- a/package/bzip2/Makefile
+++ b/package/bzip2/Makefile
@@ -34,8 +34,8 @@ $(eval $(call PKG_template,LIBBZ2,libbz2,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_
 HOST_STYLE:=		manual
 MAKE_FILE:=		Makefile-libbz2_so
 CONFIG_STYLE:=		manual
-TARGET_CFLAGS+=		-fPIC
-XAKE_FLAGS+=		PREFIX=${WRKINST}/usr
+TARGET_CFLAGS+=		-fPIC 
+XAKE_FLAGS+=		PREFIX=${WRKINST}/usr CROSS_COMPILE=1
 INSTALL_STYLE:=		manual
 
 host-build:
@@ -55,9 +55,9 @@ libbz2-install:
 	$(CP) ${WRKBUILD}/libbz2.so* \
 		${IDIR_LIBBZ2}/usr/lib
 	$(CP) ${WRKBUILD}/libbz2.so* \
-		${STAGING_DIR}/usr/lib
-	(cd ${STAGING_DIR}/usr/lib; ln -sf libbz2.so.1.0.6 libbz2.so)
-	$(CP) $(WRKBUILD)/bzlib.h $(STAGING_DIR)/usr/include
+		${STAGING_TARGET_DIR}/usr/lib
+	(cd ${STAGING_TARGET_DIR}/usr/lib; ln -sf libbz2.so.1.0.6 libbz2.so)
+	$(CP) $(WRKBUILD)/bzlib.h $(STAGING_TARGET_DIR)/usr/include
 	${INSTALL_DIR} $(IDIR_LIBBZ2_DEV)/usr/include
 	$(CP) $(WRKBUILD)/bzlib.h $(IDIR_LIBBZ2_DEV)/usr/include
 
diff --git a/package/bzip2/patches/patch-Makefile-libbz2_so b/package/bzip2/patches/patch-Makefile-libbz2_so
index 605be4e5c..148c7562a 100644
--- a/package/bzip2/patches/patch-Makefile-libbz2_so
+++ b/package/bzip2/patches/patch-Makefile-libbz2_so
@@ -1,19 +1,28 @@
 --- bzip2-1.0.6.orig/Makefile-libbz2_so	2010-09-11 01:07:52.000000000 +0200
-+++ bzip2-1.0.6/Makefile-libbz2_so	2014-01-10 21:37:37.000000000 +0100
-@@ -25,6 +25,12 @@ SHELL=/bin/sh
- CC=gcc
++++ bzip2-1.0.6/Makefile-libbz2_so	2014-01-13 21:51:20.000000000 +0100
+@@ -21,10 +21,18 @@
+ # ------------------------------------------------------------------
+ 
+ 
+-SHELL=/bin/sh
+-CC=gcc
++SHELL?=/bin/sh
++CC?=gcc
  BIGFILES=-D_FILE_OFFSET_BITS=64
- CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES)
+-CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES)
++CFLAGS?=
++CFLAGS+=-fpic -fPIC -Wall -Winline $(BIGFILES)
 +OS=$(shell uname)
++LDOPT=-soname
++ifneq ($(CROSS_COMPILE),1)
 +ifeq ($(OS),Darwin)
 +LDOPT=-install_name
-+else 
-+LDOPT=-soname
++endif
 +endif
  
  OBJS= blocksort.o  \
        huffman.o    \
-@@ -35,7 +41,7 @@ OBJS= blocksort.o  \
+@@ -35,7 +43,7 @@ OBJS= blocksort.o  \
        bzlib.o
  
  all: $(OBJS)
diff --git a/package/cairo/Makefile b/package/cairo/Makefile
index 30894cab5..8b26cbfdb 100644
--- a/package/cairo/Makefile
+++ b/package/cairo/Makefile
@@ -30,9 +30,6 @@ $(eval $(call PKG_template,CAIRO,cairo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEN
 ifeq (,$(filter arm,$(TARGET_ARCH)))
 TARGET_CFLAGS:=         $(filter-out -Os,$(TARGET_CFLAGS))
 endif
-ifeq (,$(filter cris,$(TARGET_ARCH)))
-TARGET_CFLAGS:=         $(filter-out -Os,$(TARGET_CFLAGS))
-endif
 CONFIGURE_ARGS+=	--enable-ft=yes \
 			--enable-fc=yes \
 			--enable-tee=yes \
diff --git a/package/ccid/Makefile b/package/ccid/Makefile
index 55c81fa12..ec48810ea 100644
--- a/package/ccid/Makefile
+++ b/package/ccid/Makefile
@@ -13,8 +13,6 @@ PKG_BUILDDEP:=		pcsc-lite
 PKG_URL:=		http://pcsclite.alioth.debian.org/ccid.html
 PKG_SITES:=		http://openadk.org/distfiles/
 
-PKG_ARCH_DEPENDS:=	!avr32
-
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 include $(TOPDIR)/mk/package.mk
diff --git a/package/classpath/Makefile b/package/classpath/Makefile
index 0a8e7e682..3d2166c60 100644
--- a/package/classpath/Makefile
+++ b/package/classpath/Makefile
@@ -15,7 +15,7 @@ PKG_URL:=		http://www.gnu.org/software/classpath/home.html
 PKG_SITES:=		${MASTER_SITE_GNU:=classpath/}
 
 PKG_HOST_DEPENDS:=	linux
-PKG_ARCH_DEPENDS:=	!cris !arm
+PKG_ARCH_DEPENDS:=	!arm
 
 include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
diff --git a/package/conntrack-tools/Makefile b/package/conntrack-tools/Makefile
index 9032d3f06..22390a0a7 100644
--- a/package/conntrack-tools/Makefile
+++ b/package/conntrack-tools/Makefile
@@ -15,7 +15,6 @@ PKG_URL:=		http://conntrack-tools.netfilter.org/
 PKG_SITES:=		http://www.netfilter.org/projects/conntrack-tools/files/
 
 PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
-PKG_ARCH_DEPENDS:=	!avr32
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
diff --git a/package/cryptsetup/Makefile b/package/cryptsetup/Makefile
index bf71f5a43..1e0eaca25 100644
--- a/package/cryptsetup/Makefile
+++ b/package/cryptsetup/Makefile
@@ -17,8 +17,6 @@ PKG_URL:=		http://cryptsetup.googlecode.com/
 PKG_SITES:=		http://cryptsetup.googlecode.com/files/
 PKG_OPTS:=		dev
 
-PKG_ARCH_DEPENDS:=	!cris
-
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 include ${TOPDIR}/mk/package.mk
diff --git a/package/cxxtools/Makefile b/package/cxxtools/Makefile
index 03a6bc4d3..5bfc15998 100644
--- a/package/cxxtools/Makefile
+++ b/package/cxxtools/Makefile
@@ -16,7 +16,7 @@ PKG_NEED_CXX:=		1
 PKG_CXX:=		CXXTOOLS
 PKG_OPTS:=		dev
 
-PKG_ARCH_DEPENDS:=	!arm !avr32 !m68k
+PKG_ARCH_DEPENDS:=	!arm !m68k
 
 include ${TOPDIR}/mk/package.mk
 
diff --git a/package/dansguardian/Makefile b/package/dansguardian/Makefile
index ab62c232f..711bf0edb 100644
--- a/package/dansguardian/Makefile
+++ b/package/dansguardian/Makefile
@@ -23,12 +23,8 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,DANSGUARDIAN,dansguardian,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 ifeq ($(ADK_COMPILE_DANSGUARDIAN_WITH_UCLIBCXX),y)
-ifeq ($(ADK_LINUX_AVR32),y)
-LIBRARIES:=-nodefaultlibs -luClibc++ -lgcc -lm -lc
-else
 LIBRARIES:=-nodefaultlibs -luClibc++ -lgcc -lm -lc -lgcc_s
 endif
-endif
 
 ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y)
 LIBRARIES+=-lssp
diff --git a/package/dbus-glib/Makefile b/package/dbus-glib/Makefile
index 3ad006afa..6a54abcd9 100644
--- a/package/dbus-glib/Makefile
+++ b/package/dbus-glib/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		ad0920c7e3aad669163bb59171cf138e
 PKG_DESCR:=		DBUS glib bindings
 PKG_SECTION:=		libs
-PKG_DEPENDS:=		dbus glib
+PKG_DEPENDS:=		libdbus glib
 PKG_BUILDDEP:=		dbus glib
 PKG_URL:=		http://www.freedesktop.org/wiki/Software/DBusBindings
 PKG_SITES:=		http://dbus.freedesktop.org/releases/dbus-glib/
diff --git a/package/dbus/Makefile b/package/dbus/Makefile
index 7f7f5707f..31596f56d 100644
--- a/package/dbus/Makefile
+++ b/package/dbus/Makefile
@@ -4,36 +4,45 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		dbus
-PKG_VERSION:=		1.6.12
+PKG_VERSION:=		1.6.18
 PKG_RELEASE:=		2
-PKG_MD5SUM:=		a70edc50524f258eaf5c9a9994ed8748
-PKG_DESCR:=		DBUS library and daemon
-PKG_SECTION:=		libs
-PKG_DEPENDS:=		libexpat libx11 libuuid
-PKG_BUILDDEP:=		expat libX11 util-linux
+PKG_MD5SUM:=		b02e9c95027a416987b81f9893831061
+PKG_DESCR:=		DBUS daemon
+PKG_SECTION:=		misc
+PKG_DEPENDS:=		libdbus libexpat
+PKG_BUILDDEP:=		expat util-linux
 PKG_URL:=		http://dbus.freedesktop.org/
 PKG_SITES:=		http://dbus.freedesktop.org/releases/dbus/
+PKG_LIBNAME:=		libdbus
 PKG_OPTS:=		dev
 
+PKG_SUBPKGS:=		DBUS LIBDBUS
+PKGSD_LIBDBUS:=		DBUS library
+PKGSC_LIBDBUS:=		libs
+PKGSS_LIBDBUS:=		libexpat libuuid
+
 ifeq ($(ADK_STATIC),y)
-PKG_OPTS+=		libonly
+PKG_OPTS+=		libmix
 endif
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,DBUS,dbus,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,DBUS,dbus,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBDBUS,libdbus,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBDBUS},${PKGSD_LIBDBUS},${PKGSC_LIBDBUS},${PKG_OPTS}))
 
 TARGET_LDFLAGS+=	-luuid
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 CONFIGURE_ARGS+=	--disable-tests \
 			--disable-abstract-sockets \
 			--enable-checks \
+			--disable-verbose-mode \
 			--with-xml=expat \
 			--with-session-socket-dir=/var/tmp \
 			--disable-dnotify \
 			--disable-kqueue \
+			--disable-systemd \
 			--disable-xml-docs \
-			--with-x \
+			--without-x \
 			--disable-doxygen-docs
 CONFIGURE_ENV+=		ac_cv_have_abstract_sockets=no
 
@@ -42,11 +51,16 @@ pre-install:
 	$(CP) $(WRKBUILD)/dbus/dbus-arch-deps.h \
 		$(STAGING_DIR)/usr/include/dbus-1.0/dbus
 
+libdbus-install:
+	${INSTALL_DIR} ${IDIR_LIBDBUS}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libdbus-1.so* ${IDIR_LIBDBUS}/usr/lib
+
 dbus-install:
-	${INSTALL_DIR} ${IDIR_DBUS}/etc ${IDIR_DBUS}/usr/lib \
-		${IDIR_DBUS}/usr/bin
+	${INSTALL_DIR} ${IDIR_DBUS}/etc \
+		${IDIR_DBUS}/usr/bin ${IDIR_DBUS}/usr/libexec
+	${INSTALL_BIN} ${WRKINST}/usr/libexec/dbus-daemon-launch-helper \
+		${IDIR_DBUS}/usr/libexec/
 	${CP} ${WRKINST}/etc/dbus-1 ${IDIR_DBUS}/etc
-	${CP} ${WRKINST}/usr/lib/libdbus-1.so* ${IDIR_DBUS}/usr/lib
 	${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-daemon ${IDIR_DBUS}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-launch ${IDIR_DBUS}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-uuidgen ${IDIR_DBUS}/usr/bin
@@ -57,5 +71,4 @@ dbus-install:
 	$(CP) $(WRKBUILD)/dbus/dbus-arch-deps.h \
 		$(IDIR_DBUS_DEV)/usr/include/dbus-1.0/dbus
 
-
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/digitemp/Makefile b/package/digitemp/Makefile
index a7309e882..c5968a420 100644
--- a/package/digitemp/Makefile
+++ b/package/digitemp/Makefile
@@ -15,7 +15,6 @@ PKG_URL:=		http://www.digitemp.com/software/linux/
 PKG_SITES:=		http://www.digitemp.com/software/linux/
 
 PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
-PKG_ARCH_DEPENDS:=	!avr32
 
 include ${TOPDIR}/mk/package.mk
 
diff --git a/package/ebtables/Makefile b/package/ebtables/Makefile
index 4e1665196..59f2ea6ba 100644
--- a/package/ebtables/Makefile
+++ b/package/ebtables/Makefile
@@ -12,8 +12,6 @@ PKG_SECTION:=		firewall
 PKG_URL:=		http://ebtables.sourceforge.net
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=ebtables/}
 
-PKG_ARCH_DEPENDS:=	!avr32
-
 DISTFILES:=		${PKG_NAME}-v${PKG_VERSION}-4.tar.gz
 WRKDIST=		${WRKDIR}/${PKG_NAME}-v${PKG_VERSION}-4
 
diff --git a/package/eglibc/files/libc.so.ppc b/package/eglibc/files/libc.so.ppc
new file mode 100644
index 000000000..3d4612706
--- /dev/null
+++ b/package/eglibc/files/libc.so.ppc
@@ -0,0 +1,5 @@
+/* GNU ld script
+   Use the shared library, but some functions are only in
+   the static library, so try that secondarily.  */
+OUTPUT_FORMAT(elf32-powerpc)
+GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a  AS_NEEDED ( /lib/ld.so.1 ) )
diff --git a/package/eglibc/files/libc.so.ppc64 b/package/eglibc/files/libc.so.ppc64
new file mode 100644
index 000000000..35a1edcc7
--- /dev/null
+++ b/package/eglibc/files/libc.so.ppc64
@@ -0,0 +1,5 @@
+/* GNU ld script
+   Use the shared library, but some functions are only in
+   the static library, so try that secondarily.  */
+OUTPUT_FORMAT(elf64-powerpc)
+GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a  AS_NEEDED ( /lib/ld64.so.1 ) )
diff --git a/package/eudev/Makefile b/package/eudev/Makefile
new file mode 100644
index 000000000..4bce0928c
--- /dev/null
+++ b/package/eudev/Makefile
@@ -0,0 +1,50 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		eudev
+PKG_VERSION:=		1.3
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		164df78f6f0093578a20bdd00335845f
+PKG_DESCR:=		udev device manager
+PKG_SECTION:=		utils
+PKG_BUILDDEP:=		gperf-host glib
+PKG_DEPENDS:=		glib
+PKG_URL:=		http://www.gentoo.org/proj/en/eudev/
+PKG_SITES:=		http://dev.gentoo.org/~blueness/eudev/
+PKG_LIBNAME:=		libudev
+PKG_OPTS:=		dev
+
+PKG_SUBPKGS:=		UDEV LIBUDEV LIBGUDEV
+PKGSC_LIBGUDEV:=	libs
+PKGSD_LIBGUDEV:=	GUDEV library
+PKGSC_LIBUDEV:=		libs
+PKGSD_LIBUDEV:=		UDEV library
+PKGSD_UDEV:=		Dynamic device management subsystem
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,UDEV,udev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,LIBUDEV,libudev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,LIBGUDEV,libgudev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+CONFIGURE_ARGS+=	--disable-manpages \
+			--disable-gtk-doc
+
+udev-install:
+	${INSTALL_DIR} ${IDIR_UDEV}/usr/bin ${IDIR_UDEV}/etc/udev
+	${INSTALL_DIR} ${IDIR_UDEV}/usr/lib/udev
+	${CP} ${WRKINST}/etc/udev/* ${IDIR_UDEV}/etc/udev
+	${CP} ${WRKINST}/usr/lib/udev/* ${IDIR_UDEV}/usr/lib/udev
+	${CP} ${WRKINST}/usr/bin/udevadm ${IDIR_UDEV}/usr/bin
+
+libudev-install:
+	${INSTALL_DIR} ${IDIR_LIBUDEV}/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libudev.so* $(IDIR_LIBUDEV)/usr/lib
+
+libgudev-install:
+	${INSTALL_DIR} ${IDIR_LIBGUDEV}/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libgudev*.so* $(IDIR_LIBGUDEV)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile
index d8211aedb..d82f9d643 100644
--- a/package/ffmpeg/Makefile
+++ b/package/ffmpeg/Makefile
@@ -15,7 +15,7 @@ PKG_SITES:=		http://www.ffmpeg.org/releases/
 PKH_LIBNAME:=		libffmpeg
 PKG_OPTS:=		dev
 
-PKG_ARCH_DEPENDS:=	!avr32 !cris !m68k
+PKG_ARCH_DEPENDS:=	!m68k
 
 PKG_SUBPKGS:=		LIBFFMPEG FFSERVER FFPROBE FFMPEG
 #PKGSD_FFPLAY:=		ffmpeg based video player
diff --git a/package/fluxbox/Makefile b/package/fluxbox/Makefile
index ea8ee6338..eb0663b99 100644
--- a/package/fluxbox/Makefile
+++ b/package/fluxbox/Makefile
@@ -14,8 +14,6 @@ PKG_BUILDDEP:=		libXpm libXft
 PKG_URL:=		http://www.fluxbox.org/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=fluxbox/}
 
-PKG_ARCH_DEPENDS:=	!avr32
-
 PKG_FLAVOURS_FLUXBOX:=	WITH_IMLIB2
 PKGFD_WITH_IMLIB2:=	enable imlib2 support
 PKGFS_WITH_IMLIB2:=	imlib2
diff --git a/package/forked-daapd/Makefile b/package/forked-daapd/Makefile
index d9a58ce87..5b727c004 100644
--- a/package/forked-daapd/Makefile
+++ b/package/forked-daapd/Makefile
@@ -18,7 +18,7 @@ PKG_SITES:=		http://alioth.debian.org/~jblache/forked-daapd/
 
 PKG_CFLINE_FORKED_DAAPD:=	select ADK_KERNEL_INOTIFY_USER@
 PKG_CFLINE_FORKED_DAAPD+=	depends on ADK_BROKEN@
-PKG_ARCH_DEPENDS:=	!ppc !avr32
+PKG_ARCH_DEPENDS:=	!ppc
 # gperf problem
 PKG_HOST_DEPENDS:=	!freebsd
 
diff --git a/package/gcc/Makefile b/package/gcc/Makefile
index f0e17503a..4b8480342 100644
--- a/package/gcc/Makefile
+++ b/package/gcc/Makefile
@@ -11,8 +11,6 @@ PKG_OPTS:=		noremove
 PKG_DEPENDS:=		libmpc libgmp mpfr libgcc
 PKG_BUILDDEP:=		libmpc gmp mpfr
 
-PKG_ARCH_DEPENDS:=	!avr32
-
 PKG_SUBPKGS:=		GCC GXX
 PKGSD_GXX:=		GNU C++ compiler
 
@@ -48,6 +46,13 @@ CONFIGURE_ARGS+=	--enable-languages=c,c++
 else
 CONFIGURE_ARGS+=	--enable-languages=c
 endif
+ifeq ($(CPU_ARCH),ppc)
+CONFIGURE_ARGS+=	--disable-target-optspace --with-long-double-64 --enable-secureplt
+TARGET_CFLAGS+=		'-Wl,--secure-plt'
+else
+CONFIGURE_ARGS+=	--enable-target-optspace
+endif
+
 
 CONFIGURE_ENV+=		have_sys_sdt_h=no
 CONFIGURE_ARGS+=	--host=$(REAL_GNU_TARGET_NAME) \
diff --git a/package/gcc/patches/4.7.3/musl-cris.patch b/package/gcc/patches/4.7.3/musl-cris.patch
deleted file mode 100644
index 4889263a1..000000000
--- a/package/gcc/patches/4.7.3/musl-cris.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur gcc-4.7.3.orig/gcc/config/cris/linux.h gcc-4.7.3/gcc/config/cris/linux.h
---- gcc-4.7.3.orig/gcc/config/cris/linux.h	2011-04-11 20:46:05.000000000 +0200
-+++ gcc-4.7.3/gcc/config/cris/linux.h	2013-10-11 10:01:51.000000000 +0200
-@@ -104,6 +104,7 @@
- #define CRIS_DEFAULT_CPU_VERSION CRIS_CPU_NG
- 
- #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-cris.1"
- 
- #undef CRIS_LINK_SUBTARGET_SPEC
- #define CRIS_LINK_SUBTARGET_SPEC \
diff --git a/package/gconf/Makefile b/package/gconf/Makefile
index dfed4551a..38a14e6c0 100644
--- a/package/gconf/Makefile
+++ b/package/gconf/Makefile
@@ -17,7 +17,7 @@ PKG_SITES:=		ftp://ftp.gnome.org//pub/GNOME/sources/GConf/${PKG_EXTRAVER}/
 PKG_LIBNAME:=		gconf
 PKG_OPTS:=		dev
 
-PKG_ARCH_DEPENDS:=	!arm !cris
+PKG_ARCH_DEPENDS:=	!arm
 
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/gdb/Makefile b/package/gdb/Makefile
index 61d564be7..8128e8bd5 100644
--- a/package/gdb/Makefile
+++ b/package/gdb/Makefile
@@ -11,7 +11,7 @@ PKG_DEPENDS:=		libthread-db libncurses libexpat libgcc zlib
 PKG_BUILDDEP:=		ncurses readline libiconv-tiny expat zlib
 PKG_NOPARALLEL:=	1
 
-PKG_ARCH_DEPENDS:=	!cris !avr32 !m68k
+PKG_ARCH_DEPENDS:=	!m68k
 
 include ${TOPDIR}/mk/package.mk
 
diff --git a/package/gdbserver/Makefile b/package/gdbserver/Makefile
index 71de5e559..d77558eb6 100644
--- a/package/gdbserver/Makefile
+++ b/package/gdbserver/Makefile
@@ -9,7 +9,7 @@ PKG_DESCR:=		GNU debugger (small server)
 PKG_SECTION:=		debug
 PKG_DEPENDS:=		libthread-db
 
-PKG_ARCH_DEPENDS:=	!avr32 !m68k
+PKG_ARCH_DEPENDS:=	!m68k
 PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
 PKG_SUBPKGS:=		GDBSERVER
 
diff --git a/package/gdbserver/patches/patch-gdb_gdbserver_linux-cris-low_c b/package/gdbserver/patches/patch-gdb_gdbserver_linux-cris-low_c
deleted file mode 100644
index e500d6642..000000000
--- a/package/gdbserver/patches/patch-gdb_gdbserver_linux-cris-low_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- gdb-7.1.orig/gdb/gdbserver/linux-cris-low.c
-+++ gdb-7.1/gdb/gdbserver/linux-cris-low.c
-@@ -62,7 +62,7 @@
- extern int debug_threads;
- 
- static CORE_ADDR
--cris_get_pc (struct regcache *regcache, void)
-+cris_get_pc (struct regcache *regcache)
- {
-   unsigned long pc;
-   collect_register_by_name (regcache, "pc", &pc);
diff --git a/package/gmediaserver/Makefile b/package/gmediaserver/Makefile
index 240249145..1c995edb9 100644
--- a/package/gmediaserver/Makefile
+++ b/package/gmediaserver/Makefile
@@ -15,6 +15,8 @@ PKG_URL:=		http://www.gnu.org/software/gmediaserver
 PKG_SITES:=		http://savannah.nongnu.org/download/gmediaserver/
 PKG_CXX:=		GMEDIASERVER
 
+PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,GMEDIASERVER,gmediaserver,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/gmp/Makefile b/package/gmp/Makefile
index 88160db91..5d7077306 100644
--- a/package/gmp/Makefile
+++ b/package/gmp/Makefile
@@ -8,7 +8,7 @@ PKG_NAME:=		gmp
 PKG_DESCR:=		GNU multiprecision arithmetic library
 PKG_SECTION:=		libs
 PKG_URL:=		http://gmplib.org/
-PKG_BUILDDEP:=		flex-host bison-host m4-host
+PKG_BUILDDEP:=		m4-host flex-host bison-host
 PKG_LIBNAME:=		libgmp
 PKG_OPTS:=		dev
 
diff --git a/package/huawei/Makefile b/package/huawei/Makefile
index 4dedad02f..d85bc130d 100644
--- a/package/huawei/Makefile
+++ b/package/huawei/Makefile
@@ -11,8 +11,6 @@ PKG_SECTION:=		utils
 PKG_DEPENDS:=		libusb libusb-compat
 PKG_BUILDDEP:=		libusb libusb-compat
 
-PKG_ARCH_DEPENDS:=	!avr32
-
 NO_DISTFILES:=		1
 
 include $(TOPDIR)/mk/package.mk
diff --git a/package/iperf/Makefile b/package/iperf/Makefile
index 3fc3b03f5..d867dd210 100644
--- a/package/iperf/Makefile
+++ b/package/iperf/Makefile
@@ -15,8 +15,6 @@ PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=iperf/}
 PKG_NEED_CXX:=		1
 PKG_CXX:=		IPERF
 
-PKG_ARCH_DEPENDS:=	!avr32
-
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,IPERF,iperf,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/ipset/Makefile b/package/ipset/Makefile
index 741f3ab06..34fea7f21 100644
--- a/package/ipset/Makefile
+++ b/package/ipset/Makefile
@@ -12,7 +12,7 @@ PKG_SECTION:=		firewall
 PKG_URL:=		http://ipset.netfilter.org/
 PKG_SITES:=		http://ipset.netfilter.org/
 
-PKG_ARCH_DEPENDS:=	!arm !avr32
+PKG_ARCH_DEPENDS:=	!arm
 PKG_CFLINE_IPSET:=	depends on !ADK_TOOLCHAIN_ONLY
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
diff --git a/package/jamvm/Makefile b/package/jamvm/Makefile
index 22f20455a..4c0798c26 100644
--- a/package/jamvm/Makefile
+++ b/package/jamvm/Makefile
@@ -14,7 +14,7 @@ PKG_BUILDDEP:=		libffi zlib
 PKG_URL:=		http://jamvm.sourceforge.net
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=jamvm/}
 
-PKG_ARCH_DEPENDS:=	!cris !avr32 !m68k
+PKG_ARCH_DEPENDS:=	!m68k
 
 include ${TOPDIR}/mk/host.mk
 include ${TOPDIR}/mk/package.mk
diff --git a/package/json-c/Makefile b/package/json-c/Makefile
new file mode 100644
index 000000000..de4f0e04e
--- /dev/null
+++ b/package/json-c/Makefile
@@ -0,0 +1,26 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		json-c
+PKG_VERSION:=		0.11
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		aa02367d2f7a830bf1e3376f77881e98
+PKG_DESCR:=		JSON library
+PKG_SECTION:=		libs
+PKG_URL:=		https://github.com/json-c/json-c/wiki
+PKG_SITES:=		https://s3.amazonaws.com/json-c_releases/releases/
+PKG_OPTS:=		dev
+PKG_NOPARALLEL:=	1
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,JSON_C,json-c,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+json-c-install:
+	$(INSTALL_DIR) $(IDIR_JSON_C)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libjson*.so* \
+		$(IDIR_JSON_C)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/kexec-tools/Makefile b/package/kexec-tools/Makefile
index 7f6332a3f..3ea6904d2 100644
--- a/package/kexec-tools/Makefile
+++ b/package/kexec-tools/Makefile
@@ -14,7 +14,7 @@ PKG_BUILDEP:=		zlib
 PKG_URL:=		http://kernel.org/pub/linux/utils/kernel/kexec/
 PKG_SITES:=		http://kernel.org/pub/linux/utils/kernel/kexec/
 
-PKG_ARCH_DEPENDS:=	!cris !avr32 !mips !m68k
+PKG_ARCH_DEPENDS:=	!mips !m68k
 PKG_CFLINE_KEXEC_TOOLS:=	select ADK_KERNEL_KEXEC
 
 include $(TOPDIR)/mk/package.mk
diff --git a/package/knock/Makefile b/package/knock/Makefile
index 91bd34739..04129c01b 100644
--- a/package/knock/Makefile
+++ b/package/knock/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		knock
-PKG_VERSION:=		0.5
+PKG_VERSION:=		0.6
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		ca09d61458974cff90a700aba6120891
+PKG_MD5SUM:=		e6e486be75b0d6433bac22a7de0e11f5
 PKG_DESCR:=		A port-knocking client
 PKG_SECTION:=		firewall
 PKG_BUILDDEP:=		libpcap
@@ -22,6 +22,7 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,KNOCK,knock,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,KNOCKD,knockd,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_KNOCKD},${PKGSD_KNOCKD},${PKG_SECTION}))
 
+TARGET_CPPFLAGS+=	-D_GNU_SOURCE
 CONFIGURE_ENV+=		ac_cv_lib_pcap_pcap_open_live=yes
 
 knock-install:
diff --git a/package/knock/patches/patch-Makefile_in b/package/knock/patches/patch-Makefile_in
deleted file mode 100644
index ec90372ec..000000000
--- a/package/knock/patches/patch-Makefile_in
+++ /dev/null
@@ -1,24 +0,0 @@
---- knock-0.5.orig/Makefile.in	2005-06-27 07:11:34.000000000 +0200
-+++ knock-0.5/Makefile.in	2009-06-13 09:49:14.000000000 +0200
-@@ -68,11 +68,16 @@ dist: distclean
- 	(cd ..; tar czvf knock-$(VERSION).tar.gz knock-$(VERSION))
- 
- install: all
--	$(INSTALL) -D -m0755 knockd $(DESTDIR)$(SBINDIR)/knockd
--	$(INSTALL) -D -m0755 knock $(DESTDIR)$(BINDIR)/knock
--	$(INSTALL) -D -m0644 $(MANSRC)knockd.1 $(DESTDIR)$(MANDIR)/man1/knockd.1
--	$(INSTALL) -D -m0644 $(MANSRC)knock.1 $(DESTDIR)$(MANDIR)/man1/knock.1
--	$(INSTALL) -D -m0644 knockd.conf $(DESTDIR)/etc/knockd.conf
-+	$(INSTALL) -d -m0755 $(DESTDIR)$(SBINDIR)
-+	$(INSTALL) -d -m0755 $(DESTDIR)$(BINDIR)
-+	$(INSTALL) -d -m0755 $(DESTDIR)$(MANDIR)/man1
-+	$(INSTALL) -d -m0755 $(DESTDIR)/etc
-+	$(INSTALL) -m0755 knock $(DESTDIR)$(BINDIR)/knock
-+	$(INSTALL) -m0755 knockd $(DESTDIR)$(SBINDIR)/knockd
-+	$(INSTALL) -m0755 knock $(DESTDIR)$(BINDIR)/knock
-+	$(INSTALL) -m0644 $(MANSRC)knockd.1 $(DESTDIR)$(MANDIR)/man1/knockd.1
-+	$(INSTALL) -m0644 $(MANSRC)knock.1 $(DESTDIR)$(MANDIR)/man1/knock.1
-+	$(INSTALL) -m0644 knockd.conf $(DESTDIR)/etc/knockd.conf
- 
- clean:
- 	rm -f *~ $(OBJDIR)*.o $(MANSRC)*.1
diff --git a/package/knock/patches/patch-src_knockd_c b/package/knock/patches/patch-src_knockd_c
index 7d8512c96..e3a2d2955 100644
--- a/package/knock/patches/patch-src_knockd_c
+++ b/package/knock/patches/patch-src_knockd_c
@@ -1,20 +1,23 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- knock-0.5.orig/src/knockd.c	2005-06-27 07:11:34.000000000 +0200
-+++ knock-0.5/src/knockd.c	2009-06-01 21:43:53.000000000 +0200
-@@ -46,6 +46,7 @@
- #include <syslog.h>
- #include <pcap.h>
- #include <errno.h>
-+#include <linux/limits.h>
- #include "list.h"
- 
- static char version[] = "0.5";
-@@ -1064,7 +1065,7 @@ char* get_ip(const char* iface, char *bu
- 		return(NULL);
- 	}
- 
--	bzero((void*)(&ifr.ifr_name), sizeof(ifr.ifr_name));
-+	memset((void*)(&ifr.ifr_name), 0, sizeof(ifr.ifr_name));
- 	strncpy(ifr.ifr_name, iface, sizeof(ifr.ifr_name)-1);
- 	ifr.ifr_name[sizeof(ifr.ifr_name)-1] = '\0';
- 	if(ioctl(s, SIOCGIFADDR, &ifr)) {
+--- knock-0.6.orig/src/knockd.c	2013-04-08 20:11:56.000000000 +0200
++++ knock-0.6/src/knockd.c	2014-01-16 16:59:04.000000000 +0100
+@@ -28,8 +28,8 @@
+ #include <ctype.h>
+ #include <string.h>
+ #include <fcntl.h>
+-#if defined(__FreeBSD__) || defined(__APPLE__)
+ #include <limits.h>
++#if defined(__FreeBSD__) || defined(__APPLE__)
+ #include <sys/socket.h>
+ #include <netinet/in_systm.h>
+ #endif
+@@ -40,10 +40,6 @@
+ #include <netinet/udp.h>
+ #include <netinet/ip_icmp.h>
+ #include <net/if.h>
+-#if !defined(__FreeBSD__) && !defined(__APPLE__)
+-#include <bits/time.h>
+-#include <linux/limits.h>
+-#endif
+ #include <sys/types.h>
+ #include <sys/wait.h>
+ #include <sys/ioctl.h>
diff --git a/package/libIDL/Makefile b/package/libIDL/Makefile
index aadcd7a17..e4adff641 100644
--- a/package/libIDL/Makefile
+++ b/package/libIDL/Makefile
@@ -10,7 +10,7 @@ PKG_MD5SUM:=		531fbc1b40b80dd1d6f3b5e76b99067c
 PKG_DESCR:=		libraries for Interface Definition Language files
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		glib
-PKG_BUILDDEP:=		glib-host glib flex-host bison-host libIDL-host
+PKG_BUILDDEP:=		glib-host glib m4-host flex-host bison-host libIDL-host
 PKG_URL:=		http://www.gnome.org/
 PKG_SITES:=		http://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/
 PKG_LIBNAME:=		libidl
diff --git a/package/libcap/Makefile b/package/libcap/Makefile
index 1d0f8154a..5c5f4edcf 100644
--- a/package/libcap/Makefile
+++ b/package/libcap/Makefile
@@ -20,6 +20,7 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBCAP,libcap,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+CPPFLAGS_FOR_BUILD+=	-I$(STAGING_TARGET_DIR)/usr/include
 CONFIG_STYLE:=		manual
 
 libcap-install:
diff --git a/package/libcec/Makefile b/package/libcec/Makefile
index e085df139..dcf6e2580 100644
--- a/package/libcec/Makefile
+++ b/package/libcec/Makefile
@@ -14,7 +14,9 @@ PKG_URL:=		http://libcec.pulse-eight.com/
 PKG_SITES:=		http://www.openadk.org/distfiles
 PKG_OPTS:=		dev
 
-PKG_SYSTEM_DEPENDS:=    raspberry-pi
+PKG_DEPENDS_RASPBERRY_PI:=	bcm2835-vc
+PKG_BUILDDEP_RASPBERRY_PI:=	bcm2835-vc
+PKG_SYSTEM_DEPENDS:=    raspberry-pi ibm-x40
 PKG_LIBC_DEPENDS:=      eglibc glibc musl
 
 include $(TOPDIR)/mk/package.mk
@@ -22,9 +24,11 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,LIBCEC,libcec,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 AUTOTOOL_STYLE:=	autoreconf
+ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
 CONFIGURE_ARGS+=	--enable-rpi \
 			--with-rpi-include-path=$(STAGING_TARGET_DIR)/opt/vc/include \
 			--with-rpi-lib-path=$(STAGING_TARGET_DIR)/opt/vc/lib
+endif
 
 libcec-install:
 	$(INSTALL_DIR) $(IDIR_LIBCEC)/usr/lib
diff --git a/package/libcec/patches/patch-src_lib_platform_posix_serialport_cpp b/package/libcec/patches/patch-src_lib_platform_posix_serialport_cpp
new file mode 100644
index 000000000..e677a0d22
--- /dev/null
+++ b/package/libcec/patches/patch-src_lib_platform_posix_serialport_cpp
@@ -0,0 +1,11 @@
+--- libcec-2.1.4.orig/src/lib/platform/posix/serialport.cpp	2013-12-15 12:48:14.000000000 +0100
++++ libcec-2.1.4/src/lib/platform/posix/serialport.cpp	2014-01-12 22:04:41.000000000 +0100
+@@ -37,7 +37,7 @@
+ #include "lib/platform/util/baudrate.h"
+ #include "lib/platform/posix/os-socket.h"
+ 
+-#if defined(__APPLE__) || defined(__FreeBSD__)
++#if defined(__APPLE__) || defined(__FreeBSD__) || !defined(__GLIBC__)
+ #ifndef XCASE
+ #define XCASE	0
+ #endif
diff --git a/package/libgcc/Makefile b/package/libgcc/Makefile
index 5f303bd71..28f277f8d 100644
--- a/package/libgcc/Makefile
+++ b/package/libgcc/Makefile
@@ -7,12 +7,9 @@ include ${TOPDIR}/toolchain/gcc/Makefile.inc
 PKG_NAME:=		libgcc
 PKG_DESCR:=		GCC library
 PKG_SECTION:=		libs
-#PKG_DFLT_LIBGCC:=	y if !ADK_TOOLCHAIN_ONLY
 
 NO_DISTFILES:=		1
 
-PKG_ARCH_DEPENDS:=	!avr32
-
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBGCC,libgcc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
diff --git a/package/libjson/Makefile b/package/libjson/Makefile
new file mode 100644
index 000000000..6520bd419
--- /dev/null
+++ b/package/libjson/Makefile
@@ -0,0 +1,34 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		libjson
+PKG_VERSION:=		7.6.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		82f3fcbf9f8cf3c4e25e1bdd77d65164
+PKG_DESCR:=		JSON library
+PKG_SECTION:=		libs
+PKG_URL:=		http://sourceforge.net/projects/libjson/
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=libjson/}
+PKG_OPTS:=		dev
+
+PKG_NOPARALLEL:=	1
+
+DISTFILES:=             ${PKG_NAME}_${PKG_VERSION}.zip
+WRKDIST=		${WRKDIR}/${PKG_NAME}
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBJSON,libjson,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+MAKE_FILE:=		makefile
+FAKE_FLAGS+=		prefix=${WRKINST}/usr
+CONFIG_STYLE:=		manual
+
+libjson-install:
+	$(INSTALL_DIR) $(IDIR_LIBJSON)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libjson*.so* \
+		$(IDIR_LIBJSON)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libjson/patches/patch-makefile b/package/libjson/patches/patch-makefile
new file mode 100644
index 000000000..919c6308c
--- /dev/null
+++ b/package/libjson/patches/patch-makefile
@@ -0,0 +1,50 @@
+--- libjson.orig/makefile	2014-01-17 20:38:29.584543459 +0100
++++ libjson/makefile	2014-01-17 20:38:14.372460375 +0100
+@@ -128,7 +128,7 @@ objects        = internalJSONNode.o JSON
+                  JSONDebug.o JSONIterators.o JSONMemory.o JSONNode.o \
+                  JSONNode_Mutex.o JSONPreparse.o JSONStream.o JSONValidator.o \
+                  JSONWorker.o JSONWriter.o libjson.o 
+-OS=$(shell uname)
++OS=Linux
+ 
+ # Defaults
+ ifeq ($(OS), Darwin)
+@@ -158,8 +158,7 @@ srcdir          ?= _internal/Source
+ CXX             ?= c++
+ AR              ?= ar
+ PIC             ?= PIC
+-BUILD_TYPE      ?= "default"
+-SHARED          ?= "1"
++SHARED          ?= 1
+ 
+ 
+ # Internal Variables
+@@ -237,18 +236,16 @@ endif
+ 
+ # Compile object files
+ $(objdir)/%.o: $(srcdir)/%.cpp
+-	$(CXX) $< -o $@ -c $(CXXFLAGS)
++	$(CXX) $< -o $@ -c $(CPPFLAGS) $(CXXFLAGS)
+ 
+ ifeq ($(SHARED),1)
+ install: banner install_headers $(lib_target)
+ 	@echo "Install shared library"
++	mkdir -p $(inst_path)
+ 	cp -f ./$(lib_target) $(inst_path)
+ 	cd $(inst_path) ; \
+ 	ln -sf $(lib_target) $(libname_shared_major_version) ; \
+ 	ln -sf $(libname_shared_major_version) $(libname_shared)
+-ifneq ($(OS),Darwin)
+-	ldconfig
+-endif
+ 	@echo "Install shared library: Done."
+ else
+ install: banner install_headers $(lib_target)
+@@ -266,7 +263,6 @@ install_headers: banner
+ 	cp -r ./$(srcdir)/JSONDefs $(include_path)/$(libname_hdr)/$(srcdir)
+ 	chmod -R a+r $(include_path)/$(libname_hdr)
+ 	find  $(include_path)/$(libname_hdr) -type d -exec chmod a+x {} \;
+-	cp -rv $(srcdir)/Dependencies/ $(include_path)/$(libname_hdr)/$(srcdir)
+ 	@echo "Install header files: Done."
+ 
+ clean: banner
diff --git a/package/libnl/Makefile b/package/libnl/Makefile
index e96cfe686..45b24cca2 100644
--- a/package/libnl/Makefile
+++ b/package/libnl/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		3
 PKG_MD5SUM:=		2e1c889494d274aca24ce5f6a748e66e
 PKG_DESCR:=		Netlink library
 PKG_SECTION:=		libs
-PKG_BUILDDEP:=		flex-host
+PKG_BUILDDEP:=		m4-host flex-host
 PKG_URL:=		http://www.infradead.org/~tgr/libnl/
 PKG_SITES:=		http://www.infradead.org/~tgr/libnl/files/
 PKG_NOPARALLEL:=	1
diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile
index 44d6126ef..51b470aae 100644
--- a/package/libpcap/Makefile
+++ b/package/libpcap/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		33ba2f10f3a402cb5d34f5e2a904794a
 PKG_DESCR:=		a low-level packet capture library
 PKG_SECTION:=		libs
-PKG_BUILDDEP:=		flex-host bison-host libnl
+PKG_BUILDDEP:=		m4-host flex-host bison-host libnl
 PKG_URL:=		http://www.tcpdump.org/
 PKG_SITES:=		http://www.tcpdump.org/release/
 PKG_OPTS:=		dev
diff --git a/package/libsndfile/Makefile b/package/libsndfile/Makefile
new file mode 100644
index 000000000..b1663a23c
--- /dev/null
+++ b/package/libsndfile/Makefile
@@ -0,0 +1,25 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		libsndfile
+PKG_VERSION:=		1.0.25
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		e2b7bb637e01022c7d20f95f9c3990a2
+PKG_DESCR:=		reading and writing files containing sampled sound
+PKG_SECTION:=		libs
+PKG_URL:=		http://www.mega-nerd.com/libsndfile/
+PKG_SITES:=		http://www.mega-nerd.com/libsndfile/files/
+PKG_OPTS:=		dev
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBSNDFILE,libsndfile,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+libsndfile-install:
+	$(INSTALL_DIR) $(IDIR_LIBSNDFILE)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libsndfile*.so* \
+		$(IDIR_LIBSNDFILE)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libstdcxx/Makefile b/package/libstdcxx/Makefile
index 45c1edfc4..5c6cc2b2f 100644
--- a/package/libstdcxx/Makefile
+++ b/package/libstdcxx/Makefile
@@ -16,15 +16,11 @@ endif
 endif
 endif
 
-ifeq ($(ADK_LINUX_AVR32),y)
-LIBSTDCXX_VER:=		13
-else
 ifeq ($(ADK_LINUX_MICROBLAZE),y)
 LIBSTDCXX_VER:=		18
 else
 LIBSTDCXX_VER:=		17
 endif
-endif
 
 PKG_NAME:=		libstdcxx
 PKG_DESCR:=		C++ support library
diff --git a/package/libtool/Makefile b/package/libtool/Makefile
index adfd6f4cc..4d4c8c4c8 100644
--- a/package/libtool/Makefile
+++ b/package/libtool/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		3
 PKG_MD5SUM:=		d2f3b7d4627e69e13514a40e72a24d50
 PKG_DESCR:=		a generic dynamic object loading library
 PKG_SECTION:=		lang
-PKG_BUILDDEP:=		libtool-host
+PKG_BUILDDEP:=		m4-host libtool-host
 PKG_URL:=		http://www.gnu.org/software/libtool/
 PKG_SITES:=		${MASTER_SITE_GNU:=libtool/}
 PKG_LIBNAME:=		libltdl
diff --git a/package/libtorrent/Makefile b/package/libtorrent/Makefile
index bbcada2f6..fc4a051a3 100644
--- a/package/libtorrent/Makefile
+++ b/package/libtorrent/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libtorrent
-PKG_VERSION:=		0.13.0
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		d499178f72010d5067a77f41fa1a1505
+PKG_VERSION:=		0.13.2
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		96c0b81501357df402ab592f59ecaeab
 PKG_DESCR:=		A bittorrent library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libopenssl libsigc++
@@ -15,13 +15,12 @@ PKG_URL:=		http://libtorrent.rakshasa.no/
 PKG_SITES:=		http://libtorrent.rakshasa.no/downloads/
 PKG_OPTS:=		dev
 
-PKG_ARCH_DEPENDS:=	!avr32
-
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBTORRENT,libtorrent,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-CONFIGURE_ARGS+=	--enable-aligned
+CONFIGURE_ARGS+=	--enable-aligned \
+			--without-kqueue
 
 libtorrent-install:
 	${INSTALL_DIR} ${IDIR_LIBTORRENT}/usr/lib
diff --git a/package/libupnp/Makefile b/package/libupnp/Makefile
index 4b01731bc..18eda96b6 100644
--- a/package/libupnp/Makefile
+++ b/package/libupnp/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libupnp
-PKG_VERSION:=		1.6.6
-PKG_RELEASE:=		3
-PKG_MD5SUM:=		8918dcf7428cd119d0c8275765ff2833
+PKG_VERSION:=		1.6.19
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		ee16e5d33a3ea7506f38d71facc057dd
 PKG_DESCR:=		The Universal Plug and Play (UPnP) SDK library
 PKG_SECTION:=		libs
 PKG_BUILDDEP:=		autotool
diff --git a/package/libvirt/Makefile b/package/libvirt/Makefile
index a6c593f19..9b76da0b9 100644
--- a/package/libvirt/Makefile
+++ b/package/libvirt/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		2
 PKG_MD5SUM:=		3d9f85d586c9aa3d819b626622f3fc97
 PKG_DESCR:=		virtualization API
 PKG_SECTION:=		libs
-PKG_BUILDDEP:=		libxml2 gnutls python2 libpcap parted systemd
+PKG_BUILDDEP:=		libxml2 gnutls python2 libpcap parted eudev
 PKG_DEPENDS:=		libxml2 libgnutls python2 libpcap libreadline
 PKG_DEPENDS+=		dmidecode kmod-netfilter-xt-target-checksum
 PKG_DEPENDS+=		dnsmasq qemu libnl libudev
diff --git a/package/libvpx/Makefile b/package/libvpx/Makefile
index 97dec8bcb..5f73e56b9 100644
--- a/package/libvpx/Makefile
+++ b/package/libvpx/Makefile
@@ -14,7 +14,7 @@ PKG_URL:=		http://www.webmproject.org/about/
 PKG_SITES:=		http://webm.googlecode.com/files/
 PKG_OPTS:=		dev
 
-PKG_ARCH_DEPENDS:=	!avr32 !m68k
+PKG_ARCH_DEPENDS:=	!m68k
 
 DISTFILES:=             ${PKG_NAME}-v${PKG_VERSION}.tar.bz2
 WRKDIST=		$(WRKDIR)/${PKG_NAME}-v${PKG_VERSION}
diff --git a/package/libx264/Makefile b/package/libx264/Makefile
index 1936ad533..55bd18868 100644
--- a/package/libx264/Makefile
+++ b/package/libx264/Makefile
@@ -4,16 +4,18 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libx264
-# actually is snapshot x264-snapshot-20131010-2245
-PKG_VERSION:=		1.0
-PKG_RELEASE:=		3
-PKG_MD5SUM:=		e6718029b4bc955f1dbb9bdafeed3ac0
+# actually is git checkout from 22.01.2014
+PKG_VERSION:=		1.0.1
+PKG_RELEASE:=		2
+PKG_MD5SUM:=		6be3e8adeaf6b007bbc04026b6ebd304
 PKG_DESCR:=		H264 encoding library
 PKG_SECTION:=		libs
 PKG_URL:=		http://www.videolan.org/developers/x264.html
 PKG_SITES:=		http://openadk.org/distfiles/
 PKG_OPTS:=		dev
 
+PKG_BUILDDEP_IBM_X40:=	yasm-host
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBX264,libx264,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
@@ -21,7 +23,8 @@ $(eval $(call PKG_template,LIBX264,libx264,$(PKG_VERSION)-${PKG_RELEASE},${PKG_D
 ifeq ($(ADK_TARGET_SYSTEM_SHARP_ZAURUS),y)
 CONFIGURE_ARGS+=	--disable-asm
 endif
-CONFIGURE_ARGS+=	--disable-cli
+CONFIGURE_ARGS+=	--disable-cli \
+			--cross-prefix=$(TARGET_CROSS)
 
 libx264-install:
 	$(INSTALL_DIR) $(IDIR_LIBX264)/usr/lib
diff --git a/package/libx264/patches/patch-Makefile b/package/libx264/patches/patch-Makefile
index e82e9bf2d..cd8a9f198 100644
--- a/package/libx264/patches/patch-Makefile
+++ b/package/libx264/patches/patch-Makefile
@@ -1,6 +1,6 @@
---- libx264-1.0.orig/Makefile	2013-10-10 22:45:04.000000000 +0200
-+++ libx264-1.0/Makefile	2013-10-12 17:50:05.000000000 +0200
-@@ -118,7 +118,7 @@ endif
+--- libx264-1.0.1.orig/Makefile	2014-01-22 11:20:21.000000000 +0100
++++ libx264-1.0.1/Makefile	2014-01-22 11:26:46.000000000 +0100
+@@ -117,7 +117,7 @@ endif
  
  # NEON optims
  ifeq ($(ARCH),ARM)
diff --git a/package/libx264/patches/patch-configure b/package/libx264/patches/patch-configure
index dd0097aeb..ed9d2ed94 100644
--- a/package/libx264/patches/patch-configure
+++ b/package/libx264/patches/patch-configure
@@ -1,6 +1,15 @@
---- libx264-1.0.orig/configure	2013-10-10 22:45:04.000000000 +0200
-+++ libx264-1.0/configure	2013-10-12 17:49:39.000000000 +0200
-@@ -985,9 +985,9 @@ if [ "$debug" = "yes" ]; then
+--- libx264-1.0.1.orig/configure	2014-01-22 11:20:21.000000000 +0100
++++ libx264-1.0.1/configure	2014-01-22 19:42:21.000000000 +0100
+@@ -662,7 +662,7 @@ case $host_cpu in
+                 LDFLAGS="$LDFLAGS -arch armv7"
+             fi
+         else
+-            AS="${AS-${cross_prefix}gcc}"
++            AS="${cross_prefix}gcc"
+         fi
+         ;;
+     s390|s390x)
+@@ -1007,9 +1007,9 @@ if [ "$debug" = "yes" ]; then
  elif [ $ARCH = ARM ]; then
      # arm-gcc-4.2 produces incorrect output with -ffast-math
      # and it doesn't save any speed anyway on 4.4, so disable it
@@ -12,7 +21,7 @@
  fi
  
  if cc_check '' -fno-tree-vectorize ; then
-@@ -1125,6 +1125,7 @@ bindir=$bindir
+@@ -1147,6 +1147,7 @@ bindir=$bindir
  libdir=$libdir
  includedir=$includedir
  ARCH=$ARCH
@@ -20,12 +29,3 @@
  SYS=$SYS
  CC=$CC
  CFLAGS=$CFLAGS
-@@ -1136,7 +1137,7 @@ LIBX264=$LIBX264
- AR=$AR
- RANLIB=$RANLIB
- STRIP=$STRIP
--AS=$AS
-+AS=$CC
- ASFLAGS=$ASFLAGS
- RC=$RC
- RCFLAGS=$RCFLAGS
diff --git a/package/llvm/Makefile b/package/llvm/Makefile
index 10a00d7bd..2375e092c 100644
--- a/package/llvm/Makefile
+++ b/package/llvm/Makefile
@@ -4,20 +4,20 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		llvm
-PKG_VERSION:=		3.3
+PKG_VERSION:=		3.4
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		40564e1dc390f9844f1711c08b08e391
+PKG_MD5SUM:=		46ed668a1ce38985120dbf6344cf6116
 PKG_DESCR:=		collection of modular and reusable compiler and toolchain technologies
 PKG_SECTION:=		lang
 PKG_URL:=		http://llvm.org/
-PKG_SITES:=		http://llvm.org/releases/3.3/
+PKG_SITES:=		http://llvm.org/releases/3.4/
 
 PKG_LIBC_DEPENDS:=	eglibc glibc musl
 PKG_HOST_DEPENDS:=	!darwin
 PKG_ARCH_DEPENDS:=	mips x86 x86_64 arm
 
+PKG_CFLINE_LLVM:=	depends on ADK_BROKEN
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.src.tar.gz
-WRKDIST=		${WRKDIR}/${PKG_NAME}-${PKG_VERSION}.src
 
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/log4cxx/Makefile b/package/log4cxx/Makefile
index d34d8a2f0..fd2dedb70 100644
--- a/package/log4cxx/Makefile
+++ b/package/log4cxx/Makefile
@@ -18,8 +18,6 @@ PKG_OPTS:=		dev
 DISTFILES:=		apache-${PKG_NAME}-${PKG_VERSION}.tar.gz
 WRKDIST=		${WRKDIR}/apache-${PKG_NAME}-${PKG_VERSION}
 
-PKG_ARCH_DEPENDS:=	!cris
-
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LOG4CXX,log4cxx,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
diff --git a/package/miax/Makefile b/package/miax/Makefile
index bd7c9de30..675c1f6b7 100644
--- a/package/miax/Makefile
+++ b/package/miax/Makefile
@@ -14,8 +14,6 @@ PKG_URL:=		http://sourceforge.net/projects/miax
 PKG_SITES:=		http://mesh.dl.sourceforge.net/sourceforge/miax/
 PKG_CFLINE_MIAX:=	depends on ADK_BROKEN
 
-PKG_ARCH_DEPENDS:=	!avr32
-
 DISTFILES:=		${PKG_NAME}_${PKG_VERSION}.tar.gz
 WRKDIST=		${WRKDIR}/${PKG_NAME}
 
diff --git a/package/mpd/Makefile b/package/mpd/Makefile
index aa227c4ec..da3e2e334 100644
--- a/package/mpd/Makefile
+++ b/package/mpd/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		mpd
 PKG_VERSION:=		0.18.5
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		63bcf6ce338caa2ae2cd6dc8e9710d5c
 PKG_DESCR:=		A music player daemon
 PKG_SECTION:=		multimedia
@@ -16,14 +16,14 @@ PKG_URL:=		http://www.musicpd.org/
 PKG_SITES:=		http://www.musicpd.org/download/mpd/0.18/
 PKG_NEED_CXX:=		1
 
-PKG_ARCH_DEPENDS:=	!avr32 !m68k
+PKG_ARCH_DEPENDS:=	!m68k
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
 
 PKG_FLAVOURS_MPD:=	WITH_ALSA WITH_AO WITH_MP3 WITH_MP4 WITH_TREMOR
 PKG_FLAVOURS_MPD+=	WITH_OGG WITH_FLAC WITH_WAV WITH_MMS WITH_FFMPEG
 PKG_FLAVOURS_MPD+=	WITH_SHOUT WITH_CURL WITH_SAMPLERATE WITH_HTTPD
-PKG_FLAVOURS_MPD+=	WITH_OPUS
+PKG_FLAVOURS_MPD+=	WITH_OPUS WITH_PULSE
 
 PKGFD_WITH_ALSA:=	enable ALSA output
 PKGFS_WITH_ALSA:=	alsa-lib
@@ -112,6 +112,13 @@ ifeq ($(ADK_PACKAGE_MPD_WITH_OPUS),y)
 PKG_FDEPENDS+=		libopus
 endif
 
+PKGFD_WITH_PULSE:=	enable PULSE support
+PKGFS_WITH_PULSE:=	pulseaudio
+PKGFB_WITH_PULSE:=	pulseaudio
+ifeq ($(ADK_PACKAGE_MPD_WITH_PULSE),y)
+PKG_FDEPENDS+=		pulseaudio
+endif
+
 PKGFD_WITH_HTTPD:=	enable HTTP output
 
 include ${TOPDIR}/mk/package.mk
@@ -123,7 +130,6 @@ TARGET_CFLAGS+=		-std=gnu99
 CONFIGURE_ENV+=		ac_cv_lib_nsl_gethostbyname=no
 CONFIGURE_ARGS+=	--disable-jack \
 			--disable-fifo \
-			--disable-pulse \
 			--disable-oss \
 			--disable-bzip2 \
 			--disable-libwrap \
@@ -142,6 +148,12 @@ else
 CONFIGURE_ARGS+=	--disable-httpd-output
 endif
 
+ifneq (${ADK_PACKAGE_MPD_WITH_PULSE},)
+CONFIGURE_ARGS+=	--enable-pulse
+else
+CONFIGURE_ARGS+=	--disable-pulse
+endif
+
 ifneq (${ADK_PACKAGE_MPD_WITH_ALSA},)
 CONFIGURE_ARGS+=	--enable-alsa
 else
diff --git a/package/mpdbox/Makefile b/package/mpdbox/Makefile
new file mode 100644
index 000000000..fd164e8ad
--- /dev/null
+++ b/package/mpdbox/Makefile
@@ -0,0 +1,30 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		mpdbox
+PKG_VERSION:=		1.0
+PKG_RELEASE:=		2
+PKG_MD5SUM:=		ac0dc1cc7141c1eca66d8ddd98574e0b
+PKG_DESCR:=		MPD web interface
+PKG_SECTION:=		multimedia
+PKG_URL:=		http://www.openadk.org/cgi-bin/gitweb.cgi?p=mpdbox.git;a=summary
+PKG_SITES:=		http://www.openadk.org/distfiles/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,MPDBOX,mpdbox,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIG_STYLE:=		manual
+BUILD_STYLE:=		manual
+INSTALL_STYLE:=		manual
+
+mpdbox-install:
+	$(INSTALL_DIR) $(IDIR_MPDBOX)/srv/www/htdocs
+	$(CP) $(WRKBUILD)/* \
+		$(IDIR_MPDBOX)/srv/www/htdocs
+	$(CP) $(IDIR_MPDBOX)/srv/www/htdocs/inc/config.inc.example \
+		$(IDIR_MPDBOX)/srv/www/htdocs/inc/config.inc
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/mpfr/Makefile b/package/mpfr/Makefile
index 00508ce69..41647e0bf 100644
--- a/package/mpfr/Makefile
+++ b/package/mpfr/Makefile
@@ -7,6 +7,7 @@ include ${TOPDIR}/toolchain/mpfr/Makefile.inc
 PKG_NAME:=		mpfr
 PKG_DESCR:=		multi precision library
 PKG_SECTION:=		libs
+PKG_BUILDDEP:=		gmp
 PKG_URL:=		http://www.mpfr.org/
 PKG_OPTS:=		dev
 
diff --git a/package/mrd6/Makefile b/package/mrd6/Makefile
index 909a7359a..46f7595c5 100644
--- a/package/mrd6/Makefile
+++ b/package/mrd6/Makefile
@@ -14,8 +14,6 @@ PKG_SITES:=		http://www.openadk.org/distfiles/
 PKG_NEED_CXX:=		1
 PKG_CXX:=		MRD6
 
-PKG_ARCH_DEPENDS:=	!avr32
-
 WRKBUILD=		${WRKSRC}/src
 
 include ${TOPDIR}/mk/package.mk
diff --git a/package/mt-daapd/Makefile b/package/mt-daapd/Makefile
index 7303c86e7..d1baa41e4 100644
--- a/package/mt-daapd/Makefile
+++ b/package/mt-daapd/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		mt-daapd
 PKG_VERSION:=		0.2.4.2
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		67bef9fb14d487693b0dfb792c3f1b05
 PKG_DESCR:=		a multi-threaded DAAP daemon
 PKG_SECTION:=		multimedia
diff --git a/package/mt-daapd/patches/patch-src_mp3-scanner_c b/package/mt-daapd/patches/patch-src_mp3-scanner_c
new file mode 100644
index 000000000..e5defb78f
--- /dev/null
+++ b/package/mt-daapd/patches/patch-src_mp3-scanner_c
@@ -0,0 +1,10 @@
+--- mt-daapd-0.2.4.2.orig/src/mp3-scanner.c	2008-04-19 21:17:23.000000000 +0200
++++ mt-daapd-0.2.4.2/src/mp3-scanner.c	2014-01-20 12:19:42.000000000 +0100
+@@ -40,6 +40,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <sys/param.h>
+ 
+ #include <netinet/in.h>  /* htons and friends */
+ #include <sys/stat.h>
diff --git a/package/nasm/Makefile b/package/nasm/Makefile
index 93e50f36b..39e451a70 100644
--- a/package/nasm/Makefile
+++ b/package/nasm/Makefile
@@ -4,23 +4,28 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		nasm
-PKG_VERSION:=		2.07
+PKG_VERSION:=		2.11
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		84d8e009b3d2565a810ab3ddad1f4f63
+PKG_MD5SUM:=		a884450ee65201473af4d270bdc132f8
 PKG_DESCR:=		the netwide assembler
 PKG_SECTION:=		lang
+PKG_BUILDDEP:=		nasm-host
 PKG_URL:=		http://sourceforge.net/projects/nasm/
-PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=nasm/nasm%20sources/2.07/}
+PKG_SITES:=		http://www.nasm.us/pub/nasm/releasebuilds/${PKG_VERSION}/
 
+include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
+$(eval $(call HOST_template,NASM,nasm,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,NASM,nasm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 FAKE_FLAGS+=		INSTALLROOT=${WRKINST}
+HOST_STYLE:=		auto
 
 nasm-install:
 	$(INSTALL_DIR) $(IDIR_NASM)/usr/bin
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/nasm \
 		$(IDIR_NASM)/usr/bin
 
+include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/ndisc/Makefile b/package/ndisc/Makefile
index 5e044ded4..b82b4ebb8 100644
--- a/package/ndisc/Makefile
+++ b/package/ndisc/Makefile
@@ -4,14 +4,16 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		ndisc6
-PKG_VERSION:=		0.9.8
+PKG_VERSION:=		1.0.2
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		cb8d70564b8d40aae95e19592c6be183
+PKG_MD5SUM:=		50cb4c19606cf6ff2b7388e71832f579
 PKG_DESCR:=		ICMPv6 Neighbour Discovery tools
 PKG_SECTION:=		ipv6
 PKG_URL:=		http://www.remlab.net/
 PKG_SITES:=		http://www.remlab.net/files/ndisc6/
 
+PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
+
 PKG_SUBPKGS:=		NDISC6 RDISC6 TCPTRACEROUTE6
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile
index 18845a0a5..ec7cb4377 100644
--- a/package/nfs-utils/Makefile
+++ b/package/nfs-utils/Makefile
@@ -5,11 +5,11 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		nfs-utils
 PKG_VERSION:=		1.2.8
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		fb48630b7c145fb9d6602a79c6eaab11
 PKG_DESCR:=		Utilities for NFS kernel server implementation
 PKG_SECTION:=		net/fs
-PKG_DEPENDS:=		kmod-nfsd keyutils libtirpc rpcbind libdevmapper libpthread
+PKG_DEPENDS:=		keyutils libtirpc rpcbind libdevmapper libpthread
 PKG_FDEPENDS:=		$(PKG_DEPENDS)
 PKG_BUILDDEP:=		keyutils libtirpc lvm
 PKG_URL:=		http://sourceforge.net/projects/nfs
@@ -20,6 +20,12 @@ PKG_SITES:=		http://openadk.org/distfiles/
 
 PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
 
+PKG_SUBPKGS:=		NFS_UTILS NFS_UTILS_CLIENT NFS_UTILS_SERVER
+PKGSS_NFS_UTILS_CLIENT:=kmod-nfs-fs
+PKGSD_NFS_UTILS_CLIENT:=NFS client utilities (mount)
+PKGSS_NFS_UTILS_SERVER:=kmod-nfsd
+PKGSD_NFS_UTILS_SERVER:=NFS server daemons and utilities
+
 PKG_FLAVOURS_NFS_UTILS:=WITH_KERBEROS
 PKGFD_WITH_KERBEROS:=	enable Kerberos support (MIT)
 PKGFS_WITH_KERBEROS:=	libkrb5 libevent libnfsidmap librpcsecgss libcom-err libgssglue kmod-rpcsec-gss-krb5 kmod-sunrpc-gss
@@ -34,6 +40,8 @@ endif
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,NFS_UTILS,nfs-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_FDEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,NFS_UTILS_CLIENT,nfs-utils-client,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_NFS_UTILS_CLIENT},${PKGSD_NFS_UTILS_CLIENT},${PKG_SECTION}))
+$(eval $(call PKG_template,NFS_UTILS_SERVER,nfs-utils-server,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_NFS_UTILS_SERVER},${PKGSD_NFS_UTILS_SERVER},${PKG_SECTION}))
 
 ifeq ($(ADK_NATIVE),)
 KRB5INC:=		${STAGING_TARGET_DIR}/usr
@@ -63,26 +71,31 @@ CONFIGURE_ARGS+=	--without-tcp-wrappers \
 			--with-tirpcinclude=${TIRPCINC} \
 			--disable-uuid
 
-nfs-utils-install:
-	${INSTALL_DIR} ${IDIR_NFS_UTILS}/usr/sbin ${IDIR_NFS_UTILS}/etc
-	${INSTALL_DIR} ${IDIR_NFS_UTILS}/sbin
-	${CP} ${WRKINST}/sbin/{u,}mount.nfs* ${IDIR_NFS_UTILS}/sbin
-	${INSTALL_DATA} ./files/rpc ${IDIR_NFS_UTILS}/etc
+nfs-utils-client-install:
+	${INSTALL_DIR} ${IDIR_NFS_UTILS_CLIENT}/sbin
+	${CP} ${WRKINST}/sbin/{u,}mount.nfs* ${IDIR_NFS_UTILS_CLIENT}/sbin
+
+nfs-utils-server-install:
+	${INSTALL_DIR} ${IDIR_NFS_UTILS_SERVER}/usr/sbin ${IDIR_NFS_UTILS_SERVER}/etc
 	${INSTALL_BIN} ${WRKBUILD}/utils/exportfs/exportfs \
-		${IDIR_NFS_UTILS}/usr/sbin/
-	${INSTALL_DATA} ./files/nfsd.exports ${IDIR_NFS_UTILS}/etc/exports
+		${IDIR_NFS_UTILS_SERVER}/usr/sbin/
+	${INSTALL_DATA} ./files/nfsd.exports ${IDIR_NFS_UTILS_SERVER}/etc/exports
 	${INSTALL_BIN} ${WRKBUILD}/utils/nfsd/nfsd \
-		${IDIR_NFS_UTILS}/usr/sbin/
+		${IDIR_NFS_UTILS_SERVER}/usr/sbin/
 	${INSTALL_BIN} ${WRKBUILD}/utils/mountd/mountd \
-		${IDIR_NFS_UTILS}/usr/sbin/
+		${IDIR_NFS_UTILS_SERVER}/usr/sbin/
 ifeq ($(ADK_PACKAGE_NFS_UTILS_WITH_KERBEROS),y)
-	${INSTALL_DATA} ./files/idmapd.conf ${IDIR_NFS_UTILS}/etc
+	${INSTALL_DATA} ./files/idmapd.conf ${IDIR_NFS_UTILS_SERVER}/etc
 	${INSTALL_BIN} ${WRKBUILD}/utils/gssd/gssd \
-		${IDIR_NFS_UTILS}/usr/sbin/
+		${IDIR_NFS_UTILS_SERVER}/usr/sbin/
 	${INSTALL_BIN} ${WRKBUILD}/utils/gssd/svcgssd \
-		${IDIR_NFS_UTILS}/usr/sbin/
+		${IDIR_NFS_UTILS_SERVER}/usr/sbin/
 	${INSTALL_BIN} ${WRKBUILD}/utils/idmapd/idmapd \
-		${IDIR_NFS_UTILS}/usr/sbin/
+		${IDIR_NFS_UTILS_SERVER}/usr/sbin/
 endif
 
+nfs-utils-install:
+	${INSTALL_DIR} ${IDIR_NFS_UTILS}/etc
+	${INSTALL_DATA} ./files/rpc ${IDIR_NFS_UTILS}/etc
+
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/nspr/Makefile b/package/nspr/Makefile
index 33063d67f..102b2c017 100644
--- a/package/nspr/Makefile
+++ b/package/nspr/Makefile
@@ -13,8 +13,6 @@ PKG_URL:=		http://www.mozilla.org/projects/nspr/
 PKG_SITES:=		ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PKG_VERSION}/src/
 PKG_OPTS:=		dev
 
-PKG_ARCH_DEPENDS:=	!cris
-
 WRKSRC=			${WRKDIST}/nspr
 
 include $(TOPDIR)/mk/package.mk
diff --git a/package/nss/Makefile b/package/nss/Makefile
index ffffc69e1..868dd5d4d 100644
--- a/package/nss/Makefile
+++ b/package/nss/Makefile
@@ -20,7 +20,6 @@ PKG_SITES:=		ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${P
 PKG_NOPARALLEL:=	1
 
 PKG_HOST_DEPENDS:=	!cygwin
-PKG_ARCH_DEPENDS:=	!cris
 
 WRKSRC=			${WRKDIST}/nss
 
diff --git a/package/ntfs-3g/Makefile b/package/ntfs-3g/Makefile
index 6f65db548..5151bfd21 100644
--- a/package/ntfs-3g/Makefile
+++ b/package/ntfs-3g/Makefile
@@ -4,16 +4,17 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		ntfs-3g
-PKG_VERSION:=		2010.1.16
+PKG_VERSION:=		2013.1.13
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		e104c914e8d7d29ee83e63d46afbba25
+PKG_MD5SUM:=		2d6fb47ddf62b51733227126fe9227fe
 PKG_DESCR:=		ntfs filesystem driver
-PKG_SECTION:=		kernel
+PKG_SECTION:=		fs
 PKG_DEPENDS:=		kmod-fuse-fs
 PKG_URL:=		http://tuxera.com
 PKG_SITES:=		http://tuxera.com/opensource/
 
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tgz
+DISTFILES:=		${PKG_NAME}_ntfsprogs-${PKG_VERSION}.tgz
+WRKDIST=		${WRKDIR}/${PKG_NAME}_ntfsprogs-${PKG_VERSION}
 
 include ${TOPDIR}/mk/package.mk
 
diff --git a/package/nut/Makefile b/package/nut/Makefile
index 655b93e51..cfee356fc 100644
--- a/package/nut/Makefile
+++ b/package/nut/Makefile
@@ -12,8 +12,6 @@ PKG_SECTION:=		net/misc
 PKG_URL:=		http://www.networkupstools.org/
 PKG_SITES:=		http://www.networkupstools.org/source/2.4/
 
-PKG_ARCH_DEPENDS:=	!avr32
-
 PKG_FLAVOURS_NUT:=	WITH_SSL WITH_SNMP WITH_USB
 PKGFD_WITH_SNMP:=	enable SNMP support
 PKGFS_WITH_SNMP:=	libnetsnmp
diff --git a/package/obexftp/Makefile b/package/obexftp/Makefile
index 828d73871..0aaff10ff 100644
--- a/package/obexftp/Makefile
+++ b/package/obexftp/Makefile
@@ -20,8 +20,6 @@ PKG_SUBPKGS:=		OBEXFTP LIBOBEXFTP
 PKGSC_LIBOBEXFTP:=	libs
 PKGSD_LIBOBEXFTP:=	obex ftp library
 
-PKG_ARCH_DEPENDS:=	!avr32
-
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 ifeq ($(ADK_STATIC),y)
diff --git a/package/omxplayer/Makefile b/package/omxplayer/Makefile
index 6e3c9f7b9..a4da71aef 100644
--- a/package/omxplayer/Makefile
+++ b/package/omxplayer/Makefile
@@ -11,7 +11,7 @@ PKG_MD5SUM:=		1882cac6032baa59291068af30df1702
 PKG_DESCR:=		video player for raspberry pi
 PKG_SECTION:=		multimedia
 PKG_DEPENDS:=		libffmpeg boost bcm2835-vc libfreetype libpcre
-PKG_DEPENDS+=		librt zlib libpthread libstdcxx libgcc dbus xset fbset
+PKG_DEPENDS+=		librt zlib libpthread libstdcxx libgcc libdbus
 PKG_BUILDDEP:=		ffmpeg boost bcm2835-vc freetype pcre dbus
 PKG_URL:=		https://github.com/popcornmix/omxplayer
 PKG_SITES:=		http://openadk.org/distfiles/
@@ -35,8 +35,8 @@ TARGET_LDFLAGS+=	-L$(STAGING_DIR)/opt/vc/lib
 
 omxplayer-install:
 	$(INSTALL_DIR) $(IDIR_OMXPLAYER)/usr/bin
-	$(INSTALL_BIN) $(WRKSRC)/omxplayer{,.bin} \
-		$(IDIR_OMXPLAYER)/usr/bin
+	$(INSTALL_BIN) $(WRKSRC)/omxplayer.bin \
+		$(IDIR_OMXPLAYER)/usr/bin/omxplayer
 	$(INSTALL_DIR) $(IDIR_OMXPLAYER)/usr/share/fonts/truetype/freefont/
 	$(INSTALL_DATA) $(WRKSRC)/fonts/* \
 		$(IDIR_OMXPLAYER)/usr/share/fonts/truetype/freefont/
diff --git a/package/omxplayer/patches/patch-omxplayer b/package/omxplayer/patches/patch-omxplayer
deleted file mode 100644
index 94dd052ae..000000000
--- a/package/omxplayer/patches/patch-omxplayer
+++ /dev/null
@@ -1,85 +0,0 @@
---- omxplayer-0.3.orig/omxplayer	2014-01-07 09:24:29.000000000 +0100
-+++ omxplayer-0.3/omxplayer	2014-01-10 17:57:55.229752300 +0100
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- #
- # OMXPlayer launcher script.
- #
-@@ -13,38 +13,10 @@ else
-     OMXPLAYER_LIBS="$OMXPLAYER_LIBS:/usr/lib/omxplayer"
- fi
- 
--refresh_regex='(|.* )(-r|--refresh)( .*|$)'
--audio_regex='.*\.(mp3|wav|wma|cda|ogg|ogm|aac|ac3|flac)( .*|$)'
--
- fbset_bin=`which fbset`
--xset_bin=`which xset`
--xrefresh_bin=`which xrefresh`
--
--if [ -z $NOREFRESH ] || [ "$NOREFRESH" == "0" ]; then
--    if [[ $@ =~ $refresh_regex ]] && [[ ! $@ =~ $audio_regex ]]; then
--        check_failed=0
--
--        if [ -z $fbset_bin ]; then
--            echo "WARNING: You are going to run omxplayer with -r/--refresh and you don't have fbset installed, this can cause black screen when it finishes playing."
--            check_failed=1
--        fi
--
--        if [ ! -z $DISPLAY ]; then
--            if [ -z $xset_bin ] || [ -z $xrefresh_bin ]; then
--                echo "WARNING: You are going to run omxplayer with -r/--refresh and you don't have xset and xrefresh installed (x11-xserver-utils package on Debian/Raspbian), this can cause black screen when it finishes playing."
--                check_failed=1
--            fi
--        fi
--
--        if [ "$check_failed" == "1" ]; then
--            read -sn 1 -p "Press any key to continue or Ctrl-C to quit."
--            echo
--        fi
--    fi
--fi
- 
--OMXPLAYER_DBUS_ADDR=`mktemp -t omxplayer-XXXXX`
--OMXPLAYER_DBUS_PID=`mktemp -t omxplayer-XXXXX`
-+OMXPLAYER_DBUS_ADDR=`mktemp`
-+OMXPLAYER_DBUS_PID=`mktemp`
- 
- exec 5> $OMXPLAYER_DBUS_ADDR
- exec 6> $OMXPLAYER_DBUS_PID
-@@ -66,16 +38,7 @@ fi
- rm -f $OMXPLAYER_DBUS_ADDR
- rm -f $OMXPLAYER_DBUS_PID
- 
--if [ ! -z $NOREFRESH ] && [ "$NOREFRESH" == "1" ]; then
--    exit 0
--fi
--
--if [[ $@ =~ $audio_regex ]]; then
--    exit 0
--fi
--
--if [[ $@ =~ $refresh_regex ]]; then
--    if [ ! -z $fbset_bin ]; then
-+if [ ! -z $fbset_bin ]; then
-         DEPTH2=`$fbset_bin | head -3 | tail -1 | cut -d " " -f 10`
- 
-         if [ "$DEPTH2" == "8" ]; then
-@@ -89,16 +52,5 @@ if [[ $@ =~ $refresh_regex ]]; then
- 
-         $fbset_bin -depth $DEPTH1 > /dev/null 2>&1
-         $fbset_bin -depth $DEPTH2 > /dev/null 2>&1
--    fi
--
--    if [ ! -z $xset_bin ] && [ ! -z $xrefresh_bin ]; then
--        if [ -z $DISPLAY ]; then
--            DISPLAY=":0"
--        fi
--
--        $xset_bin -display $DISPLAY -q > /dev/null 2>&1
--        if [ "$?" == "0" ]; then
--            $xrefresh_bin -display $DISPLAY > /dev/null 2>&1
--        fi
--    fi
- fi
-+
diff --git a/package/openobex/Makefile b/package/openobex/Makefile
index d0091fe5c..24f3484bb 100644
--- a/package/openobex/Makefile
+++ b/package/openobex/Makefile
@@ -13,8 +13,6 @@ PKG_URL:=		http://dev.zuckschwerdt.org/openobex/wiki/WikiStart
 PKG_SITES:=		${MASTER_SITE_KERNEL:=bluetooth/}
 PKG_OPTS:=		dev
 
-PKG_ARCH_DEPENDS:=	!avr32
-
 ifeq ($(ADK_STATIC),y)
 PKG_OPTS+=		libonly
 endif
diff --git a/package/opensc/Makefile b/package/opensc/Makefile
index 21d20c026..ce7fe7d3e 100644
--- a/package/opensc/Makefile
+++ b/package/opensc/Makefile
@@ -16,8 +16,6 @@ PKG_SITES:=		http://www.opensc-project.org/files/opensc/
 PKG_LIBNAME:=		libopensc
 PKG_OPTS:=		dev
 
-PKG_ARCH_DEPENDS:=	!avr32
-
 PKG_SUBPKGS:=		OPENSC LIBOPENSC
 PKGSD_LIBOPENSC:=	opensc library
 PKGSC_LIBOPENSC:=	libs
diff --git a/package/openswan/Makefile b/package/openswan/Makefile
index ae750a2a4..efea0b004 100644
--- a/package/openswan/Makefile
+++ b/package/openswan/Makefile
@@ -20,8 +20,6 @@ PKG_URL:=		http://www.openswan.org/
 PKG_SITES:=		http://www.openswan.org/download/
 PKG_NOPARALLEL:=	1
 
-PKG_ARCH_DEPENDS:=	!avr32
-
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,OPENSWAN,openswan,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/oprofile/Makefile b/package/oprofile/Makefile
index 1d4278fd0..622c246d4 100644
--- a/package/oprofile/Makefile
+++ b/package/oprofile/Makefile
@@ -14,7 +14,7 @@ PKG_BUILDDEP:=		popt binutils
 PKG_URL:=		http://oprofile.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=oprofile/}
 
-PKG_ARCH_DEPENDS:=	!cris !avr32 !m68k
+PKG_ARCH_DEPENDS:=	!m68k
 PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
 
 PKG_CFLINE_OPROFILE:=	select BUSYBOX_EXPR
diff --git a/package/orbit2/Makefile b/package/orbit2/Makefile
index 15cc231ee..46da045d1 100644
--- a/package/orbit2/Makefile
+++ b/package/orbit2/Makefile
@@ -16,8 +16,6 @@ PKG_SITES:=		ftp://ftp.gnome.org//pub/gnome/sources/ORBit2/${PKG_EXTRAVER}/
 PKG_LIBNAME:=		orbit2
 PKG_OPTS:=		dev
 
-PKG_ARCH_DEPENDS:=	!cris
-
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,ORBIT2,orbit2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
diff --git a/package/pcc-libs/Makefile b/package/pcc-libs/Makefile
index 4e04de03c..9860b6805 100644
--- a/package/pcc-libs/Makefile
+++ b/package/pcc-libs/Makefile
@@ -12,7 +12,7 @@ PKG_SECTION:=		lang
 PKG_URL:=		http://pcc.ludd.ltu.se/
 PKG_SITES:=		http://pcc.ludd.ltu.se/ftp/pub/pcc-releases/
 
-PKG_ARCH_DEPENDS:=	!arm !cris !m68k !mips !ppc !avr32
+PKG_ARCH_DEPENDS:=	!arm !m68k !mips !ppc
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tgz
 
 include $(TOPDIR)/mk/package.mk
diff --git a/package/pcc/Makefile b/package/pcc/Makefile
index 5630157de..c7f3878da 100644
--- a/package/pcc/Makefile
+++ b/package/pcc/Makefile
@@ -14,7 +14,7 @@ PKG_URL:=		http://pcc.ludd.ltu.se/
 PKG_SITES:=		http://pcc.ludd.ltu.se/ftp/pub/pcc-releases/
 PKG_NOPARALLEL:=	1
 
-PKG_ARCH_DEPENDS:=	!arm !cris !m68k !mips !ppc !avr32
+PKG_ARCH_DEPENDS:=	!arm !m68k !mips !ppc
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tgz
 
 include $(TOPDIR)/mk/package.mk
diff --git a/package/pcsc-lite/Makefile b/package/pcsc-lite/Makefile
index 8a7f496dd..bc54b608b 100644
--- a/package/pcsc-lite/Makefile
+++ b/package/pcsc-lite/Makefile
@@ -15,8 +15,6 @@ PKG_URL:=		http://pcsclite.alioth.debian.org/
 PKG_SITES:=		http://alioth.debian.org/frs/download.php/file/3598/
 PKG_OPTS:=		dev
 
-PKG_ARCH_DEPENDS:=	!avr32
-
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 include $(TOPDIR)/mk/package.mk
diff --git a/package/perl/files/config.sh.arm.musl b/package/perl/files/config.sh.arm.musl
new file mode 100644
index 000000000..6e5665a67
--- /dev/null
+++ b/package/perl/files/config.sh.arm.musl
@@ -0,0 +1,1118 @@
+#!/bin/sh
+#
+# This file was produced by running the Configure script. It holds all the
+# definitions figured out by Configure. Should you modify one of these values,
+# do not forget to propagate your changes by running "Configure -der". You may
+# instead choose to run each of the .SH files by yourself, or "Configure -S".
+#
+
+# Package name      : perl5
+# Source directory  : .
+# Configuration time: Thu Jan  1 00:02:36 GMT 1970
+# Configured by     : root
+# Target system     : linux openadk 3.12.6 #1 fri jan 10 18:48:49 cet 2014 arm gnulinux 
+
+: Configure command line arguments.
+config_arg0='./Configure'
+config_args='-des'
+config_argc=1
+config_arg1='-des'
+
+Author=''
+Date='$Date'
+Header=''
+Id='$Id'
+Locker=''
+Log='$Log'
+RCSfile='$RCSfile'
+Revision='$Revision'
+Source=''
+State=''
+_a='.a'
+_exe=''
+_o='.o'
+afs='false'
+afsroot='/afs'
+alignbytes='8'
+ansi2knr=''
+aphostname='/bin/hostname'
+api_revision='5'
+api_subversion='0'
+api_version='18'
+api_versionstring='5.18.0'
+ar='ar'
+archlib='/usr/lib/perl5/5.18.1/arm-linux'
+archlibexp='/usr/lib/perl5/5.18.1/arm-linux'
+archname64=''
+archname='arm-linux'
+archobjs=''
+asctime_r_proto='0'
+awk='awk'
+baserev='5.0'
+bash=''
+bin='/usr/bin'
+bin_ELF='define'
+binexp='/usr/bin'
+bison='bison'
+bootstrap_charset='undef'
+byacc='byacc'
+byteorder='1234'
+c=''
+castflags='1'
+cat='cat'
+cc='%%CC%%'
+cccdlflags='-fPIC'
+ccdlflags='-Wl,-E'
+ccflags='%%CFLAGS%%'
+ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
+ccname='gcc'
+ccsymbols=''
+ccversion=''
+cf_by='root'
+cf_email='root@openadk.nonet'
+cf_time='Thu Jan  1 00:02:36 GMT 1970'
+charbits='8'
+charsize='1'
+chgrp=''
+chmod='chmod'
+chown=''
+clocktype='clock_t'
+comm='comm'
+compress=''
+contains='grep'
+cp='cp'
+cpio=''
+cpp='cpp'
+cpp_stuff='42'
+cppccsymbols=''
+cppflags='%%CPPFLAGS%%'
+cpplast='-'
+cppminus='-'
+cpprun='%%CPP%%'
+cppstdin='%%CPP%%'
+cppsymbols='_FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE=1 _XOPEN_SOURCE=700 __ACCUM_EPSILON__=0x1P-15K __ACCUM_FBIT__=15 __ACCUM_IBIT__=16 __ACCUM_MAX__=0X7FFFFFFFP-15K __ACCUM_MIN__=(-0X1P15K-0X1P15K) __APCS_32__=1 __ARMEL__=1 __ARM_ARCH_5T__=1 __ARM_EABI__=1 __ARM_PCS=1 __ATOMIC_ACQUIRE=2 __ATOMIC_ACQ_REL=4 __ATOMIC_CONSUME=1 __ATOMIC_RELAXED=0 __ATOMIC_RELEASE=3 __ATOMIC_SEQ_CST=5 __BIGGEST_ALIGNMENT__=8 __BYTE_ORDER__=1234 __CHAR16_TYPE__=short\ unsigned\ int __CHAR32_TYPE__=unsigned\ int __CHAR_BIT__=8 __CHAR_UNSIGNED__=1 __DA_FBIT__=31 __DA_IBIT__=32 __DBL_DECIMAL_DIG__=17 __DBL_DENORM_MIN__=((double)4.9406564584124654e-324L) __DBL_DIG__=15 __DBL_EPSILON__=((double)2.2204460492503131e-16L) __DBL_HAS_DENORM__=1 __DBL_HAS_INFINITY__=1 __DBL_HAS_QUIET_NAN__=1 __DBL_MANT_DIG__=53 __DBL_MAX_10_EXP__=308 __DBL_MAX_EXP__=1024 __DBL_MAX__=((double)1.7976931348623157e+308L) __DBL_MIN_10_EXP__=(-307) __DBL_MIN_EXP__=(-1021) __DBL_MIN__=((double)2.2250738585072014e-308L) __DEC128_EPSILON__=1E-33DL __DEC128_MANT_DIG__=34 __DEC128_MAX_EXP__=6145 __DEC128_MAX__=9.999999999999999999999999999999999E6144DL __DEC128_MIN_EXP__=(-6142) __DEC128_MIN__=1E-6143DL __DEC128_SUBNORMAL_MIN__=0.000000000000000000000000000000001E-6143DL __DEC32_EPSILON__=1E-6DF __DEC32_MANT_DIG__=7 __DEC32_MAX_EXP__=97 __DEC32_MAX__=9.999999E96DF __DEC32_MIN_EXP__=(-94) __DEC32_MIN__=1E-95DF __DEC32_SUBNORMAL_MIN__=0.000001E-95DF __DEC64_EPSILON__=1E-15DD __DEC64_MANT_DIG__=16 __DEC64_MAX_EXP__=385 __DEC64_MAX__=9.999999999999999E384DD __DEC64_MIN_EXP__=(-382) __DEC64_MIN__=1E-383DD __DEC64_SUBNORMAL_MIN__=0.000000000000001E-383DD __DECIMAL_DIG__=17 __DEC_EVAL_METHOD__=2 __DQ_FBIT__=63 __DQ_IBIT__=0 __ELF__=1 __FINITE_MATH_ONLY__=0 __FLOAT_WORD_ORDER__=1234 __FLT_DECIMAL_DIG__=9 __FLT_DENORM_MIN__=1.4012984643248171e-45F __FLT_DIG__=6 __FLT_EPSILON__=1.1920928955078125e-7F __FLT_EVAL_METHOD__=0 __FLT_HAS_DENORM__=1 __FLT_HAS_INFINITY__=1 __FLT_HAS_QUIET_NAN__=1 __FLT_MANT_DIG__=24 __FLT_MAX_10_EXP__=38 __FLT_MAX_EXP__=128 __FLT_MAX__=3.4028234663852886e+38F __FLT_MIN_10_EXP__=(-37) __FLT_MIN_EXP__=(-125) __FLT_MIN__=1.1754943508222875e-38F __FLT_RADIX__=2 __FRACT_EPSILON__=0x1P-15R __FRACT_FBIT__=15 __FRACT_IBIT__=0 __FRACT_MAX__=0X7FFFP-15R __FRACT_MIN__=(-0.5R-0.5R) __GCC_ATOMIC_BOOL_LOCK_FREE=1 __GCC_ATOMIC_CHAR16_T_LOCK_FREE=1 __GCC_ATOMIC_CHAR32_T_LOCK_FREE=1 __GCC_ATOMIC_CHAR_LOCK_FREE=1 __GCC_ATOMIC_INT_LOCK_FREE=1 __GCC_ATOMIC_LLONG_LOCK_FREE=1 __GCC_ATOMIC_LONG_LOCK_FREE=1 __GCC_ATOMIC_POINTER_LOCK_FREE=1 __GCC_ATOMIC_SHORT_LOCK_FREE=1 __GCC_ATOMIC_TEST_AND_SET_TRUEVAL=1 __GCC_ATOMIC_WCHAR_T_LOCK_FREE=1 __GNUC_GNU_INLINE__=1 __GNUC_MINOR__=7 __GNUC_PATCHLEVEL__=3 __GNUC__=4 __GXX_ABI_VERSION=1002 __GXX_TYPEINFO_EQUALITY_INLINE=0 __HA_FBIT__=7 __HA_IBIT__=8 __HQ_FBIT__=15 __HQ_IBIT__=0 __INT16_C=__INT16_C __INT16_MAX__=32767 __INT16_TYPE__=short\ int __INT32_C=__INT32_C __INT32_MAX__=2147483647 __INT32_TYPE__=int __INT64_C=__INT64_C __INT64_MAX__=9223372036854775807LL __INT64_TYPE__=long\ long\ int __INT8_C=__INT8_C __INT8_MAX__=127 __INT8_TYPE__=signed\ char __INTMAX_C=__INTMAX_C __INTMAX_MAX__=9223372036854775807LL __INTMAX_TYPE__=long\ long\ int __INTPTR_MAX__=2147483647 __INTPTR_TYPE__=int __INT_FAST16_MAX__=2147483647 __INT_FAST16_TYPE__=int __INT_FAST32_MAX__=2147483647 __INT_FAST32_TYPE__=int __INT_FAST64_MAX__=9223372036854775807LL __INT_FAST64_TYPE__=long\ long\ int __INT_FAST8_MAX__=127 __INT_FAST8_TYPE__=signed\ char __INT_LEAST16_MAX__=32767 __INT_LEAST16_TYPE__=short\ int __INT_LEAST32_MAX__=2147483647 __INT_LEAST32_TYPE__=int __INT_LEAST64_MAX__=9223372036854775807LL __INT_LEAST64_TYPE__=long\ long\ int __INT_LEAST8_MAX__=127 __INT_LEAST8_TYPE__=signed\ char __INT_MAX__=2147483647 __LACCUM_EPSILON__=0x1P-31LK __LACCUM_FBIT__=31 __LACCUM_IBIT__=32 __LACCUM_MAX__=0X7FFFFFFFFFFFFFFFP-31LK __LACCUM_MIN__=(-0X1P31LK-0X1P31LK) __LDBL_DENORM_MIN__=4.9406564584124654e-324L __LDBL_DIG__=15 __LDBL_EPSILON__=2.2204460492503131e-16L __LDBL_HAS_DENORM__=1 __LDBL_HAS_INFINITY__=1 __LDBL_HAS_QUIET_NAN__=1 __LDBL_MANT_DIG__=53 __LDBL_MAX_10_EXP__=308 __LDBL_MAX_EXP__=1024 __LDBL_MAX__=1.7976931348623157e+308L __LDBL_MIN_10_EXP__=(-307) __LDBL_MIN_EXP__=(-1021) __LDBL_MIN__=2.2250738585072014e-308L __LFRACT_EPSILON__=0x1P-31LR __LFRACT_FBIT__=31 __LFRACT_IBIT__=0 __LFRACT_MAX__=0X7FFFFFFFP-31LR __LFRACT_MIN__=(-0.5LR-0.5LR) __LLACCUM_EPSILON__=0x1P-31LLK __LLACCUM_FBIT__=31 __LLACCUM_IBIT__=32 __LLACCUM_MAX__=0X7FFFFFFFFFFFFFFFP-31LLK __LLACCUM_MIN__=(-0X1P31LLK-0X1P31LLK) __LLFRACT_EPSILON__=0x1P-63LLR __LLFRACT_FBIT__=63 __LLFRACT_IBIT__=0 __LLFRACT_MAX__=0X7FFFFFFFFFFFFFFFP-63LLR __LLFRACT_MIN__=(-0.5LLR-0.5LLR) __LONG_LONG_MAX__=9223372036854775807LL __LONG_MAX__=2147483647L __ORDER_BIG_ENDIAN__=4321 __ORDER_LITTLE_ENDIAN__=1234 __ORDER_PDP_ENDIAN__=3412 __PRAGMA_REDEFINE_EXTNAME=1 __PTRDIFF_MAX__=2147483647 __PTRDIFF_TYPE__=int __QQ_FBIT__=7 __QQ_IBIT__=0 __REGISTER_PREFIX__= __SACCUM_EPSILON__=0x1P-7HK __SACCUM_FBIT__=7 __SACCUM_IBIT__=8 __SACCUM_MAX__=0X7FFFP-7HK __SACCUM_MIN__=(-0X1P7HK-0X1P7HK) __SA_FBIT__=15 __SA_IBIT__=16 __SCHAR_MAX__=127 __SFRACT_EPSILON__=0x1P-7HR __SFRACT_FBIT__=7 __SFRACT_IBIT__=0 __SFRACT_MAX__=0X7FP-7HR __SFRACT_MIN__=(-0.5HR-0.5HR) __SHRT_MAX__=32767 __SIG_ATOMIC_MAX__=2147483647 __SIG_ATOMIC_MIN__=(-2147483647\ -\ 1) __SIG_ATOMIC_TYPE__=int __SIZEOF_DOUBLE__=8 __SIZEOF_FLOAT__=4 __SIZEOF_INT__=4 __SIZEOF_LONG_DOUBLE__=8 __SIZEOF_LONG_LONG__=8 __SIZEOF_LONG__=4 __SIZEOF_POINTER__=4 __SIZEOF_PTRDIFF_T__=4 __SIZEOF_SHORT__=2 __SIZEOF_SIZE_T__=4 __SIZEOF_WCHAR_T__=4 __SIZEOF_WINT_T__=4 __SIZE_MAX__=4294967295U __SIZE_TYPE__=unsigned\ int __SOFTFP__=1 __SQ_FBIT__=31 __SQ_IBIT__=0 __STDC_HOSTED__=1 __STDC__=1 __TA_FBIT__=63 __TA_IBIT__=64 __THUMB_INTERWORK__=1 __TQ_FBIT__=127 __TQ_IBIT__=0 __UACCUM_EPSILON__=0x1P-16UK __UACCUM_FBIT__=16 __UACCUM_IBIT__=16 __UACCUM_MAX__=0XFFFFFFFFP-16UK __UACCUM_MIN__=0.0UK __UDA_FBIT__=32 __UDA_IBIT__=32 __UDQ_FBIT__=64 __UDQ_IBIT__=0 __UFRACT_EPSILON__=0x1P-16UR __UFRACT_FBIT__=16 __UFRACT_IBIT__=0 __UFRACT_MAX__=0XFFFFP-16UR __UFRACT_MIN__=0.0UR __UHA_FBIT__=8 __UHA_IBIT__=8 __UHQ_FBIT__=16 __UHQ_IBIT__=0 __UINT16_C=__UINT16_C __UINT16_MAX__=65535 __UINT16_TYPE__=short\ unsigned\ int __UINT32_C=__UINT32_C __UINT32_MAX__=4294967295U __UINT32_TYPE__=unsigned\ int __UINT64_C=__UINT64_C __UINT64_MAX__=18446744073709551615ULL __UINT64_TYPE__=long\ long\ unsigned\ int __UINT8_C=__UINT8_C __UINT8_MAX__=255 __UINT8_TYPE__=unsigned\ char __UINTMAX_C=__UINTMAX_C __UINTMAX_MAX__=18446744073709551615ULL __UINTMAX_TYPE__=long\ long\ unsigned\ int __UINTPTR_MAX__=4294967295U __UINTPTR_TYPE__=unsigned\ int __UINT_FAST16_MAX__=4294967295U __UINT_FAST16_TYPE__=unsigned\ int __UINT_FAST32_MAX__=4294967295U __UINT_FAST32_TYPE__=unsigned\ int __UINT_FAST64_MAX__=18446744073709551615ULL __UINT_FAST64_TYPE__=long\ long\ unsigned\ int __UINT_FAST8_MAX__=255 __UINT_FAST8_TYPE__=unsigned\ char __UINT_LEAST16_MAX__=65535 __UINT_LEAST16_TYPE__=short\ unsigned\ int __UINT_LEAST32_MAX__=4294967295U __UINT_LEAST32_TYPE__=unsigned\ int __UINT_LEAST64_MAX__=18446744073709551615ULL __UINT_LEAST64_TYPE__=long\ long\ unsigned\ int __UINT_LEAST8_MAX__=255 __UINT_LEAST8_TYPE__=unsigned\ char __ULACCUM_EPSILON__=0x1P-32ULK __ULACCUM_FBIT__=32 __ULACCUM_IBIT__=32 __ULACCUM_MAX__=0XFFFFFFFFFFFFFFFFP-32ULK __ULACCUM_MIN__=0.0ULK __ULFRACT_EPSILON__=0x1P-32ULR __ULFRACT_FBIT__=32 __ULFRACT_IBIT__=0 __ULFRACT_MAX__=0XFFFFFFFFP-32ULR __ULFRACT_MIN__=0.0ULR __ULLACCUM_EPSILON__=0x1P-32ULLK __ULLACCUM_FBIT__=32 __ULLACCUM_IBIT__=32 __ULLACCUM_MAX__=0XFFFFFFFFFFFFFFFFP-32ULLK __ULLACCUM_MIN__=0.0ULLK __ULLFRACT_EPSILON__=0x1P-64ULLR __ULLFRACT_FBIT__=64 __ULLFRACT_IBIT__=0 __ULLFRACT_MAX__=0XFFFFFFFFFFFFFFFFP-64ULLR __ULLFRACT_MIN__=0.0ULLR __UQQ_FBIT__=8 __UQQ_IBIT__=0 __USACCUM_EPSILON__=0x1P-8UHK __USACCUM_FBIT__=8 __USACCUM_IBIT__=8 __USACCUM_MAX__=0XFFFFP-8UHK __USACCUM_MIN__=0.0UHK __USA_FBIT__=16 __USA_IBIT__=16 __USER_LABEL_PREFIX__= __USFRACT_EPSILON__=0x1P-8UHR __USFRACT_FBIT__=8 __USFRACT_IBIT__=0 __USFRACT_MAX__=0XFFP-8UHR __USFRACT_MIN__=0.0UHR __USQ_FBIT__=32 __USQ_IBIT__=0 __UTA_FBIT__=64 __UTA_IBIT__=64 __UTQ_FBIT__=128 __UTQ_IBIT__=0 __VERSION__="4.7.3" __VFP_FP__=1 __WCHAR_MAX__=4294967295U __WCHAR_MIN__=0U __WCHAR_TYPE__=unsigned\ int __WINT_MAX__=4294967295U __WINT_MIN__=0U __WINT_TYPE__=unsigned\ int __arm__=1 __linux=1 __linux__=1 __unix=1 __unix__=1 linux=1 unix=1'
+crypt_r_proto='0'
+cryptlib=''
+csh='csh'
+ctermid_r_proto='0'
+ctime_r_proto='0'
+d_Gconvert='gcvt((x),(n),(b))'
+d_PRIEUldbl='define'
+d_PRIFUldbl='define'
+d_PRIGUldbl='define'
+d_PRIXU64='define'
+d_PRId64='define'
+d_PRIeldbl='define'
+d_PRIfldbl='define'
+d_PRIgldbl='define'
+d_PRIi64='define'
+d_PRIo64='define'
+d_PRIu64='define'
+d_PRIx64='define'
+d_SCNfldbl='define'
+d__fwalk='undef'
+d_access='define'
+d_accessx='undef'
+d_aintl='undef'
+d_alarm='define'
+d_archlib='define'
+d_asctime64='undef'
+d_asctime_r='undef'
+d_atolf='undef'
+d_atoll='define'
+d_attribute_deprecated='define'
+d_attribute_format='define'
+d_attribute_malloc='define'
+d_attribute_nonnull='define'
+d_attribute_noreturn='define'
+d_attribute_pure='define'
+d_attribute_unused='define'
+d_attribute_warn_unused_result='define'
+d_bcmp='define'
+d_bcopy='define'
+d_bsd='undef'
+d_bsdgetpgrp='undef'
+d_bsdsetpgrp='undef'
+d_builtin_choose_expr='define'
+d_builtin_expect='define'
+d_bzero='define'
+d_c99_variadic_macros='define'
+d_casti32='define'
+d_castneg='undef'
+d_charvspr='undef'
+d_chown='define'
+d_chroot='define'
+d_chsize='undef'
+d_class='undef'
+d_clearenv='define'
+d_closedir='define'
+d_cmsghdr_s='define'
+d_const='define'
+d_copysignl='define'
+d_cplusplus='undef'
+d_crypt='define'
+d_crypt_r='undef'
+d_csh='undef'
+d_ctermid='define'
+d_ctermid_r='undef'
+d_ctime64='undef'
+d_ctime_r='undef'
+d_cuserid='define'
+d_dbl_dig='define'
+d_dbminitproto='undef'
+d_difftime64='undef'
+d_difftime='define'
+d_dir_dd_fd='undef'
+d_dirfd='define'
+d_dirnamlen='undef'
+d_dlerror='define'
+d_dlopen='define'
+d_dlsymun='undef'
+d_dosuid='undef'
+d_drand48_r='undef'
+d_drand48proto='define'
+d_dup2='define'
+d_eaccess='define'
+d_endgrent='define'
+d_endgrent_r='undef'
+d_endhent='define'
+d_endhostent_r='undef'
+d_endnent='define'
+d_endnetent_r='undef'
+d_endpent='define'
+d_endprotoent_r='undef'
+d_endpwent='define'
+d_endpwent_r='undef'
+d_endsent='define'
+d_endservent_r='undef'
+d_eofnblk='define'
+d_eunice='undef'
+d_faststdio='undef'
+d_fchdir='define'
+d_fchmod='define'
+d_fchown='define'
+d_fcntl='define'
+d_fcntl_can_lock='undef'
+d_fd_macros='define'
+d_fd_set='define'
+d_fds_bits='define'
+d_fgetpos='define'
+d_finite='define'
+d_finitel='undef'
+d_flexfnam='define'
+d_flock='define'
+d_flockproto='undef'
+d_fork='define'
+d_fp_class='undef'
+d_fpathconf='define'
+d_fpclass='undef'
+d_fpclassify='undef'
+d_fpclassl='undef'
+d_fpos64_t='undef'
+d_frexpl='define'
+d_fs_data_s='undef'
+d_fseeko='define'
+d_fsetpos='define'
+d_fstatfs='define'
+d_fstatvfs='define'
+d_fsync='define'
+d_ftello='define'
+d_ftime='undef'
+d_futimes='undef'
+d_gdbm_ndbm_h_uses_prototypes='undef'
+d_gdbmndbm_h_uses_prototypes='undef'
+d_getaddrinfo='define'
+d_getcwd='define'
+d_getespwnam='undef'
+d_getfsstat='undef'
+d_getgrent='define'
+d_getgrent_r='undef'
+d_getgrgid_r='undef'
+d_getgrnam_r='undef'
+d_getgrps='define'
+d_gethbyaddr='define'
+d_gethbyname='define'
+d_gethent='define'
+d_gethname='define'
+d_gethostbyaddr_r='undef'
+d_gethostbyname_r='undef'
+d_gethostent_r='undef'
+d_gethostprotos='define'
+d_getitimer='define'
+d_getlogin='define'
+d_getlogin_r='undef'
+d_getmnt='undef'
+d_getmntent='define'
+d_getnameinfo='define'
+d_getnbyaddr='define'
+d_getnbyname='define'
+d_getnent='define'
+d_getnetbyaddr_r='undef'
+d_getnetbyname_r='undef'
+d_getnetent_r='undef'
+d_getnetprotos='define'
+d_getpagsz='define'
+d_getpbyname='define'
+d_getpbynumber='define'
+d_getpent='define'
+d_getpgid='define'
+d_getpgrp2='undef'
+d_getpgrp='define'
+d_getppid='define'
+d_getprior='define'
+d_getprotobyname_r='undef'
+d_getprotobynumber_r='undef'
+d_getprotoent_r='undef'
+d_getprotoprotos='define'
+d_getprpwnam='undef'
+d_getpwent='define'
+d_getpwent_r='undef'
+d_getpwnam_r='undef'
+d_getpwuid_r='undef'
+d_getsbyname='define'
+d_getsbyport='define'
+d_getsent='define'
+d_getservbyname_r='undef'
+d_getservbyport_r='undef'
+d_getservent_r='undef'
+d_getservprotos='define'
+d_getspnam='define'
+d_getspnam_r='undef'
+d_gettimeod='define'
+d_gmtime64='undef'
+d_gmtime_r='undef'
+d_gnulibc='undef'
+d_grpasswd='define'
+d_hasmntopt='define'
+d_htonl='define'
+d_ilogbl='define'
+d_inc_version_list='undef'
+d_index='undef'
+d_inetaton='define'
+d_inetntop='define'
+d_inetpton='define'
+d_int64_t='define'
+d_ip_mreq='define'
+d_ip_mreq_source='define'
+d_ipv6_mreq='define'
+d_ipv6_mreq_source='undef'
+d_isascii='define'
+d_isblank='define'
+d_isfinite='undef'
+d_isinf='undef'
+d_isnan='undef'
+d_isnanl='undef'
+d_killpg='define'
+d_lchown='define'
+d_ldbl_dig='define'
+d_libm_lib_version='undef'
+d_link='define'
+d_localtime64='undef'
+d_localtime_r='undef'
+d_localtime_r_needs_tzset='undef'
+d_locconv='define'
+d_lockf='define'
+d_longdbl='define'
+d_longlong='define'
+d_lseekproto='define'
+d_lstat='define'
+d_madvise='define'
+d_malloc_good_size='undef'
+d_malloc_size='undef'
+d_mblen='define'
+d_mbstowcs='define'
+d_mbtowc='define'
+d_memchr='define'
+d_memcmp='define'
+d_memcpy='define'
+d_memmove='define'
+d_memset='define'
+d_mkdir='define'
+d_mkdtemp='define'
+d_mkfifo='define'
+d_mkstemp='define'
+d_mkstemps='define'
+d_mktime64='undef'
+d_mktime='define'
+d_mmap='define'
+d_modfl='define'
+d_modfl_pow32_bug='undef'
+d_modflproto='define'
+d_mprotect='define'
+d_msg='define'
+d_msg_ctrunc='define'
+d_msg_dontroute='define'
+d_msg_oob='define'
+d_msg_peek='define'
+d_msg_proxy='define'
+d_msgctl='define'
+d_msgget='define'
+d_msghdr_s='define'
+d_msgrcv='define'
+d_msgsnd='define'
+d_msync='define'
+d_munmap='define'
+d_mymalloc='undef'
+d_ndbm='undef'
+d_ndbm_h_uses_prototypes='undef'
+d_nice='define'
+d_nl_langinfo='define'
+d_nv_preserves_uv='define'
+d_nv_zero_is_allbits_zero='define'
+d_off64_t='undef'
+d_old_pthread_create_joinable='undef'
+d_oldpthreads='undef'
+d_oldsock='undef'
+d_open3='define'
+d_pathconf='define'
+d_pause='define'
+d_perl_otherlibdirs='undef'
+d_phostname='undef'
+d_pipe='define'
+d_poll='define'
+d_portable='define'
+d_prctl='define'
+d_prctl_set_name='define'
+d_printf_format_null='define'
+d_procselfexe='undef'
+d_pseudofork='undef'
+d_pthread_atfork='define'
+d_pthread_attr_setscope='define'
+d_pthread_yield='undef'
+d_pwage='undef'
+d_pwchange='undef'
+d_pwclass='undef'
+d_pwcomment='undef'
+d_pwexpire='undef'
+d_pwgecos='define'
+d_pwpasswd='define'
+d_pwquota='undef'
+d_qgcvt='undef'
+d_quad='define'
+d_random_r='undef'
+d_readdir64_r='undef'
+d_readdir='define'
+d_readdir_r='undef'
+d_readlink='define'
+d_readv='define'
+d_recvmsg='define'
+d_rename='define'
+d_rewinddir='define'
+d_rmdir='define'
+d_safebcpy='undef'
+d_safemcpy='undef'
+d_sanemcmp='define'
+d_sbrkproto='define'
+d_scalbnl='define'
+d_sched_yield='define'
+d_scm_rights='define'
+d_seekdir='define'
+d_select='define'
+d_sem='define'
+d_semctl='define'
+d_semctl_semid_ds='define'
+d_semctl_semun='define'
+d_semget='define'
+d_semop='define'
+d_sendmsg='define'
+d_setegid='define'
+d_seteuid='define'
+d_setgrent='define'
+d_setgrent_r='undef'
+d_setgrps='define'
+d_sethent='define'
+d_sethostent_r='undef'
+d_setitimer='define'
+d_setlinebuf='define'
+d_setlocale='define'
+d_setlocale_r='undef'
+d_setnent='define'
+d_setnetent_r='undef'
+d_setpent='define'
+d_setpgid='define'
+d_setpgrp2='undef'
+d_setpgrp='define'
+d_setprior='define'
+d_setproctitle='undef'
+d_setprotoent_r='undef'
+d_setpwent='define'
+d_setpwent_r='undef'
+d_setregid='define'
+d_setresgid='define'
+d_setresuid='define'
+d_setreuid='define'
+d_setrgid='undef'
+d_setruid='undef'
+d_setsent='define'
+d_setservent_r='undef'
+d_setsid='define'
+d_setvbuf='define'
+d_sfio='undef'
+d_shm='define'
+d_shmat='define'
+d_shmatprototype='define'
+d_shmctl='define'
+d_shmdt='define'
+d_shmget='define'
+d_sigaction='define'
+d_signbit='define'
+d_sigprocmask='define'
+d_sigsetjmp='define'
+d_sin6_scope_id='define'
+d_sitearch='define'
+d_snprintf='define'
+d_sockaddr_in6='define'
+d_sockaddr_sa_len='undef'
+d_sockatmark='define'
+d_sockatmarkproto='define'
+d_socket='define'
+d_socklen_t='define'
+d_sockpair='define'
+d_socks5_init='undef'
+d_sprintf_returns_strlen='define'
+d_sqrtl='define'
+d_srand48_r='undef'
+d_srandom_r='undef'
+d_sresgproto='undef'
+d_sresuproto='undef'
+d_statblks='define'
+d_statfs_f_flags='define'
+d_statfs_s='define'
+d_static_inline='define'
+d_statvfs='define'
+d_stdio_cnt_lval='undef'
+d_stdio_ptr_lval='undef'
+d_stdio_ptr_lval_nochange_cnt='undef'
+d_stdio_ptr_lval_sets_cnt='undef'
+d_stdio_stream_array='undef'
+d_stdiobase='undef'
+d_stdstdio='undef'
+d_strchr='define'
+d_strcoll='define'
+d_strctcpy='define'
+d_strerrm='strerror(e)'
+d_strerror='define'
+d_strerror_r='undef'
+d_strftime='define'
+d_strlcat='define'
+d_strlcpy='define'
+d_strtod='define'
+d_strtol='define'
+d_strtold='define'
+d_strtoll='define'
+d_strtoq='undef'
+d_strtoul='define'
+d_strtoull='define'
+d_strtouq='undef'
+d_strxfrm='define'
+d_suidsafe='undef'
+d_symlink='define'
+d_syscall='define'
+d_syscallproto='define'
+d_sysconf='define'
+d_sysernlst=''
+d_syserrlst='undef'
+d_system='define'
+d_tcgetpgrp='define'
+d_tcsetpgrp='define'
+d_telldir='define'
+d_telldirproto='define'
+d_time='define'
+d_timegm='define'
+d_times='define'
+d_tm_tm_gmtoff='define'
+d_tm_tm_zone='define'
+d_tmpnam_r='undef'
+d_truncate='define'
+d_ttyname_r='undef'
+d_tzname='define'
+d_u32align='undef'
+d_ualarm='define'
+d_umask='define'
+d_uname='define'
+d_union_semun='undef'
+d_unordered='undef'
+d_unsetenv='define'
+d_usleep='define'
+d_usleepproto='define'
+d_ustat='undef'
+d_vendorarch='undef'
+d_vendorbin='undef'
+d_vendorlib='undef'
+d_vendorscript='undef'
+d_vfork='undef'
+d_void_closedir='undef'
+d_voidsig='define'
+d_voidtty=''
+d_volatile='define'
+d_vprintf='define'
+d_vsnprintf='define'
+d_wait4='define'
+d_waitpid='define'
+d_wcstombs='define'
+d_wctomb='define'
+d_writev='define'
+d_xenix='undef'
+date='date'
+db_hashtype='u_int32_t'
+db_prefixtype='size_t'
+db_version_major=''
+db_version_minor=''
+db_version_patch=''
+defvoidused='15'
+direntrytype='struct dirent'
+dlext='so'
+dlsrc='dl_dlopen.xs'
+doublesize='8'
+drand01='drand48()'
+drand48_r_proto='0'
+dtrace=''
+dynamic_ext='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call Hash/Util Hash/Util/FieldHash I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate Unicode/Normalize XS/APItest XS/Typemap arybase attributes mro re threads threads/shared'
+eagain='EAGAIN'
+ebcdic='undef'
+echo='echo'
+egrep='egrep'
+emacs=''
+endgrent_r_proto='0'
+endhostent_r_proto='0'
+endnetent_r_proto='0'
+endprotoent_r_proto='0'
+endpwent_r_proto='0'
+endservent_r_proto='0'
+eunicefix=':'
+exe_ext=''
+expr='expr'
+extensions='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call Hash/Util Hash/Util/FieldHash I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate Unicode/Normalize XS/APItest XS/Typemap arybase attributes mro re threads threads/shared Archive/Extract Archive/Tar Attribute/Handlers AutoLoader B/Debug B/Deparse B/Lint CGI CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML CPANPLUS CPANPLUS/Dist/Build Carp Config/Perl/V Devel/SelfStubber Digest Dumpvalue Env Errno ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/ParseXS File/CheckTree File/Fetch File/Path File/Temp FileCache Filter/Simple Getopt/Long HTTP/Tiny I18N/Collate I18N/LangTags IO/Compress IO/Zlib IPC/Cmd IPC/Open3 JSON/PP Locale/Codes Locale/Maketext Locale/Maketext/Simple Log/Message Log/Message/Simple Math/BigInt Math/BigRat Math/Complex Memoize Module/Build Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata Module/Pluggable NEXT Net/Ping Object/Accessor Package/Constants Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/LaTeX Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage Safe Search/Dict SelfLoader Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Term/UI Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Memoize Tie/RefHash Time/Local XSLoader autodie autouse base bignum constant encoding/warnings if lib libnet parent perlfaq podlators'
+extern_C='extern'
+extras=''
+fflushNULL='define'
+fflushall='undef'
+find=''
+firstmakefile='makefile'
+flex=''
+fpossize='16'
+fpostype='fpos_t'
+freetype='void'
+from=':'
+full_ar='%%AR%%'
+full_csh='csh'
+full_sed='/bin/sed'
+gccansipedantic=''
+gccosandvers=''
+gccversion='4.7.3'
+getgrent_r_proto='0'
+getgrgid_r_proto='0'
+getgrnam_r_proto='0'
+gethostbyaddr_r_proto='0'
+gethostbyname_r_proto='0'
+gethostent_r_proto='0'
+getlogin_r_proto='0'
+getnetbyaddr_r_proto='0'
+getnetbyname_r_proto='0'
+getnetent_r_proto='0'
+getprotobyname_r_proto='0'
+getprotobynumber_r_proto='0'
+getprotoent_r_proto='0'
+getpwent_r_proto='0'
+getpwnam_r_proto='0'
+getpwuid_r_proto='0'
+getservbyname_r_proto='0'
+getservbyport_r_proto='0'
+getservent_r_proto='0'
+getspnam_r_proto='0'
+gidformat='"lu"'
+gidsign='1'
+gidsize='4'
+gidtype='gid_t'
+glibpth='/usr/shlib  /lib /usr/lib /usr/lib/386 /lib/386 /usr/ccs/lib /usr/ucblib /usr/local/lib '
+gmake='gmake'
+gmtime_r_proto='0'
+gnulibc_version=''
+grep='grep'
+groupcat='cat /etc/group'
+groupstype='gid_t'
+gzip='gzip'
+h_fcntl='true'
+h_sysfile='false'
+hint='recommended'
+hostcat='cat /etc/hosts'
+html1dir=' '
+html1direxp=''
+html3dir=' '
+html3direxp=''
+i16size='2'
+i16type='short'
+i32size='4'
+i32type='long'
+i64size='8'
+i64type='long long'
+i8size='1'
+i8type='signed char'
+i_arpainet='define'
+i_assert='define'
+i_bsdioctl=''
+i_crypt='define'
+i_db='undef'
+i_dbm='undef'
+i_dirent='define'
+i_dld='undef'
+i_dlfcn='define'
+i_fcntl='define'
+i_float='define'
+i_fp='undef'
+i_fp_class='undef'
+i_gdbm='undef'
+i_gdbm_ndbm='undef'
+i_gdbmndbm='undef'
+i_grp='define'
+i_ieeefp='undef'
+i_inttypes='define'
+i_langinfo='define'
+i_libutil='undef'
+i_limits='define'
+i_locale='define'
+i_machcthr='undef'
+i_malloc='define'
+i_mallocmalloc='undef'
+i_math='define'
+i_memory='undef'
+i_mntent='define'
+i_ndbm='undef'
+i_netdb='define'
+i_neterrno='undef'
+i_netinettcp='define'
+i_niin='define'
+i_poll='define'
+i_prot='undef'
+i_pthread='define'
+i_pwd='define'
+i_rpcsvcdbm='undef'
+i_sfio='undef'
+i_sgtty='undef'
+i_shadow='define'
+i_socks='undef'
+i_stdarg='define'
+i_stdbool='define'
+i_stddef='define'
+i_stdlib='define'
+i_string='define'
+i_sunmath='undef'
+i_sysaccess='undef'
+i_sysdir='define'
+i_sysfile='undef'
+i_sysfilio='undef'
+i_sysin='undef'
+i_sysioctl='define'
+i_syslog='define'
+i_sysmman='define'
+i_sysmode='undef'
+i_sysmount='define'
+i_sysndir='undef'
+i_sysparam='define'
+i_syspoll='define'
+i_sysresrc='define'
+i_syssecrt='undef'
+i_sysselct='define'
+i_syssockio='undef'
+i_sysstat='define'
+i_sysstatfs='define'
+i_sysstatvfs='define'
+i_systime='define'
+i_systimek='undef'
+i_systimes='define'
+i_systypes='define'
+i_sysuio='define'
+i_sysun='define'
+i_sysutsname='define'
+i_sysvfs='define'
+i_syswait='define'
+i_termio='undef'
+i_termios='define'
+i_time='define'
+i_unistd='define'
+i_ustat='undef'
+i_utime='define'
+i_values='define'
+i_varargs='undef'
+i_varhdr='stdarg.h'
+i_vfork='undef'
+ignore_versioned_solibs='y'
+inc_version_list=' '
+inc_version_list_init='0'
+incpath=''
+inews=''
+initialinstalllocation='/usr/bin'
+installarchlib='/usr/lib/perl5/5.18.1/arm-linux'
+installbin='/usr/bin'
+installhtml1dir=''
+installhtml3dir=''
+installman1dir=''
+installman3dir=''
+installprefix='/usr'
+installprefixexp='/usr'
+installprivlib='/usr/lib/perl5/5.18.1'
+installscript='/usr/bin'
+installsitearch='/usr/lib/perl5/site_perl/5.18.1/arm-linux'
+installsitebin='/usr/bin'
+installsitehtml1dir=''
+installsitehtml3dir=''
+installsitelib='/usr/lib/perl5/site_perl/5.18.1'
+installsiteman1dir=''
+installsiteman3dir=''
+installsitescript='/usr/bin'
+installstyle='lib/perl5'
+installusrbinperl='undef'
+installvendorarch=''
+installvendorbin=''
+installvendorhtml1dir=''
+installvendorhtml3dir=''
+installvendorlib=''
+installvendorman1dir=''
+installvendorman3dir=''
+installvendorscript=''
+intsize='4'
+issymlink='test -h'
+ivdformat='"ld"'
+ivsize='4'
+ivtype='long'
+known_extensions='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call GDBM_File Hash/Util Hash/Util/FieldHash I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc NDBM_File ODBM_File Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate Unicode/Normalize VMS/DCLsym VMS/Stdio Win32 Win32API/File Win32CORE XS/APItest XS/Typemap arybase attributes mro re threads threads/shared '
+ksh=''
+ld='%%LD%%'
+ld_can_script='define'
+lddlflags='-shared %%LDFLAGS%%'
+ldflags=' %%LDFLAGS%%'
+ldflags_uselargefiles=''
+ldlibpthname='LD_LIBRARY_PATH'
+less='less'
+lib_ext='.a'
+libc=''
+libperl='libperl.a'
+libpth='%%LIBDIRS%%'
+libs='-lc'
+libsdirs='%%LIBDIRS%%'
+libsfiles=' libc.so'
+#libsfound=' /lib/libc.so'
+libspath='%%LIBDIRS%%'
+libswanted='sfio socket inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun m crypt sec util c cposix posix ucb BSD gdbm_compat'
+libswanted_uselargefiles=''
+line=''
+lint=''
+lkflags=''
+ln='ln'
+lns='/bin/ln -s'
+localtime_r_proto='0'
+locincpth='/usr/local/include /opt/local/include /usr/gnu/include /opt/gnu/include /usr/GNU/include /opt/GNU/include'
+loclibpth='/usr/local/lib /opt/local/lib /usr/gnu/lib /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib'
+longdblsize='8'
+longlongsize='8'
+longsize='4'
+lp=''
+lpr=''
+ls='ls'
+lseeksize='8'
+lseektype='off_t'
+mad='undef'
+madlyh=''
+madlyobj=''
+madlysrc=''
+mail=''
+mailx=''
+make='make'
+make_set_make='#'
+mallocobj=''
+mallocsrc=''
+malloctype='void *'
+man1dir=' '
+man1direxp=''
+man1ext='0'
+man3dir=' '
+man3direxp=''
+man3ext='0'
+mips_type=''
+mistrustnm=''
+mkdir='mkdir'
+mmaptype='void *'
+modetype='mode_t'
+more='more'
+multiarch='undef'
+mv=''
+myarchname='arm-linux'
+mydomain='.nonet'
+myhostname='openadk'
+myuname='linux openadk 3.12.6 #1 fri jan 10 18:48:49 cet 2014 arm gnulinux '
+n='-n'
+need_va_copy='undef'
+netdb_hlen_type='size_t'
+netdb_host_type='const void *'
+netdb_name_type='const char *'
+netdb_net_type='in_addr_t'
+nm='nm'
+nm_opt=''
+nm_so_opt='--dynamic'
+nonxs_ext='Archive/Extract Archive/Tar Attribute/Handlers AutoLoader B/Debug B/Deparse B/Lint CGI CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML CPANPLUS CPANPLUS/Dist/Build Carp Config/Perl/V Devel/SelfStubber Digest Dumpvalue Env Errno ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/ParseXS File/CheckTree File/Fetch File/Path File/Temp FileCache Filter/Simple Getopt/Long HTTP/Tiny I18N/Collate I18N/LangTags IO/Compress IO/Zlib IPC/Cmd IPC/Open3 JSON/PP Locale/Codes Locale/Maketext Locale/Maketext/Simple Log/Message Log/Message/Simple Math/BigInt Math/BigRat Math/Complex Memoize Module/Build Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata Module/Pluggable NEXT Net/Ping Object/Accessor Package/Constants Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/LaTeX Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage Safe Search/Dict SelfLoader Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Term/UI Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Memoize Tie/RefHash Time/Local XSLoader autodie autouse base bignum constant encoding/warnings if lib libnet parent perlfaq podlators'
+nroff='nroff'
+nvEUformat='"E"'
+nvFUformat='"F"'
+nvGUformat='"G"'
+nv_overflows_integers_at='256.0*256.0*256.0*256.0*256.0*256.0*2.0*2.0*2.0*2.0*2.0'
+nv_preserves_uv_bits='32'
+nveformat='"e"'
+nvfformat='"f"'
+nvgformat='"g"'
+nvsize='8'
+nvtype='double'
+o_nonblock='O_NONBLOCK'
+obj_ext='.o'
+old_pthread_create_joinable=''
+optimize='-O2'
+orderlib='false'
+osname='linux'
+osvers='3.12.6'
+otherlibdirs=' '
+package='perl5'
+pager='/usr/bin/less -R'
+passcat='cat /etc/passwd'
+patchlevel='18'
+path_sep=':'
+perl5=''
+perl='perl'
+perl_patchlevel=''
+perl_static_inline='static __inline__'
+perladmin='root@openadk.nonet'
+perllibs='-lc'
+perlpath='/usr/bin/perl'
+pg='pg'
+phostname='hostname'
+pidtype='pid_t'
+plibpth='/lib/arm-openadk-linux-muslgnueabi/4.7.3 /lib/arm-linux-gnueabi /lib /usr/lib/arm-openadk-linux-muslgnueabi/4.7.3 /usr/lib/arm-linux-gnueabi /usr/lib'
+pmake=''
+pr=''
+prefix='/usr'
+prefixexp='/usr'
+privlib='/usr/lib/perl5/5.18.1'
+privlibexp='/usr/lib/perl5/5.18.1'
+procselfexe=''
+prototype='define'
+ptrsize='4'
+quadkind='3'
+quadtype='long long'
+randbits='48'
+randfunc='drand48'
+random_r_proto='0'
+randseedtype='long'
+ranlib=':'
+rd_nodata='-1'
+readdir64_r_proto='0'
+readdir_r_proto='0'
+revision='5'
+rm='rm'
+rm_try='/bin/rm -f try try a.out .out try.[cho] try..o core core.try* try.core*'
+rmail=''
+run=''
+runnm='true'
+sGMTIME_max='2147483647'
+sGMTIME_min='-2147483648'
+sLOCALTIME_max='2147483647'
+sLOCALTIME_min='-2147483648'
+sPRIEUldbl='"E"'
+sPRIFUldbl='"F"'
+sPRIGUldbl='"G"'
+sPRIXU64='"llX"'
+sPRId64='"lld"'
+sPRIeldbl='"e"'
+sPRIfldbl='"f"'
+sPRIgldbl='"g"'
+sPRIi64='"lli"'
+sPRIo64='"llo"'
+sPRIu64='"llu"'
+sPRIx64='"llx"'
+sSCNfldbl='"f"'
+sched_yield='sched_yield()'
+scriptdir='/usr/bin'
+scriptdirexp='/usr/bin'
+sed='sed'
+seedfunc='srand48'
+selectminbits='32'
+selecttype='fd_set *'
+sendmail=''
+setgrent_r_proto='0'
+sethostent_r_proto='0'
+setlocale_r_proto='0'
+setnetent_r_proto='0'
+setprotoent_r_proto='0'
+setpwent_r_proto='0'
+setservent_r_proto='0'
+sh='/bin/sh'
+shar=''
+sharpbang='#!'
+shmattype='void *'
+shortsize='2'
+shrpenv=''
+shsharp='true'
+sig_count='65'
+sig_name='ZERO HUP INT QUIT ILL TRAP ABRT BUS FPE KILL USR1 SEGV USR2 PIPE ALRM TERM STKFLT CHLD CONT STOP TSTP TTIN TTOU URG XCPU XFSZ VTALRM PROF WINCH IO PWR SYS NUM32 NUM33 NUM34 RTMIN NUM36 NUM37 NUM38 NUM39 NUM40 NUM41 NUM42 NUM43 NUM44 NUM45 NUM46 NUM47 NUM48 NUM49 NUM50 NUM51 NUM52 NUM53 NUM54 NUM55 NUM56 NUM57 NUM58 NUM59 NUM60 NUM61 NUM62 NUM63 RTMAX IOT POLL UNUSED '
+sig_name_init='"ZERO", "HUP", "INT", "QUIT", "ILL", "TRAP", "ABRT", "BUS", "FPE", "KILL", "USR1", "SEGV", "USR2", "PIPE", "ALRM", "TERM", "STKFLT", "CHLD", "CONT", "STOP", "TSTP", "TTIN", "TTOU", "URG", "XCPU", "XFSZ", "VTALRM", "PROF", "WINCH", "IO", "PWR", "SYS", "NUM32", "NUM33", "NUM34", "RTMIN", "NUM36", "NUM37", "NUM38", "NUM39", "NUM40", "NUM41", "NUM42", "NUM43", "NUM44", "NUM45", "NUM46", "NUM47", "NUM48", "NUM49", "NUM50", "NUM51", "NUM52", "NUM53", "NUM54", "NUM55", "NUM56", "NUM57", "NUM58", "NUM59", "NUM60", "NUM61", "NUM62", "NUM63", "RTMAX", "IOT", "POLL", "UNUSED", 0'
+sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 6 29 31 '
+sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 6, 29, 31, 0'
+sig_size='68'
+signal_t='void'
+sitearch='/usr/lib/perl5/site_perl/5.18.1/arm-linux'
+sitearchexp='/usr/lib/perl5/site_perl/5.18.1/arm-linux'
+sitebin='/usr/bin'
+sitebinexp='/usr/bin'
+sitehtml1dir=''
+sitehtml1direxp=''
+sitehtml3dir=''
+sitehtml3direxp=''
+sitelib='/usr/lib/perl5/site_perl/5.18.1'
+sitelib_stem='/usr/lib/perl5/site_perl'
+sitelibexp='/usr/lib/perl5/site_perl/5.18.1'
+siteman1dir=''
+siteman1direxp=''
+siteman3dir=''
+siteman3direxp=''
+siteprefix='/usr'
+siteprefixexp='/usr'
+sitescript='/usr/bin'
+sitescriptexp='/usr/bin'
+sizesize='4'
+sizetype='size_t'
+sleep=''
+smail=''
+so='so'
+sockethdr=''
+socketlib=''
+socksizetype='socklen_t'
+sort='sort'
+spackage='Perl5'
+spitshell='cat'
+srand48_r_proto='0'
+srandom_r_proto='0'
+src='.'
+ssizetype='ssize_t'
+st_ino_sign='1'
+st_ino_size='8'
+startperl='#!/usr/bin/perl'
+startsh='#!/bin/sh'
+static_ext=' '
+stdchar='char'
+stdio_base='((fp)->_base)'
+stdio_bufsiz='((fp)->_cnt + (fp)->_ptr - (fp)->_base)'
+stdio_cnt='((fp)->_cnt)'
+stdio_filbuf=''
+stdio_ptr='((fp)->_ptr)'
+stdio_stream_array=''
+strerror_r_proto='0'
+strings='/usr/include/string.h'
+submit=''
+subversion='1'
+sysman='/usr/man/man1'
+tail=''
+tar=''
+targetarch=''
+tbl=''
+tee=''
+test='test'
+timeincl='/usr/include/sys/time.h /usr/include/time.h '
+timetype='time_t'
+tmpnam_r_proto='0'
+to=':'
+touch='touch'
+tr='tr'
+trnl='\n'
+troff=''
+ttyname_r_proto='0'
+u16size='2'
+u16type='unsigned short'
+u32size='4'
+u32type='unsigned long'
+u64size='8'
+u64type='unsigned long long'
+u8size='1'
+u8type='unsigned char'
+uidformat='"lu"'
+uidsign='1'
+uidsize='4'
+uidtype='uid_t'
+uname='uname'
+uniq='uniq'
+uquadtype='unsigned long long'
+use5005threads='undef'
+use64bitall='undef'
+use64bitint='undef'
+usecrosscompile='undef'
+usedevel='undef'
+usedl='define'
+usedtrace='undef'
+usefaststdio='undef'
+useithreads='undef'
+usekernprocpathname='undef'
+uselargefiles='define'
+uselongdouble='undef'
+usemallocwrap='define'
+usemorebits='undef'
+usemultiplicity='undef'
+usemymalloc='n'
+usenm='true'
+usensgetexecutablepath='undef'
+useopcode='true'
+useperlio='define'
+useposix='true'
+usereentrant='undef'
+userelocatableinc='undef'
+usesfio='false'
+useshrplib='false'
+usesitecustomize='undef'
+usesocks='undef'
+usethreads='undef'
+usevendorprefix='undef'
+useversionedarchname='undef'
+usevfork='false'
+usrinc='%%INCDIRS%%'
+uuname=''
+uvXUformat='"lX"'
+uvoformat='"lo"'
+uvsize='4'
+uvtype='unsigned long'
+uvuformat='"lu"'
+uvxformat='"lx"'
+vaproto='define'
+vendorarch=''
+vendorarchexp=''
+vendorbin=''
+vendorbinexp=''
+vendorhtml1dir=' '
+vendorhtml1direxp=''
+vendorhtml3dir=' '
+vendorhtml3direxp=''
+vendorlib=''
+vendorlib_stem=''
+vendorlibexp=''
+vendorman1dir=' '
+vendorman1direxp=''
+vendorman3dir=' '
+vendorman3direxp=''
+vendorprefix=''
+vendorprefixexp=''
+vendorscript=''
+vendorscriptexp=''
+version='5.18.1'
+version_patchlevel_string='version 18 subversion 1'
+versiononly='undef'
+vi=''
+voidflags='15'
+xlibpth='/usr/lib/386 /lib/386'
+yacc='yacc'
+yaccflags=''
+zcat=''
+zip='zip'
+PERL_REVISION=5
+PERL_VERSION=18
+PERL_SUBVERSION=1
+PERL_API_REVISION=5
+PERL_API_VERSION=18
+PERL_API_SUBVERSION=0
+PERL_PATCHLEVEL=''
+PERL_CONFIG_SH=true
+: Variables propagated from previous config.sh file.
+libdb_needs_pthread='N'
diff --git a/package/perl/files/config.sh.i686.eglibc b/package/perl/files/config.sh.i686.eglibc
new file mode 100644
index 000000000..4dbd4304e
--- /dev/null
+++ b/package/perl/files/config.sh.i686.eglibc
@@ -0,0 +1,1118 @@
+#!/bin/sh
+#
+# This file was produced by running the Configure script. It holds all the
+# definitions figured out by Configure. Should you modify one of these values,
+# do not forget to propagate your changes by running "Configure -der". You may
+# instead choose to run each of the .SH files by yourself, or "Configure -S".
+#
+
+# Package name      : perl5
+# Source directory  : .
+# Configuration time: Sun Jan 12 14:13:02 CET 2014
+# Configured by     : root
+# Target system     : linux openadk 3.12.6 #1 sat jan 11 14:26:27 cet 2014 i686 gnulinux 
+
+: Configure command line arguments.
+config_arg0='./Configure'
+config_args='-des'
+config_argc=1
+config_arg1='-des'
+
+Author=''
+Date='$Date'
+Header=''
+Id='$Id'
+Locker=''
+Log='$Log'
+RCSfile='$RCSfile'
+Revision='$Revision'
+Source=''
+State=''
+_a='.a'
+_exe=''
+_o='.o'
+afs='false'
+afsroot='/afs'
+alignbytes='4'
+ansi2knr=''
+aphostname='/bin/hostname'
+api_revision='5'
+api_subversion='0'
+api_version='18'
+api_versionstring='5.18.0'
+ar='ar'
+archlib='/usr/lib/perl5/5.18.1/i686-linux'
+archlibexp='/usr/lib/perl5/5.18.1/i686-linux'
+archname64=''
+archname='i686-linux'
+archobjs=''
+asctime_r_proto='0'
+awk='awk'
+baserev='5.0'
+bash=''
+bin='/usr/bin'
+bin_ELF='define'
+binexp='/usr/bin'
+bison='bison'
+bootstrap_charset='undef'
+byacc='byacc'
+byteorder='1234'
+c=''
+castflags='0'
+cat='cat'
+cc='%%CC%%'
+cccdlflags='-fPIC'
+ccdlflags='-Wl,-E'
+ccflags='%%CFLAGS%%'
+ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
+ccname='gcc'
+ccsymbols=''
+ccversion=''
+cf_by='root'
+cf_email='root@openadk.nonet'
+cf_time='Sun Jan 12 14:13:02 CET 2014'
+charbits='8'
+charsize='1'
+chgrp=''
+chmod='chmod'
+chown=''
+clocktype='clock_t'
+comm='comm'
+compress=''
+contains='grep'
+cp='cp'
+cpio=''
+cpp='cpp'
+cpp_stuff='42'
+cppccsymbols=''
+cppflags='%%CPPFLAGS%%'
+cpplast='-'
+cppminus='-'
+cpprun='%%CPP%%'
+cppstdin='%%CPP%%'
+cppsymbols='_FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE=1 _POSIX_C_SOURCE=200809L _POSIX_SOURCE=1 __ATOMIC_ACQUIRE=2 __ATOMIC_ACQ_REL=4 __ATOMIC_CONSUME=1 __ATOMIC_RELAXED=0 __ATOMIC_RELEASE=3 __ATOMIC_SEQ_CST=5 __BIGGEST_ALIGNMENT__=16 __BYTE_ORDER__=1234 __CHAR16_TYPE__=short\ unsigned\ int __CHAR32_TYPE__=unsigned\ int __CHAR_BIT__=8 __DBL_DECIMAL_DIG__=17 __DBL_DENORM_MIN__=((double)4.94065645841246544177e-324L) __DBL_DIG__=15 __DBL_EPSILON__=((double)2.22044604925031308085e-16L) __DBL_HAS_DENORM__=1 __DBL_HAS_INFINITY__=1 __DBL_HAS_QUIET_NAN__=1 __DBL_MANT_DIG__=53 __DBL_MAX_10_EXP__=308 __DBL_MAX_EXP__=1024 __DBL_MAX__=((double)1.79769313486231570815e+308L) __DBL_MIN_10_EXP__=(-307) __DBL_MIN_EXP__=(-1021) __DBL_MIN__=((double)2.22507385850720138309e-308L) __DEC128_EPSILON__=1E-33DL __DEC128_MANT_DIG__=34 __DEC128_MAX_EXP__=6145 __DEC128_MAX__=9.999999999999999999999999999999999E6144DL __DEC128_MIN_EXP__=(-6142) __DEC128_MIN__=1E-6143DL __DEC128_SUBNORMAL_MIN__=0.000000000000000000000000000000001E-6143DL __DEC32_EPSILON__=1E-6DF __DEC32_MANT_DIG__=7 __DEC32_MAX_EXP__=97 __DEC32_MAX__=9.999999E96DF __DEC32_MIN_EXP__=(-94) __DEC32_MIN__=1E-95DF __DEC32_SUBNORMAL_MIN__=0.000001E-95DF __DEC64_EPSILON__=1E-15DD __DEC64_MANT_DIG__=16 __DEC64_MAX_EXP__=385 __DEC64_MAX__=9.999999999999999E384DD __DEC64_MIN_EXP__=(-382) __DEC64_MIN__=1E-383DD __DEC64_SUBNORMAL_MIN__=0.000000000000001E-383DD __DECIMAL_BID_FORMAT__=1 __DECIMAL_DIG__=21 __DEC_EVAL_METHOD__=2 __ELF__=1 __FINITE_MATH_ONLY__=0 __FLOAT_WORD_ORDER__=1234 __FLT_DECIMAL_DIG__=9 __FLT_DENORM_MIN__=1.40129846432481707092e-45F __FLT_DIG__=6 __FLT_EPSILON__=1.19209289550781250000e-7F __FLT_EVAL_METHOD__=2 __FLT_HAS_DENORM__=1 __FLT_HAS_INFINITY__=1 __FLT_HAS_QUIET_NAN__=1 __FLT_MANT_DIG__=24 __FLT_MAX_10_EXP__=38 __FLT_MAX_EXP__=128 __FLT_MAX__=3.40282346638528859812e+38F __FLT_MIN_10_EXP__=(-37) __FLT_MIN_EXP__=(-125) __FLT_MIN__=1.17549435082228750797e-38F __FLT_RADIX__=2 __GCC_ATOMIC_BOOL_LOCK_FREE=2 __GCC_ATOMIC_CHAR16_T_LOCK_FREE=2 __GCC_ATOMIC_CHAR32_T_LOCK_FREE=2 __GCC_ATOMIC_CHAR_LOCK_FREE=2 __GCC_ATOMIC_INT_LOCK_FREE=2 __GCC_ATOMIC_LLONG_LOCK_FREE=2 __GCC_ATOMIC_LONG_LOCK_FREE=2 __GCC_ATOMIC_POINTER_LOCK_FREE=2 __GCC_ATOMIC_SHORT_LOCK_FREE=2 __GCC_ATOMIC_TEST_AND_SET_TRUEVAL=1 __GCC_ATOMIC_WCHAR_T_LOCK_FREE=2 __GCC_HAVE_DWARF2_CFI_ASM=1 __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1=1 __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2=1 __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4=1 __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8=1 __GLIBC_MINOR__=18 __GLIBC__=2 __GNUC_GNU_INLINE__=1 __GNUC_MINOR__=7 __GNUC_PATCHLEVEL__=3 __GNUC__=4 __GNU_LIBRARY__=6 __GXX_ABI_VERSION=1002 __INT16_C=__INT16_C __INT16_MAX__=32767 __INT16_TYPE__=short\ int __INT32_C=__INT32_C __INT32_MAX__=2147483647 __INT32_TYPE__=int __INT64_C=__INT64_C __INT64_MAX__=9223372036854775807LL __INT64_TYPE__=long\ long\ int __INT8_C=__INT8_C __INT8_MAX__=127 __INT8_TYPE__=signed\ char __INTMAX_C=__INTMAX_C __INTMAX_MAX__=9223372036854775807LL __INTMAX_TYPE__=long\ long\ int __INTPTR_MAX__=2147483647 __INTPTR_TYPE__=int __INT_FAST16_MAX__=2147483647 __INT_FAST16_TYPE__=int __INT_FAST32_MAX__=2147483647 __INT_FAST32_TYPE__=int __INT_FAST64_MAX__=9223372036854775807LL __INT_FAST64_TYPE__=long\ long\ int __INT_FAST8_MAX__=127 __INT_FAST8_TYPE__=signed\ char __INT_LEAST16_MAX__=32767 __INT_LEAST16_TYPE__=short\ int __INT_LEAST32_MAX__=2147483647 __INT_LEAST32_TYPE__=int __INT_LEAST64_MAX__=9223372036854775807LL __INT_LEAST64_TYPE__=long\ long\ int __INT_LEAST8_MAX__=127 __INT_LEAST8_TYPE__=signed\ char __INT_MAX__=2147483647 __LDBL_DENORM_MIN__=3.64519953188247460253e-4951L __LDBL_DIG__=18 __LDBL_EPSILON__=1.08420217248550443401e-19L __LDBL_HAS_DENORM__=1 __LDBL_HAS_INFINITY__=1 __LDBL_HAS_QUIET_NAN__=1 __LDBL_MANT_DIG__=64 __LDBL_MAX_10_EXP__=4932 __LDBL_MAX_EXP__=16384 __LDBL_MAX__=1.18973149535723176502e+4932L __LDBL_MIN_10_EXP__=(-4931) __LDBL_MIN_EXP__=(-16381) __LDBL_MIN__=3.36210314311209350626e-4932L __LONG_LONG_MAX__=9223372036854775807LL __LONG_MAX__=2147483647L __ORDER_BIG_ENDIAN__=4321 __ORDER_LITTLE_ENDIAN__=1234 __ORDER_PDP_ENDIAN__=3412 __PRAGMA_REDEFINE_EXTNAME=1 __PTRDIFF_MAX__=2147483647 __PTRDIFF_TYPE__=int __REGISTER_PREFIX__= __SCHAR_MAX__=127 __SHRT_MAX__=32767 __SIG_ATOMIC_MAX__=2147483647 __SIG_ATOMIC_MIN__=(-2147483647\ -\ 1) __SIG_ATOMIC_TYPE__=int __SIZEOF_DOUBLE__=8 __SIZEOF_FLOAT__=4 __SIZEOF_INT__=4 __SIZEOF_LONG_DOUBLE__=12 __SIZEOF_LONG_LONG__=8 __SIZEOF_LONG__=4 __SIZEOF_POINTER__=4 __SIZEOF_PTRDIFF_T__=4 __SIZEOF_SHORT__=2 __SIZEOF_SIZE_T__=4 __SIZEOF_WCHAR_T__=4 __SIZEOF_WINT_T__=4 __SIZE_MAX__=4294967295U __SIZE_TYPE__=unsigned\ int __STDC_HOSTED__=1 __STDC__=1 __UINT16_C=__UINT16_C __UINT16_MAX__=65535 __UINT16_TYPE__=short\ unsigned\ int __UINT32_C=__UINT32_C __UINT32_MAX__=4294967295U __UINT32_TYPE__=unsigned\ int __UINT64_C=__UINT64_C __UINT64_MAX__=18446744073709551615ULL __UINT64_TYPE__=long\ long\ unsigned\ int __UINT8_C=__UINT8_C __UINT8_MAX__=255 __UINT8_TYPE__=unsigned\ char __UINTMAX_C=__UINTMAX_C __UINTMAX_MAX__=18446744073709551615ULL __UINTMAX_TYPE__=long\ long\ unsigned\ int __UINTPTR_MAX__=4294967295U __UINTPTR_TYPE__=unsigned\ int __UINT_FAST16_MAX__=4294967295U __UINT_FAST16_TYPE__=unsigned\ int __UINT_FAST32_MAX__=4294967295U __UINT_FAST32_TYPE__=unsigned\ int __UINT_FAST64_MAX__=18446744073709551615ULL __UINT_FAST64_TYPE__=long\ long\ unsigned\ int __UINT_FAST8_MAX__=255 __UINT_FAST8_TYPE__=unsigned\ char __UINT_LEAST16_MAX__=65535 __UINT_LEAST16_TYPE__=short\ unsigned\ int __UINT_LEAST32_MAX__=4294967295U __UINT_LEAST32_TYPE__=unsigned\ int __UINT_LEAST64_MAX__=18446744073709551615ULL __UINT_LEAST64_TYPE__=long\ long\ unsigned\ int __UINT_LEAST8_MAX__=255 __UINT_LEAST8_TYPE__=unsigned\ char __USER_LABEL_PREFIX__= __USE_BSD=1 __USE_FILE_OFFSET64=1 __USE_LARGEFILE=1 __USE_MISC=1 __USE_POSIX199309=1 __USE_POSIX199506=1 __USE_POSIX2=1 __USE_POSIX=1 __USE_SVID=1 __VERSION__="4.7.3" __WCHAR_MAX__=2147483647L __WCHAR_MIN__=(-2147483647L\ -\ 1) __WCHAR_TYPE__=long\ int __WINT_MAX__=4294967295U __WINT_MIN__=0U __WINT_TYPE__=unsigned\ int __code_model_32__=1 __gnu_linux__=1 __i386=1 __i386__=1 __i686=1 __i686__=1 __linux=1 __linux__=1 __pentiumpro=1 __pentiumpro__=1 __unix=1 __unix__=1 i386=1 linux=1 unix=1'
+crypt_r_proto='0'
+cryptlib=''
+csh='csh'
+ctermid_r_proto='0'
+ctime_r_proto='0'
+d_Gconvert='gcvt((x),(n),(b))'
+d_PRIEUldbl='define'
+d_PRIFUldbl='define'
+d_PRIGUldbl='define'
+d_PRIXU64='define'
+d_PRId64='define'
+d_PRIeldbl='define'
+d_PRIfldbl='define'
+d_PRIgldbl='define'
+d_PRIi64='define'
+d_PRIo64='define'
+d_PRIu64='define'
+d_PRIx64='define'
+d_SCNfldbl='define'
+d__fwalk='undef'
+d_access='define'
+d_accessx='undef'
+d_aintl='undef'
+d_alarm='define'
+d_archlib='define'
+d_asctime64='undef'
+d_asctime_r='undef'
+d_atolf='undef'
+d_atoll='define'
+d_attribute_deprecated='define'
+d_attribute_format='define'
+d_attribute_malloc='define'
+d_attribute_nonnull='define'
+d_attribute_noreturn='define'
+d_attribute_pure='define'
+d_attribute_unused='define'
+d_attribute_warn_unused_result='define'
+d_bcmp='define'
+d_bcopy='define'
+d_bsd='undef'
+d_bsdgetpgrp='undef'
+d_bsdsetpgrp='undef'
+d_builtin_choose_expr='define'
+d_builtin_expect='define'
+d_bzero='define'
+d_c99_variadic_macros='define'
+d_casti32='define'
+d_castneg='define'
+d_charvspr='undef'
+d_chown='define'
+d_chroot='define'
+d_chsize='undef'
+d_class='undef'
+d_clearenv='define'
+d_closedir='define'
+d_cmsghdr_s='define'
+d_const='define'
+d_copysignl='define'
+d_cplusplus='undef'
+d_crypt='define'
+d_crypt_r='undef'
+d_csh='undef'
+d_ctermid='define'
+d_ctermid_r='undef'
+d_ctime64='undef'
+d_ctime_r='undef'
+d_cuserid='define'
+d_dbl_dig='define'
+d_dbminitproto='undef'
+d_difftime64='undef'
+d_difftime='define'
+d_dir_dd_fd='undef'
+d_dirfd='define'
+d_dirnamlen='undef'
+d_dlerror='define'
+d_dlopen='define'
+d_dlsymun='undef'
+d_dosuid='undef'
+d_drand48_r='undef'
+d_drand48proto='define'
+d_dup2='define'
+d_eaccess='define'
+d_endgrent='define'
+d_endgrent_r='undef'
+d_endhent='define'
+d_endhostent_r='undef'
+d_endnent='define'
+d_endnetent_r='undef'
+d_endpent='define'
+d_endprotoent_r='undef'
+d_endpwent='define'
+d_endpwent_r='undef'
+d_endsent='define'
+d_endservent_r='undef'
+d_eofnblk='define'
+d_eunice='undef'
+d_faststdio='define'
+d_fchdir='define'
+d_fchmod='define'
+d_fchown='define'
+d_fcntl='define'
+d_fcntl_can_lock='undef'
+d_fd_macros='define'
+d_fd_set='define'
+d_fds_bits='undef'
+d_fgetpos='define'
+d_finite='define'
+d_finitel='define'
+d_flexfnam='define'
+d_flock='define'
+d_flockproto='define'
+d_fork='define'
+d_fp_class='undef'
+d_fpathconf='define'
+d_fpclass='undef'
+d_fpclassify='undef'
+d_fpclassl='undef'
+d_fpos64_t='undef'
+d_frexpl='define'
+d_fs_data_s='undef'
+d_fseeko='define'
+d_fsetpos='define'
+d_fstatfs='define'
+d_fstatvfs='define'
+d_fsync='define'
+d_ftello='define'
+d_ftime='undef'
+d_futimes='define'
+d_gdbm_ndbm_h_uses_prototypes='undef'
+d_gdbmndbm_h_uses_prototypes='undef'
+d_getaddrinfo='define'
+d_getcwd='define'
+d_getespwnam='undef'
+d_getfsstat='undef'
+d_getgrent='define'
+d_getgrent_r='undef'
+d_getgrgid_r='undef'
+d_getgrnam_r='undef'
+d_getgrps='define'
+d_gethbyaddr='define'
+d_gethbyname='define'
+d_gethent='define'
+d_gethname='define'
+d_gethostbyaddr_r='undef'
+d_gethostbyname_r='undef'
+d_gethostent_r='undef'
+d_gethostprotos='define'
+d_getitimer='define'
+d_getlogin='define'
+d_getlogin_r='undef'
+d_getmnt='undef'
+d_getmntent='define'
+d_getnameinfo='define'
+d_getnbyaddr='define'
+d_getnbyname='define'
+d_getnent='define'
+d_getnetbyaddr_r='undef'
+d_getnetbyname_r='undef'
+d_getnetent_r='undef'
+d_getnetprotos='define'
+d_getpagsz='define'
+d_getpbyname='define'
+d_getpbynumber='define'
+d_getpent='define'
+d_getpgid='define'
+d_getpgrp2='undef'
+d_getpgrp='define'
+d_getppid='define'
+d_getprior='define'
+d_getprotobyname_r='undef'
+d_getprotobynumber_r='undef'
+d_getprotoent_r='undef'
+d_getprotoprotos='define'
+d_getprpwnam='undef'
+d_getpwent='define'
+d_getpwent_r='undef'
+d_getpwnam_r='undef'
+d_getpwuid_r='undef'
+d_getsbyname='define'
+d_getsbyport='define'
+d_getsent='define'
+d_getservbyname_r='undef'
+d_getservbyport_r='undef'
+d_getservent_r='undef'
+d_getservprotos='define'
+d_getspnam='define'
+d_getspnam_r='undef'
+d_gettimeod='define'
+d_gmtime64='undef'
+d_gmtime_r='undef'
+d_gnulibc='define'
+d_grpasswd='define'
+d_hasmntopt='define'
+d_htonl='define'
+d_ilogbl='define'
+d_inc_version_list='undef'
+d_index='undef'
+d_inetaton='define'
+d_inetntop='define'
+d_inetpton='define'
+d_int64_t='define'
+d_ip_mreq='define'
+d_ip_mreq_source='define'
+d_ipv6_mreq='define'
+d_ipv6_mreq_source='undef'
+d_isascii='define'
+d_isblank='define'
+d_isfinite='undef'
+d_isinf='define'
+d_isnan='define'
+d_isnanl='define'
+d_killpg='define'
+d_lchown='define'
+d_ldbl_dig='define'
+d_libm_lib_version='define'
+d_link='define'
+d_localtime64='undef'
+d_localtime_r='undef'
+d_localtime_r_needs_tzset='undef'
+d_locconv='define'
+d_lockf='define'
+d_longdbl='define'
+d_longlong='define'
+d_lseekproto='define'
+d_lstat='define'
+d_madvise='define'
+d_malloc_good_size='undef'
+d_malloc_size='undef'
+d_mblen='define'
+d_mbstowcs='define'
+d_mbtowc='define'
+d_memchr='define'
+d_memcmp='define'
+d_memcpy='define'
+d_memmove='define'
+d_memset='define'
+d_mkdir='define'
+d_mkdtemp='define'
+d_mkfifo='define'
+d_mkstemp='define'
+d_mkstemps='define'
+d_mktime64='undef'
+d_mktime='define'
+d_mmap='define'
+d_modfl='define'
+d_modfl_pow32_bug='undef'
+d_modflproto='define'
+d_mprotect='define'
+d_msg='define'
+d_msg_ctrunc='define'
+d_msg_dontroute='define'
+d_msg_oob='define'
+d_msg_peek='define'
+d_msg_proxy='define'
+d_msgctl='define'
+d_msgget='define'
+d_msghdr_s='define'
+d_msgrcv='define'
+d_msgsnd='define'
+d_msync='define'
+d_munmap='define'
+d_mymalloc='undef'
+d_ndbm='undef'
+d_ndbm_h_uses_prototypes='undef'
+d_nice='define'
+d_nl_langinfo='define'
+d_nv_preserves_uv='define'
+d_nv_zero_is_allbits_zero='define'
+d_off64_t='undef'
+d_old_pthread_create_joinable='undef'
+d_oldpthreads='undef'
+d_oldsock='undef'
+d_open3='define'
+d_pathconf='define'
+d_pause='define'
+d_perl_otherlibdirs='undef'
+d_phostname='undef'
+d_pipe='define'
+d_poll='define'
+d_portable='define'
+d_prctl='define'
+d_prctl_set_name='define'
+d_printf_format_null='define'
+d_procselfexe='undef'
+d_pseudofork='undef'
+d_pthread_atfork='undef'
+d_pthread_attr_setscope='define'
+d_pthread_yield='undef'
+d_pwage='undef'
+d_pwchange='undef'
+d_pwclass='undef'
+d_pwcomment='undef'
+d_pwexpire='undef'
+d_pwgecos='define'
+d_pwpasswd='define'
+d_pwquota='undef'
+d_qgcvt='define'
+d_quad='define'
+d_random_r='undef'
+d_readdir64_r='undef'
+d_readdir='define'
+d_readdir_r='undef'
+d_readlink='define'
+d_readv='define'
+d_recvmsg='define'
+d_rename='define'
+d_rewinddir='define'
+d_rmdir='define'
+d_safebcpy='undef'
+d_safemcpy='undef'
+d_sanemcmp='define'
+d_sbrkproto='define'
+d_scalbnl='define'
+d_sched_yield='define'
+d_scm_rights='define'
+d_seekdir='define'
+d_select='define'
+d_sem='define'
+d_semctl='define'
+d_semctl_semid_ds='define'
+d_semctl_semun='define'
+d_semget='define'
+d_semop='define'
+d_sendmsg='define'
+d_setegid='define'
+d_seteuid='define'
+d_setgrent='define'
+d_setgrent_r='undef'
+d_setgrps='define'
+d_sethent='define'
+d_sethostent_r='undef'
+d_setitimer='define'
+d_setlinebuf='define'
+d_setlocale='define'
+d_setlocale_r='undef'
+d_setnent='define'
+d_setnetent_r='undef'
+d_setpent='define'
+d_setpgid='define'
+d_setpgrp2='undef'
+d_setpgrp='define'
+d_setprior='define'
+d_setproctitle='undef'
+d_setprotoent_r='undef'
+d_setpwent='define'
+d_setpwent_r='undef'
+d_setregid='define'
+d_setresgid='define'
+d_setresuid='define'
+d_setreuid='define'
+d_setrgid='undef'
+d_setruid='undef'
+d_setsent='define'
+d_setservent_r='undef'
+d_setsid='define'
+d_setvbuf='define'
+d_sfio='undef'
+d_shm='define'
+d_shmat='define'
+d_shmatprototype='define'
+d_shmctl='define'
+d_shmdt='define'
+d_shmget='define'
+d_sigaction='define'
+d_signbit='define'
+d_sigprocmask='define'
+d_sigsetjmp='define'
+d_sin6_scope_id='define'
+d_sitearch='define'
+d_snprintf='define'
+d_sockaddr_in6='define'
+d_sockaddr_sa_len='undef'
+d_sockatmark='define'
+d_sockatmarkproto='define'
+d_socket='define'
+d_socklen_t='define'
+d_sockpair='define'
+d_socks5_init='undef'
+d_sprintf_returns_strlen='define'
+d_sqrtl='define'
+d_srand48_r='undef'
+d_srandom_r='undef'
+d_sresgproto='undef'
+d_sresuproto='undef'
+d_statblks='define'
+d_statfs_f_flags='define'
+d_statfs_s='define'
+d_static_inline='define'
+d_statvfs='define'
+d_stdio_cnt_lval='undef'
+d_stdio_ptr_lval='define'
+d_stdio_ptr_lval_nochange_cnt='undef'
+d_stdio_ptr_lval_sets_cnt='define'
+d_stdio_stream_array='undef'
+d_stdiobase='define'
+d_stdstdio='define'
+d_strchr='define'
+d_strcoll='define'
+d_strctcpy='define'
+d_strerrm='strerror(e)'
+d_strerror='define'
+d_strerror_r='undef'
+d_strftime='define'
+d_strlcat='undef'
+d_strlcpy='undef'
+d_strtod='define'
+d_strtol='define'
+d_strtold='define'
+d_strtoll='define'
+d_strtoq='define'
+d_strtoul='define'
+d_strtoull='define'
+d_strtouq='define'
+d_strxfrm='define'
+d_suidsafe='undef'
+d_symlink='define'
+d_syscall='define'
+d_syscallproto='define'
+d_sysconf='define'
+d_sysernlst=''
+d_syserrlst='define'
+d_system='define'
+d_tcgetpgrp='define'
+d_tcsetpgrp='define'
+d_telldir='define'
+d_telldirproto='define'
+d_time='define'
+d_timegm='define'
+d_times='define'
+d_tm_tm_gmtoff='define'
+d_tm_tm_zone='define'
+d_tmpnam_r='undef'
+d_truncate='define'
+d_ttyname_r='undef'
+d_tzname='define'
+d_u32align='undef'
+d_ualarm='define'
+d_umask='define'
+d_uname='define'
+d_union_semun='undef'
+d_unordered='undef'
+d_unsetenv='define'
+d_usleep='define'
+d_usleepproto='define'
+d_ustat='define'
+d_vendorarch='undef'
+d_vendorbin='undef'
+d_vendorlib='undef'
+d_vendorscript='undef'
+d_vfork='undef'
+d_void_closedir='undef'
+d_voidsig='define'
+d_voidtty=''
+d_volatile='define'
+d_vprintf='define'
+d_vsnprintf='define'
+d_wait4='define'
+d_waitpid='define'
+d_wcstombs='define'
+d_wctomb='define'
+d_writev='define'
+d_xenix='undef'
+date='date'
+db_hashtype='u_int32_t'
+db_prefixtype='size_t'
+db_version_major=''
+db_version_minor=''
+db_version_patch=''
+defvoidused='15'
+direntrytype='struct dirent'
+dlext='so'
+dlsrc='dl_dlopen.xs'
+doublesize='8'
+drand01='drand48()'
+drand48_r_proto='0'
+dtrace=''
+dynamic_ext='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call Hash/Util Hash/Util/FieldHash I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate Unicode/Normalize XS/APItest XS/Typemap arybase attributes mro re threads threads/shared'
+eagain='EAGAIN'
+ebcdic='undef'
+echo='echo'
+egrep='egrep'
+emacs=''
+endgrent_r_proto='0'
+endhostent_r_proto='0'
+endnetent_r_proto='0'
+endprotoent_r_proto='0'
+endpwent_r_proto='0'
+endservent_r_proto='0'
+eunicefix=':'
+exe_ext=''
+expr='expr'
+extensions='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call Hash/Util Hash/Util/FieldHash I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate Unicode/Normalize XS/APItest XS/Typemap arybase attributes mro re threads threads/shared Archive/Extract Archive/Tar Attribute/Handlers AutoLoader B/Debug B/Deparse B/Lint CGI CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML CPANPLUS CPANPLUS/Dist/Build Carp Config/Perl/V Devel/SelfStubber Digest Dumpvalue Env Errno ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/ParseXS File/CheckTree File/Fetch File/Path File/Temp FileCache Filter/Simple Getopt/Long HTTP/Tiny I18N/Collate I18N/LangTags IO/Compress IO/Zlib IPC/Cmd IPC/Open3 JSON/PP Locale/Codes Locale/Maketext Locale/Maketext/Simple Log/Message Log/Message/Simple Math/BigInt Math/BigRat Math/Complex Memoize Module/Build Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata Module/Pluggable NEXT Net/Ping Object/Accessor Package/Constants Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/LaTeX Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage Safe Search/Dict SelfLoader Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Term/UI Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Memoize Tie/RefHash Time/Local XSLoader autodie autouse base bignum constant encoding/warnings if lib libnet parent perlfaq podlators'
+extern_C='extern'
+extras=''
+fflushNULL='define'
+fflushall='undef'
+find=''
+firstmakefile='makefile'
+flex=''
+fpossize='16'
+fpostype='fpos_t'
+freetype='void'
+from=':'
+full_ar='%%AR%%'
+full_csh='csh'
+full_sed='/bin/sed'
+gccansipedantic=''
+gccosandvers=''
+gccversion='4.7.3'
+getgrent_r_proto='0'
+getgrgid_r_proto='0'
+getgrnam_r_proto='0'
+gethostbyaddr_r_proto='0'
+gethostbyname_r_proto='0'
+gethostent_r_proto='0'
+getlogin_r_proto='0'
+getnetbyaddr_r_proto='0'
+getnetbyname_r_proto='0'
+getnetent_r_proto='0'
+getprotobyname_r_proto='0'
+getprotobynumber_r_proto='0'
+getprotoent_r_proto='0'
+getpwent_r_proto='0'
+getpwnam_r_proto='0'
+getpwuid_r_proto='0'
+getservbyname_r_proto='0'
+getservbyport_r_proto='0'
+getservent_r_proto='0'
+getspnam_r_proto='0'
+gidformat='"lu"'
+gidsign='1'
+gidsize='4'
+gidtype='gid_t'
+glibpth='/usr/shlib  /lib /usr/lib /usr/lib/386 /lib/386 /usr/ccs/lib /usr/ucblib /usr/local/lib '
+gmake='gmake'
+gmtime_r_proto='0'
+gnulibc_version='2.18'
+grep='grep'
+groupcat='cat /etc/group'
+groupstype='gid_t'
+gzip='gzip'
+h_fcntl='false'
+h_sysfile='true'
+hint='recommended'
+hostcat='cat /etc/hosts'
+html1dir=' '
+html1direxp=''
+html3dir=' '
+html3direxp=''
+i16size='2'
+i16type='short'
+i32size='4'
+i32type='long'
+i64size='8'
+i64type='long long'
+i8size='1'
+i8type='signed char'
+i_arpainet='define'
+i_assert='define'
+i_bsdioctl=''
+i_crypt='define'
+i_db='undef'
+i_dbm='undef'
+i_dirent='define'
+i_dld='undef'
+i_dlfcn='define'
+i_fcntl='undef'
+i_float='define'
+i_fp='undef'
+i_fp_class='undef'
+i_gdbm='undef'
+i_gdbm_ndbm='undef'
+i_gdbmndbm='undef'
+i_grp='define'
+i_ieeefp='undef'
+i_inttypes='define'
+i_langinfo='define'
+i_libutil='undef'
+i_limits='define'
+i_locale='define'
+i_machcthr='undef'
+i_malloc='define'
+i_mallocmalloc='undef'
+i_math='define'
+i_memory='undef'
+i_mntent='define'
+i_ndbm='undef'
+i_netdb='define'
+i_neterrno='undef'
+i_netinettcp='define'
+i_niin='define'
+i_poll='define'
+i_prot='undef'
+i_pthread='define'
+i_pwd='define'
+i_rpcsvcdbm='undef'
+i_sfio='undef'
+i_sgtty='undef'
+i_shadow='define'
+i_socks='undef'
+i_stdarg='define'
+i_stdbool='define'
+i_stddef='define'
+i_stdlib='define'
+i_string='define'
+i_sunmath='undef'
+i_sysaccess='undef'
+i_sysdir='define'
+i_sysfile='define'
+i_sysfilio='undef'
+i_sysin='undef'
+i_sysioctl='define'
+i_syslog='define'
+i_sysmman='define'
+i_sysmode='undef'
+i_sysmount='define'
+i_sysndir='undef'
+i_sysparam='define'
+i_syspoll='define'
+i_sysresrc='define'
+i_syssecrt='undef'
+i_sysselct='define'
+i_syssockio='undef'
+i_sysstat='define'
+i_sysstatfs='define'
+i_sysstatvfs='define'
+i_systime='define'
+i_systimek='undef'
+i_systimes='define'
+i_systypes='define'
+i_sysuio='define'
+i_sysun='define'
+i_sysutsname='define'
+i_sysvfs='define'
+i_syswait='define'
+i_termio='undef'
+i_termios='define'
+i_time='define'
+i_unistd='define'
+i_ustat='define'
+i_utime='define'
+i_values='define'
+i_varargs='undef'
+i_varhdr='stdarg.h'
+i_vfork='undef'
+ignore_versioned_solibs='y'
+inc_version_list=' '
+inc_version_list_init='0'
+incpath=''
+inews=''
+initialinstalllocation='/usr/bin'
+installarchlib='/usr/lib/perl5/5.18.1/i686-linux'
+installbin='/usr/bin'
+installhtml1dir=''
+installhtml3dir=''
+installman1dir=''
+installman3dir=''
+installprefix='/usr'
+installprefixexp='/usr'
+installprivlib='/usr/lib/perl5/5.18.1'
+installscript='/usr/bin'
+installsitearch='/usr/lib/perl5/site_perl/5.18.1/i686-linux'
+installsitebin='/usr/bin'
+installsitehtml1dir=''
+installsitehtml3dir=''
+installsitelib='/usr/lib/perl5/site_perl/5.18.1'
+installsiteman1dir=''
+installsiteman3dir=''
+installsitescript='/usr/bin'
+installstyle='lib/perl5'
+installusrbinperl='undef'
+installvendorarch=''
+installvendorbin=''
+installvendorhtml1dir=''
+installvendorhtml3dir=''
+installvendorlib=''
+installvendorman1dir=''
+installvendorman3dir=''
+installvendorscript=''
+intsize='4'
+issymlink='test -h'
+ivdformat='"ld"'
+ivsize='4'
+ivtype='long'
+known_extensions='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call GDBM_File Hash/Util Hash/Util/FieldHash I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc NDBM_File ODBM_File Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate Unicode/Normalize VMS/DCLsym VMS/Stdio Win32 Win32API/File Win32CORE XS/APItest XS/Typemap arybase attributes mro re threads threads/shared '
+ksh=''
+ld='%%LD%%'
+ld_can_script='define'
+lddlflags='-shared %%LDFLAGS%%'
+ldflags=' %%LDFLAGS%%'
+ldflags_uselargefiles=''
+ldlibpthname='LD_LIBRARY_PATH'
+less='less'
+lib_ext='.a'
+libc=''
+libperl='libperl.a'
+libpth='%%LIBDIRS%%'
+libs='-lnsl -ldl -lm -lcrypt -lutil -lc'
+libsdirs='%%LIBDIRS%%'
+libsfiles=' libnsl.so libdl.so libm.so libcrypt.so libutil.so libc.so'
+#libsfound=' /lib/libnsl.so /lib/libdl.so /lib/libm.so /lib/libcrypt.so /lib/libutil.so /usr/lib/libc.so'
+libspath='%%LIBDIRS%%'
+libswanted='sfio socket inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun m crypt sec util c cposix posix ucb BSD gdbm_compat'
+libswanted_uselargefiles=''
+line=''
+lint=''
+lkflags=''
+ln='ln'
+lns='/bin/ln -s'
+localtime_r_proto='0'
+locincpth='/usr/local/include /opt/local/include /usr/gnu/include /opt/gnu/include /usr/GNU/include /opt/GNU/include'
+loclibpth='/usr/local/lib /opt/local/lib /usr/gnu/lib /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib'
+longdblsize='12'
+longlongsize='8'
+longsize='4'
+lp=''
+lpr=''
+ls='ls'
+lseeksize='8'
+lseektype='off_t'
+mad='undef'
+madlyh=''
+madlyobj=''
+madlysrc=''
+mail=''
+mailx=''
+make='make'
+make_set_make='#'
+mallocobj=''
+mallocsrc=''
+malloctype='void *'
+man1dir=' '
+man1direxp=''
+man1ext='0'
+man3dir=' '
+man3direxp=''
+man3ext='0'
+mips_type=''
+mistrustnm=''
+mkdir='mkdir'
+mmaptype='void *'
+modetype='mode_t'
+more='more'
+multiarch='undef'
+mv=''
+myarchname='i686-linux'
+mydomain='.nonet'
+myhostname='openadk'
+myuname='linux openadk 3.12.6 #1 sat jan 11 14:26:27 cet 2014 i686 gnulinux '
+n='-n'
+need_va_copy='undef'
+netdb_hlen_type='size_t'
+netdb_host_type='const void *'
+netdb_name_type='const char *'
+netdb_net_type='in_addr_t'
+nm='nm'
+nm_opt=''
+nm_so_opt='--dynamic'
+nonxs_ext='Archive/Extract Archive/Tar Attribute/Handlers AutoLoader B/Debug B/Deparse B/Lint CGI CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML CPANPLUS CPANPLUS/Dist/Build Carp Config/Perl/V Devel/SelfStubber Digest Dumpvalue Env Errno ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/ParseXS File/CheckTree File/Fetch File/Path File/Temp FileCache Filter/Simple Getopt/Long HTTP/Tiny I18N/Collate I18N/LangTags IO/Compress IO/Zlib IPC/Cmd IPC/Open3 JSON/PP Locale/Codes Locale/Maketext Locale/Maketext/Simple Log/Message Log/Message/Simple Math/BigInt Math/BigRat Math/Complex Memoize Module/Build Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata Module/Pluggable NEXT Net/Ping Object/Accessor Package/Constants Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/LaTeX Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage Safe Search/Dict SelfLoader Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Term/UI Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Memoize Tie/RefHash Time/Local XSLoader autodie autouse base bignum constant encoding/warnings if lib libnet parent perlfaq podlators'
+nroff='nroff'
+nvEUformat='"E"'
+nvFUformat='"F"'
+nvGUformat='"G"'
+nv_overflows_integers_at='256.0*256.0*256.0*256.0*256.0*256.0*2.0*2.0*2.0*2.0*2.0'
+nv_preserves_uv_bits='32'
+nveformat='"e"'
+nvfformat='"f"'
+nvgformat='"g"'
+nvsize='8'
+nvtype='double'
+o_nonblock='O_NONBLOCK'
+obj_ext='.o'
+old_pthread_create_joinable=''
+optimize='-O2'
+orderlib='false'
+osname='linux'
+osvers='3.12.6'
+otherlibdirs=' '
+package='perl5'
+pager='/usr/bin/less -R'
+passcat='cat /etc/passwd'
+patchlevel='18'
+path_sep=':'
+perl5=''
+perl='perl'
+perl_patchlevel=''
+perl_static_inline='static __inline__'
+perladmin='root@openadk.nonet'
+perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc'
+perlpath='/usr/bin/perl'
+pg='pg'
+phostname='hostname'
+pidtype='pid_t'
+plibpth='/lib/i686-openadk-linux-gnu/4.7.3 /lib/i386-linux-gnu /lib /usr/lib/i686-openadk-linux-gnu/4.7.3 /usr/lib/i386-linux-gnu /usr/lib'
+pmake=''
+pr=''
+prefix='/usr'
+prefixexp='/usr'
+privlib='/usr/lib/perl5/5.18.1'
+privlibexp='/usr/lib/perl5/5.18.1'
+procselfexe=''
+prototype='define'
+ptrsize='4'
+quadkind='3'
+quadtype='long long'
+randbits='48'
+randfunc='drand48'
+random_r_proto='0'
+randseedtype='long'
+ranlib=':'
+rd_nodata='-1'
+readdir64_r_proto='0'
+readdir_r_proto='0'
+revision='5'
+rm='rm'
+rm_try='/bin/rm -f try try a.out .out try.[cho] try..o core core.try* try.core*'
+rmail=''
+run=''
+runnm='false'
+sGMTIME_max='2147483647'
+sGMTIME_min='-2147483648'
+sLOCALTIME_max='2147483647'
+sLOCALTIME_min='-2147483648'
+sPRIEUldbl='"LE"'
+sPRIFUldbl='"LF"'
+sPRIGUldbl='"LG"'
+sPRIXU64='"LX"'
+sPRId64='"Ld"'
+sPRIeldbl='"Le"'
+sPRIfldbl='"Lf"'
+sPRIgldbl='"Lg"'
+sPRIi64='"Li"'
+sPRIo64='"Lo"'
+sPRIu64='"Lu"'
+sPRIx64='"Lx"'
+sSCNfldbl='"Lf"'
+sched_yield='sched_yield()'
+scriptdir='/usr/bin'
+scriptdirexp='/usr/bin'
+sed='sed'
+seedfunc='srand48'
+selectminbits='32'
+selecttype='fd_set *'
+sendmail=''
+setgrent_r_proto='0'
+sethostent_r_proto='0'
+setlocale_r_proto='0'
+setnetent_r_proto='0'
+setprotoent_r_proto='0'
+setpwent_r_proto='0'
+setservent_r_proto='0'
+sh='/bin/sh'
+shar=''
+sharpbang='#!'
+shmattype='void *'
+shortsize='2'
+shrpenv=''
+shsharp='true'
+sig_count='65'
+sig_name='ZERO HUP INT QUIT ILL TRAP ABRT BUS FPE KILL USR1 SEGV USR2 PIPE ALRM TERM STKFLT CHLD CONT STOP TSTP TTIN TTOU URG XCPU XFSZ VTALRM PROF WINCH IO PWR SYS NUM32 NUM33 RTMIN NUM35 NUM36 NUM37 NUM38 NUM39 NUM40 NUM41 NUM42 NUM43 NUM44 NUM45 NUM46 NUM47 NUM48 NUM49 NUM50 NUM51 NUM52 NUM53 NUM54 NUM55 NUM56 NUM57 NUM58 NUM59 NUM60 NUM61 NUM62 NUM63 RTMAX IOT CLD POLL UNUSED '
+sig_name_init='"ZERO", "HUP", "INT", "QUIT", "ILL", "TRAP", "ABRT", "BUS", "FPE", "KILL", "USR1", "SEGV", "USR2", "PIPE", "ALRM", "TERM", "STKFLT", "CHLD", "CONT", "STOP", "TSTP", "TTIN", "TTOU", "URG", "XCPU", "XFSZ", "VTALRM", "PROF", "WINCH", "IO", "PWR", "SYS", "NUM32", "NUM33", "RTMIN", "NUM35", "NUM36", "NUM37", "NUM38", "NUM39", "NUM40", "NUM41", "NUM42", "NUM43", "NUM44", "NUM45", "NUM46", "NUM47", "NUM48", "NUM49", "NUM50", "NUM51", "NUM52", "NUM53", "NUM54", "NUM55", "NUM56", "NUM57", "NUM58", "NUM59", "NUM60", "NUM61", "NUM62", "NUM63", "RTMAX", "IOT", "CLD", "POLL", "UNUSED", 0'
+sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 6 17 29 31 '
+sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 6, 17, 29, 31, 0'
+sig_size='69'
+signal_t='void'
+sitearch='/usr/lib/perl5/site_perl/5.18.1/i686-linux'
+sitearchexp='/usr/lib/perl5/site_perl/5.18.1/i686-linux'
+sitebin='/usr/bin'
+sitebinexp='/usr/bin'
+sitehtml1dir=''
+sitehtml1direxp=''
+sitehtml3dir=''
+sitehtml3direxp=''
+sitelib='/usr/lib/perl5/site_perl/5.18.1'
+sitelib_stem='/usr/lib/perl5/site_perl'
+sitelibexp='/usr/lib/perl5/site_perl/5.18.1'
+siteman1dir=''
+siteman1direxp=''
+siteman3dir=''
+siteman3direxp=''
+siteprefix='/usr'
+siteprefixexp='/usr'
+sitescript='/usr/bin'
+sitescriptexp='/usr/bin'
+sizesize='4'
+sizetype='size_t'
+sleep=''
+smail=''
+so='so'
+sockethdr=''
+socketlib=''
+socksizetype='socklen_t'
+sort='sort'
+spackage='Perl5'
+spitshell='cat'
+srand48_r_proto='0'
+srandom_r_proto='0'
+src='.'
+ssizetype='ssize_t'
+st_ino_sign='1'
+st_ino_size='8'
+startperl='#!/usr/bin/perl'
+startsh='#!/bin/sh'
+static_ext=' '
+stdchar='char'
+stdio_base='((fp)->_IO_read_base)'
+stdio_bufsiz='((fp)->_IO_read_end - (fp)->_IO_read_base)'
+stdio_cnt='((fp)->_IO_read_end - (fp)->_IO_read_ptr)'
+stdio_filbuf=''
+stdio_ptr='((fp)->_IO_read_ptr)'
+stdio_stream_array=''
+strerror_r_proto='0'
+strings='/usr/include/string.h'
+submit=''
+subversion='1'
+sysman='/usr/man/man1'
+tail=''
+tar=''
+targetarch=''
+tbl=''
+tee=''
+test='test'
+timeincl='/usr/include/sys/time.h /usr/include/time.h '
+timetype='time_t'
+tmpnam_r_proto='0'
+to=':'
+touch='touch'
+tr='tr'
+trnl='\n'
+troff=''
+ttyname_r_proto='0'
+u16size='2'
+u16type='unsigned short'
+u32size='4'
+u32type='unsigned long'
+u64size='8'
+u64type='unsigned long long'
+u8size='1'
+u8type='unsigned char'
+uidformat='"lu"'
+uidsign='1'
+uidsize='4'
+uidtype='uid_t'
+uname='uname'
+uniq='uniq'
+uquadtype='unsigned long long'
+use5005threads='undef'
+use64bitall='undef'
+use64bitint='undef'
+usecrosscompile='undef'
+usedevel='undef'
+usedl='define'
+usedtrace='undef'
+usefaststdio='undef'
+useithreads='undef'
+usekernprocpathname='undef'
+uselargefiles='define'
+uselongdouble='undef'
+usemallocwrap='define'
+usemorebits='undef'
+usemultiplicity='undef'
+usemymalloc='n'
+usenm='false'
+usensgetexecutablepath='undef'
+useopcode='true'
+useperlio='define'
+useposix='true'
+usereentrant='undef'
+userelocatableinc='undef'
+usesfio='false'
+useshrplib='false'
+usesitecustomize='undef'
+usesocks='undef'
+usethreads='undef'
+usevendorprefix='undef'
+useversionedarchname='undef'
+usevfork='false'
+usrinc='%%INCDIRS%%'
+uuname=''
+uvXUformat='"lX"'
+uvoformat='"lo"'
+uvsize='4'
+uvtype='unsigned long'
+uvuformat='"lu"'
+uvxformat='"lx"'
+vaproto='define'
+vendorarch=''
+vendorarchexp=''
+vendorbin=''
+vendorbinexp=''
+vendorhtml1dir=' '
+vendorhtml1direxp=''
+vendorhtml3dir=' '
+vendorhtml3direxp=''
+vendorlib=''
+vendorlib_stem=''
+vendorlibexp=''
+vendorman1dir=' '
+vendorman1direxp=''
+vendorman3dir=' '
+vendorman3direxp=''
+vendorprefix=''
+vendorprefixexp=''
+vendorscript=''
+vendorscriptexp=''
+version='5.18.1'
+version_patchlevel_string='version 18 subversion 1'
+versiononly='undef'
+vi=''
+voidflags='15'
+xlibpth='/usr/lib/386 /lib/386'
+yacc='yacc'
+yaccflags=''
+zcat=''
+zip='zip'
+PERL_REVISION=5
+PERL_VERSION=18
+PERL_SUBVERSION=1
+PERL_API_REVISION=5
+PERL_API_VERSION=18
+PERL_API_SUBVERSION=0
+PERL_PATCHLEVEL=''
+PERL_CONFIG_SH=true
+: Variables propagated from previous config.sh file.
+libdb_needs_pthread='N'
diff --git a/package/perl/files/config.sh.ppc.eglibc b/package/perl/files/config.sh.ppc.eglibc
new file mode 100644
index 000000000..a1b56018f
--- /dev/null
+++ b/package/perl/files/config.sh.ppc.eglibc
@@ -0,0 +1,1118 @@
+#!/bin/sh
+#
+# This file was produced by running the Configure script. It holds all the
+# definitions figured out by Configure. Should you modify one of these values,
+# do not forget to propagate your changes by running "Configure -der". You may
+# instead choose to run each of the .SH files by yourself, or "Configure -S".
+#
+
+# Package name      : perl5
+# Source directory  : .
+# Configuration time: Tue Jan 14 12:51:25 CET 2014
+# Configured by     : root
+# Target system     : linux openadk 3.12.6 #1 tue jan 14 10:26:22 cet 2014 ppc gnulinux 
+
+: Configure command line arguments.
+config_arg0='./Configure'
+config_args='-des'
+config_argc=1
+config_arg1='-des'
+
+Author=''
+Date='$Date'
+Header=''
+Id='$Id'
+Locker=''
+Log='$Log'
+RCSfile='$RCSfile'
+Revision='$Revision'
+Source=''
+State=''
+_a='.a'
+_exe=''
+_o='.o'
+afs='false'
+afsroot='/afs'
+alignbytes='8'
+ansi2knr=''
+aphostname='/bin/hostname'
+api_revision='5'
+api_subversion='0'
+api_version='18'
+api_versionstring='5.18.0'
+ar='ar'
+archlib='/usr/lib/perl5/5.18.1/ppc-linux'
+archlibexp='/usr/lib/perl5/5.18.1/ppc-linux'
+archname64=''
+archname='ppc-linux'
+archobjs=''
+asctime_r_proto='0'
+awk='awk'
+baserev='5.0'
+bash=''
+bin='/usr/bin'
+bin_ELF='define'
+binexp='/usr/bin'
+bison='bison'
+bootstrap_charset='undef'
+byacc='byacc'
+byteorder='4321'
+c=''
+castflags='0'
+cat='cat'
+cc='%%CC%%'
+cccdlflags='-fPIC'
+ccdlflags='-Wl,-E'
+ccflags='%%CFLAGS%%'
+ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
+ccname='gcc'
+ccsymbols='system=linux system=posix system=unix'
+ccversion=''
+cf_by='root'
+cf_email='root@openadk.nonet'
+cf_time='Tue Jan 14 12:51:25 CET 2014'
+charbits='8'
+charsize='1'
+chgrp=''
+chmod='chmod'
+chown=''
+clocktype='clock_t'
+comm='comm'
+compress=''
+contains='grep'
+cp='cp'
+cpio=''
+cpp='cpp'
+cpp_stuff='42'
+cppccsymbols='__gnu_linux__=1 __linux=1 __linux__=1 __unix=1 __unix__=1 linux=1 unix=1'
+cppflags='%%CPPFLAGS%%'
+cpplast='-'
+cppminus='-'
+cpprun='%%CPP%%'
+cppstdin='%%CPP%%'
+cppsymbols='PPC=1 _ARCH_PPC=1 _BIG_ENDIAN=1 _CALL_SYSV=1 _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE=1 _POSIX_C_SOURCE=200809L _POSIX_SOURCE=1 __ATOMIC_ACQUIRE=2 __ATOMIC_ACQ_REL=4 __ATOMIC_CONSUME=1 __ATOMIC_RELAXED=0 __ATOMIC_RELEASE=3 __ATOMIC_SEQ_CST=5 __BIGGEST_ALIGNMENT__=16 __BIG_ENDIAN__=1 __BYTE_ORDER__=4321 __CHAR16_TYPE__=short\ unsigned\ int __CHAR32_TYPE__=unsigned\ int __CHAR_BIT__=8 __CHAR_UNSIGNED__=1 __DBL_DECIMAL_DIG__=17 __DBL_DENORM_MIN__=((double)4.9406564584124654e-324L) __DBL_DIG__=15 __DBL_EPSILON__=((double)2.2204460492503131e-16L) __DBL_HAS_DENORM__=1 __DBL_HAS_INFINITY__=1 __DBL_HAS_QUIET_NAN__=1 __DBL_MANT_DIG__=53 __DBL_MAX_10_EXP__=308 __DBL_MAX_EXP__=1024 __DBL_MAX__=((double)1.7976931348623157e+308L) __DBL_MIN_10_EXP__=(-307) __DBL_MIN_EXP__=(-1021) __DBL_MIN__=((double)2.2250738585072014e-308L) __DEC128_EPSILON__=1E-33DL __DEC128_MANT_DIG__=34 __DEC128_MAX_EXP__=6145 __DEC128_MAX__=9.999999999999999999999999999999999E6144DL __DEC128_MIN_EXP__=(-6142) __DEC128_MIN__=1E-6143DL __DEC128_SUBNORMAL_MIN__=0.000000000000000000000000000000001E-6143DL __DEC32_EPSILON__=1E-6DF __DEC32_MANT_DIG__=7 __DEC32_MAX_EXP__=97 __DEC32_MAX__=9.999999E96DF __DEC32_MIN_EXP__=(-94) __DEC32_MIN__=1E-95DF __DEC32_SUBNORMAL_MIN__=0.000001E-95DF __DEC64_EPSILON__=1E-15DD __DEC64_MANT_DIG__=16 __DEC64_MAX_EXP__=385 __DEC64_MAX__=9.999999999999999E384DD __DEC64_MIN_EXP__=(-382) __DEC64_MIN__=1E-383DD __DEC64_SUBNORMAL_MIN__=0.000000000000001E-383DD __DECIMAL_DIG__=17 __DEC_EVAL_METHOD__=2 __ELF__=1 __FINITE_MATH_ONLY__=0 __FLOAT_WORD_ORDER__=4321 __FLT_DECIMAL_DIG__=9 __FLT_DENORM_MIN__=1.4012984643248171e-45F __FLT_DIG__=6 __FLT_EPSILON__=1.1920928955078125e-7F __FLT_EVAL_METHOD__=0 __FLT_HAS_DENORM__=1 __FLT_HAS_INFINITY__=1 __FLT_HAS_QUIET_NAN__=1 __FLT_MANT_DIG__=24 __FLT_MAX_10_EXP__=38 __FLT_MAX_EXP__=128 __FLT_MAX__=3.4028234663852886e+38F __FLT_MIN_10_EXP__=(-37) __FLT_MIN_EXP__=(-125) __FLT_MIN__=1.1754943508222875e-38F __FLT_RADIX__=2 __FP_FAST_FMA=1 __FP_FAST_FMAF=1 __FP_FAST_FMAL=1 __GCC_ATOMIC_BOOL_LOCK_FREE=2 __GCC_ATOMIC_CHAR16_T_LOCK_FREE=2 __GCC_ATOMIC_CHAR32_T_LOCK_FREE=2 __GCC_ATOMIC_CHAR_LOCK_FREE=2 __GCC_ATOMIC_INT_LOCK_FREE=2 __GCC_ATOMIC_LLONG_LOCK_FREE=1 __GCC_ATOMIC_LONG_LOCK_FREE=2 __GCC_ATOMIC_POINTER_LOCK_FREE=2 __GCC_ATOMIC_SHORT_LOCK_FREE=2 __GCC_ATOMIC_TEST_AND_SET_TRUEVAL=1 __GCC_ATOMIC_WCHAR_T_LOCK_FREE=2 __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1=1 __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2=1 __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4=1 __GLIBC_MINOR__=18 __GLIBC__=2 __GNUC_GNU_INLINE__=1 __GNUC_MINOR__=7 __GNUC_PATCHLEVEL__=3 __GNUC__=4 __GNU_LIBRARY__=6 __GXX_ABI_VERSION=1002 __HAVE_BSWAP__=1 __INT16_C=__INT16_C __INT16_MAX__=32767 __INT16_TYPE__=short\ int __INT32_C=__INT32_C __INT32_MAX__=2147483647 __INT32_TYPE__=int __INT64_C=__INT64_C __INT64_MAX__=9223372036854775807LL __INT64_TYPE__=long\ long\ int __INT8_C=__INT8_C __INT8_MAX__=127 __INT8_TYPE__=signed\ char __INTMAX_C=__INTMAX_C __INTMAX_MAX__=9223372036854775807LL __INTMAX_TYPE__=long\ long\ int __INTPTR_MAX__=2147483647 __INTPTR_TYPE__=int __INT_FAST16_MAX__=2147483647 __INT_FAST16_TYPE__=int __INT_FAST32_MAX__=2147483647 __INT_FAST32_TYPE__=int __INT_FAST64_MAX__=9223372036854775807LL __INT_FAST64_TYPE__=long\ long\ int __INT_FAST8_MAX__=127 __INT_FAST8_TYPE__=signed\ char __INT_LEAST16_MAX__=32767 __INT_LEAST16_TYPE__=short\ int __INT_LEAST32_MAX__=2147483647 __INT_LEAST32_TYPE__=int __INT_LEAST64_MAX__=9223372036854775807LL __INT_LEAST64_TYPE__=long\ long\ int __INT_LEAST8_MAX__=127 __INT_LEAST8_TYPE__=signed\ char __INT_MAX__=2147483647 __LDBL_DENORM_MIN__=4.9406564584124654e-324L __LDBL_DIG__=15 __LDBL_EPSILON__=2.2204460492503131e-16L __LDBL_HAS_DENORM__=1 __LDBL_HAS_INFINITY__=1 __LDBL_HAS_QUIET_NAN__=1 __LDBL_MANT_DIG__=53 __LDBL_MAX_10_EXP__=308 __LDBL_MAX_EXP__=1024 __LDBL_MAX__=1.7976931348623157e+308L __LDBL_MIN_10_EXP__=(-307) __LDBL_MIN_EXP__=(-1021) __LDBL_MIN__=2.2250738585072014e-308L __LONG_LONG_MAX__=9223372036854775807LL __LONG_MAX__=2147483647L __ORDER_BIG_ENDIAN__=4321 __ORDER_LITTLE_ENDIAN__=1234 __ORDER_PDP_ENDIAN__=3412 __PPC=1 __PPC__=1 __PRAGMA_REDEFINE_EXTNAME=1 __PTRDIFF_MAX__=2147483647 __PTRDIFF_TYPE__=int __REGISTER_PREFIX__= __SCHAR_MAX__=127 __SHRT_MAX__=32767 __SIG_ATOMIC_MAX__=2147483647 __SIG_ATOMIC_MIN__=(-2147483647\ -\ 1) __SIG_ATOMIC_TYPE__=int __SIZEOF_DOUBLE__=8 __SIZEOF_FLOAT__=4 __SIZEOF_INT__=4 __SIZEOF_LONG_DOUBLE__=8 __SIZEOF_LONG_LONG__=8 __SIZEOF_LONG__=4 __SIZEOF_POINTER__=4 __SIZEOF_PTRDIFF_T__=4 __SIZEOF_SHORT__=2 __SIZEOF_SIZE_T__=4 __SIZEOF_WCHAR_T__=4 __SIZEOF_WINT_T__=4 __SIZE_MAX__=4294967295U __SIZE_TYPE__=unsigned\ int __STDC_HOSTED__=1 __STDC__=1 __UINT16_C=__UINT16_C __UINT16_MAX__=65535 __UINT16_TYPE__=short\ unsigned\ int __UINT32_C=__UINT32_C __UINT32_MAX__=4294967295U __UINT32_TYPE__=unsigned\ int __UINT64_C=__UINT64_C __UINT64_MAX__=18446744073709551615ULL __UINT64_TYPE__=long\ long\ unsigned\ int __UINT8_C=__UINT8_C __UINT8_MAX__=255 __UINT8_TYPE__=unsigned\ char __UINTMAX_C=__UINTMAX_C __UINTMAX_MAX__=18446744073709551615ULL __UINTMAX_TYPE__=long\ long\ unsigned\ int __UINTPTR_MAX__=4294967295U __UINTPTR_TYPE__=unsigned\ int __UINT_FAST16_MAX__=4294967295U __UINT_FAST16_TYPE__=unsigned\ int __UINT_FAST32_MAX__=4294967295U __UINT_FAST32_TYPE__=unsigned\ int __UINT_FAST64_MAX__=18446744073709551615ULL __UINT_FAST64_TYPE__=long\ long\ unsigned\ int __UINT_FAST8_MAX__=255 __UINT_FAST8_TYPE__=unsigned\ char __UINT_LEAST16_MAX__=65535 __UINT_LEAST16_TYPE__=short\ unsigned\ int __UINT_LEAST32_MAX__=4294967295U __UINT_LEAST32_TYPE__=unsigned\ int __UINT_LEAST64_MAX__=18446744073709551615ULL __UINT_LEAST64_TYPE__=long\ long\ unsigned\ int __UINT_LEAST8_MAX__=255 __UINT_LEAST8_TYPE__=unsigned\ char __USER_LABEL_PREFIX__= __USE_BSD=1 __USE_FILE_OFFSET64=1 __USE_LARGEFILE=1 __USE_MISC=1 __USE_POSIX199309=1 __USE_POSIX199506=1 __USE_POSIX2=1 __USE_POSIX=1 __USE_SVID=1 __VERSION__="4.7.3" __WCHAR_MAX__=2147483647L __WCHAR_MIN__=(-2147483647L\ -\ 1) __WCHAR_TYPE__=long\ int __WINT_MAX__=4294967295U __WINT_MIN__=0U __WINT_TYPE__=unsigned\ int __powerpc=1 __powerpc__=1 powerpc=1'
+crypt_r_proto='0'
+cryptlib=''
+csh='csh'
+ctermid_r_proto='0'
+ctime_r_proto='0'
+d_Gconvert='gcvt((x),(n),(b))'
+d_PRIEUldbl='define'
+d_PRIFUldbl='define'
+d_PRIGUldbl='define'
+d_PRIXU64='define'
+d_PRId64='define'
+d_PRIeldbl='define'
+d_PRIfldbl='define'
+d_PRIgldbl='define'
+d_PRIi64='define'
+d_PRIo64='define'
+d_PRIu64='define'
+d_PRIx64='define'
+d_SCNfldbl='define'
+d__fwalk='undef'
+d_access='define'
+d_accessx='undef'
+d_aintl='undef'
+d_alarm='define'
+d_archlib='define'
+d_asctime64='undef'
+d_asctime_r='undef'
+d_atolf='undef'
+d_atoll='define'
+d_attribute_deprecated='define'
+d_attribute_format='define'
+d_attribute_malloc='define'
+d_attribute_nonnull='define'
+d_attribute_noreturn='define'
+d_attribute_pure='define'
+d_attribute_unused='define'
+d_attribute_warn_unused_result='define'
+d_bcmp='define'
+d_bcopy='define'
+d_bsd='undef'
+d_bsdgetpgrp='undef'
+d_bsdsetpgrp='undef'
+d_builtin_choose_expr='define'
+d_builtin_expect='define'
+d_bzero='define'
+d_c99_variadic_macros='define'
+d_casti32='define'
+d_castneg='define'
+d_charvspr='undef'
+d_chown='define'
+d_chroot='define'
+d_chsize='undef'
+d_class='undef'
+d_clearenv='define'
+d_closedir='define'
+d_cmsghdr_s='define'
+d_const='define'
+d_copysignl='define'
+d_cplusplus='undef'
+d_crypt='define'
+d_crypt_r='undef'
+d_csh='undef'
+d_ctermid='define'
+d_ctermid_r='undef'
+d_ctime64='undef'
+d_ctime_r='undef'
+d_cuserid='define'
+d_dbl_dig='define'
+d_dbminitproto='undef'
+d_difftime64='undef'
+d_difftime='define'
+d_dir_dd_fd='undef'
+d_dirfd='define'
+d_dirnamlen='undef'
+d_dlerror='define'
+d_dlopen='define'
+d_dlsymun='undef'
+d_dosuid='undef'
+d_drand48_r='undef'
+d_drand48proto='define'
+d_dup2='define'
+d_eaccess='define'
+d_endgrent='define'
+d_endgrent_r='undef'
+d_endhent='define'
+d_endhostent_r='undef'
+d_endnent='define'
+d_endnetent_r='undef'
+d_endpent='define'
+d_endprotoent_r='undef'
+d_endpwent='define'
+d_endpwent_r='undef'
+d_endsent='define'
+d_endservent_r='undef'
+d_eofnblk='define'
+d_eunice='undef'
+d_faststdio='define'
+d_fchdir='define'
+d_fchmod='define'
+d_fchown='define'
+d_fcntl='define'
+d_fcntl_can_lock='undef'
+d_fd_macros='define'
+d_fd_set='define'
+d_fds_bits='undef'
+d_fgetpos='define'
+d_finite='define'
+d_finitel='define'
+d_flexfnam='define'
+d_flock='define'
+d_flockproto='define'
+d_fork='define'
+d_fp_class='undef'
+d_fpathconf='define'
+d_fpclass='undef'
+d_fpclassify='undef'
+d_fpclassl='undef'
+d_fpos64_t='undef'
+d_frexpl='define'
+d_fs_data_s='undef'
+d_fseeko='define'
+d_fsetpos='define'
+d_fstatfs='define'
+d_fstatvfs='define'
+d_fsync='define'
+d_ftello='define'
+d_ftime='undef'
+d_futimes='define'
+d_gdbm_ndbm_h_uses_prototypes='undef'
+d_gdbmndbm_h_uses_prototypes='undef'
+d_getaddrinfo='define'
+d_getcwd='define'
+d_getespwnam='undef'
+d_getfsstat='undef'
+d_getgrent='define'
+d_getgrent_r='undef'
+d_getgrgid_r='undef'
+d_getgrnam_r='undef'
+d_getgrps='define'
+d_gethbyaddr='define'
+d_gethbyname='define'
+d_gethent='define'
+d_gethname='define'
+d_gethostbyaddr_r='undef'
+d_gethostbyname_r='undef'
+d_gethostent_r='undef'
+d_gethostprotos='define'
+d_getitimer='define'
+d_getlogin='define'
+d_getlogin_r='undef'
+d_getmnt='undef'
+d_getmntent='define'
+d_getnameinfo='define'
+d_getnbyaddr='define'
+d_getnbyname='define'
+d_getnent='define'
+d_getnetbyaddr_r='undef'
+d_getnetbyname_r='undef'
+d_getnetent_r='undef'
+d_getnetprotos='define'
+d_getpagsz='define'
+d_getpbyname='define'
+d_getpbynumber='define'
+d_getpent='define'
+d_getpgid='define'
+d_getpgrp2='undef'
+d_getpgrp='define'
+d_getppid='define'
+d_getprior='define'
+d_getprotobyname_r='undef'
+d_getprotobynumber_r='undef'
+d_getprotoent_r='undef'
+d_getprotoprotos='define'
+d_getprpwnam='undef'
+d_getpwent='define'
+d_getpwent_r='undef'
+d_getpwnam_r='undef'
+d_getpwuid_r='undef'
+d_getsbyname='define'
+d_getsbyport='define'
+d_getsent='define'
+d_getservbyname_r='undef'
+d_getservbyport_r='undef'
+d_getservent_r='undef'
+d_getservprotos='define'
+d_getspnam='define'
+d_getspnam_r='undef'
+d_gettimeod='define'
+d_gmtime64='undef'
+d_gmtime_r='undef'
+d_gnulibc='define'
+d_grpasswd='define'
+d_hasmntopt='define'
+d_htonl='define'
+d_ilogbl='define'
+d_inc_version_list='undef'
+d_index='undef'
+d_inetaton='define'
+d_inetntop='define'
+d_inetpton='define'
+d_int64_t='define'
+d_ip_mreq='define'
+d_ip_mreq_source='define'
+d_ipv6_mreq='define'
+d_ipv6_mreq_source='undef'
+d_isascii='define'
+d_isblank='define'
+d_isfinite='undef'
+d_isinf='define'
+d_isnan='define'
+d_isnanl='define'
+d_killpg='define'
+d_lchown='define'
+d_ldbl_dig='define'
+d_libm_lib_version='define'
+d_link='define'
+d_localtime64='undef'
+d_localtime_r='undef'
+d_localtime_r_needs_tzset='undef'
+d_locconv='define'
+d_lockf='define'
+d_longdbl='define'
+d_longlong='define'
+d_lseekproto='define'
+d_lstat='define'
+d_madvise='define'
+d_malloc_good_size='undef'
+d_malloc_size='undef'
+d_mblen='define'
+d_mbstowcs='define'
+d_mbtowc='define'
+d_memchr='define'
+d_memcmp='define'
+d_memcpy='define'
+d_memmove='define'
+d_memset='define'
+d_mkdir='define'
+d_mkdtemp='define'
+d_mkfifo='define'
+d_mkstemp='define'
+d_mkstemps='define'
+d_mktime64='undef'
+d_mktime='define'
+d_mmap='define'
+d_modfl='define'
+d_modfl_pow32_bug='undef'
+d_modflproto='define'
+d_mprotect='define'
+d_msg='define'
+d_msg_ctrunc='define'
+d_msg_dontroute='define'
+d_msg_oob='define'
+d_msg_peek='define'
+d_msg_proxy='define'
+d_msgctl='define'
+d_msgget='define'
+d_msghdr_s='define'
+d_msgrcv='define'
+d_msgsnd='define'
+d_msync='define'
+d_munmap='define'
+d_mymalloc='undef'
+d_ndbm='undef'
+d_ndbm_h_uses_prototypes='undef'
+d_nice='define'
+d_nl_langinfo='define'
+d_nv_preserves_uv='define'
+d_nv_zero_is_allbits_zero='define'
+d_off64_t='undef'
+d_old_pthread_create_joinable='undef'
+d_oldpthreads='undef'
+d_oldsock='undef'
+d_open3='define'
+d_pathconf='define'
+d_pause='define'
+d_perl_otherlibdirs='undef'
+d_phostname='undef'
+d_pipe='define'
+d_poll='define'
+d_portable='define'
+d_prctl='define'
+d_prctl_set_name='define'
+d_printf_format_null='define'
+d_procselfexe='undef'
+d_pseudofork='undef'
+d_pthread_atfork='undef'
+d_pthread_attr_setscope='define'
+d_pthread_yield='undef'
+d_pwage='undef'
+d_pwchange='undef'
+d_pwclass='undef'
+d_pwcomment='undef'
+d_pwexpire='undef'
+d_pwgecos='define'
+d_pwpasswd='define'
+d_pwquota='undef'
+d_qgcvt='define'
+d_quad='define'
+d_random_r='undef'
+d_readdir64_r='undef'
+d_readdir='define'
+d_readdir_r='undef'
+d_readlink='define'
+d_readv='define'
+d_recvmsg='define'
+d_rename='define'
+d_rewinddir='define'
+d_rmdir='define'
+d_safebcpy='undef'
+d_safemcpy='undef'
+d_sanemcmp='define'
+d_sbrkproto='define'
+d_scalbnl='define'
+d_sched_yield='define'
+d_scm_rights='define'
+d_seekdir='define'
+d_select='define'
+d_sem='define'
+d_semctl='define'
+d_semctl_semid_ds='undef'
+d_semctl_semun='define'
+d_semget='define'
+d_semop='define'
+d_sendmsg='define'
+d_setegid='define'
+d_seteuid='define'
+d_setgrent='define'
+d_setgrent_r='undef'
+d_setgrps='define'
+d_sethent='define'
+d_sethostent_r='undef'
+d_setitimer='define'
+d_setlinebuf='define'
+d_setlocale='define'
+d_setlocale_r='undef'
+d_setnent='define'
+d_setnetent_r='undef'
+d_setpent='define'
+d_setpgid='define'
+d_setpgrp2='undef'
+d_setpgrp='define'
+d_setprior='define'
+d_setproctitle='undef'
+d_setprotoent_r='undef'
+d_setpwent='define'
+d_setpwent_r='undef'
+d_setregid='define'
+d_setresgid='define'
+d_setresuid='define'
+d_setreuid='define'
+d_setrgid='undef'
+d_setruid='undef'
+d_setsent='define'
+d_setservent_r='undef'
+d_setsid='define'
+d_setvbuf='define'
+d_sfio='undef'
+d_shm='define'
+d_shmat='define'
+d_shmatprototype='define'
+d_shmctl='define'
+d_shmdt='define'
+d_shmget='define'
+d_sigaction='define'
+d_signbit='define'
+d_sigprocmask='define'
+d_sigsetjmp='define'
+d_sin6_scope_id='define'
+d_sitearch='define'
+d_snprintf='define'
+d_sockaddr_in6='define'
+d_sockaddr_sa_len='undef'
+d_sockatmark='define'
+d_sockatmarkproto='define'
+d_socket='define'
+d_socklen_t='define'
+d_sockpair='define'
+d_socks5_init='undef'
+d_sprintf_returns_strlen='define'
+d_sqrtl='define'
+d_srand48_r='undef'
+d_srandom_r='undef'
+d_sresgproto='undef'
+d_sresuproto='undef'
+d_statblks='define'
+d_statfs_f_flags='define'
+d_statfs_s='define'
+d_static_inline='define'
+d_statvfs='define'
+d_stdio_cnt_lval='undef'
+d_stdio_ptr_lval='define'
+d_stdio_ptr_lval_nochange_cnt='undef'
+d_stdio_ptr_lval_sets_cnt='define'
+d_stdio_stream_array='undef'
+d_stdiobase='define'
+d_stdstdio='define'
+d_strchr='define'
+d_strcoll='define'
+d_strctcpy='define'
+d_strerrm='strerror(e)'
+d_strerror='define'
+d_strerror_r='undef'
+d_strftime='define'
+d_strlcat='undef'
+d_strlcpy='undef'
+d_strtod='define'
+d_strtol='define'
+d_strtold='define'
+d_strtoll='define'
+d_strtoq='define'
+d_strtoul='define'
+d_strtoull='define'
+d_strtouq='define'
+d_strxfrm='define'
+d_suidsafe='undef'
+d_symlink='define'
+d_syscall='define'
+d_syscallproto='define'
+d_sysconf='define'
+d_sysernlst=''
+d_syserrlst='define'
+d_system='define'
+d_tcgetpgrp='define'
+d_tcsetpgrp='define'
+d_telldir='define'
+d_telldirproto='define'
+d_time='define'
+d_timegm='define'
+d_times='define'
+d_tm_tm_gmtoff='define'
+d_tm_tm_zone='define'
+d_tmpnam_r='undef'
+d_truncate='define'
+d_ttyname_r='undef'
+d_tzname='define'
+d_u32align='undef'
+d_ualarm='define'
+d_umask='define'
+d_uname='define'
+d_union_semun='undef'
+d_unordered='undef'
+d_unsetenv='define'
+d_usleep='define'
+d_usleepproto='define'
+d_ustat='define'
+d_vendorarch='undef'
+d_vendorbin='undef'
+d_vendorlib='undef'
+d_vendorscript='undef'
+d_vfork='undef'
+d_void_closedir='undef'
+d_voidsig='define'
+d_voidtty=''
+d_volatile='define'
+d_vprintf='define'
+d_vsnprintf='define'
+d_wait4='define'
+d_waitpid='define'
+d_wcstombs='define'
+d_wctomb='define'
+d_writev='define'
+d_xenix='undef'
+date='date'
+db_hashtype='u_int32_t'
+db_prefixtype='size_t'
+db_version_major=''
+db_version_minor=''
+db_version_patch=''
+defvoidused='15'
+direntrytype='struct dirent'
+dlext='so'
+dlsrc='dl_dlopen.xs'
+doublesize='8'
+drand01='drand48()'
+drand48_r_proto='0'
+dtrace=''
+dynamic_ext='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call Hash/Util Hash/Util/FieldHash I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate Unicode/Normalize XS/APItest XS/Typemap arybase attributes mro re threads threads/shared'
+eagain='EAGAIN'
+ebcdic='undef'
+echo='echo'
+egrep='egrep'
+emacs=''
+endgrent_r_proto='0'
+endhostent_r_proto='0'
+endnetent_r_proto='0'
+endprotoent_r_proto='0'
+endpwent_r_proto='0'
+endservent_r_proto='0'
+eunicefix=':'
+exe_ext=''
+expr='expr'
+extensions='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call Hash/Util Hash/Util/FieldHash I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate Unicode/Normalize XS/APItest XS/Typemap arybase attributes mro re threads threads/shared Archive/Extract Archive/Tar Attribute/Handlers AutoLoader B/Debug B/Deparse B/Lint CGI CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML CPANPLUS CPANPLUS/Dist/Build Carp Config/Perl/V Devel/SelfStubber Digest Dumpvalue Env Errno ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/ParseXS File/CheckTree File/Fetch File/Path File/Temp FileCache Filter/Simple Getopt/Long HTTP/Tiny I18N/Collate I18N/LangTags IO/Compress IO/Zlib IPC/Cmd IPC/Open3 JSON/PP Locale/Codes Locale/Maketext Locale/Maketext/Simple Log/Message Log/Message/Simple Math/BigInt Math/BigRat Math/Complex Memoize Module/Build Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata Module/Pluggable NEXT Net/Ping Object/Accessor Package/Constants Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/LaTeX Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage Safe Search/Dict SelfLoader Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Term/UI Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Memoize Tie/RefHash Time/Local XSLoader autodie autouse base bignum constant encoding/warnings if lib libnet parent perlfaq podlators'
+extern_C='extern'
+extras=''
+fflushNULL='define'
+fflushall='undef'
+find=''
+firstmakefile='makefile'
+flex=''
+fpossize='16'
+fpostype='fpos_t'
+freetype='void'
+from=':'
+full_ar='%%AR%%'
+full_csh='csh'
+full_sed='/bin/sed'
+gccansipedantic=''
+gccosandvers=''
+gccversion='4.7.3'
+getgrent_r_proto='0'
+getgrgid_r_proto='0'
+getgrnam_r_proto='0'
+gethostbyaddr_r_proto='0'
+gethostbyname_r_proto='0'
+gethostent_r_proto='0'
+getlogin_r_proto='0'
+getnetbyaddr_r_proto='0'
+getnetbyname_r_proto='0'
+getnetent_r_proto='0'
+getprotobyname_r_proto='0'
+getprotobynumber_r_proto='0'
+getprotoent_r_proto='0'
+getpwent_r_proto='0'
+getpwnam_r_proto='0'
+getpwuid_r_proto='0'
+getservbyname_r_proto='0'
+getservbyport_r_proto='0'
+getservent_r_proto='0'
+getspnam_r_proto='0'
+gidformat='"lu"'
+gidsign='1'
+gidsize='4'
+gidtype='gid_t'
+glibpth='/usr/shlib  /lib /usr/lib /usr/lib/386 /lib/386 /usr/ccs/lib /usr/ucblib /usr/local/lib '
+gmake='gmake'
+gmtime_r_proto='0'
+gnulibc_version='2.18'
+grep='grep'
+groupcat='cat /etc/group'
+groupstype='gid_t'
+gzip='gzip'
+h_fcntl='false'
+h_sysfile='true'
+hint='recommended'
+hostcat='cat /etc/hosts'
+html1dir=' '
+html1direxp=''
+html3dir=' '
+html3direxp=''
+i16size='2'
+i16type='short'
+i32size='4'
+i32type='long'
+i64size='8'
+i64type='long long'
+i8size='1'
+i8type='signed char'
+i_arpainet='define'
+i_assert='define'
+i_bsdioctl=''
+i_crypt='define'
+i_db='undef'
+i_dbm='undef'
+i_dirent='define'
+i_dld='undef'
+i_dlfcn='define'
+i_fcntl='undef'
+i_float='define'
+i_fp='undef'
+i_fp_class='undef'
+i_gdbm='undef'
+i_gdbm_ndbm='undef'
+i_gdbmndbm='undef'
+i_grp='define'
+i_ieeefp='undef'
+i_inttypes='define'
+i_langinfo='define'
+i_libutil='undef'
+i_limits='define'
+i_locale='define'
+i_machcthr='undef'
+i_malloc='define'
+i_mallocmalloc='undef'
+i_math='define'
+i_memory='undef'
+i_mntent='define'
+i_ndbm='undef'
+i_netdb='define'
+i_neterrno='undef'
+i_netinettcp='define'
+i_niin='define'
+i_poll='define'
+i_prot='undef'
+i_pthread='define'
+i_pwd='define'
+i_rpcsvcdbm='undef'
+i_sfio='undef'
+i_sgtty='undef'
+i_shadow='define'
+i_socks='undef'
+i_stdarg='define'
+i_stdbool='define'
+i_stddef='define'
+i_stdlib='define'
+i_string='define'
+i_sunmath='undef'
+i_sysaccess='undef'
+i_sysdir='define'
+i_sysfile='define'
+i_sysfilio='undef'
+i_sysin='undef'
+i_sysioctl='define'
+i_syslog='define'
+i_sysmman='define'
+i_sysmode='undef'
+i_sysmount='define'
+i_sysndir='undef'
+i_sysparam='define'
+i_syspoll='define'
+i_sysresrc='define'
+i_syssecrt='undef'
+i_sysselct='define'
+i_syssockio='undef'
+i_sysstat='define'
+i_sysstatfs='define'
+i_sysstatvfs='define'
+i_systime='define'
+i_systimek='undef'
+i_systimes='define'
+i_systypes='define'
+i_sysuio='define'
+i_sysun='define'
+i_sysutsname='define'
+i_sysvfs='define'
+i_syswait='define'
+i_termio='undef'
+i_termios='define'
+i_time='define'
+i_unistd='define'
+i_ustat='define'
+i_utime='define'
+i_values='define'
+i_varargs='undef'
+i_varhdr='stdarg.h'
+i_vfork='undef'
+ignore_versioned_solibs='y'
+inc_version_list=' '
+inc_version_list_init='0'
+incpath=''
+inews=''
+initialinstalllocation='/usr/bin'
+installarchlib='/usr/lib/perl5/5.18.1/ppc-linux'
+installbin='/usr/bin'
+installhtml1dir=''
+installhtml3dir=''
+installman1dir=''
+installman3dir=''
+installprefix='/usr'
+installprefixexp='/usr'
+installprivlib='/usr/lib/perl5/5.18.1'
+installscript='/usr/bin'
+installsitearch='/usr/lib/perl5/site_perl/5.18.1/ppc-linux'
+installsitebin='/usr/bin'
+installsitehtml1dir=''
+installsitehtml3dir=''
+installsitelib='/usr/lib/perl5/site_perl/5.18.1'
+installsiteman1dir=''
+installsiteman3dir=''
+installsitescript='/usr/bin'
+installstyle='lib/perl5'
+installusrbinperl='undef'
+installvendorarch=''
+installvendorbin=''
+installvendorhtml1dir=''
+installvendorhtml3dir=''
+installvendorlib=''
+installvendorman1dir=''
+installvendorman3dir=''
+installvendorscript=''
+intsize='4'
+issymlink='test -h'
+ivdformat='"ld"'
+ivsize='4'
+ivtype='long'
+known_extensions='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call GDBM_File Hash/Util Hash/Util/FieldHash I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc NDBM_File ODBM_File Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate Unicode/Normalize VMS/DCLsym VMS/Stdio Win32 Win32API/File Win32CORE XS/APItest XS/Typemap arybase attributes mro re threads threads/shared '
+ksh=''
+ld='%%LD%%'
+ld_can_script='define'
+lddlflags='-shared %%LDFLAGS%%'
+ldflags=' %%LDFLAGS%%'
+ldflags_uselargefiles=''
+ldlibpthname='LD_LIBRARY_PATH'
+less='less'
+lib_ext='.a'
+libc=''
+libperl='libperl.a'
+libpth='%%LIBDIRS%%'
+libs='-lnsl -ldl -lm -lcrypt -lutil -lc'
+libsdirs='%%LIBDIRS%%'
+libsfiles=' libnsl.so libdl.so libm.so libcrypt.so libutil.so libc.so'
+#libsfound=' /lib/libnsl.so /lib/libdl.so /lib/libm.so /lib/libcrypt.so /lib/libutil.so /usr/lib/libc.so'
+libspath='%%LIBDIRS%%'
+libswanted='sfio socket inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun m crypt sec util c cposix posix ucb BSD gdbm_compat'
+libswanted_uselargefiles=''
+line=''
+lint=''
+lkflags=''
+ln='ln'
+lns='/bin/ln -s'
+localtime_r_proto='0'
+locincpth='/usr/local/include /opt/local/include /usr/gnu/include /opt/gnu/include /usr/GNU/include /opt/GNU/include'
+loclibpth='/usr/local/lib /opt/local/lib /usr/gnu/lib /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib'
+longdblsize='8'
+longlongsize='8'
+longsize='4'
+lp=''
+lpr=''
+ls='ls'
+lseeksize='8'
+lseektype='off_t'
+mad='undef'
+madlyh=''
+madlyobj=''
+madlysrc=''
+mail=''
+mailx=''
+make='make'
+make_set_make='#'
+mallocobj=''
+mallocsrc=''
+malloctype='void *'
+man1dir=' '
+man1direxp=''
+man1ext='0'
+man3dir=' '
+man3direxp=''
+man3ext='0'
+mips_type=''
+mistrustnm=''
+mkdir='mkdir'
+mmaptype='void *'
+modetype='mode_t'
+more='more'
+multiarch='undef'
+mv=''
+myarchname='ppc-linux'
+mydomain='.nonet'
+myhostname='openadk'
+myuname='linux openadk 3.12.6 #1 tue jan 14 10:26:22 cet 2014 ppc gnulinux '
+n='-n'
+need_va_copy='define'
+netdb_hlen_type='size_t'
+netdb_host_type='const void *'
+netdb_name_type='const char *'
+netdb_net_type='in_addr_t'
+nm='nm'
+nm_opt=''
+nm_so_opt='--dynamic'
+nonxs_ext='Archive/Extract Archive/Tar Attribute/Handlers AutoLoader B/Debug B/Deparse B/Lint CGI CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML CPANPLUS CPANPLUS/Dist/Build Carp Config/Perl/V Devel/SelfStubber Digest Dumpvalue Env Errno ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/ParseXS File/CheckTree File/Fetch File/Path File/Temp FileCache Filter/Simple Getopt/Long HTTP/Tiny I18N/Collate I18N/LangTags IO/Compress IO/Zlib IPC/Cmd IPC/Open3 JSON/PP Locale/Codes Locale/Maketext Locale/Maketext/Simple Log/Message Log/Message/Simple Math/BigInt Math/BigRat Math/Complex Memoize Module/Build Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata Module/Pluggable NEXT Net/Ping Object/Accessor Package/Constants Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/LaTeX Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage Safe Search/Dict SelfLoader Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Term/UI Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Memoize Tie/RefHash Time/Local XSLoader autodie autouse base bignum constant encoding/warnings if lib libnet parent perlfaq podlators'
+nroff='nroff'
+nvEUformat='"E"'
+nvFUformat='"F"'
+nvGUformat='"G"'
+nv_overflows_integers_at='256.0*256.0*256.0*256.0*256.0*256.0*2.0*2.0*2.0*2.0*2.0'
+nv_preserves_uv_bits='32'
+nveformat='"e"'
+nvfformat='"f"'
+nvgformat='"g"'
+nvsize='8'
+nvtype='double'
+o_nonblock='O_NONBLOCK'
+obj_ext='.o'
+old_pthread_create_joinable=''
+optimize='-O1'
+orderlib='false'
+osname='linux'
+osvers='3.12.6'
+otherlibdirs=' '
+package='perl5'
+pager='/usr/bin/less -R'
+passcat='cat /etc/passwd'
+patchlevel='18'
+path_sep=':'
+perl5=''
+perl='perl'
+perl_patchlevel=''
+perl_static_inline='static __inline__'
+perladmin='root@openadk.nonet'
+perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc'
+perlpath='/usr/bin/perl'
+pg='pg'
+phostname='hostname'
+pidtype='pid_t'
+plibpth='/lib/ppc-openadk-linux-gnu/4.7.3 /lib/powerpc-linux-gnu /lib /usr/lib/ppc-openadk-linux-gnu/4.7.3 /usr/lib/powerpc-linux-gnu /usr/lib'
+pmake=''
+pr=''
+prefix='/usr'
+prefixexp='/usr'
+privlib='/usr/lib/perl5/5.18.1'
+privlibexp='/usr/lib/perl5/5.18.1'
+procselfexe=''
+prototype='define'
+ptrsize='4'
+quadkind='3'
+quadtype='long long'
+randbits='48'
+randfunc='drand48'
+random_r_proto='0'
+randseedtype='long'
+ranlib=':'
+rd_nodata='-1'
+readdir64_r_proto='0'
+readdir_r_proto='0'
+revision='5'
+rm='rm'
+rm_try='/bin/rm -f try try a.out .out try.[cho] try..o core core.try* try.core*'
+rmail=''
+run=''
+runnm='false'
+sGMTIME_max='2147483647'
+sGMTIME_min='-2147483648'
+sLOCALTIME_max='2147483647'
+sLOCALTIME_min='-2147483648'
+sPRIEUldbl='"E"'
+sPRIFUldbl='"F"'
+sPRIGUldbl='"G"'
+sPRIXU64='"LX"'
+sPRId64='"Ld"'
+sPRIeldbl='"e"'
+sPRIfldbl='"f"'
+sPRIgldbl='"g"'
+sPRIi64='"Li"'
+sPRIo64='"Lo"'
+sPRIu64='"Lu"'
+sPRIx64='"Lx"'
+sSCNfldbl='"f"'
+sched_yield='sched_yield()'
+scriptdir='/usr/bin'
+scriptdirexp='/usr/bin'
+sed='sed'
+seedfunc='srand48'
+selectminbits='32'
+selecttype='fd_set *'
+sendmail=''
+setgrent_r_proto='0'
+sethostent_r_proto='0'
+setlocale_r_proto='0'
+setnetent_r_proto='0'
+setprotoent_r_proto='0'
+setpwent_r_proto='0'
+setservent_r_proto='0'
+sh='/bin/sh'
+shar=''
+sharpbang='#!'
+shmattype='void *'
+shortsize='2'
+shrpenv=''
+shsharp='true'
+sig_count='65'
+sig_name='ZERO HUP INT QUIT ILL TRAP ABRT BUS FPE KILL USR1 SEGV USR2 PIPE ALRM TERM STKFLT CHLD CONT STOP TSTP TTIN TTOU URG XCPU XFSZ VTALRM PROF WINCH IO PWR SYS NUM32 NUM33 RTMIN NUM35 NUM36 NUM37 NUM38 NUM39 NUM40 NUM41 NUM42 NUM43 NUM44 NUM45 NUM46 NUM47 NUM48 NUM49 NUM50 NUM51 NUM52 NUM53 NUM54 NUM55 NUM56 NUM57 NUM58 NUM59 NUM60 NUM61 NUM62 NUM63 RTMAX IOT CLD POLL UNUSED '
+sig_name_init='"ZERO", "HUP", "INT", "QUIT", "ILL", "TRAP", "ABRT", "BUS", "FPE", "KILL", "USR1", "SEGV", "USR2", "PIPE", "ALRM", "TERM", "STKFLT", "CHLD", "CONT", "STOP", "TSTP", "TTIN", "TTOU", "URG", "XCPU", "XFSZ", "VTALRM", "PROF", "WINCH", "IO", "PWR", "SYS", "NUM32", "NUM33", "RTMIN", "NUM35", "NUM36", "NUM37", "NUM38", "NUM39", "NUM40", "NUM41", "NUM42", "NUM43", "NUM44", "NUM45", "NUM46", "NUM47", "NUM48", "NUM49", "NUM50", "NUM51", "NUM52", "NUM53", "NUM54", "NUM55", "NUM56", "NUM57", "NUM58", "NUM59", "NUM60", "NUM61", "NUM62", "NUM63", "RTMAX", "IOT", "CLD", "POLL", "UNUSED", 0'
+sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 6 17 29 31 '
+sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 6, 17, 29, 31, 0'
+sig_size='69'
+signal_t='void'
+sitearch='/usr/lib/perl5/site_perl/5.18.1/ppc-linux'
+sitearchexp='/usr/lib/perl5/site_perl/5.18.1/ppc-linux'
+sitebin='/usr/bin'
+sitebinexp='/usr/bin'
+sitehtml1dir=''
+sitehtml1direxp=''
+sitehtml3dir=''
+sitehtml3direxp=''
+sitelib='/usr/lib/perl5/site_perl/5.18.1'
+sitelib_stem='/usr/lib/perl5/site_perl'
+sitelibexp='/usr/lib/perl5/site_perl/5.18.1'
+siteman1dir=''
+siteman1direxp=''
+siteman3dir=''
+siteman3direxp=''
+siteprefix='/usr'
+siteprefixexp='/usr'
+sitescript='/usr/bin'
+sitescriptexp='/usr/bin'
+sizesize='4'
+sizetype='size_t'
+sleep=''
+smail=''
+so='so'
+sockethdr=''
+socketlib=''
+socksizetype='socklen_t'
+sort='sort'
+spackage='Perl5'
+spitshell='cat'
+srand48_r_proto='0'
+srandom_r_proto='0'
+src='.'
+ssizetype='ssize_t'
+st_ino_sign='1'
+st_ino_size='8'
+startperl='#!/usr/bin/perl'
+startsh='#!/bin/sh'
+static_ext=' '
+stdchar='char'
+stdio_base='((fp)->_IO_read_base)'
+stdio_bufsiz='((fp)->_IO_read_end - (fp)->_IO_read_base)'
+stdio_cnt='((fp)->_IO_read_end - (fp)->_IO_read_ptr)'
+stdio_filbuf=''
+stdio_ptr='((fp)->_IO_read_ptr)'
+stdio_stream_array=''
+strerror_r_proto='0'
+strings='/usr/include/string.h'
+submit=''
+subversion='1'
+sysman='/usr/man/man1'
+tail=''
+tar=''
+targetarch=''
+tbl=''
+tee=''
+test='test'
+timeincl='/usr/include/sys/time.h /usr/include/time.h '
+timetype='time_t'
+tmpnam_r_proto='0'
+to=':'
+touch='touch'
+tr='tr'
+trnl='\n'
+troff=''
+ttyname_r_proto='0'
+u16size='2'
+u16type='unsigned short'
+u32size='4'
+u32type='unsigned long'
+u64size='8'
+u64type='unsigned long long'
+u8size='1'
+u8type='unsigned char'
+uidformat='"lu"'
+uidsign='1'
+uidsize='4'
+uidtype='uid_t'
+uname='uname'
+uniq='uniq'
+uquadtype='unsigned long long'
+use5005threads='undef'
+use64bitall='undef'
+use64bitint='undef'
+usecrosscompile='undef'
+usedevel='undef'
+usedl='define'
+usedtrace='undef'
+usefaststdio='undef'
+useithreads='undef'
+usekernprocpathname='undef'
+uselargefiles='define'
+uselongdouble='undef'
+usemallocwrap='define'
+usemorebits='undef'
+usemultiplicity='undef'
+usemymalloc='n'
+usenm='false'
+usensgetexecutablepath='undef'
+useopcode='true'
+useperlio='define'
+useposix='true'
+usereentrant='undef'
+userelocatableinc='undef'
+usesfio='false'
+useshrplib='false'
+usesitecustomize='undef'
+usesocks='undef'
+usethreads='undef'
+usevendorprefix='undef'
+useversionedarchname='undef'
+usevfork='false'
+usrinc='%%INCDIRS%%'
+uuname=''
+uvXUformat='"lX"'
+uvoformat='"lo"'
+uvsize='4'
+uvtype='unsigned long'
+uvuformat='"lu"'
+uvxformat='"lx"'
+vaproto='define'
+vendorarch=''
+vendorarchexp=''
+vendorbin=''
+vendorbinexp=''
+vendorhtml1dir=' '
+vendorhtml1direxp=''
+vendorhtml3dir=' '
+vendorhtml3direxp=''
+vendorlib=''
+vendorlib_stem=''
+vendorlibexp=''
+vendorman1dir=' '
+vendorman1direxp=''
+vendorman3dir=' '
+vendorman3direxp=''
+vendorprefix=''
+vendorprefixexp=''
+vendorscript=''
+vendorscriptexp=''
+version='5.18.1'
+version_patchlevel_string='version 18 subversion 1'
+versiononly='undef'
+vi=''
+voidflags='15'
+xlibpth='/usr/lib/386 /lib/386'
+yacc='yacc'
+yaccflags=''
+zcat=''
+zip='zip'
+PERL_REVISION=5
+PERL_VERSION=18
+PERL_SUBVERSION=1
+PERL_API_REVISION=5
+PERL_API_VERSION=18
+PERL_API_SUBVERSION=0
+PERL_PATCHLEVEL=''
+PERL_CONFIG_SH=true
+: Variables propagated from previous config.sh file.
+libdb_needs_pthread='N'
diff --git a/package/perl/files/config.sh.ppc.uclibc b/package/perl/files/config.sh.ppc.uclibc
new file mode 100644
index 000000000..4fbbda34e
--- /dev/null
+++ b/package/perl/files/config.sh.ppc.uclibc
@@ -0,0 +1,1118 @@
+#!/bin/sh
+#
+# This file was produced by running the Configure script. It holds all the
+# definitions figured out by Configure. Should you modify one of these values,
+# do not forget to propagate your changes by running "Configure -der". You may
+# instead choose to run each of the .SH files by yourself, or "Configure -S".
+#
+
+# Package name      : perl5
+# Source directory  : .
+# Configuration time: Tue Jan 14 07:33:10 CET 2014
+# Configured by     : root
+# Target system     : linux openadk 3.12.6 #1 mon jan 13 23:17:04 cet 2014 ppc gnulinux 
+
+: Configure command line arguments.
+config_arg0='./Configure'
+config_args='-des'
+config_argc=1
+config_arg1='-des'
+
+Author=''
+Date='$Date'
+Header=''
+Id='$Id'
+Locker=''
+Log='$Log'
+RCSfile='$RCSfile'
+Revision='$Revision'
+Source=''
+State=''
+_a='.a'
+_exe=''
+_o='.o'
+afs='false'
+afsroot='/afs'
+alignbytes='8'
+ansi2knr=''
+aphostname='/bin/hostname'
+api_revision='5'
+api_subversion='0'
+api_version='18'
+api_versionstring='5.18.0'
+ar='ar'
+archlib='/usr/lib/perl5/5.18.1/ppc-linux'
+archlibexp='/usr/lib/perl5/5.18.1/ppc-linux'
+archname64=''
+archname='ppc-linux'
+archobjs=''
+asctime_r_proto='0'
+awk='awk'
+baserev='5.0'
+bash=''
+bin='/usr/bin'
+bin_ELF='define'
+binexp='/usr/bin'
+bison='bison'
+bootstrap_charset='undef'
+byacc='byacc'
+byteorder='4321'
+c=''
+castflags='0'
+cat='cat'
+cc='%%CC%%'
+cccdlflags='-fPIC'
+ccdlflags='-Wl,-E'
+ccflags='%%CFLAGS%%'
+ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
+ccname='gcc'
+ccsymbols='system=linux system=posix system=unix'
+ccversion=''
+cf_by='root'
+cf_email='root@openadk.nonet'
+cf_time='Tue Jan 14 07:33:10 CET 2014'
+charbits='8'
+charsize='1'
+chgrp=''
+chmod='chmod'
+chown=''
+clocktype='clock_t'
+comm='comm'
+compress=''
+contains='grep'
+cp='cp'
+cpio=''
+cpp='cpp'
+cpp_stuff='42'
+cppccsymbols='__gnu_linux__=1 __linux=1 __linux__=1 __unix=1 __unix__=1 linux=1 unix=1'
+cppflags='%%CPPFLAGS%%'
+cpplast='-'
+cppminus='-'
+cpprun='%%CPP%%'
+cppstdin='%%CPP%%'
+cppsymbols='BIG_ENDIAN=4321 LITTLE_ENDIAN=1234 PPC=1 _ARCH_PPC=1 _BIG_ENDIAN=1 _CALL_SYSV=1 _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE=1 _POSIX_C_SOURCE=200809L _POSIX_SOURCE=1 __ATOMIC_ACQUIRE=2 __ATOMIC_ACQ_REL=4 __ATOMIC_CONSUME=1 __ATOMIC_RELAXED=0 __ATOMIC_RELEASE=3 __ATOMIC_SEQ_CST=5 __BIGGEST_ALIGNMENT__=16 __BIG_ENDIAN=4321 __BIG_ENDIAN__=1 __BYTE_ORDER__=4321 __CHAR16_TYPE__=short\ unsigned\ int __CHAR32_TYPE__=unsigned\ int __CHAR_BIT__=8 __CHAR_UNSIGNED__=1 __DBL_DECIMAL_DIG__=17 __DBL_DENORM_MIN__=((double)4.9406564584124654e-324L) __DBL_DIG__=15 __DBL_EPSILON__=((double)2.2204460492503131e-16L) __DBL_HAS_DENORM__=1 __DBL_HAS_INFINITY__=1 __DBL_HAS_QUIET_NAN__=1 __DBL_MANT_DIG__=53 __DBL_MAX_10_EXP__=308 __DBL_MAX_EXP__=1024 __DBL_MAX__=((double)1.7976931348623157e+308L) __DBL_MIN_10_EXP__=(-307) __DBL_MIN_EXP__=(-1021) __DBL_MIN__=((double)2.2250738585072014e-308L) __DEC128_EPSILON__=1E-33DL __DEC128_MANT_DIG__=34 __DEC128_MAX_EXP__=6145 __DEC128_MAX__=9.999999999999999999999999999999999E6144DL __DEC128_MIN_EXP__=(-6142) __DEC128_MIN__=1E-6143DL __DEC128_SUBNORMAL_MIN__=0.000000000000000000000000000000001E-6143DL __DEC32_EPSILON__=1E-6DF __DEC32_MANT_DIG__=7 __DEC32_MAX_EXP__=97 __DEC32_MAX__=9.999999E96DF __DEC32_MIN_EXP__=(-94) __DEC32_MIN__=1E-95DF __DEC32_SUBNORMAL_MIN__=0.000001E-95DF __DEC64_EPSILON__=1E-15DD __DEC64_MANT_DIG__=16 __DEC64_MAX_EXP__=385 __DEC64_MAX__=9.999999999999999E384DD __DEC64_MIN_EXP__=(-382) __DEC64_MIN__=1E-383DD __DEC64_SUBNORMAL_MIN__=0.000000000000001E-383DD __DECIMAL_DIG__=17 __DEC_EVAL_METHOD__=2 __ELF__=1 __FINITE_MATH_ONLY__=0 __FLOAT_WORD_ORDER__=4321 __FLT_DECIMAL_DIG__=9 __FLT_DENORM_MIN__=1.4012984643248171e-45F __FLT_DIG__=6 __FLT_EPSILON__=1.1920928955078125e-7F __FLT_EVAL_METHOD__=0 __FLT_HAS_DENORM__=1 __FLT_HAS_INFINITY__=1 __FLT_HAS_QUIET_NAN__=1 __FLT_MANT_DIG__=24 __FLT_MAX_10_EXP__=38 __FLT_MAX_EXP__=128 __FLT_MAX__=3.4028234663852886e+38F __FLT_MIN_10_EXP__=(-37) __FLT_MIN_EXP__=(-125) __FLT_MIN__=1.1754943508222875e-38F __FLT_RADIX__=2 __FP_FAST_FMA=1 __FP_FAST_FMAF=1 __FP_FAST_FMAL=1 __GCC_ATOMIC_BOOL_LOCK_FREE=2 __GCC_ATOMIC_CHAR16_T_LOCK_FREE=2 __GCC_ATOMIC_CHAR32_T_LOCK_FREE=2 __GCC_ATOMIC_CHAR_LOCK_FREE=2 __GCC_ATOMIC_INT_LOCK_FREE=2 __GCC_ATOMIC_LLONG_LOCK_FREE=1 __GCC_ATOMIC_LONG_LOCK_FREE=2 __GCC_ATOMIC_POINTER_LOCK_FREE=2 __GCC_ATOMIC_SHORT_LOCK_FREE=2 __GCC_ATOMIC_TEST_AND_SET_TRUEVAL=1 __GCC_ATOMIC_WCHAR_T_LOCK_FREE=2 __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1=1 __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2=1 __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4=1 __GLIBC_MINOR__=2 __GLIBC__=2 __GNUC_GNU_INLINE__=1 __GNUC_MINOR__=7 __GNUC_PATCHLEVEL__=3 __GNUC__=4 __GNU_LIBRARY__=6 __GXX_ABI_VERSION=1002 __HAVE_BSWAP__=1 __INT16_C=__INT16_C __INT16_MAX__=32767 __INT16_TYPE__=short\ int __INT32_C=__INT32_C __INT32_MAX__=2147483647 __INT32_TYPE__=int __INT64_C=__INT64_C __INT64_MAX__=9223372036854775807LL __INT64_TYPE__=long\ long\ int __INT8_C=__INT8_C __INT8_MAX__=127 __INT8_TYPE__=signed\ char __INTMAX_C=__INTMAX_C __INTMAX_MAX__=9223372036854775807LL __INTMAX_TYPE__=long\ long\ int __INTPTR_MAX__=2147483647 __INTPTR_TYPE__=int __INT_FAST16_MAX__=2147483647 __INT_FAST16_TYPE__=int __INT_FAST32_MAX__=2147483647 __INT_FAST32_TYPE__=int __INT_FAST64_MAX__=9223372036854775807LL __INT_FAST64_TYPE__=long\ long\ int __INT_FAST8_MAX__=127 __INT_FAST8_TYPE__=signed\ char __INT_LEAST16_MAX__=32767 __INT_LEAST16_TYPE__=short\ int __INT_LEAST32_MAX__=2147483647 __INT_LEAST32_TYPE__=int __INT_LEAST64_MAX__=9223372036854775807LL __INT_LEAST64_TYPE__=long\ long\ int __INT_LEAST8_MAX__=127 __INT_LEAST8_TYPE__=signed\ char __INT_MAX__=2147483647 __LDBL_DENORM_MIN__=4.9406564584124654e-324L __LDBL_DIG__=15 __LDBL_EPSILON__=2.2204460492503131e-16L __LDBL_HAS_DENORM__=1 __LDBL_HAS_INFINITY__=1 __LDBL_HAS_QUIET_NAN__=1 __LDBL_MANT_DIG__=53 __LDBL_MAX_10_EXP__=308 __LDBL_MAX_EXP__=1024 __LDBL_MAX__=1.7976931348623157e+308L __LDBL_MIN_10_EXP__=(-307) __LDBL_MIN_EXP__=(-1021) __LDBL_MIN__=2.2250738585072014e-308L __LITTLE_ENDIAN=1234 __LONG_LONG_MAX__=9223372036854775807LL __LONG_MAX__=2147483647L __ORDER_BIG_ENDIAN__=4321 __ORDER_LITTLE_ENDIAN__=1234 __ORDER_PDP_ENDIAN__=3412 __PPC=1 __PPC__=1 __PRAGMA_REDEFINE_EXTNAME=1 __PTRDIFF_MAX__=2147483647 __PTRDIFF_TYPE__=int __REGISTER_PREFIX__= __SCHAR_MAX__=127 __SHRT_MAX__=32767 __SIG_ATOMIC_MAX__=2147483647 __SIG_ATOMIC_MIN__=(-2147483647\ -\ 1) __SIG_ATOMIC_TYPE__=int __SIZEOF_DOUBLE__=8 __SIZEOF_FLOAT__=4 __SIZEOF_INT__=4 __SIZEOF_LONG_DOUBLE__=8 __SIZEOF_LONG_LONG__=8 __SIZEOF_LONG__=4 __SIZEOF_POINTER__=4 __SIZEOF_PTRDIFF_T__=4 __SIZEOF_SHORT__=2 __SIZEOF_SIZE_T__=4 __SIZEOF_WCHAR_T__=4 __SIZEOF_WINT_T__=4 __SIZE_MAX__=4294967295U __SIZE_TYPE__=unsigned\ int __STDC_HOSTED__=1 __STDC__=1 __UINT16_C=__UINT16_C __UINT16_MAX__=65535 __UINT16_TYPE__=short\ unsigned\ int __UINT32_C=__UINT32_C __UINT32_MAX__=4294967295U __UINT32_TYPE__=unsigned\ int __UINT64_C=__UINT64_C __UINT64_MAX__=18446744073709551615ULL __UINT64_TYPE__=long\ long\ unsigned\ int __UINT8_C=__UINT8_C __UINT8_MAX__=255 __UINT8_TYPE__=unsigned\ char __UINTMAX_C=__UINTMAX_C __UINTMAX_MAX__=18446744073709551615ULL __UINTMAX_TYPE__=long\ long\ unsigned\ int __UINTPTR_MAX__=4294967295U __UINTPTR_TYPE__=unsigned\ int __UINT_FAST16_MAX__=4294967295U __UINT_FAST16_TYPE__=unsigned\ int __UINT_FAST32_MAX__=4294967295U __UINT_FAST32_TYPE__=unsigned\ int __UINT_FAST64_MAX__=18446744073709551615ULL __UINT_FAST64_TYPE__=long\ long\ unsigned\ int __UINT_FAST8_MAX__=255 __UINT_FAST8_TYPE__=unsigned\ char __UINT_LEAST16_MAX__=65535 __UINT_LEAST16_TYPE__=short\ unsigned\ int __UINT_LEAST32_MAX__=4294967295U __UINT_LEAST32_TYPE__=unsigned\ int __UINT_LEAST64_MAX__=18446744073709551615ULL __UINT_LEAST64_TYPE__=long\ long\ unsigned\ int __UINT_LEAST8_MAX__=255 __UINT_LEAST8_TYPE__=unsigned\ char __USER_LABEL_PREFIX__= __USE_BSD=1 __USE_FILE_OFFSET64=1 __USE_LARGEFILE=1 __USE_MISC=1 __USE_POSIX199309=1 __USE_POSIX199506=1 __USE_POSIX2=1 __USE_POSIX=1 __USE_SVID=1 __VERSION__="4.7.3" __WCHAR_MAX__=2147483647L __WCHAR_MIN__=(-2147483647L\ -\ 1) __WCHAR_TYPE__=long\ int __WINT_MAX__=4294967295U __WINT_MIN__=0U __WINT_TYPE__=unsigned\ int __powerpc=1 __powerpc__=1 powerpc=1'
+crypt_r_proto='0'
+cryptlib=''
+csh='csh'
+ctermid_r_proto='0'
+ctime_r_proto='0'
+d_Gconvert='gcvt((x),(n),(b))'
+d_PRIEUldbl='define'
+d_PRIFUldbl='define'
+d_PRIGUldbl='define'
+d_PRIXU64='define'
+d_PRId64='define'
+d_PRIeldbl='define'
+d_PRIfldbl='define'
+d_PRIgldbl='define'
+d_PRIi64='define'
+d_PRIo64='define'
+d_PRIu64='define'
+d_PRIx64='define'
+d_SCNfldbl='define'
+d__fwalk='undef'
+d_access='define'
+d_accessx='undef'
+d_aintl='undef'
+d_alarm='define'
+d_archlib='define'
+d_asctime64='undef'
+d_asctime_r='undef'
+d_atolf='undef'
+d_atoll='define'
+d_attribute_deprecated='define'
+d_attribute_format='define'
+d_attribute_malloc='define'
+d_attribute_nonnull='define'
+d_attribute_noreturn='define'
+d_attribute_pure='define'
+d_attribute_unused='define'
+d_attribute_warn_unused_result='define'
+d_bcmp='define'
+d_bcopy='define'
+d_bsd='undef'
+d_bsdgetpgrp='undef'
+d_bsdsetpgrp='undef'
+d_builtin_choose_expr='define'
+d_builtin_expect='define'
+d_bzero='define'
+d_c99_variadic_macros='undef'
+d_casti32='define'
+d_castneg='define'
+d_charvspr='undef'
+d_chown='define'
+d_chroot='define'
+d_chsize='undef'
+d_class='undef'
+d_clearenv='define'
+d_closedir='define'
+d_cmsghdr_s='define'
+d_const='define'
+d_copysignl='define'
+d_cplusplus='undef'
+d_crypt='define'
+d_crypt_r='undef'
+d_csh='undef'
+d_ctermid='define'
+d_ctermid_r='undef'
+d_ctime64='undef'
+d_ctime_r='undef'
+d_cuserid='define'
+d_dbl_dig='define'
+d_dbminitproto='undef'
+d_difftime64='undef'
+d_difftime='define'
+d_dir_dd_fd='undef'
+d_dirfd='define'
+d_dirnamlen='undef'
+d_dlerror='define'
+d_dlopen='define'
+d_dlsymun='undef'
+d_dosuid='undef'
+d_drand48_r='undef'
+d_drand48proto='define'
+d_dup2='define'
+d_eaccess='undef'
+d_endgrent='define'
+d_endgrent_r='undef'
+d_endhent='define'
+d_endhostent_r='undef'
+d_endnent='define'
+d_endnetent_r='undef'
+d_endpent='define'
+d_endprotoent_r='undef'
+d_endpwent='define'
+d_endpwent_r='undef'
+d_endsent='define'
+d_endservent_r='undef'
+d_eofnblk='define'
+d_eunice='undef'
+d_faststdio='undef'
+d_fchdir='define'
+d_fchmod='define'
+d_fchown='define'
+d_fcntl='define'
+d_fcntl_can_lock='undef'
+d_fd_macros='define'
+d_fd_set='define'
+d_fds_bits='undef'
+d_fgetpos='define'
+d_finite='undef'
+d_finitel='undef'
+d_flexfnam='define'
+d_flock='define'
+d_flockproto='define'
+d_fork='define'
+d_fp_class='undef'
+d_fpathconf='define'
+d_fpclass='undef'
+d_fpclassify='undef'
+d_fpclassl='undef'
+d_fpos64_t='undef'
+d_frexpl='define'
+d_fs_data_s='undef'
+d_fseeko='define'
+d_fsetpos='define'
+d_fstatfs='define'
+d_fstatvfs='define'
+d_fsync='define'
+d_ftello='define'
+d_ftime='undef'
+d_futimes='undef'
+d_gdbm_ndbm_h_uses_prototypes='undef'
+d_gdbmndbm_h_uses_prototypes='undef'
+d_getaddrinfo='define'
+d_getcwd='define'
+d_getespwnam='undef'
+d_getfsstat='undef'
+d_getgrent='define'
+d_getgrent_r='undef'
+d_getgrgid_r='undef'
+d_getgrnam_r='undef'
+d_getgrps='define'
+d_gethbyaddr='define'
+d_gethbyname='define'
+d_gethent='define'
+d_gethname='define'
+d_gethostbyaddr_r='undef'
+d_gethostbyname_r='undef'
+d_gethostent_r='undef'
+d_gethostprotos='define'
+d_getitimer='define'
+d_getlogin='define'
+d_getlogin_r='undef'
+d_getmnt='undef'
+d_getmntent='define'
+d_getnameinfo='define'
+d_getnbyaddr='define'
+d_getnbyname='define'
+d_getnent='define'
+d_getnetbyaddr_r='undef'
+d_getnetbyname_r='undef'
+d_getnetent_r='undef'
+d_getnetprotos='define'
+d_getpagsz='define'
+d_getpbyname='define'
+d_getpbynumber='define'
+d_getpent='define'
+d_getpgid='define'
+d_getpgrp2='undef'
+d_getpgrp='define'
+d_getppid='define'
+d_getprior='define'
+d_getprotobyname_r='undef'
+d_getprotobynumber_r='undef'
+d_getprotoent_r='undef'
+d_getprotoprotos='define'
+d_getprpwnam='undef'
+d_getpwent='define'
+d_getpwent_r='undef'
+d_getpwnam_r='undef'
+d_getpwuid_r='undef'
+d_getsbyname='define'
+d_getsbyport='define'
+d_getsent='define'
+d_getservbyname_r='undef'
+d_getservbyport_r='undef'
+d_getservent_r='undef'
+d_getservprotos='define'
+d_getspnam='define'
+d_getspnam_r='undef'
+d_gettimeod='define'
+d_gmtime64='undef'
+d_gmtime_r='undef'
+d_gnulibc='undef'
+d_grpasswd='define'
+d_hasmntopt='define'
+d_htonl='define'
+d_ilogbl='define'
+d_inc_version_list='undef'
+d_index='undef'
+d_inetaton='define'
+d_inetntop='define'
+d_inetpton='define'
+d_int64_t='define'
+d_ip_mreq='define'
+d_ip_mreq_source='define'
+d_ipv6_mreq='undef'
+d_ipv6_mreq_source='undef'
+d_isascii='define'
+d_isblank='define'
+d_isfinite='undef'
+d_isinf='undef'
+d_isnan='undef'
+d_isnanl='undef'
+d_killpg='define'
+d_lchown='define'
+d_ldbl_dig='define'
+d_libm_lib_version='define'
+d_link='define'
+d_localtime64='undef'
+d_localtime_r='undef'
+d_localtime_r_needs_tzset='undef'
+d_locconv='define'
+d_lockf='define'
+d_longdbl='define'
+d_longlong='define'
+d_lseekproto='define'
+d_lstat='define'
+d_madvise='define'
+d_malloc_good_size='undef'
+d_malloc_size='undef'
+d_mblen='define'
+d_mbstowcs='define'
+d_mbtowc='define'
+d_memchr='define'
+d_memcmp='define'
+d_memcpy='define'
+d_memmove='define'
+d_memset='define'
+d_mkdir='define'
+d_mkdtemp='define'
+d_mkfifo='define'
+d_mkstemp='define'
+d_mkstemps='undef'
+d_mktime64='undef'
+d_mktime='define'
+d_mmap='define'
+d_modfl='define'
+d_modfl_pow32_bug='undef'
+d_modflproto='define'
+d_mprotect='define'
+d_msg='define'
+d_msg_ctrunc='define'
+d_msg_dontroute='define'
+d_msg_oob='define'
+d_msg_peek='define'
+d_msg_proxy='define'
+d_msgctl='define'
+d_msgget='define'
+d_msghdr_s='define'
+d_msgrcv='define'
+d_msgsnd='define'
+d_msync='define'
+d_munmap='define'
+d_mymalloc='undef'
+d_ndbm='undef'
+d_ndbm_h_uses_prototypes='undef'
+d_nice='define'
+d_nl_langinfo='define'
+d_nv_preserves_uv='define'
+d_nv_zero_is_allbits_zero='define'
+d_off64_t='undef'
+d_old_pthread_create_joinable='undef'
+d_oldpthreads='undef'
+d_oldsock='undef'
+d_open3='define'
+d_pathconf='define'
+d_pause='define'
+d_perl_otherlibdirs='undef'
+d_phostname='undef'
+d_pipe='define'
+d_poll='define'
+d_portable='define'
+d_prctl='define'
+d_prctl_set_name='define'
+d_printf_format_null='define'
+d_procselfexe='undef'
+d_pseudofork='undef'
+d_pthread_atfork='undef'
+d_pthread_attr_setscope='define'
+d_pthread_yield='undef'
+d_pwage='undef'
+d_pwchange='undef'
+d_pwclass='undef'
+d_pwcomment='undef'
+d_pwexpire='undef'
+d_pwgecos='define'
+d_pwpasswd='define'
+d_pwquota='undef'
+d_qgcvt='undef'
+d_quad='define'
+d_random_r='undef'
+d_readdir64_r='undef'
+d_readdir='define'
+d_readdir_r='undef'
+d_readlink='define'
+d_readv='define'
+d_recvmsg='define'
+d_rename='define'
+d_rewinddir='define'
+d_rmdir='define'
+d_safebcpy='undef'
+d_safemcpy='undef'
+d_sanemcmp='define'
+d_sbrkproto='define'
+d_scalbnl='define'
+d_sched_yield='define'
+d_scm_rights='define'
+d_seekdir='define'
+d_select='define'
+d_sem='define'
+d_semctl='define'
+d_semctl_semid_ds='undef'
+d_semctl_semun='define'
+d_semget='define'
+d_semop='define'
+d_sendmsg='define'
+d_setegid='define'
+d_seteuid='define'
+d_setgrent='define'
+d_setgrent_r='undef'
+d_setgrps='define'
+d_sethent='define'
+d_sethostent_r='undef'
+d_setitimer='define'
+d_setlinebuf='define'
+d_setlocale='define'
+d_setlocale_r='undef'
+d_setnent='define'
+d_setnetent_r='undef'
+d_setpent='define'
+d_setpgid='define'
+d_setpgrp2='undef'
+d_setpgrp='define'
+d_setprior='define'
+d_setproctitle='undef'
+d_setprotoent_r='undef'
+d_setpwent='define'
+d_setpwent_r='undef'
+d_setregid='define'
+d_setresgid='define'
+d_setresuid='define'
+d_setreuid='define'
+d_setrgid='undef'
+d_setruid='undef'
+d_setsent='define'
+d_setservent_r='undef'
+d_setsid='define'
+d_setvbuf='define'
+d_sfio='undef'
+d_shm='define'
+d_shmat='define'
+d_shmatprototype='define'
+d_shmctl='define'
+d_shmdt='define'
+d_shmget='define'
+d_sigaction='define'
+d_signbit='define'
+d_sigprocmask='define'
+d_sigsetjmp='define'
+d_sin6_scope_id='undef'
+d_sitearch='define'
+d_snprintf='define'
+d_sockaddr_in6='undef'
+d_sockaddr_sa_len='undef'
+d_sockatmark='undef'
+d_sockatmarkproto='undef'
+d_socket='define'
+d_socklen_t='define'
+d_sockpair='define'
+d_socks5_init='undef'
+d_sprintf_returns_strlen='define'
+d_sqrtl='define'
+d_srand48_r='undef'
+d_srandom_r='undef'
+d_sresgproto='undef'
+d_sresuproto='undef'
+d_statblks='define'
+d_statfs_f_flags='undef'
+d_statfs_s='define'
+d_static_inline='define'
+d_statvfs='define'
+d_stdio_cnt_lval='undef'
+d_stdio_ptr_lval='undef'
+d_stdio_ptr_lval_nochange_cnt='undef'
+d_stdio_ptr_lval_sets_cnt='undef'
+d_stdio_stream_array='undef'
+d_stdiobase='undef'
+d_stdstdio='undef'
+d_strchr='define'
+d_strcoll='define'
+d_strctcpy='define'
+d_strerrm='strerror(e)'
+d_strerror='define'
+d_strerror_r='undef'
+d_strftime='define'
+d_strlcat='define'
+d_strlcpy='define'
+d_strtod='define'
+d_strtol='define'
+d_strtold='define'
+d_strtoll='define'
+d_strtoq='define'
+d_strtoul='define'
+d_strtoull='define'
+d_strtouq='define'
+d_strxfrm='define'
+d_suidsafe='undef'
+d_symlink='define'
+d_syscall='define'
+d_syscallproto='define'
+d_sysconf='define'
+d_sysernlst=''
+d_syserrlst='undef'
+d_system='define'
+d_tcgetpgrp='define'
+d_tcsetpgrp='define'
+d_telldir='define'
+d_telldirproto='define'
+d_time='define'
+d_timegm='define'
+d_times='define'
+d_tm_tm_gmtoff='define'
+d_tm_tm_zone='define'
+d_tmpnam_r='undef'
+d_truncate='define'
+d_ttyname_r='undef'
+d_tzname='define'
+d_u32align='undef'
+d_ualarm='define'
+d_umask='define'
+d_uname='define'
+d_union_semun='undef'
+d_unordered='undef'
+d_unsetenv='define'
+d_usleep='define'
+d_usleepproto='define'
+d_ustat='undef'
+d_vendorarch='undef'
+d_vendorbin='undef'
+d_vendorlib='undef'
+d_vendorscript='undef'
+d_vfork='undef'
+d_void_closedir='undef'
+d_voidsig='define'
+d_voidtty=''
+d_volatile='define'
+d_vprintf='define'
+d_vsnprintf='define'
+d_wait4='define'
+d_waitpid='define'
+d_wcstombs='define'
+d_wctomb='define'
+d_writev='define'
+d_xenix='undef'
+date='date'
+db_hashtype='u_int32_t'
+db_prefixtype='size_t'
+db_version_major=''
+db_version_minor=''
+db_version_patch=''
+defvoidused='15'
+direntrytype='struct dirent'
+dlext='so'
+dlsrc='dl_dlopen.xs'
+doublesize='8'
+drand01='drand48()'
+drand48_r_proto='0'
+dtrace=''
+dynamic_ext='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call Hash/Util Hash/Util/FieldHash I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate Unicode/Normalize XS/APItest XS/Typemap arybase attributes mro re threads threads/shared'
+eagain='EAGAIN'
+ebcdic='undef'
+echo='echo'
+egrep='egrep'
+emacs=''
+endgrent_r_proto='0'
+endhostent_r_proto='0'
+endnetent_r_proto='0'
+endprotoent_r_proto='0'
+endpwent_r_proto='0'
+endservent_r_proto='0'
+eunicefix=':'
+exe_ext=''
+expr='expr'
+extensions='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call Hash/Util Hash/Util/FieldHash I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate Unicode/Normalize XS/APItest XS/Typemap arybase attributes mro re threads threads/shared Archive/Extract Archive/Tar Attribute/Handlers AutoLoader B/Debug B/Deparse B/Lint CGI CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML CPANPLUS CPANPLUS/Dist/Build Carp Config/Perl/V Devel/SelfStubber Digest Dumpvalue Env Errno ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/ParseXS File/CheckTree File/Fetch File/Path File/Temp FileCache Filter/Simple Getopt/Long HTTP/Tiny I18N/Collate I18N/LangTags IO/Compress IO/Zlib IPC/Cmd IPC/Open3 JSON/PP Locale/Codes Locale/Maketext Locale/Maketext/Simple Log/Message Log/Message/Simple Math/BigInt Math/BigRat Math/Complex Memoize Module/Build Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata Module/Pluggable NEXT Net/Ping Object/Accessor Package/Constants Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/LaTeX Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage Safe Search/Dict SelfLoader Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Term/UI Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Memoize Tie/RefHash Time/Local XSLoader autodie autouse base bignum constant encoding/warnings if lib libnet parent perlfaq podlators'
+extern_C='extern'
+extras=''
+fflushNULL='define'
+fflushall='undef'
+find=''
+firstmakefile='makefile'
+flex=''
+fpossize='24'
+fpostype='fpos_t'
+freetype='void'
+from=':'
+full_ar='%%AR%%'
+full_csh='csh'
+full_sed='/bin/sed'
+gccansipedantic=''
+gccosandvers=''
+gccversion='4.7.3'
+getgrent_r_proto='0'
+getgrgid_r_proto='0'
+getgrnam_r_proto='0'
+gethostbyaddr_r_proto='0'
+gethostbyname_r_proto='0'
+gethostent_r_proto='0'
+getlogin_r_proto='0'
+getnetbyaddr_r_proto='0'
+getnetbyname_r_proto='0'
+getnetent_r_proto='0'
+getprotobyname_r_proto='0'
+getprotobynumber_r_proto='0'
+getprotoent_r_proto='0'
+getpwent_r_proto='0'
+getpwnam_r_proto='0'
+getpwuid_r_proto='0'
+getservbyname_r_proto='0'
+getservbyport_r_proto='0'
+getservent_r_proto='0'
+getspnam_r_proto='0'
+gidformat='"lu"'
+gidsign='1'
+gidsize='4'
+gidtype='gid_t'
+glibpth='/usr/shlib  /lib /usr/lib /usr/lib/386 /lib/386 /usr/ccs/lib /usr/ucblib /usr/local/lib '
+gmake='gmake'
+gmtime_r_proto='0'
+gnulibc_version=''
+grep='grep'
+groupcat='cat /etc/group'
+groupstype='gid_t'
+gzip='gzip'
+h_fcntl='false'
+h_sysfile='true'
+hint='recommended'
+hostcat='cat /etc/hosts'
+html1dir=' '
+html1direxp=''
+html3dir=' '
+html3direxp=''
+i16size='2'
+i16type='short'
+i32size='4'
+i32type='long'
+i64size='8'
+i64type='long long'
+i8size='1'
+i8type='signed char'
+i_arpainet='define'
+i_assert='define'
+i_bsdioctl=''
+i_crypt='define'
+i_db='undef'
+i_dbm='undef'
+i_dirent='define'
+i_dld='undef'
+i_dlfcn='define'
+i_fcntl='undef'
+i_float='define'
+i_fp='undef'
+i_fp_class='undef'
+i_gdbm='undef'
+i_gdbm_ndbm='undef'
+i_gdbmndbm='undef'
+i_grp='define'
+i_ieeefp='undef'
+i_inttypes='define'
+i_langinfo='define'
+i_libutil='undef'
+i_limits='define'
+i_locale='define'
+i_machcthr='undef'
+i_malloc='define'
+i_mallocmalloc='undef'
+i_math='define'
+i_memory='undef'
+i_mntent='define'
+i_ndbm='undef'
+i_netdb='define'
+i_neterrno='undef'
+i_netinettcp='define'
+i_niin='define'
+i_poll='define'
+i_prot='undef'
+i_pthread='define'
+i_pwd='define'
+i_rpcsvcdbm='undef'
+i_sfio='undef'
+i_sgtty='undef'
+i_shadow='define'
+i_socks='undef'
+i_stdarg='define'
+i_stdbool='define'
+i_stddef='define'
+i_stdlib='define'
+i_string='define'
+i_sunmath='undef'
+i_sysaccess='undef'
+i_sysdir='define'
+i_sysfile='define'
+i_sysfilio='undef'
+i_sysin='undef'
+i_sysioctl='define'
+i_syslog='define'
+i_sysmman='define'
+i_sysmode='undef'
+i_sysmount='define'
+i_sysndir='undef'
+i_sysparam='define'
+i_syspoll='define'
+i_sysresrc='define'
+i_syssecrt='undef'
+i_sysselct='define'
+i_syssockio='undef'
+i_sysstat='define'
+i_sysstatfs='define'
+i_sysstatvfs='define'
+i_systime='define'
+i_systimek='undef'
+i_systimes='define'
+i_systypes='define'
+i_sysuio='define'
+i_sysun='define'
+i_sysutsname='define'
+i_sysvfs='define'
+i_syswait='define'
+i_termio='undef'
+i_termios='define'
+i_time='define'
+i_unistd='define'
+i_ustat='undef'
+i_utime='define'
+i_values='define'
+i_varargs='undef'
+i_varhdr='stdarg.h'
+i_vfork='undef'
+ignore_versioned_solibs='y'
+inc_version_list=' '
+inc_version_list_init='0'
+incpath=''
+inews=''
+initialinstalllocation='/usr/bin'
+installarchlib='/usr/lib/perl5/5.18.1/ppc-linux'
+installbin='/usr/bin'
+installhtml1dir=''
+installhtml3dir=''
+installman1dir=''
+installman3dir=''
+installprefix='/usr'
+installprefixexp='/usr'
+installprivlib='/usr/lib/perl5/5.18.1'
+installscript='/usr/bin'
+installsitearch='/usr/lib/perl5/site_perl/5.18.1/ppc-linux'
+installsitebin='/usr/bin'
+installsitehtml1dir=''
+installsitehtml3dir=''
+installsitelib='/usr/lib/perl5/site_perl/5.18.1'
+installsiteman1dir=''
+installsiteman3dir=''
+installsitescript='/usr/bin'
+installstyle='lib/perl5'
+installusrbinperl='undef'
+installvendorarch=''
+installvendorbin=''
+installvendorhtml1dir=''
+installvendorhtml3dir=''
+installvendorlib=''
+installvendorman1dir=''
+installvendorman3dir=''
+installvendorscript=''
+intsize='4'
+issymlink='test -h'
+ivdformat='"ld"'
+ivsize='4'
+ivtype='long'
+known_extensions='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call GDBM_File Hash/Util Hash/Util/FieldHash I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc NDBM_File ODBM_File Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate Unicode/Normalize VMS/DCLsym VMS/Stdio Win32 Win32API/File Win32CORE XS/APItest XS/Typemap arybase attributes mro re threads threads/shared '
+ksh=''
+ld='%%LD%%'
+ld_can_script='define'
+lddlflags='-shared %%LDFLAGS%%'
+ldflags=' %%LDFLAGS%%'
+ldflags_uselargefiles=''
+ldlibpthname='LD_LIBRARY_PATH'
+less='less'
+lib_ext='.a'
+libc=''
+libperl='libperl.a'
+libpth='%%LIBDIRS%%'
+libs='-ldl -lm -lcrypt -lutil -lc'
+libsdirs='%%LIBDIRS%%'
+libsfiles=' libdl.so libm.so libcrypt.so libutil.so libc.so'
+#libsfound=' /lib/libdl.so /lib/libm.so /lib/libcrypt.so /lib/libutil.so /usr/lib/libc.so'
+libspath='%%LIBDIRS%%'
+libswanted='sfio socket inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun m crypt sec util c cposix posix ucb BSD gdbm_compat'
+libswanted_uselargefiles=''
+line=''
+lint=''
+lkflags=''
+ln='ln'
+lns='/bin/ln -s'
+localtime_r_proto='0'
+locincpth='/usr/local/include /opt/local/include /usr/gnu/include /opt/gnu/include /usr/GNU/include /opt/GNU/include'
+loclibpth='/usr/local/lib /opt/local/lib /usr/gnu/lib /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib'
+longdblsize='8'
+longlongsize='8'
+longsize='4'
+lp=''
+lpr=''
+ls='ls'
+lseeksize='8'
+lseektype='off_t'
+mad='undef'
+madlyh=''
+madlyobj=''
+madlysrc=''
+mail=''
+mailx=''
+make='make'
+make_set_make='#'
+mallocobj=''
+mallocsrc=''
+malloctype='void *'
+man1dir=' '
+man1direxp=''
+man1ext='0'
+man3dir=' '
+man3direxp=''
+man3ext='0'
+mips_type=''
+mistrustnm=''
+mkdir='mkdir'
+mmaptype='void *'
+modetype='mode_t'
+more='more'
+multiarch='undef'
+mv=''
+myarchname='ppc-linux'
+mydomain='.nonet'
+myhostname='openadk'
+myuname='linux openadk 3.12.6 #1 mon jan 13 23:17:04 cet 2014 ppc gnulinux '
+n='-n'
+need_va_copy='define'
+netdb_hlen_type='size_t'
+netdb_host_type='const void *'
+netdb_name_type='const char *'
+netdb_net_type='in_addr_t'
+nm='nm'
+nm_opt=''
+nm_so_opt='--dynamic'
+nonxs_ext='Archive/Extract Archive/Tar Attribute/Handlers AutoLoader B/Debug B/Deparse B/Lint CGI CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML CPANPLUS CPANPLUS/Dist/Build Carp Config/Perl/V Devel/SelfStubber Digest Dumpvalue Env Errno ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/ParseXS File/CheckTree File/Fetch File/Path File/Temp FileCache Filter/Simple Getopt/Long HTTP/Tiny I18N/Collate I18N/LangTags IO/Compress IO/Zlib IPC/Cmd IPC/Open3 JSON/PP Locale/Codes Locale/Maketext Locale/Maketext/Simple Log/Message Log/Message/Simple Math/BigInt Math/BigRat Math/Complex Memoize Module/Build Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata Module/Pluggable NEXT Net/Ping Object/Accessor Package/Constants Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/LaTeX Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage Safe Search/Dict SelfLoader Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Term/UI Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Memoize Tie/RefHash Time/Local XSLoader autodie autouse base bignum constant encoding/warnings if lib libnet parent perlfaq podlators'
+nroff='nroff'
+nvEUformat='"E"'
+nvFUformat='"F"'
+nvGUformat='"G"'
+nv_overflows_integers_at='256.0*256.0*256.0*256.0*256.0*256.0*2.0*2.0*2.0*2.0*2.0'
+nv_preserves_uv_bits='32'
+nveformat='"e"'
+nvfformat='"f"'
+nvgformat='"g"'
+nvsize='8'
+nvtype='double'
+o_nonblock='O_NONBLOCK'
+obj_ext='.o'
+old_pthread_create_joinable=''
+optimize='-O1'
+orderlib='false'
+osname='linux'
+osvers='3.12.6'
+otherlibdirs=' '
+package='perl5'
+pager='/usr/bin/less -R'
+passcat='cat /etc/passwd'
+patchlevel='18'
+path_sep=':'
+perl5=''
+perl='perl'
+perl_patchlevel=''
+perl_static_inline='static __inline__'
+perladmin='root@openadk.nonet'
+perllibs='-ldl -lm -lcrypt -lutil -lc'
+perlpath='/usr/bin/perl'
+pg='pg'
+phostname='hostname'
+pidtype='pid_t'
+plibpth='/lib/ppc-openadk-linux-uclibc/4.7.3 /lib/powerpc-linux-gnu /lib /usr/lib/ppc-openadk-linux-uclibc/4.7.3 /usr/lib/powerpc-linux-gnu /usr/lib'
+pmake=''
+pr=''
+prefix='/usr'
+prefixexp='/usr'
+privlib='/usr/lib/perl5/5.18.1'
+privlibexp='/usr/lib/perl5/5.18.1'
+procselfexe=''
+prototype='define'
+ptrsize='4'
+quadkind='3'
+quadtype='long long'
+randbits='48'
+randfunc='drand48'
+random_r_proto='0'
+randseedtype='long'
+ranlib=':'
+rd_nodata='-1'
+readdir64_r_proto='0'
+readdir_r_proto='0'
+revision='5'
+rm='rm'
+rm_try='/bin/rm -f try try a.out .out try.[cho] try..o core core.try* try.core*'
+rmail=''
+run=''
+runnm='true'
+sGMTIME_max='2147483647'
+sGMTIME_min='-2147483648'
+sLOCALTIME_max='2147483647'
+sLOCALTIME_min='-2147483648'
+sPRIEUldbl='"E"'
+sPRIFUldbl='"F"'
+sPRIGUldbl='"G"'
+sPRIXU64='"LX"'
+sPRId64='"Ld"'
+sPRIeldbl='"e"'
+sPRIfldbl='"f"'
+sPRIgldbl='"g"'
+sPRIi64='"Li"'
+sPRIo64='"Lo"'
+sPRIu64='"Lu"'
+sPRIx64='"Lx"'
+sSCNfldbl='"f"'
+sched_yield='sched_yield()'
+scriptdir='/usr/bin'
+scriptdirexp='/usr/bin'
+sed='sed'
+seedfunc='srand48'
+selectminbits='32'
+selecttype='fd_set *'
+sendmail=''
+setgrent_r_proto='0'
+sethostent_r_proto='0'
+setlocale_r_proto='0'
+setnetent_r_proto='0'
+setprotoent_r_proto='0'
+setpwent_r_proto='0'
+setservent_r_proto='0'
+sh='/bin/sh'
+shar=''
+sharpbang='#!'
+shmattype='void *'
+shortsize='2'
+shrpenv=''
+shsharp='true'
+sig_count='65'
+sig_name='ZERO HUP INT QUIT ILL TRAP ABRT BUS FPE KILL USR1 SEGV USR2 PIPE ALRM TERM STKFLT CHLD CONT STOP TSTP TTIN TTOU URG XCPU XFSZ VTALRM PROF WINCH IO PWR SYS NUM32 NUM33 RTMIN NUM35 NUM36 NUM37 NUM38 NUM39 NUM40 NUM41 NUM42 NUM43 NUM44 NUM45 NUM46 NUM47 NUM48 NUM49 NUM50 NUM51 NUM52 NUM53 NUM54 NUM55 NUM56 NUM57 NUM58 NUM59 NUM60 NUM61 NUM62 NUM63 RTMAX IOT CLD POLL UNUSED '
+sig_name_init='"ZERO", "HUP", "INT", "QUIT", "ILL", "TRAP", "ABRT", "BUS", "FPE", "KILL", "USR1", "SEGV", "USR2", "PIPE", "ALRM", "TERM", "STKFLT", "CHLD", "CONT", "STOP", "TSTP", "TTIN", "TTOU", "URG", "XCPU", "XFSZ", "VTALRM", "PROF", "WINCH", "IO", "PWR", "SYS", "NUM32", "NUM33", "RTMIN", "NUM35", "NUM36", "NUM37", "NUM38", "NUM39", "NUM40", "NUM41", "NUM42", "NUM43", "NUM44", "NUM45", "NUM46", "NUM47", "NUM48", "NUM49", "NUM50", "NUM51", "NUM52", "NUM53", "NUM54", "NUM55", "NUM56", "NUM57", "NUM58", "NUM59", "NUM60", "NUM61", "NUM62", "NUM63", "RTMAX", "IOT", "CLD", "POLL", "UNUSED", 0'
+sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 6 17 29 31 '
+sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 6, 17, 29, 31, 0'
+sig_size='69'
+signal_t='void'
+sitearch='/usr/lib/perl5/site_perl/5.18.1/ppc-linux'
+sitearchexp='/usr/lib/perl5/site_perl/5.18.1/ppc-linux'
+sitebin='/usr/bin'
+sitebinexp='/usr/bin'
+sitehtml1dir=''
+sitehtml1direxp=''
+sitehtml3dir=''
+sitehtml3direxp=''
+sitelib='/usr/lib/perl5/site_perl/5.18.1'
+sitelib_stem='/usr/lib/perl5/site_perl'
+sitelibexp='/usr/lib/perl5/site_perl/5.18.1'
+siteman1dir=''
+siteman1direxp=''
+siteman3dir=''
+siteman3direxp=''
+siteprefix='/usr'
+siteprefixexp='/usr'
+sitescript='/usr/bin'
+sitescriptexp='/usr/bin'
+sizesize='4'
+sizetype='size_t'
+sleep=''
+smail=''
+so='so'
+sockethdr=''
+socketlib=''
+socksizetype='socklen_t'
+sort='sort'
+spackage='Perl5'
+spitshell='cat'
+srand48_r_proto='0'
+srandom_r_proto='0'
+src='.'
+ssizetype='ssize_t'
+st_ino_sign='1'
+st_ino_size='8'
+startperl='#!/usr/bin/perl'
+startsh='#!/bin/sh'
+static_ext=' '
+stdchar='char'
+stdio_base='((fp)->_base)'
+stdio_bufsiz='((fp)->_cnt + (fp)->_ptr - (fp)->_base)'
+stdio_cnt='((fp)->_cnt)'
+stdio_filbuf=''
+stdio_ptr='((fp)->_ptr)'
+stdio_stream_array=''
+strerror_r_proto='0'
+strings='/usr/include/string.h'
+submit=''
+subversion='1'
+sysman='/usr/man/man1'
+tail=''
+tar=''
+targetarch=''
+tbl=''
+tee=''
+test='test'
+timeincl='/usr/include/sys/time.h /usr/include/time.h '
+timetype='time_t'
+tmpnam_r_proto='0'
+to=':'
+touch='touch'
+tr='tr'
+trnl='\n'
+troff=''
+ttyname_r_proto='0'
+u16size='2'
+u16type='unsigned short'
+u32size='4'
+u32type='unsigned long'
+u64size='8'
+u64type='unsigned long long'
+u8size='1'
+u8type='unsigned char'
+uidformat='"lu"'
+uidsign='1'
+uidsize='4'
+uidtype='uid_t'
+uname='uname'
+uniq='uniq'
+uquadtype='unsigned long long'
+use5005threads='undef'
+use64bitall='undef'
+use64bitint='undef'
+usecrosscompile='undef'
+usedevel='undef'
+usedl='define'
+usedtrace='undef'
+usefaststdio='undef'
+useithreads='undef'
+usekernprocpathname='undef'
+uselargefiles='define'
+uselongdouble='undef'
+usemallocwrap='define'
+usemorebits='undef'
+usemultiplicity='undef'
+usemymalloc='n'
+usenm='true'
+usensgetexecutablepath='undef'
+useopcode='true'
+useperlio='define'
+useposix='true'
+usereentrant='undef'
+userelocatableinc='undef'
+usesfio='false'
+useshrplib='false'
+usesitecustomize='undef'
+usesocks='undef'
+usethreads='undef'
+usevendorprefix='undef'
+useversionedarchname='undef'
+usevfork='false'
+usrinc='%%INCDIRS%%'
+uuname=''
+uvXUformat='"lX"'
+uvoformat='"lo"'
+uvsize='4'
+uvtype='unsigned long'
+uvuformat='"lu"'
+uvxformat='"lx"'
+vaproto='define'
+vendorarch=''
+vendorarchexp=''
+vendorbin=''
+vendorbinexp=''
+vendorhtml1dir=' '
+vendorhtml1direxp=''
+vendorhtml3dir=' '
+vendorhtml3direxp=''
+vendorlib=''
+vendorlib_stem=''
+vendorlibexp=''
+vendorman1dir=' '
+vendorman1direxp=''
+vendorman3dir=' '
+vendorman3direxp=''
+vendorprefix=''
+vendorprefixexp=''
+vendorscript=''
+vendorscriptexp=''
+version='5.18.1'
+version_patchlevel_string='version 18 subversion 1'
+versiononly='undef'
+vi=''
+voidflags='15'
+xlibpth='/usr/lib/386 /lib/386'
+yacc='yacc'
+yaccflags=''
+zcat=''
+zip='zip'
+PERL_REVISION=5
+PERL_VERSION=18
+PERL_SUBVERSION=1
+PERL_API_REVISION=5
+PERL_API_VERSION=18
+PERL_API_SUBVERSION=0
+PERL_PATCHLEVEL=''
+PERL_CONFIG_SH=true
+: Variables propagated from previous config.sh file.
+libdb_needs_pthread='N'
diff --git a/package/perl/files/config.sh.ppc64.eglibc b/package/perl/files/config.sh.ppc64.eglibc
new file mode 100644
index 000000000..6c9c74fe8
--- /dev/null
+++ b/package/perl/files/config.sh.ppc64.eglibc
@@ -0,0 +1,1118 @@
+#!/bin/sh
+#
+# This file was produced by running the Configure script. It holds all the
+# definitions figured out by Configure. Should you modify one of these values,
+# do not forget to propagate your changes by running "Configure -der". You may
+# instead choose to run each of the .SH files by yourself, or "Configure -S".
+#
+
+# Package name      : perl5
+# Source directory  : .
+# Configuration time: Sun Jan 19 14:00:23 CET 2014
+# Configured by     : root
+# Target system     : linux openadk 3.12.6 #1 sat jan 18 22:32:32 cet 2014 ppc64 gnulinux 
+
+: Configure command line arguments.
+config_arg0='./Configure'
+config_args='-des'
+config_argc=1
+config_arg1='-des'
+
+Author=''
+Date='$Date'
+Header=''
+Id='$Id'
+Locker=''
+Log='$Log'
+RCSfile='$RCSfile'
+Revision='$Revision'
+Source=''
+State=''
+_a='.a'
+_exe=''
+_o='.o'
+afs='false'
+afsroot='/afs'
+alignbytes='8'
+ansi2knr=''
+aphostname='/bin/hostname'
+api_revision='5'
+api_subversion='0'
+api_version='18'
+api_versionstring='5.18.0'
+ar='ar'
+archlib='/usr/lib/perl5/5.18.1/ppc64-linux'
+archlibexp='/usr/lib/perl5/5.18.1/ppc64-linux'
+archname64=''
+archname='ppc64-linux'
+archobjs=''
+asctime_r_proto='0'
+awk='awk'
+baserev='5.0'
+bash=''
+bin='/usr/bin'
+bin_ELF='define'
+binexp='/usr/bin'
+bison='bison'
+bootstrap_charset='undef'
+byacc='byacc'
+byteorder='87654321'
+c=''
+castflags='0'
+cat='cat'
+cc='%%CC%%'
+cccdlflags='-fPIC'
+ccdlflags='-Wl,-E'
+ccflags='%%CFLAGS%%'
+ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
+ccname='gcc'
+ccsymbols='system=linux system=posix system=unix'
+ccversion=''
+cf_by='root'
+cf_email='root@openadk.nonet'
+cf_time='Sun Jan 19 14:00:23 CET 2014'
+charbits='8'
+charsize='1'
+chgrp=''
+chmod='chmod'
+chown=''
+clocktype='clock_t'
+comm='comm'
+compress=''
+contains='grep'
+cp='cp'
+cpio=''
+cpp='cpp'
+cpp_stuff='42'
+cppccsymbols='__gnu_linux__=1 __linux=1 __linux__=1 __unix=1 __unix__=1 linux=1 unix=1'
+cppflags='%%CPPFLAGS%%'
+cpplast='-'
+cppminus='-'
+cpprun='%%CPP%%'
+cppstdin='%%CPP%%'
+cppsymbols='_ARCH_PPC64=1 _ARCH_PPC=1 _ARCH_PPCGR=1 _BIG_ENDIAN=1 _CALL_AIX=1 _CALL_AIXDESC=1 _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE=1 _LP64=1 _POSIX_C_SOURCE=200809L _POSIX_SOURCE=1 __ATOMIC_ACQUIRE=2 __ATOMIC_ACQ_REL=4 __ATOMIC_CONSUME=1 __ATOMIC_RELAXED=0 __ATOMIC_RELEASE=3 __ATOMIC_SEQ_CST=5 __BIGGEST_ALIGNMENT__=16 __BIG_ENDIAN__=1 __BYTE_ORDER__=4321 __CHAR16_TYPE__=short\ unsigned\ int __CHAR32_TYPE__=unsigned\ int __CHAR_BIT__=8 __CHAR_UNSIGNED__=1 __CMODEL_MEDIUM__=1 __DBL_DECIMAL_DIG__=17 __DBL_DENORM_MIN__=((double)4.9406564584124654e-324L) __DBL_DIG__=15 __DBL_EPSILON__=((double)2.2204460492503131e-16L) __DBL_HAS_DENORM__=1 __DBL_HAS_INFINITY__=1 __DBL_HAS_QUIET_NAN__=1 __DBL_MANT_DIG__=53 __DBL_MAX_10_EXP__=308 __DBL_MAX_EXP__=1024 __DBL_MAX__=((double)1.7976931348623157e+308L) __DBL_MIN_10_EXP__=(-307) __DBL_MIN_EXP__=(-1021) __DBL_MIN__=((double)2.2250738585072014e-308L) __DEC128_EPSILON__=1E-33DL __DEC128_MANT_DIG__=34 __DEC128_MAX_EXP__=6145 __DEC128_MAX__=9.999999999999999999999999999999999E6144DL __DEC128_MIN_EXP__=(-6142) __DEC128_MIN__=1E-6143DL __DEC128_SUBNORMAL_MIN__=0.000000000000000000000000000000001E-6143DL __DEC32_EPSILON__=1E-6DF __DEC32_MANT_DIG__=7 __DEC32_MAX_EXP__=97 __DEC32_MAX__=9.999999E96DF __DEC32_MIN_EXP__=(-94) __DEC32_MIN__=1E-95DF __DEC32_SUBNORMAL_MIN__=0.000001E-95DF __DEC64_EPSILON__=1E-15DD __DEC64_MANT_DIG__=16 __DEC64_MAX_EXP__=385 __DEC64_MAX__=9.999999999999999E384DD __DEC64_MIN_EXP__=(-382) __DEC64_MIN__=1E-383DD __DEC64_SUBNORMAL_MIN__=0.000000000000001E-383DD __DECIMAL_DIG__=17 __DEC_EVAL_METHOD__=2 __ELF__=1 __FINITE_MATH_ONLY__=0 __FLOAT_WORD_ORDER__=4321 __FLT_DECIMAL_DIG__=9 __FLT_DENORM_MIN__=1.4012984643248171e-45F __FLT_DIG__=6 __FLT_EPSILON__=1.1920928955078125e-7F __FLT_EVAL_METHOD__=0 __FLT_HAS_DENORM__=1 __FLT_HAS_INFINITY__=1 __FLT_HAS_QUIET_NAN__=1 __FLT_MANT_DIG__=24 __FLT_MAX_10_EXP__=38 __FLT_MAX_EXP__=128 __FLT_MAX__=3.4028234663852886e+38F __FLT_MIN_10_EXP__=(-37) __FLT_MIN_EXP__=(-125) __FLT_MIN__=1.1754943508222875e-38F __FLT_RADIX__=2 __FP_FAST_FMA=1 __FP_FAST_FMAF=1 __FP_FAST_FMAL=1 __GCC_ATOMIC_BOOL_LOCK_FREE=2 __GCC_ATOMIC_CHAR16_T_LOCK_FREE=2 __GCC_ATOMIC_CHAR32_T_LOCK_FREE=2 __GCC_ATOMIC_CHAR_LOCK_FREE=2 __GCC_ATOMIC_INT_LOCK_FREE=2 __GCC_ATOMIC_LLONG_LOCK_FREE=2 __GCC_ATOMIC_LONG_LOCK_FREE=2 __GCC_ATOMIC_POINTER_LOCK_FREE=2 __GCC_ATOMIC_SHORT_LOCK_FREE=2 __GCC_ATOMIC_TEST_AND_SET_TRUEVAL=1 __GCC_ATOMIC_WCHAR_T_LOCK_FREE=2 __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1=1 __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2=1 __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4=1 __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8=1 __GLIBC_MINOR__=18 __GLIBC__=2 __GNUC_GNU_INLINE__=1 __GNUC_MINOR__=7 __GNUC_PATCHLEVEL__=3 __GNUC__=4 __GNU_LIBRARY__=6 __GXX_ABI_VERSION=1002 __HAVE_BSWAP__=1 __INT16_C=__INT16_C __INT16_MAX__=32767 __INT16_TYPE__=short\ int __INT32_C=__INT32_C __INT32_MAX__=2147483647 __INT32_TYPE__=int __INT64_C=__INT64_C __INT64_MAX__=9223372036854775807L __INT64_TYPE__=long\ int __INT8_C=__INT8_C __INT8_MAX__=127 __INT8_TYPE__=signed\ char __INTMAX_C=__INTMAX_C __INTMAX_MAX__=9223372036854775807L __INTMAX_TYPE__=long\ int __INTPTR_MAX__=9223372036854775807L __INTPTR_TYPE__=long\ int __INT_FAST16_MAX__=9223372036854775807L __INT_FAST16_TYPE__=long\ int __INT_FAST32_MAX__=9223372036854775807L __INT_FAST32_TYPE__=long\ int __INT_FAST64_MAX__=9223372036854775807L __INT_FAST64_TYPE__=long\ int __INT_FAST8_MAX__=127 __INT_FAST8_TYPE__=signed\ char __INT_LEAST16_MAX__=32767 __INT_LEAST16_TYPE__=short\ int __INT_LEAST32_MAX__=2147483647 __INT_LEAST32_TYPE__=int __INT_LEAST64_MAX__=9223372036854775807L __INT_LEAST64_TYPE__=long\ int __INT_LEAST8_MAX__=127 __INT_LEAST8_TYPE__=signed\ char __INT_MAX__=2147483647 __LDBL_DENORM_MIN__=4.9406564584124654e-324L __LDBL_DIG__=15 __LDBL_EPSILON__=2.2204460492503131e-16L __LDBL_HAS_DENORM__=1 __LDBL_HAS_INFINITY__=1 __LDBL_HAS_QUIET_NAN__=1 __LDBL_MANT_DIG__=53 __LDBL_MAX_10_EXP__=308 __LDBL_MAX_EXP__=1024 __LDBL_MAX__=1.7976931348623157e+308L __LDBL_MIN_10_EXP__=(-307) __LDBL_MIN_EXP__=(-1021) __LDBL_MIN__=2.2250738585072014e-308L __LONG_LONG_MAX__=9223372036854775807LL __LONG_MAX__=9223372036854775807L __LP64__=1 __ORDER_BIG_ENDIAN__=4321 __ORDER_LITTLE_ENDIAN__=1234 __ORDER_PDP_ENDIAN__=3412 __PPC64__=1 __PPC__=1 __PRAGMA_REDEFINE_EXTNAME=1 __PTRDIFF_MAX__=9223372036854775807L __PTRDIFF_TYPE__=long\ int __RECIPF__=1 __REGISTER_PREFIX__= __RSQRTE__=1 __SCHAR_MAX__=127 __SHRT_MAX__=32767 __SIG_ATOMIC_MAX__=2147483647 __SIG_ATOMIC_MIN__=(-2147483647\ -\ 1) __SIG_ATOMIC_TYPE__=int __SIZEOF_DOUBLE__=8 __SIZEOF_FLOAT__=4 __SIZEOF_INT128__=16 __SIZEOF_INT__=4 __SIZEOF_LONG_DOUBLE__=8 __SIZEOF_LONG_LONG__=8 __SIZEOF_LONG__=8 __SIZEOF_POINTER__=8 __SIZEOF_PTRDIFF_T__=8 __SIZEOF_SHORT__=2 __SIZEOF_SIZE_T__=8 __SIZEOF_WCHAR_T__=4 __SIZEOF_WINT_T__=4 __SIZE_MAX__=18446744073709551615UL __SIZE_TYPE__=long\ unsigned\ int __STDC_HOSTED__=1 __STDC__=1 __UINT16_C=__UINT16_C __UINT16_MAX__=65535 __UINT16_TYPE__=short\ unsigned\ int __UINT32_C=__UINT32_C __UINT32_MAX__=4294967295U __UINT32_TYPE__=unsigned\ int __UINT64_C=__UINT64_C __UINT64_MAX__=18446744073709551615UL __UINT64_TYPE__=long\ unsigned\ int __UINT8_C=__UINT8_C __UINT8_MAX__=255 __UINT8_TYPE__=unsigned\ char __UINTMAX_C=__UINTMAX_C __UINTMAX_MAX__=18446744073709551615UL __UINTMAX_TYPE__=long\ unsigned\ int __UINTPTR_MAX__=18446744073709551615UL __UINTPTR_TYPE__=long\ unsigned\ int __UINT_FAST16_MAX__=18446744073709551615UL __UINT_FAST16_TYPE__=long\ unsigned\ int __UINT_FAST32_MAX__=18446744073709551615UL __UINT_FAST32_TYPE__=long\ unsigned\ int __UINT_FAST64_MAX__=18446744073709551615UL __UINT_FAST64_TYPE__=long\ unsigned\ int __UINT_FAST8_MAX__=255 __UINT_FAST8_TYPE__=unsigned\ char __UINT_LEAST16_MAX__=65535 __UINT_LEAST16_TYPE__=short\ unsigned\ int __UINT_LEAST32_MAX__=4294967295U __UINT_LEAST32_TYPE__=unsigned\ int __UINT_LEAST64_MAX__=18446744073709551615UL __UINT_LEAST64_TYPE__=long\ unsigned\ int __UINT_LEAST8_MAX__=255 __UINT_LEAST8_TYPE__=unsigned\ char __USER_LABEL_PREFIX__= __USE_BSD=1 __USE_FILE_OFFSET64=1 __USE_LARGEFILE=1 __USE_MISC=1 __USE_POSIX199309=1 __USE_POSIX199506=1 __USE_POSIX2=1 __USE_POSIX=1 __USE_SVID=1 __VERSION__="4.7.3" __WCHAR_MAX__=2147483647 __WCHAR_MIN__=(-2147483647\ -\ 1) __WCHAR_TYPE__=int __WINT_MAX__=4294967295U __WINT_MIN__=0U __WINT_TYPE__=unsigned\ int __builtin_vsx_vperm=__builtin_vec_perm __builtin_vsx_xvmaddadp=__builtin_vsx_xvmadddp __builtin_vsx_xvmaddasp=__builtin_vsx_xvmaddsp __builtin_vsx_xvmaddmdp=__builtin_vsx_xvmadddp __builtin_vsx_xvmaddmsp=__builtin_vsx_xvmaddsp __builtin_vsx_xvmsubadp=__builtin_vsx_xvmsubdp __builtin_vsx_xvmsubasp=__builtin_vsx_xvmsubsp __builtin_vsx_xvmsubmdp=__builtin_vsx_xvmsubdp __builtin_vsx_xvmsubmsp=__builtin_vsx_xvmsubsp __builtin_vsx_xvnmaddadp=__builtin_vsx_xvnmadddp __builtin_vsx_xvnmaddasp=__builtin_vsx_xvnmaddsp __builtin_vsx_xvnmaddmdp=__builtin_vsx_xvnmadddp __builtin_vsx_xvnmaddmsp=__builtin_vsx_xvnmaddsp __builtin_vsx_xvnmsubadp=__builtin_vsx_xvnmsubdp __builtin_vsx_xvnmsubasp=__builtin_vsx_xvnmsubsp __builtin_vsx_xvnmsubmdp=__builtin_vsx_xvnmsubdp __builtin_vsx_xvnmsubmsp=__builtin_vsx_xvnmsubsp __builtin_vsx_xxland=__builtin_vec_and __builtin_vsx_xxlandc=__builtin_vec_andc __builtin_vsx_xxlnor=__builtin_vec_nor __builtin_vsx_xxlor=__builtin_vec_or __builtin_vsx_xxlxor=__builtin_vec_xor __builtin_vsx_xxsel=__builtin_vec_sel __powerpc64__=1 __powerpc__=1'
+crypt_r_proto='0'
+cryptlib=''
+csh='csh'
+ctermid_r_proto='0'
+ctime_r_proto='0'
+d_Gconvert='gcvt((x),(n),(b))'
+d_PRIEUldbl='define'
+d_PRIFUldbl='define'
+d_PRIGUldbl='define'
+d_PRIXU64='define'
+d_PRId64='define'
+d_PRIeldbl='define'
+d_PRIfldbl='define'
+d_PRIgldbl='define'
+d_PRIi64='define'
+d_PRIo64='define'
+d_PRIu64='define'
+d_PRIx64='define'
+d_SCNfldbl='define'
+d__fwalk='undef'
+d_access='define'
+d_accessx='undef'
+d_aintl='undef'
+d_alarm='define'
+d_archlib='define'
+d_asctime64='undef'
+d_asctime_r='undef'
+d_atolf='undef'
+d_atoll='define'
+d_attribute_deprecated='define'
+d_attribute_format='define'
+d_attribute_malloc='define'
+d_attribute_nonnull='define'
+d_attribute_noreturn='define'
+d_attribute_pure='define'
+d_attribute_unused='define'
+d_attribute_warn_unused_result='define'
+d_bcmp='define'
+d_bcopy='define'
+d_bsd='undef'
+d_bsdgetpgrp='undef'
+d_bsdsetpgrp='undef'
+d_builtin_choose_expr='define'
+d_builtin_expect='define'
+d_bzero='define'
+d_c99_variadic_macros='define'
+d_casti32='define'
+d_castneg='define'
+d_charvspr='undef'
+d_chown='define'
+d_chroot='define'
+d_chsize='undef'
+d_class='undef'
+d_clearenv='define'
+d_closedir='define'
+d_cmsghdr_s='define'
+d_const='define'
+d_copysignl='define'
+d_cplusplus='undef'
+d_crypt='define'
+d_crypt_r='undef'
+d_csh='undef'
+d_ctermid='define'
+d_ctermid_r='undef'
+d_ctime64='undef'
+d_ctime_r='undef'
+d_cuserid='define'
+d_dbl_dig='define'
+d_dbminitproto='undef'
+d_difftime64='undef'
+d_difftime='define'
+d_dir_dd_fd='undef'
+d_dirfd='define'
+d_dirnamlen='undef'
+d_dlerror='define'
+d_dlopen='define'
+d_dlsymun='undef'
+d_dosuid='undef'
+d_drand48_r='undef'
+d_drand48proto='define'
+d_dup2='define'
+d_eaccess='define'
+d_endgrent='define'
+d_endgrent_r='undef'
+d_endhent='define'
+d_endhostent_r='undef'
+d_endnent='define'
+d_endnetent_r='undef'
+d_endpent='define'
+d_endprotoent_r='undef'
+d_endpwent='define'
+d_endpwent_r='undef'
+d_endsent='define'
+d_endservent_r='undef'
+d_eofnblk='define'
+d_eunice='undef'
+d_faststdio='define'
+d_fchdir='define'
+d_fchmod='define'
+d_fchown='define'
+d_fcntl='define'
+d_fcntl_can_lock='undef'
+d_fd_macros='define'
+d_fd_set='define'
+d_fds_bits='undef'
+d_fgetpos='define'
+d_finite='define'
+d_finitel='define'
+d_flexfnam='define'
+d_flock='define'
+d_flockproto='define'
+d_fork='define'
+d_fp_class='undef'
+d_fpathconf='define'
+d_fpclass='undef'
+d_fpclassify='undef'
+d_fpclassl='undef'
+d_fpos64_t='undef'
+d_frexpl='define'
+d_fs_data_s='undef'
+d_fseeko='define'
+d_fsetpos='define'
+d_fstatfs='define'
+d_fstatvfs='define'
+d_fsync='define'
+d_ftello='define'
+d_ftime='undef'
+d_futimes='define'
+d_gdbm_ndbm_h_uses_prototypes='undef'
+d_gdbmndbm_h_uses_prototypes='undef'
+d_getaddrinfo='define'
+d_getcwd='define'
+d_getespwnam='undef'
+d_getfsstat='undef'
+d_getgrent='define'
+d_getgrent_r='undef'
+d_getgrgid_r='undef'
+d_getgrnam_r='undef'
+d_getgrps='define'
+d_gethbyaddr='define'
+d_gethbyname='define'
+d_gethent='define'
+d_gethname='define'
+d_gethostbyaddr_r='undef'
+d_gethostbyname_r='undef'
+d_gethostent_r='undef'
+d_gethostprotos='define'
+d_getitimer='define'
+d_getlogin='define'
+d_getlogin_r='undef'
+d_getmnt='undef'
+d_getmntent='define'
+d_getnameinfo='define'
+d_getnbyaddr='define'
+d_getnbyname='define'
+d_getnent='define'
+d_getnetbyaddr_r='undef'
+d_getnetbyname_r='undef'
+d_getnetent_r='undef'
+d_getnetprotos='define'
+d_getpagsz='define'
+d_getpbyname='define'
+d_getpbynumber='define'
+d_getpent='define'
+d_getpgid='define'
+d_getpgrp2='undef'
+d_getpgrp='define'
+d_getppid='define'
+d_getprior='define'
+d_getprotobyname_r='undef'
+d_getprotobynumber_r='undef'
+d_getprotoent_r='undef'
+d_getprotoprotos='define'
+d_getprpwnam='undef'
+d_getpwent='define'
+d_getpwent_r='undef'
+d_getpwnam_r='undef'
+d_getpwuid_r='undef'
+d_getsbyname='define'
+d_getsbyport='define'
+d_getsent='define'
+d_getservbyname_r='undef'
+d_getservbyport_r='undef'
+d_getservent_r='undef'
+d_getservprotos='define'
+d_getspnam='define'
+d_getspnam_r='undef'
+d_gettimeod='define'
+d_gmtime64='undef'
+d_gmtime_r='undef'
+d_gnulibc='define'
+d_grpasswd='define'
+d_hasmntopt='define'
+d_htonl='define'
+d_ilogbl='define'
+d_inc_version_list='undef'
+d_index='undef'
+d_inetaton='define'
+d_inetntop='define'
+d_inetpton='define'
+d_int64_t='define'
+d_ip_mreq='define'
+d_ip_mreq_source='define'
+d_ipv6_mreq='define'
+d_ipv6_mreq_source='undef'
+d_isascii='define'
+d_isblank='define'
+d_isfinite='undef'
+d_isinf='define'
+d_isnan='define'
+d_isnanl='define'
+d_killpg='define'
+d_lchown='define'
+d_ldbl_dig='define'
+d_libm_lib_version='define'
+d_link='define'
+d_localtime64='undef'
+d_localtime_r='undef'
+d_localtime_r_needs_tzset='undef'
+d_locconv='define'
+d_lockf='define'
+d_longdbl='define'
+d_longlong='define'
+d_lseekproto='define'
+d_lstat='define'
+d_madvise='define'
+d_malloc_good_size='undef'
+d_malloc_size='undef'
+d_mblen='define'
+d_mbstowcs='define'
+d_mbtowc='define'
+d_memchr='define'
+d_memcmp='define'
+d_memcpy='define'
+d_memmove='define'
+d_memset='define'
+d_mkdir='define'
+d_mkdtemp='define'
+d_mkfifo='define'
+d_mkstemp='define'
+d_mkstemps='define'
+d_mktime64='undef'
+d_mktime='define'
+d_mmap='define'
+d_modfl='define'
+d_modfl_pow32_bug='undef'
+d_modflproto='define'
+d_mprotect='define'
+d_msg='define'
+d_msg_ctrunc='define'
+d_msg_dontroute='define'
+d_msg_oob='define'
+d_msg_peek='define'
+d_msg_proxy='define'
+d_msgctl='define'
+d_msgget='define'
+d_msghdr_s='define'
+d_msgrcv='define'
+d_msgsnd='define'
+d_msync='define'
+d_munmap='define'
+d_mymalloc='undef'
+d_ndbm='undef'
+d_ndbm_h_uses_prototypes='undef'
+d_nice='define'
+d_nl_langinfo='define'
+d_nv_preserves_uv='undef'
+d_nv_zero_is_allbits_zero='define'
+d_off64_t='undef'
+d_old_pthread_create_joinable='undef'
+d_oldpthreads='undef'
+d_oldsock='undef'
+d_open3='define'
+d_pathconf='define'
+d_pause='define'
+d_perl_otherlibdirs='undef'
+d_phostname='undef'
+d_pipe='define'
+d_poll='define'
+d_portable='define'
+d_prctl='define'
+d_prctl_set_name='define'
+d_printf_format_null='undef'
+d_procselfexe='undef'
+d_pseudofork='undef'
+d_pthread_atfork='undef'
+d_pthread_attr_setscope='define'
+d_pthread_yield='undef'
+d_pwage='undef'
+d_pwchange='undef'
+d_pwclass='undef'
+d_pwcomment='undef'
+d_pwexpire='undef'
+d_pwgecos='define'
+d_pwpasswd='define'
+d_pwquota='undef'
+d_qgcvt='define'
+d_quad='define'
+d_random_r='undef'
+d_readdir64_r='undef'
+d_readdir='define'
+d_readdir_r='undef'
+d_readlink='define'
+d_readv='define'
+d_recvmsg='define'
+d_rename='define'
+d_rewinddir='define'
+d_rmdir='define'
+d_safebcpy='undef'
+d_safemcpy='undef'
+d_sanemcmp='define'
+d_sbrkproto='define'
+d_scalbnl='define'
+d_sched_yield='define'
+d_scm_rights='define'
+d_seekdir='define'
+d_select='define'
+d_sem='define'
+d_semctl='define'
+d_semctl_semid_ds='define'
+d_semctl_semun='define'
+d_semget='define'
+d_semop='define'
+d_sendmsg='define'
+d_setegid='define'
+d_seteuid='define'
+d_setgrent='define'
+d_setgrent_r='undef'
+d_setgrps='define'
+d_sethent='define'
+d_sethostent_r='undef'
+d_setitimer='define'
+d_setlinebuf='define'
+d_setlocale='define'
+d_setlocale_r='undef'
+d_setnent='define'
+d_setnetent_r='undef'
+d_setpent='define'
+d_setpgid='define'
+d_setpgrp2='undef'
+d_setpgrp='define'
+d_setprior='define'
+d_setproctitle='undef'
+d_setprotoent_r='undef'
+d_setpwent='define'
+d_setpwent_r='undef'
+d_setregid='define'
+d_setresgid='define'
+d_setresuid='define'
+d_setreuid='define'
+d_setrgid='undef'
+d_setruid='undef'
+d_setsent='define'
+d_setservent_r='undef'
+d_setsid='define'
+d_setvbuf='define'
+d_sfio='undef'
+d_shm='define'
+d_shmat='define'
+d_shmatprototype='define'
+d_shmctl='define'
+d_shmdt='define'
+d_shmget='define'
+d_sigaction='define'
+d_signbit='define'
+d_sigprocmask='define'
+d_sigsetjmp='define'
+d_sin6_scope_id='define'
+d_sitearch='define'
+d_snprintf='define'
+d_sockaddr_in6='define'
+d_sockaddr_sa_len='undef'
+d_sockatmark='define'
+d_sockatmarkproto='define'
+d_socket='define'
+d_socklen_t='define'
+d_sockpair='define'
+d_socks5_init='undef'
+d_sprintf_returns_strlen='define'
+d_sqrtl='define'
+d_srand48_r='undef'
+d_srandom_r='undef'
+d_sresgproto='undef'
+d_sresuproto='undef'
+d_statblks='define'
+d_statfs_f_flags='define'
+d_statfs_s='define'
+d_static_inline='define'
+d_statvfs='define'
+d_stdio_cnt_lval='undef'
+d_stdio_ptr_lval='define'
+d_stdio_ptr_lval_nochange_cnt='undef'
+d_stdio_ptr_lval_sets_cnt='define'
+d_stdio_stream_array='undef'
+d_stdiobase='define'
+d_stdstdio='define'
+d_strchr='define'
+d_strcoll='define'
+d_strctcpy='define'
+d_strerrm='strerror(e)'
+d_strerror='define'
+d_strerror_r='undef'
+d_strftime='define'
+d_strlcat='undef'
+d_strlcpy='undef'
+d_strtod='define'
+d_strtol='define'
+d_strtold='define'
+d_strtoll='define'
+d_strtoq='define'
+d_strtoul='define'
+d_strtoull='define'
+d_strtouq='define'
+d_strxfrm='define'
+d_suidsafe='undef'
+d_symlink='define'
+d_syscall='define'
+d_syscallproto='define'
+d_sysconf='define'
+d_sysernlst=''
+d_syserrlst='define'
+d_system='define'
+d_tcgetpgrp='define'
+d_tcsetpgrp='define'
+d_telldir='define'
+d_telldirproto='define'
+d_time='define'
+d_timegm='define'
+d_times='define'
+d_tm_tm_gmtoff='define'
+d_tm_tm_zone='define'
+d_tmpnam_r='undef'
+d_truncate='define'
+d_ttyname_r='undef'
+d_tzname='define'
+d_u32align='define'
+d_ualarm='define'
+d_umask='define'
+d_uname='define'
+d_union_semun='undef'
+d_unordered='undef'
+d_unsetenv='define'
+d_usleep='define'
+d_usleepproto='define'
+d_ustat='define'
+d_vendorarch='undef'
+d_vendorbin='undef'
+d_vendorlib='undef'
+d_vendorscript='undef'
+d_vfork='undef'
+d_void_closedir='undef'
+d_voidsig='define'
+d_voidtty=''
+d_volatile='define'
+d_vprintf='define'
+d_vsnprintf='define'
+d_wait4='define'
+d_waitpid='define'
+d_wcstombs='define'
+d_wctomb='define'
+d_writev='define'
+d_xenix='undef'
+date='date'
+db_hashtype='u_int32_t'
+db_prefixtype='size_t'
+db_version_major=''
+db_version_minor=''
+db_version_patch=''
+defvoidused='15'
+direntrytype='struct dirent'
+dlext='so'
+dlsrc='dl_dlopen.xs'
+doublesize='8'
+drand01='drand48()'
+drand48_r_proto='0'
+dtrace=''
+dynamic_ext='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call Hash/Util Hash/Util/FieldHash I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate Unicode/Normalize XS/APItest XS/Typemap arybase attributes mro re threads threads/shared'
+eagain='EAGAIN'
+ebcdic='undef'
+echo='echo'
+egrep='egrep'
+emacs=''
+endgrent_r_proto='0'
+endhostent_r_proto='0'
+endnetent_r_proto='0'
+endprotoent_r_proto='0'
+endpwent_r_proto='0'
+endservent_r_proto='0'
+eunicefix=':'
+exe_ext=''
+expr='expr'
+extensions='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call Hash/Util Hash/Util/FieldHash I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate Unicode/Normalize XS/APItest XS/Typemap arybase attributes mro re threads threads/shared Archive/Extract Archive/Tar Attribute/Handlers AutoLoader B/Debug B/Deparse B/Lint CGI CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML CPANPLUS CPANPLUS/Dist/Build Carp Config/Perl/V Devel/SelfStubber Digest Dumpvalue Env Errno ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/ParseXS File/CheckTree File/Fetch File/Path File/Temp FileCache Filter/Simple Getopt/Long HTTP/Tiny I18N/Collate I18N/LangTags IO/Compress IO/Zlib IPC/Cmd IPC/Open3 JSON/PP Locale/Codes Locale/Maketext Locale/Maketext/Simple Log/Message Log/Message/Simple Math/BigInt Math/BigRat Math/Complex Memoize Module/Build Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata Module/Pluggable NEXT Net/Ping Object/Accessor Package/Constants Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/LaTeX Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage Safe Search/Dict SelfLoader Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Term/UI Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Memoize Tie/RefHash Time/Local XSLoader autodie autouse base bignum constant encoding/warnings if lib libnet parent perlfaq podlators'
+extern_C='extern'
+extras=''
+fflushNULL='define'
+fflushall='undef'
+find=''
+firstmakefile='makefile'
+flex=''
+fpossize='16'
+fpostype='fpos_t'
+freetype='void'
+from=':'
+full_ar='%%AR%%'
+full_csh='csh'
+full_sed='/bin/sed'
+gccansipedantic=''
+gccosandvers=''
+gccversion='4.7.3'
+getgrent_r_proto='0'
+getgrgid_r_proto='0'
+getgrnam_r_proto='0'
+gethostbyaddr_r_proto='0'
+gethostbyname_r_proto='0'
+gethostent_r_proto='0'
+getlogin_r_proto='0'
+getnetbyaddr_r_proto='0'
+getnetbyname_r_proto='0'
+getnetent_r_proto='0'
+getprotobyname_r_proto='0'
+getprotobynumber_r_proto='0'
+getprotoent_r_proto='0'
+getpwent_r_proto='0'
+getpwnam_r_proto='0'
+getpwuid_r_proto='0'
+getservbyname_r_proto='0'
+getservbyport_r_proto='0'
+getservent_r_proto='0'
+getspnam_r_proto='0'
+gidformat='"u"'
+gidsign='1'
+gidsize='4'
+gidtype='gid_t'
+glibpth='/usr/shlib  /lib /usr/lib /usr/lib/386 /lib/386 /usr/ccs/lib /usr/ucblib /usr/local/lib /lib64 /usr/lib64 /usr/local/lib64 '
+gmake='gmake'
+gmtime_r_proto='0'
+gnulibc_version='2.18'
+grep='grep'
+groupcat='cat /etc/group'
+groupstype='gid_t'
+gzip='gzip'
+h_fcntl='false'
+h_sysfile='true'
+hint='recommended'
+hostcat='cat /etc/hosts'
+html1dir=' '
+html1direxp=''
+html3dir=' '
+html3direxp=''
+i16size='2'
+i16type='short'
+i32size='4'
+i32type='int'
+i64size='8'
+i64type='long'
+i8size='1'
+i8type='signed char'
+i_arpainet='define'
+i_assert='define'
+i_bsdioctl=''
+i_crypt='define'
+i_db='undef'
+i_dbm='undef'
+i_dirent='define'
+i_dld='undef'
+i_dlfcn='define'
+i_fcntl='undef'
+i_float='define'
+i_fp='undef'
+i_fp_class='undef'
+i_gdbm='undef'
+i_gdbm_ndbm='undef'
+i_gdbmndbm='undef'
+i_grp='define'
+i_ieeefp='undef'
+i_inttypes='define'
+i_langinfo='define'
+i_libutil='undef'
+i_limits='define'
+i_locale='define'
+i_machcthr='undef'
+i_malloc='define'
+i_mallocmalloc='undef'
+i_math='define'
+i_memory='undef'
+i_mntent='define'
+i_ndbm='undef'
+i_netdb='define'
+i_neterrno='undef'
+i_netinettcp='define'
+i_niin='define'
+i_poll='define'
+i_prot='undef'
+i_pthread='define'
+i_pwd='define'
+i_rpcsvcdbm='undef'
+i_sfio='undef'
+i_sgtty='undef'
+i_shadow='define'
+i_socks='undef'
+i_stdarg='define'
+i_stdbool='define'
+i_stddef='define'
+i_stdlib='define'
+i_string='define'
+i_sunmath='undef'
+i_sysaccess='undef'
+i_sysdir='define'
+i_sysfile='define'
+i_sysfilio='undef'
+i_sysin='undef'
+i_sysioctl='define'
+i_syslog='define'
+i_sysmman='define'
+i_sysmode='undef'
+i_sysmount='define'
+i_sysndir='undef'
+i_sysparam='define'
+i_syspoll='define'
+i_sysresrc='define'
+i_syssecrt='undef'
+i_sysselct='define'
+i_syssockio='undef'
+i_sysstat='define'
+i_sysstatfs='define'
+i_sysstatvfs='define'
+i_systime='define'
+i_systimek='undef'
+i_systimes='define'
+i_systypes='define'
+i_sysuio='define'
+i_sysun='define'
+i_sysutsname='define'
+i_sysvfs='define'
+i_syswait='define'
+i_termio='undef'
+i_termios='define'
+i_time='define'
+i_unistd='define'
+i_ustat='define'
+i_utime='define'
+i_values='define'
+i_varargs='undef'
+i_varhdr='stdarg.h'
+i_vfork='undef'
+ignore_versioned_solibs='y'
+inc_version_list=' '
+inc_version_list_init='0'
+incpath=''
+inews=''
+initialinstalllocation='/usr/bin'
+installarchlib='/usr/lib/perl5/5.18.1/ppc64-linux'
+installbin='/usr/bin'
+installhtml1dir=''
+installhtml3dir=''
+installman1dir=''
+installman3dir=''
+installprefix='/usr'
+installprefixexp='/usr'
+installprivlib='/usr/lib/perl5/5.18.1'
+installscript='/usr/bin'
+installsitearch='/usr/lib/perl5/site_perl/5.18.1/ppc64-linux'
+installsitebin='/usr/bin'
+installsitehtml1dir=''
+installsitehtml3dir=''
+installsitelib='/usr/lib/perl5/site_perl/5.18.1'
+installsiteman1dir=''
+installsiteman3dir=''
+installsitescript='/usr/bin'
+installstyle='lib/perl5'
+installusrbinperl='undef'
+installvendorarch=''
+installvendorbin=''
+installvendorhtml1dir=''
+installvendorhtml3dir=''
+installvendorlib=''
+installvendorman1dir=''
+installvendorman3dir=''
+installvendorscript=''
+intsize='4'
+issymlink='test -h'
+ivdformat='"ld"'
+ivsize='8'
+ivtype='long'
+known_extensions='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call GDBM_File Hash/Util Hash/Util/FieldHash I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc NDBM_File ODBM_File Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate Unicode/Normalize VMS/DCLsym VMS/Stdio Win32 Win32API/File Win32CORE XS/APItest XS/Typemap arybase attributes mro re threads threads/shared '
+ksh=''
+ld='%%LD%%'
+ld_can_script='define'
+lddlflags='-shared %%LDFLAGS%%'
+ldflags=' %%LDFLAGS%%'
+ldflags_uselargefiles=''
+ldlibpthname='LD_LIBRARY_PATH'
+less='less'
+lib_ext='.a'
+libc=''
+libperl='libperl.a'
+libpth='%%LIBDIRS%%'
+libs='-lnsl -ldl -lm -lcrypt -lutil -lc'
+libsdirs='%%LIBDIRS%%'
+libsfiles=' libnsl.so libdl.so libm.so libcrypt.so libutil.so libc.so'
+#libsfound=' /lib/../lib64/libnsl.so /lib/../lib64/libdl.so /lib/../lib64/libm.so /lib/../lib64/libcrypt.so /lib/../lib64/libutil.so /usr/lib/../lib64/libc.so'
+libspath='%%LIBDIRS%%'
+libswanted='sfio socket inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun m crypt sec util c cposix posix ucb BSD gdbm_compat'
+libswanted_uselargefiles=''
+line=''
+lint=''
+lkflags=''
+ln='ln'
+lns='/bin/ln -s'
+localtime_r_proto='0'
+locincpth='/usr/local/include /opt/local/include /usr/gnu/include /opt/gnu/include /usr/GNU/include /opt/GNU/include'
+loclibpth='/usr/local/lib /opt/local/lib /usr/gnu/lib /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib'
+longdblsize='8'
+longlongsize='8'
+longsize='8'
+lp=''
+lpr=''
+ls='ls'
+lseeksize='8'
+lseektype='off_t'
+mad='undef'
+madlyh=''
+madlyobj=''
+madlysrc=''
+mail=''
+mailx=''
+make='make'
+make_set_make='#'
+mallocobj=''
+mallocsrc=''
+malloctype='void *'
+man1dir=' '
+man1direxp=''
+man1ext='0'
+man3dir=' '
+man3direxp=''
+man3ext='0'
+mips_type=''
+mistrustnm=''
+mkdir='mkdir'
+mmaptype='void *'
+modetype='mode_t'
+more='more'
+multiarch='undef'
+mv=''
+myarchname='ppc64-linux'
+mydomain='.nonet'
+myhostname='openadk'
+myuname='linux openadk 3.12.6 #1 sat jan 18 22:32:32 cet 2014 ppc64 gnulinux '
+n='-n'
+need_va_copy='undef'
+netdb_hlen_type='size_t'
+netdb_host_type='char *'
+netdb_name_type='const char *'
+netdb_net_type='in_addr_t'
+nm='nm'
+nm_opt=''
+nm_so_opt='--dynamic'
+nonxs_ext='Archive/Extract Archive/Tar Attribute/Handlers AutoLoader B/Debug B/Deparse B/Lint CGI CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML CPANPLUS CPANPLUS/Dist/Build Carp Config/Perl/V Devel/SelfStubber Digest Dumpvalue Env Errno ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/ParseXS File/CheckTree File/Fetch File/Path File/Temp FileCache Filter/Simple Getopt/Long HTTP/Tiny I18N/Collate I18N/LangTags IO/Compress IO/Zlib IPC/Cmd IPC/Open3 JSON/PP Locale/Codes Locale/Maketext Locale/Maketext/Simple Log/Message Log/Message/Simple Math/BigInt Math/BigRat Math/Complex Memoize Module/Build Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata Module/Pluggable NEXT Net/Ping Object/Accessor Package/Constants Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/LaTeX Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage Safe Search/Dict SelfLoader Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Term/UI Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Memoize Tie/RefHash Time/Local XSLoader autodie autouse base bignum constant encoding/warnings if lib libnet parent perlfaq podlators'
+nroff='nroff'
+nvEUformat='"E"'
+nvFUformat='"F"'
+nvGUformat='"G"'
+nv_overflows_integers_at='256.0*256.0*256.0*256.0*256.0*256.0*2.0*2.0*2.0*2.0*2.0'
+nv_preserves_uv_bits='53'
+nveformat='"e"'
+nvfformat='"f"'
+nvgformat='"g"'
+nvsize='8'
+nvtype='double'
+o_nonblock='O_NONBLOCK'
+obj_ext='.o'
+old_pthread_create_joinable=''
+optimize='-O1'
+orderlib='false'
+osname='linux'
+osvers='3.12.6'
+otherlibdirs=' '
+package='perl5'
+pager='/usr/bin/less -R'
+passcat='cat /etc/passwd'
+patchlevel='18'
+path_sep=':'
+perl5=''
+perl='perl'
+perl_patchlevel=''
+perl_static_inline='static __inline__'
+perladmin='root@openadk.nonet'
+perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc'
+perlpath='/usr/bin/perl'
+pg='pg'
+phostname='hostname'
+pidtype='pid_t'
+plibpth='/lib/ppc64-openadk-linux-gnu/4.7.3 /lib/powerpc64-linux-gnu /lib/../lib64 /usr/lib/ppc64-openadk-linux-gnu/4.7.3 /usr/lib/powerpc64-linux-gnu /usr/lib/../lib64 /lib /usr/lib'
+pmake=''
+pr=''
+prefix='/usr'
+prefixexp='/usr'
+privlib='/usr/lib/perl5/5.18.1'
+privlibexp='/usr/lib/perl5/5.18.1'
+procselfexe=''
+prototype='define'
+ptrsize='8'
+quadkind='2'
+quadtype='long'
+randbits='48'
+randfunc='drand48'
+random_r_proto='0'
+randseedtype='long'
+ranlib=':'
+rd_nodata='-1'
+readdir64_r_proto='0'
+readdir_r_proto='0'
+revision='5'
+rm='rm'
+rm_try='/bin/rm -f try try a.out .out try.[cho] try..o core core.try* try.core*'
+rmail=''
+run=''
+runnm='false'
+sGMTIME_max='67768036191676799'
+sGMTIME_min='-62167219200'
+sLOCALTIME_max='67768036191673199'
+sLOCALTIME_min='-62167222408'
+sPRIEUldbl='"E"'
+sPRIFUldbl='"F"'
+sPRIGUldbl='"G"'
+sPRIXU64='"lX"'
+sPRId64='"ld"'
+sPRIeldbl='"e"'
+sPRIfldbl='"f"'
+sPRIgldbl='"g"'
+sPRIi64='"li"'
+sPRIo64='"lo"'
+sPRIu64='"lu"'
+sPRIx64='"lx"'
+sSCNfldbl='"f"'
+sched_yield='sched_yield()'
+scriptdir='/usr/bin'
+scriptdirexp='/usr/bin'
+sed='sed'
+seedfunc='srand48'
+selectminbits='64'
+selecttype='fd_set *'
+sendmail=''
+setgrent_r_proto='0'
+sethostent_r_proto='0'
+setlocale_r_proto='0'
+setnetent_r_proto='0'
+setprotoent_r_proto='0'
+setpwent_r_proto='0'
+setservent_r_proto='0'
+sh='/bin/sh'
+shar=''
+sharpbang='#!'
+shmattype='void *'
+shortsize='2'
+shrpenv=''
+shsharp='true'
+sig_count='65'
+sig_name='ZERO HUP INT QUIT ILL TRAP ABRT BUS FPE KILL USR1 SEGV USR2 PIPE ALRM TERM STKFLT CHLD CONT STOP TSTP TTIN TTOU URG XCPU XFSZ VTALRM PROF WINCH IO PWR SYS NUM32 NUM33 RTMIN NUM35 NUM36 NUM37 NUM38 NUM39 NUM40 NUM41 NUM42 NUM43 NUM44 NUM45 NUM46 NUM47 NUM48 NUM49 NUM50 NUM51 NUM52 NUM53 NUM54 NUM55 NUM56 NUM57 NUM58 NUM59 NUM60 NUM61 NUM62 NUM63 RTMAX IOT CLD POLL UNUSED '
+sig_name_init='"ZERO", "HUP", "INT", "QUIT", "ILL", "TRAP", "ABRT", "BUS", "FPE", "KILL", "USR1", "SEGV", "USR2", "PIPE", "ALRM", "TERM", "STKFLT", "CHLD", "CONT", "STOP", "TSTP", "TTIN", "TTOU", "URG", "XCPU", "XFSZ", "VTALRM", "PROF", "WINCH", "IO", "PWR", "SYS", "NUM32", "NUM33", "RTMIN", "NUM35", "NUM36", "NUM37", "NUM38", "NUM39", "NUM40", "NUM41", "NUM42", "NUM43", "NUM44", "NUM45", "NUM46", "NUM47", "NUM48", "NUM49", "NUM50", "NUM51", "NUM52", "NUM53", "NUM54", "NUM55", "NUM56", "NUM57", "NUM58", "NUM59", "NUM60", "NUM61", "NUM62", "NUM63", "RTMAX", "IOT", "CLD", "POLL", "UNUSED", 0'
+sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 6 17 29 31 '
+sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 6, 17, 29, 31, 0'
+sig_size='69'
+signal_t='void'
+sitearch='/usr/lib/perl5/site_perl/5.18.1/ppc64-linux'
+sitearchexp='/usr/lib/perl5/site_perl/5.18.1/ppc64-linux'
+sitebin='/usr/bin'
+sitebinexp='/usr/bin'
+sitehtml1dir=''
+sitehtml1direxp=''
+sitehtml3dir=''
+sitehtml3direxp=''
+sitelib='/usr/lib/perl5/site_perl/5.18.1'
+sitelib_stem='/usr/lib/perl5/site_perl'
+sitelibexp='/usr/lib/perl5/site_perl/5.18.1'
+siteman1dir=''
+siteman1direxp=''
+siteman3dir=''
+siteman3direxp=''
+siteprefix='/usr'
+siteprefixexp='/usr'
+sitescript='/usr/bin'
+sitescriptexp='/usr/bin'
+sizesize='8'
+sizetype='size_t'
+sleep=''
+smail=''
+so='so'
+sockethdr=''
+socketlib=''
+socksizetype='socklen_t'
+sort='sort'
+spackage='Perl5'
+spitshell='cat'
+srand48_r_proto='0'
+srandom_r_proto='0'
+src='.'
+ssizetype='ssize_t'
+st_ino_sign='1'
+st_ino_size='8'
+startperl='#!/usr/bin/perl'
+startsh='#!/bin/sh'
+static_ext=' '
+stdchar='char'
+stdio_base='((fp)->_IO_read_base)'
+stdio_bufsiz='((fp)->_IO_read_end - (fp)->_IO_read_base)'
+stdio_cnt='((fp)->_IO_read_end - (fp)->_IO_read_ptr)'
+stdio_filbuf=''
+stdio_ptr='((fp)->_IO_read_ptr)'
+stdio_stream_array=''
+strerror_r_proto='0'
+strings='/usr/include/string.h'
+submit=''
+subversion='1'
+sysman='/usr/man/man1'
+tail=''
+tar=''
+targetarch=''
+tbl=''
+tee=''
+test='test'
+timeincl='/usr/include/sys/time.h /usr/include/time.h '
+timetype='time_t'
+tmpnam_r_proto='0'
+to=':'
+touch='touch'
+tr='tr'
+trnl='\n'
+troff=''
+ttyname_r_proto='0'
+u16size='2'
+u16type='unsigned short'
+u32size='4'
+u32type='unsigned int'
+u64size='8'
+u64type='unsigned long'
+u8size='1'
+u8type='unsigned char'
+uidformat='"u"'
+uidsign='1'
+uidsize='4'
+uidtype='uid_t'
+uname='uname'
+uniq='uniq'
+uquadtype='unsigned long'
+use5005threads='undef'
+use64bitall='define'
+use64bitint='define'
+usecrosscompile='undef'
+usedevel='undef'
+usedl='define'
+usedtrace='undef'
+usefaststdio='undef'
+useithreads='undef'
+usekernprocpathname='undef'
+uselargefiles='define'
+uselongdouble='undef'
+usemallocwrap='define'
+usemorebits='undef'
+usemultiplicity='undef'
+usemymalloc='n'
+usenm='false'
+usensgetexecutablepath='undef'
+useopcode='true'
+useperlio='define'
+useposix='true'
+usereentrant='undef'
+userelocatableinc='undef'
+usesfio='false'
+useshrplib='false'
+usesitecustomize='undef'
+usesocks='undef'
+usethreads='undef'
+usevendorprefix='undef'
+useversionedarchname='undef'
+usevfork='false'
+usrinc='%%INCDIRS%%'
+uuname=''
+uvXUformat='"lX"'
+uvoformat='"lo"'
+uvsize='8'
+uvtype='unsigned long'
+uvuformat='"lu"'
+uvxformat='"lx"'
+vaproto='define'
+vendorarch=''
+vendorarchexp=''
+vendorbin=''
+vendorbinexp=''
+vendorhtml1dir=' '
+vendorhtml1direxp=''
+vendorhtml3dir=' '
+vendorhtml3direxp=''
+vendorlib=''
+vendorlib_stem=''
+vendorlibexp=''
+vendorman1dir=' '
+vendorman1direxp=''
+vendorman3dir=' '
+vendorman3direxp=''
+vendorprefix=''
+vendorprefixexp=''
+vendorscript=''
+vendorscriptexp=''
+version='5.18.1'
+version_patchlevel_string='version 18 subversion 1'
+versiononly='undef'
+vi=''
+voidflags='15'
+xlibpth='/usr/lib/386 /lib/386'
+yacc='yacc'
+yaccflags=''
+zcat=''
+zip='zip'
+PERL_REVISION=5
+PERL_VERSION=18
+PERL_SUBVERSION=1
+PERL_API_REVISION=5
+PERL_API_VERSION=18
+PERL_API_SUBVERSION=0
+PERL_PATCHLEVEL=''
+PERL_CONFIG_SH=true
+: Variables propagated from previous config.sh file.
+libdb_needs_pthread='N'
diff --git a/package/php/Makefile b/package/php/Makefile
index 43fd6554f..528f5bb11 100644
--- a/package/php/Makefile
+++ b/package/php/Makefile
@@ -67,7 +67,6 @@ PKGFD_MOD_ZLIB:=	ZLIB support
 PKGFB_MOD_ZLIB:=	zlib
 PKGFS_MOD_ZLIB:=	zlib
 
-PKG_ARCH_DEPENDS:=	!cris !avr32
 PKG_HOST_DEPENDS:=	!cygwin
 
 include $(TOPDIR)/mk/package.mk
diff --git a/package/polkit/Makefile b/package/polkit/Makefile
index 0fbfcb439..5ed8333e3 100644
--- a/package/polkit/Makefile
+++ b/package/polkit/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		polkit
 PKG_VERSION:=		0.112
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		23973dcfd8b92ab2b7db3a925642b76d
 PKG_DESCR:=		application-level toolkit
 PKG_SECTION:=		libs
@@ -15,8 +15,6 @@ PKG_URL:=		http://www.freedesktop.org/wiki/Software/polkit/
 PKG_SITES:=		http://openadk.org/distfiles/
 PKG_OPTS:=		dev
 
-PKG_LIBC_DEPENDS:=	eglibc glibc
-
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,POLKIT,polkit,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
@@ -26,6 +24,7 @@ CONFIGURE_ARGS+=	--disable-man-pages \
 			--disable-examples \
 			--enable-libsystemd-login=no \
 			--without-systemdsystemunitdir \
+			--with-polkitd-user=root \
 			--with-authfw=shadow \
 			--with-os-type=unknown
 
@@ -38,5 +37,8 @@ polkit-install:
 	$(CP) $(WRKINST)/usr/lib/polkit-1/* \
 		$(IDIR_POLKIT)/usr/lib/polkit-1
 	$(CP) $(WRKINST)/usr/bin/* $(IDIR_POLKIT)/usr/bin
+	$(INSTALL_DIR) $(IDIR_POLKIT)/usr/share/dbus-1
+	$(CP) $(WRKINST)/usr/share/dbus-1/* \
+		$(IDIR_POLKIT)/usr/share/dbus-1
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/pptpd/Makefile b/package/pptpd/Makefile
index 2a2e957dd..07ae9cc1a 100644
--- a/package/pptpd/Makefile
+++ b/package/pptpd/Makefile
@@ -13,6 +13,8 @@ PKG_DEPENDS:=		ppp kmod-crypto kmod-ppp-mppe kmod-ppp kmod-net-ipgre
 PKG_URL:=		http://www.poptop.org/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=poptop/}
 
+PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,PPTPD,pptpd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/pulseaudio/Makefile b/package/pulseaudio/Makefile
new file mode 100644
index 000000000..4c7247c5c
--- /dev/null
+++ b/package/pulseaudio/Makefile
@@ -0,0 +1,71 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		pulseaudio
+PKG_VERSION:=		4.0
+PKG_RELEASE:=		3
+PKG_MD5SUM:=		591f211db2790a7e4d222f2dc6858db3
+PKG_DESCR:=		a sound system for POSIX OSes
+PKG_SECTION:=		multimedia
+PKG_DEPENDS:=		libltdl json-c libsndfile libudev libspeex libncurses
+PKG_DEPENDS+=		libflac libvorbis libogg libuuid libsndfile dbus
+PKG_DEPENDS+=		libgcc libpthread librt alsa-lib libsamplerate
+PKG_BUILDDEP:=		libtool json-c libsndfile eudev speex libsndfile
+PKG_BUILDDEP+=		flac libvorbis libogg util-linux dbus ncurses alsa-lib
+PKG_BUILDDEP+=		libsamplerate
+PKG_URL:=		http://www.freedesktop.org/wiki/Software/PulseAudio/
+PKG_SITES:=		http://freedesktop.org/software/pulseaudio/releases/
+PKG_OPTS:=		dev
+
+PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
+
+DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.xz
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,PULSEAUDIO,pulseaudio,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+TARGET_CPPFLAGS+=	-D_GNU_SOURCE -D_POSIX_SOURCE
+CONFIGURE_ARGS+=	--disable-systemd \
+			--disable-manpages \
+			--disable-neon-opt \
+			--disable-x11 \
+			--disable-avahi \
+			--disable-lirc \
+			--disable-openssl \
+			--disable-orc \
+			--disable-tcpwrap \
+			--disable-oss-output \
+			--disable-oss-wrapper \
+			--disable-esound \
+			--disable-jack \
+			--disable-gconf \
+			--enable-samplerate \
+			--enable-alsa \
+			--enable-dbus \
+			--enable-udev \
+			--with-speex
+
+pulseaudio-install:
+	$(INSTALL_DIR) $(IDIR_PULSEAUDIO)/etc/dbus-1
+	$(CP) $(WRKINST)/etc/dbus-1/* \
+		$(IDIR_PULSEAUDIO)/etc/dbus-1
+	$(INSTALL_DIR) $(IDIR_PULSEAUDIO)/etc/pulse
+	$(CP) $(WRKINST)/etc/pulse/* \
+		$(IDIR_PULSEAUDIO)/etc/pulse
+	$(INSTALL_DIR) $(IDIR_PULSEAUDIO)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/* \
+		$(IDIR_PULSEAUDIO)/usr/bin
+	$(INSTALL_DIR) $(IDIR_PULSEAUDIO)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libpulse*.so* \
+		$(IDIR_PULSEAUDIO)/usr/lib
+	$(INSTALL_DIR) $(IDIR_PULSEAUDIO)/usr/lib/pulseaudio
+	$(CP) $(WRKINST)/usr/lib/pulseaudio/libpulse*.so* \
+		$(IDIR_PULSEAUDIO)/usr/lib/pulseaudio
+	$(INSTALL_DIR) $(IDIR_PULSEAUDIO)/usr/lib/pulse-$(PKG_VERSION)/modules
+	$(CP) $(WRKINST)/usr/lib/pulse-$(PKG_VERSION)/modules/*.so \
+		$(IDIR_PULSEAUDIO)/usr/lib/pulse-$(PKG_VERSION)/modules
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/pulseaudio/files/pulseaudio.init b/package/pulseaudio/files/pulseaudio.init
new file mode 100644
index 000000000..f928e3fe6
--- /dev/null
+++ b/package/pulseaudio/files/pulseaudio.init
@@ -0,0 +1,32 @@
+#!/bin/sh
+#PKG pulseaudio
+#INIT 60
+. /etc/rc.conf
+
+case $1 in
+autostop) ;;
+autostart)
+	test x"${pulseaudio:-NO}" = x"NO" && exit 0
+	exec sh $0 start
+	;;
+start)
+	if [ ! -d /var/run/pulse ]; then 
+		mkdir -p /var/run/pulse/ && chown -R pulse.pulse /var/run/pulse && chmod 750 /var/run/pulse
+	fi
+	if [ ! -d /var/lib/pulse ]; then 
+		mkdir -p /var/lib/pulse/.pulse-cookie && chown -R pulse.pulse /var/lib/pulse && chmod 750 /var/lib/pulse
+	fi
+	/usr/bin/pulseaudio $pulseaudio_flags
+	;;
+stop)
+	kill $(pgrep -f /usr/bin/pulseaudio)
+	;;
+restart)
+	sh $0 stop
+	sh $0 start
+	;;
+*)
+	echo "usage: $0 {start | stop | restart}"
+	exit 1
+esac
+exit $?
diff --git a/package/pulseaudio/files/pulseaudio.postinst b/package/pulseaudio/files/pulseaudio.postinst
new file mode 100644
index 000000000..b339de93f
--- /dev/null
+++ b/package/pulseaudio/files/pulseaudio.postinst
@@ -0,0 +1,7 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+add_rcconf pulseaudio pulseaudio NO
+gid=$(get_next_gid)
+add_user pulse $(get_next_uid) $gid /var/run/pulse
+add_group pulse $gid
+add_rcconf pulseaudio_flags pulseaudio_flags "-D --system --disallow-exit --disallow-module-loading --disable-shm --exit-idle-time=-1 --realtime=false"
diff --git a/package/qingy/Makefile b/package/qingy/Makefile
index 381d252d8..4e095f2b2 100644
--- a/package/qingy/Makefile
+++ b/package/qingy/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		qingy
 PKG_VERSION:=		1.0.0
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		1e0912655e240adfd0ce5ced30bbc685
 PKG_DESCR:=		a DirectFB getty replacement
 PKG_SECTION:=		misc
diff --git a/package/qingy/patches/patch-src_libraries_misc_h b/package/qingy/patches/patch-src_libraries_misc_h
new file mode 100644
index 000000000..22ee9c890
--- /dev/null
+++ b/package/qingy/patches/patch-src_libraries_misc_h
@@ -0,0 +1,10 @@
+--- qingy-1.0.0.orig/src/libraries/misc.h	2008-11-27 10:29:01.000000000 +0100
++++ qingy-1.0.0/src/libraries/misc.h	2014-01-20 07:38:44.000000000 +0100
+@@ -29,6 +29,7 @@
+ #include <config.h>
+ #endif
+ 
++#include <time.h>
+ #include "qingy_constants.h"
+ 
+ /* Computes the integer part of the base 10 log */
diff --git a/package/qingy/patches/patch-src_libraries_vt_c b/package/qingy/patches/patch-src_libraries_vt_c
new file mode 100644
index 000000000..84a9842a8
--- /dev/null
+++ b/package/qingy/patches/patch-src_libraries_vt_c
@@ -0,0 +1,39 @@
+--- qingy-1.0.0.orig/src/libraries/vt.c	2008-11-25 12:21:28.000000000 +0100
++++ qingy-1.0.0/src/libraries/vt.c	2014-01-20 07:53:43.000000000 +0100
+@@ -98,14 +98,15 @@ static int getfd()
+ int switch_to_tty(int tty)
+ {
+   char *ttyname = create_tty_name(tty);
++  FILE *_stdin, *_stdout, *_stderr;
+   
+   if (!ttyname) return 0;
+   /* we set stdin, stdout and stderr to the new tty */
+-  stdin  = freopen(ttyname, "r", stdin);
+-  stdout = freopen(ttyname, "w", stdout);
+-  stderr = freopen(ttyname, "w", stderr);
++  _stdin  = freopen(ttyname, "r", stdin);
++  _stdout = freopen(ttyname, "w", stdout);
++  _stderr = freopen(ttyname, "w", stderr);
+   free(ttyname);
+-  if (!stdin || !stdout || !stderr) return 0;
++  if (!_stdin || !_stdout || !_stderr) return 0;
+ 
+   return 1;
+ }
+@@ -197,6 +198,7 @@ void stderr_disable(void)
+ void stderr_enable(int *vt)
+ {
+   char *ttyname;
++  FILE *_stderr;
+ 
+ 	if (!vt)
+ 		ttyname = create_tty_name(get_active_tty());
+@@ -205,7 +207,7 @@ void stderr_enable(int *vt)
+   
+   if (!ttyname) return;
+ 
+-	stderr = fopen(ttyname, "w");
++	_stderr = freopen(ttyname, "w", stderr);
+   free(ttyname);
+ }
+ 
diff --git a/package/rdate/Makefile b/package/rdate/Makefile
index 619b5ad6a..1dd8d0222 100644
--- a/package/rdate/Makefile
+++ b/package/rdate/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		rdate
 PKG_VERSION:=		20070817
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		9a6489d7de4311678a3fab001bb503df
 PKG_DESCR:=		A small rdate and NTP client
 PKG_SECTION:=		ntp
diff --git a/package/rdate/patches/patch-rdate_c b/package/rdate/patches/patch-rdate_c
new file mode 100644
index 000000000..f560ca707
--- /dev/null
+++ b/package/rdate/patches/patch-rdate_c
@@ -0,0 +1,10 @@
+--- rdate.orig/rdate.c	2007-08-16 12:38:52.000000000 +0200
++++ rdate/rdate.c	2014-01-14 16:53:03.000000000 +0100
+@@ -45,6 +45,7 @@
+ #include <sys/socket.h>
+ #include <sys/time.h>
+ 
++#include <stdint.h>
+ #include <stdio.h>
+ #include <ctype.h>
+ #include <err.h>
diff --git a/package/rtorrent/Makefile b/package/rtorrent/Makefile
index a0659476b..7d709faa3 100644
--- a/package/rtorrent/Makefile
+++ b/package/rtorrent/Makefile
@@ -4,21 +4,20 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		rtorrent
-PKG_VERSION:=		0.9.0
+PKG_VERSION:=		0.9.2
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		9bc258d7a63dd13e3348f310ae26a434
+PKG_MD5SUM:=		72c3e9ab859bda7cc8aa96c0b508b09f
 PKG_DESCR:=		console torrent application
 PKG_SECTION:=		p2p
 PKG_DEPENDS:=		libncurses libtorrent libcurl libstdcxx
-PKG_BUILDDEP:=		ncurses libtorrent curl
+PKG_BUILDDEP:=		autotool ncurses libtorrent curl
 PKG_URL:=		http://libtorrent.rakshasa.no/
 PKG_SITES:=		http://libtorrent.rakshasa.no/downloads/
 
-PKG_ARCH_DEPENDS:=	!avr32
-
 include ${TOPDIR}/mk/package.mk
 
-TARGET_LDFLAGS+=	-lpthread
+AUTOTOOL_STYLE:=	autoreconf
+TARGET_LDFLAGS+=	-lpthread -ltinfo
 
 $(eval $(call PKG_template,RTORRENT,rtorrent,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
diff --git a/package/rtorrent/patches/patch-configure b/package/rtorrent/patches/patch-configure
deleted file mode 100644
index 833360f24..000000000
--- a/package/rtorrent/patches/patch-configure
+++ /dev/null
@@ -1,41 +0,0 @@
---- rtorrent-0.9.0.orig/configure	2011-12-10 13:32:44.000000000 +0100
-+++ rtorrent-0.9.0/configure	2012-03-22 21:14:03.805634594 +0100
-@@ -15442,38 +15442,6 @@ fi
- 
- 
- 
--  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for execinfo.h" >&5
--$as_echo_n "checking for execinfo.h... " >&6; }
--
--  if test "$cross_compiling" = yes; then :
--  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot run test program while cross compiling
--See \`config.log' for more details" "$LINENO" 5; }
--else
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--#include <execinfo.h>
--      int main() { backtrace((void**)0, 0); backtrace_symbols((char**)0, 0); return 0;}
--
--_ACEOF
--if ac_fn_c_try_run "$LINENO"; then :
--
--      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
--
--$as_echo "#define USE_EXECINFO 1" >>confdefs.h
--
--
--else
--
--      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
--  conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
- 
- 
- 
diff --git a/package/rtorrent/patches/patch-configure_ac b/package/rtorrent/patches/patch-configure_ac
new file mode 100644
index 000000000..975e059cf
--- /dev/null
+++ b/package/rtorrent/patches/patch-configure_ac
@@ -0,0 +1,18 @@
+--- rtorrent-0.9.2.orig/configure.ac	2012-04-20 08:55:30.000000000 +0200
++++ rtorrent-0.9.2/configure.ac	2014-01-13 12:54:40.000000000 +0100
+@@ -4,7 +4,6 @@ AC_DEFINE(API_VERSION, 6, api version)
+ 
+ AM_INIT_AUTOMAKE
+ AM_CONFIG_HEADER(config.h)
+-AM_PATH_CPPUNIT(1.9.6)
+ 
+ AC_PROG_CXX
+ AC_PROG_LIBTOOL
+@@ -20,7 +19,6 @@ TORRENT_DISABLE_IPV6
+ 
+ AC_SYS_LARGEFILE
+ 
+-TORRENT_CHECK_EXECINFO()
+ TORRENT_OTFD()
+ 
+ TORRENT_ENABLE_ARCH
diff --git a/package/ruby-ldap/Makefile b/package/ruby-ldap/Makefile
index 9d063331a..6289c1cb8 100644
--- a/package/ruby-ldap/Makefile
+++ b/package/ruby-ldap/Makefile
@@ -14,8 +14,6 @@ PKG_BUILDDEP:=		ruby openldap
 PKG_URL:=		http://ruby-ldap.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=ruby-ldap/0.9.8/}
 
-PKG_ARCH_DEPENDS:=	!avr32
-
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 include $(TOPDIR)/mk/package.mk
diff --git a/package/ruby/Makefile b/package/ruby/Makefile
index bf25e2236..cc34e7e5d 100644
--- a/package/ruby/Makefile
+++ b/package/ruby/Makefile
@@ -17,7 +17,6 @@ PKG_SITES:=		http://ftp.ruby-lang.org/pub/ruby/2.0/
 PKG_NOPARALLEL:=	1
 
 PKG_HOST_DEPENDS:=	!freebsd !cygwin
-PKG_ARCH_DEPENDS:=	!avr32
 
 DISTFILES:= 		${PKG_NAME}-${PKG_VERSION}-p${PKG_EXTRAVER}.tar.gz
 WRKDIST=		${WRKDIR}/${PKG_NAME}-${PKG_VERSION}-p${PKG_EXTRAVER}
diff --git a/package/rxvt-unicode/Makefile b/package/rxvt-unicode/Makefile
index 0ffe3ad00..df1460a75 100644
--- a/package/rxvt-unicode/Makefile
+++ b/package/rxvt-unicode/Makefile
@@ -15,8 +15,6 @@ PKG_URL:=		http://software.schmorp.de/pkg/rxvt-unicode.html
 PKG_SITES:=		http://dist.schmorp.de/rxvt-unicode/
 PKG_NEED_CXX:=		1
 
-PKG_ARCH_DEPENDS:=	!avr32
-
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 include $(TOPDIR)/mk/package.mk
diff --git a/package/samba/Makefile b/package/samba/Makefile
index 794bbb61f..f29bf52e0 100644
--- a/package/samba/Makefile
+++ b/package/samba/Makefile
@@ -14,8 +14,6 @@ PKG_DEPENDS:=		samba-lib libuuid libpopt
 PKG_URL:=		http://www.samba.org/
 PKG_SITES:=		http://samba.org/samba/ftp/stable/
 
-PKG_ARCH_DEPENDS:=	!avr32
-
 PKG_SUBPKGS:=		SAMBA SAMBA_CLIENT SAMBA_PASSWD SAMBA_LIB
 PKGSD_SAMBA_CLIENT:=	NetBIOS/SMB client
 PKGSS_SAMBA_CLIENT:=	libreadline samba-lib
diff --git a/package/sane-backends/Makefile b/package/sane-backends/Makefile
index 8deca8f19..4bad787ef 100644
--- a/package/sane-backends/Makefile
+++ b/package/sane-backends/Makefile
@@ -15,8 +15,6 @@ PKG_URL:=		http://www.sane-project.org/
 PKG_SITES:=		ftp://ftp2.sane-project.org/pub/sane/${PKG_NAME}-${PKG_VERSION}/
 PKG_MULTI:=		1
 
-PKG_ARCH_DEPENDS:=	!cris !avr32
-
 PKG_SUBPKGS:=		SANE_BACKENDS SANE_BACKEND_NET SANE_BACKEND_ABATON SANE_BACKEND_AGFAFOCUS
 PKG_SUBPKGS+=		SANE_BACKEND_APPLE SANE_BACKEND_ARTEC_EPLUS48U SANE_BACKEND_ARTEC SANE_BACKEND_AS6E
 PKG_SUBPKGS+=		SANE_BACKEND_AVISION SANE_BACKEND_BH SANE_BACKEND_CANON630U SANE_BACKEND_CANON
diff --git a/package/scsi-spin/Makefile b/package/scsi-spin/Makefile
index 4d123009f..6ea1f433e 100644
--- a/package/scsi-spin/Makefile
+++ b/package/scsi-spin/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		scsi-spin
 PKG_VERSION:=		1.0
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		d0c32bfc500e94cc1905d9457a99cdbb
 PKG_DESCR:=		Utility to spin down scsi disks
 PKG_SECTION:=		misc
diff --git a/package/scsi-spin/src/scsi-spin.c b/package/scsi-spin/src/scsi-spin.c
index b92347ff4..28a890cad 100644
--- a/package/scsi-spin/src/scsi-spin.c
+++ b/package/scsi-spin/src/scsi-spin.c
@@ -16,6 +16,7 @@
 */
 
 #include <stdlib.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <getopt.h>
diff --git a/package/sispmctl/Makefile b/package/sispmctl/Makefile
index 7fffc4c4b..5f1b5929d 100644
--- a/package/sispmctl/Makefile
+++ b/package/sispmctl/Makefile
@@ -14,8 +14,6 @@ PKG_BUILDDEP:=		libusb libusb-compat
 PKG_URL:=		http://sispmctl.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=sispmctl/}
 
-PKG_ARCH_DEPENDS:=	!avr32
-
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,SISPMCTL,sispmctl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/speex/Makefile b/package/speex/Makefile
index bacc1919e..986e12f3f 100644
--- a/package/speex/Makefile
+++ b/package/speex/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		speex
 PKG_VERSION:=		1.2rc1
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		c4438b22c08e5811ff10e2b06ee9b9ae
 PKG_DESCR:=		an open source patent-free speech compression codec
 PKG_SECTION:=		libs
@@ -26,6 +26,6 @@ XAKE_FLAGS+=		bin_PROGRAMS=""
 
 libspeex-install:
 	${INSTALL_DIR} ${IDIR_LIBSPEEX}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libspeex.so* ${IDIR_LIBSPEEX}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libspeex*.so* ${IDIR_LIBSPEEX}/usr/lib/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/squid/Makefile b/package/squid/Makefile
index a10de02ac..84e8b30f1 100644
--- a/package/squid/Makefile
+++ b/package/squid/Makefile
@@ -16,8 +16,6 @@ PKG_SITES:=		http://www.squid-cache.org/Versions/v3/3.4/
 PKG_MULTI:=		1
 PKG_NEED_CXX:=		1
 
-PKG_ARCH_DEPENDS:=	!avr32
-
 PKG_SUBPKGS:=		SQUID SQUID_MOD_BASIC_AUTH_GETPWNAM SQUID_MOD_BASIC_AUTH_NCSA
 PKG_SUBPKGS+=		SQUID_MOD_BASIC_AUTH_SMB SQUID_MOD_DIGEST_AUTH_FILE
 PKG_SUBPKGS+=		SQUID_MOD_EXTERNAL_ACL_FILE_USERIP SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP
diff --git a/package/strace/Makefile b/package/strace/Makefile
index b0dc32eb9..1908419af 100644
--- a/package/strace/Makefile
+++ b/package/strace/Makefile
@@ -12,8 +12,6 @@ PKG_SECTION:=		debug
 PKG_DEPENDS:=		libgcc
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=strace/}
 
-PKG_ARCH_DEPENDS:=	!avr32
-
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
 
 include ${TOPDIR}/mk/package.mk
@@ -25,6 +23,9 @@ TARGET_CFLAGS+=		-static
 endif
 ifeq ($(ADK_TARGET_LIB_MUSL),y)
 TARGET_CPPFLAGS+=	-DMSG_EXCEPT=020000 -D_LARGEFILE64_SOURCE=1
+ifeq ($(ADK_LINUX_PPC),y)
+TARGET_CPPFLAGS+=	-Dsigcontext_struct=sigcontext -include ppc-regs.h
+endif
 endif
 
 INSTALL_STYLE:=		manual
diff --git a/package/strace/patches/patch-defs_h b/package/strace/patches/patch-defs_h
index d4a359ef4..c5687b457 100644
--- a/package/strace/patches/patch-defs_h
+++ b/package/strace/patches/patch-defs_h
@@ -1,5 +1,5 @@
 --- strace-4.8.orig/defs.h	2013-05-14 16:10:42.000000000 +0200
-+++ strace-4.8/defs.h	2013-10-25 13:21:18.000000000 +0200
++++ strace-4.8/defs.h	2014-01-15 12:10:01.000000000 +0100
 @@ -37,6 +37,28 @@
  # endif
  #endif
@@ -42,7 +42,7 @@
  # include <sys/ptrace.h>
  # undef ptrace
 -# ifdef POWERPC
-+# if defined(POWERPC) || defined(ARM)
++# if defined(ARM)
  #  define __KERNEL__
  #  include <asm/ptrace.h>
  #  undef __KERNEL__
diff --git a/package/strace/patches/patch-process_c b/package/strace/patches/patch-process_c
index 3384b1f4f..b48adddd4 100644
--- a/package/strace/patches/patch-process_c
+++ b/package/strace/patches/patch-process_c
@@ -1,5 +1,5 @@
 --- strace-4.8.orig/process.c	2013-05-18 00:22:19.000000000 +0200
-+++ strace-4.8/process.c	2013-10-25 13:17:58.000000000 +0200
++++ strace-4.8/process.c	2014-01-15 12:21:31.000000000 +0100
 @@ -55,19 +55,6 @@
  # endif
  #endif
diff --git a/package/strace/src/linux/crisv10/syscallent.h b/package/strace/src/linux/crisv10/syscallent.h
deleted file mode 100644
index d8dd9f7ab..000000000
--- a/package/strace/src/linux/crisv10/syscallent.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "i386/syscallent.h"
diff --git a/package/strace/src/linux/crisv32/ioctlent.h.in b/package/strace/src/linux/crisv32/ioctlent.h.in
deleted file mode 100644
index 52ac99ba0..000000000
--- a/package/strace/src/linux/crisv32/ioctlent.h.in
+++ /dev/null
@@ -1 +0,0 @@
-#include "../i386/ioctlent.h.in"
diff --git a/package/strace/src/linux/crisv32/syscallent.h b/package/strace/src/linux/crisv32/syscallent.h
deleted file mode 100644
index d8dd9f7ab..000000000
--- a/package/strace/src/linux/crisv32/syscallent.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "i386/syscallent.h"
diff --git a/package/strace/src/ppc-regs.h b/package/strace/src/ppc-regs.h
new file mode 100644
index 000000000..78cc06bbe
--- /dev/null
+++ b/package/strace/src/ppc-regs.h
@@ -0,0 +1,49 @@
+#define PT_R0 0
+#define PT_R1 1
+#define PT_R2 2
+#define PT_R3 3
+#define PT_R4 4
+#define PT_R5 5
+#define PT_R6 6
+#define PT_R7 7
+#define PT_R8 8
+#define PT_R9 9
+#define PT_R10 10
+#define PT_R11 11
+#define PT_R12 12
+#define PT_R13 13
+#define PT_R14 14
+#define PT_R15 15
+#define PT_R16 16
+#define PT_R17 17
+#define PT_R18 18
+#define PT_R19 19
+#define PT_R20 20
+#define PT_R21 21
+#define PT_R22 22
+#define PT_R23 23
+#define PT_R24 24
+#define PT_R25 25
+#define PT_R26 26
+#define PT_R27 27
+#define PT_R27 27
+#define PT_R28 28
+#define PT_R29 29
+#define PT_R30 30
+#define PT_R31 31
+#define PT_NIP 32
+#define PT_MSR 33
+#define PT_ORIG_R3 34
+#define PT_CTR 35
+#define PT_LNK 36
+#define PT_XER 37
+#define PT_CCR 38
+#define PT_MQ 39
+#define PT_TRAP 40
+#define PT_DAR 41
+#define PT_DSISR 42
+#define PT_RESULT 43
+#define PT_REGS_COUNT 44
+#define PT_FPR0 48
+#define PT_FPR31 (PT_FPR0 + 2*31)
+#define PT_FPSCR (PT_FPR0 + 2*32 + 1) 
diff --git a/package/systemd/Makefile b/package/systemd/Makefile
index 11ae586ae..5fe43a086 100644
--- a/package/systemd/Makefile
+++ b/package/systemd/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		systemd
 PKG_VERSION:=		208
-PKG_RELEASE:=		3
+PKG_RELEASE:=		4
 PKG_MD5SUM:=		df64550d92afbffb4f67a434193ee165
 PKG_DESCR:=		System and Service Manager
 PKG_SECTION:=		utils
@@ -14,28 +14,13 @@ PKG_BUILDDEP:=		autotool usbutils glib kmod util-linux libcap
 PKG_BUILDDEP+=		libgcrypt gperf-host
 PKG_URL:=		http://freedesktop.org/wiki/Software/systemd/
 PKG_SITES:=		http://www.freedesktop.org/software/systemd/
-PKG_LIBNAME:=		libudev
-PKG_OPTS:=		dev
 
 PKG_LIBC_DEPENDS:=	eglibc glibc
-PKG_SUBPKGS:=		UDEV LIBUDEV LIBGUDEV
-PKGSC_LIBGUDEV:=	libs
-PKGSD_LIBGUDEV:=	GUDEV library
-PKGSC_LIBUDEV:=		libs
-PKGSD_LIBUDEV:=		UDEV library
-PKGSD_UDEV:=		Dynamic device management subsystem
-
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
 
-ifeq ($(ADK_STATIC),y)
-PKG_OPTS+=		libmix
-endif
-
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,UDEV,udev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBUDEV,libudev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,LIBGUDEV,libgudev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,SYSTEMD,systemd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 AUTOTOOL_STYLE:=	autoreconf
 TARGET_LDFLAGS+=	-lrt
@@ -45,19 +30,7 @@ CONFIGURE_ARGS+=	--disable-static \
 			--disable-manpages \
 			--disable-polkit
 
-udev-install:
-	${INSTALL_DIR} ${IDIR_UDEV}/usr/bin ${IDIR_UDEV}/etc/udev
-	${INSTALL_DIR} ${IDIR_UDEV}/usr/lib/udev
-	${CP} ${WRKINST}/etc/udev/* ${IDIR_UDEV}/etc/udev
-	${CP} ${WRKINST}/usr/lib/udev/* ${IDIR_UDEV}/usr/lib/udev
-	${CP} ${WRKINST}/usr/bin/udevadm ${IDIR_UDEV}/usr/bin
-
-libudev-install:
-	${INSTALL_DIR} ${IDIR_LIBUDEV}/usr/lib
-	$(CP) $(WRKINST)/usr/lib/libudev.so* $(IDIR_LIBUDEV)/usr/lib
-
-libgudev-install:
-	${INSTALL_DIR} ${IDIR_LIBGUDEV}/usr/lib
-	$(CP) $(WRKINST)/usr/lib/libgudev*.so* $(IDIR_LIBGUDEV)/usr/lib
+# TODO
+systemd-install:
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/tcl/Makefile b/package/tcl/Makefile
index f45317d8f..df231ffdc 100644
--- a/package/tcl/Makefile
+++ b/package/tcl/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		tcl
 PKG_VERSION:=		8.5.9
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		8512d8db3233041dd68a81476906012a
 PKG_DESCR:=		TCL scripting language
 PKG_SECTION:=		lang
diff --git a/package/tcl/patches/patch-generic_tcl_h b/package/tcl/patches/patch-generic_tcl_h
new file mode 100644
index 000000000..6263ba8f1
--- /dev/null
+++ b/package/tcl/patches/patch-generic_tcl_h
@@ -0,0 +1,11 @@
+--- tcl8.5.9.orig/generic/tcl.h	2010-08-04 19:02:39.000000000 +0200
++++ tcl8.5.9/generic/tcl.h	2014-01-20 11:18:37.000000000 +0100
+@@ -19,6 +19,8 @@
+ #ifndef _TCL
+ #define _TCL
+ 
++#include <sys/stat.h>
++
+ /*
+  * For C++ compilers, use extern "C"
+  */
diff --git a/package/tcl/patches/patch-unix_Makefile_in b/package/tcl/patches/patch-unix_Makefile_in
index 7c4a9ca93..38340c80b 100644
--- a/package/tcl/patches/patch-unix_Makefile_in
+++ b/package/tcl/patches/patch-unix_Makefile_in
@@ -1,5 +1,5 @@
---- tcl8.5.8.orig/unix/Makefile.in	2009-11-13 19:38:45.000000000 +0100
-+++ tcl8.5.8/unix/Makefile.in	2009-11-20 21:59:51.000000000 +0100
+--- tcl8.5.9.orig/unix/Makefile.in	2010-09-08 19:40:48.000000000 +0200
++++ tcl8.5.9/unix/Makefile.in	2014-01-20 11:13:05.000000000 +0100
 @@ -101,7 +101,8 @@ CFLAGS_OPTIMIZE		= @CFLAGS_OPTIMIZE@
  #CFLAGS			= $(CFLAGS_DEBUG)
  #CFLAGS			= $(CFLAGS_OPTIMIZE)
@@ -10,7 +10,7 @@
  
  # Flags to pass to the linker
  LDFLAGS_DEBUG		= @LDFLAGS_DEBUG@
-@@ -745,7 +746,7 @@ install-binaries: binaries
+@@ -737,7 +738,7 @@ install-binaries: binaries
  	fi
  	@EXTRA_INSTALL_BINARIES@
  
diff --git a/package/tcl/patches/patch-unix_configure b/package/tcl/patches/patch-unix_configure
index 393c2b45e..380b8d591 100644
--- a/package/tcl/patches/patch-unix_configure
+++ b/package/tcl/patches/patch-unix_configure
@@ -1,6 +1,6 @@
---- tcl8.5.8.orig/unix/configure	2009-11-13 19:38:45.000000000 +0100
-+++ tcl8.5.8/unix/configure	2011-01-13 16:22:59.000000000 +0100
-@@ -7968,9 +7968,6 @@ fi
+--- tcl8.5.9.orig/unix/configure	2010-09-08 19:40:48.000000000 +0200
++++ tcl8.5.9/unix/configure	2014-01-20 11:13:05.000000000 +0100
+@@ -7983,9 +7983,6 @@ fi
  	    LD_SEARCH_FLAGS=""
  	    LD_LIBRARY_PATH_VAR="DYLD_LIBRARY_PATH"
  
@@ -10,7 +10,7 @@
  
  	    PLAT_OBJS='${MAC_OSX_OBJS}'
  	    PLAT_SRCS='${MAC_OSX_SRCS}'
-@@ -17646,11 +17643,6 @@ _ACEOF
+@@ -17578,11 +17575,6 @@ _ACEOF
  
  
  cat >>confdefs.h <<\_ACEOF
@@ -22,7 +22,7 @@
  #define TCL_WIDE_CLICKS 1
  _ACEOF
  
-@@ -18817,7 +18809,7 @@ HTML_DIR='$(DISTDIR)/html'
+@@ -18749,7 +18741,7 @@ HTML_DIR='$(DISTDIR)/html'
  # AIX remembers this path and will attempt to use it at run-time to look
  # up the Tcl library.
  
diff --git a/package/tntnet/Makefile b/package/tntnet/Makefile
index 923f350dc..109f13963 100644
--- a/package/tntnet/Makefile
+++ b/package/tntnet/Makefile
@@ -15,7 +15,7 @@ PKG_URL:=		http://www.tntnet.org/
 PKG_SITES:=		http://www.tntnet.org/download/
 PKG_NEED_CXX:=		1
 
-PKG_ARCH_DEPENDS:=	!arm !avr32 !m68k
+PKG_ARCH_DEPENDS:=	!arm !m68k
 
 PKG_CHOICES_TNTNET:=	WITHOUT_SSL WITH_OPENSSL WITH_GNUTLS
 PKGCD_WITHOUT_SSL:=	use no SSL
diff --git a/package/twm/Makefile b/package/twm/Makefile
index d24a87a44..25688d14f 100644
--- a/package/twm/Makefile
+++ b/package/twm/Makefile
@@ -15,7 +15,7 @@ PKG_URL:=		http://xorg.freedesktop.org/
 PKG_SITES:=		http://xorg.freedesktop.org/archive/individual/app/
 PKG_NEED_CXX:=		1
 
-PKG_ARCH_DEPENDS:=	!cris !avr32 !m68k
+PKG_ARCH_DEPENDS:=	!m68k
 
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/uclibc++/Makefile b/package/uclibc++/Makefile
index 13c153e83..5878f7a70 100644
--- a/package/uclibc++/Makefile
+++ b/package/uclibc++/Makefile
@@ -31,9 +31,6 @@ MAKE_FLAGS+=		TOPDIR="${WRKBUILD}/" \
 			${TARGET_CONFIGURE_OPTS} \
 			ARCH_CFLAGS="${TARGET_CFLAGS}" \
 			CROSS="${TARGET_CROSS}"
-ifeq ($(ADK_LINUX_AVR32),y)
-MAKE_FLAGS+=		check_as_needed=
-endif
 TARGET_CONFIGURE_OPTS=
 
 do-configure:
diff --git a/package/upower/Makefile b/package/upower/Makefile
index adf317802..99c721879 100644
--- a/package/upower/Makefile
+++ b/package/upower/Makefile
@@ -5,17 +5,15 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		upower
 PKG_VERSION:=		0.99.0
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		14f43bc13353e23e7280863f33ac50d2
 PKG_DESCR:=		powermanagement
 PKG_SECTION:=		misc
-PKG_BUILDDEP:=		glib dbus-glib polkit systemd
+PKG_BUILDDEP:=		glib dbus-glib polkit eudev
 PKG_DEPENDS:=		glib dbus-glib polkit libgudev
 PKG_URL:=		http://upower.freedesktop.org/
 PKG_SITES:=		http://upower.freedesktop.org/releases/
 
-PKG_LIBC_DEPENDS:=	eglibc glibc
-
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.xz
 
 include $(TOPDIR)/mk/package.mk
@@ -38,5 +36,8 @@ upower-install:
 	$(INSTALL_DIR) $(IDIR_UPOWER)/usr/bin
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/upower \
 		$(IDIR_UPOWER)/usr/bin
+	$(INSTALL_DIR) $(IDIR_UPOWER)/usr/share/dbus-1
+	$(CP) $(WRKINST)/usr/share/dbus-1/* \
+		$(IDIR_UPOWER)/usr/share/dbus-1
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/usbutils/Makefile b/package/usbutils/Makefile
index ce0b0b31e..09a0102ca 100644
--- a/package/usbutils/Makefile
+++ b/package/usbutils/Makefile
@@ -13,8 +13,6 @@ PKG_DEPENDS:=		libusb libusb-compat libpthread zlib librt libgcc
 PKG_BUILDDEP:=		libusb libusb-compat zlib
 PKG_SITES:=		http://www.kernel.org/pub/linux/utils/usb/usbutils/
 
-PKG_ARCH_DEPENDS:=	!avr32
-
 PKG_SUBPKGS:=		LSUSB
 
 include ${TOPDIR}/mk/package.mk
diff --git a/package/ussp-push/Makefile b/package/ussp-push/Makefile
index a0302f016..c10b1ee5e 100644
--- a/package/ussp-push/Makefile
+++ b/package/ussp-push/Makefile
@@ -14,8 +14,6 @@ PKG_BUILDDEP:=		openobex
 PKG_SITES:=		http://xmailserver.org/
 PKG_CFLINE_USSP_PUSH:=	depends on ADK_BROKEN
 
-PKG_ARCH_DEPENDS:=	!avr32
-
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,USSP_PUSH,ussp-push,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/vlc/Makefile b/package/vlc/Makefile
index 790b5e210..cab09241a 100644
--- a/package/vlc/Makefile
+++ b/package/vlc/Makefile
@@ -14,7 +14,7 @@ PKG_DEPENDS:=		libffmpeg xcb-util libtheora libgcrypt
 PKG_URL:=		http://www.videolan.org/vlc/
 PKG_SITES:=		http://download.videolan.org/pub/videolan/vlc/$(PKG_VERSION)/
 
-PKG_ARCH_DEPENDS:=	!cris !avr32 !m68k
+PKG_ARCH_DEPENDS:=	!m68k
 PKG_LIBC_DEPENDS:=	eglibc glibc musl
 
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.xz
diff --git a/package/weechat/Makefile b/package/weechat/Makefile
index e5b67dd00..4f20654c9 100644
--- a/package/weechat/Makefile
+++ b/package/weechat/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		weechat
 PKG_VERSION:=		0.4.2
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		fd584c258aace2aa898f40e1fcf06084
 PKG_DESCR:=		lightweight IRC client
 PKG_SECTION:=		chat
@@ -20,6 +20,7 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,WEECHAT,weechat,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 AUTOTOOL_STYLE:=	autoreconf
+TARGET_LDFLAGS+=	-ltinfo
 CONFIGURE_ARGS+=	--with-debug=0 \
 			--disable-perl \
 			--disable-python \
diff --git a/package/xbmc/Makefile b/package/xbmc/Makefile
index 71ead8b7e..05026e12b 100644
--- a/package/xbmc/Makefile
+++ b/package/xbmc/Makefile
@@ -5,31 +5,34 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		xbmc
 PKG_VERSION:=		12.3
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		7ae385ebf8e5cfcb917393235e6efbdb
 PKG_DESCR:=		software media player
 PKG_SECTION:=		multimedia
-PKG_DEPENDS:=		boost libffmpeg python2 libstdcxx bcm2835-vc
-PKG_DEPENDS+=		libglew mesalib libass libmpeg2 libmad dbus
+PKG_DEPENDS:=		boost libffmpeg python2 libstdcxx
+PKG_DEPENDS+=		libglew mesalib libass libmpeg2 libmad libdbus
 PKG_DEPENDS+=		libjpeg-turbo libogg libvorbis libmodplug libcurl
 PKG_DEPENDS+=		libflac libopenssl libbz2 libtiff liblzo
 PKG_DEPENDS+=		yajl tinyxml libsqlite libpcrecpp libpng
 PKG_DEPENDS+=		libpcre libcdio libfreetype libsamplerate
 PKG_DEPENDS+=		taglib libjasper libmp3lame libmicrohttpd
-PKG_DEPENDS+=		omxplayer libbluray libgpg-error libudev
+PKG_DEPENDS+=		libbluray libgpg-error libudev python2-mod-sqlite
 PKG_DEPENDS+=		libssh libcec libnfs librtmp samba-lib libncurses
 PKG_BUILDDEP:=		autotool boost ffmpeg python2 MesaLib libglew libass
 PKG_BUILDDEP+=		libmpeg2 libmad libjpeg-turbo libogg libvorbis libmodplug
 PKG_BUILDDEP+=		curl flac openssl bzip2 libtiff liblzo yajl
 PKG_BUILDDEP+=		tinyxml sqlite pcre libpng libcdio freetype 
 PKG_BUILDDEP+=		libsamplerate taglib libjasper lame libmicrohttpd
-PKG_BUILDDEP+=		bcm2835-vc libgpg-error libbluray dbus
-PKG_BUILDDEP+=		libssh libcec libnfs samba rtmpdump systemd
+PKG_BUILDDEP+=		libssh libcec libnfs samba rtmpdump eudev
+PKG_BUILDDEP+=		libgpg-error libbluray dbus
 PKG_BUILDDEP+=		swig-host sdl-host sdl-image-host liblzo-host
 PKG_URL:=		http://xbmc.org/
 PKG_SITES:=		http://mirrors.xbmc.org/releases/source/
 
-PKG_SYSTEM_DEPENDS:=	raspberry-pi
+PKG_DEPENDS_RASPBERRY_PI:=	bcm2835-vc omxplayer
+PKG_BUILDDEP_RASPBERRY_PI:=	bcm2835-vc omxplayer
+PKG_BUILDDEP_IBM_X40:=	nasm-host
+PKG_SYSTEM_DEPENDS:=	raspberry-pi ibm-x40
 PKG_LIBC_DEPENDS:=	eglibc glibc musl
 
 WRKDIST=		$(WRKDIR)/$(PKG_NAME)-$(PKG_VERSION)-Frodo
@@ -41,12 +44,15 @@ $(eval $(call PKG_template,XBMC,xbmc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS
 XAKE_FLAGS+=		V=1 TIXML_USE_STL=1
 XAKE_FLAGS+=		GCC_HONOUR_COPTS=s
 TARGET_CPPFLAGS+=	-I$(STAGING_DIR)/usr/include/boost-1_55 \
-			-DTIXML_USE_STL=1 \
-			-I$(STAGING_DIR)/opt/vc/include \
+			-DTIXML_USE_STL=1 -DHAS_SIMPLEPM=1
+
+ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
+TARGET_CPPFLAGS+=	-I$(STAGING_DIR)/opt/vc/include \
 			-I$(STAGING_DIR)/opt/vc/include/interface/vcos/pthreads \
 			-I$(STAGING_DIR)/opt/vc/include/interface/vmcs_host/linux
-TARGET_LDFLAGS+=	-L$(STAGING_DIR)/opt/vc/lib -lkhrn_static \
-			-L$(STAGING_DIR)/usr/lib/samba
+TARGET_LDFLAGS+=	-L$(STAGING_DIR)/opt/vc/lib -lkhrn_static
+endif
+
 AUTOTOOL_STYLE:=	autoreconf
 CONFIGURE_ENV+=		DESTDIR='${WRKINST}' \
 			TEXTUREPACKER_NATIVE_ROOT='$(STAGING_HOST_DIR)/usr'
@@ -58,20 +64,25 @@ CONFIGURE_ARGS+=	--disable-optical-drive \
 			--enable-udev \
 			--enable-libbluray \
 			--enable-external-libraries \
-			--enable-player=omxplayer \
-			--enable-gles \
 			--enable-rtmp \
 			--disable-libusb \
 			--disable-libcap \
 			--disable-sdl \
 			--disable-joystick \
 			--disable-dvdcss \
-			--disable-x11 \
-			--disable-debug \
-			--with-platform=raspberry-pi
+			--disable-debug
+
+ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
+CONFIGURE_ARGS+=	--with-platform=raspberry-pi \
+			--enable-player=omxplayer \
+			--enable-gles \
+			--disable-x11
+else
+CONFIGURE_ARGS+=	--enable-x11
+endif
 
 pre-configure:
-	(cd $(WRKBUILD)/lib/cpluff && ./autogen.sh)
+	(cd $(WRKBUILD)/lib/cpluff && env PATH=$(AUTOTOOL_PATH) ./autogen.sh)
 
 xbmc-install:
 	$(INSTALL_DIR) $(IDIR_XBMC)/usr/lib/xbmc
diff --git a/package/xbmc/files/xbmc.init b/package/xbmc/files/xbmc.init
index ed8a49bd6..afb1fd9ac 100644
--- a/package/xbmc/files/xbmc.init
+++ b/package/xbmc/files/xbmc.init
@@ -15,7 +15,7 @@ start)
 	xbmc &
 	;;
 stop)
-	kill $(pgrep -f /usr/bin/xbmc)
+	kill $(pgrep -f /usr/lib/xbmc/xbmc.bin)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/xbmc/patches/001-simplepm.patch b/package/xbmc/patches/001-simplepm.patch
new file mode 100644
index 000000000..41ded94fa
--- /dev/null
+++ b/package/xbmc/patches/001-simplepm.patch
@@ -0,0 +1,144 @@
+diff -Nur xbmc-12.3-Frodo.orig/xbmc/powermanagement/linux/LinuxPowerSyscall.cpp xbmc-12.3-Frodo/xbmc/powermanagement/linux/LinuxPowerSyscall.cpp
+--- xbmc-12.3-Frodo.orig/xbmc/powermanagement/linux/LinuxPowerSyscall.cpp	1970-01-01 01:00:00.000000000 +0100
++++ xbmc-12.3-Frodo/xbmc/powermanagement/linux/LinuxPowerSyscall.cpp	2014-01-10 16:23:32.238217592 +0100
+@@ -0,0 +1,55 @@
++/*
++ *      Copyright (C) 2014 Team XBMC
++ *      http://www.xbmc.org
++ *
++ *  This Program is free software; you can redistribute it and/or modify
++ *  it under the terms of the GNU General Public License as published by
++ *  the Free Software Foundation; either version 2, or (at your option)
++ *  any later version.
++ *
++ *  This Program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with XBMC; see the file COPYING.  If not, see
++ *  <http://www.gnu.org/licenses/>.
++ *
++ */
++ 
++#if defined (_LINUX)
++
++#include <stdlib.h>
++#include "LinuxPowerSyscall.h"
++#include "utils/log.h"
++
++CLinuxPowerSyscall::CLinuxPowerSyscall()
++{ 
++	CLog::Log(LOGINFO, "Selected LinuxPower as PowerSyscall");
++}
++
++CLinuxPowerSyscall::~CLinuxPowerSyscall()
++{ }
++
++bool CLinuxPowerSyscall::Powerdown()
++{
++  system("/sbin/poweroff -F");
++  return 0;
++}
++
++bool CLinuxPowerSyscall::Reboot()
++{
++  system("/sbin/reboot -F");
++  return 0;
++}
++
++int CLinuxPowerSyscall::BatteryLevel(void)
++{ }
++
++bool CLinuxPowerSyscall::PumpPowerEvents(IPowerEventsCallback *callback)
++{    
++  return true;
++}
++
++#endif
+diff -Nur xbmc-12.3-Frodo.orig/xbmc/powermanagement/linux/LinuxPowerSyscall.h xbmc-12.3-Frodo/xbmc/powermanagement/linux/LinuxPowerSyscall.h
+--- xbmc-12.3-Frodo.orig/xbmc/powermanagement/linux/LinuxPowerSyscall.h	1970-01-01 01:00:00.000000000 +0100
++++ xbmc-12.3-Frodo/xbmc/powermanagement/linux/LinuxPowerSyscall.h	2014-01-10 14:57:23.365205874 +0100
+@@ -0,0 +1,44 @@
++#pragma once
++/*
++ *      Copyright (C) 2014 Team XBMC
++ *      http://www.xbmc.org
++ *
++ *  This Program is free software; you can redistribute it and/or modify
++ *  it under the terms of the GNU General Public License as published by
++ *  the Free Software Foundation; either version 2, or (at your option)
++ *  any later version.
++ *
++ *  This Program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with XBMC; see the file COPYING.  If not, see
++ *  <http://www.gnu.org/licenses/>.
++ *
++ */
++
++#if defined (_LINUX)
++#include "powermanagement/IPowerSyscall.h"
++
++class CLinuxPowerSyscall : public CPowerSyscallWithoutEvents
++{
++public:
++  CLinuxPowerSyscall();
++  ~CLinuxPowerSyscall();
++
++  virtual bool Powerdown();
++  virtual bool Suspend(void) { return false; }
++  virtual bool Hibernate(void) { return false; }
++  virtual bool Reboot();
++
++  virtual bool CanPowerdown(void) { return true; }
++  virtual bool CanSuspend(void) { return false; }
++  virtual bool CanHibernate(void) { return false; }
++  virtual bool CanReboot(void) { return true; }
++  virtual int  BatteryLevel(void);
++
++  virtual bool PumpPowerEvents(IPowerEventsCallback *callback);
++};
++#endif
+diff -Nur xbmc-12.3-Frodo.orig/xbmc/powermanagement/linux/Makefile xbmc-12.3-Frodo/xbmc/powermanagement/linux/Makefile
+--- xbmc-12.3-Frodo.orig/xbmc/powermanagement/linux/Makefile	2013-12-12 22:47:49.000000000 +0100
++++ xbmc-12.3-Frodo/xbmc/powermanagement/linux/Makefile	2014-01-10 14:27:13.411383558 +0100
+@@ -2,7 +2,8 @@
+      ConsoleUPowerSyscall.cpp \
+      HALPowerSyscall.cpp \
+      UPowerSyscall.cpp \
+-     SystemdUPowerSyscall.cpp
++     SystemdUPowerSyscall.cpp \
++     LinuxPowerSyscall.cpp
+ 
+ LIB=powermanagement_linux.a
+ 
+diff -Nur xbmc-12.3-Frodo.orig/xbmc/powermanagement/PowerManager.cpp xbmc-12.3-Frodo/xbmc/powermanagement/PowerManager.cpp
+--- xbmc-12.3-Frodo.orig/xbmc/powermanagement/PowerManager.cpp	2013-12-12 22:47:49.000000000 +0100
++++ xbmc-12.3-Frodo/xbmc/powermanagement/PowerManager.cpp	2014-01-14 11:19:11.558337441 +0100
+@@ -46,6 +46,9 @@
+ #include "linux/ConsoleDeviceKitPowerSyscall.h"
+ #include "linux/SystemdUPowerSyscall.h"
+ #include "linux/UPowerSyscall.h"
++#ifdef HAS_SIMPLEPM
++#include "linux/LinuxPowerSyscall.h"
++#endif
+ #ifdef HAS_HAL
+ #include "linux/HALPowerSyscall.h"
+ #endif
+@@ -83,6 +86,10 @@
+     m_instance = new CSystemdUPowerSyscall();
+   else if (CUPowerSyscall::HasUPower())
+     m_instance = new CUPowerSyscall();
++#ifdef HAS_SIMPLEPM
++  else
++    m_instance = new CLinuxPowerSyscall();
++#endif
+ #ifdef HAS_HAL
+   else
+     m_instance = new CHALPowerSyscall();
diff --git a/package/xbmc/patches/002-defaultsutf8.patch b/package/xbmc/patches/002-defaultsutf8.patch
new file mode 100644
index 000000000..fad88800d
--- /dev/null
+++ b/package/xbmc/patches/002-defaultsutf8.patch
@@ -0,0 +1,28 @@
+diff -Nur xbmc-12.3-Frodo.orig/language/English/langinfo.xml xbmc-12.3-Frodo/language/English/langinfo.xml
+--- xbmc-12.3-Frodo.orig/language/English/langinfo.xml	2013-12-12 22:47:49.000000000 +0100
++++ xbmc-12.3-Frodo/language/English/langinfo.xml	2014-01-14 19:34:44.869490320 +0100
+@@ -48,8 +48,8 @@
+ 
+ <language locale="en">
+   <charsets>
+-    <gui>CP1252</gui>
+-    <subtitle>CP1252</subtitle>
++    <gui>UTF-8</gui>
++    <subtitle>UTF-8</subtitle>
+   </charsets>
+ 
+   <dvd>
+diff -Nur xbmc-12.3-Frodo.orig/language/German/langinfo.xml xbmc-12.3-Frodo/language/German/langinfo.xml
+--- xbmc-12.3-Frodo.orig/language/German/langinfo.xml	2013-12-12 22:47:49.000000000 +0100
++++ xbmc-12.3-Frodo/language/German/langinfo.xml	2014-01-14 19:34:20.997392956 +0100
+@@ -2,8 +2,8 @@
+ <language locale="de">
+ 
+   <charsets>
+-    <gui unicodefont="false">CP1252</gui>
+-    <subtitle>CP1252</subtitle>
++    <gui unicodefont="false">UTF-8</gui>
++    <subtitle>UTF-8</subtitle>
+   </charsets>
+ 
+   <dvd>
diff --git a/package/xbmc/patches/patch-tools_Linux_xbmc_sh_in b/package/xbmc/patches/patch-tools_Linux_xbmc_sh_in
index a08eb0a94..9b670449b 100644
--- a/package/xbmc/patches/patch-tools_Linux_xbmc_sh_in
+++ b/package/xbmc/patches/patch-tools_Linux_xbmc_sh_in
@@ -1,5 +1,26 @@
---- xbmc-12.2.orig/tools/Linux/xbmc.sh.in	2013-05-03 07:57:41.000000000 +0200
-+++ xbmc-12.2/tools/Linux/xbmc.sh.in	2013-08-05 16:24:14.000000000 +0200
+--- xbmc-12.3-Frodo.orig/tools/Linux/xbmc.sh.in	2013-12-12 22:47:49.000000000 +0100
++++ xbmc-12.3-Frodo/tools/Linux/xbmc.sh.in	2014-01-14 09:55:27.409527526 +0100
+@@ -52,7 +52,7 @@ single_stacktrace()
+ 
+ print_crash_report()
+ {
+-  FILE="$HOME/xbmc_crashlog-`date +%Y%m%d_%H%M%S`.log"
++  FILE="/tmp/xbmc_crashlog-`date +%Y%m%d_%H%M%S`.log"
+   echo "############## XBMC CRASH LOG ###############" >> $FILE
+   echo >> $FILE
+   echo "################ SYSTEM INFO ################" >> $FILE
+@@ -91,9 +91,9 @@ print_crash_report()
+   echo >> $FILE
+   echo "################# LOG FILE ##################" >> $FILE
+   echo >> $FILE
+-  if [ -f ~/.xbmc/temp/xbmc.log ]
++  if [ -f /tmp/xbmc/xbmc.log ]
+   then
+-    cat ~/.xbmc/temp/xbmc.log >> $FILE
++    cat /tmp/xbmc/xbmc.log >> $FILE
+     echo >> $FILE
+   else
+     echo "Logfile not found in the usual place." >> $FILE
 @@ -107,12 +107,6 @@ print_crash_report()
    echo "Crash report available at $FILE"
  }
diff --git a/package/xf86-input-evdev/Makefile b/package/xf86-input-evdev/Makefile
index 5e5e35d53..d2b28285b 100644
--- a/package/xf86-input-evdev/Makefile
+++ b/package/xf86-input-evdev/Makefile
@@ -10,11 +10,11 @@ PKG_MD5SUM:=		2d3f7111b8284cec81884023c4bb4a11
 PKG_DESCR:=		X11 driver for Event driver
 PKG_SECTION:=		x11/drivers
 PKG_DEPENDS:=		xorg-server kmod-input-evdev libudev
-PKG_BUILDDEP:=		xorg-server systemd
+PKG_BUILDDEP:=		xorg-server eudev
 PKG_SITES:=		${MASTER_SITE_XORG}
 
 PKG_LIBC_DEPENDS:=	eglibc glibc
-PKG_ARCH_DEPENDS:=	!avr32 !m68k
+PKG_ARCH_DEPENDS:=	!m68k
 
 PKG_CFLINE_XF86_INPUT_EVDEV:= depends on ADK_TARGET_WITH_INPUT
 
diff --git a/package/xf86-input-evtouch/Makefile b/package/xf86-input-evtouch/Makefile
index e097c77ae..9e9da4f1c 100644
--- a/package/xf86-input-evtouch/Makefile
+++ b/package/xf86-input-evtouch/Makefile
@@ -14,7 +14,7 @@ PKG_BUILDDEP:=		xorg-server
 PKG_SITES:=		http://www.conan.de/touchscreen/
 PKG_NEED_CXX:=		1
 
-PKG_ARCH_DEPENDS:=      !arm !avr32 !m68k
+PKG_ARCH_DEPENDS:=      !arm !m68k
 PKG_CFLINE_XF86_INPUT_EVTOUCH:=	depends on ADK_TARGET_WITH_INPUT
 
 DISTFILES:= 		${PKG_NAME}-${PKG_VERSION}.tar.bz2
diff --git a/package/xf86-input-keyboard/Makefile b/package/xf86-input-keyboard/Makefile
index ee6a72c83..cca9b2194 100644
--- a/package/xf86-input-keyboard/Makefile
+++ b/package/xf86-input-keyboard/Makefile
@@ -14,7 +14,7 @@ PKG_BUILDDEP:=		xorg-server
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_NEED_CXX:=		1
 
-PKG_ARCH_DEPENDS:=      !avr32 !m68k
+PKG_ARCH_DEPENDS:=      !m68k
 PKG_CFLINE_XF86_INPUT_KEYBOARD:=	depends on ADK_TARGET_WITH_INPUT
 
 include $(TOPDIR)/mk/package.mk
diff --git a/package/xf86-input-mouse/Makefile b/package/xf86-input-mouse/Makefile
index b738e2dd2..f050696f6 100644
--- a/package/xf86-input-mouse/Makefile
+++ b/package/xf86-input-mouse/Makefile
@@ -14,7 +14,7 @@ PKG_BUILDDEP:=		xorg-server
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_NEED_CXX:=		1
 
-PKG_ARCH_DEPENDS:=      !avr32 !m68k
+PKG_ARCH_DEPENDS:=      !m68k
 PKG_CFLINE_XF86_INPUT_MOUSE:=	depends on ADK_TARGET_WITH_INPUT
 
 include $(TOPDIR)/mk/package.mk
diff --git a/package/xf86-video-ati/Makefile b/package/xf86-video-ati/Makefile
index 32c5178f5..ca025734c 100644
--- a/package/xf86-video-ati/Makefile
+++ b/package/xf86-video-ati/Makefile
@@ -9,12 +9,12 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		6bb71cff9ad9c5c7b258b2b6c56fdc95
 PKG_DESCR:=		X11 driver for ATI VGA chip
 PKG_SECTION:=		x11/drivers
-PKG_BUILDDEP:=		xorg-server libdrm xf86driproto MesaLib systemd
+PKG_BUILDDEP:=		xorg-server libdrm xf86driproto MesaLib eudev
 PKG_DEPENDS:=		xorg-server libdrm mesalib libudev
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_NEED_CXX:=		1
 
-PKG_ARCH_DEPENDS:=      !avr32 !arm !m68k
+PKG_ARCH_DEPENDS:=      !arm !m68k
 PKG_CFLINE_XF86_VIDEO_ATI:=depends on ADK_TARGET_WITH_VGA
 
 include $(TOPDIR)/mk/package.mk
diff --git a/package/xf86-video-cirrus/Makefile b/package/xf86-video-cirrus/Makefile
index b285bba94..22179746e 100644
--- a/package/xf86-video-cirrus/Makefile
+++ b/package/xf86-video-cirrus/Makefile
@@ -14,7 +14,7 @@ PKG_BUILDDEP:=		xorg-server autotool util-macros
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_NEED_CXX:=		1
 
-PKG_ARCH_DEPENDS:=	!arm !avr32 !m68k
+PKG_ARCH_DEPENDS:=	!arm !m68k
 PKG_CFLINE_XF86_VIDEO_CIRRUS:=depends on ADK_TARGET_WITH_VGA
 
 include $(TOPDIR)/mk/package.mk
diff --git a/package/xf86-video-fbdev/Makefile b/package/xf86-video-fbdev/Makefile
index 74407d4e9..cf24b3358 100644
--- a/package/xf86-video-fbdev/Makefile
+++ b/package/xf86-video-fbdev/Makefile
@@ -14,7 +14,7 @@ PKG_BUILDDEP:=		xorg-server
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_NEED_CXX:=		1
 
-PKG_ARCH_DEPENDS:=      !avr32 !m68k
+PKG_ARCH_DEPENDS:=      !m68k
 PKG_CFLINE_XF86_VIDEO_FBDEV:=	depends on ADK_TARGET_WITH_VGA
 
 include $(TOPDIR)/mk/package.mk
diff --git a/package/xf86-video-intel/Makefile b/package/xf86-video-intel/Makefile
index dbb22102c..2e68798ae 100644
--- a/package/xf86-video-intel/Makefile
+++ b/package/xf86-video-intel/Makefile
@@ -14,7 +14,7 @@ PKG_BUILDDEP:=		xorg-server libdrm xf86driproto MesaLib
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_NEED_CXX:=		1
 
-PKG_ARCH_DEPENDS:=	!arm !avr32 !m68k
+PKG_ARCH_DEPENDS:=	!arm !m68k
 PKG_CFLINE_XF86_VIDEO_INTEL:=depends on ADK_TARGET_WITH_VGA
 
 include $(TOPDIR)/mk/package.mk
diff --git a/package/xf86-video-siliconmotion/Makefile b/package/xf86-video-siliconmotion/Makefile
index ad3e50e34..84c73e6bd 100644
--- a/package/xf86-video-siliconmotion/Makefile
+++ b/package/xf86-video-siliconmotion/Makefile
@@ -14,7 +14,7 @@ PKG_BUILDDEP:=		xorg-server
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_NEED_CXX:=		1
 
-PKG_ARCH_DEPENDS:=	!arm !avr32 !m68k
+PKG_ARCH_DEPENDS:=	!arm !m68k
 PKG_CFLINE_XF86_VIDEO_SILICONMOTION:=depends on ADK_TARGET_WITH_VGA
 
 include $(TOPDIR)/mk/package.mk
diff --git a/package/xinit/Makefile b/package/xinit/Makefile
index d9988a1e2..bd8d2bf64 100644
--- a/package/xinit/Makefile
+++ b/package/xinit/Makefile
@@ -15,7 +15,7 @@ PKG_URL:=		http://xorg.freedesktop.org/
 PKG_SITES:=		http://xorg.freedesktop.org/archive/individual/app/
 PKG_NEED_CXX:=		1
 
-PKG_ARCH_DEPENDS:=	!cris !avr32 !m68k
+PKG_ARCH_DEPENDS:=	!m68k
 
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile
index 3305779ab..fef274746 100644
--- a/package/xorg-server/Makefile
+++ b/package/xorg-server/Makefile
@@ -23,7 +23,7 @@ PKG_NEED_CXX:=		1
 PKG_OPTS:=		dev
 
 PKG_CFLINE_XORG_SERVER:=depends on ADK_TARGET_WITH_VGA
-PKG_ARCH_DEPENDS:=	!cris !avr32 !m68k
+PKG_ARCH_DEPENDS:=	!m68k
 
 PKG_FLAVOURS_XORG_SERVER:=	WITH_DRI WITH_KDRIVE
 PKGFS_WITH_DRI:=		mesalib
diff --git a/package/xvinfo/Makefile b/package/xvinfo/Makefile
index 0ffc44a1d..0e2ee6b2b 100644
--- a/package/xvinfo/Makefile
+++ b/package/xvinfo/Makefile
@@ -13,8 +13,6 @@ PKG_BUILDDEP:=		libXv
 PKG_URL:=		http://xorg.freedesktop.org/
 PKG_SITES:=		${MASTER_SITE_XORG}
 
-PKG_ARCH_DEPENDS:=	!cris
-
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,XVINFO,xvinfo,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/scripts/adkprepare.sh b/scripts/adkprepare.sh
index b526371ef..022a978c1 100755
--- a/scripts/adkprepare.sh
+++ b/scripts/adkprepare.sh
@@ -34,6 +34,7 @@ openbsd() {
 	pkg_add -v intltool
 	pkg_add -v screen--
 	pkg_add -v vim--no_x11
+	pkg_add -v py-libxml
 }
 
 netbsd() {
diff --git a/scripts/m4 b/scripts/m4
deleted file mode 100755
index 8456bce21..000000000
--- a/scripts/m4
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-if [ -z "$(which gm4 2>/dev/null)" ];then
-	/usr/bin/m4 "$@"
-else
-	gm4 "$@"
-fi
diff --git a/target/arch.lst b/target/arch.lst
index e2b207f5f..8c9a71e0b 100644
--- a/target/arch.lst
+++ b/target/arch.lst
@@ -1,6 +1,4 @@
 arm
-avr32
-cris
 m68k
 microblaze
 mips
diff --git a/target/arm/kernel/raspberry-pi b/target/arm/kernel/raspberry-pi
new file mode 100644
index 000000000..82f9b77a8
--- /dev/null
+++ b/target/arm/kernel/raspberry-pi
@@ -0,0 +1,17 @@
+CONFIG_ARM=y
+CONFIG_FIQ=y
+CONFIG_ARM_PATCH_PHYS_VIRT=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_TREE_PREEMPT_RCU=y
+CONFIG_PREEMPT_RCU=y
+CONFIG_ARCH_BCM2708=y
+CONFIG_MACH_BCM2708=y
+CONFIG_BCM2708_GPIO=y
+CONFIG_BCM2708_VCMEM=y
+CONFIG_BCM2708_DMAER=y
+CONFIG_PREEMPT=y
+CONFIG_AEABI=y
+CONFIG_VFP=y
+CONFIG_DTC=y
+CONFIG_OF=y
+CONFIG_BCM2708_VCHIQ=y
diff --git a/target/arm/sys-available/acmesystems-foxg20 b/target/arm/sys-available/acmesystems-foxg20
index 8ea196d97..527a31ebb 100644
--- a/target/arm/sys-available/acmesystems-foxg20
+++ b/target/arm/sys-available/acmesystems-foxg20
@@ -15,6 +15,7 @@ config ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
 	select ADK_TARGET_WITH_RTC
 	select ADK_TARGET_WITH_USB
 	select ADK_TARGET_KERNEL_IMAGE
+	depends on ADK_BROKEN
 	help
 	  Acme Systems Foxboard FOXG20
 
diff --git a/target/arm/sys-available/raspberry-pi b/target/arm/sys-available/raspberry-pi
index 3fa60178e..9fd1c1b2a 100644
--- a/target/arm/sys-available/raspberry-pi
+++ b/target/arm/sys-available/raspberry-pi
@@ -3,10 +3,6 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI
 	select ADK_arm
 	select ADK_little
 	select ADK_raspberry_pi
-	select ADK_KERNEL_ARCH_BCM2708
-	select ADK_KERNEL_AEABI
-	select ADK_KERNEL_PREEMPT
-	select ADK_KERNEL_VFP
 	select ADK_EABIHF
 	select ADK_CPU_RASPBERRY_PI
 	select ADK_TARGET_WITH_MMC
@@ -15,6 +11,7 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI
 	select ADK_TARGET_WITH_INPUT
 	select ADK_PACKAGE_BCM2835_FIRMWARE
 	select ADK_TARGET_KERNEL_ZIMAGE
+	select ADK_USE_KERNEL_MINICONFIG
 	help
 	  Raspberry PI
 
diff --git a/target/avr32/Config.in b/target/avr32/Config.in
deleted file mode 100644
index d00c57b8f..000000000
--- a/target/avr32/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-choice
-depends on ADK_LINUX_AVR32 && !ADK_CHOOSE_TARGET_ARCH
-prompt "Target system"
-
-config ADK_CHOOSE_TARGET_SYSTEM_AVR32
-        boolean "Choose target system"
-
-source "target/avr32/Config.in.systems"
-endchoice
diff --git a/target/avr32/Makefile b/target/avr32/Makefile
deleted file mode 100644
index f33b0d854..000000000
--- a/target/avr32/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include $(TOPDIR)/rules.mk
-include $(TOPDIR)/mk/kernel.mk
-include $(TOPDIR)/mk/modules.mk
-include $(TOPDIR)/mk/kernel-build.mk
-include $(TOPDIR)/mk/image.mk
-
-KERNEL:=$(LINUX_DIR)/arch/avr32/boot/images/uImage
-
-ifeq ($(ADK_TARGET_FS),archive)
-imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
-	@cp $(KERNEL) $(BIN_DIR)/${TARGET_KERNEL}
-	@echo 'The kernel file is: $(BIN_DIR)/${TARGET_KERNEL}'
-	@echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)"
-endif
-ifeq ($(ADK_TARGET_FS),initramfs)
-imageinstall: $(BIN_DIR)/$(INITRAMFS)
-	@cp $(KERNEL) $(BIN_DIR)/$(TARGET_KERNEL)
-	@echo 'The kernel file is: $(BIN_DIR)/${TARGET_KERNEL}'
-	@echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}'
-endif
-ifeq ($(ADK_TARGET_FS),initramfs-piggyback)
-imageinstall: createinitramfs
-	@cp $(KERNEL) $(BIN_DIR)/${TARGET_KERNEL}
-	@echo 'The kernel+initramfs file is: $(BIN_DIR)/${TARGET_KERNEL}'
-endif
-ifeq ($(ADK_TARGET_FS),nfsroot)
-imageinstall: $(BIN_DIR)/$(ROOTFSUSERTARBALL)
-	@cp $(KERNEL) $(BIN_DIR)/$(TARGET_KERNEL)
-	@echo 'The kernel file is: $(BIN_DIR)/${TARGET_KERNEL}'
-	@echo 'The nfs root tarball is: ${BIN_DIR}/${ROOTFSUSERTARBALL}'
-	@echo 'Type dhcp via u-boot prompt to load kernel'
-	@echo 'After that type bootm to load the kernel'
-endif
diff --git a/target/avr32/kernel.config b/target/avr32/kernel.config
deleted file mode 100644
index c837d501f..000000000
--- a/target/avr32/kernel.config
+++ /dev/null
@@ -1,785 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Linux/avr32 2.6.39 Kernel Configuration
-# Sun Aug 28 11:53:37 2011
-#
-CONFIG_AVR32=y
-CONFIG_GENERIC_GPIO=y
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_GENERIC_BUG=y
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-CONFIG_CONSTRUCTORS=y
-
-#
-# General setup
-#
-CONFIG_EXPERIMENTAL=y
-CONFIG_BROKEN_ON_SMP=y
-CONFIG_INIT_ENV_ARG_LIMIT=32
-CONFIG_CROSS_COMPILE=""
-CONFIG_LOCALVERSION=""
-# CONFIG_LOCALVERSION_AUTO is not set
-# CONFIG_SWAP is not set
-CONFIG_SYSVIPC=y
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_POSIX_MQUEUE_SYSCTL=y
-# CONFIG_BSD_PROCESS_ACCT is not set
-# CONFIG_FHANDLE is not set
-# CONFIG_TASKSTATS is not set
-# CONFIG_AUDIT is not set
-CONFIG_HAVE_GENERIC_HARDIRQS=y
-
-#
-# IRQ subsystem
-#
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_IRQ_SHOW=y
-CONFIG_HARDIRQS_SW_RESEND=y
-
-#
-# RCU Subsystem
-#
-CONFIG_TINY_RCU=y
-# CONFIG_PREEMPT_RCU is not set
-# CONFIG_RCU_TRACE is not set
-# CONFIG_TREE_RCU_TRACE is not set
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_LOG_BUF_SHIFT=15
-# CONFIG_CGROUPS is not set
-# CONFIG_NAMESPACES is not set
-# CONFIG_SCHED_AUTOGROUP is not set
-# CONFIG_SYSFS_DEPRECATED is not set
-# CONFIG_RELAY is not set
-# CONFIG_BLK_DEV_INITRD is not set
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_SYSCTL=y
-CONFIG_ANON_INODES=y
-CONFIG_EXPERT=y
-CONFIG_SYSCTL_SYSCALL=y
-# CONFIG_KALLSYMS is not set
-CONFIG_HOTPLUG=y
-CONFIG_PRINTK=y
-CONFIG_BUG=y
-# CONFIG_ELF_CORE is not set
-# CONFIG_BASE_FULL is not set
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-CONFIG_SIGNALFD=y
-CONFIG_TIMERFD=y
-CONFIG_EVENTFD=y
-CONFIG_SHMEM=y
-CONFIG_AIO=y
-CONFIG_EMBEDDED=y
-
-#
-# Kernel Performance Events And Counters
-#
-# CONFIG_VM_EVENT_COUNTERS is not set
-# CONFIG_COMPAT_BRK is not set
-CONFIG_SLAB=y
-# CONFIG_SLUB is not set
-# CONFIG_SLOB is not set
-# CONFIG_PROFILING is not set
-CONFIG_HAVE_OPROFILE=y
-# CONFIG_KPROBES is not set
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_CLK=y
-
-#
-# GCOV-based kernel profiling
-#
-# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
-CONFIG_SLABINFO=y
-CONFIG_RT_MUTEXES=y
-CONFIG_BASE_SMALL=1
-CONFIG_MODULES=y
-# CONFIG_MODULE_FORCE_LOAD is not set
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-# CONFIG_MODVERSIONS is not set
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-CONFIG_BLOCK=y
-# CONFIG_LBDAF is not set
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_BLK_DEV_INTEGRITY is not set
-
-#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-# CONFIG_IOSCHED_DEADLINE is not set
-CONFIG_IOSCHED_CFQ=y
-CONFIG_DEFAULT_CFQ=y
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="cfq"
-# CONFIG_INLINE_SPIN_TRYLOCK is not set
-# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
-# CONFIG_INLINE_SPIN_LOCK is not set
-# CONFIG_INLINE_SPIN_LOCK_BH is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
-CONFIG_INLINE_SPIN_UNLOCK=y
-# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_READ_TRYLOCK is not set
-# CONFIG_INLINE_READ_LOCK is not set
-# CONFIG_INLINE_READ_LOCK_BH is not set
-# CONFIG_INLINE_READ_LOCK_IRQ is not set
-# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
-CONFIG_INLINE_READ_UNLOCK=y
-# CONFIG_INLINE_READ_UNLOCK_BH is not set
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_WRITE_TRYLOCK is not set
-# CONFIG_INLINE_WRITE_LOCK is not set
-# CONFIG_INLINE_WRITE_LOCK_BH is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
-CONFIG_INLINE_WRITE_UNLOCK=y
-# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
-# CONFIG_MUTEX_SPIN_ON_OWNER is not set
-CONFIG_FREEZER=y
-
-#
-# System Type and features
-#
-# CONFIG_NO_HZ is not set
-# CONFIG_HIGH_RES_TIMERS is not set
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_SUBARCH_AVR32B=y
-CONFIG_MMU=y
-CONFIG_PERFORMANCE_COUNTERS=y
-CONFIG_PLATFORM_AT32AP=y
-CONFIG_CPU_AT32AP700X=y
-CONFIG_CPU_AT32AP7000=y
-CONFIG_BOARD_ATNGW100_COMMON=y
-# CONFIG_BOARD_ATSTK1000 is not set
-CONFIG_BOARD_ATNGW100_MKI=y
-# CONFIG_BOARD_ATNGW100_MKII is not set
-# CONFIG_BOARD_HAMMERHEAD is not set
-# CONFIG_BOARD_FAVR_32 is not set
-# CONFIG_BOARD_MERISC is not set
-# CONFIG_BOARD_MIMC200 is not set
-CONFIG_BOARD_ATNGW100_ADDON_NONE=y
-# CONFIG_BOARD_ATNGW100_EVKLCD10X is not set
-# CONFIG_BOARD_ATNGW100_MRMT is not set
-CONFIG_LOADER_U_BOOT=y
-
-#
-# Atmel AVR32 AP options
-#
-# CONFIG_AP700X_32_BIT_SMC is not set
-CONFIG_AP700X_16_BIT_SMC=y
-# CONFIG_AP700X_8_BIT_SMC is not set
-CONFIG_LOAD_ADDRESS=0x10000000
-CONFIG_ENTRY_ADDRESS=0x90000000
-CONFIG_PHYS_OFFSET=0x10000000
-CONFIG_PREEMPT_NONE=y
-# CONFIG_PREEMPT_VOLUNTARY is not set
-# CONFIG_PREEMPT is not set
-CONFIG_QUICKLIST=y
-# CONFIG_HAVE_ARCH_BOOTMEM is not set
-# CONFIG_ARCH_HAVE_MEMORY_PRESENT is not set
-# CONFIG_NEED_NODE_MEMMAP_SIZE is not set
-CONFIG_ARCH_FLATMEM_ENABLE=y
-# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
-# CONFIG_ARCH_SPARSEMEM_ENABLE is not set
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_FLATMEM_MANUAL=y
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_SPLIT_PTLOCK_CPUS=4
-# CONFIG_COMPACTION is not set
-# CONFIG_PHYS_ADDR_T_64BIT is not set
-CONFIG_ZONE_DMA_FLAG=0
-CONFIG_NR_QUICK=2
-CONFIG_VIRT_TO_BUS=y
-# CONFIG_KSM is not set
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-CONFIG_NEED_PER_CPU_KM=y
-# CONFIG_OWNERSHIP_TRACE is not set
-# CONFIG_NMI_DEBUGGING is not set
-# CONFIG_HZ_100 is not set
-CONFIG_HZ_250=y
-# CONFIG_HZ_300 is not set
-# CONFIG_HZ_1000 is not set
-CONFIG_HZ=250
-# CONFIG_SCHED_HRTICK is not set
-CONFIG_CMDLINE="console=ttyS0,115200"
-
-#
-# Power management options
-#
-CONFIG_SUSPEND=y
-CONFIG_SUSPEND_FREEZER=y
-CONFIG_PM_SLEEP=y
-# CONFIG_PM_RUNTIME is not set
-CONFIG_PM=y
-# CONFIG_PM_DEBUG is not set
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-
-#
-# CPU Frequency scaling
-#
-# CONFIG_CPU_FREQ is not set
-
-#
-# Bus options
-#
-# CONFIG_ARCH_SUPPORTS_MSI is not set
-# CONFIG_PCCARD is not set
-
-#
-# Executable file formats
-#
-CONFIG_BINFMT_ELF=y
-# CONFIG_HAVE_AOUT is not set
-# CONFIG_BINFMT_MISC is not set
-CONFIG_NET=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-# CONFIG_NET_KEY is not set
-CONFIG_INET=y
-# CONFIG_IP_MULTICAST is not set
-# CONFIG_IP_ADVANCED_ROUTER is not set
-# CONFIG_IP_PNP is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_IPGRE_DEMUX is not set
-# CONFIG_ARPD is not set
-# CONFIG_SYN_COOKIES is not set
-# CONFIG_INET_AH is not set
-# CONFIG_INET_ESP is not set
-# CONFIG_INET_IPCOMP is not set
-# CONFIG_INET_XFRM_TUNNEL is not set
-# CONFIG_INET_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_LRO is not set
-# CONFIG_INET_DIAG is not set
-# CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
-# CONFIG_TCP_MD5SIG is not set
-# CONFIG_IPV6 is not set
-# CONFIG_NETWORK_SECMARK is not set
-# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
-# CONFIG_NETFILTER is not set
-# CONFIG_IP_DCCP is not set
-# CONFIG_IP_SCTP is not set
-# CONFIG_RDS is not set
-# CONFIG_TIPC is not set
-# CONFIG_ATM is not set
-# CONFIG_L2TP is not set
-# CONFIG_BRIDGE is not set
-# CONFIG_VLAN_8021Q is not set
-# CONFIG_DECNET is not set
-# CONFIG_LLC2 is not set
-# CONFIG_IPX is not set
-# CONFIG_ATALK is not set
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_ECONET is not set
-# CONFIG_WAN_ROUTER is not set
-# CONFIG_PHONET is not set
-# CONFIG_IEEE802154 is not set
-# CONFIG_NET_SCHED is not set
-# CONFIG_DCB is not set
-# CONFIG_BATMAN_ADV is not set
-
-#
-# Network testing
-#
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_HAMRADIO is not set
-# CONFIG_CAN is not set
-# CONFIG_IRDA is not set
-# CONFIG_BT is not set
-# CONFIG_AF_RXRPC is not set
-CONFIG_WIRELESS=y
-# CONFIG_CFG80211 is not set
-# CONFIG_LIB80211 is not set
-
-#
-# CFG80211 needs to be enabled for MAC80211
-#
-# CONFIG_WIMAX is not set
-# CONFIG_RFKILL is not set
-# CONFIG_NET_9P is not set
-# CONFIG_CAIF is not set
-# CONFIG_CEPH_LIB is not set
-
-#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-# CONFIG_STANDALONE is not set
-# CONFIG_PREVENT_FIRMWARE_BUILD is not set
-# CONFIG_FW_LOADER is not set
-# CONFIG_SYS_HYPERVISOR is not set
-# CONFIG_CONNECTOR is not set
-# CONFIG_MTD is not set
-# CONFIG_PARPORT is not set
-# CONFIG_BLK_DEV is not set
-# CONFIG_SENSORS_LIS3LV02D is not set
-# CONFIG_MISC_DEVICES is not set
-
-#
-# SCSI device support
-#
-CONFIG_SCSI_MOD=y
-# CONFIG_RAID_ATTRS is not set
-# CONFIG_SCSI is not set
-# CONFIG_SCSI_DMA is not set
-# CONFIG_SCSI_NETLINK is not set
-# CONFIG_ATA is not set
-# CONFIG_MD is not set
-CONFIG_HAVE_NET_MACB=y
-# CONFIG_NETDEVICES is not set
-# CONFIG_ISDN is not set
-# CONFIG_PHONE is not set
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-# CONFIG_INPUT_FF_MEMLESS is not set
-# CONFIG_INPUT_POLLDEV is not set
-# CONFIG_INPUT_SPARSEKMAP is not set
-
-#
-# Userland interfaces
-#
-# CONFIG_INPUT_MOUSEDEV is not set
-# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_EVDEV is not set
-# CONFIG_INPUT_EVBUG is not set
-
-#
-# Input Device Drivers
-#
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_TABLET is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-# CONFIG_INPUT_MISC is not set
-
-#
-# Hardware I/O ports
-#
-CONFIG_SERIO=y
-# CONFIG_SERIO_I8042 is not set
-# CONFIG_SERIO_SERPORT is not set
-# CONFIG_SERIO_AT32PSIF is not set
-# CONFIG_SERIO_LIBPS2 is not set
-# CONFIG_SERIO_RAW is not set
-# CONFIG_SERIO_ALTERA_PS2 is not set
-# CONFIG_SERIO_PS2MULT is not set
-# CONFIG_GAMEPORT is not set
-
-#
-# Character devices
-#
-CONFIG_VT=y
-# CONFIG_CONSOLE_TRANSLATIONS is not set
-CONFIG_VT_CONSOLE=y
-CONFIG_HW_CONSOLE=y
-# CONFIG_VT_HW_CONSOLE_BINDING is not set
-CONFIG_UNIX98_PTYS=y
-# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_SERIAL_NONSTANDARD is not set
-# CONFIG_N_GSM is not set
-# CONFIG_DEVKMEM is not set
-
-#
-# Serial drivers
-#
-# CONFIG_SERIAL_8250 is not set
-
-#
-# Non-8250 serial port support
-#
-CONFIG_SERIAL_ATMEL=y
-CONFIG_SERIAL_ATMEL_CONSOLE=y
-CONFIG_SERIAL_ATMEL_PDC=y
-# CONFIG_SERIAL_ATMEL_TTYAT is not set
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-# CONFIG_SERIAL_TIMBERDALE is not set
-# CONFIG_SERIAL_ALTERA_JTAGUART is not set
-# CONFIG_SERIAL_ALTERA_UART is not set
-# CONFIG_TTY_PRINTK is not set
-# CONFIG_IPMI_HANDLER is not set
-# CONFIG_HW_RANDOM is not set
-# CONFIG_R3964 is not set
-# CONFIG_RAW_DRIVER is not set
-# CONFIG_TCG_TPM is not set
-# CONFIG_RAMOOPS is not set
-# CONFIG_I2C is not set
-# CONFIG_SPI is not set
-
-#
-# PPS support
-#
-# CONFIG_PPS is not set
-
-#
-# PPS generators support
-#
-CONFIG_ARCH_REQUIRE_GPIOLIB=y
-CONFIG_GPIOLIB=y
-# CONFIG_GPIO_SYSFS is not set
-
-#
-# Memory mapped GPIO expanders:
-#
-# CONFIG_GPIO_BASIC_MMIO is not set
-# CONFIG_GPIO_IT8761E is not set
-
-#
-# I2C GPIO expanders:
-#
-
-#
-# PCI GPIO expanders:
-#
-
-#
-# SPI GPIO expanders:
-#
-
-#
-# AC97 GPIO expanders:
-#
-
-#
-# MODULbus GPIO expanders:
-#
-# CONFIG_W1 is not set
-# CONFIG_POWER_SUPPLY is not set
-# CONFIG_HWMON is not set
-# CONFIG_THERMAL is not set
-# CONFIG_WATCHDOG is not set
-CONFIG_SSB_POSSIBLE=y
-
-#
-# Sonics Silicon Backplane
-#
-# CONFIG_SSB is not set
-# CONFIG_MFD_SUPPORT is not set
-# CONFIG_REGULATOR is not set
-# CONFIG_MEDIA_SUPPORT is not set
-
-#
-# Graphics support
-#
-CONFIG_HAVE_FB_ATMEL=y
-# CONFIG_DRM is not set
-# CONFIG_VGASTATE is not set
-# CONFIG_VIDEO_OUTPUT_CONTROL is not set
-# CONFIG_FB is not set
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-
-#
-# Display device support
-#
-# CONFIG_DISPLAY_SUPPORT is not set
-
-#
-# Console display driver support
-#
-CONFIG_DUMMY_CONSOLE=y
-# CONFIG_SOUND is not set
-# CONFIG_HID_SUPPORT is not set
-# CONFIG_USB_SUPPORT is not set
-# CONFIG_MMC is not set
-# CONFIG_MEMSTICK is not set
-# CONFIG_NEW_LEDS is not set
-# CONFIG_NFC_DEVICES is not set
-# CONFIG_ACCESSIBILITY is not set
-CONFIG_RTC_LIB=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_HCTOSYS=y
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-# CONFIG_RTC_DEBUG is not set
-
-#
-# RTC interfaces
-#
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_DEV=y
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-# CONFIG_RTC_DRV_TEST is not set
-
-#
-# SPI RTC drivers
-#
-
-#
-# Platform RTC drivers
-#
-# CONFIG_RTC_DRV_DS1286 is not set
-# CONFIG_RTC_DRV_DS1511 is not set
-# CONFIG_RTC_DRV_DS1553 is not set
-# CONFIG_RTC_DRV_DS1742 is not set
-# CONFIG_RTC_DRV_STK17TA8 is not set
-# CONFIG_RTC_DRV_M48T86 is not set
-# CONFIG_RTC_DRV_M48T35 is not set
-CONFIG_RTC_DRV_M48T59=y
-# CONFIG_RTC_DRV_MSM6242 is not set
-# CONFIG_RTC_DRV_BQ4802 is not set
-# CONFIG_RTC_DRV_RP5C01 is not set
-# CONFIG_RTC_DRV_V3020 is not set
-
-#
-# on-CPU RTC drivers
-#
-# CONFIG_RTC_DRV_AT32AP700X is not set
-# CONFIG_DMADEVICES is not set
-# CONFIG_AUXDISPLAY is not set
-# CONFIG_UIO is not set
-# CONFIG_STAGING is not set
-
-#
-# File systems
-#
-# CONFIG_EXT2_FS is not set
-# CONFIG_EXT3_FS is not set
-# CONFIG_EXT4_FS is not set
-# CONFIG_REISERFS_FS is not set
-# CONFIG_JFS_FS is not set
-# CONFIG_XFS_FS is not set
-# CONFIG_BTRFS_FS is not set
-# CONFIG_NILFS2_FS is not set
-CONFIG_FS_POSIX_ACL=y
-CONFIG_EXPORTFS=y
-CONFIG_FILE_LOCKING=y
-CONFIG_FSNOTIFY=y
-# CONFIG_DNOTIFY is not set
-# CONFIG_INOTIFY_USER is not set
-# CONFIG_FANOTIFY is not set
-# CONFIG_QUOTA is not set
-# CONFIG_QUOTACTL is not set
-# CONFIG_AUTOFS4_FS is not set
-# CONFIG_FUSE_FS is not set
-
-#
-# Caches
-#
-# CONFIG_FSCACHE is not set
-
-#
-# CD-ROM/DVD Filesystems
-#
-# CONFIG_ISO9660_FS is not set
-# CONFIG_UDF_FS is not set
-
-#
-# DOS/FAT/NT Filesystems
-#
-# CONFIG_MSDOS_FS is not set
-# CONFIG_VFAT_FS is not set
-# CONFIG_NTFS_FS is not set
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-# CONFIG_PROC_KCORE is not set
-CONFIG_PROC_SYSCTL=y
-# CONFIG_PROC_PAGE_MONITOR is not set
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-# CONFIG_TMPFS_POSIX_ACL is not set
-# CONFIG_HUGETLB_PAGE is not set
-# CONFIG_CONFIGFS_FS is not set
-# CONFIG_MISC_FILESYSTEMS is not set
-# CONFIG_NETWORK_FILESYSTEMS is not set
-
-#
-# Partition Types
-#
-# CONFIG_PARTITION_ADVANCED is not set
-CONFIG_MSDOS_PARTITION=y
-# CONFIG_NLS is not set
-
-#
-# Kernel hacking
-#
-CONFIG_PRINTK_TIME=y
-CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
-# CONFIG_ENABLE_WARN_DEPRECATED is not set
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_FRAME_WARN=1024
-# CONFIG_MAGIC_SYSRQ is not set
-# CONFIG_STRIP_ASM_SYMS is not set
-# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_DEBUG_FS is not set
-# CONFIG_HEADERS_CHECK is not set
-# CONFIG_DEBUG_SECTION_MISMATCH is not set
-# CONFIG_DEBUG_KERNEL is not set
-# CONFIG_HARDLOCKUP_DETECTOR is not set
-# CONFIG_SPARSE_RCU_POINTER is not set
-CONFIG_DEBUG_BUGVERBOSE=y
-# CONFIG_DEBUG_MEMORY_INIT is not set
-# CONFIG_SYSCTL_SYSCALL_CHECK is not set
-CONFIG_TRACING_SUPPORT=y
-# CONFIG_FTRACE is not set
-# CONFIG_ATOMIC64_SELFTEST is not set
-# CONFIG_SAMPLES is not set
-# CONFIG_TEST_KSTRTOX is not set
-
-#
-# Security options
-#
-# CONFIG_KEYS is not set
-# CONFIG_SECURITY_DMESG_RESTRICT is not set
-# CONFIG_SECURITY is not set
-# CONFIG_SECURITYFS is not set
-CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_DEFAULT_SECURITY=""
-CONFIG_CRYPTO=y
-
-#
-# Crypto core or helper
-#
-# CONFIG_CRYPTO_MANAGER is not set
-# CONFIG_CRYPTO_MANAGER2 is not set
-# CONFIG_CRYPTO_GF128MUL is not set
-# CONFIG_CRYPTO_NULL is not set
-# CONFIG_CRYPTO_CRYPTD is not set
-# CONFIG_CRYPTO_AUTHENC is not set
-# CONFIG_CRYPTO_TEST is not set
-
-#
-# Authenticated Encryption with Associated Data
-#
-# CONFIG_CRYPTO_CCM is not set
-# CONFIG_CRYPTO_GCM is not set
-# CONFIG_CRYPTO_SEQIV is not set
-
-#
-# Block modes
-#
-# CONFIG_CRYPTO_CBC is not set
-# CONFIG_CRYPTO_CTR is not set
-# CONFIG_CRYPTO_CTS is not set
-# CONFIG_CRYPTO_ECB is not set
-# CONFIG_CRYPTO_LRW is not set
-# CONFIG_CRYPTO_PCBC is not set
-# CONFIG_CRYPTO_XTS is not set
-
-#
-# Hash modes
-#
-# CONFIG_CRYPTO_HMAC is not set
-# CONFIG_CRYPTO_XCBC is not set
-# CONFIG_CRYPTO_VMAC is not set
-
-#
-# Digest
-#
-# CONFIG_CRYPTO_CRC32C is not set
-# CONFIG_CRYPTO_GHASH is not set
-# CONFIG_CRYPTO_MD4 is not set
-# CONFIG_CRYPTO_MD5 is not set
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
-# CONFIG_CRYPTO_RMD128 is not set
-# CONFIG_CRYPTO_RMD160 is not set
-# CONFIG_CRYPTO_RMD256 is not set
-# CONFIG_CRYPTO_RMD320 is not set
-# CONFIG_CRYPTO_SHA1 is not set
-# CONFIG_CRYPTO_SHA256 is not set
-# CONFIG_CRYPTO_SHA512 is not set
-# CONFIG_CRYPTO_TGR192 is not set
-# CONFIG_CRYPTO_WP512 is not set
-
-#
-# Ciphers
-#
-# CONFIG_CRYPTO_AES is not set
-# CONFIG_CRYPTO_ANUBIS is not set
-# CONFIG_CRYPTO_ARC4 is not set
-# CONFIG_CRYPTO_BLOWFISH is not set
-# CONFIG_CRYPTO_CAMELLIA is not set
-# CONFIG_CRYPTO_CAST5 is not set
-# CONFIG_CRYPTO_CAST6 is not set
-# CONFIG_CRYPTO_DES is not set
-# CONFIG_CRYPTO_FCRYPT is not set
-# CONFIG_CRYPTO_KHAZAD is not set
-# CONFIG_CRYPTO_SALSA20 is not set
-# CONFIG_CRYPTO_SEED is not set
-# CONFIG_CRYPTO_SERPENT is not set
-# CONFIG_CRYPTO_TEA is not set
-# CONFIG_CRYPTO_TWOFISH is not set
-
-#
-# Compression
-#
-# CONFIG_CRYPTO_DEFLATE is not set
-# CONFIG_CRYPTO_ZLIB is not set
-# CONFIG_CRYPTO_LZO is not set
-
-#
-# Random Number Generation
-#
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-# CONFIG_CRYPTO_USER_API_HASH is not set
-# CONFIG_CRYPTO_USER_API_SKCIPHER is not set
-# CONFIG_CRYPTO_HW is not set
-
-#
-# OCF Configuration
-#
-# CONFIG_OCF_OCF is not set
-# CONFIG_BINARY_PRINTF is not set
-
-#
-# Library routines
-#
-CONFIG_BITREVERSE=y
-CONFIG_GENERIC_FIND_LAST_BIT=y
-# CONFIG_CRC_CCITT is not set
-# CONFIG_CRC16 is not set
-# CONFIG_CRC_T10DIF is not set
-# CONFIG_CRC_ITU_T is not set
-CONFIG_CRC32=y
-# CONFIG_CRC7 is not set
-# CONFIG_LIBCRC32C is not set
-# CONFIG_XZ_DEC is not set
-# CONFIG_XZ_DEC_BCJ is not set
-CONFIG_GENERIC_ALLOCATOR=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-CONFIG_HAS_DMA=y
-CONFIG_NLATTR=y
-# CONFIG_AVERAGE is not set
diff --git a/target/avr32/sys-available/atmel-ngw100 b/target/avr32/sys-available/atmel-ngw100
deleted file mode 100644
index 6f553ce27..000000000
--- a/target/avr32/sys-available/atmel-ngw100
+++ /dev/null
@@ -1,9 +0,0 @@
-config ADK_TARGET_SYSTEM_ATMEL_NGW100
-	bool "Atmel NGW100"
-	select ADK_avr32
-	select ADK_atmel_ngw100
-	select ADK_DISABLE_HONOUR_CFLAGS
-	select ADK_TOOLCHAIN_GCC_SJLJ
-	help
-	  Support for ATMEL NGW100.
-
diff --git a/target/avr32/sys-available/toolchain-avr32 b/target/avr32/sys-available/toolchain-avr32
deleted file mode 100644
index 1071dc1ee..000000000
--- a/target/avr32/sys-available/toolchain-avr32
+++ /dev/null
@@ -1,8 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_AVR32
-	bool "Toolchain only"
-	select ADK_avr32
-	select ADK_toolchain_avr32
-	select ADK_TOOLCHAIN
-	help
-	  Build a avr32 toolchain.
-
diff --git a/target/avr32/target.mk b/target/avr32/target.mk
deleted file mode 100644
index 600697f2c..000000000
--- a/target/avr32/target.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-include $(TOPDIR)/mk/kernel-ver.mk
-ARCH:=			avr32
-CPU_ARCH:=		avr32
-TARGET_OPTIMIZATION:=	-Os -pipe
-TARGET_CFLAGS_ARCH:=	
diff --git a/target/avr32/uclibc.config b/target/avr32/uclibc.config
deleted file mode 100644
index c096e8d48..000000000
--- a/target/avr32/uclibc.config
+++ /dev/null
@@ -1,248 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Version: 0.9.33.2
-# Fri Sep 21 11:43:03 2012
-#
-# TARGET_alpha is not set
-# TARGET_arm is not set
-TARGET_avr32=y
-# TARGET_bfin is not set
-# TARGET_c6x is not set
-# TARGET_cris is not set
-# TARGET_e1 is not set
-# TARGET_frv is not set
-# TARGET_h8300 is not set
-# TARGET_hppa is not set
-# TARGET_i386 is not set
-# TARGET_i960 is not set
-# TARGET_ia64 is not set
-# TARGET_m68k is not set
-# TARGET_microblaze is not set
-# TARGET_mips is not set
-# TARGET_nios is not set
-# TARGET_nios2 is not set
-# TARGET_powerpc is not set
-# TARGET_sh is not set
-# TARGET_sh64 is not set
-# TARGET_sparc is not set
-# TARGET_v850 is not set
-# TARGET_vax is not set
-# TARGET_x86_64 is not set
-# TARGET_xtensa is not set
-
-#
-# Target Architecture Features and Options
-#
-TARGET_ARCH="avr32"
-FORCE_OPTIONS_FOR_ARCH=y
-CONFIG_AVR32_AP7=y
-LINKRELAX=y
-TARGET_SUBARCH=""
-
-#
-# Using ELF file format
-#
-ARCH_BIG_ENDIAN=y
-
-#
-# Using Big Endian
-#
-ARCH_HAS_MMU=y
-ARCH_USE_MMU=y
-UCLIBC_HAS_FLOATS=y
-UCLIBC_HAS_FPU=y
-DO_C99_MATH=y
-# DO_XSI_MATH is not set
-UCLIBC_HAS_FENV=y
-KERNEL_HEADERS=""
-HAVE_DOT_CONFIG=y
-
-#
-# General Library Settings
-#
-DOPIC=y
-HAVE_SHARED=y
-FORCE_SHAREABLE_TEXT_SEGMENTS=y
-LDSO_LDD_SUPPORT=y
-LDSO_CACHE_SUPPORT=y
-# LDSO_PRELOAD_ENV_SUPPORT is not set
-# LDSO_PRELOAD_FILE_SUPPORT is not set
-LDSO_BASE_FILENAME="ld.so"
-# LDSO_STANDALONE_SUPPORT is not set
-# LDSO_PRELINK_SUPPORT is not set
-# UCLIBC_STATIC_LDCONFIG is not set
-LDSO_RUNPATH=y
-LDSO_SEARCH_INTERP_PATH=y
-LDSO_LD_LIBRARY_PATH=y
-# LDSO_NO_CLEANUP is not set
-UCLIBC_CTOR_DTOR=y
-# LDSO_GNU_HASH_SUPPORT is not set
-# HAS_NO_THREADS is not set
-LINUXTHREADS_OLD=y
-# LINUXTHREADS_NEW is not set
-# UCLIBC_HAS_THREADS_NATIVE is not set
-UCLIBC_HAS_THREADS=y
-PTHREADS_DEBUG_SUPPORT=y
-UCLIBC_HAS_SYSLOG=y
-UCLIBC_HAS_LFS=y
-# MALLOC is not set
-# MALLOC_SIMPLE is not set
-MALLOC_STANDARD=y
-MALLOC_GLIBC_COMPAT=y
-UCLIBC_DYNAMIC_ATEXIT=y
-COMPAT_ATEXIT=y
-UCLIBC_SUSV3_LEGACY=y
-# UCLIBC_SUSV3_LEGACY_MACROS is not set
-UCLIBC_SUSV4_LEGACY=y
-# UCLIBC_STRICT_HEADERS is not set
-# UCLIBC_HAS_STUBS is not set
-UCLIBC_HAS_SHADOW=y
-UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
-UCLIBC_HAS___PROGNAME=y
-UCLIBC_HAS_PTY=y
-ASSUME_DEVPTS=y
-UNIX98PTY_ONLY=y
-UCLIBC_HAS_GETPT=y
-UCLIBC_HAS_LIBUTIL=y
-UCLIBC_HAS_TM_EXTENSIONS=y
-UCLIBC_HAS_TZ_CACHING=y
-UCLIBC_HAS_TZ_FILE=y
-UCLIBC_HAS_TZ_FILE_READ_MANY=y
-UCLIBC_TZ_FILE_PATH="/etc/TZ"
-UCLIBC_FALLBACK_TO_ETC_LOCALTIME=y
-
-#
-# Advanced Library Settings
-#
-UCLIBC_PWD_BUFFER_SIZE=256
-UCLIBC_GRP_BUFFER_SIZE=256
-
-#
-# Support various families of functions
-#
-UCLIBC_LINUX_MODULE_26=y
-# UCLIBC_LINUX_MODULE_24 is not set
-UCLIBC_LINUX_SPECIFIC=y
-UCLIBC_HAS_GNU_ERROR=y
-UCLIBC_BSD_SPECIFIC=y
-UCLIBC_HAS_BSD_ERR=y
-# UCLIBC_HAS_OBSOLETE_BSD_SIGNAL is not set
-# UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL is not set
-# UCLIBC_NTP_LEGACY is not set
-# UCLIBC_SV4_DEPRECATED is not set
-UCLIBC_HAS_REALTIME=y
-UCLIBC_HAS_ADVANCED_REALTIME=y
-UCLIBC_HAS_EPOLL=y
-# UCLIBC_HAS_XATTR is not set
-# UCLIBC_HAS_PROFILING is not set
-UCLIBC_HAS_CRYPT_IMPL=y
-# UCLIBC_HAS_SHA256_CRYPT_IMPL is not set
-# UCLIBC_HAS_SHA512_CRYPT_IMPL is not set
-UCLIBC_HAS_CRYPT=y
-UCLIBC_HAS_NETWORK_SUPPORT=y
-UCLIBC_HAS_SOCKET=y
-UCLIBC_HAS_IPV4=y
-UCLIBC_HAS_IPV6=y
-UCLIBC_HAS_RPC=y
-UCLIBC_HAS_FULL_RPC=y
-UCLIBC_HAS_REENTRANT_RPC=y
-UCLIBC_USE_NETLINK=y
-UCLIBC_SUPPORT_AI_ADDRCONFIG=y
-UCLIBC_HAS_BSD_RES_CLOSE=y
-UCLIBC_HAS_COMPAT_RES_STATE=y
-# UCLIBC_HAS_EXTRA_COMPAT_RES_STATE is not set
-UCLIBC_HAS_RESOLVER_SUPPORT=y
-UCLIBC_HAS_LIBRESOLV_STUB=y
-UCLIBC_HAS_LIBNSL_STUB=y
-
-#
-# String and Stdio Support
-#
-UCLIBC_HAS_STRING_GENERIC_OPT=y
-UCLIBC_HAS_STRING_ARCH_OPT=y
-UCLIBC_HAS_CTYPE_TABLES=y
-UCLIBC_HAS_CTYPE_SIGNED=y
-# UCLIBC_HAS_CTYPE_UNSAFE is not set
-UCLIBC_HAS_CTYPE_CHECKED=y
-# UCLIBC_HAS_CTYPE_ENFORCED is not set
-UCLIBC_HAS_WCHAR=y
-# UCLIBC_HAS_LOCALE is not set
-UCLIBC_HAS_HEXADECIMAL_FLOATS=y
-UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
-UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
-UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
-# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_256 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
-UCLIBC_HAS_STDIO_BUFSIZ_4096=y
-# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
-UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
-# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set
-UCLIBC_HAS_STDIO_GETC_MACRO=y
-UCLIBC_HAS_STDIO_PUTC_MACRO=y
-UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
-# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set
-UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y
-# UCLIBC_HAS_FOPEN_CLOSEEXEC_MODE is not set
-UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
-UCLIBC_HAS_PRINTF_M_SPEC=y
-UCLIBC_HAS_ERRNO_MESSAGES=y
-# UCLIBC_HAS_SYS_ERRLIST is not set
-UCLIBC_HAS_SIGNUM_MESSAGES=y
-# UCLIBC_HAS_SYS_SIGLIST is not set
-UCLIBC_HAS_GNU_GETOPT=y
-UCLIBC_HAS_GNU_GETSUBOPT=y
-
-#
-# Big and Tall
-#
-UCLIBC_HAS_REGEX=y
-# UCLIBC_HAS_REGEX_OLD is not set
-UCLIBC_HAS_FNMATCH=y
-# UCLIBC_HAS_FNMATCH_OLD is not set
-UCLIBC_HAS_WORDEXP=y
-UCLIBC_HAS_NFTW=y
-UCLIBC_HAS_FTW=y
-# UCLIBC_HAS_FTS is not set
-UCLIBC_HAS_GLOB=y
-UCLIBC_HAS_GNU_GLOB=y
-# UCLIBC_HAS_UTMPX is not set
-
-#
-# Library Installation Options
-#
-RUNTIME_PREFIX="/"
-DEVEL_PREFIX="/usr/"
-MULTILIB_DIR="lib"
-HARDWIRED_ABSPATH=y
-
-#
-# Security options
-#
-UCLIBC_HAS_ARC4RANDOM=y
-# UCLIBC_HAS_SSP is not set
-UCLIBC_BUILD_RELRO=y
-# UCLIBC_BUILD_NOW is not set
-UCLIBC_BUILD_NOEXECSTACK=y
-
-#
-# Development/debugging options
-#
-CROSS_COMPILER_PREFIX=""
-UCLIBC_EXTRA_CFLAGS=""
-# DODEBUG is not set
-# DODEBUG_PT is not set
-DOSTRIP=y
-# DOASSERTS is not set
-# SUPPORT_LD_DEBUG is not set
-# SUPPORT_LD_DEBUG_EARLY is not set
-# UCLIBC_MALLOC_DEBUGGING is not set
-# UCLIBC_HAS_BACKTRACE is not set
-WARNINGS="-Wall"
-EXTRA_WARNINGS=y
-# DOMULTI is not set
-# UCLIBC_MJN3_ONLY is not set
diff --git a/target/config/Config.in b/target/config/Config.in
index d0183fdbb..2b9d0f396 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -162,6 +162,7 @@ config ADK_TARGET_KERNEL_MINICONFIG
 	default "qemu-ppc64" if ADK_TARGET_SYSTEM_QEMU_PPC64
 	default "qemu-sparc" if ADK_TARGET_SYSTEM_QEMU_SPARC
 	default "qemu-i686" if ADK_TARGET_SYSTEM_QEMU_I686
+	default "raspberry-pi" if ADK_TARGET_SYSTEM_RASPBERRY_PI
 
 choice
 prompt "Qemu MICROBLAZE Emulation"
@@ -193,18 +194,6 @@ config ADK_TARGET_QEMU_ARM_MODEL_SPITZ
 
 endchoice
 
-choice
-prompt "Foxboard LX Model"
-depends on ADK_TARGET_SYSTEM_FOXBOARD_LX
-
-config ADK_TARGET_FOXBOARD_MODEL_LX416
-	boolean "Foxboard LX 4x16"
-
-config ADK_TARGET_FOXBOARD_MODEL_LX832
-	boolean "Foxboard LX 8x32"
-
-endchoice
-
 choice 
 prompt "Broadcom BCM47xx Model"
 depends on ADK_TARGET_SYSTEM_BROADCOM_BCM47XX
@@ -378,12 +367,6 @@ config ADK_TARGET_CPU_WITH_3DNOWEXT
 	boolean
 
 # cpu configuration
-config ADK_CPU_CRIS_V10
-	boolean
-
-config ADK_CPU_CRIS_V32
-	boolean
-
 config ADK_CPU_SH4
 	boolean
 
@@ -467,13 +450,10 @@ config ADK_TARGET_CPU_ARCH
 	default "mipsel" if ADK_LINUX_MIPS && ADK_little
 	default "arm" if ADK_LINUX_ARM && ADK_little
 	default "armeb" if ADK_LINUX_ARM && ADK_big
-	default "avr32" if ADK_LINUX_AVR32
 	default "sparc" if ADK_LINUX_SPARC
 	default "sparc64" if ADK_LINUX_SPARC64
 	default "sh4" if ADK_LINUX_SH && ADK_little
 	default "sh4eb" if ADK_LINUX_SH && ADK_big
-	default "cris" if ADK_CPU_CRIS_V10
-	default "crisv32" if ADK_CPU_CRIS_V32
 	default "ppc" if ADK_CPU_PPC
 	default "ppc64" if ADK_CPU_PPC64
 	default "mips64el" if ADK_native && ADK_lemote_yeelong	
@@ -512,14 +492,12 @@ config ADK_TARGET_CFLAGS
 	default "-march=mips32" if ADK_CPU_MIPS32
 	default "-march=mips64" if ADK_CPU_MIPS64
 	default "-march=armv5te -mtune=arm926ej-s" if ADK_CPU_ARMV5
-	default "-march=v32" if ADK_CPU_CRIS_V32
-	default "-march=v10" if ADK_CPU_CRIS_V10
 	default "-march=armv5te -mtune=iwmmxt" if ADK_CPU_XSCALE
 	default "-march=armv6 -mtune=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard" if ADK_CPU_RASPBERRY_PI
 
 config ADK_TARGET_CMDLINE
 	string
-	default "dwc_otg.fiq_split_enable=0" if ADK_TARGET_SYSTEM_RASPBERRY_PI
+	default "dwc_otg.fiq_split_enable=1" if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default "console=tty no_auto_cmd" if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default "console=ttyS0,9600" if ADK_TARGET_SYSTEM_FON_FON2100
 	default "console=ttyS0,38400" if ADK_TARGET_SYSTEM_PCENGINES_WRAP
@@ -539,7 +517,6 @@ config ADK_TARGET_CMDLINE
 	default "console=ttyS0" if ADK_TARGET_SYSTEM_ARANYM_M68K
 	default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
 	default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
-	default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_FOXBOARD_LX
 	default ""
 
 # c library
diff --git a/target/config/Config.in.arch.choice b/target/config/Config.in.arch.choice
index ce58aa2c1..a147a0251 100644
--- a/target/config/Config.in.arch.choice
+++ b/target/config/Config.in.arch.choice
@@ -20,18 +20,6 @@ config ADK_LINUX_ARM
 	help
 	  Support for ARM systems.
 
-config ADK_LINUX_AVR32
-	bool "avr32 system"
-	select ADK_avr32
-	help
-	  Support for AVR32 systems.
-
-config ADK_LINUX_CRIS
-	bool "cris system"
-	select ADK_cris
-	help
-	  Support for CRIS systems.
-
 config ADK_LINUX_M68K
 	bool "m68k system"
 	select ADK_m68k
diff --git a/target/config/Config.in.arch.default b/target/config/Config.in.arch.default
index 737ce525c..43d1e5399 100644
--- a/target/config/Config.in.arch.default
+++ b/target/config/Config.in.arch.default
@@ -5,12 +5,6 @@ config ADK_native
 config ADK_arm
 	bool
 
-config ADK_avr32
-	bool
-
-config ADK_cris
-	bool
-
 config ADK_m68k
 	bool
 
@@ -44,8 +38,6 @@ config ADK_x86
 config ADK_TARGET_ARCH
 	string
 	default "arm"  if ADK_arm
-	default "avr32"  if ADK_avr32
-	default "cris"  if ADK_cris
 	default "m68k"  if ADK_m68k
 	default "microblaze"  if ADK_microblaze
 	default "mips"  if ADK_mips
diff --git a/target/config/Config.in.system.choice b/target/config/Config.in.system.choice
index 8f6f7413f..54e4e621a 100644
--- a/target/config/Config.in.system.choice
+++ b/target/config/Config.in.system.choice
@@ -1,6 +1,4 @@
 source "target/arm/Config.in"
-source "target/avr32/Config.in"
-source "target/cris/Config.in"
 source "target/m68k/Config.in"
 source "target/microblaze/Config.in"
 source "target/mips/Config.in"
diff --git a/target/cris/Config.in b/target/cris/Config.in
deleted file mode 100644
index 4ad4b681d..000000000
--- a/target/cris/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-choice
-depends on ADK_LINUX_CRIS && !ADK_CHOOSE_TARGET_ARCH
-prompt "Target system"
-
-config ADK_CHOOSE_TARGET_SYSTEM_CRIS
-	boolean "Choose target system"
-
-source "target/cris/Config.in.systems"
-endchoice
diff --git a/target/cris/Makefile b/target/cris/Makefile
deleted file mode 100644
index 34e5ce542..000000000
--- a/target/cris/Makefile
+++ /dev/null
@@ -1,76 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include $(TOPDIR)/rules.mk
-include $(TOPDIR)/mk/kernel.mk
-include $(TOPDIR)/mk/modules.mk
-include $(TOPDIR)/mk/kernel-build.mk
-include $(TOPDIR)/mk/image.mk
-
-ZKERNEL:=$(LINUX_DIR)/arch/cris/boot/zImage
-KERNEL:=$(LINUX_DIR)/vmlinux
-
-tools-compile:
-	$(MAKE) -C ../tools/mkfimage all
-ifneq ($(ADK_HOST_DARWIN),y)
-	$(MAKE) -C ../tools/e100boot all
-endif
-	$(MAKE) -C ../tools/squashfs all
-	$(INSTALL_BIN) ../tools/boot_linux $(BIN_DIR)/
-
-kernel-install: tools-compile
-	PATH='${TARGET_PATH}' mkfimage $(ZKERNEL) $(BUILD_DIR)/$(TARGET_KERNEL) $(MAKE_TRACE)
-
-${BUILD_DIR}/${ROOTFSSQUASHFS}: ${BUILD_DIR}/root.squashfs
-	cat ${BUILD_DIR}/${TARGET_KERNEL} ${BUILD_DIR}/root.squashfs \
-		>${BUILD_DIR}/${ROOTFSSQUASHFS}
-
-ifeq ($(ADK_TARGET_FS),squashfs)
-imageinstall: kernel-install $(BUILD_DIR)/$(ROOTFSSQUASHFS)
-	dd if=${BUILD_DIR}/${ROOTFSSQUASHFS} of=${BIN_DIR}/${ROOTFSSQUASHFS} \
-		bs=4063232 conv=sync $(MAKE_TRACE)
-	@if [ $$($(STATCMD) ${BIN_DIR}/${ROOTFSSQUASHFS}) -gt 4063232 ];then \
-		echo 'Image is too big!'; \
-	else \
-		echo 'Use sudo ./boot_linux -F -i $(ROOTFSSQUASHFS) to flash'; \
-		echo 'Do not forget to set the network boot jumper, before you start the foxboard'; \
-	fi
-endif
-ifeq ($(ADK_TARGET_FS),nfsroot)
-imageinstall: kernel-install ${BIN_DIR}/${ROOTFSUSERTARBALL}
-	@cp $(BUILD_DIR)/$(TARGET_KERNEL) $(BIN_DIR)/$(TARGET_KERNEL)
-	@echo Use sudo ./boot_linux -F -i $(BIN_DIR)/${TARGET_KERNEL} to flash the kernel
-	@echo Do not forget to set network boot jumper, before you start the foxboard
-	@echo ${ROOTFSUSERTARBALL} is your nfs root and can be extracted on your nfs server
-endif
-ifeq ($(ADK_TARGET_FS),archive)
-imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
-	@cp $(KERNEL) $(BIN_DIR)/$(TARGET_KERNEL)
-	@echo 'The kernel file is: $(BIN_DIR)/${TARGET_KERNEL}'
-	@echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)"
-ifeq ($(ADK_TARGET_SYSTEM_QEMU_CRIS),y)
-	@echo "Use following command to create a QEMU Image:"
-	@echo "sudo ./scripts/create-image.sh -f ${ADK_TARGET_ROOTFS} qemu-${CPU_ARCH}.img $(BIN_DIR)/$(ROOTFSTARBALL)"
-	@echo "Start qemu with following command line:"
-	@echo 'qemu-system-cris -M axis-dev88 -nographic -kernel $(BIN_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img'
-endif
-endif
-ifeq ($(ADK_TARGET_FS),initramfs)
-imageinstall: $(BIN_DIR)/$(INITRAMFS)
-	@cp $(KERNEL) $(BIN_DIR)/$(TARGET_KERNEL)
-	@echo 'The kernel file is: $(BIN_DIR)/${TARGET_KERNEL}'
-	@echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}'
-ifeq ($(ADK_TARGET_SYSTEM_QEMU_CRIS),y)
-	@echo "Start qemu with following command line:"
-	@echo 'qemu-system-cris -M axis-dev88 -nographic -kernel $(BIN_DIR)/$(TARGET_KERNEL) -initrd ${BIN_DIR}/${INITRAMFS}'
-endif
-endif
-ifeq ($(ADK_TARGET_FS),initramfs-piggyback)
-imageinstall: createinitramfs
-	@cp $(KERNEL) $(BIN_DIR)/${TARGET_KERNEL}
-	@echo 'The kernel+initramfs file is: $(BIN_DIR)/${TARGET_KERNEL}'
-ifeq ($(ADK_TARGET_SYSTEM_QEMU_CRIS),y)
-	@echo "Start qemu with following command line:"
-	@echo 'qemu-system-cris -M axis-dev88 -nographic -kernel $(BIN_DIR)/$(TARGET_KERNEL)'
-endif
-endif
diff --git a/target/cris/kernel.config b/target/cris/kernel.config
deleted file mode 100644
index c79daaefa..000000000
--- a/target/cris/kernel.config
+++ /dev/null
@@ -1,979 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Linux/cris 2.6.39 Kernel Configuration
-# Thu Aug 25 08:32:11 2011
-#
-CONFIG_MMU=y
-CONFIG_ZONE_DMA=y
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-CONFIG_ARCH_USES_GETTIMEOFFSET=y
-CONFIG_GENERIC_IOMAP=y
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-CONFIG_GENERIC_FIND_NEXT_BIT=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_NO_IOPORT=y
-CONFIG_FORCE_MAX_ZONEORDER=6
-CONFIG_CRIS=y
-CONFIG_HZ=100
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-CONFIG_CONSTRUCTORS=y
-
-#
-# General setup
-#
-CONFIG_EXPERIMENTAL=y
-CONFIG_BROKEN_ON_SMP=y
-CONFIG_INIT_ENV_ARG_LIMIT=32
-CONFIG_CROSS_COMPILE=""
-CONFIG_LOCALVERSION=""
-# CONFIG_LOCALVERSION_AUTO is not set
-# CONFIG_SWAP is not set
-CONFIG_SYSVIPC=y
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_POSIX_MQUEUE_SYSCTL=y
-# CONFIG_BSD_PROCESS_ACCT is not set
-# CONFIG_FHANDLE is not set
-# CONFIG_TASKSTATS is not set
-# CONFIG_AUDIT is not set
-CONFIG_HAVE_GENERIC_HARDIRQS=y
-
-#
-# IRQ subsystem
-#
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_IRQ_SHOW=y
-
-#
-# RCU Subsystem
-#
-CONFIG_TINY_RCU=y
-# CONFIG_PREEMPT_RCU is not set
-# CONFIG_RCU_TRACE is not set
-# CONFIG_TREE_RCU_TRACE is not set
-# CONFIG_IKCONFIG is not set
-CONFIG_LOG_BUF_SHIFT=14
-# CONFIG_CGROUPS is not set
-# CONFIG_NAMESPACES is not set
-# CONFIG_SCHED_AUTOGROUP is not set
-# CONFIG_SYSFS_DEPRECATED is not set
-# CONFIG_RELAY is not set
-# CONFIG_BLK_DEV_INITRD is not set
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_SYSCTL=y
-CONFIG_ANON_INODES=y
-CONFIG_EXPERT=y
-CONFIG_UID16=y
-CONFIG_SYSCTL_SYSCALL=y
-# CONFIG_KALLSYMS is not set
-CONFIG_HOTPLUG=y
-CONFIG_PRINTK=y
-# CONFIG_BUG is not set
-# CONFIG_ELF_CORE is not set
-# CONFIG_BASE_FULL is not set
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-CONFIG_SIGNALFD=y
-CONFIG_TIMERFD=y
-CONFIG_EVENTFD=y
-CONFIG_SHMEM=y
-CONFIG_AIO=y
-CONFIG_EMBEDDED=y
-
-#
-# Kernel Performance Events And Counters
-#
-# CONFIG_VM_EVENT_COUNTERS is not set
-# CONFIG_COMPAT_BRK is not set
-CONFIG_SLAB=y
-# CONFIG_SLUB is not set
-# CONFIG_SLOB is not set
-# CONFIG_PROFILING is not set
-
-#
-# GCOV-based kernel profiling
-#
-# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
-CONFIG_SLABINFO=y
-CONFIG_RT_MUTEXES=y
-CONFIG_BASE_SMALL=1
-CONFIG_MODULES=y
-# CONFIG_MODULE_FORCE_LOAD is not set
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-# CONFIG_MODVERSIONS is not set
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-CONFIG_BLOCK=y
-# CONFIG_LBDAF is not set
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_BLK_DEV_INTEGRITY is not set
-
-#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_DEFAULT_NOOP=y
-CONFIG_DEFAULT_IOSCHED="noop"
-# CONFIG_INLINE_SPIN_TRYLOCK is not set
-# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
-# CONFIG_INLINE_SPIN_LOCK is not set
-# CONFIG_INLINE_SPIN_LOCK_BH is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
-CONFIG_INLINE_SPIN_UNLOCK=y
-# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_READ_TRYLOCK is not set
-# CONFIG_INLINE_READ_LOCK is not set
-# CONFIG_INLINE_READ_LOCK_BH is not set
-# CONFIG_INLINE_READ_LOCK_IRQ is not set
-# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
-CONFIG_INLINE_READ_UNLOCK=y
-# CONFIG_INLINE_READ_UNLOCK_BH is not set
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_WRITE_TRYLOCK is not set
-# CONFIG_INLINE_WRITE_LOCK is not set
-# CONFIG_INLINE_WRITE_LOCK_BH is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
-CONFIG_INLINE_WRITE_UNLOCK=y
-# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
-# CONFIG_MUTEX_SPIN_ON_OWNER is not set
-# CONFIG_FREEZER is not set
-
-#
-# General setup
-#
-CONFIG_BINFMT_ELF=y
-# CONFIG_HAVE_AOUT is not set
-# CONFIG_BINFMT_MISC is not set
-CONFIG_ETRAX_CMDLINE=""
-# CONFIG_ETRAX_WATCHDOG is not set
-CONFIG_ETRAX_FAST_TIMER=y
-# CONFIG_ETRAX_KMALLOCED_MODULES is not set
-# CONFIG_OOM_REBOOT is not set
-CONFIG_PREEMPT_NONE=y
-# CONFIG_PREEMPT_VOLUNTARY is not set
-# CONFIG_PREEMPT is not set
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_FLATMEM_MANUAL=y
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_SPLIT_PTLOCK_CPUS=4
-# CONFIG_COMPACTION is not set
-# CONFIG_PHYS_ADDR_T_64BIT is not set
-CONFIG_ZONE_DMA_FLAG=1
-CONFIG_BOUNCE=y
-CONFIG_VIRT_TO_BUS=y
-# CONFIG_KSM is not set
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-CONFIG_NEED_PER_CPU_KM=y
-
-#
-# Hardware setup
-#
-# CONFIG_ETRAX100LX is not set
-CONFIG_ETRAX100LX_V2=y
-# CONFIG_SVINTO_SIM is not set
-# CONFIG_ETRAXFS is not set
-# CONFIG_CRIS_MACH_ARTPEC3 is not set
-# CONFIG_ETRAX_VCS_SIM is not set
-CONFIG_ETRAX_ARCH_V10=y
-# CONFIG_ETRAX_ARCH_V32 is not set
-CONFIG_ETRAX_DRAM_SIZE=16
-CONFIG_ETRAX_MTD_SIZE=0x00800000
-CONFIG_ETRAX_FLASH_BUSWIDTH=2
-CONFIG_ETRAX_NANDFLASH_BUSWIDTH=1
-CONFIG_ETRAX_FLASH1_SIZE=0
-# CONFIG_ETRAX_DEBUG_PORT0 is not set
-# CONFIG_ETRAX_DEBUG_PORT1 is not set
-# CONFIG_ETRAX_DEBUG_PORT2 is not set
-# CONFIG_ETRAX_DEBUG_PORT3 is not set
-CONFIG_ETRAX_DEBUG_PORT_NULL=y
-
-#
-# CRIS v10 options
-#
-CONFIG_ETRAX_DRAM_VIRTUAL_BASE=c0000000
-CONFIG_ETRAX_PA_LEDS=y
-# CONFIG_ETRAX_PB_LEDS is not set
-# CONFIG_ETRAX_CSP0_LEDS is not set
-# CONFIG_ETRAX_NO_LEDS is not set
-CONFIG_ETRAX_LED1G=2
-CONFIG_ETRAX_LED1R=2
-CONFIG_ETRAX_LED2G=3
-CONFIG_ETRAX_LED2R=3
-CONFIG_ETRAX_LED3G=2
-CONFIG_ETRAX_LED3R=2
-CONFIG_ETRAX_RESCUE_SER0=y
-# CONFIG_ETRAX_RESCUE_SER1 is not set
-# CONFIG_ETRAX_RESCUE_SER2 is not set
-# CONFIG_ETRAX_RESCUE_SER3 is not set
-CONFIG_ETRAX_DEF_R_WAITSTATES=0x95f8
-CONFIG_ETRAX_DEF_R_BUS_CONFIG=0x4
-CONFIG_ETRAX_SDRAM=y
-CONFIG_ETRAX_DEF_R_SDRAM_CONFIG=0x09603737
-CONFIG_ETRAX_DEF_R_SDRAM_TIMING=0x80608002
-CONFIG_ETRAX_DEF_R_PORT_PA_DIR=0x1c
-CONFIG_ETRAX_DEF_R_PORT_PA_DATA=0xf0
-CONFIG_ETRAX_DEF_R_PORT_PB_CONFIG=0x00
-CONFIG_ETRAX_DEF_R_PORT_PB_DIR=0xce
-CONFIG_ETRAX_DEF_R_PORT_PB_DATA=0x03
-# CONFIG_ETRAX_SOFT_SHUTDOWN is not set
-CONFIG_NET=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-# CONFIG_NET_KEY is not set
-CONFIG_INET=y
-# CONFIG_IP_MULTICAST is not set
-# CONFIG_IP_ADVANCED_ROUTER is not set
-# CONFIG_IP_PNP is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_IPGRE_DEMUX is not set
-# CONFIG_ARPD is not set
-# CONFIG_SYN_COOKIES is not set
-# CONFIG_INET_AH is not set
-# CONFIG_INET_ESP is not set
-# CONFIG_INET_IPCOMP is not set
-# CONFIG_INET_XFRM_TUNNEL is not set
-# CONFIG_INET_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_LRO is not set
-# CONFIG_INET_DIAG is not set
-# CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
-# CONFIG_TCP_MD5SIG is not set
-# CONFIG_IPV6 is not set
-# CONFIG_NETWORK_SECMARK is not set
-# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_DEBUG is not set
-CONFIG_NETFILTER_ADVANCED=y
-
-#
-# Core Netfilter Configuration
-#
-# CONFIG_NETFILTER_NETLINK_QUEUE is not set
-# CONFIG_NETFILTER_NETLINK_LOG is not set
-CONFIG_NF_CONNTRACK=m
-# CONFIG_NF_CONNTRACK_MARK is not set
-# CONFIG_NF_CONNTRACK_EVENTS is not set
-# CONFIG_NF_CONNTRACK_TIMESTAMP is not set
-# CONFIG_NF_CT_PROTO_DCCP is not set
-# CONFIG_NF_CT_PROTO_SCTP is not set
-# CONFIG_NF_CT_PROTO_UDPLITE is not set
-# CONFIG_NF_CONNTRACK_AMANDA is not set
-# CONFIG_NF_CONNTRACK_FTP is not set
-# CONFIG_NF_CONNTRACK_H323 is not set
-# CONFIG_NF_CONNTRACK_IRC is not set
-# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
-# CONFIG_NF_CONNTRACK_SNMP is not set
-# CONFIG_NF_CONNTRACK_PPTP is not set
-# CONFIG_NF_CONNTRACK_SANE is not set
-# CONFIG_NF_CONNTRACK_SIP is not set
-# CONFIG_NF_CONNTRACK_TFTP is not set
-# CONFIG_NF_CT_NETLINK is not set
-CONFIG_NETFILTER_XTABLES=m
-
-#
-# Xtables combined modules
-#
-# CONFIG_NETFILTER_XT_MARK is not set
-# CONFIG_NETFILTER_XT_CONNMARK is not set
-
-#
-# Xtables targets
-#
-# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
-# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
-# CONFIG_NETFILTER_XT_TARGET_IDLETIMER is not set
-# CONFIG_NETFILTER_XT_TARGET_MARK is not set
-# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
-# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
-# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
-# CONFIG_NETFILTER_XT_TARGET_TEE is not set
-# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
-
-#
-# Xtables matches
-#
-# CONFIG_NETFILTER_XT_MATCH_ADDRTYPE is not set
-# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set
-# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set
-# CONFIG_NETFILTER_XT_MATCH_CPU is not set
-# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
-# CONFIG_NETFILTER_XT_MATCH_DEVGROUP is not set
-# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
-# CONFIG_NETFILTER_XT_MATCH_ESP is not set
-# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
-# CONFIG_NETFILTER_XT_MATCH_HELPER is not set
-# CONFIG_NETFILTER_XT_MATCH_HL is not set
-# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
-# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
-# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
-# CONFIG_NETFILTER_XT_MATCH_MAC is not set
-# CONFIG_NETFILTER_XT_MATCH_MARK is not set
-# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
-# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
-# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
-# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
-# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
-# CONFIG_NETFILTER_XT_MATCH_REALM is not set
-# CONFIG_NETFILTER_XT_MATCH_RECENT is not set
-# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
-# CONFIG_NETFILTER_XT_MATCH_STATE is not set
-# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
-# CONFIG_NETFILTER_XT_MATCH_STRING is not set
-# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
-# CONFIG_NETFILTER_XT_MATCH_TIME is not set
-# CONFIG_NETFILTER_XT_MATCH_U32 is not set
-# CONFIG_IP_VS is not set
-
-#
-# IP: Netfilter Configuration
-#
-CONFIG_NF_DEFRAG_IPV4=m
-CONFIG_NF_CONNTRACK_IPV4=m
-# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
-CONFIG_IP_NF_QUEUE=m
-CONFIG_IP_NF_IPTABLES=m
-# CONFIG_IP_NF_MATCH_AH is not set
-# CONFIG_IP_NF_MATCH_ECN is not set
-# CONFIG_IP_NF_MATCH_TTL is not set
-# CONFIG_IP_NF_FILTER is not set
-# CONFIG_IP_NF_TARGET_LOG is not set
-# CONFIG_IP_NF_TARGET_ULOG is not set
-# CONFIG_NF_NAT is not set
-# CONFIG_IP_NF_MANGLE is not set
-# CONFIG_IP_NF_RAW is not set
-# CONFIG_IP_NF_ARPTABLES is not set
-# CONFIG_IP_DCCP is not set
-# CONFIG_IP_SCTP is not set
-# CONFIG_RDS is not set
-# CONFIG_TIPC is not set
-# CONFIG_ATM is not set
-# CONFIG_L2TP is not set
-# CONFIG_BRIDGE is not set
-# CONFIG_NET_DSA is not set
-# CONFIG_VLAN_8021Q is not set
-# CONFIG_DECNET is not set
-# CONFIG_LLC2 is not set
-# CONFIG_IPX is not set
-# CONFIG_ATALK is not set
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_ECONET is not set
-# CONFIG_WAN_ROUTER is not set
-# CONFIG_PHONET is not set
-# CONFIG_IEEE802154 is not set
-# CONFIG_NET_SCHED is not set
-# CONFIG_DCB is not set
-# CONFIG_BATMAN_ADV is not set
-
-#
-# Network testing
-#
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_HAMRADIO is not set
-# CONFIG_CAN is not set
-# CONFIG_IRDA is not set
-# CONFIG_BT is not set
-# CONFIG_AF_RXRPC is not set
-CONFIG_WIRELESS=y
-# CONFIG_CFG80211 is not set
-# CONFIG_LIB80211 is not set
-
-#
-# CFG80211 needs to be enabled for MAC80211
-#
-# CONFIG_WIMAX is not set
-# CONFIG_RFKILL is not set
-# CONFIG_NET_9P is not set
-# CONFIG_CAIF is not set
-# CONFIG_CEPH_LIB is not set
-
-#
-# Drivers for built-in interfaces
-#
-CONFIG_ETRAX_ETHERNET=y
-CONFIG_ETRAX_SERIAL=y
-# CONFIG_ETRAX_SERIAL_FAST_TIMER is not set
-# CONFIG_ETRAX_SERIAL_FLUSH_DMA_FAST is not set
-CONFIG_ETRAX_SERIAL_RX_TIMEOUT_TICKS=1
-CONFIG_ETRAX_SERIAL_PORT0=y
-CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_ON_NONE=y
-# CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_ON_PA is not set
-# CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_ON_PB is not set
-# CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_MIXED is not set
-CONFIG_ETRAX_SER0_DTR_ON_PA_BIT=-1
-CONFIG_ETRAX_SER0_RI_ON_PA_BIT=-1
-CONFIG_ETRAX_SER0_DSR_ON_PA_BIT=-1
-CONFIG_ETRAX_SER0_CD_ON_PA_BIT=-1
-CONFIG_ETRAX_SER0_DTR_ON_PB_BIT=-1
-CONFIG_ETRAX_SER0_RI_ON_PB_BIT=-1
-CONFIG_ETRAX_SER0_DSR_ON_PB_BIT=-1
-CONFIG_ETRAX_SER0_CD_ON_PB_BIT=-1
-# CONFIG_ETRAX_SERIAL_PORT1 is not set
-# CONFIG_ETRAX_SERIAL_PORT2 is not set
-# CONFIG_ETRAX_SERIAL_PORT3 is not set
-# CONFIG_ETRAX_RS485 is not set
-CONFIG_ETRAX_USB_HOST=y
-CONFIG_ETRAX_USB_HOST_PORT1=y
-CONFIG_ETRAX_USB_HOST_PORT2=y
-CONFIG_ETRAX_PTABLE_SECTOR=0
-CONFIG_ETRAX_I2C=y
-CONFIG_ETRAX_I2C_USES_PB_NOT_PB_I2C=y
-CONFIG_ETRAX_I2C_DATA_PORT=0
-CONFIG_ETRAX_I2C_CLK_PORT=1
-# CONFIG_ETRAX_I2C_EEPROM is not set
-CONFIG_ETRAX_GPIO=y
-CONFIG_ETRAX_PA_BUTTON_BITMASK=02
-CONFIG_ETRAX_PA_CHANGEABLE_DIR=0xFF
-CONFIG_ETRAX_PA_CHANGEABLE_BITS=0xFF
-CONFIG_ETRAX_PB_CHANGEABLE_DIR=0xFF
-CONFIG_ETRAX_PB_CHANGEABLE_BITS=0xFF
-# CONFIG_ETRAX_SYNCHRONOUS_SERIAL is not set
-CONFIG_ETRAX_AXISFLASHMAP=y
-# CONFIG_ETRAX_RTC is not set
-# CONFIG_ETRAX_NETWORK_LED_ON_WHEN_LINK is not set
-CONFIG_ETRAX_NETWORK_LED_ON_WHEN_ACTIVITY=y
-CONFIG_ETRAX_SERIAL_PORT0_NO_DMA_OUT=y
-CONFIG_ETRAX_SERIAL_PORT0_NO_DMA_IN=y
-
-#
-# Generic Driver Options
-#
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-# CONFIG_STANDALONE is not set
-# CONFIG_PREVENT_FIRMWARE_BUILD is not set
-# CONFIG_FW_LOADER is not set
-# CONFIG_SYS_HYPERVISOR is not set
-CONFIG_MTD=y
-# CONFIG_MTD_DEBUG is not set
-# CONFIG_MTD_TESTS is not set
-CONFIG_MTD_PARTITIONS=y
-# CONFIG_MTD_REDBOOT_PARTS is not set
-# CONFIG_MTD_CMDLINE_PARTS is not set
-# CONFIG_MTD_AR7_PARTS is not set
-
-#
-# User Modules And Translation Layers
-#
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLKDEVS=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_BLOCK_RO=y
-# CONFIG_FTL is not set
-# CONFIG_NFTL is not set
-# CONFIG_INFTL is not set
-# CONFIG_RFD_FTL is not set
-# CONFIG_SSFDC is not set
-# CONFIG_SM_FTL is not set
-# CONFIG_MTD_OOPS is not set
-
-#
-# RAM/ROM/Flash chip drivers
-#
-CONFIG_MTD_CFI=y
-CONFIG_MTD_JEDECPROBE=y
-CONFIG_MTD_GEN_PROBE=y
-CONFIG_MTD_CFI_ADV_OPTIONS=y
-CONFIG_MTD_CFI_NOSWAP=y
-# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
-# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
-# CONFIG_MTD_CFI_GEOMETRY is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-# CONFIG_MTD_OTP is not set
-# CONFIG_MTD_CFI_INTELEXT is not set
-CONFIG_MTD_CFI_AMDSTD=y
-# CONFIG_MTD_CFI_STAA is not set
-CONFIG_MTD_CFI_UTIL=y
-# CONFIG_MTD_RAM is not set
-# CONFIG_MTD_ROM is not set
-# CONFIG_MTD_ABSENT is not set
-
-#
-# Mapping drivers for chip access
-#
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-# CONFIG_MTD_PHYSMAP is not set
-# CONFIG_MTD_PLATRAM is not set
-# CONFIG_MTD_LATCH_ADDR is not set
-
-#
-# Self-contained MTD device drivers
-#
-# CONFIG_MTD_SLRAM is not set
-# CONFIG_MTD_PHRAM is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_BLOCK2MTD is not set
-
-#
-# Disk-On-Chip Device Drivers
-#
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
-# CONFIG_MTD_NAND is not set
-# CONFIG_MTD_ONENAND is not set
-
-#
-# LPDDR flash memory drivers
-#
-# CONFIG_MTD_LPDDR is not set
-# CONFIG_MTD_UBI is not set
-# CONFIG_PARPORT is not set
-# CONFIG_BLK_DEV is not set
-CONFIG_HAVE_IDE=y
-# CONFIG_IDE is not set
-
-#
-# SCSI device support
-#
-CONFIG_SCSI_MOD=y
-# CONFIG_RAID_ATTRS is not set
-# CONFIG_SCSI is not set
-# CONFIG_SCSI_DMA is not set
-# CONFIG_SCSI_NETLINK is not set
-# CONFIG_MEDIA_SUPPORT is not set
-CONFIG_NETDEVICES=y
-# CONFIG_DUMMY is not set
-# CONFIG_BONDING is not set
-# CONFIG_MACVLAN is not set
-# CONFIG_EQUALIZER is not set
-# CONFIG_TUN is not set
-# CONFIG_VETH is not set
-CONFIG_MII=y
-# CONFIG_PHYLIB is not set
-CONFIG_NET_ETHERNET=y
-# CONFIG_ETHOC is not set
-# CONFIG_DNET is not set
-# CONFIG_IBM_NEW_EMAC_ZMII is not set
-# CONFIG_IBM_NEW_EMAC_RGMII is not set
-# CONFIG_IBM_NEW_EMAC_TAH is not set
-# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
-# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
-# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
-# CONFIG_KS8851_MLL is not set
-# CONFIG_NETDEV_1000 is not set
-# CONFIG_NETDEV_10000 is not set
-CONFIG_WLAN=y
-# CONFIG_USB_ZD1201 is not set
-# CONFIG_HOSTAP is not set
-
-#
-# Enable WiMAX (Networking options) to see the WiMAX drivers
-#
-
-#
-# USB Network Adapters
-#
-# CONFIG_USB_CATC is not set
-# CONFIG_USB_KAWETH is not set
-# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_RTL8150 is not set
-# CONFIG_USB_USBNET is not set
-# CONFIG_USB_IPHETH is not set
-# CONFIG_WAN is not set
-
-#
-# CAIF transport drivers
-#
-# CONFIG_PPP is not set
-# CONFIG_SLIP is not set
-# CONFIG_NETCONSOLE is not set
-# CONFIG_NETPOLL is not set
-# CONFIG_NET_POLL_CONTROLLER is not set
-# CONFIG_I2C is not set
-# CONFIG_RTC_CLASS is not set
-
-#
-# Input device support
-#
-# CONFIG_INPUT is not set
-
-#
-# Hardware I/O ports
-#
-# CONFIG_SERIO is not set
-# CONFIG_GAMEPORT is not set
-
-#
-# Character devices
-#
-# CONFIG_VT is not set
-CONFIG_UNIX98_PTYS=y
-# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_SERIAL_NONSTANDARD is not set
-# CONFIG_N_GSM is not set
-# CONFIG_DEVKMEM is not set
-
-#
-# Serial drivers
-#
-# CONFIG_SERIAL_8250 is not set
-
-#
-# Non-8250 serial port support
-#
-# CONFIG_SERIAL_TIMBERDALE is not set
-# CONFIG_SERIAL_ALTERA_JTAGUART is not set
-# CONFIG_SERIAL_ALTERA_UART is not set
-# CONFIG_TTY_PRINTK is not set
-# CONFIG_IPMI_HANDLER is not set
-# CONFIG_HW_RANDOM is not set
-# CONFIG_RTC is not set
-# CONFIG_GEN_RTC is not set
-# CONFIG_R3964 is not set
-
-#
-# PCMCIA character devices
-#
-# CONFIG_RAW_DRIVER is not set
-# CONFIG_TCG_TPM is not set
-# CONFIG_RAMOOPS is not set
-
-#
-# File systems
-#
-# CONFIG_EXT2_FS is not set
-# CONFIG_EXT3_FS is not set
-# CONFIG_EXT4_FS is not set
-# CONFIG_REISERFS_FS is not set
-# CONFIG_JFS_FS is not set
-# CONFIG_XFS_FS is not set
-# CONFIG_BTRFS_FS is not set
-# CONFIG_NILFS2_FS is not set
-CONFIG_FS_POSIX_ACL=y
-CONFIG_EXPORTFS=y
-CONFIG_FILE_LOCKING=y
-CONFIG_FSNOTIFY=y
-# CONFIG_DNOTIFY is not set
-# CONFIG_INOTIFY_USER is not set
-# CONFIG_FANOTIFY is not set
-# CONFIG_QUOTA is not set
-# CONFIG_QUOTACTL is not set
-# CONFIG_AUTOFS4_FS is not set
-# CONFIG_FUSE_FS is not set
-
-#
-# Caches
-#
-# CONFIG_FSCACHE is not set
-
-#
-# CD-ROM/DVD Filesystems
-#
-# CONFIG_ISO9660_FS is not set
-# CONFIG_UDF_FS is not set
-
-#
-# DOS/FAT/NT Filesystems
-#
-# CONFIG_MSDOS_FS is not set
-# CONFIG_VFAT_FS is not set
-# CONFIG_NTFS_FS is not set
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-# CONFIG_PROC_KCORE is not set
-CONFIG_PROC_SYSCTL=y
-# CONFIG_PROC_PAGE_MONITOR is not set
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-# CONFIG_TMPFS_POSIX_ACL is not set
-# CONFIG_HUGETLB_PAGE is not set
-# CONFIG_CONFIGFS_FS is not set
-# CONFIG_MISC_FILESYSTEMS is not set
-# CONFIG_NETWORK_FILESYSTEMS is not set
-
-#
-# Partition Types
-#
-# CONFIG_PARTITION_ADVANCED is not set
-CONFIG_MSDOS_PARTITION=y
-# CONFIG_NLS is not set
-# CONFIG_SOUND is not set
-CONFIG_USB_SUPPORT=y
-# CONFIG_USB_ARCH_HAS_HCD is not set
-# CONFIG_USB_ARCH_HAS_OHCI is not set
-# CONFIG_USB_ARCH_HAS_EHCI is not set
-CONFIG_USB=y
-# CONFIG_USB_DEBUG is not set
-# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
-
-#
-# Miscellaneous USB options
-#
-# CONFIG_USB_DEVICEFS is not set
-# CONFIG_USB_DEVICE_CLASS is not set
-# CONFIG_USB_DYNAMIC_MINORS is not set
-# CONFIG_USB_OTG_WHITELIST is not set
-# CONFIG_USB_OTG_BLACKLIST_HUB is not set
-# CONFIG_USB_MON is not set
-# CONFIG_USB_WUSB is not set
-# CONFIG_USB_WUSB_CBAF is not set
-
-#
-# USB Host Controller Drivers
-#
-# CONFIG_USB_C67X00_HCD is not set
-# CONFIG_USB_OXU210HP_HCD is not set
-# CONFIG_USB_ISP116X_HCD is not set
-# CONFIG_USB_ISP1760_HCD is not set
-# CONFIG_USB_ISP1362_HCD is not set
-# CONFIG_USB_SL811_HCD is not set
-# CONFIG_USB_R8A66597_HCD is not set
-# CONFIG_USB_HWA_HCD is not set
-
-#
-# USB Device Class drivers
-#
-# CONFIG_USB_ACM is not set
-# CONFIG_USB_PRINTER is not set
-# CONFIG_USB_WDM is not set
-# CONFIG_USB_TMC is not set
-
-#
-# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
-#
-
-#
-# also be needed; see USB_STORAGE Help for more info
-#
-# CONFIG_USB_LIBUSUAL is not set
-
-#
-# USB Imaging devices
-#
-# CONFIG_USB_MDC800 is not set
-
-#
-# USB port drivers
-#
-# CONFIG_USB_SERIAL is not set
-
-#
-# USB Miscellaneous drivers
-#
-# CONFIG_USB_EMI62 is not set
-# CONFIG_USB_EMI26 is not set
-# CONFIG_USB_ADUTUX is not set
-# CONFIG_USB_SEVSEG is not set
-# CONFIG_USB_RIO500 is not set
-# CONFIG_USB_LEGOTOWER is not set
-# CONFIG_USB_LCD is not set
-# CONFIG_USB_LED is not set
-# CONFIG_USB_CYPRESS_CY7C63 is not set
-# CONFIG_USB_CYTHERM is not set
-# CONFIG_USB_IDMOUSE is not set
-# CONFIG_USB_FTDI_ELAN is not set
-# CONFIG_USB_APPLEDISPLAY is not set
-# CONFIG_USB_LD is not set
-# CONFIG_USB_TRANCEVIBRATOR is not set
-# CONFIG_USB_IOWARRIOR is not set
-# CONFIG_USB_TEST is not set
-# CONFIG_USB_ISIGHTFW is not set
-# CONFIG_USB_YUREX is not set
-# CONFIG_USB_GADGET is not set
-
-#
-# OTG and related infrastructure
-#
-# CONFIG_NOP_USB_XCEIV is not set
-# CONFIG_STAGING is not set
-
-#
-# Kernel hacking
-#
-# CONFIG_SYSTEM_PROFILER is not set
-CONFIG_PRINTK_TIME=y
-CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
-# CONFIG_ENABLE_WARN_DEPRECATED is not set
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_FRAME_WARN=1024
-CONFIG_MAGIC_SYSRQ=y
-# CONFIG_STRIP_ASM_SYMS is not set
-# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_DEBUG_FS is not set
-# CONFIG_HEADERS_CHECK is not set
-# CONFIG_DEBUG_SECTION_MISMATCH is not set
-# CONFIG_DEBUG_KERNEL is not set
-# CONFIG_HARDLOCKUP_DETECTOR is not set
-# CONFIG_SPARSE_RCU_POINTER is not set
-# CONFIG_DEBUG_MEMORY_INIT is not set
-# CONFIG_SYSCTL_SYSCALL_CHECK is not set
-# CONFIG_ATOMIC64_SELFTEST is not set
-# CONFIG_SAMPLES is not set
-# CONFIG_TEST_KSTRTOX is not set
-# CONFIG_NO_SEGFAULT_TERMINATION is not set
-
-#
-# Security options
-#
-# CONFIG_KEYS is not set
-# CONFIG_SECURITY_DMESG_RESTRICT is not set
-# CONFIG_SECURITY is not set
-# CONFIG_SECURITYFS is not set
-CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_DEFAULT_SECURITY=""
-CONFIG_CRYPTO=y
-
-#
-# Crypto core or helper
-#
-CONFIG_CRYPTO_ALGAPI=m
-CONFIG_CRYPTO_ALGAPI2=m
-CONFIG_CRYPTO_AEAD2=m
-CONFIG_CRYPTO_BLKCIPHER2=m
-CONFIG_CRYPTO_HASH2=m
-CONFIG_CRYPTO_RNG=m
-CONFIG_CRYPTO_RNG2=m
-CONFIG_CRYPTO_PCOMP2=m
-CONFIG_CRYPTO_MANAGER=m
-CONFIG_CRYPTO_MANAGER2=m
-CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
-# CONFIG_CRYPTO_GF128MUL is not set
-# CONFIG_CRYPTO_NULL is not set
-CONFIG_CRYPTO_WORKQUEUE=m
-# CONFIG_CRYPTO_CRYPTD is not set
-# CONFIG_CRYPTO_AUTHENC is not set
-# CONFIG_CRYPTO_TEST is not set
-
-#
-# Authenticated Encryption with Associated Data
-#
-# CONFIG_CRYPTO_CCM is not set
-# CONFIG_CRYPTO_GCM is not set
-# CONFIG_CRYPTO_SEQIV is not set
-
-#
-# Block modes
-#
-# CONFIG_CRYPTO_CBC is not set
-# CONFIG_CRYPTO_CTR is not set
-# CONFIG_CRYPTO_CTS is not set
-# CONFIG_CRYPTO_ECB is not set
-# CONFIG_CRYPTO_LRW is not set
-# CONFIG_CRYPTO_PCBC is not set
-# CONFIG_CRYPTO_XTS is not set
-
-#
-# Hash modes
-#
-# CONFIG_CRYPTO_HMAC is not set
-# CONFIG_CRYPTO_XCBC is not set
-# CONFIG_CRYPTO_VMAC is not set
-
-#
-# Digest
-#
-# CONFIG_CRYPTO_CRC32C is not set
-# CONFIG_CRYPTO_GHASH is not set
-# CONFIG_CRYPTO_MD4 is not set
-# CONFIG_CRYPTO_MD5 is not set
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
-# CONFIG_CRYPTO_RMD128 is not set
-# CONFIG_CRYPTO_RMD160 is not set
-# CONFIG_CRYPTO_RMD256 is not set
-# CONFIG_CRYPTO_RMD320 is not set
-# CONFIG_CRYPTO_SHA1 is not set
-# CONFIG_CRYPTO_SHA256 is not set
-# CONFIG_CRYPTO_SHA512 is not set
-# CONFIG_CRYPTO_TGR192 is not set
-# CONFIG_CRYPTO_WP512 is not set
-
-#
-# Ciphers
-#
-CONFIG_CRYPTO_AES=m
-# CONFIG_CRYPTO_ANUBIS is not set
-# CONFIG_CRYPTO_ARC4 is not set
-# CONFIG_CRYPTO_BLOWFISH is not set
-# CONFIG_CRYPTO_CAMELLIA is not set
-# CONFIG_CRYPTO_CAST5 is not set
-# CONFIG_CRYPTO_CAST6 is not set
-# CONFIG_CRYPTO_DES is not set
-# CONFIG_CRYPTO_FCRYPT is not set
-# CONFIG_CRYPTO_KHAZAD is not set
-# CONFIG_CRYPTO_SALSA20 is not set
-# CONFIG_CRYPTO_SEED is not set
-# CONFIG_CRYPTO_SERPENT is not set
-# CONFIG_CRYPTO_TEA is not set
-# CONFIG_CRYPTO_TWOFISH is not set
-
-#
-# Compression
-#
-# CONFIG_CRYPTO_DEFLATE is not set
-# CONFIG_CRYPTO_ZLIB is not set
-# CONFIG_CRYPTO_LZO is not set
-
-#
-# Random Number Generation
-#
-CONFIG_CRYPTO_ANSI_CPRNG=m
-# CONFIG_CRYPTO_USER_API_HASH is not set
-# CONFIG_CRYPTO_USER_API_SKCIPHER is not set
-CONFIG_CRYPTO_HW=y
-
-#
-# OCF Configuration
-#
-# CONFIG_OCF_OCF is not set
-# CONFIG_BINARY_PRINTF is not set
-
-#
-# Library routines
-#
-CONFIG_BITREVERSE=y
-CONFIG_GENERIC_FIND_LAST_BIT=y
-# CONFIG_CRC_CCITT is not set
-# CONFIG_CRC16 is not set
-# CONFIG_CRC_T10DIF is not set
-# CONFIG_CRC_ITU_T is not set
-CONFIG_CRC32=y
-# CONFIG_CRC7 is not set
-# CONFIG_LIBCRC32C is not set
-# CONFIG_XZ_DEC is not set
-# CONFIG_XZ_DEC_BCJ is not set
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_DMA=y
-CONFIG_NLATTR=y
-# CONFIG_AVERAGE is not set
diff --git a/target/cris/patches/cris.patch b/target/cris/patches/cris.patch
deleted file mode 100644
index 0fefa318c..000000000
--- a/target/cris/patches/cris.patch
+++ /dev/null
@@ -1,5713 +0,0 @@
-diff -Nur linux-2.6.36.orig/arch/cris/Kconfig linux-2.6.36/arch/cris/Kconfig
---- linux-2.6.36.orig/arch/cris/Kconfig	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/arch/cris/Kconfig	2010-11-15 17:57:17.000000000 +0100
-@@ -177,6 +177,12 @@
- 	help
- 	  Size of DRAM (decimal in MB) typically 2, 8 or 16.
- 
-+config ETRAX_MTD_SIZE
-+	hex "MTD size (hex)"
-+	default "0x00800000"
-+	help
-+	  Size of MTD device typically 4 or 8 MB.
-+
- config ETRAX_VMEM_SIZE
-        int "Video memory size (dec, in MB)"
-        depends on ETRAX_ARCH_V32 && !ETRAXFS
-@@ -282,7 +288,7 @@
- 	select MTD_CFI_AMDSTD
- 	select MTD_JEDECPROBE if ETRAX_ARCH_V32
- 	select MTD_CHAR
--	select MTD_BLOCK
-+	select MTD_BLOCK_RO
- 	select MTD_PARTITIONS
- 	select MTD_CONCAT
- 	select MTD_COMPLEX_MAPPINGS
-@@ -671,6 +677,11 @@
- 
- source "drivers/ide/Kconfig"
- 
-+#mysteriously part of this standard linux driver was removed from cris build! - info@crisos.org  
-+source "drivers/scsi/Kconfig"
-+
-+source "drivers/media/Kconfig"
-+
- source "drivers/net/Kconfig"
- 
- source "drivers/i2c/Kconfig"
-diff -Nur linux-2.6.36.orig/arch/cris/Makefile linux-2.6.36/arch/cris/Makefile
---- linux-2.6.36.orig/arch/cris/Makefile	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/arch/cris/Makefile	2010-11-15 17:57:17.000000000 +0100
-@@ -40,10 +40,10 @@
- 
- LD = $(CROSS_COMPILE)ld -mcrislinux
- 
--OBJCOPYFLAGS := -O binary -R .note -R .comment -S
-+OBJCOPYFLAGS := -O binary -R .bss -R .note -R .note.gnu.build-id -R .comment -S
- 
- KBUILD_AFLAGS += -mlinux -march=$(arch-y) $(inc)
--KBUILD_CFLAGS += -mlinux -march=$(arch-y) -pipe $(inc)
-+KBUILD_CFLAGS += -mlinux -march=$(arch-y) -pipe -fno-peephole2 $(inc)
- KBUILD_CPPFLAGS += $(inc)
- 
- ifdef CONFIG_FRAME_POINTER
-diff -Nur linux-2.6.36.orig/arch/cris/arch-v10/drivers/axisflashmap.c linux-2.6.36/arch/cris/arch-v10/drivers/axisflashmap.c
---- linux-2.6.36.orig/arch/cris/arch-v10/drivers/axisflashmap.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/arch/cris/arch-v10/drivers/axisflashmap.c	2010-11-15 17:57:17.000000000 +0100
-@@ -113,7 +113,7 @@
- 
- /* If no partition-table was found, we use this default-set. */
- #define MAX_PARTITIONS         7
--#define NUM_DEFAULT_PARTITIONS 3
-+#define NUM_DEFAULT_PARTITIONS 4
- 
- /*
-  * Default flash size is 2MB. CONFIG_ETRAX_PTABLE_SECTOR is most likely the
-@@ -122,19 +122,24 @@
-  */
- static struct mtd_partition axis_default_partitions[NUM_DEFAULT_PARTITIONS] = {
- 	{
--		.name = "boot firmware",
--		.size = CONFIG_ETRAX_PTABLE_SECTOR,
-+		.name = "kernel",
-+		.size = 0x00,
- 		.offset = 0
- 	},
- 	{
--		.name = "kernel",
--		.size = 0x200000 - (6 * CONFIG_ETRAX_PTABLE_SECTOR),
--		.offset = CONFIG_ETRAX_PTABLE_SECTOR
-+		.name = "rootfs",
-+		.size = 0x200000 ,
-+		.offset = 0x200000
- 	},
- 	{
--		.name = "filesystem",
--		.size = 5 * CONFIG_ETRAX_PTABLE_SECTOR,
--		.offset = 0x200000 - (5 * CONFIG_ETRAX_PTABLE_SECTOR)
-+		.name = "cfgfs",
-+		.size = 0x20000 ,
-+		.offset = CONFIG_ETRAX_MTD_SIZE - 0x20000
-+	},
-+	{
-+		.name = "linux",
-+		.size = CONFIG_ETRAX_MTD_SIZE - 0x20000,
-+		.offset = 0
- 	}
- };
- 
-@@ -281,6 +286,11 @@
- 	struct partitiontable_entry *ptable;
- 	int use_default_ptable = 1; /* Until proven otherwise. */
- 	const char pmsg[] = "  /dev/flash%d at 0x%08x, size 0x%08x\n";
-+	unsigned int kernel_part_size = 0;
-+	unsigned char *flash_mem = (unsigned char*)(FLASH_CACHED_ADDR);
-+	unsigned int flash_scan_count = 0;
-+	const char *part_magic = "ACME_PART_MAGIC";
-+	unsigned int magic_len = strlen(part_magic);
- 
- 	if (!(mymtd = flash_probe())) {
- 		/* There's no reason to use this module if no flash chip can
-@@ -292,6 +302,31 @@
- 		       mymtd->name, mymtd->size);
- 		axisflash_mtd = mymtd;
- 	}
-+	/* scan flash to findout where out partition starts */
-+
-+	printk(KERN_INFO "Scanning flash for end of kernel magic\n");
-+	for(flash_scan_count = 0; flash_scan_count < 100000; flash_scan_count++){
-+		if(strncmp(&flash_mem[flash_scan_count], part_magic, magic_len - 1) == 0)
-+		{
-+			kernel_part_size = flash_mem[flash_scan_count + magic_len ];
-+			kernel_part_size <<= 8;
-+			kernel_part_size += flash_mem[flash_scan_count + magic_len + 2];
-+			kernel_part_size <<= 8;
-+			kernel_part_size += flash_mem[flash_scan_count + magic_len + 1];
-+			kernel_part_size <<= 8;
-+			kernel_part_size += flash_mem[flash_scan_count + magic_len + 3];
-+			printk(KERN_INFO "Kernel ends at 0x%.08X\n", kernel_part_size);
-+			flash_scan_count = 1100000;
-+		}
-+	}
-+
-+
-+	if(kernel_part_size){
-+		kernel_part_size = (kernel_part_size & 0xffff0000);
-+		axis_default_partitions[0].size = kernel_part_size;
-+		axis_default_partitions[1].size =  mymtd->size - axis_default_partitions[0].size - axis_default_partitions[2].size;
-+		axis_default_partitions[1].offset = axis_default_partitions[0].size;
-+	}
- 
- 	if (mymtd) {
- 		mymtd->owner = THIS_MODULE;
-@@ -360,21 +395,6 @@
- 		use_default_ptable = !ptable_ok;
- 	}
- 
--	if (romfs_in_flash) {
--		/* Add an overlapping device for the root partition (romfs). */
--
--		axis_partitions[pidx].name = "romfs";
--		axis_partitions[pidx].size = romfs_length;
--		axis_partitions[pidx].offset = romfs_start - FLASH_CACHED_ADDR;
--		axis_partitions[pidx].mask_flags |= MTD_WRITEABLE;
--
--		printk(KERN_INFO
--                       " Adding readonly flash partition for romfs image:\n");
--		printk(pmsg, pidx, axis_partitions[pidx].offset,
--		       axis_partitions[pidx].size);
--		pidx++;
--	}
--
- #ifdef CONFIG_ETRAX_AXISFLASHMAP_MTD0WHOLE
- 	if (mymtd) {
- 		main_partition.size = mymtd->size;
-@@ -397,36 +417,6 @@
- 		if (err)
- 			panic("axisflashmap could not add MTD partitions!\n");
- 	}
--
--	if (!romfs_in_flash) {
--		/* Create an RAM device for the root partition (romfs). */
--
--#if !defined(CONFIG_MTD_MTDRAM) || (CONFIG_MTDRAM_TOTAL_SIZE != 0) || (CONFIG_MTDRAM_ABS_POS != 0)
--		/* No use trying to boot this kernel from RAM. Panic! */
--		printk(KERN_EMERG "axisflashmap: Cannot create an MTD RAM "
--		       "device due to kernel (mis)configuration!\n");
--		panic("This kernel cannot boot from RAM!\n");
--#else
--		struct mtd_info *mtd_ram;
--
--		mtd_ram = kmalloc(sizeof(struct mtd_info), GFP_KERNEL);
--		if (!mtd_ram)
--			panic("axisflashmap couldn't allocate memory for "
--			      "mtd_info!\n");
--
--		printk(KERN_INFO " Adding RAM partition for romfs image:\n");
--		printk(pmsg, pidx, (unsigned)romfs_start,
--			(unsigned)romfs_length);
--
--		err = mtdram_init_device(mtd_ram,
--			(void *)romfs_start,
--			romfs_length,
--			"romfs");
--		if (err)
--			panic("axisflashmap could not initialize MTD RAM "
--			      "device!\n");
--#endif
--	}
- 	return err;
- }
- 
-diff -Nur linux-2.6.36.orig/arch/cris/arch-v10/drivers/ds1302.c linux-2.6.36/arch/cris/arch-v10/drivers/ds1302.c
---- linux-2.6.36.orig/arch/cris/arch-v10/drivers/ds1302.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/arch/cris/arch-v10/drivers/ds1302.c	2010-11-15 17:57:17.000000000 +0100
-@@ -22,6 +22,7 @@
- #include <linux/smp_lock.h>
- #include <linux/bcd.h>
- #include <linux/capability.h>
-+#include <linux/device.h>
- 
- #include <asm/uaccess.h>
- #include <asm/system.h>
-@@ -499,6 +500,10 @@
- 	return 0;
- }
- 
-+#ifdef CONFIG_SYSFS
-+static struct class *rtc_class;
-+#endif
-+
- static int __init ds1302_register(void)
- {
- 	ds1302_init();
-@@ -507,6 +512,12 @@
- 		       ds1302_name, RTC_MAJOR_NR);
- 		return -1;
- 	}
-+	#ifdef CONFIG_SYSFS
-+	rtc_class = class_create(THIS_MODULE, "rtc");
-+	class_device_create(rtc_class, NULL, MKDEV(RTC_MAJOR_NR, 0),
-+		NULL, "rtc");
-+	#endif
-+
-         return 0;
- 
- }
-diff -Nur linux-2.6.36.orig/arch/cris/arch-v10/drivers/gpio.c linux-2.6.36/arch/cris/arch-v10/drivers/gpio.c
---- linux-2.6.36.orig/arch/cris/arch-v10/drivers/gpio.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/arch/cris/arch-v10/drivers/gpio.c	2010-11-15 17:57:17.000000000 +0100
-@@ -20,6 +20,7 @@
- #include <linux/poll.h>
- #include <linux/init.h>
- #include <linux/interrupt.h>
-+#include <linux/device.h>
- 
- #include <asm/etraxgpio.h>
- #include <arch/svinto.h>
-@@ -797,6 +798,10 @@
- 
- /* main driver initialization routine, called from mem.c */
- 
-+#ifdef CONFIG_SYSFS
-+static struct class *gpio_class;
-+#endif
-+
- static int __init gpio_init(void)
- {
- 	int res;
-@@ -810,6 +815,13 @@
- 		return res;
- 	}
- 
-+#ifdef CONFIG_SYSFS
-+	gpio_class = class_create(THIS_MODULE, "gpio");
-+	device_create(gpio_class, NULL, MKDEV(GPIO_MAJOR, 0), NULL, "gpioa");
-+	device_create(gpio_class, NULL, MKDEV(GPIO_MAJOR, 1), NULL, "gpiob");
-+	device_create(gpio_class, NULL, MKDEV(GPIO_MAJOR, 2), NULL, "leds");
-+	device_create(gpio_class, NULL, MKDEV(GPIO_MAJOR, 3), NULL, "gpiog");
-+#endif
- 	/* Clear all leds */
- #if defined (CONFIG_ETRAX_CSP0_LEDS) ||  defined (CONFIG_ETRAX_PA_LEDS) || defined (CONFIG_ETRAX_PB_LEDS)
- 	CRIS_LED_NETWORK_SET(0);
-diff -Nur linux-2.6.36.orig/arch/cris/arch-v10/lib/hw_settings.S linux-2.6.36/arch/cris/arch-v10/lib/hw_settings.S
---- linux-2.6.36.orig/arch/cris/arch-v10/lib/hw_settings.S	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/arch/cris/arch-v10/lib/hw_settings.S	2010-11-15 17:57:17.000000000 +0100
-@@ -58,3 +58,5 @@
- 	.dword R_PORT_PB_SET
- 	.dword PB_SET_VALUE
- 	.dword 0 ; No more register values
-+	.ascii "ACME_PART_MAGIC" 
-+	.dword 0xdeadc0de
-diff -Nur linux-2.6.36.orig/arch/cris/arch-v10/mm/init.c linux-2.6.36/arch/cris/arch-v10/mm/init.c
---- linux-2.6.36.orig/arch/cris/arch-v10/mm/init.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/arch/cris/arch-v10/mm/init.c	2010-11-15 17:57:17.000000000 +0100
-@@ -184,6 +184,9 @@
- 
- 	free_area_init_node(0, zones_size, PAGE_OFFSET >> PAGE_SHIFT, 0);
- }
-+void free_initrd_mem(unsigned long start, unsigned long end)
-+{
-+}
- 
- /* Initialize remaps of some I/O-ports. It is important that this
-  * is called before any driver is initialized.
-diff -Nur linux-2.6.36.orig/arch/cris/boot/Makefile linux-2.6.36/arch/cris/boot/Makefile
---- linux-2.6.36.orig/arch/cris/boot/Makefile	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/arch/cris/boot/Makefile	2010-11-15 17:57:17.000000000 +0100
-@@ -5,7 +5,7 @@
- objcopyflags-$(CONFIG_ETRAX_ARCH_V10) += -R .note -R .comment
- objcopyflags-$(CONFIG_ETRAX_ARCH_V32) += --remove-section=.bss --remove-section=.note.gnu.build-id
- 
--OBJCOPYFLAGS = -O binary $(objcopyflags-y)
-+#OBJCOPYFLAGS = -O binary $(objcopyflags-y)
- 
- 
- subdir- := compressed rescue
-@@ -17,7 +17,6 @@
- 
- $(obj)/compressed/vmlinux: $(obj)/Image FORCE
- 	$(Q)$(MAKE) $(build)=$(obj)/compressed $@
--	$(Q)$(MAKE) $(build)=$(obj)/rescue $(obj)/rescue/rescue.bin
- 
- $(obj)/zImage:  $(obj)/compressed/vmlinux
- 	@cp $< $@
-diff -Nur linux-2.6.36.orig/arch/cris/boot/compressed/Makefile linux-2.6.36/arch/cris/boot/compressed/Makefile
---- linux-2.6.36.orig/arch/cris/boot/compressed/Makefile	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/arch/cris/boot/compressed/Makefile	2010-11-15 17:57:17.000000000 +0100
-@@ -18,7 +18,7 @@
- OBJECTS-$(CONFIG_ETRAX_ARCH_V32) = $(obj)/head_v32.o
- OBJECTS-$(CONFIG_ETRAX_ARCH_V10) = $(obj)/head_v10.o
- OBJECTS= $(OBJECTS-y) $(obj)/misc.o
--OBJCOPYFLAGS = -O binary --remove-section=.bss
-+#OBJCOPYFLAGS = -O binary --remove-section=.bss
- 
- quiet_cmd_image = BUILD   $@
- cmd_image = cat $(obj)/decompress.bin $(obj)/piggy.gz > $@
-diff -Nur linux-2.6.36.orig/drivers/net/cris/eth_v10.c linux-2.6.36/drivers/net/cris/eth_v10.c
---- linux-2.6.36.orig/drivers/net/cris/eth_v10.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/drivers/net/cris/eth_v10.c	2010-11-15 17:57:17.000000000 +0100
-@@ -1718,7 +1718,7 @@
- static void
- e100_netpoll(struct net_device* netdev)
- {
--	e100rxtx_interrupt(NETWORK_DMA_TX_IRQ_NBR, netdev, NULL);
-+	e100rxtx_interrupt(NETWORK_DMA_TX_IRQ_NBR, netdev);
- }
- #endif
- 
-diff -Nur linux-2.6.36.orig/drivers/serial/crisv10.c linux-2.6.36/drivers/serial/crisv10.c
---- linux-2.6.36.orig/drivers/serial/crisv10.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/drivers/serial/crisv10.c	2010-11-15 17:57:17.000000000 +0100
-@@ -13,6 +13,7 @@
- #include <linux/errno.h>
- #include <linux/signal.h>
- #include <linux/sched.h>
-+#include <linux/smp_lock.h> 
- #include <linux/timer.h>
- #include <linux/interrupt.h>
- #include <linux/tty.h>
-@@ -27,6 +28,7 @@
- #include <linux/kernel.h>
- #include <linux/mutex.h>
- #include <linux/bitops.h>
-+#include <linux/device.h>
- #include <linux/seq_file.h>
- #include <linux/delay.h>
- #include <linux/module.h>
-@@ -4426,6 +4428,7 @@
- #endif
- };
- 
-+static struct class *rs_class;
- static int __init rs_init(void)
- {
- 	int i;
-@@ -4559,6 +4562,24 @@
- #endif
- #endif /* CONFIG_SVINTO_SIM */
- 
-+	rs_class = class_create(THIS_MODULE, "rs_tty");
-+#ifdef CONFIG_ETRAX_SERIAL_PORT0 
-+	device_create(rs_class, NULL,
-+		MKDEV(TTY_MAJOR, 64), NULL, "ttyS0");
-+#endif
-+#ifdef CONFIG_ETRAX_SERIAL_PORT1 
-+	device_create(rs_class, NULL,
-+		MKDEV(TTY_MAJOR, 65), NULL, "ttyS1");
-+#endif
-+#ifdef CONFIG_ETRAX_SERIAL_PORT2 
-+	device_create(rs_class, NULL,
-+		MKDEV(TTY_MAJOR, 66), NULL, "ttyS2");
-+#endif
-+#ifdef CONFIG_ETRAX_SERIAL_PORT3 
-+	device_create(rs_class, NULL,
-+		MKDEV(TTY_MAJOR, 67), NULL, "ttyS3");
-+#endif
-+
- 	return 0;
- }
- 
-diff -Nur linux-2.6.36.orig/drivers/usb/Makefile linux-2.6.36/drivers/usb/Makefile
---- linux-2.6.36.orig/drivers/usb/Makefile	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/drivers/usb/Makefile	2010-11-15 17:57:18.000000000 +0100
-@@ -21,6 +21,7 @@
- obj-$(CONFIG_USB_R8A66597_HCD)	+= host/
- obj-$(CONFIG_USB_HWA_HCD)	+= host/
- obj-$(CONFIG_USB_ISP1760_HCD)	+= host/
-+obj-$(CONFIG_ETRAX_USB_HOST)	+= host/
- obj-$(CONFIG_USB_IMX21_HCD)	+= host/
- 
- obj-$(CONFIG_USB_C67X00_HCD)	+= c67x00/
-diff -Nur linux-2.6.36.orig/drivers/usb/host/Makefile linux-2.6.36/drivers/usb/host/Makefile
---- linux-2.6.36.orig/drivers/usb/host/Makefile	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/drivers/usb/host/Makefile	2010-11-15 17:57:18.000000000 +0100
-@@ -32,5 +32,6 @@
- obj-$(CONFIG_USB_R8A66597_HCD)	+= r8a66597-hcd.o
- obj-$(CONFIG_USB_ISP1760_HCD)	+= isp1760.o
- obj-$(CONFIG_USB_HWA_HCD)	+= hwa-hc.o
-+obj-$(CONFIG_ETRAX_USB_HOST)	+= hc-crisv10.o
- obj-$(CONFIG_USB_IMX21_HCD)	+= imx21-hcd.o
- 
-diff -Nur linux-2.6.36.orig/drivers/usb/host/hc-cris-dbg.h linux-2.6.36/drivers/usb/host/hc-cris-dbg.h
---- linux-2.6.36.orig/drivers/usb/host/hc-cris-dbg.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36/drivers/usb/host/hc-cris-dbg.h	2010-11-15 17:57:17.000000000 +0100
-@@ -0,0 +1,146 @@
-+
-+/* macros for debug output */
-+
-+#define warn(fmt, args...) \
-+        printk(KERN_INFO "crisv10 warn: ");printk(fmt, ## args)
-+
-+#define hcd_dbg(hcd, fmt, args...) \
-+	dev_info(hcd->self.controller, fmt, ## args)
-+#define hcd_err(hcd, fmt, args...) \
-+	dev_err(hcd->self.controller, fmt, ## args)
-+#define hcd_info(hcd, fmt, args...) \
-+	dev_info(hcd->self.controller, fmt, ## args)
-+#define hcd_warn(hcd, fmt, args...) \
-+	dev_warn(hcd->self.controller, fmt, ## args)
-+
-+/*
-+#define devdrv_dbg(fmt, args...) \
-+        printk(KERN_INFO "usb_devdrv dbg: ");printk(fmt, ## args)
-+*/
-+#define devdrv_dbg(fmt, args...) {}
-+
-+#define devdrv_err(fmt, args...) \
-+        printk(KERN_ERR "usb_devdrv error: ");printk(fmt, ## args)
-+#define devdrv_info(fmt, args...) \
-+        printk(KERN_INFO "usb_devdrv: ");printk(fmt, ## args)
-+
-+#define irq_dbg(fmt, args...) \
-+        printk(KERN_INFO "crisv10_irq dbg: ");printk(fmt, ## args)
-+#define irq_err(fmt, args...) \
-+        printk(KERN_ERR "crisv10_irq error: ");printk(fmt, ## args)
-+#define irq_warn(fmt, args...) \
-+        printk(KERN_INFO "crisv10_irq warn: ");printk(fmt, ## args)
-+#define irq_info(fmt, args...) \
-+        printk(KERN_INFO "crisv10_hcd: ");printk(fmt, ## args)
-+
-+/*
-+#define rh_dbg(fmt, args...) \
-+  printk(KERN_DEBUG "crisv10_rh dbg: ");printk(fmt, ## args)
-+*/
-+#define rh_dbg(fmt, args...) {}
-+
-+#define rh_err(fmt, args...) \
-+        printk(KERN_ERR "crisv10_rh error: ");printk(fmt, ## args)
-+#define rh_warn(fmt, args...) \
-+        printk(KERN_INFO "crisv10_rh warning: ");printk(fmt, ## args)
-+#define rh_info(fmt, args...) \
-+        printk(KERN_INFO "crisv10_rh: ");printk(fmt, ## args)
-+
-+/*
-+#define tc_dbg(fmt, args...) \
-+        printk(KERN_INFO "crisv10_tc dbg: ");printk(fmt, ## args)
-+*/
-+#define tc_dbg(fmt, args...) {while(0){}}
-+
-+#define tc_err(fmt, args...) \
-+        printk(KERN_ERR "crisv10_tc error: ");printk(fmt, ## args)
-+/*
-+#define tc_warn(fmt, args...) \
-+        printk(KERN_INFO "crisv10_tc warning: ");printk(fmt, ## args)
-+*/
-+#define tc_warn(fmt, args...) {while(0){}}
-+
-+#define tc_info(fmt, args...) \
-+        printk(KERN_INFO "crisv10_tc: ");printk(fmt, ## args)
-+
-+
-+/* Debug print-outs for various traffic types */
-+
-+#define intr_warn(fmt, args...) \
-+        printk(KERN_INFO "crisv10_intr warning: ");printk(fmt, ## args)
-+
-+#define intr_dbg(fmt, args...) \
-+        printk(KERN_DEBUG "crisv10_intr dbg: ");printk(fmt, ## args)
-+/*
-+#define intr_dbg(fmt, args...) {while(0){}}
-+*/
-+
-+
-+#define isoc_err(fmt, args...) \
-+        printk(KERN_ERR "crisv10_isoc error: ");printk(fmt, ## args)
-+/*
-+#define isoc_warn(fmt, args...) \
-+        printk(KERN_INFO "crisv10_isoc warning: ");printk(fmt, ## args)
-+*/
-+#define isoc_warn(fmt, args...) {while(0){}}
-+
-+/*
-+#define isoc_dbg(fmt, args...) \
-+        printk(KERN_INFO "crisv10_isoc dbg: ");printk(fmt, ## args)
-+*/
-+#define isoc_dbg(fmt, args...) {while(0){}}
-+
-+/*
-+#define timer_warn(fmt, args...) \
-+        printk(KERN_INFO "crisv10_timer warning: ");printk(fmt, ## args)
-+*/
-+#define timer_warn(fmt, args...) {while(0){}}
-+
-+/*
-+#define timer_dbg(fmt, args...) \
-+        printk(KERN_INFO "crisv10_timer dbg: ");printk(fmt, ## args)
-+*/
-+#define timer_dbg(fmt, args...) {while(0){}}
-+
-+
-+/* Debug printouts for events related to late finishing of URBs */
-+
-+#define late_dbg(fmt, args...) \
-+        printk(KERN_INFO "crisv10_late dbg: ");printk(fmt, ## args)
-+/*
-+#define late_dbg(fmt, args...) {while(0){}}
-+*/
-+
-+#define late_warn(fmt, args...) \
-+        printk(KERN_INFO "crisv10_late warning: ");printk(fmt, ## args)
-+/*
-+#define errno_dbg(fmt, args...) \
-+        printk(KERN_INFO "crisv10_errno dbg: ");printk(fmt, ## args)
-+*/
-+#define errno_dbg(fmt, args...) {while(0){}}
-+
-+
-+#define dma_dbg(fmt, args...) \
-+        printk(KERN_INFO "crisv10_dma dbg: ");printk(fmt, ## args)
-+#define dma_err(fmt, args...) \
-+        printk(KERN_ERR "crisv10_dma error: ");printk(fmt, ## args)
-+#define dma_warn(fmt, args...) \
-+        printk(KERN_INFO "crisv10_dma warning: ");printk(fmt, ## args)
-+#define dma_info(fmt, args...) \
-+        printk(KERN_INFO "crisv10_dma: ");printk(fmt, ## args)
-+
-+
-+
-+#define str_dir(pipe) \
-+	(usb_pipeout(pipe) ? "out" : "in")
-+#define str_type(pipe) \
-+	({								\
-+		char *s = "?";						\
-+		switch (usb_pipetype(pipe)) {				\
-+		case PIPE_ISOCHRONOUS:	s = "iso";  break;		\
-+		case PIPE_INTERRUPT:	s = "intr"; break;		\
-+		case PIPE_CONTROL:	s = "ctrl"; break;		\
-+		case PIPE_BULK:		s = "bulk"; break;		\
-+		};							\
-+		s;							\
-+	})
-diff -Nur linux-2.6.36.orig/drivers/usb/host/hc-crisv10.c linux-2.6.36/drivers/usb/host/hc-crisv10.c
---- linux-2.6.36.orig/drivers/usb/host/hc-crisv10.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36/drivers/usb/host/hc-crisv10.c	2010-11-15 17:57:18.000000000 +0100
-@@ -0,0 +1,4801 @@
-+/*
-+ *
-+ * ETRAX 100LX USB Host Controller Driver
-+ *
-+ * Copyright (C) 2005, 2006  Axis Communications AB
-+ *
-+ * Author: Konrad Eriksson <konrad.eriksson@axis.se>
-+ *
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/moduleparam.h>
-+#include <linux/slab.h>
-+#include <linux/spinlock.h>
-+#include <linux/usb.h>
-+#include <linux/platform_device.h>
-+#include <linux/usb/hcd.h>
-+
-+#include <asm/io.h>
-+#include <asm/irq.h>
-+#include <arch/dma.h>
-+#include <arch/io_interface_mux.h>
-+
-+#include "hc-crisv10.h"
-+#include "hc-cris-dbg.h"
-+
-+
-+/***************************************************************************/
-+/***************************************************************************/
-+/* Host Controller settings                                                */
-+/***************************************************************************/
-+/***************************************************************************/
-+
-+#define VERSION			"1.00 hinko.4"
-+#define COPYRIGHT		"(c) 2005, 2006 Axis Communications AB"
-+#define DESCRIPTION     "ETRAX 100LX USB Host Controller"
-+
-+#define ETRAX_USB_HC_IRQ USB_HC_IRQ_NBR
-+#define ETRAX_USB_RX_IRQ USB_DMA_RX_IRQ_NBR
-+#define ETRAX_USB_TX_IRQ USB_DMA_TX_IRQ_NBR
-+
-+/* Number of physical ports in Etrax 100LX */
-+#define USB_ROOT_HUB_PORTS 2
-+
-+const char hc_name[] = "hc-crisv10";
-+const char product_desc[] = DESCRIPTION;
-+
-+/* The number of epids is, among other things, used for pre-allocating
-+   ctrl, bulk and isoc EP descriptors (one for each epid).
-+   Assumed to be > 1 when initiating the DMA lists. */
-+#define NBR_OF_EPIDS       32
-+
-+/* Support interrupt traffic intervals up to 128 ms. */
-+#define MAX_INTR_INTERVAL  128
-+
-+/* If periodic traffic (intr or isoc) is to be used, then one entry in the EP
-+   table must be "invalid". By this we mean that we shouldn't care about epid
-+   attentions for this epid, or at least handle them differently from epid
-+   attentions for "valid" epids. This define determines which one to use
-+   (don't change it). */
-+#define INVALID_EPID       31
-+/* A special epid for the bulk dummys. */
-+#define DUMMY_EPID         30
-+
-+/* Module settings */
-+
-+MODULE_DESCRIPTION(DESCRIPTION);
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Konrad Eriksson <konrad.eriksson@axis.se>");
-+
-+
-+/* Module parameters */
-+
-+/* 0 = No ports enabled
-+   1 = Only port 1 enabled (on board ethernet on devboard)
-+   2 = Only port 2 enabled (external connector on devboard)
-+   3 = Both ports enabled
-+*/
-+static unsigned int ports = 3;
-+module_param(ports, uint, S_IRUGO);
-+MODULE_PARM_DESC(ports, "Bitmask indicating USB ports to use");
-+
-+
-+/***************************************************************************/
-+/***************************************************************************/
-+/* Shared global variables for this module                                 */
-+/***************************************************************************/
-+/***************************************************************************/
-+
-+/* EP descriptor lists for non period transfers. Must be 32-bit aligned. */
-+static volatile struct USB_EP_Desc TxBulkEPList[NBR_OF_EPIDS] __attribute__ ((aligned (4)));
-+
-+static volatile struct USB_EP_Desc TxCtrlEPList[NBR_OF_EPIDS] __attribute__ ((aligned (4)));
-+
-+/* EP descriptor lists for period transfers. Must be 32-bit aligned. */
-+static volatile struct USB_EP_Desc TxIntrEPList[MAX_INTR_INTERVAL] __attribute__ ((aligned (4)));
-+static volatile struct USB_SB_Desc TxIntrSB_zout __attribute__ ((aligned (4)));
-+
-+static volatile struct USB_EP_Desc TxIsocEPList[NBR_OF_EPIDS] __attribute__ ((aligned (4)));
-+static volatile struct USB_SB_Desc TxIsocSB_zout __attribute__ ((aligned (4)));
-+
-+//static volatile struct USB_SB_Desc TxIsocSBList[NBR_OF_EPIDS] __attribute__ ((aligned (4))); 
-+
-+/* After each enabled bulk EP IN we put two disabled EP descriptors with the eol flag set,
-+   causing the DMA to stop the DMA channel. The first of these two has the intr flag set, which
-+   gives us a dma8_sub0_descr interrupt. When we receive this, we advance the DMA one step in the
-+   EP list and then restart the bulk channel, thus forcing a switch between bulk EP descriptors
-+   in each frame. */
-+static volatile struct USB_EP_Desc TxBulkDummyEPList[NBR_OF_EPIDS][2] __attribute__ ((aligned (4)));
-+
-+/* List of URB pointers, where each points to the active URB for a epid.
-+   For Bulk, Ctrl and Intr this means which URB that currently is added to
-+   DMA lists (Isoc URBs are all directly added to DMA lists). As soon as
-+   URB has completed is the queue examined and the first URB in queue is
-+   removed and moved to the activeUrbList while its state change to STARTED and
-+   its transfer(s) gets added to DMA list (exception Isoc where URBs enter
-+   state STARTED directly and added transfers added to DMA lists). */
-+static struct urb *activeUrbList[NBR_OF_EPIDS];
-+
-+/* Additional software state info for each epid */
-+static struct etrax_epid epid_state[NBR_OF_EPIDS];
-+
-+/* Timer handles for bulk traffic timer used to avoid DMA bug where DMA stops
-+   even if there is new data waiting to be processed */
-+static struct timer_list bulk_start_timer = TIMER_INITIALIZER(NULL, 0, 0);
-+static struct timer_list bulk_eot_timer = TIMER_INITIALIZER(NULL, 0, 0);
-+
-+/* We want the start timer to expire before the eot timer, because the former
-+   might start traffic, thus making it unnecessary for the latter to time
-+   out. */
-+#define BULK_START_TIMER_INTERVAL (HZ/50) /* 20 ms */
-+#define BULK_EOT_TIMER_INTERVAL (HZ/16) /* 60 ms */
-+
-+/* Delay before a URB completion happen when it's scheduled to be delayed */
-+#define LATER_TIMER_DELAY (HZ/50) /* 20 ms */
-+
-+/* Simplifying macros for checking software state info of a epid */
-+/* ----------------------------------------------------------------------- */
-+#define epid_inuse(epid)       epid_state[epid].inuse
-+#define epid_out_traffic(epid) epid_state[epid].out_traffic
-+#define epid_isoc(epid)   (epid_state[epid].type == PIPE_ISOCHRONOUS ? 1 : 0)
-+#define epid_intr(epid)   (epid_state[epid].type == PIPE_INTERRUPT ? 1 : 0)
-+
-+
-+/***************************************************************************/
-+/***************************************************************************/
-+/* DEBUG FUNCTIONS                                                         */
-+/***************************************************************************/
-+/***************************************************************************/
-+/* Note that these functions are always available in their "__" variants,
-+   for use in error situations. The "__" missing variants are controlled by
-+   the USB_DEBUG_DESC/USB_DEBUG_URB macros. */
-+static void __dump_urb(struct urb* purb)
-+{
-+  struct crisv10_urb_priv *urb_priv = purb->hcpriv;
-+  int urb_num = -1;
-+  if(urb_priv) {
-+    urb_num = urb_priv->urb_num;
-+  }
-+  printk("\nURB:0x%x[%d]\n", (unsigned int)purb, urb_num);
-+  printk("dev                   :0x%08lx\n", (unsigned long)purb->dev);
-+  printk("pipe                  :0x%08x\n", purb->pipe);
-+  printk("status                :%d\n", purb->status);
-+  printk("transfer_flags        :0x%08x\n", purb->transfer_flags);
-+  printk("transfer_buffer       :0x%08lx\n", (unsigned long)purb->transfer_buffer);
-+  printk("transfer_buffer_length:%d\n", purb->transfer_buffer_length);
-+  printk("actual_length         :%d\n", purb->actual_length);
-+  printk("setup_packet          :0x%08lx\n", (unsigned long)purb->setup_packet);
-+  printk("start_frame           :%d\n", purb->start_frame);
-+  printk("number_of_packets     :%d\n", purb->number_of_packets);
-+  printk("interval              :%d\n", purb->interval);
-+  printk("error_count           :%d\n", purb->error_count);
-+  printk("context               :0x%08lx\n", (unsigned long)purb->context);
-+  printk("complete              :0x%08lx\n\n", (unsigned long)purb->complete);
-+}
-+
-+static void __dump_in_desc(volatile struct USB_IN_Desc *in)
-+{
-+  printk("\nUSB_IN_Desc at 0x%08lx\n", (unsigned long)in);
-+  printk("  sw_len  : 0x%04x (%d)\n", in->sw_len, in->sw_len);
-+  printk("  command : 0x%04x\n", in->command);
-+  printk("  next    : 0x%08lx\n", in->next);
-+  printk("  buf     : 0x%08lx\n", in->buf);
-+  printk("  hw_len  : 0x%04x (%d)\n", in->hw_len, in->hw_len);
-+  printk("  status  : 0x%04x\n\n", in->status);
-+}
-+
-+static void __dump_sb_desc(volatile struct USB_SB_Desc *sb)
-+{
-+  char tt = (sb->command & 0x30) >> 4;
-+  char *tt_string;
-+
-+  switch (tt) {
-+  case 0:
-+    tt_string = "zout";
-+    break;
-+  case 1:
-+    tt_string = "in";
-+    break;
-+  case 2:
-+    tt_string = "out";
-+    break;
-+  case 3:
-+    tt_string = "setup";
-+    break;
-+  default:
-+    tt_string = "unknown (weird)";
-+  }
-+
-+  printk(" USB_SB_Desc at 0x%08lx ", (unsigned long)sb);
-+  printk(" command:0x%04x (", sb->command);
-+  printk("rem:%d ", (sb->command & 0x3f00) >> 8);
-+  printk("full:%d ", (sb->command & 0x40) >> 6);
-+  printk("tt:%d(%s) ", tt, tt_string);
-+  printk("intr:%d ", (sb->command & 0x8) >> 3);
-+  printk("eot:%d ", (sb->command & 0x2) >> 1);
-+  printk("eol:%d)", sb->command & 0x1);
-+  printk(" sw_len:0x%04x(%d)", sb->sw_len, sb->sw_len);
-+  printk(" next:0x%08lx", sb->next);
-+  printk(" buf:0x%08lx\n", sb->buf);
-+}
-+
-+
-+static void __dump_ep_desc(volatile struct USB_EP_Desc *ep)
-+{
-+  printk("USB_EP_Desc at 0x%08lx ", (unsigned long)ep);
-+  printk(" command:0x%04x (", ep->command);
-+  printk("ep_id:%d ", (ep->command & 0x1f00) >> 8);
-+  printk("enable:%d ", (ep->command & 0x10) >> 4);
-+  printk("intr:%d ", (ep->command & 0x8) >> 3);
-+  printk("eof:%d ", (ep->command & 0x2) >> 1);
-+  printk("eol:%d)", ep->command & 0x1);
-+  printk(" hw_len:0x%04x(%d)", ep->hw_len, ep->hw_len);
-+  printk(" next:0x%08lx", ep->next);
-+  printk(" sub:0x%08lx\n", ep->sub);
-+}
-+
-+static inline void __dump_ep_list(int pipe_type)
-+{
-+  volatile struct USB_EP_Desc *ep;
-+  volatile struct USB_EP_Desc *first_ep;
-+  volatile struct USB_SB_Desc *sb;
-+
-+  switch (pipe_type)
-+    {
-+    case PIPE_BULK:
-+      first_ep = &TxBulkEPList[0];
-+      break;
-+    case PIPE_CONTROL:
-+      first_ep = &TxCtrlEPList[0];
-+      break;
-+    case PIPE_INTERRUPT:
-+      first_ep = &TxIntrEPList[0];
-+      break;
-+    case PIPE_ISOCHRONOUS:
-+      first_ep = &TxIsocEPList[0];
-+      break;
-+    default:
-+      warn("Cannot dump unknown traffic type");
-+      return;
-+    }
-+  ep = first_ep;
-+
-+  printk("\n\nDumping EP list...\n\n");
-+
-+  do {
-+    __dump_ep_desc(ep);
-+    /* Cannot phys_to_virt on 0 as it turns into 80000000, which is != 0. */
-+    sb = ep->sub ? phys_to_virt(ep->sub) : 0;
-+    while (sb) {
-+      __dump_sb_desc(sb);
-+      sb = sb->next ? phys_to_virt(sb->next) : 0;
-+    }
-+    ep = (volatile struct USB_EP_Desc *)(phys_to_virt(ep->next));
-+
-+  } while (ep != first_ep);
-+}
-+
-+static inline void __dump_ept_data(int epid)
-+{
-+  unsigned long flags;
-+  __u32 r_usb_ept_data;
-+
-+  if (epid < 0 || epid > 31) {
-+    printk("Cannot dump ept data for invalid epid %d\n", epid);
-+    return;
-+  }
-+
-+  local_irq_save(flags);
-+  *R_USB_EPT_INDEX = IO_FIELD(R_USB_EPT_INDEX, value, epid);
-+  nop();
-+  r_usb_ept_data = *R_USB_EPT_DATA;
-+  local_irq_restore(flags);
-+
-+  printk(" R_USB_EPT_DATA = 0x%x for epid %d :\n", r_usb_ept_data, epid);
-+  if (r_usb_ept_data == 0) {
-+    /* No need for more detailed printing. */
-+    return;
-+  }
-+  printk("  valid           : %d\n", (r_usb_ept_data & 0x80000000) >> 31);
-+  printk("  hold            : %d\n", (r_usb_ept_data & 0x40000000) >> 30);
-+  printk("  error_count_in  : %d\n", (r_usb_ept_data & 0x30000000) >> 28);
-+  printk("  t_in            : %d\n", (r_usb_ept_data & 0x08000000) >> 27);
-+  printk("  low_speed       : %d\n", (r_usb_ept_data & 0x04000000) >> 26);
-+  printk("  port            : %d\n", (r_usb_ept_data & 0x03000000) >> 24);
-+  printk("  error_code      : %d\n", (r_usb_ept_data & 0x00c00000) >> 22);
-+  printk("  t_out           : %d\n", (r_usb_ept_data & 0x00200000) >> 21);
-+  printk("  error_count_out : %d\n", (r_usb_ept_data & 0x00180000) >> 19);
-+  printk("  max_len         : %d\n", (r_usb_ept_data & 0x0003f800) >> 11);
-+  printk("  ep              : %d\n", (r_usb_ept_data & 0x00000780) >> 7);
-+  printk("  dev             : %d\n", (r_usb_ept_data & 0x0000003f));
-+}
-+
-+static inline void __dump_ept_data_iso(int epid)
-+{
-+  unsigned long flags;
-+  __u32 ept_data;
-+
-+  if (epid < 0 || epid > 31) {
-+    printk("Cannot dump ept data for invalid epid %d\n", epid);
-+    return;
-+  }
-+
-+  local_irq_save(flags);
-+  *R_USB_EPT_INDEX = IO_FIELD(R_USB_EPT_INDEX, value, epid);
-+  nop();
-+  ept_data = *R_USB_EPT_DATA_ISO;
-+  local_irq_restore(flags);
-+
-+  printk(" R_USB_EPT_DATA = 0x%x for epid %d :\n", ept_data, epid);
-+  if (ept_data == 0) {
-+    /* No need for more detailed printing. */
-+    return;
-+  }
-+  printk("  valid           : %d\n", IO_EXTRACT(R_USB_EPT_DATA_ISO, valid,
-+						ept_data));
-+  printk("  port            : %d\n", IO_EXTRACT(R_USB_EPT_DATA_ISO, port,
-+						ept_data));
-+  printk("  error_code      : %d\n", IO_EXTRACT(R_USB_EPT_DATA_ISO, error_code,
-+						ept_data));
-+  printk("  max_len         : %d\n", IO_EXTRACT(R_USB_EPT_DATA_ISO, max_len,
-+						ept_data));
-+  printk("  ep              : %d\n", IO_EXTRACT(R_USB_EPT_DATA_ISO, ep,
-+						ept_data));
-+  printk("  dev             : %d\n", IO_EXTRACT(R_USB_EPT_DATA_ISO, dev,
-+						ept_data));
-+}
-+
-+static inline void __dump_ept_data_list(void)
-+{
-+  int i;
-+
-+  printk("Dumping the whole R_USB_EPT_DATA list\n");
-+
-+  for (i = 0; i < 32; i++) {
-+    __dump_ept_data(i);
-+  }
-+}
-+
-+static void debug_epid(int epid) {
-+  int i;
-+  
-+  if(epid_isoc(epid)) {
-+    __dump_ept_data_iso(epid);
-+  } else {
-+    __dump_ept_data(epid);
-+  }
-+
-+  printk("Bulk:\n");
-+  for(i = 0; i < 32; i++) {
-+    if(IO_EXTRACT(USB_EP_command, epid, TxBulkEPList[i].command) ==
-+       epid) {
-+      printk("%d: ", i); __dump_ep_desc(&(TxBulkEPList[i]));
-+    }
-+  }
-+
-+  printk("Ctrl:\n");
-+  for(i = 0; i < 32; i++) {
-+    if(IO_EXTRACT(USB_EP_command, epid, TxCtrlEPList[i].command) ==
-+       epid) {
-+      printk("%d: ", i); __dump_ep_desc(&(TxCtrlEPList[i]));
-+    }
-+  }
-+
-+  printk("Intr:\n");
-+  for(i = 0; i < MAX_INTR_INTERVAL; i++) {
-+    if(IO_EXTRACT(USB_EP_command, epid, TxIntrEPList[i].command) ==
-+       epid) {
-+      printk("%d: ", i); __dump_ep_desc(&(TxIntrEPList[i]));
-+    }
-+  }
-+  
-+  printk("Isoc:\n");
-+  for(i = 0; i < 32; i++) {
-+    if(IO_EXTRACT(USB_EP_command, epid, TxIsocEPList[i].command) ==
-+       epid) {
-+      printk("%d: ", i); __dump_ep_desc(&(TxIsocEPList[i]));
-+    }
-+  }
-+
-+  __dump_ept_data_list();
-+  __dump_ep_list(PIPE_INTERRUPT);
-+  printk("\n\n");
-+}
-+
-+
-+
-+char* hcd_status_to_str(__u8 bUsbStatus) {
-+  static char hcd_status_str[128];
-+  hcd_status_str[0] = '\0';
-+  if(bUsbStatus & IO_STATE(R_USB_STATUS, ourun, yes)) {
-+    strcat(hcd_status_str, "ourun ");
-+  }
-+  if(bUsbStatus & IO_STATE(R_USB_STATUS, perror, yes)) {
-+    strcat(hcd_status_str, "perror ");
-+  }
-+  if(bUsbStatus & IO_STATE(R_USB_STATUS, device_mode, yes)) {
-+    strcat(hcd_status_str, "device_mode ");
-+  }
-+  if(bUsbStatus & IO_STATE(R_USB_STATUS, host_mode, yes)) {
-+    strcat(hcd_status_str, "host_mode ");
-+  }
-+  if(bUsbStatus & IO_STATE(R_USB_STATUS, started, yes)) {
-+    strcat(hcd_status_str, "started ");
-+  }
-+  if(bUsbStatus & IO_STATE(R_USB_STATUS, running, yes)) {
-+    strcat(hcd_status_str, "running ");
-+  }
-+  return hcd_status_str;
-+}
-+
-+
-+char* sblist_to_str(struct USB_SB_Desc* sb_desc) {
-+  static char sblist_to_str_buff[128];
-+  char tmp[32], tmp2[32];
-+  sblist_to_str_buff[0] = '\0';
-+  while(sb_desc != NULL) {
-+    switch(IO_EXTRACT(USB_SB_command, tt, sb_desc->command)) {
-+    case 0: sprintf(tmp, "zout");  break;
-+    case 1: sprintf(tmp, "in");    break;
-+    case 2: sprintf(tmp, "out");   break;
-+    case 3: sprintf(tmp, "setup"); break;
-+    }
-+    sprintf(tmp2, "(%s %d)", tmp, sb_desc->sw_len);
-+    strcat(sblist_to_str_buff, tmp2);
-+    if(sb_desc->next != 0) {
-+      sb_desc = phys_to_virt(sb_desc->next);
-+    } else {
-+      sb_desc = NULL;
-+    }
-+  }
-+  return sblist_to_str_buff;
-+}
-+
-+char* port_status_to_str(__u16 wPortStatus) {
-+  static char port_status_str[128];
-+  port_status_str[0] = '\0';
-+  if(wPortStatus & IO_STATE(R_USB_RH_PORT_STATUS_1, connected, yes)) {
-+    strcat(port_status_str, "connected ");
-+  }
-+  if(wPortStatus & IO_STATE(R_USB_RH_PORT_STATUS_1, enabled, yes)) {
-+    strcat(port_status_str, "enabled ");
-+  }
-+  if(wPortStatus & IO_STATE(R_USB_RH_PORT_STATUS_1, suspended, yes)) {
-+    strcat(port_status_str, "suspended ");
-+  }
-+  if(wPortStatus & IO_STATE(R_USB_RH_PORT_STATUS_1, reset, yes)) {
-+    strcat(port_status_str, "reset ");
-+  }
-+  if(wPortStatus & IO_STATE(R_USB_RH_PORT_STATUS_1, speed, full)) {
-+    strcat(port_status_str, "full-speed ");
-+  } else {
-+    strcat(port_status_str, "low-speed ");
-+  }
-+  return port_status_str;
-+}
-+
-+
-+char* endpoint_to_str(struct usb_endpoint_descriptor *ed) {
-+  static char endpoint_to_str_buff[128];
-+  char tmp[32];
-+  int epnum = ed->bEndpointAddress & 0x0F;
-+  int dir = ed->bEndpointAddress & 0x80;
-+  int type = ed->bmAttributes & 0x03;
-+  endpoint_to_str_buff[0] = '\0';
-+  sprintf(endpoint_to_str_buff, "ep:%d ", epnum);
-+  switch(type) {
-+  case 0:
-+    sprintf(tmp, " ctrl");
-+    break;
-+  case 1:
-+    sprintf(tmp, " isoc");
-+    break;
-+  case 2:
-+    sprintf(tmp, " bulk");
-+    break;
-+  case 3:
-+    sprintf(tmp, " intr");
-+    break;
-+  }
-+  strcat(endpoint_to_str_buff, tmp);
-+  if(dir) {
-+    sprintf(tmp, " in");
-+  } else {
-+    sprintf(tmp, " out");
-+  }
-+  strcat(endpoint_to_str_buff, tmp);
-+
-+  return endpoint_to_str_buff;
-+}
-+
-+/* Debug helper functions for Transfer Controller */
-+char* pipe_to_str(unsigned int pipe) {
-+  static char pipe_to_str_buff[128];
-+  char tmp[64];
-+  sprintf(pipe_to_str_buff, "dir:%s", str_dir(pipe));
-+  sprintf(tmp, " type:%s", str_type(pipe));
-+  strcat(pipe_to_str_buff, tmp);
-+
-+  sprintf(tmp, " dev:%d", usb_pipedevice(pipe));
-+  strcat(pipe_to_str_buff, tmp);
-+  sprintf(tmp, " ep:%d", usb_pipeendpoint(pipe));
-+  strcat(pipe_to_str_buff, tmp);
-+  return pipe_to_str_buff;
-+}
-+
-+
-+#define USB_DEBUG_DESC 1
-+
-+#ifdef USB_DEBUG_DESC
-+#define dump_in_desc(x) __dump_in_desc(x)
-+#define dump_sb_desc(...) __dump_sb_desc(...)
-+#define dump_ep_desc(x) __dump_ep_desc(x)
-+#define dump_ept_data(x) __dump_ept_data(x)
-+#else
-+#define dump_in_desc(...) do {} while (0)
-+#define dump_sb_desc(...) do {} while (0)
-+#define dump_ep_desc(...) do {} while (0)
-+#endif
-+
-+
-+/* Uncomment this to enable massive function call trace
-+   #define USB_DEBUG_TRACE */
-+//#define USB_DEBUG_TRACE 1
-+
-+#ifdef USB_DEBUG_TRACE
-+#define DBFENTER (printk(": Entering: %s\n", __FUNCTION__))
-+#define DBFEXIT  (printk(": Exiting:  %s\n", __FUNCTION__))
-+#else
-+#define DBFENTER do {} while (0)
-+#define DBFEXIT  do {} while (0)
-+#endif
-+
-+#define CHECK_ALIGN(x) if (((__u32)(x)) & 0x00000003) \
-+{panic("Alignment check (DWORD) failed at %s:%s:%d\n", __FILE__, __FUNCTION__, __LINE__);}
-+
-+/* Most helpful debugging aid */
-+#define ASSERT(expr) ((void) ((expr) ? 0 : (err("assert failed at: %s %d",__FUNCTION__, __LINE__))))
-+
-+
-+/***************************************************************************/
-+/***************************************************************************/
-+/* Forward declarations                                                    */
-+/***************************************************************************/
-+/***************************************************************************/
-+void crisv10_hcd_epid_attn_irq(struct crisv10_irq_reg *reg);
-+void crisv10_hcd_port_status_irq(struct crisv10_irq_reg *reg);
-+void crisv10_hcd_ctl_status_irq(struct crisv10_irq_reg *reg);
-+void crisv10_hcd_isoc_eof_irq(struct crisv10_irq_reg *reg);
-+
-+void rh_port_status_change(__u16[]);
-+int  rh_clear_port_feature(__u8, __u16);
-+int  rh_set_port_feature(__u8, __u16);
-+static void rh_disable_port(unsigned int port);
-+
-+static void check_finished_bulk_tx_epids(struct usb_hcd *hcd,
-+					 int timer);
-+
-+//static int  tc_setup_epid(struct usb_host_endpoint *ep, struct urb *urb,
-+//			 int mem_flags);
-+static int tc_setup_epid(struct urb *urb, int mem_flags);
-+static void tc_free_epid(struct usb_host_endpoint *ep);
-+static int  tc_allocate_epid(void);
-+static void tc_finish_urb(struct usb_hcd *hcd, struct urb *urb, int status);
-+static void tc_finish_urb_later(struct usb_hcd *hcd, struct urb *urb,
-+				int status);
-+
-+static int  urb_priv_create(struct usb_hcd *hcd, struct urb *urb, int epid,
-+			   int mem_flags);
-+static void urb_priv_free(struct usb_hcd *hcd, struct urb *urb);
-+
-+static inline struct urb *urb_list_first(int epid);
-+static inline void        urb_list_add(struct urb *urb, int epid,
-+				      int mem_flags);
-+static inline urb_entry_t *urb_list_entry(struct urb *urb, int epid);
-+static inline void        urb_list_del(struct urb *urb, int epid);
-+static inline void        urb_list_move_last(struct urb *urb, int epid);
-+static inline struct urb *urb_list_next(struct urb *urb, int epid);
-+
-+int create_sb_for_urb(struct urb *urb, int mem_flags);
-+int init_intr_urb(struct urb *urb, int mem_flags);
-+
-+static inline void  etrax_epid_set(__u8 index, __u32 data);
-+static inline void  etrax_epid_clear_error(__u8 index);
-+static inline void  etrax_epid_set_toggle(__u8 index, __u8 dirout,
-+					      __u8 toggle);
-+static inline __u8  etrax_epid_get_toggle(__u8 index, __u8 dirout);
-+static inline __u32 etrax_epid_get(__u8 index);
-+
-+/* We're accessing the same register position in Etrax so
-+   when we do full access the internal difference doesn't matter */
-+#define etrax_epid_iso_set(index, data) etrax_epid_set(index, data)
-+#define etrax_epid_iso_get(index) etrax_epid_get(index)
-+
-+
-+//static void        tc_dma_process_isoc_urb(struct urb *urb);
-+static void        tc_dma_process_queue(int epid);
-+static void        tc_dma_unlink_intr_urb(struct urb *urb);
-+static irqreturn_t tc_dma_tx_interrupt(int irq, void *vhc);
-+static irqreturn_t tc_dma_rx_interrupt(int irq, void *vhc);
-+
-+static void tc_bulk_start_timer_func(unsigned long dummy);
-+static void tc_bulk_eot_timer_func(unsigned long dummy);
-+
-+
-+/*************************************************************/
-+/*************************************************************/
-+/* Host Controler Driver block                               */
-+/*************************************************************/
-+/*************************************************************/
-+
-+/* HCD operations */
-+static irqreturn_t crisv10_hcd_top_irq(int irq, void*);
-+static int crisv10_hcd_reset(struct usb_hcd *);
-+static int crisv10_hcd_start(struct usb_hcd *);
-+static void crisv10_hcd_stop(struct usb_hcd *);
-+#ifdef CONFIG_PM
-+static int crisv10_hcd_suspend(struct device *, u32, u32);
-+static int crisv10_hcd_resume(struct device *, u32);
-+#endif /* CONFIG_PM */
-+static int crisv10_hcd_get_frame(struct usb_hcd *);
-+
-+//static int  tc_urb_enqueue(struct usb_hcd *, struct usb_host_endpoint *ep, struct urb *, gfp_t mem_flags);
-+static int tc_urb_enqueue(struct usb_hcd *hcd, struct urb *urb, gfp_t mem_flags);
-+//static int  tc_urb_dequeue(struct usb_hcd *, struct urb *);
-+static int tc_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status);
-+static void tc_endpoint_disable(struct usb_hcd *, struct usb_host_endpoint *ep);
-+
-+static int rh_status_data_request(struct usb_hcd *, char *);
-+static int rh_control_request(struct usb_hcd *, u16, u16, u16, char*, u16);
-+
-+#ifdef CONFIG_PM
-+static int crisv10_hcd_hub_suspend(struct usb_hcd *);
-+static int crisv10_hcd_hub_resume(struct usb_hcd *);
-+#endif /* CONFIG_PM */
-+#ifdef CONFIG_USB_OTG
-+static int crisv10_hcd_start_port_reset(struct usb_hcd *, unsigned);
-+#endif /* CONFIG_USB_OTG */
-+
-+/* host controller driver interface */
-+static const struct hc_driver crisv10_hc_driver = 
-+  {
-+    .description =	hc_name,
-+    .product_desc =	product_desc,
-+    .hcd_priv_size =	sizeof(struct crisv10_hcd),
-+
-+    /* Attaching IRQ handler manualy in probe() */
-+    /* .irq =		crisv10_hcd_irq, */
-+
-+    .flags =		HCD_USB11,
-+
-+    /* called to init HCD and root hub */
-+    .reset =		crisv10_hcd_reset,
-+    .start =		crisv10_hcd_start,	
-+
-+    /* cleanly make HCD stop writing memory and doing I/O */
-+    .stop =		crisv10_hcd_stop,
-+
-+    /* return current frame number */
-+    .get_frame_number =	crisv10_hcd_get_frame,
-+
-+
-+    /* Manage i/o requests via the Transfer Controller */
-+    .urb_enqueue =	tc_urb_enqueue,
-+    .urb_dequeue =	tc_urb_dequeue,
-+
-+    /* hw synch, freeing endpoint resources that urb_dequeue can't */
-+    .endpoint_disable = tc_endpoint_disable,
-+
-+
-+    /* Root Hub support */
-+    .hub_status_data =	rh_status_data_request,
-+    .hub_control =	rh_control_request,
-+#ifdef CONFIG_PM
-+    .hub_suspend =	rh_suspend_request,
-+    .hub_resume =	rh_resume_request,
-+#endif /* CONFIG_PM */
-+#ifdef	CONFIG_USB_OTG
-+    .start_port_reset =	crisv10_hcd_start_port_reset,
-+#endif /* CONFIG_USB_OTG */
-+  };
-+
-+
-+/*
-+ * conversion between pointers to a hcd and the corresponding
-+ * crisv10_hcd 
-+ */
-+
-+static inline struct crisv10_hcd *hcd_to_crisv10_hcd(struct usb_hcd *hcd)
-+{
-+	return (struct crisv10_hcd *) hcd->hcd_priv;
-+}
-+
-+static inline struct usb_hcd *crisv10_hcd_to_hcd(struct crisv10_hcd *hcd)
-+{
-+	return container_of((void *) hcd, struct usb_hcd, hcd_priv);
-+}
-+
-+/* check if specified port is in use */
-+static inline int port_in_use(unsigned int port)
-+{
-+	return ports & (1 << port);
-+}
-+
-+/* number of ports in use */
-+static inline unsigned int num_ports(void)
-+{
-+	unsigned int i, num = 0;
-+	for (i = 0; i < USB_ROOT_HUB_PORTS; i++)
-+		if (port_in_use(i))
-+			num++;
-+	return num;
-+}
-+
-+/* map hub port number to the port number used internally by the HC */
-+static inline unsigned int map_port(unsigned int port)
-+{
-+  unsigned int i, num = 0;
-+  for (i = 0; i < USB_ROOT_HUB_PORTS; i++)
-+    if (port_in_use(i))
-+      if (++num == port)
-+	return i;
-+  return -1;
-+}
-+
-+/* size of descriptors in slab cache */
-+#ifndef MAX
-+#define MAX(x, y)		((x) > (y) ? (x) : (y))
-+#endif
-+
-+
-+/******************************************************************/
-+/* Hardware Interrupt functions                                   */
-+/******************************************************************/
-+
-+/* Fast interrupt handler for HC */
-+static irqreturn_t crisv10_hcd_top_irq(int irq, void *vcd)
-+{
-+  struct usb_hcd *hcd = vcd;
-+  struct crisv10_irq_reg reg;
-+  __u32 irq_mask;
-+  unsigned long flags;
-+
-+  DBFENTER;
-+
-+  ASSERT(hcd != NULL);
-+  reg.hcd = hcd;
-+
-+  /* Turn of other interrupts while handling these sensitive cases */
-+  local_irq_save(flags);
-+  
-+  /* Read out which interrupts that are flaged */
-+  irq_mask = *R_USB_IRQ_MASK_READ;
-+  reg.r_usb_irq_mask_read = irq_mask;
-+
-+  /* Reading R_USB_STATUS clears the ctl_status interrupt. Note that
-+     R_USB_STATUS must be read before R_USB_EPID_ATTN since reading the latter
-+     clears the ourun and perror fields of R_USB_STATUS. */
-+  reg.r_usb_status = *R_USB_STATUS;
-+  
-+  /* Reading R_USB_EPID_ATTN clears the iso_eof, bulk_eot and epid_attn
-+     interrupts. */
-+  reg.r_usb_epid_attn = *R_USB_EPID_ATTN;
-+  
-+  /* Reading R_USB_RH_PORT_STATUS_1 and R_USB_RH_PORT_STATUS_2 clears the
-+     port_status interrupt. */
-+  reg.r_usb_rh_port_status_1 = *R_USB_RH_PORT_STATUS_1;
-+  reg.r_usb_rh_port_status_2 = *R_USB_RH_PORT_STATUS_2;
-+  
-+  /* Reading R_USB_FM_NUMBER clears the sof interrupt. */
-+  /* Note: the lower 11 bits contain the actual frame number, sent with each
-+     sof. */
-+  reg.r_usb_fm_number = *R_USB_FM_NUMBER;
-+
-+  /* Interrupts are handled in order of priority. */
-+  if (irq_mask & IO_MASK(R_USB_IRQ_MASK_READ, port_status)) {
-+    crisv10_hcd_port_status_irq(&reg);
-+  }
-+  if (irq_mask & IO_MASK(R_USB_IRQ_MASK_READ, epid_attn)) {
-+    crisv10_hcd_epid_attn_irq(&reg);
-+  }
-+  if (irq_mask & IO_MASK(R_USB_IRQ_MASK_READ, ctl_status)) {
-+    crisv10_hcd_ctl_status_irq(&reg);
-+  }
-+  if (irq_mask & IO_MASK(R_USB_IRQ_MASK_READ, iso_eof)) {
-+    crisv10_hcd_isoc_eof_irq(&reg);
-+  }
-+  if (irq_mask & IO_MASK(R_USB_IRQ_MASK_READ, bulk_eot)) {
-+    /* Update/restart the bulk start timer since obviously the channel is
-+       running. */
-+    mod_timer(&bulk_start_timer, jiffies + BULK_START_TIMER_INTERVAL);
-+    /* Update/restart the bulk eot timer since we just received an bulk eot
-+       interrupt. */
-+    mod_timer(&bulk_eot_timer, jiffies + BULK_EOT_TIMER_INTERVAL);
-+
-+    /* Check for finished bulk transfers on epids */
-+    check_finished_bulk_tx_epids(hcd, 0);
-+  }
-+  local_irq_restore(flags);
-+
-+  DBFEXIT;
-+  return IRQ_HANDLED;
-+}
-+
-+
-+void crisv10_hcd_epid_attn_irq(struct crisv10_irq_reg *reg) {
-+  struct usb_hcd *hcd = reg->hcd;
-+  struct crisv10_urb_priv *urb_priv;
-+  int epid;
-+  DBFENTER;
-+
-+  for (epid = 0; epid < NBR_OF_EPIDS; epid++) {
-+    if (test_bit(epid, (void *)&reg->r_usb_epid_attn)) {
-+      struct urb *urb;
-+      __u32 ept_data;
-+      int error_code;
-+
-+      if (epid == DUMMY_EPID || epid == INVALID_EPID) {
-+	/* We definitely don't care about these ones. Besides, they are
-+	   always disabled, so any possible disabling caused by the
-+	   epid attention interrupt is irrelevant. */
-+	warn("Got epid_attn for INVALID_EPID or DUMMY_EPID (%d).", epid);
-+	continue;
-+      }
-+
-+      if(!epid_inuse(epid)) {
-+	irq_err("Epid attention on epid:%d that isn't in use\n", epid);
-+	printk("R_USB_STATUS: 0x%x\n", reg->r_usb_status);
-+	debug_epid(epid);
-+	continue;
-+      }
-+
-+      /* Note that although there are separate R_USB_EPT_DATA and
-+	 R_USB_EPT_DATA_ISO registers, they are located at the same address and
-+	 are of the same size. In other words, this read should be ok for isoc
-+	 also. */
-+      ept_data = etrax_epid_get(epid);
-+      error_code = IO_EXTRACT(R_USB_EPT_DATA, error_code, ept_data);
-+
-+      /* Get the active URB for this epid. We blatantly assume
-+	 that only this URB could have caused the epid attention. */
-+      urb = activeUrbList[epid];
-+      if (urb == NULL) {
-+	irq_err("Attention on epid:%d error:%d with no active URB.\n",
-+		epid, error_code);
-+	printk("R_USB_STATUS: 0x%x\n", reg->r_usb_status);
-+	debug_epid(epid);
-+	continue;
-+      }
-+
-+      urb_priv = (struct crisv10_urb_priv *)urb->hcpriv;
-+      ASSERT(urb_priv);
-+
-+      /* Using IO_STATE_VALUE on R_USB_EPT_DATA should be ok for isoc also. */
-+      if (error_code == IO_STATE_VALUE(R_USB_EPT_DATA, error_code, no_error)) {
-+
-+	/* Isoc traffic doesn't have error_count_in/error_count_out. */
-+	if ((usb_pipetype(urb->pipe) != PIPE_ISOCHRONOUS) &&
-+	    (IO_EXTRACT(R_USB_EPT_DATA, error_count_in, ept_data) == 3 ||
-+	     IO_EXTRACT(R_USB_EPT_DATA, error_count_out, ept_data) == 3)) {
-+	  /* Check if URB allready is marked for late-finish, we can get
-+	     several 3rd error for Intr traffic when a device is unplugged */
-+	  if(urb_priv->later_data == NULL) {
-+	    /* 3rd error. */
-+	    irq_warn("3rd error for epid:%d (%s %s) URB:0x%x[%d]\n", epid,
-+		     str_dir(urb->pipe), str_type(urb->pipe),
-+		     (unsigned int)urb, urb_priv->urb_num);
-+	  
-+	    tc_finish_urb_later(hcd, urb, -EPROTO);
-+	  }
-+
-+	} else if (reg->r_usb_status & IO_MASK(R_USB_STATUS, perror)) {
-+	  irq_warn("Perror for epid:%d\n", epid);
-+	  printk("FM_NUMBER: %d\n", reg->r_usb_fm_number & 0x7ff);
-+	  printk("R_USB_STATUS: 0x%x\n", reg->r_usb_status);
-+	  __dump_urb(urb);
-+	  debug_epid(epid);
-+
-+	  if (!(ept_data & IO_MASK(R_USB_EPT_DATA, valid))) {
-+	    /* invalid ep_id */
-+	    panic("Perror because of invalid epid."
-+		  " Deconfigured too early?");
-+	  } else {
-+	    /* past eof1, near eof, zout transfer, setup transfer */
-+	    /* Dump the urb and the relevant EP descriptor. */
-+	    panic("Something wrong with DMA descriptor contents."
-+		  " Too much traffic inserted?");
-+	  }
-+	} else if (reg->r_usb_status & IO_MASK(R_USB_STATUS, ourun)) {
-+	  /* buffer ourun */
-+	  printk("FM_NUMBER: %d\n", reg->r_usb_fm_number & 0x7ff);
-+	  printk("R_USB_STATUS: 0x%x\n", reg->r_usb_status);
-+	  __dump_urb(urb);
-+	  debug_epid(epid);
-+
-+	  panic("Buffer overrun/underrun for epid:%d. DMA too busy?", epid);
-+	} else {
-+	  irq_warn("Attention on epid:%d (%s %s) with no error code\n", epid,
-+		   str_dir(urb->pipe), str_type(urb->pipe));
-+	  printk("R_USB_STATUS: 0x%x\n", reg->r_usb_status);
-+	  __dump_urb(urb);
-+	  debug_epid(epid);
-+	}
-+
-+      } else if (error_code == IO_STATE_VALUE(R_USB_EPT_DATA, error_code,
-+					      stall)) {
-+	/* Not really a protocol error, just says that the endpoint gave
-+	   a stall response. Note that error_code cannot be stall for isoc. */
-+	if (usb_pipetype(urb->pipe) == PIPE_ISOCHRONOUS) {
-+	  panic("Isoc traffic cannot stall");
-+	}
-+
-+	tc_dbg("Stall for epid:%d (%s %s) URB:0x%x\n", epid,
-+	       str_dir(urb->pipe), str_type(urb->pipe), (unsigned int)urb);
-+	tc_finish_urb(hcd, urb, -EPIPE);
-+
-+      } else if (error_code == IO_STATE_VALUE(R_USB_EPT_DATA, error_code,
-+					      bus_error)) {
-+	/* Two devices responded to a transaction request. Must be resolved
-+	   by software. FIXME: Reset ports? */
-+	panic("Bus error for epid %d."
-+	      " Two devices responded to transaction request\n",
-+	      epid);
-+
-+      } else if (error_code == IO_STATE_VALUE(R_USB_EPT_DATA, error_code,
-+					      buffer_error)) {
-+	/* DMA overrun or underrun. */
-+	irq_warn("Buffer overrun/underrun for epid:%d (%s %s)\n", epid,
-+		 str_dir(urb->pipe), str_type(urb->pipe));
-+
-+	/* It seems that error_code = buffer_error in
-+	   R_USB_EPT_DATA/R_USB_EPT_DATA_ISO and ourun = yes in R_USB_STATUS
-+	   are the same error. */
-+	tc_finish_urb(hcd, urb, -EPROTO);
-+      } else {
-+	  irq_warn("Unknown attention on epid:%d (%s %s)\n", epid,
-+		   str_dir(urb->pipe), str_type(urb->pipe));
-+	  dump_ept_data(epid);
-+      }
-+    }
-+  }
-+  DBFEXIT;
-+}
-+
-+void crisv10_hcd_port_status_irq(struct crisv10_irq_reg *reg)
-+{
-+  __u16 port_reg[USB_ROOT_HUB_PORTS];
-+  DBFENTER;
-+  port_reg[0] = reg->r_usb_rh_port_status_1;
-+  port_reg[1] = reg->r_usb_rh_port_status_2;
-+  rh_port_status_change(port_reg);
-+  DBFEXIT;
-+}
-+
-+void crisv10_hcd_isoc_eof_irq(struct crisv10_irq_reg *reg)
-+{
-+  int epid;
-+  struct urb *urb;
-+  struct crisv10_urb_priv *urb_priv;
-+
-+  DBFENTER;
-+
-+  for (epid = 0; epid < NBR_OF_EPIDS - 1; epid++) {
-+
-+    /* Only check epids that are in use, is valid and has SB list */
-+    if (!epid_inuse(epid) || epid == INVALID_EPID ||
-+	TxIsocEPList[epid].sub == 0 || epid == DUMMY_EPID) {
-+      /* Nothing here to see. */
-+      continue;
-+    }
-+    ASSERT(epid_isoc(epid));
-+
-+    /* Get the active URB for this epid (if any). */
-+    urb = activeUrbList[epid];
-+    if (urb == 0) {
-+      isoc_warn("Ignoring NULL urb for epid:%d\n", epid);
-+      continue;
-+    }
-+    if(!epid_out_traffic(epid)) {
-+      /* Sanity check. */
-+      ASSERT(usb_pipetype(urb->pipe) == PIPE_ISOCHRONOUS);
-+
-+      urb_priv = (struct crisv10_urb_priv *)urb->hcpriv;
-+      ASSERT(urb_priv);
-+
-+      if (urb_priv->urb_state == NOT_STARTED) {
-+	/* If ASAP is not set and urb->start_frame is the current frame,
-+	   start the transfer. */
-+	if (!(urb->transfer_flags & URB_ISO_ASAP) &&
-+	    (urb->start_frame == (*R_USB_FM_NUMBER & 0x7ff))) {
-+	  /* EP should not be enabled if we're waiting for start_frame */
-+	  ASSERT((TxIsocEPList[epid].command &
-+		  IO_STATE(USB_EP_command, enable, yes)) == 0);
-+
-+	  isoc_warn("Enabling isoc IN EP descr for epid %d\n", epid);
-+	  TxIsocEPList[epid].command |= IO_STATE(USB_EP_command, enable, yes);
-+
-+	  /* This urb is now active. */
-+	  urb_priv->urb_state = STARTED;
-+	  continue;
-+	}
-+      }
-+    }
-+  }
-+
-+  DBFEXIT;
-+}
-+
-+void crisv10_hcd_ctl_status_irq(struct crisv10_irq_reg *reg)
-+{
-+  struct crisv10_hcd* crisv10_hcd = hcd_to_crisv10_hcd(reg->hcd);
-+
-+  DBFENTER;
-+  ASSERT(crisv10_hcd);
-+
-+  irq_dbg("ctr_status_irq, controller status: %s\n",
-+	  hcd_status_to_str(reg->r_usb_status));
-+  
-+  /* FIXME: What should we do if we get ourun or perror? Dump the EP and SB
-+     list for the corresponding epid? */
-+  if (reg->r_usb_status & IO_MASK(R_USB_STATUS, ourun)) {
-+    panic("USB controller got ourun.");
-+  }
-+  if (reg->r_usb_status & IO_MASK(R_USB_STATUS, perror)) {
-+    
-+    /* Before, etrax_usb_do_intr_recover was called on this epid if it was
-+       an interrupt pipe. I don't see how re-enabling all EP descriptors
-+       will help if there was a programming error. */
-+    panic("USB controller got perror.");
-+  }
-+
-+  /* Keep track of USB Controller, if it's running or not */
-+  if(reg->r_usb_status & IO_STATE(R_USB_STATUS, running, yes)) {
-+    crisv10_hcd->running = 1;
-+  } else {
-+    crisv10_hcd->running = 0;
-+  }
-+  
-+  if (reg->r_usb_status & IO_MASK(R_USB_STATUS, device_mode)) {
-+    /* We should never operate in device mode. */
-+    panic("USB controller in device mode.");
-+  }
-+
-+  /* Set the flag to avoid getting "Unlink after no-IRQ? Controller is probably
-+     using the wrong IRQ" from hcd_unlink_urb() in drivers/usb/core/hcd.c */
-+  set_bit(HCD_FLAG_SAW_IRQ, &reg->hcd->flags);
-+  
-+  DBFEXIT;
-+}
-+
-+
-+/******************************************************************/
-+/* Host Controller interface functions                            */
-+/******************************************************************/
-+
-+static inline void crisv10_ready_wait(void) {
-+  volatile int timeout = 10000;
-+  /* Check the busy bit of USB controller in Etrax */
-+  while((*R_USB_COMMAND & IO_MASK(R_USB_COMMAND, busy)) &&
-+	(timeout-- > 0));
-+  if(timeout == 0) {
-+    warn("Timeout while waiting for USB controller to be idle\n");
-+  }
-+}
-+
-+/* reset host controller */
-+static int crisv10_hcd_reset(struct usb_hcd *hcd)
-+{
-+  DBFENTER;
-+  hcd_dbg(hcd, "reset\n");
-+
-+
-+  /* Reset the USB interface. */
-+  /*
-+  *R_USB_COMMAND =
-+    IO_STATE(R_USB_COMMAND, port_sel, nop) |
-+    IO_STATE(R_USB_COMMAND, port_cmd, reset) |
-+    IO_STATE(R_USB_COMMAND, ctrl_cmd, reset);
-+  nop();
-+  */
-+  DBFEXIT;
-+  return 0;
-+}
-+
-+/* start host controller */
-+static int crisv10_hcd_start(struct usb_hcd *hcd)
-+{
-+  DBFENTER;
-+  hcd_dbg(hcd, "start\n");
-+
-+  crisv10_ready_wait();
-+
-+  /* Start processing of USB traffic. */
-+  *R_USB_COMMAND =
-+    IO_STATE(R_USB_COMMAND, port_sel, nop) |
-+    IO_STATE(R_USB_COMMAND, port_cmd, reset) |
-+    IO_STATE(R_USB_COMMAND, ctrl_cmd, host_run);
-+
-+  nop();
-+
-+  hcd->state = HC_STATE_RUNNING;
-+
-+  DBFEXIT;
-+  return 0;
-+}
-+
-+/* stop host controller */
-+static void crisv10_hcd_stop(struct usb_hcd *hcd)
-+{
-+  DBFENTER;
-+  hcd_dbg(hcd, "stop\n");
-+  crisv10_hcd_reset(hcd);
-+  DBFEXIT;
-+}
-+
-+/* return the current frame number */
-+static int crisv10_hcd_get_frame(struct usb_hcd *hcd)
-+{
-+  DBFENTER;
-+  DBFEXIT;
-+  return (*R_USB_FM_NUMBER & 0x7ff);
-+}
-+
-+#ifdef	CONFIG_USB_OTG
-+
-+static int crisv10_hcd_start_port_reset(struct usb_hcd *hcd, unsigned port)
-+{
-+  return 0; /* no-op for now */
-+}
-+
-+#endif /* CONFIG_USB_OTG */
-+
-+
-+/******************************************************************/
-+/* Root Hub functions                                             */
-+/******************************************************************/
-+
-+/* root hub status */
-+static const struct usb_hub_status rh_hub_status = 
-+  {
-+    .wHubStatus =		0,
-+    .wHubChange =		0,
-+  };
-+
-+/* root hub descriptor */
-+static const u8 rh_hub_descr[] =
-+  {
-+    0x09,			/* bDescLength	       */
-+    0x29,			/* bDescriptorType     */
-+    USB_ROOT_HUB_PORTS,         /* bNbrPorts	       */
-+    0x00,			/* wHubCharacteristics */
-+    0x00,		 
-+    0x01,			/* bPwrOn2pwrGood      */
-+    0x00,			/* bHubContrCurrent    */
-+    0x00,			/* DeviceRemovable     */
-+    0xff			/* PortPwrCtrlMask     */
-+  };
-+
-+/* Actual holder of root hub status*/
-+struct crisv10_rh rh;
-+
-+/* Initialize root hub data structures (called from dvdrv_hcd_probe()) */
-+int rh_init(void) {
-+  int i;
-+  /* Reset port status flags */
-+  for (i = 0; i < USB_ROOT_HUB_PORTS; i++) {
-+    rh.wPortChange[i] = 0;
-+    rh.wPortStatusPrev[i] = 0;
-+  }
-+  return 0;
-+}
-+
-+#define RH_FEAT_MASK ((1<<USB_PORT_FEAT_CONNECTION)|\
-+		      (1<<USB_PORT_FEAT_ENABLE)|\
-+		      (1<<USB_PORT_FEAT_SUSPEND)|\
-+		      (1<<USB_PORT_FEAT_RESET))
-+
-+/* Handle port status change interrupt (called from bottom part interrupt) */
-+void rh_port_status_change(__u16 port_reg[]) {
-+  int i;
-+  __u16 wChange;
-+
-+  for(i = 0; i < USB_ROOT_HUB_PORTS; i++) {
-+    /* Xor out changes since last read, masked for important flags */
-+    wChange = (port_reg[i] & RH_FEAT_MASK) ^ rh.wPortStatusPrev[i];
-+    /* Or changes together with (if any) saved changes */
-+    rh.wPortChange[i] |= wChange;
-+    /* Save new status */
-+    rh.wPortStatusPrev[i] = port_reg[i];
-+
-+    if(wChange) {
-+      rh_dbg("Interrupt port_status change port%d: %s  Current-status:%s\n", i+1,
-+	     port_status_to_str(wChange),
-+	     port_status_to_str(port_reg[i]));
-+    }
-+  }
-+}
-+
-+/* Construct port status change bitmap for the root hub */
-+static int rh_status_data_request(struct usb_hcd *hcd, char *buf)
-+{
-+  struct crisv10_hcd* crisv10_hcd = hcd_to_crisv10_hcd(hcd);
-+  unsigned int i;
-+
-+//  DBFENTER;
-+  
-+  /*
-+   * corresponds to hub status change EP (USB 2.0 spec section 11.13.4)
-+   * return bitmap indicating ports with status change
-+   */
-+  *buf = 0;
-+  spin_lock(&crisv10_hcd->lock);
-+  for (i = 1; i <= crisv10_hcd->num_ports; i++) {
-+    if (rh.wPortChange[map_port(i)]) {
-+      *buf |= (1 << i);
-+      rh_dbg("rh_status_data_request, change on port %d: %s  Current Status: %s\n", i,
-+	     port_status_to_str(rh.wPortChange[map_port(i)]),
-+	     port_status_to_str(rh.wPortStatusPrev[map_port(i)]));
-+    }
-+  }
-+  spin_unlock(&crisv10_hcd->lock);
-+
-+// DBFEXIT;
-+
-+  return *buf == 0 ? 0 : 1;
-+}
-+
-+/* Handle a control request for the root hub (called from hcd_driver) */
-+static int rh_control_request(struct usb_hcd *hcd, 
-+			      u16 typeReq, 
-+			      u16 wValue, 
-+			      u16 wIndex,
-+			      char *buf, 
-+			      u16 wLength) {
-+
-+  struct crisv10_hcd *crisv10_hcd = hcd_to_crisv10_hcd(hcd);
-+  int retval = 0;
-+  int len;
-+  DBFENTER;
-+
-+  switch (typeReq) {
-+  case GetHubDescriptor:
-+    rh_dbg("GetHubDescriptor\n");
-+    len = min_t(unsigned int, sizeof rh_hub_descr, wLength);
-+    memcpy(buf, rh_hub_descr, len);
-+    buf[2] = crisv10_hcd->num_ports;
-+    break;
-+  case GetHubStatus:
-+    rh_dbg("GetHubStatus\n");
-+    len = min_t(unsigned int, sizeof rh_hub_status, wLength);
-+    memcpy(buf, &rh_hub_status, len);
-+    break;
-+  case GetPortStatus:
-+    if (!wIndex || wIndex > crisv10_hcd->num_ports)
-+      goto error;
-+    rh_dbg("GetportStatus, port:%d change:%s  status:%s\n", wIndex,
-+	   port_status_to_str(rh.wPortChange[map_port(wIndex)]),
-+	   port_status_to_str(rh.wPortStatusPrev[map_port(wIndex)]));
-+    *(u16 *) buf = cpu_to_le16(rh.wPortStatusPrev[map_port(wIndex)]);
-+    *(u16 *) (buf + 2) = cpu_to_le16(rh.wPortChange[map_port(wIndex)]);
-+    break;
-+  case SetHubFeature:
-+    rh_dbg("SetHubFeature\n");
-+  case ClearHubFeature:
-+    rh_dbg("ClearHubFeature\n");
-+    switch (wValue) {
-+    case C_HUB_OVER_CURRENT:
-+    case C_HUB_LOCAL_POWER:
-+      rh_warn("Not implemented hub request:%d \n", typeReq);
-+      /* not implemented */
-+      break;
-+    default:
-+      goto error;
-+    }
-+    break;
-+  case SetPortFeature:
-+    if (!wIndex || wIndex > crisv10_hcd->num_ports)
-+      goto error;
-+    if(rh_set_port_feature(map_port(wIndex), wValue))
-+      goto error;
-+    break;
-+  case ClearPortFeature:
-+    if (!wIndex || wIndex > crisv10_hcd->num_ports)
-+      goto error;
-+    if(rh_clear_port_feature(map_port(wIndex), wValue))
-+      goto error;
-+    break;
-+  default:
-+    rh_warn("Unknown hub request: %d\n", typeReq);
-+  error:
-+    retval = -EPIPE;
-+  }
-+  DBFEXIT;
-+  return retval;
-+}
-+
-+int rh_set_port_feature(__u8 bPort, __u16 wFeature) {
-+  __u8 bUsbCommand = 0;
-+  switch(wFeature) {
-+  case USB_PORT_FEAT_RESET:
-+    rh_dbg("SetPortFeature: reset\n");
-+    bUsbCommand |= IO_STATE(R_USB_COMMAND, port_cmd, reset);
-+    goto set;
-+    break;
-+  case USB_PORT_FEAT_SUSPEND:
-+    rh_dbg("SetPortFeature: suspend\n");
-+    bUsbCommand |= IO_STATE(R_USB_COMMAND, port_cmd, suspend);
-+    goto set;
-+    break;
-+  case USB_PORT_FEAT_POWER:
-+    rh_dbg("SetPortFeature: power\n");
-+    break;
-+  case USB_PORT_FEAT_C_CONNECTION:
-+    rh_dbg("SetPortFeature: c_connection\n");
-+    break;
-+  case USB_PORT_FEAT_C_RESET:
-+    rh_dbg("SetPortFeature: c_reset\n");
-+    break;
-+  case USB_PORT_FEAT_C_OVER_CURRENT:
-+    rh_dbg("SetPortFeature: c_over_current\n");
-+    break;
-+
-+  set:
-+    /* Select which port via the port_sel field */
-+    bUsbCommand |= IO_FIELD(R_USB_COMMAND, port_sel, bPort+1);
-+
-+    /* Make sure the controller isn't busy. */
-+    crisv10_ready_wait();
-+    /* Send out the actual command to the USB controller */
-+    *R_USB_COMMAND = bUsbCommand;
-+
-+    /* If port reset then also bring USB controller into running state */
-+    if(wFeature == USB_PORT_FEAT_RESET) {
-+      /* Wait a while for controller to first become started after port reset */
-+      udelay(12000); /* 12ms blocking wait */
-+      
-+      /* Make sure the controller isn't busy. */
-+      crisv10_ready_wait();
-+
-+      /* If all enabled ports were disabled the host controller goes down into
-+	 started mode, so we need to bring it back into the running state.
-+	 (This is safe even if it's already in the running state.) */
-+      *R_USB_COMMAND =
-+	IO_STATE(R_USB_COMMAND, port_sel, nop) |
-+	IO_STATE(R_USB_COMMAND, port_cmd, reset) |
-+	IO_STATE(R_USB_COMMAND, ctrl_cmd, host_run);
-+    }
-+
-+    break;
-+  default:
-+    rh_dbg("SetPortFeature: unknown feature\n");
-+    return -1;
-+  }
-+  return 0;
-+}
-+
-+int rh_clear_port_feature(__u8 bPort, __u16 wFeature) {
-+  switch(wFeature) {
-+  case USB_PORT_FEAT_ENABLE:
-+    rh_dbg("ClearPortFeature: enable\n");
-+    rh_disable_port(bPort);
-+    break;
-+  case USB_PORT_FEAT_SUSPEND:
-+    rh_dbg("ClearPortFeature: suspend\n");
-+    break;
-+  case USB_PORT_FEAT_POWER:
-+    rh_dbg("ClearPortFeature: power\n");
-+    break;
-+
-+  case USB_PORT_FEAT_C_ENABLE:
-+    rh_dbg("ClearPortFeature: c_enable\n");
-+    goto clear;
-+  case USB_PORT_FEAT_C_SUSPEND:
-+    rh_dbg("ClearPortFeature: c_suspend\n");
-+    goto clear;
-+  case USB_PORT_FEAT_C_CONNECTION:
-+    rh_dbg("ClearPortFeature: c_connection\n");
-+    goto clear;
-+  case USB_PORT_FEAT_C_OVER_CURRENT:
-+    rh_dbg("ClearPortFeature: c_over_current\n");
-+    goto clear;
-+  case USB_PORT_FEAT_C_RESET:
-+    rh_dbg("ClearPortFeature: c_reset\n");
-+    goto clear;
-+  clear:
-+    rh.wPortChange[bPort] &= ~(1 << (wFeature - 16));
-+    break;
-+  default:
-+    rh_dbg("ClearPortFeature: unknown feature\n");
-+    return -1;
-+  }
-+  return 0;
-+}
-+
-+
-+#ifdef	CONFIG_PM
-+/* Handle a suspend request for the root hub (called from hcd_driver) */
-+static int rh_suspend_request(struct usb_hcd *hcd)
-+{
-+  return 0; /* no-op for now */
-+}
-+
-+/* Handle a resume request for the root hub (called from hcd_driver) */
-+static int rh_resume_request(struct usb_hcd *hcd)
-+{
-+  return 0; /* no-op for now */
-+}
-+#endif /* CONFIG_PM */
-+
-+
-+
-+/* Wrapper function for workaround port disable registers in USB controller  */
-+static void rh_disable_port(unsigned int port) {
-+  volatile int timeout = 10000;
-+  volatile char* usb_portx_disable;
-+  switch(port) {
-+  case 0:
-+    usb_portx_disable = R_USB_PORT1_DISABLE;
-+    break;
-+  case 1:
-+    usb_portx_disable = R_USB_PORT2_DISABLE;
-+    break;
-+  default:
-+    /* Invalid port index */
-+    return;
-+  }
-+  /* Set disable flag in special register  */
-+  *usb_portx_disable = IO_STATE(R_USB_PORT1_DISABLE, disable, yes);
-+  /* Wait until not enabled anymore */
-+  while((rh.wPortStatusPrev[port] &
-+	IO_STATE(R_USB_RH_PORT_STATUS_1, enabled, yes)) &&
-+	(timeout-- > 0));
-+  if(timeout == 0) {
-+    warn("Timeout while waiting for port %d to become disabled\n", port);
-+  }
-+  /* clear disable flag in special register  */
-+  *usb_portx_disable = IO_STATE(R_USB_PORT1_DISABLE, disable, no);
-+  rh_info("Physical port %d disabled\n", port+1);
-+}
-+
-+
-+/******************************************************************/
-+/* Transfer Controller (TC) functions                             */
-+/******************************************************************/
-+
-+/* FIXME: Should RX_BUF_SIZE be a config option, or maybe we should adjust it
-+   dynamically?
-+   To adjust it dynamically we would have to get an interrupt when we reach
-+   the end of the rx descriptor list, or when we get close to the end, and
-+   then allocate more descriptors. */
-+#define NBR_OF_RX_DESC     512
-+#define RX_DESC_BUF_SIZE   1024
-+#define RX_BUF_SIZE        (NBR_OF_RX_DESC * RX_DESC_BUF_SIZE)
-+
-+
-+/* Local variables for Transfer Controller */
-+/* --------------------------------------- */
-+
-+/* This is a circular (double-linked) list of the active urbs for each epid.
-+   The head is never removed, and new urbs are linked onto the list as
-+   urb_entry_t elements. Don't reference urb_list directly; use the wrapper
-+   functions instead (which includes spin_locks) */
-+static struct list_head urb_list[NBR_OF_EPIDS];
-+
-+/* Read about the need and usage of this lock in submit_ctrl_urb. */
-+/* Lock for URB lists for each EPID */
-+static spinlock_t urb_list_lock;
-+
-+/* Lock for EPID array register (R_USB_EPT_x) in Etrax */
-+static spinlock_t etrax_epid_lock;
-+
-+/* Lock for dma8 sub0 handling */
-+static spinlock_t etrax_dma8_sub0_lock;
-+
-+/* DMA IN cache bug. Align the DMA IN buffers to 32 bytes, i.e. a cache line.
-+   Since RX_DESC_BUF_SIZE is 1024 is a multiple of 32, all rx buffers will be
-+   cache aligned. */
-+static volatile unsigned char RxBuf[RX_BUF_SIZE] __attribute__ ((aligned (32)));
-+static volatile struct USB_IN_Desc RxDescList[NBR_OF_RX_DESC] __attribute__ ((aligned (4)));
-+
-+/* Pointers into RxDescList. */
-+static volatile struct USB_IN_Desc *myNextRxDesc;
-+static volatile struct USB_IN_Desc *myLastRxDesc;
-+
-+/* A zout transfer makes a memory access at the address of its buf pointer,
-+   which means that setting this buf pointer to 0 will cause an access to the
-+   flash. In addition to this, setting sw_len to 0 results in a 16/32 bytes
-+   (depending on DMA burst size) transfer.
-+   Instead, we set it to 1, and point it to this buffer. */
-+static int zout_buffer[4] __attribute__ ((aligned (4)));
-+
-+/* Cache for allocating new EP and SB descriptors. */
-+//static kmem_cache_t *usb_desc_cache;
-+static struct kmem_cache *usb_desc_cache;
-+
-+/* Cache for the data allocated in the isoc descr top half. */
-+//static kmem_cache_t *isoc_compl_cache;
-+static struct kmem_cache *isoc_compl_cache;
-+
-+/* Cache for the data allocated when delayed finishing of URBs */
-+//static kmem_cache_t *later_data_cache;
-+static struct kmem_cache *later_data_cache;
-+
-+/* Counter to keep track of how many Isoc EP we have sat up. Used to enable
-+   and disable iso_eof interrupt. We only need these interrupts when we have
-+   Isoc data endpoints (consumes CPU cycles).
-+   FIXME: This could be more fine granular, so this interrupt is only enabled
-+   when we have a In Isoc URB not URB_ISO_ASAP flaged queued. */
-+static int isoc_epid_counter;
-+
-+/* Protecting wrapper functions for R_USB_EPT_x */
-+/* -------------------------------------------- */
-+static inline void etrax_epid_set(__u8 index, __u32 data) {
-+  unsigned long flags;
-+  spin_lock_irqsave(&etrax_epid_lock, flags);
-+  *R_USB_EPT_INDEX = IO_FIELD(R_USB_EPT_INDEX, value, index);
-+  nop();
-+  *R_USB_EPT_DATA = data;
-+  spin_unlock_irqrestore(&etrax_epid_lock, flags);
-+}
-+
-+static inline void etrax_epid_clear_error(__u8 index) {
-+  unsigned long flags;
-+  spin_lock_irqsave(&etrax_epid_lock, flags);
-+  *R_USB_EPT_INDEX = IO_FIELD(R_USB_EPT_INDEX, value, index);
-+  nop();
-+  *R_USB_EPT_DATA &=
-+    ~(IO_MASK(R_USB_EPT_DATA, error_count_in) |
-+      IO_MASK(R_USB_EPT_DATA, error_count_out) |
-+      IO_MASK(R_USB_EPT_DATA, error_code));
-+  spin_unlock_irqrestore(&etrax_epid_lock, flags);
-+}
-+
-+static inline void etrax_epid_set_toggle(__u8 index, __u8 dirout,
-+                                             __u8 toggle) {
-+  unsigned long flags;
-+  spin_lock_irqsave(&etrax_epid_lock, flags);
-+  *R_USB_EPT_INDEX = IO_FIELD(R_USB_EPT_INDEX, value, index);
-+  nop();
-+  if(dirout) {
-+    *R_USB_EPT_DATA &= ~IO_MASK(R_USB_EPT_DATA, t_out);
-+    *R_USB_EPT_DATA |= IO_FIELD(R_USB_EPT_DATA, t_out, toggle);
-+  } else {
-+    *R_USB_EPT_DATA &= ~IO_MASK(R_USB_EPT_DATA, t_in);
-+    *R_USB_EPT_DATA |= IO_FIELD(R_USB_EPT_DATA, t_in, toggle);
-+  }
-+  spin_unlock_irqrestore(&etrax_epid_lock, flags);
-+}
-+
-+static inline __u8 etrax_epid_get_toggle(__u8 index, __u8 dirout) {
-+  unsigned long flags;
-+  __u8 toggle;
-+  spin_lock_irqsave(&etrax_epid_lock, flags);
-+  *R_USB_EPT_INDEX = IO_FIELD(R_USB_EPT_INDEX, value, index);
-+  nop();
-+  if (dirout) {
-+    toggle = IO_EXTRACT(R_USB_EPT_DATA, t_out, *R_USB_EPT_DATA);
-+  } else {
-+    toggle = IO_EXTRACT(R_USB_EPT_DATA, t_in, *R_USB_EPT_DATA);
-+  }
-+  spin_unlock_irqrestore(&etrax_epid_lock, flags);
-+  return toggle;
-+}
-+
-+
-+static inline __u32 etrax_epid_get(__u8 index) {
-+  unsigned long flags;
-+  __u32 data;
-+  spin_lock_irqsave(&etrax_epid_lock, flags);
-+  *R_USB_EPT_INDEX = IO_FIELD(R_USB_EPT_INDEX, value, index);
-+  nop();
-+  data = *R_USB_EPT_DATA;
-+  spin_unlock_irqrestore(&etrax_epid_lock, flags);
-+  return data;
-+}
-+
-+
-+
-+
-+/* Main functions for Transfer Controller */
-+/* -------------------------------------- */
-+
-+/* Init structs, memories and lists used by Transfer Controller */
-+int tc_init(struct usb_hcd *hcd) {
-+  int i;
-+  /* Clear software state info for all epids */
-+  memset(epid_state, 0, sizeof(struct etrax_epid) * NBR_OF_EPIDS);
-+
-+  /* Set Invalid and Dummy as being in use and disabled */
-+  epid_state[INVALID_EPID].inuse = 1;
-+  epid_state[DUMMY_EPID].inuse = 1;
-+  epid_state[INVALID_EPID].disabled = 1;
-+  epid_state[DUMMY_EPID].disabled = 1;
-+
-+  /* Clear counter for how many Isoc epids we have sat up */
-+  isoc_epid_counter = 0;
-+
-+  /* Initialize the urb list by initiating a head for each list.
-+     Also reset list hodling active URB for each epid */
-+  for (i = 0; i < NBR_OF_EPIDS; i++) {
-+    INIT_LIST_HEAD(&urb_list[i]);
-+    activeUrbList[i] = NULL;
-+  }
-+
-+  /* Init lock for URB lists */
-+  spin_lock_init(&urb_list_lock);
-+  /* Init lock for Etrax R_USB_EPT register */
-+  spin_lock_init(&etrax_epid_lock);
-+  /* Init lock for Etrax dma8 sub0 handling */
-+  spin_lock_init(&etrax_dma8_sub0_lock);
-+
-+  /* We use kmem_cache_* to make sure that all DMA desc. are dword aligned */
-+
-+  /* Note that we specify sizeof(struct USB_EP_Desc) as the size, but also
-+     allocate SB descriptors from this cache. This is ok since
-+     sizeof(struct USB_EP_Desc) == sizeof(struct USB_SB_Desc). */
-+//  usb_desc_cache = kmem_cache_create("usb_desc_cache",
-+//				     sizeof(struct USB_EP_Desc), 0,
-+//				     SLAB_HWCACHE_ALIGN, 0, 0);
-+  usb_desc_cache = kmem_cache_create(
-+				  "usb_desc_cache",
-+				  sizeof(struct USB_EP_Desc),
-+				  0,
-+				  SLAB_HWCACHE_ALIGN,
-+				  NULL);
-+  if(usb_desc_cache == NULL) {
-+    return -ENOMEM;
-+  }
-+
-+  /* Create slab cache for speedy allocation of memory for isoc bottom-half
-+     interrupt handling */
-+//  isoc_compl_cache =
-+//    kmem_cache_create("isoc_compl_cache",
-+//		      sizeof(struct crisv10_isoc_complete_data),
-+//		      0, SLAB_HWCACHE_ALIGN, 0, 0);
-+  isoc_compl_cache = kmem_cache_create(
-+				  "isoc_compl_cache",
-+				  sizeof(struct crisv10_isoc_complete_data),
-+				  0,
-+				  SLAB_HWCACHE_ALIGN,
-+				  NULL
-+				  );
-+
-+  if(isoc_compl_cache == NULL) {
-+    return -ENOMEM;
-+  }
-+
-+  /* Create slab cache for speedy allocation of memory for later URB finish
-+     struct */
-+//  later_data_cache =
-+//    kmem_cache_create("later_data_cache",
-+//		      sizeof(struct urb_later_data),
-+//		      0, SLAB_HWCACHE_ALIGN, 0, 0);
-+
-+  later_data_cache = kmem_cache_create(
-+				  "later_data_cache",
-+				  sizeof(struct urb_later_data),
-+				  0,
-+				  SLAB_HWCACHE_ALIGN,
-+				  NULL
-+				  );
-+  
-+  if(later_data_cache == NULL) {
-+    return -ENOMEM;
-+  }
-+
-+
-+  /* Initiate the bulk start timer. */
-+  init_timer(&bulk_start_timer);
-+  bulk_start_timer.expires = jiffies + BULK_START_TIMER_INTERVAL;
-+  bulk_start_timer.function = tc_bulk_start_timer_func;
-+  add_timer(&bulk_start_timer);
-+
-+
-+  /* Initiate the bulk eot timer. */
-+  init_timer(&bulk_eot_timer);
-+  bulk_eot_timer.expires = jiffies + BULK_EOT_TIMER_INTERVAL;
-+  bulk_eot_timer.function = tc_bulk_eot_timer_func;
-+  bulk_eot_timer.data = (unsigned long)hcd;
-+  add_timer(&bulk_eot_timer);
-+
-+  return 0;
-+}
-+
-+/* Uninitialize all resources used by Transfer Controller */
-+void tc_destroy(void) {
-+
-+  /* Destroy all slab cache */
-+  kmem_cache_destroy(usb_desc_cache);
-+  kmem_cache_destroy(isoc_compl_cache);
-+  kmem_cache_destroy(later_data_cache);
-+
-+  /* Remove timers */
-+  del_timer(&bulk_start_timer);
-+  del_timer(&bulk_eot_timer);
-+}
-+
-+static void restart_dma8_sub0(void) {
-+  unsigned long flags;
-+  spin_lock_irqsave(&etrax_dma8_sub0_lock, flags);
-+  /* Verify that the dma is not running */
-+  if ((*R_DMA_CH8_SUB0_CMD & IO_MASK(R_DMA_CH8_SUB0_CMD, cmd)) == 0) {
-+    struct USB_EP_Desc *ep = (struct USB_EP_Desc *)phys_to_virt(*R_DMA_CH8_SUB0_EP);
-+    while (DUMMY_EPID == IO_EXTRACT(USB_EP_command, epid, ep->command)) {
-+      ep = (struct USB_EP_Desc *)phys_to_virt(ep->next);
-+    }
-+    /* Advance the DMA to the next EP descriptor that is not a DUMMY_EPID.
-+	 * ep->next is already a physical address. virt_to_phys is needed, see
-+	 * http://mhonarc.axis.se/dev-etrax/msg08630.html
-+	 */
-+    //*R_DMA_CH8_SUB0_EP = ep->next;
-+	*R_DMA_CH8_SUB0_EP = virt_to_phys(ep);
-+    /* Restart the DMA */
-+    *R_DMA_CH8_SUB0_CMD = IO_STATE(R_DMA_CH8_SUB0_CMD, cmd, start);
-+  }
-+  spin_unlock_irqrestore(&etrax_dma8_sub0_lock, flags);
-+}
-+
-+/* queue an URB with the transfer controller (called from hcd_driver) */
-+//static int tc_urb_enqueue(struct usb_hcd *hcd, 
-+//			  struct usb_host_endpoint *ep,
-+//			  struct urb *urb, 
-+//			  gfp_t mem_flags) {
-+static int tc_urb_enqueue(struct usb_hcd *hcd, struct urb *urb, gfp_t mem_flags)
-+{
-+  int epid;
-+  int retval;
-+//  int bustime = 0;
-+  int maxpacket;
-+  unsigned long flags;
-+  struct crisv10_urb_priv *urb_priv;
-+  struct crisv10_hcd* crisv10_hcd = hcd_to_crisv10_hcd(hcd);
-+  DBFENTER;
-+
-+  if(!(crisv10_hcd->running)) {
-+    /* The USB Controller is not running, probably because no device is 
-+       attached. No idea to enqueue URBs then */
-+    tc_warn("Rejected enqueueing of URB:0x%x because no dev attached\n",
-+	    (unsigned int)urb);
-+    return -ENOENT;
-+  }
-+
-+  maxpacket = usb_maxpacket(urb->dev, urb->pipe, usb_pipeout(urb->pipe));
-+  
-+  /* hinko ignore usb_pipeisoc */
-+#if 0
-+  /* Special case check for In Isoc transfers. Specification states that each
-+     In Isoc transfer consists of one packet and therefore it should fit into
-+     the transfer-buffer of an URB.
-+     We do the check here to be sure (an invalid scenario can be produced with
-+     parameters to the usbtest suite) */
-+  if(usb_pipeisoc(urb->pipe) && usb_pipein(urb->pipe) &&
-+     (urb->transfer_buffer_length < maxpacket)) {
-+    tc_err("Submit In Isoc URB with buffer length:%d to pipe with maxpacketlen: %d\n", urb->transfer_buffer_length, maxpacket);
-+    return -EMSGSIZE;
-+  }
-+
-+  /* Check if there is enough bandwidth for periodic transfer  */
-+  if(usb_pipeint(urb->pipe) || usb_pipeisoc(urb->pipe)) {
-+    /* only check (and later claim) if not already claimed */
-+    if (urb->bandwidth == 0) {
-+      bustime = usb_check_bandwidth(urb->dev, urb);
-+      if (bustime < 0) {
-+	tc_err("Not enough periodic bandwidth\n");
-+	return -ENOSPC;
-+      }
-+    }
-+  }
-+#endif
-+  
-+  /* Check if there is a epid for URBs destination, if not this function
-+     set up one. */
-+  //epid = tc_setup_epid(ep, urb, mem_flags);
-+  epid = tc_setup_epid(urb, mem_flags);
-+  if (epid < 0) {
-+    tc_err("Failed setup epid:%d for URB:0x%x\n", epid, (unsigned int)urb);
-+    DBFEXIT;
-+    return -ENOMEM;
-+  }
-+
-+  if(urb == activeUrbList[epid]) {
-+    tc_err("Resubmition of allready active URB:0x%x\n", (unsigned int)urb);
-+    return -ENXIO;
-+  }
-+
-+  if(urb_list_entry(urb, epid)) {
-+    tc_err("Resubmition of allready queued URB:0x%x\n", (unsigned int)urb);
-+    return -ENXIO;
-+  }
-+
-+  /* If we actively have flaged endpoint as disabled then refuse submition */
-+  if(epid_state[epid].disabled) {
-+    return -ENOENT;
-+  }
-+
-+  /* Allocate and init HC-private data for URB */
-+  if(urb_priv_create(hcd, urb, epid, mem_flags) != 0) {
-+    DBFEXIT;
-+    return -ENOMEM;
-+  }
-+  urb_priv = urb->hcpriv;
-+
-+  tc_dbg("Enqueue URB:0x%x[%d] epid:%d (%s) bufflen:%d\n",
-+	 (unsigned int)urb, urb_priv->urb_num, epid,
-+	 pipe_to_str(urb->pipe), urb->transfer_buffer_length);
-+
-+  /* Create and link SBs required for this URB */
-+  retval = create_sb_for_urb(urb, mem_flags);
-+  if(retval != 0) {
-+    tc_err("Failed to create SBs for URB:0x%x[%d]\n", (unsigned int)urb,
-+	   urb_priv->urb_num);
-+    urb_priv_free(hcd, urb);
-+    DBFEXIT;
-+    return retval;
-+  }
-+
-+  /* Init intr EP pool if this URB is a INTR transfer. This pool is later
-+     used when inserting EPs in the TxIntrEPList. We do the alloc here
-+     so we can't run out of memory later */
-+  if(usb_pipeint(urb->pipe)) {
-+    retval = init_intr_urb(urb, mem_flags);
-+    if(retval != 0) {
-+      tc_warn("Failed to init Intr URB\n");
-+      urb_priv_free(hcd, urb);
-+      DBFEXIT;
-+      return retval;
-+    }
-+  }
-+
-+  /* Disable other access when inserting USB */
-+
-+  /* BUG on sleeping inside int disabled if using local_irq_save/local_irq_restore
-+   * her - because urb_list_add() and tc_dma_process_queue() save irqs again !??!
-+   */
-+//  local_irq_save(flags);
-+
-+  /* hinko ignore usb_pipeisoc */
-+#if 0
-+  /* Claim bandwidth, if needed */
-+  if(bustime) {
-+    usb_claim_bandwidth(urb->dev, urb, bustime, 0);
-+  }
-+  
-+  /* Add URB to EP queue */
-+  urb_list_add(urb, epid, mem_flags);
-+
-+  if(usb_pipeisoc(urb->pipe)) {
-+    /* Special processing of Isoc URBs. */
-+    tc_dma_process_isoc_urb(urb);
-+  } else {
-+    /* Process EP queue for rest of the URB types (Bulk, Ctrl, Intr) */
-+    tc_dma_process_queue(epid);
-+  }
-+#endif
-+  /* Add URB to EP queue */
-+  urb_list_add(urb, epid, mem_flags);
-+
-+  /*hinko link/unlink urb -> ep */
-+  spin_lock_irqsave(&crisv10_hcd->lock, flags);
-+  //spin_lock(&crisv10_hcd->lock);
-+  retval = usb_hcd_link_urb_to_ep(hcd, urb);
-+  if (retval) {
-+    spin_unlock_irqrestore(&crisv10_hcd->lock, flags);
-+    tc_warn("Failed to link urb to ep\n");
-+    urb_priv_free(hcd, urb);
-+    DBFEXIT;
-+    return retval;
-+  }
-+  spin_unlock_irqrestore(&crisv10_hcd->lock, flags);
-+  //spin_unlock(&crisv10_hcd->lock);
-+  
-+  /* Process EP queue for rest of the URB types (Bulk, Ctrl, Intr) */
-+  tc_dma_process_queue(epid);
-+
-+//  local_irq_restore(flags);
-+
-+  DBFEXIT;
-+  return 0;
-+}
-+
-+/* remove an URB from the transfer controller queues (called from hcd_driver)*/
-+//static int tc_urb_dequeue(struct usb_hcd *hcd, struct urb *urb)
-+static int tc_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
-+{
-+  struct crisv10_urb_priv *urb_priv;
-+  unsigned long flags;
-+  int epid;
-+
-+  DBFENTER;
-+  /* Disable interrupts here since a descriptor interrupt for the isoc epid
-+     will modify the sb list.  This could possibly be done more granular, but
-+     urb_dequeue should not be used frequently anyway.
-+  */
-+  local_irq_save(flags);
-+
-+  urb_priv = urb->hcpriv;
-+
-+  if (!urb_priv) {
-+    /* This happens if a device driver calls unlink on an urb that
-+       was never submitted (lazy driver) or if the urb was completed
-+       while dequeue was being called. */
-+    tc_warn("Dequeing of not enqueued URB:0x%x\n", (unsigned int)urb);
-+    local_irq_restore(flags);
-+    return 0;
-+  }
-+  epid = urb_priv->epid;
-+
-+  tc_warn("Dequeing %s URB:0x%x[%d] (%s %s epid:%d) status:%d %s\n",
-+	  (urb == activeUrbList[epid]) ? "active" : "queued",
-+	  (unsigned int)urb, urb_priv->urb_num, str_dir(urb->pipe),
-+	  str_type(urb->pipe), epid, urb->status,
-+	  (urb_priv->later_data) ? "later-sched" : "");
-+
-+  /* For Bulk, Ctrl and Intr are only one URB active at a time. So any URB
-+     that isn't active can be dequeued by just removing it from the queue */
-+  if(usb_pipebulk(urb->pipe) || usb_pipecontrol(urb->pipe) ||
-+     usb_pipeint(urb->pipe)) {
-+
-+    /* Check if URB haven't gone further than the queue */
-+    if(urb != activeUrbList[epid]) {
-+      ASSERT(urb_priv->later_data == NULL);
-+      tc_warn("Dequeing URB:0x%x[%d] (%s %s epid:%d) from queue"
-+	      " (not active)\n", (unsigned int)urb, urb_priv->urb_num,
-+	      str_dir(urb->pipe), str_type(urb->pipe), epid);
-+      
-+      /* Finish the URB with error status from USB core */
-+      tc_finish_urb(hcd, urb, urb->status);
-+      local_irq_restore(flags);
-+      return 0;
-+    }
-+  }
-+
-+  /* Set URB status to Unlink for handling when interrupt comes. */
-+  urb_priv->urb_state = UNLINK;
-+
-+  /* Differentiate dequeing of Bulk and Ctrl from Isoc and Intr */
-+  switch(usb_pipetype(urb->pipe)) {
-+  case PIPE_BULK:
-+    /* Check if EP still is enabled */
-+    if (TxBulkEPList[epid].command & IO_MASK(USB_EP_command, enable)) {
-+      /* The EP was enabled, disable it. */
-+      TxBulkEPList[epid].command &= ~IO_MASK(USB_EP_command, enable);
-+    }
-+    /* Kicking dummy list out of the party. */
-+    TxBulkEPList[epid].next = virt_to_phys(&TxBulkEPList[(epid + 1) % NBR_OF_EPIDS]);
-+    break;
-+  case PIPE_CONTROL:
-+    /* Check if EP still is enabled */
-+    if (TxCtrlEPList[epid].command & IO_MASK(USB_EP_command, enable)) {
-+      /* The EP was enabled, disable it. */
-+      TxCtrlEPList[epid].command &= ~IO_MASK(USB_EP_command, enable);
-+    }
-+    break;
-+  case PIPE_ISOCHRONOUS:
-+    /* Disabling, busy-wait and unlinking of Isoc SBs will be done in
-+       finish_isoc_urb(). Because there might the case when URB is dequeued
-+       but there are other valid URBs waiting */
-+
-+    /* Check if In Isoc EP still is enabled */
-+    if (TxIsocEPList[epid].command & IO_MASK(USB_EP_command, enable)) {
-+      /* The EP was enabled, disable it. */
-+      TxIsocEPList[epid].command &= ~IO_MASK(USB_EP_command, enable);
-+    }
-+    break;
-+  case PIPE_INTERRUPT:
-+    /* Special care is taken for interrupt URBs. EPs are unlinked in
-+       tc_finish_urb */
-+    break;
-+  default:
-+    break;
-+  }
-+
-+  /* Asynchronous unlink, finish the URB later from scheduled or other
-+     event (data finished, error) */
-+  tc_finish_urb_later(hcd, urb, urb->status);
-+
-+  local_irq_restore(flags);
-+  DBFEXIT;
-+  return 0;
-+}
-+
-+
-+static void tc_sync_finish_epid(struct usb_hcd *hcd, int epid) {
-+  volatile int timeout = 10000;
-+  struct urb* urb;
-+  struct crisv10_urb_priv* urb_priv;
-+  unsigned long flags;
-+  
-+  volatile struct USB_EP_Desc *first_ep;  /* First EP in the list. */
-+  volatile struct USB_EP_Desc *curr_ep;   /* Current EP, the iterator. */
-+  volatile struct USB_EP_Desc *next_ep;   /* The EP after current. */
-+
-+  int type = epid_state[epid].type;
-+
-+  /* Setting this flag will cause enqueue() to return -ENOENT for new
-+     submitions on this endpoint and finish_urb() wont process queue further */
-+  epid_state[epid].disabled = 1;
-+
-+  switch(type) {
-+  case PIPE_BULK:
-+    /* Check if EP still is enabled */
-+    if (TxBulkEPList[epid].command & IO_MASK(USB_EP_command, enable)) {
-+      /* The EP was enabled, disable it. */
-+      TxBulkEPList[epid].command &= ~IO_MASK(USB_EP_command, enable);
-+      tc_warn("sync_finish: Disabling EP for epid:%d\n", epid);
-+
-+      /* Do busy-wait until DMA not using this EP descriptor anymore */
-+      while((*R_DMA_CH8_SUB0_EP ==
-+	     virt_to_phys(&TxBulkEPList[epid])) &&
-+	    (timeout-- > 0));
-+      if(timeout == 0) {
-+	warn("Timeout while waiting for DMA-TX-Bulk to leave EP for"
-+	     " epid:%d\n", epid);
-+      }
-+    }
-+    break;
-+
-+  case PIPE_CONTROL:
-+    /* Check if EP still is enabled */
-+    if (TxCtrlEPList[epid].command & IO_MASK(USB_EP_command, enable)) {
-+      /* The EP was enabled, disable it. */
-+      TxCtrlEPList[epid].command &= ~IO_MASK(USB_EP_command, enable);
-+      tc_warn("sync_finish: Disabling EP for epid:%d\n", epid);
-+
-+      /* Do busy-wait until DMA not using this EP descriptor anymore */
-+      while((*R_DMA_CH8_SUB1_EP ==
-+	     virt_to_phys(&TxCtrlEPList[epid])) &&
-+	    (timeout-- > 0));
-+      if(timeout == 0) {
-+	warn("Timeout while waiting for DMA-TX-Ctrl to leave EP for"
-+	     " epid:%d\n", epid);
-+      }
-+    }
-+    break;
-+
-+  case PIPE_INTERRUPT:
-+    local_irq_save(flags);
-+    /* Disable all Intr EPs belonging to epid */
-+    first_ep = &TxIntrEPList[0];
-+    curr_ep = first_ep;
-+    do {
-+      next_ep = (struct USB_EP_Desc *)phys_to_virt(curr_ep->next);
-+      if (IO_EXTRACT(USB_EP_command, epid, next_ep->command) == epid) {
-+	/* Disable EP */
-+	next_ep->command &= ~IO_MASK(USB_EP_command, enable);
-+      }
-+      curr_ep = phys_to_virt(curr_ep->next);
-+    } while (curr_ep != first_ep);
-+
-+    local_irq_restore(flags);
-+    break;
-+
-+  case PIPE_ISOCHRONOUS:
-+    /* Check if EP still is enabled */
-+    if (TxIsocEPList[epid].command & IO_MASK(USB_EP_command, enable)) {
-+      tc_warn("sync_finish: Disabling Isoc EP for epid:%d\n", epid);
-+      /* The EP was enabled, disable it. */
-+      TxIsocEPList[epid].command &= ~IO_MASK(USB_EP_command, enable);
-+      
-+      while((*R_DMA_CH8_SUB3_EP == virt_to_phys(&TxIsocEPList[epid])) &&
-+	    (timeout-- > 0));
-+      if(timeout == 0) {
-+	warn("Timeout while waiting for DMA-TX-Isoc to leave EP for"
-+	     " epid:%d\n", epid);
-+      }
-+    }
-+    break;
-+  }
-+
-+  local_irq_save(flags);
-+
-+  /* Finish if there is active URB for this endpoint */
-+  if(activeUrbList[epid] != NULL) {
-+    urb = activeUrbList[epid];
-+    urb_priv = urb->hcpriv;
-+    ASSERT(urb_priv);
-+    tc_warn("Sync finish %s URB:0x%x[%d] (%s %s epid:%d) status:%d %s\n",
-+	    (urb == activeUrbList[epid]) ? "active" : "queued",
-+	    (unsigned int)urb, urb_priv->urb_num, str_dir(urb->pipe),
-+	    str_type(urb->pipe), epid, urb->status,
-+	    (urb_priv->later_data) ? "later-sched" : "");
-+
-+    tc_finish_urb(hcd, activeUrbList[epid], -ENOENT);
-+    ASSERT(activeUrbList[epid] == NULL);
-+  }
-+
-+  /* Finish any queued URBs for this endpoint. There won't be any resubmitions
-+     because epid_disabled causes enqueue() to fail for this endpoint */
-+  while((urb = urb_list_first(epid)) != NULL) {
-+    urb_priv = urb->hcpriv;
-+    ASSERT(urb_priv);
-+
-+    tc_warn("Sync finish %s URB:0x%x[%d] (%s %s epid:%d) status:%d %s\n",
-+	    (urb == activeUrbList[epid]) ? "active" : "queued",
-+	    (unsigned int)urb, urb_priv->urb_num, str_dir(urb->pipe),
-+	    str_type(urb->pipe), epid, urb->status,
-+	    (urb_priv->later_data) ? "later-sched" : "");
-+
-+    tc_finish_urb(hcd, urb, -ENOENT);
-+  }
-+  epid_state[epid].disabled = 0;
-+  local_irq_restore(flags);
-+}
-+
-+/* free resources associated with an endpoint (called from hcd_driver) */
-+static void tc_endpoint_disable(struct usb_hcd *hcd, 
-+				struct usb_host_endpoint *ep) {
-+  DBFENTER;
-+  /* Only free epid if it has been allocated. We get two endpoint_disable
-+     requests for ctrl endpoints so ignore the second one */
-+  if(ep->hcpriv != NULL) {
-+    struct crisv10_ep_priv *ep_priv = ep->hcpriv;
-+    int epid = ep_priv->epid;
-+    tc_warn("endpoint_disable ep:0x%x ep-priv:0x%x (%s) (epid:%d freed)\n",
-+	   (unsigned int)ep, (unsigned int)ep->hcpriv,
-+	   endpoint_to_str(&(ep->desc)), epid);
-+
-+    tc_sync_finish_epid(hcd, epid);
-+
-+    ASSERT(activeUrbList[epid] == NULL);
-+    ASSERT(list_empty(&urb_list[epid]));
-+
-+    tc_free_epid(ep);
-+  } else {
-+    tc_dbg("endpoint_disable ep:0x%x ep-priv:0x%x (%s)\n", (unsigned int)ep,
-+	   (unsigned int)ep->hcpriv, endpoint_to_str(&(ep->desc)));
-+  }
-+  DBFEXIT;
-+}
-+
-+//static void tc_finish_urb_later_proc(void *data) {
-+static void tc_finish_urb_later_proc(struct work_struct *work) {
-+  unsigned long flags;
-+  //struct urb_later_data* uld = (struct urb_later_data*)data;
-+  struct urb_later_data* uld = container_of(work, struct urb_later_data, ws.work);
-+  local_irq_save(flags);
-+  if(uld->urb == NULL) {
-+    late_dbg("Later finish of URB = NULL (allready finished)\n");
-+  } else {
-+    struct crisv10_urb_priv* urb_priv = uld->urb->hcpriv;
-+    ASSERT(urb_priv);
-+    if(urb_priv->urb_num == uld->urb_num) {
-+      late_dbg("Later finish of URB:0x%x[%d]\n", (unsigned int)(uld->urb),
-+	       urb_priv->urb_num);
-+      if(uld->status != uld->urb->status) {
-+	errno_dbg("Later-finish URB with status:%d, later-status:%d\n",
-+		  uld->urb->status, uld->status);
-+      }
-+      if(uld != urb_priv->later_data) {
-+	panic("Scheduled uld not same as URBs uld\n");
-+      }
-+      tc_finish_urb(uld->hcd, uld->urb, uld->status);
-+    } else {
-+      late_warn("Ignoring later finish of URB:0x%x[%d]"
-+		", urb_num doesn't match current URB:0x%x[%d]",
-+		(unsigned int)(uld->urb), uld->urb_num,
-+		(unsigned int)(uld->urb), urb_priv->urb_num);
-+    }
-+  }
-+  local_irq_restore(flags);
-+  kmem_cache_free(later_data_cache, uld);
-+}
-+
-+static void tc_finish_urb_later(struct usb_hcd *hcd, struct urb *urb,
-+				int status) {
-+  struct crisv10_urb_priv *urb_priv = urb->hcpriv;
-+  struct urb_later_data* uld;
-+
-+  ASSERT(urb_priv);
-+
-+  if(urb_priv->later_data != NULL) {
-+    /* Later-finish allready scheduled for this URB, just update status to
-+       return when finishing later */
-+    errno_dbg("Later-finish schedule change URB status:%d with new"
-+	      " status:%d\n", urb_priv->later_data->status, status);
-+    
-+    urb_priv->later_data->status = status;
-+    return;
-+  }
-+
-+  uld = kmem_cache_alloc(later_data_cache, GFP_ATOMIC);
-+  ASSERT(uld);
-+
-+  uld->hcd = hcd;
-+  uld->urb = urb;
-+  uld->urb_num = urb_priv->urb_num;
-+  uld->status = status;
-+
-+  //INIT_WORK(&uld->ws, tc_finish_urb_later_proc, uld);
-+  INIT_DELAYED_WORK(&uld->ws, tc_finish_urb_later_proc);
-+  urb_priv->later_data = uld;
-+
-+  /* Schedule the finishing of the URB to happen later */
-+  schedule_delayed_work(&uld->ws, LATER_TIMER_DELAY);
-+}
-+
-+  /* hinko ignore usb_pipeisoc */
-+#if 0
-+static void tc_finish_isoc_urb(struct usb_hcd *hcd, struct urb *urb,
-+			       int status);
-+#endif
-+
-+static void tc_finish_urb(struct usb_hcd *hcd, struct urb *urb, int status) {
-+  struct crisv10_hcd* crisv10_hcd = hcd_to_crisv10_hcd(hcd);
-+  struct crisv10_urb_priv *urb_priv = urb->hcpriv;
-+  int epid;
-+  char toggle;
-+  int urb_num;
-+  unsigned long flags;
-+
-+  DBFENTER;
-+  ASSERT(urb_priv != NULL);
-+  epid = urb_priv->epid;
-+  urb_num = urb_priv->urb_num;
-+
-+  if(urb != activeUrbList[epid]) {
-+    if(urb_list_entry(urb, epid)) {
-+      /* Remove this URB from the list. Only happens when URB are finished
-+	 before having been processed (dequeing) */
-+      urb_list_del(urb, epid);
-+    } else {
-+      tc_warn("Finishing of URB:0x%x[%d] neither active or in queue for"
-+	      " epid:%d\n", (unsigned int)urb, urb_num, epid);
-+    }
-+  }
-+
-+  /* Cancel any pending later-finish of this URB */
-+  if(urb_priv->later_data) {
-+    urb_priv->later_data->urb = NULL;
-+  }
-+
-+  /* For an IN pipe, we always set the actual length, regardless of whether
-+     there was an error or not (which means the device driver can use the data
-+     if it wants to). */
-+  if(usb_pipein(urb->pipe)) {
-+    urb->actual_length = urb_priv->rx_offset;
-+  } else {
-+    /* Set actual_length for OUT urbs also; the USB mass storage driver seems
-+       to want that. */
-+    if (status == 0 && urb->status == -EINPROGRESS) {
-+      urb->actual_length = urb->transfer_buffer_length;
-+    } else {
-+      /*  We wouldn't know of any partial writes if there was an error. */
-+      urb->actual_length = 0;
-+    }
-+  }
-+
-+
-+  /* URB status mangling */
-+  if(urb->status == -EINPROGRESS) {
-+    /* The USB core hasn't changed the status, let's set our finish status */
-+    urb->status = status;
-+
-+    if ((status == 0) && (urb->transfer_flags & URB_SHORT_NOT_OK) &&
-+	usb_pipein(urb->pipe) &&
-+	(urb->actual_length != urb->transfer_buffer_length)) {
-+      /* URB_SHORT_NOT_OK means that short reads (shorter than the endpoint's
-+	 max length) is to be treated as an error. */
-+      errno_dbg("Finishing URB:0x%x[%d] with SHORT_NOT_OK flag and short"
-+		" data:%d\n", (unsigned int)urb, urb_num,
-+		urb->actual_length);
-+      urb->status = -EREMOTEIO;
-+    }
-+
-+    if(urb_priv->urb_state == UNLINK) {
-+      /* URB has been requested to be unlinked asynchronously */
-+      urb->status = -ECONNRESET;
-+      errno_dbg("Fixing unlink status of URB:0x%x[%d] to:%d\n",
-+		(unsigned int)urb, urb_num, urb->status);
-+    }
-+  } else {
-+    /* The USB Core wants to signal some error via the URB, pass it through */
-+  }
-+
-+  /* hinko ignore usb_pipeisoc */
-+#if 0
-+  /* use completely different finish function for Isoc URBs */
-+  if(usb_pipeisoc(urb->pipe)) {
-+    tc_finish_isoc_urb(hcd, urb, status);
-+    return;
-+  }
-+#endif
-+
-+  /* Do special unlinking of EPs for Intr traffic */
-+  if(usb_pipeint(urb->pipe)) {
-+    tc_dma_unlink_intr_urb(urb);
-+  }
-+
-+  /* hinko ignore usb_pipeisoc */
-+#if 0
-+  /* Release allocated bandwidth for periodic transfers */
-+  if(usb_pipeint(urb->pipe) || usb_pipeisoc(urb->pipe))
-+    usb_release_bandwidth(urb->dev, urb, 0);
-+#endif
-+  
-+  /* This URB is active on EP */
-+  if(urb == activeUrbList[epid]) {
-+    /* We need to fiddle with the toggle bits because the hardware doesn't do
-+       it for us. */
-+    toggle = etrax_epid_get_toggle(epid, usb_pipeout(urb->pipe));
-+    usb_settoggle(urb->dev, usb_pipeendpoint(urb->pipe),
-+		  usb_pipeout(urb->pipe), toggle);
-+
-+    /* Checks for Ctrl and Bulk EPs */
-+    switch(usb_pipetype(urb->pipe)) {
-+    case PIPE_BULK:
-+      /* Check so Bulk EP realy is disabled before finishing active URB  */
-+      ASSERT((TxBulkEPList[epid].command & IO_MASK(USB_EP_command, enable)) ==
-+	     IO_STATE(USB_EP_command, enable, no));
-+      /* Disable sub-pointer for EP to avoid next tx_interrupt() to
-+	 process Bulk EP. */
-+      TxBulkEPList[epid].sub = 0;
-+      /* No need to wait for the DMA before changing the next pointer.
-+	 The modulo NBR_OF_EPIDS isn't actually necessary, since we will never use
-+	 the last one (INVALID_EPID) for actual traffic. */
-+      TxBulkEPList[epid].next = 
-+	virt_to_phys(&TxBulkEPList[(epid + 1) % NBR_OF_EPIDS]);
-+      break;
-+    case PIPE_CONTROL:
-+      /* Check so Ctrl EP realy is disabled before finishing active URB  */
-+      ASSERT((TxCtrlEPList[epid].command & IO_MASK(USB_EP_command, enable)) ==
-+	     IO_STATE(USB_EP_command, enable, no));
-+      /* Disable sub-pointer for EP to avoid next tx_interrupt() to
-+	 process Ctrl EP. */
-+      TxCtrlEPList[epid].sub = 0;
-+      break;
-+    }
-+  }
-+
-+  /* Free HC-private URB data*/
-+  urb_priv_free(hcd, urb);
-+
-+  if(urb->status) {
-+    errno_dbg("finish_urb (URB:0x%x[%d] %s %s) (data:%d) status:%d\n",
-+	      (unsigned int)urb, urb_num, str_dir(urb->pipe),
-+	      str_type(urb->pipe), urb->actual_length, urb->status);
-+  } else {
-+    tc_dbg("finish_urb (URB:0x%x[%d] %s %s) (data:%d) status:%d\n",
-+	   (unsigned int)urb, urb_num, str_dir(urb->pipe),
-+	   str_type(urb->pipe), urb->actual_length, urb->status);
-+  }
-+
-+  /* If we just finished an active URB, clear active pointer. */
-+  if (urb == activeUrbList[epid]) {
-+    /* Make URB not active on EP anymore */
-+    activeUrbList[epid] = NULL;
-+
-+    if(urb->status == 0) {
-+      /* URB finished sucessfully, process queue to see if there are any more
-+	 URBs waiting before we call completion function.*/
-+      if(crisv10_hcd->running) {
-+	/* Only process queue if USB controller is running */
-+	tc_dma_process_queue(epid);
-+      } else {
-+	tc_warn("No processing of queue for epid:%d, USB Controller not"
-+		" running\n", epid);
-+      }
-+    }
-+  }
-+
-+  /*  Hand the URB from HCD to its USB device driver, using its completion
-+      functions */
-+//  usb_hcd_giveback_urb (hcd, urb);
-+	/**
-+	 * usb_hcd_unlink_urb_from_ep - remove an URB from its endpoint queue
-+	 * @hcd: host controller to which @urb was submitted
-+	 * @urb: URB being unlinked
-+	 *
-+	 * Host controller drivers should call this routine before calling
-+	 * usb_hcd_giveback_urb().  The HCD's private spinlock must be held and
-+	 * interrupts must be disabled.  The actions carried out here are required
-+	 * for URB completion.
-+	 */
-+  
-+  /*hinko link/unlink urb -> ep */
-+  //spin_lock(&crisv10_hcd->lock);
-+  spin_lock_irqsave(&crisv10_hcd->lock, flags);
-+  usb_hcd_unlink_urb_from_ep(hcd, urb);
-+  usb_hcd_giveback_urb(hcd, urb, status);
-+  //spin_unlock(&crisv10_hcd->lock);
-+  spin_unlock_irqrestore(&crisv10_hcd->lock, flags);
-+
-+  /* Check the queue once more if the URB returned with error, because we
-+     didn't do it before the completion function because the specification
-+     states that the queue should not restart until all it's unlinked
-+     URBs have been fully retired, with the completion functions run */
-+  if(crisv10_hcd->running) {
-+    /* Only process queue if USB controller is running */
-+    tc_dma_process_queue(epid);
-+  } else {
-+    tc_warn("No processing of queue for epid:%d, USB Controller not running\n",
-+	    epid);
-+  }
-+
-+  DBFEXIT;
-+}
-+
-+  /* hinko ignore usb_pipeisoc */
-+#if 0
-+static void tc_finish_isoc_urb(struct usb_hcd *hcd, struct urb *urb,
-+			       int status) {
-+  struct crisv10_urb_priv *urb_priv = urb->hcpriv;
-+  int epid, i;
-+  volatile int timeout = 10000;
-+
-+  ASSERT(urb_priv);
-+  epid = urb_priv->epid;
-+
-+  ASSERT(usb_pipeisoc(urb->pipe));
-+
-+  /* Set that all isoc packets have status and length set before
-+     completing the urb. */
-+  for (i = urb_priv->isoc_packet_counter; i < urb->number_of_packets; i++){
-+    urb->iso_frame_desc[i].actual_length = 0;
-+    urb->iso_frame_desc[i].status = -EPROTO;
-+  }
-+
-+  /* Check if the URB is currently active (done or error) */
-+  if(urb == activeUrbList[epid]) {
-+    /* Check if there are another In Isoc URB queued for this epid */
-+    if (!list_empty(&urb_list[epid])&& !epid_state[epid].disabled) {
-+      /* Move it from queue to active and mark it started so Isoc transfers
-+	 won't be interrupted.
-+	 All Isoc URBs data transfers are already added to DMA lists so we
-+	 don't have to insert anything in DMA lists here. */
-+      activeUrbList[epid] = urb_list_first(epid);
-+      ((struct crisv10_urb_priv *)(activeUrbList[epid]->hcpriv))->urb_state =
-+	STARTED;
-+      urb_list_del(activeUrbList[epid], epid);
-+
-+      if(urb->status) {
-+	errno_dbg("finish_isoc_urb (URB:0x%x[%d] %s %s) (%d of %d packets)"
-+		  " status:%d, new waiting URB:0x%x[%d]\n",
-+		  (unsigned int)urb, urb_priv->urb_num, str_dir(urb->pipe),
-+		  str_type(urb->pipe), urb_priv->isoc_packet_counter,
-+		  urb->number_of_packets, urb->status,
-+		  (unsigned int)activeUrbList[epid],
-+		  ((struct crisv10_urb_priv *)(activeUrbList[epid]->hcpriv))->urb_num);
-+      }
-+
-+    } else { /* No other URB queued for this epid */
-+      if(urb->status) {
-+	errno_dbg("finish_isoc_urb (URB:0x%x[%d] %s %s) (%d of %d packets)"
-+		  " status:%d, no new URB waiting\n",
-+		  (unsigned int)urb, urb_priv->urb_num, str_dir(urb->pipe),
-+		  str_type(urb->pipe), urb_priv->isoc_packet_counter,
-+		  urb->number_of_packets, urb->status);
-+      }
-+
-+      /* Check if EP is still enabled, then shut it down. */
-+      if (TxIsocEPList[epid].command & IO_MASK(USB_EP_command, enable)) {
-+	isoc_dbg("Isoc EP enabled for epid:%d, disabling it\n", epid);
-+
-+	/* Should only occur for In Isoc EPs where SB isn't consumed. */
-+	ASSERT(usb_pipein(urb->pipe));
-+
-+	/* Disable it and wait for it to stop */
-+	TxIsocEPList[epid].command &= ~IO_MASK(USB_EP_command, enable);
-+	
-+	/* Ah, the luxury of busy-wait. */
-+	while((*R_DMA_CH8_SUB3_EP == virt_to_phys(&TxIsocEPList[epid])) &&
-+	      (timeout-- > 0));
-+	if(timeout == 0) {
-+	  warn("Timeout while waiting for DMA-TX-Isoc to leave EP for epid:%d\n", epid);
-+	}
-+      }
-+
-+      /* Unlink SB to say that epid is finished. */
-+      TxIsocEPList[epid].sub = 0;
-+      TxIsocEPList[epid].hw_len = 0;
-+
-+      /* No URB active for EP anymore */
-+      activeUrbList[epid] = NULL;
-+    }
-+  } else { /* Finishing of not active URB (queued up with SBs thought) */
-+    isoc_warn("finish_isoc_urb (URB:0x%x %s) (%d of %d packets) status:%d,"
-+	      " SB queued but not active\n",
-+	      (unsigned int)urb, str_dir(urb->pipe),
-+	      urb_priv->isoc_packet_counter, urb->number_of_packets,
-+	      urb->status);
-+    if(usb_pipeout(urb->pipe)) {
-+      /* Finishing of not yet active Out Isoc URB needs unlinking of SBs. */
-+      struct USB_SB_Desc *iter_sb, *prev_sb, *next_sb;
-+
-+      iter_sb = TxIsocEPList[epid].sub ?
-+	phys_to_virt(TxIsocEPList[epid].sub) : 0;
-+      prev_sb = 0;
-+
-+      /* SB that is linked before this URBs first SB */
-+      while (iter_sb && (iter_sb != urb_priv->first_sb)) {
-+	prev_sb = iter_sb;
-+	iter_sb = iter_sb->next ? phys_to_virt(iter_sb->next) : 0;
-+      }
-+
-+      if (iter_sb == 0) {
-+	/* Unlink of the URB currently being transmitted. */
-+	prev_sb = 0;
-+	iter_sb = TxIsocEPList[epid].sub ? phys_to_virt(TxIsocEPList[epid].sub) : 0;
-+      }
-+
-+      while (iter_sb && (iter_sb != urb_priv->last_sb)) {
-+	iter_sb = iter_sb->next ? phys_to_virt(iter_sb->next) : 0;
-+      }
-+
-+      if (iter_sb) {
-+	next_sb = iter_sb->next ? phys_to_virt(iter_sb->next) : 0;
-+      } else {
-+	/* This should only happen if the DMA has completed
-+	   processing the SB list for this EP while interrupts
-+	   are disabled. */
-+	isoc_dbg("Isoc urb not found, already sent?\n");
-+	next_sb = 0;
-+      }
-+      if (prev_sb) {
-+	prev_sb->next = next_sb ? virt_to_phys(next_sb) : 0;
-+      } else {
-+	TxIsocEPList[epid].sub = next_sb ? virt_to_phys(next_sb) : 0;
-+      }
-+    }
-+  }
-+
-+  /* Free HC-private URB data*/
-+  urb_priv_free(hcd, urb);
-+
-+  usb_release_bandwidth(urb->dev, urb, 0);
-+
-+  /*  Hand the URB from HCD to its USB device driver, using its completion
-+      functions */
-+  usb_hcd_giveback_urb (hcd, urb);
-+}
-+#endif
-+
-+static __u32 urb_num = 0;
-+
-+/* allocate and initialize URB private data */
-+static int urb_priv_create(struct usb_hcd *hcd, struct urb *urb, int epid,
-+			   int mem_flags) {
-+  struct crisv10_urb_priv *urb_priv;
-+  
-+  urb_priv = kmalloc(sizeof *urb_priv, mem_flags);
-+  if (!urb_priv)
-+    return -ENOMEM;
-+  memset(urb_priv, 0, sizeof *urb_priv);
-+
-+  urb_priv->epid = epid;
-+  urb_priv->urb_state = NOT_STARTED;
-+
-+  urb->hcpriv = urb_priv;
-+  /* Assign URB a sequence number, and increment counter */
-+  urb_priv->urb_num = urb_num;
-+  urb_num++;
-+  return 0;
-+}
-+
-+/* free URB private data */
-+static void urb_priv_free(struct usb_hcd *hcd, struct urb *urb) {
-+  int i;
-+  struct crisv10_urb_priv *urb_priv = urb->hcpriv;
-+  ASSERT(urb_priv != 0);
-+
-+  /* Check it has any SBs linked that needs to be freed*/
-+  if(urb_priv->first_sb != NULL) {
-+    struct USB_SB_Desc *next_sb, *first_sb, *last_sb;
-+    int i = 0;
-+    first_sb = urb_priv->first_sb;
-+    last_sb = urb_priv->last_sb;
-+    ASSERT(last_sb);
-+    while(first_sb != last_sb) {
-+      next_sb = (struct USB_SB_Desc *)phys_to_virt(first_sb->next);
-+      kmem_cache_free(usb_desc_cache, first_sb);
-+      first_sb = next_sb;
-+      i++;
-+    }
-+    kmem_cache_free(usb_desc_cache, last_sb);
-+    i++;
-+  }
-+
-+  /* Check if it has any EPs in its Intr pool that also needs to be freed */
-+  if(urb_priv->intr_ep_pool_length > 0) {
-+    for(i = 0; i < urb_priv->intr_ep_pool_length; i++) {
-+      kfree(urb_priv->intr_ep_pool[i]);
-+    }
-+    /*
-+    tc_dbg("Freed %d EPs from URB:0x%x EP pool\n",
-+	     urb_priv->intr_ep_pool_length, (unsigned int)urb);
-+    */
-+  }
-+
-+  kfree(urb_priv);
-+  urb->hcpriv = NULL;
-+}
-+
-+static int ep_priv_create(struct usb_host_endpoint *ep, int mem_flags) {
-+  struct crisv10_ep_priv *ep_priv;
-+  
-+  ep_priv = kmalloc(sizeof *ep_priv, mem_flags);
-+  if (!ep_priv)
-+    return -ENOMEM;
-+  memset(ep_priv, 0, sizeof *ep_priv);
-+
-+  ep->hcpriv = ep_priv;
-+  return 0;
-+}
-+
-+static void ep_priv_free(struct usb_host_endpoint *ep) {
-+  struct crisv10_ep_priv *ep_priv = ep->hcpriv;
-+  ASSERT(ep_priv);
-+  kfree(ep_priv);
-+  ep->hcpriv = NULL;
-+}
-+
-+/* EPID handling functions, managing EP-list in Etrax through wrappers */
-+/* ------------------------------------------------------------------- */
-+
-+/* Sets up a new EPID for an endpoint or returns existing if found */
-+//static int tc_setup_epid(struct usb_host_endpoint *ep, struct urb *urb,
-+//			 int mem_flags) {
-+static int tc_setup_epid(struct urb *urb, int mem_flags)
-+{
-+  int epid;
-+  char devnum, endpoint, out_traffic, slow;
-+  int maxlen;
-+  __u32 epid_data;
-+  struct usb_host_endpoint *ep = urb->ep;
-+  struct crisv10_ep_priv *ep_priv = ep->hcpriv;
-+  
-+  DBFENTER;
-+  
-+  /* Check if a valid epid already is setup for this endpoint */
-+  if(ep_priv != NULL) {
-+    return ep_priv->epid;
-+  }
-+
-+  /* We must find and initiate a new epid for this urb. */
-+  epid = tc_allocate_epid();
-+  
-+  if (epid == -1) {
-+    /* Failed to allocate a new epid. */
-+    DBFEXIT;
-+    return epid;
-+  }
-+  
-+  /* We now have a new epid to use. Claim it. */
-+  epid_state[epid].inuse = 1;
-+  
-+  /* Init private data for new endpoint */
-+  if(ep_priv_create(ep, mem_flags) != 0) {
-+    return -ENOMEM;
-+  }
-+  ep_priv = ep->hcpriv;
-+  ep_priv->epid = epid;
-+
-+  devnum = usb_pipedevice(urb->pipe);
-+  endpoint = usb_pipeendpoint(urb->pipe);
-+  slow = (urb->dev->speed == USB_SPEED_LOW);
-+  maxlen = usb_maxpacket(urb->dev, urb->pipe, usb_pipeout(urb->pipe));
-+
-+  if (usb_pipetype(urb->pipe) == PIPE_CONTROL) {
-+    /* We want both IN and OUT control traffic to be put on the same
-+       EP/SB list. */
-+    out_traffic = 1;
-+  } else {
-+    out_traffic = usb_pipeout(urb->pipe);
-+  }
-+    
-+  if (usb_pipetype(urb->pipe) == PIPE_ISOCHRONOUS) {
-+    epid_data = IO_STATE(R_USB_EPT_DATA_ISO, valid, yes) |
-+      /* FIXME: Change any to the actual port? */
-+      IO_STATE(R_USB_EPT_DATA_ISO, port, any) |
-+      IO_FIELD(R_USB_EPT_DATA_ISO, max_len, maxlen) |
-+      IO_FIELD(R_USB_EPT_DATA_ISO, ep, endpoint) |
-+      IO_FIELD(R_USB_EPT_DATA_ISO, dev, devnum);
-+    etrax_epid_iso_set(epid, epid_data);
-+  } else {
-+    epid_data = IO_STATE(R_USB_EPT_DATA, valid, yes) |
-+      IO_FIELD(R_USB_EPT_DATA, low_speed, slow) |
-+      /* FIXME: Change any to the actual port? */
-+      IO_STATE(R_USB_EPT_DATA, port, any) |
-+      IO_FIELD(R_USB_EPT_DATA, max_len, maxlen) |
-+      IO_FIELD(R_USB_EPT_DATA, ep, endpoint) |
-+      IO_FIELD(R_USB_EPT_DATA, dev, devnum);
-+    etrax_epid_set(epid, epid_data);
-+  }
-+  
-+  epid_state[epid].out_traffic = out_traffic;
-+  epid_state[epid].type = usb_pipetype(urb->pipe);
-+
-+  tc_warn("Setting up ep:0x%x epid:%d (addr:%d endp:%d max_len:%d %s %s %s)\n",
-+	  (unsigned int)ep, epid, devnum, endpoint, maxlen,
-+	  str_type(urb->pipe), out_traffic ? "out" : "in",
-+	  slow ? "low" : "full");
-+
-+  /* Enable Isoc eof interrupt if we set up the first Isoc epid */
-+  if(usb_pipeisoc(urb->pipe)) {
-+    isoc_epid_counter++;
-+    if(isoc_epid_counter == 1) {
-+      isoc_warn("Enabled Isoc eof interrupt\n");
-+      *R_USB_IRQ_MASK_SET |= IO_STATE(R_USB_IRQ_MASK_SET, iso_eof, set);
-+    }
-+  }
-+
-+  DBFEXIT;
-+  return epid;
-+}
-+
-+static void tc_free_epid(struct usb_host_endpoint *ep) {
-+  unsigned long flags;
-+  struct crisv10_ep_priv *ep_priv = ep->hcpriv;
-+  int epid;
-+  volatile int timeout = 10000;
-+
-+  DBFENTER;
-+
-+  if (ep_priv == NULL) {
-+    tc_warn("Trying to free unused epid on ep:0x%x\n", (unsigned int)ep);
-+    DBFEXIT;
-+    return;
-+  }
-+
-+  epid = ep_priv->epid;
-+
-+  /* Disable Isoc eof interrupt if we free the last Isoc epid */
-+  if(epid_isoc(epid)) {
-+    ASSERT(isoc_epid_counter > 0);
-+    isoc_epid_counter--;
-+    if(isoc_epid_counter == 0) {
-+      *R_USB_IRQ_MASK_SET &= ~IO_STATE(R_USB_IRQ_MASK_SET, iso_eof, set);
-+      isoc_warn("Disabled Isoc eof interrupt\n");
-+    }
-+  }
-+
-+  /* Take lock manualy instead of in epid_x_x wrappers,
-+     because we need to be polling here */
-+  spin_lock_irqsave(&etrax_epid_lock, flags);
-+  
-+  *R_USB_EPT_INDEX = IO_FIELD(R_USB_EPT_INDEX, value, epid);
-+  nop();
-+  while((*R_USB_EPT_DATA & IO_MASK(R_USB_EPT_DATA, hold)) &&
-+	(timeout-- > 0));
-+  if(timeout == 0) {
-+    warn("Timeout while waiting for epid:%d to drop hold\n", epid);
-+  }
-+  /* This will, among other things, set the valid field to 0. */
-+  *R_USB_EPT_DATA = 0;
-+  spin_unlock_irqrestore(&etrax_epid_lock, flags);
-+  
-+  /* Free resource in software state info list */
-+  epid_state[epid].inuse = 0;
-+
-+  /* Free private endpoint data */
-+  ep_priv_free(ep);
-+  
-+  DBFEXIT;
-+}
-+
-+static int tc_allocate_epid(void) {
-+  int i;
-+  DBFENTER;
-+  for (i = 0; i < NBR_OF_EPIDS; i++) {
-+    if (!epid_inuse(i)) {
-+      DBFEXIT;
-+      return i;
-+    }
-+  }
-+  
-+  tc_warn("Found no free epids\n");
-+  DBFEXIT;
-+  return -1;
-+}
-+
-+
-+/* Wrappers around the list functions (include/linux/list.h). */
-+/* ---------------------------------------------------------- */
-+static inline int __urb_list_empty(int epid) {
-+  int retval;
-+  retval = list_empty(&urb_list[epid]);
-+  return retval;
-+}
-+
-+/* Returns first urb for this epid, or NULL if list is empty. */
-+static inline struct urb *urb_list_first(int epid) {
-+  unsigned long flags;
-+  struct urb *first_urb = 0;
-+  spin_lock_irqsave(&urb_list_lock, flags);
-+  if (!__urb_list_empty(epid)) {
-+    /* Get the first urb (i.e. head->next). */
-+    urb_entry_t *urb_entry = list_entry((&urb_list[epid])->next, urb_entry_t, list);
-+    first_urb = urb_entry->urb;
-+  }
-+  spin_unlock_irqrestore(&urb_list_lock, flags);
-+  return first_urb;
-+}
-+
-+/* Adds an urb_entry last in the list for this epid. */
-+static inline void urb_list_add(struct urb *urb, int epid, int mem_flags) {
-+  unsigned long flags;
-+  urb_entry_t *urb_entry = (urb_entry_t *)kmalloc(sizeof(urb_entry_t), mem_flags);
-+  ASSERT(urb_entry);
-+  
-+  urb_entry->urb = urb;
-+  spin_lock_irqsave(&urb_list_lock, flags);
-+  list_add_tail(&urb_entry->list, &urb_list[epid]);
-+  spin_unlock_irqrestore(&urb_list_lock, flags);
-+}
-+
-+/* Search through the list for an element that contains this urb. (The list
-+   is expected to be short and the one we are about to delete will often be
-+   the first in the list.)
-+   Should be protected by spin_locks in calling function */
-+static inline urb_entry_t *__urb_list_entry(struct urb *urb, int epid) {
-+  struct list_head *entry;
-+  struct list_head *tmp;
-+  urb_entry_t *urb_entry;
-+  
-+  list_for_each_safe(entry, tmp, &urb_list[epid]) {
-+    urb_entry = list_entry(entry, urb_entry_t, list);
-+    ASSERT(urb_entry);
-+    ASSERT(urb_entry->urb);
-+    
-+    if (urb_entry->urb == urb) {
-+      return urb_entry;
-+    }
-+  }
-+  return 0;
-+}
-+
-+/* Same function as above but for global use. Protects list by spinlock */
-+static inline urb_entry_t *urb_list_entry(struct urb *urb, int epid) {
-+  unsigned long flags;
-+  urb_entry_t *urb_entry;
-+  spin_lock_irqsave(&urb_list_lock, flags);
-+  urb_entry = __urb_list_entry(urb, epid);
-+  spin_unlock_irqrestore(&urb_list_lock, flags);
-+  return (urb_entry);
-+}
-+
-+/* Delete an urb from the list. */
-+static inline void urb_list_del(struct urb *urb, int epid) {
-+  unsigned long flags;
-+  urb_entry_t *urb_entry;
-+
-+  /* Delete entry and free. */
-+  spin_lock_irqsave(&urb_list_lock, flags);
-+  urb_entry = __urb_list_entry(urb, epid);
-+  ASSERT(urb_entry);
-+
-+  list_del(&urb_entry->list);
-+  spin_unlock_irqrestore(&urb_list_lock, flags);
-+  kfree(urb_entry);
-+}
-+
-+/* Move an urb to the end of the list. */
-+static inline void urb_list_move_last(struct urb *urb, int epid) {
-+  unsigned long flags;
-+  urb_entry_t *urb_entry;
-+  
-+  spin_lock_irqsave(&urb_list_lock, flags);
-+  urb_entry = __urb_list_entry(urb, epid);
-+  ASSERT(urb_entry);
-+
-+  list_del(&urb_entry->list);
-+  list_add_tail(&urb_entry->list, &urb_list[epid]);
-+  spin_unlock_irqrestore(&urb_list_lock, flags);
-+}
-+
-+/* Get the next urb in the list. */
-+static inline struct urb *urb_list_next(struct urb *urb, int epid) {
-+  unsigned long flags;
-+  urb_entry_t *urb_entry;
-+
-+  spin_lock_irqsave(&urb_list_lock, flags);
-+  urb_entry = __urb_list_entry(urb, epid);
-+  ASSERT(urb_entry);
-+
-+  if (urb_entry->list.next != &urb_list[epid]) {
-+    struct list_head *elem = urb_entry->list.next;
-+    urb_entry = list_entry(elem, urb_entry_t, list);
-+    spin_unlock_irqrestore(&urb_list_lock, flags);
-+    return urb_entry->urb;
-+  } else {
-+    spin_unlock_irqrestore(&urb_list_lock, flags);
-+    return NULL;
-+  }
-+}
-+
-+struct USB_EP_Desc* create_ep(int epid, struct USB_SB_Desc* sb_desc,
-+			      int mem_flags) {
-+  struct USB_EP_Desc *ep_desc;
-+  ep_desc = (struct USB_EP_Desc *) kmem_cache_alloc(usb_desc_cache, mem_flags);
-+  if(ep_desc == NULL)
-+    return NULL;
-+  memset(ep_desc, 0, sizeof(struct USB_EP_Desc));
-+
-+  ep_desc->hw_len = 0;
-+  ep_desc->command = (IO_FIELD(USB_EP_command, epid, epid) |
-+		      IO_STATE(USB_EP_command, enable, yes));
-+  if(sb_desc == NULL) {
-+    ep_desc->sub = 0;
-+  } else {
-+    ep_desc->sub = virt_to_phys(sb_desc);
-+  }
-+  return ep_desc;
-+}
-+
-+#define TT_ZOUT  0
-+#define TT_IN    1
-+#define TT_OUT   2
-+#define TT_SETUP 3
-+
-+#define CMD_EOL  IO_STATE(USB_SB_command, eol, yes)
-+#define CMD_INTR IO_STATE(USB_SB_command, intr, yes)
-+#define CMD_FULL IO_STATE(USB_SB_command, full, yes)
-+
-+/* Allocation and setup of a generic SB. Used to create SETUP, OUT and ZOUT
-+   SBs. Also used by create_sb_in() to avoid same allocation procedure at two
-+   places */
-+struct USB_SB_Desc* create_sb(struct USB_SB_Desc* sb_prev, int tt, void* data,
-+			      int datalen, int mem_flags) {
-+  struct USB_SB_Desc *sb_desc;
-+  sb_desc = (struct USB_SB_Desc*)kmem_cache_alloc(usb_desc_cache, mem_flags);
-+  if(sb_desc == NULL)
-+    return NULL;
-+  memset(sb_desc, 0, sizeof(struct USB_SB_Desc));
-+
-+  sb_desc->command = IO_FIELD(USB_SB_command, tt, tt) |
-+                     IO_STATE(USB_SB_command, eot, yes);
-+
-+  sb_desc->sw_len = datalen;
-+  if(data != NULL) {
-+    sb_desc->buf = virt_to_phys(data);
-+  } else {
-+    sb_desc->buf = 0;
-+  }
-+  if(sb_prev != NULL) {
-+    sb_prev->next = virt_to_phys(sb_desc);
-+  }
-+  return sb_desc;
-+}
-+
-+/* Creates a copy of an existing SB by allocation space for it and copy
-+   settings */
-+struct USB_SB_Desc* create_sb_copy(struct USB_SB_Desc* sb_orig, int mem_flags) {
-+  struct USB_SB_Desc *sb_desc;
-+  sb_desc = (struct USB_SB_Desc*)kmem_cache_alloc(usb_desc_cache, mem_flags);
-+  if(sb_desc == NULL)
-+    return NULL;
-+
-+  memcpy(sb_desc, sb_orig, sizeof(struct USB_SB_Desc));
-+  return sb_desc;
-+}
-+
-+/* A specific create_sb function for creation of in SBs. This is due to
-+   that datalen in In SBs shows how many packets we are expecting. It also
-+   sets up the rem field to show if how many bytes we expect in last packet
-+   if it's not a full one */
-+struct USB_SB_Desc* create_sb_in(struct USB_SB_Desc* sb_prev, int datalen,
-+				 int maxlen, int mem_flags) {
-+  struct USB_SB_Desc *sb_desc;
-+  sb_desc = create_sb(sb_prev, TT_IN, NULL,
-+		      datalen ? (datalen - 1) / maxlen + 1 : 0, mem_flags);
-+  if(sb_desc == NULL)
-+    return NULL;
-+  sb_desc->command |= IO_FIELD(USB_SB_command, rem, datalen % maxlen);
-+  return sb_desc;
-+}
-+
-+void set_sb_cmds(struct USB_SB_Desc *sb_desc, __u16 flags) {
-+  sb_desc->command |= flags;
-+}
-+
-+int create_sb_for_urb(struct urb *urb, int mem_flags) {
-+  int is_out = !usb_pipein(urb->pipe);
-+  int type = usb_pipetype(urb->pipe);
-+  int maxlen = usb_maxpacket(urb->dev, urb->pipe, is_out);
-+  int buf_len = urb->transfer_buffer_length;
-+  void *buf = buf_len > 0 ? urb->transfer_buffer : NULL;
-+  struct USB_SB_Desc *sb_desc = NULL;
-+
-+  struct crisv10_urb_priv *urb_priv = (struct crisv10_urb_priv *)urb->hcpriv;
-+  ASSERT(urb_priv != NULL);
-+
-+  switch(type) {
-+  case PIPE_CONTROL:
-+    /* Setup stage */
-+    sb_desc = create_sb(NULL, TT_SETUP, urb->setup_packet, 8, mem_flags);
-+    if(sb_desc == NULL)
-+      return -ENOMEM;
-+    set_sb_cmds(sb_desc, CMD_FULL);
-+
-+    /* Attach first SB to URB */
-+    urb_priv->first_sb = sb_desc;    
-+
-+    if (is_out) { /* Out Control URB */
-+      /* If this Control OUT transfer has an optional data stage we add
-+	 an OUT token before the mandatory IN (status) token */
-+      if ((buf_len > 0) && buf) {
-+	sb_desc = create_sb(sb_desc, TT_OUT, buf, buf_len, mem_flags);
-+	if(sb_desc == NULL)
-+	  return -ENOMEM;
-+	set_sb_cmds(sb_desc, CMD_FULL);
-+      }
-+
-+      /* Status stage */
-+      /* The data length has to be exactly 1. This is due to a requirement
-+         of the USB specification that a host must be prepared to receive
-+         data in the status phase */
-+      sb_desc = create_sb(sb_desc, TT_IN, NULL, 1, mem_flags);
-+      if(sb_desc == NULL)
-+	return -ENOMEM;
-+    } else { /* In control URB */
-+      /* Data stage */
-+      sb_desc = create_sb_in(sb_desc, buf_len, maxlen, mem_flags);
-+      if(sb_desc == NULL)
-+	return -ENOMEM;
-+
-+      /* Status stage */
-+      /* Read comment at zout_buffer declaration for an explanation to this. */
-+      sb_desc = create_sb(sb_desc, TT_ZOUT, &zout_buffer[0], 1, mem_flags);
-+      if(sb_desc == NULL)
-+	return -ENOMEM;
-+      /* Set descriptor interrupt flag for in URBs so we can finish URB after
-+         zout-packet has been sent */
-+      set_sb_cmds(sb_desc, CMD_INTR | CMD_FULL);
-+    }
-+    /* Set end-of-list flag in last SB */
-+    set_sb_cmds(sb_desc, CMD_EOL);
-+    /* Attach last SB to URB */
-+    urb_priv->last_sb = sb_desc;
-+    break;
-+
-+  case PIPE_BULK:
-+    if (is_out) { /* Out Bulk URB */
-+      sb_desc = create_sb(NULL, TT_OUT, buf, buf_len, mem_flags);
-+      if(sb_desc == NULL)
-+	return -ENOMEM;
-+      /* The full field is set to yes, even if we don't actually check that
-+	 this is a full-length transfer (i.e., that transfer_buffer_length %
-+	 maxlen = 0).
-+	 Setting full prevents the USB controller from sending an empty packet
-+	 in that case.  However, if URB_ZERO_PACKET was set we want that. */
-+      if (!(urb->transfer_flags & URB_ZERO_PACKET)) {
-+	set_sb_cmds(sb_desc, CMD_FULL);
-+      }
-+    } else { /* In Bulk URB */
-+      sb_desc = create_sb_in(NULL, buf_len, maxlen, mem_flags);
-+      if(sb_desc == NULL)
-+	return -ENOMEM;
-+    }
-+    /* Set end-of-list flag for last SB */
-+    set_sb_cmds(sb_desc, CMD_EOL);
-+
-+    /* Attach SB to URB */
-+    urb_priv->first_sb = sb_desc;
-+    urb_priv->last_sb = sb_desc;
-+    break;
-+
-+  case PIPE_INTERRUPT:
-+    if(is_out) { /* Out Intr URB */
-+      sb_desc = create_sb(NULL, TT_OUT, buf, buf_len, mem_flags);
-+      if(sb_desc == NULL)
-+	return -ENOMEM;
-+
-+      /* The full field is set to yes, even if we don't actually check that
-+	 this is a full-length transfer (i.e., that transfer_buffer_length %
-+	 maxlen = 0).
-+	 Setting full prevents the USB controller from sending an empty packet
-+	 in that case.  However, if URB_ZERO_PACKET was set we want that. */
-+      if (!(urb->transfer_flags & URB_ZERO_PACKET)) {
-+	set_sb_cmds(sb_desc, CMD_FULL);
-+      }
-+      /* Only generate TX interrupt if it's a Out URB*/
-+      set_sb_cmds(sb_desc, CMD_INTR);
-+
-+    } else { /* In Intr URB */
-+      sb_desc = create_sb_in(NULL, buf_len, maxlen, mem_flags);
-+      if(sb_desc == NULL)
-+	return -ENOMEM;
-+    }
-+    /* Set end-of-list flag for last SB */
-+    set_sb_cmds(sb_desc, CMD_EOL);
-+
-+    /* Attach SB to URB */
-+    urb_priv->first_sb = sb_desc;
-+    urb_priv->last_sb = sb_desc;
-+
-+    break;
-+  case PIPE_ISOCHRONOUS:
-+    if(is_out) { /* Out Isoc URB */
-+      int i;
-+      if(urb->number_of_packets == 0) {
-+	tc_err("Can't create SBs for Isoc URB with zero packets\n");
-+	return -EPIPE;
-+      }
-+      /* Create one SB descriptor for each packet and link them together. */
-+      for(i = 0; i < urb->number_of_packets; i++) {
-+	if (urb->iso_frame_desc[i].length > 0) {
-+
-+	  sb_desc = create_sb(sb_desc, TT_OUT, urb->transfer_buffer +
-+			      urb->iso_frame_desc[i].offset,
-+			      urb->iso_frame_desc[i].length, mem_flags);
-+	  if(sb_desc == NULL)
-+	    return -ENOMEM;
-+
-+	  /* Check if it's a full length packet */
-+	  if (urb->iso_frame_desc[i].length ==
-+	      usb_maxpacket(urb->dev, urb->pipe, usb_pipeout(urb->pipe))) {
-+	    set_sb_cmds(sb_desc, CMD_FULL);
-+	  }
-+	  
-+	} else { /* zero length packet */
-+	  sb_desc = create_sb(sb_desc, TT_ZOUT, &zout_buffer[0], 1, mem_flags);
-+	  if(sb_desc == NULL)
-+	    return -ENOMEM;
-+	  set_sb_cmds(sb_desc, CMD_FULL);
-+	}
-+	/* Attach first SB descriptor to URB */
-+	if (i == 0) {
-+	  urb_priv->first_sb = sb_desc;
-+	}
-+      }
-+      /* Set interrupt and end-of-list flags in last SB */
-+      set_sb_cmds(sb_desc, CMD_INTR | CMD_EOL);
-+      /* Attach last SB descriptor to URB */
-+      urb_priv->last_sb = sb_desc;
-+      tc_dbg("Created %d out SBs for Isoc URB:0x%x\n",
-+	       urb->number_of_packets, (unsigned int)urb);
-+    } else { /* In Isoc URB */
-+      /* Actual number of packets is not relevant for periodic in traffic as
-+	 long as it is more than zero.  Set to 1 always. */
-+      sb_desc = create_sb(sb_desc, TT_IN, NULL, 1, mem_flags);
-+      if(sb_desc == NULL)
-+	return -ENOMEM;
-+      /* Set end-of-list flags for SB */
-+      set_sb_cmds(sb_desc, CMD_EOL);
-+
-+      /* Attach SB to URB */
-+      urb_priv->first_sb = sb_desc;
-+      urb_priv->last_sb = sb_desc;
-+    }
-+    break;
-+  default:
-+    tc_err("Unknown pipe-type\n");
-+    return -EPIPE;
-+    break;
-+  }
-+  return 0;
-+}
-+
-+int init_intr_urb(struct urb *urb, int mem_flags) {
-+  struct crisv10_urb_priv *urb_priv = (struct crisv10_urb_priv *)urb->hcpriv;
-+  struct USB_EP_Desc* ep_desc;
-+  int interval;
-+  int i;
-+  int ep_count;
-+
-+  ASSERT(urb_priv != NULL);
-+  ASSERT(usb_pipeint(urb->pipe));
-+  /* We can't support interval longer than amount of eof descriptors in
-+     TxIntrEPList */
-+  if(urb->interval > MAX_INTR_INTERVAL) {
-+    tc_err("Interrupt interval %dms too big (max: %dms)\n", urb->interval,
-+	   MAX_INTR_INTERVAL);
-+    return -EINVAL;
-+  }
-+
-+  /* We assume that the SB descriptors already have been setup */
-+  ASSERT(urb_priv->first_sb != NULL);
-+
-+  /* Round of the interval to 2^n, it is obvious that this code favours
-+     smaller numbers, but that is actually a good thing */
-+  /* FIXME: The "rounding error" for larger intervals will be quite
-+     large. For in traffic this shouldn't be a problem since it will only
-+     mean that we "poll" more often. */
-+  interval = urb->interval;
-+  for (i = 0; interval; i++) {
-+    interval = interval >> 1;
-+  }
-+  urb_priv->interval = 1 << (i - 1);
-+
-+  /* We can only have max interval for Out Interrupt due to that we can only
-+     handle one linked in EP for a certain epid in the Intr descr array at the
-+     time. The USB Controller in the Etrax 100LX continues to process Intr EPs
-+     so we have no way of knowing which one that caused the actual transfer if
-+     we have several linked in. */
-+  if(usb_pipeout(urb->pipe)) {
-+    urb_priv->interval = MAX_INTR_INTERVAL;
-+  }
-+
-+  /* Calculate amount of EPs needed */
-+  ep_count = MAX_INTR_INTERVAL / urb_priv->interval;
-+
-+  for(i = 0; i < ep_count; i++) {
-+    ep_desc = create_ep(urb_priv->epid, urb_priv->first_sb, mem_flags);
-+    if(ep_desc == NULL) {
-+      /* Free any descriptors that we may have allocated before failure */
-+      while(i > 0) {
-+	i--;
-+	kfree(urb_priv->intr_ep_pool[i]);
-+      }
-+      return -ENOMEM;
-+    }
-+    urb_priv->intr_ep_pool[i] = ep_desc;
-+  }
-+  urb_priv->intr_ep_pool_length = ep_count;
-+  return 0;
-+}
-+
-+/* DMA RX/TX functions */
-+/* ----------------------- */
-+
-+static void tc_dma_init_rx_list(void) {
-+  int i;
-+
-+  /* Setup descriptor list except last one */
-+  for (i = 0; i < (NBR_OF_RX_DESC - 1); i++) {
-+    RxDescList[i].sw_len = RX_DESC_BUF_SIZE;
-+    RxDescList[i].command = 0;
-+    RxDescList[i].next = virt_to_phys(&RxDescList[i + 1]);
-+    RxDescList[i].buf = virt_to_phys(RxBuf + (i * RX_DESC_BUF_SIZE));
-+    RxDescList[i].hw_len = 0;
-+    RxDescList[i].status = 0;
-+    
-+    /* DMA IN cache bug. (struct etrax_dma_descr has the same layout as
-+       USB_IN_Desc for the relevant fields.) */
-+    prepare_rx_descriptor((struct etrax_dma_descr*)&RxDescList[i]);
-+    
-+  }
-+  /* Special handling of last descriptor */
-+  RxDescList[i].sw_len = RX_DESC_BUF_SIZE;
-+  RxDescList[i].command = IO_STATE(USB_IN_command, eol, yes);
-+  RxDescList[i].next = virt_to_phys(&RxDescList[0]);
-+  RxDescList[i].buf = virt_to_phys(RxBuf + (i * RX_DESC_BUF_SIZE));
-+  RxDescList[i].hw_len = 0;
-+  RxDescList[i].status = 0;
-+  
-+  /* Setup list pointers that show progress in list */
-+  myNextRxDesc = &RxDescList[0];
-+  myLastRxDesc = &RxDescList[NBR_OF_RX_DESC - 1];
-+  
-+  flush_etrax_cache();
-+  /* Point DMA to first descriptor in list and start it */
-+  *R_DMA_CH9_FIRST = virt_to_phys(myNextRxDesc);
-+  *R_DMA_CH9_CMD = IO_STATE(R_DMA_CH9_CMD, cmd, start);
-+}
-+
-+
-+static void tc_dma_init_tx_bulk_list(void) {
-+  int i;
-+  volatile struct USB_EP_Desc *epDescr;
-+
-+  for (i = 0; i < (NBR_OF_EPIDS - 1); i++) {
-+    epDescr = &(TxBulkEPList[i]);
-+    CHECK_ALIGN(epDescr);
-+    epDescr->hw_len = 0;
-+    epDescr->command = IO_FIELD(USB_EP_command, epid, i);
-+    epDescr->sub = 0;
-+    epDescr->next = virt_to_phys(&TxBulkEPList[i + 1]);
-+
-+    /* Initiate two EPs, disabled and with the eol flag set. No need for any
-+       preserved epid. */
-+    
-+    /* The first one has the intr flag set so we get an interrupt when the DMA
-+       channel is about to become disabled. */
-+    CHECK_ALIGN(&TxBulkDummyEPList[i][0]);
-+    TxBulkDummyEPList[i][0].hw_len = 0;
-+    TxBulkDummyEPList[i][0].command = (IO_FIELD(USB_EP_command, epid, DUMMY_EPID) |
-+				       IO_STATE(USB_EP_command, eol, yes) |
-+				       IO_STATE(USB_EP_command, intr, yes));
-+    TxBulkDummyEPList[i][0].sub = 0;
-+    TxBulkDummyEPList[i][0].next = virt_to_phys(&TxBulkDummyEPList[i][1]);
-+    
-+    /* The second one. */
-+    CHECK_ALIGN(&TxBulkDummyEPList[i][1]);
-+    TxBulkDummyEPList[i][1].hw_len = 0;
-+    TxBulkDummyEPList[i][1].command = (IO_FIELD(USB_EP_command, epid, DUMMY_EPID) |
-+				       IO_STATE(USB_EP_command, eol, yes));
-+    TxBulkDummyEPList[i][1].sub = 0;
-+    /* The last dummy's next pointer is the same as the current EP's next pointer. */
-+    TxBulkDummyEPList[i][1].next = virt_to_phys(&TxBulkEPList[i + 1]);
-+  }
-+
-+  /* Special handling of last descr in list, make list circular */
-+  epDescr = &TxBulkEPList[i];
-+  CHECK_ALIGN(epDescr);
-+  epDescr->hw_len = 0;
-+  epDescr->command = IO_STATE(USB_EP_command, eol, yes) |
-+    IO_FIELD(USB_EP_command, epid, i);
-+  epDescr->sub = 0;
-+  epDescr->next = virt_to_phys(&TxBulkEPList[0]);
-+  
-+  /* Init DMA sub-channel pointers to last item in each list */
-+  *R_DMA_CH8_SUB0_EP = virt_to_phys(&TxBulkEPList[i]);
-+  /* No point in starting the bulk channel yet.
-+   *R_DMA_CH8_SUB0_CMD = IO_STATE(R_DMA_CH8_SUB0_CMD, cmd, start); */
-+}
-+
-+static void tc_dma_init_tx_ctrl_list(void) {
-+  int i;
-+  volatile struct USB_EP_Desc *epDescr;
-+
-+  for (i = 0; i < (NBR_OF_EPIDS - 1); i++) {
-+    epDescr = &(TxCtrlEPList[i]);
-+    CHECK_ALIGN(epDescr);
-+    epDescr->hw_len = 0;
-+    epDescr->command = IO_FIELD(USB_EP_command, epid, i);
-+    epDescr->sub = 0;
-+    epDescr->next = virt_to_phys(&TxCtrlEPList[i + 1]);
-+  }
-+  /* Special handling of last descr in list, make list circular */
-+  epDescr = &TxCtrlEPList[i];
-+  CHECK_ALIGN(epDescr);
-+  epDescr->hw_len = 0;
-+  epDescr->command = IO_STATE(USB_EP_command, eol, yes) |
-+    IO_FIELD(USB_EP_command, epid, i);
-+  epDescr->sub = 0;
-+  epDescr->next = virt_to_phys(&TxCtrlEPList[0]);
-+  
-+  /* Init DMA sub-channel pointers to last item in each list */
-+  *R_DMA_CH8_SUB1_EP = virt_to_phys(&TxCtrlEPList[i]);
-+  /* No point in starting the ctrl channel yet.
-+   *R_DMA_CH8_SUB1_CMD = IO_STATE(R_DMA_CH8_SUB0_CMD, cmd, start); */
-+}
-+
-+
-+static void tc_dma_init_tx_intr_list(void) {
-+  int i;
-+
-+  TxIntrSB_zout.sw_len = 1;
-+  TxIntrSB_zout.next = 0;
-+  TxIntrSB_zout.buf = virt_to_phys(&zout_buffer[0]);
-+  TxIntrSB_zout.command = (IO_FIELD(USB_SB_command, rem, 0) |
-+			   IO_STATE(USB_SB_command, tt, zout) |
-+			   IO_STATE(USB_SB_command, full, yes) |
-+			   IO_STATE(USB_SB_command, eot, yes) |
-+			   IO_STATE(USB_SB_command, eol, yes));
-+  
-+  for (i = 0; i < (MAX_INTR_INTERVAL - 1); i++) {
-+    CHECK_ALIGN(&TxIntrEPList[i]);
-+    TxIntrEPList[i].hw_len = 0;
-+    TxIntrEPList[i].command =
-+      (IO_STATE(USB_EP_command, eof, yes) |
-+       IO_STATE(USB_EP_command, enable, yes) |
-+       IO_FIELD(USB_EP_command, epid, INVALID_EPID));
-+    TxIntrEPList[i].sub = virt_to_phys(&TxIntrSB_zout);
-+    TxIntrEPList[i].next = virt_to_phys(&TxIntrEPList[i + 1]);
-+  }
-+
-+  /* Special handling of last descr in list, make list circular */
-+  CHECK_ALIGN(&TxIntrEPList[i]);
-+  TxIntrEPList[i].hw_len = 0;
-+  TxIntrEPList[i].command =
-+    (IO_STATE(USB_EP_command, eof, yes) |
-+     IO_STATE(USB_EP_command, eol, yes) |
-+     IO_STATE(USB_EP_command, enable, yes) |
-+     IO_FIELD(USB_EP_command, epid, INVALID_EPID));
-+  TxIntrEPList[i].sub = virt_to_phys(&TxIntrSB_zout);
-+  TxIntrEPList[i].next = virt_to_phys(&TxIntrEPList[0]);
-+
-+  intr_dbg("Initiated Intr EP descriptor list\n");
-+
-+
-+  /* Connect DMA 8 sub-channel 2 to first in list */
-+  *R_DMA_CH8_SUB2_EP = virt_to_phys(&TxIntrEPList[0]);
-+}
-+
-+static void tc_dma_init_tx_isoc_list(void) {
-+  int i;
-+
-+  DBFENTER;
-+
-+  /* Read comment at zout_buffer declaration for an explanation to this. */
-+  TxIsocSB_zout.sw_len = 1;
-+  TxIsocSB_zout.next = 0;
-+  TxIsocSB_zout.buf = virt_to_phys(&zout_buffer[0]);
-+  TxIsocSB_zout.command = (IO_FIELD(USB_SB_command, rem, 0) |
-+			   IO_STATE(USB_SB_command, tt, zout) |
-+			   IO_STATE(USB_SB_command, full, yes) |
-+			   IO_STATE(USB_SB_command, eot, yes) |
-+			   IO_STATE(USB_SB_command, eol, yes));
-+
-+  /* The last isochronous EP descriptor is a dummy. */
-+  for (i = 0; i < (NBR_OF_EPIDS - 1); i++) {
-+    CHECK_ALIGN(&TxIsocEPList[i]);
-+    TxIsocEPList[i].hw_len = 0;
-+    TxIsocEPList[i].command = IO_FIELD(USB_EP_command, epid, i);
-+    TxIsocEPList[i].sub = 0;
-+    TxIsocEPList[i].next = virt_to_phys(&TxIsocEPList[i + 1]);
-+  }
-+
-+  CHECK_ALIGN(&TxIsocEPList[i]);
-+  TxIsocEPList[i].hw_len = 0;
-+
-+  /* Must enable the last EP descr to get eof interrupt. */
-+  TxIsocEPList[i].command = (IO_STATE(USB_EP_command, enable, yes) |
-+			     IO_STATE(USB_EP_command, eof, yes) |
-+			     IO_STATE(USB_EP_command, eol, yes) |
-+			     IO_FIELD(USB_EP_command, epid, INVALID_EPID));
-+  TxIsocEPList[i].sub = virt_to_phys(&TxIsocSB_zout);
-+  TxIsocEPList[i].next = virt_to_phys(&TxIsocEPList[0]);
-+
-+  *R_DMA_CH8_SUB3_EP = virt_to_phys(&TxIsocEPList[0]);
-+  *R_DMA_CH8_SUB3_CMD = IO_STATE(R_DMA_CH8_SUB3_CMD, cmd, start);
-+}
-+
-+static int tc_dma_init(struct usb_hcd *hcd) {
-+  tc_dma_init_rx_list();
-+  tc_dma_init_tx_bulk_list();
-+  tc_dma_init_tx_ctrl_list();
-+  tc_dma_init_tx_intr_list();
-+  tc_dma_init_tx_isoc_list();
-+
-+  if (cris_request_dma(USB_TX_DMA_NBR,
-+		       "ETRAX 100LX built-in USB (Tx)",
-+		       DMA_VERBOSE_ON_ERROR,
-+		       dma_usb)) {
-+    err("Could not allocate DMA ch 8 for USB");
-+    return -EBUSY;
-+  }
-+ 	
-+  if (cris_request_dma(USB_RX_DMA_NBR,
-+		       "ETRAX 100LX built-in USB (Rx)",
-+		       DMA_VERBOSE_ON_ERROR,
-+		       dma_usb)) {
-+    err("Could not allocate DMA ch 9 for USB");
-+    return -EBUSY;
-+  }
-+
-+  *R_IRQ_MASK2_SET =
-+    /* Note that these interrupts are not used. */
-+    IO_STATE(R_IRQ_MASK2_SET, dma8_sub0_descr, set) |
-+    /* Sub channel 1 (ctrl) descr. interrupts are used. */
-+    IO_STATE(R_IRQ_MASK2_SET, dma8_sub1_descr, set) |
-+    IO_STATE(R_IRQ_MASK2_SET, dma8_sub2_descr, set) |
-+    /* Sub channel 3 (isoc) descr. interrupts are used. */
-+    IO_STATE(R_IRQ_MASK2_SET, dma8_sub3_descr, set);
-+  
-+  /* Note that the dma9_descr interrupt is not used. */
-+  *R_IRQ_MASK2_SET =
-+    IO_STATE(R_IRQ_MASK2_SET, dma9_eop, set) |
-+    IO_STATE(R_IRQ_MASK2_SET, dma9_descr, set);
-+
-+  if (request_irq(ETRAX_USB_RX_IRQ, tc_dma_rx_interrupt, 0,
-+		  "ETRAX 100LX built-in USB (Rx)", hcd)) {
-+    err("Could not allocate IRQ %d for USB", ETRAX_USB_RX_IRQ);
-+    return -EBUSY;
-+  }
-+  
-+  if (request_irq(ETRAX_USB_TX_IRQ, tc_dma_tx_interrupt, 0,
-+		  "ETRAX 100LX built-in USB (Tx)", hcd)) {
-+    err("Could not allocate IRQ %d for USB", ETRAX_USB_TX_IRQ);
-+    return -EBUSY;
-+  }
-+
-+  return 0;
-+}
-+
-+static void tc_dma_destroy(void) {
-+  free_irq(ETRAX_USB_RX_IRQ, NULL);
-+  free_irq(ETRAX_USB_TX_IRQ, NULL);
-+
-+  cris_free_dma(USB_TX_DMA_NBR, "ETRAX 100LX built-in USB (Tx)");
-+  cris_free_dma(USB_RX_DMA_NBR, "ETRAX 100LX built-in USB (Rx)");
-+
-+}
-+
-+static void tc_dma_link_intr_urb(struct urb *urb);
-+
-+/* Handle processing of Bulk, Ctrl and Intr queues */
-+static void tc_dma_process_queue(int epid) {
-+  struct urb *urb;
-+  struct crisv10_urb_priv *urb_priv = urb->hcpriv;
-+  unsigned long flags;
-+  char toggle;
-+
-+  if(epid_state[epid].disabled) {
-+    /* Don't process any URBs on a disabled endpoint */
-+    return;
-+  }
-+
-+  /* Do not disturb us while fiddling with EPs and epids */
-+  local_irq_save(flags);
-+
-+  /* For bulk, Ctrl and Intr can we only have one URB active at a time for
-+     a specific EP. */
-+  if(activeUrbList[epid] != NULL) {
-+    /* An URB is already active on EP, skip checking queue */
-+    local_irq_restore(flags);
-+    return;
-+  }
-+
-+  urb = urb_list_first(epid);
-+  if(urb == NULL) {
-+    /* No URB waiting in EP queue. Nothing do to */
-+    local_irq_restore(flags);
-+    return;
-+  }
-+
-+  urb_priv = urb->hcpriv;
-+  ASSERT(urb_priv != NULL);
-+  ASSERT(urb_priv->urb_state == NOT_STARTED);
-+  ASSERT(!usb_pipeisoc(urb->pipe));
-+
-+  /* Remove this URB from the queue and move it to active */
-+  activeUrbList[epid] = urb;
-+  urb_list_del(urb, epid);
-+
-+  urb_priv->urb_state = STARTED;
-+
-+  /* Reset error counters (regardless of which direction this traffic is). */
-+  etrax_epid_clear_error(epid);
-+
-+  /* Special handling of Intr EP lists */
-+  if(usb_pipeint(urb->pipe)) {
-+    tc_dma_link_intr_urb(urb);
-+    local_irq_restore(flags);
-+    return;
-+  }
-+
-+  /* Software must preset the toggle bits for Bulk and Ctrl */
-+  if(usb_pipecontrol(urb->pipe)) {
-+    /* Toggle bits are initialized only during setup transaction in a
-+       CTRL transfer */
-+    etrax_epid_set_toggle(epid, 0, 0);
-+    etrax_epid_set_toggle(epid, 1, 0);
-+  } else {
-+    toggle = usb_gettoggle(urb->dev, usb_pipeendpoint(urb->pipe),
-+			   usb_pipeout(urb->pipe));
-+    etrax_epid_set_toggle(epid, usb_pipeout(urb->pipe), toggle);
-+  }
-+
-+  tc_dbg("Added SBs from (URB:0x%x %s %s) to epid %d: %s\n",
-+	 (unsigned int)urb, str_dir(urb->pipe), str_type(urb->pipe), epid,
-+	 sblist_to_str(urb_priv->first_sb));
-+
-+  /* We start the DMA sub channel without checking if it's running or not,
-+     because:
-+     1) If it's already running, issuing the start command is a nop.
-+     2) We avoid a test-and-set race condition. */
-+  switch(usb_pipetype(urb->pipe)) {
-+  case PIPE_BULK:
-+    /* Assert that the EP descriptor is disabled. */
-+    ASSERT(!(TxBulkEPList[epid].command & IO_MASK(USB_EP_command, enable)));
-+
-+    /* Set up and enable the EP descriptor. */
-+    TxBulkEPList[epid].sub = virt_to_phys(urb_priv->first_sb);
-+    TxBulkEPList[epid].hw_len = 0;
-+    TxBulkEPList[epid].command |= IO_STATE(USB_EP_command, enable, yes);
-+
-+    /* Check if the dummy list is already with us (if several urbs were queued). */
-+    if (usb_pipein(urb->pipe) && (TxBulkEPList[epid].next != virt_to_phys(&TxBulkDummyEPList[epid][0]))) {
-+      tc_dbg("Inviting dummy list to the party for urb 0x%lx, epid %d", 
-+	     (unsigned long)urb, epid);
-+      
-+      /* We don't need to check if the DMA is at this EP or not before changing the
-+	 next pointer, since we will do it in one 32-bit write (EP descriptors are
-+	 32-bit aligned). */
-+      TxBulkEPList[epid].next = virt_to_phys(&TxBulkDummyEPList[epid][0]);
-+    }
-+
-+    restart_dma8_sub0();
-+
-+    /* Update/restart the bulk start timer since we just started the channel.*/
-+    mod_timer(&bulk_start_timer, jiffies + BULK_START_TIMER_INTERVAL);
-+    /* Update/restart the bulk eot timer since we just inserted traffic. */
-+    mod_timer(&bulk_eot_timer, jiffies + BULK_EOT_TIMER_INTERVAL);
-+    break;
-+  case PIPE_CONTROL:
-+    /* Assert that the EP descriptor is disabled. */
-+    ASSERT(!(TxCtrlEPList[epid].command & IO_MASK(USB_EP_command, enable)));
-+
-+    /* Set up and enable the EP descriptor. */
-+    TxCtrlEPList[epid].sub = virt_to_phys(urb_priv->first_sb);
-+    TxCtrlEPList[epid].hw_len = 0;
-+    TxCtrlEPList[epid].command |= IO_STATE(USB_EP_command, enable, yes);
-+
-+    *R_DMA_CH8_SUB1_CMD = IO_STATE(R_DMA_CH8_SUB1_CMD, cmd, start);
-+    break;
-+  }
-+  local_irq_restore(flags);
-+}
-+
-+static void tc_dma_link_intr_urb(struct urb *urb) {
-+  struct crisv10_urb_priv *urb_priv = urb->hcpriv;
-+  volatile struct USB_EP_Desc *tmp_ep;
-+  struct USB_EP_Desc *ep_desc;
-+  int i = 0, epid;
-+  int pool_idx = 0;
-+
-+  ASSERT(urb_priv != NULL);
-+  epid = urb_priv->epid;
-+  ASSERT(urb_priv->interval > 0);
-+  ASSERT(urb_priv->intr_ep_pool_length > 0);
-+
-+  tmp_ep = &TxIntrEPList[0];
-+
-+  /* Only insert one EP descriptor in list for Out Intr URBs.
-+     We can only handle Out Intr with interval of 128ms because
-+     it's not possible to insert several Out Intr EPs because they
-+     are not consumed by the DMA. */
-+  if(usb_pipeout(urb->pipe)) {
-+    ep_desc = urb_priv->intr_ep_pool[0];
-+    ASSERT(ep_desc);
-+    ep_desc->next = tmp_ep->next;
-+    tmp_ep->next = virt_to_phys(ep_desc);
-+    i++;
-+  } else {
-+    /* Loop through Intr EP descriptor list and insert EP for URB at
-+       specified interval */
-+    do {
-+      /* Each EP descriptor with eof flag sat signals a new frame */
-+      if (tmp_ep->command & IO_MASK(USB_EP_command, eof)) {
-+	/* Insert a EP from URBs EP pool at correct interval */
-+	if ((i % urb_priv->interval) == 0) {
-+	  ep_desc = urb_priv->intr_ep_pool[pool_idx];
-+	  ASSERT(ep_desc);
-+	  ep_desc->next = tmp_ep->next;
-+	  tmp_ep->next = virt_to_phys(ep_desc);
-+	  pool_idx++;
-+	  ASSERT(pool_idx <= urb_priv->intr_ep_pool_length);
-+	}
-+	i++;
-+      }
-+      tmp_ep = (struct USB_EP_Desc *)phys_to_virt(tmp_ep->next);
-+    } while(tmp_ep != &TxIntrEPList[0]);
-+  }
-+
-+  intr_dbg("Added SBs to intr epid %d: %s interval:%d (%d EP)\n", epid,
-+	   sblist_to_str(urb_priv->first_sb), urb_priv->interval, pool_idx);
-+
-+  /* We start the DMA sub channel without checking if it's running or not,
-+     because:
-+     1) If it's already running, issuing the start command is a nop.
-+     2) We avoid a test-and-set race condition. */
-+  *R_DMA_CH8_SUB2_CMD = IO_STATE(R_DMA_CH8_SUB2_CMD, cmd, start);
-+}
-+
-+  /* hinko ignore usb_pipeisoc */
-+#if 0
-+static void tc_dma_process_isoc_urb(struct urb *urb) {
-+  unsigned long flags;
-+  struct crisv10_urb_priv *urb_priv = urb->hcpriv;
-+  int epid;
-+
-+  /* Do not disturb us while fiddling with EPs and epids */
-+  local_irq_save(flags);
-+
-+  ASSERT(urb_priv);
-+  ASSERT(urb_priv->first_sb);
-+  epid = urb_priv->epid;
-+
-+  if(activeUrbList[epid] == NULL) {
-+    /* EP is idle, so make this URB active */
-+    activeUrbList[epid] = urb;
-+    urb_list_del(urb, epid);
-+    ASSERT(TxIsocEPList[epid].sub == 0);
-+    ASSERT(!(TxIsocEPList[epid].command &
-+	     IO_STATE(USB_EP_command, enable, yes)));
-+
-+    /* Differentiate between In and Out Isoc. Because In SBs are not consumed*/
-+    if(usb_pipein(urb->pipe)) {
-+    /* Each EP for In Isoc will have only one SB descriptor, setup when
-+       submitting the first active urb. We do it here by copying from URBs
-+       pre-allocated SB. */
-+      memcpy((void *)&(TxIsocSBList[epid]), urb_priv->first_sb,
-+	     sizeof(TxIsocSBList[epid]));
-+      TxIsocEPList[epid].hw_len = 0;
-+      TxIsocEPList[epid].sub = virt_to_phys(&(TxIsocSBList[epid]));
-+    } else {
-+      /* For Out Isoc we attach the pre-allocated list of SBs for the URB */
-+      TxIsocEPList[epid].hw_len = 0;
-+      TxIsocEPList[epid].sub = virt_to_phys(urb_priv->first_sb);
-+
-+      isoc_dbg("Attached first URB:0x%x[%d] to epid:%d first_sb:0x%x"
-+	       " last_sb::0x%x\n",
-+	       (unsigned int)urb, urb_priv->urb_num, epid,
-+	       (unsigned int)(urb_priv->first_sb),
-+	       (unsigned int)(urb_priv->last_sb));
-+    }
-+
-+    if (urb->transfer_flags & URB_ISO_ASAP) {
-+      /* The isoc transfer should be started as soon as possible. The
-+	 start_frame field is a return value if URB_ISO_ASAP was set. Comparing
-+	 R_USB_FM_NUMBER with a USB Chief trace shows that the first isoc IN
-+	 token is sent 2 frames later. I'm not sure how this affects usage of
-+	 the start_frame field by the device driver, or how it affects things
-+	 when USB_ISO_ASAP is not set, so therefore there's no compensation for
-+	 the 2 frame "lag" here. */
-+      urb->start_frame = (*R_USB_FM_NUMBER & 0x7ff);
-+      TxIsocEPList[epid].command |= IO_STATE(USB_EP_command, enable, yes);
-+      urb_priv->urb_state = STARTED;
-+      isoc_dbg("URB_ISO_ASAP set, urb->start_frame set to %d\n",
-+	       urb->start_frame);
-+    } else {
-+      /* Not started yet. */
-+      urb_priv->urb_state = NOT_STARTED;
-+      isoc_warn("urb_priv->urb_state set to NOT_STARTED for URB:0x%x\n",
-+		(unsigned int)urb);
-+    }
-+
-+  } else {
-+    /* An URB is already active on the EP. Leave URB in queue and let
-+       finish_isoc_urb process it after current active URB */
-+    ASSERT(TxIsocEPList[epid].sub != 0);
-+
-+    if(usb_pipein(urb->pipe)) {
-+      /* Because there already is a active In URB on this epid we do nothing
-+         and the finish_isoc_urb() function will handle switching to next URB*/
-+
-+    } else { /* For Out Isoc, insert new URBs traffic last in SB-list. */
-+      struct USB_SB_Desc *temp_sb_desc;
-+
-+      /* Set state STARTED to all Out Isoc URBs added to SB list because we
-+         don't know how many of them that are finished before descr interrupt*/
-+      urb_priv->urb_state = STARTED;
-+
-+      /* Find end of current SB list by looking for SB with eol flag sat */
-+      temp_sb_desc = phys_to_virt(TxIsocEPList[epid].sub);
-+      while ((temp_sb_desc->command & IO_MASK(USB_SB_command, eol)) !=
-+	     IO_STATE(USB_SB_command, eol, yes)) {
-+	ASSERT(temp_sb_desc->next);
-+	temp_sb_desc = phys_to_virt(temp_sb_desc->next);
-+      }
-+
-+      isoc_dbg("Appended URB:0x%x[%d] (first:0x%x last:0x%x) to epid:%d"
-+	       " sub:0x%x eol:0x%x\n",
-+	       (unsigned int)urb, urb_priv->urb_num,
-+	       (unsigned int)(urb_priv->first_sb),
-+	       (unsigned int)(urb_priv->last_sb), epid,
-+	       (unsigned int)phys_to_virt(TxIsocEPList[epid].sub),
-+	       (unsigned int)temp_sb_desc);
-+
-+      /* Next pointer must be set before eol is removed. */
-+      temp_sb_desc->next = virt_to_phys(urb_priv->first_sb);
-+      /* Clear the previous end of list flag since there is a new in the
-+	 added SB descriptor list. */
-+      temp_sb_desc->command &= ~IO_MASK(USB_SB_command, eol);
-+
-+      if (!(TxIsocEPList[epid].command & IO_MASK(USB_EP_command, enable))) {
-+	__u32 epid_data;
-+	/* 8.8.5 in Designer's Reference says we should check for and correct
-+	   any errors in the EP here.  That should not be necessary if
-+	   epid_attn is handled correctly, so we assume all is ok. */
-+	epid_data = etrax_epid_iso_get(epid);
-+	if (IO_EXTRACT(R_USB_EPT_DATA, error_code, epid_data) !=
-+	    IO_STATE_VALUE(R_USB_EPT_DATA, error_code, no_error)) {
-+	  isoc_err("Disabled Isoc EP with error:%d on epid:%d when appending"
-+		   " URB:0x%x[%d]\n",
-+		   IO_EXTRACT(R_USB_EPT_DATA, error_code, epid_data), epid,
-+		   (unsigned int)urb, urb_priv->urb_num);
-+	}
-+
-+	/* The SB list was exhausted. */
-+	if (virt_to_phys(urb_priv->last_sb) != TxIsocEPList[epid].sub) {
-+	  /* The new sublist did not get processed before the EP was
-+	     disabled.  Setup the EP again. */
-+
-+	  if(virt_to_phys(temp_sb_desc) == TxIsocEPList[epid].sub) {
-+	    isoc_dbg("EP for epid:%d stoped at SB:0x%x before newly inserted"
-+		     ", restarting from this URBs SB:0x%x\n",
-+		     epid, (unsigned int)temp_sb_desc,
-+		     (unsigned int)(urb_priv->first_sb));
-+	    TxIsocEPList[epid].hw_len = 0;
-+	    TxIsocEPList[epid].sub = virt_to_phys(urb_priv->first_sb);
-+	    urb->start_frame = (*R_USB_FM_NUMBER & 0x7ff);
-+	    /* Enable the EP again so data gets processed this time */
-+	    TxIsocEPList[epid].command |=
-+	      IO_STATE(USB_EP_command, enable, yes);
-+
-+	  } else {
-+	    /* The EP has been disabled but not at end this URB (god knows
-+	       where). This should generate an epid_attn so we should not be
-+	       here */
-+	    isoc_warn("EP was disabled on sb:0x%x before SB list for"
-+		     " URB:0x%x[%d] got processed\n",
-+		     (unsigned int)phys_to_virt(TxIsocEPList[epid].sub),
-+		     (unsigned int)urb, urb_priv->urb_num);
-+	  }
-+	} else {
-+	  /* This might happend if we are slow on this function and isn't
-+	     an error. */
-+	  isoc_dbg("EP was disabled and finished with SBs from appended"
-+		   " URB:0x%x[%d]\n", (unsigned int)urb, urb_priv->urb_num);
-+	}
-+      }
-+    }
-+  }
-+  
-+  /* Start the DMA sub channel */
-+  *R_DMA_CH8_SUB3_CMD = IO_STATE(R_DMA_CH8_SUB3_CMD, cmd, start);
-+
-+  local_irq_restore(flags);
-+}
-+#endif
-+
-+static void tc_dma_unlink_intr_urb(struct urb *urb) {
-+  struct crisv10_urb_priv *urb_priv = urb->hcpriv;
-+  volatile struct USB_EP_Desc *first_ep;  /* First EP in the list. */
-+  volatile struct USB_EP_Desc *curr_ep;   /* Current EP, the iterator. */
-+  volatile struct USB_EP_Desc *next_ep;   /* The EP after current. */
-+  volatile struct USB_EP_Desc *unlink_ep; /* The one we should remove from
-+					     the list. */
-+  int count = 0;
-+  volatile int timeout = 10000;
-+  int epid;
-+
-+  /* Read 8.8.4 in Designer's Reference, "Removing an EP Descriptor from the
-+     List". */
-+  ASSERT(urb_priv);
-+  ASSERT(urb_priv->intr_ep_pool_length > 0);
-+  epid = urb_priv->epid;
-+
-+  /* First disable all Intr EPs belonging to epid for this URB */
-+  first_ep = &TxIntrEPList[0];
-+  curr_ep = first_ep;
-+  do {
-+    next_ep = (struct USB_EP_Desc *)phys_to_virt(curr_ep->next);
-+    if (IO_EXTRACT(USB_EP_command, epid, next_ep->command) == epid) {
-+      /* Disable EP */
-+      next_ep->command &= ~IO_MASK(USB_EP_command, enable);
-+    }
-+    curr_ep = phys_to_virt(curr_ep->next);
-+  } while (curr_ep != first_ep);
-+
-+
-+  /* Now unlink all EPs belonging to this epid from Descr list */
-+  first_ep = &TxIntrEPList[0];
-+  curr_ep = first_ep;
-+  do {
-+    next_ep = (struct USB_EP_Desc *)phys_to_virt(curr_ep->next);
-+    if (IO_EXTRACT(USB_EP_command, epid, next_ep->command) == epid) {
-+      /* This is the one we should unlink. */
-+      unlink_ep = next_ep;
-+
-+      /* Actually unlink the EP from the DMA list. */
-+      curr_ep->next = unlink_ep->next;
-+
-+      /* Wait until the DMA is no longer at this descriptor. */
-+      while((*R_DMA_CH8_SUB2_EP == virt_to_phys(unlink_ep)) &&
-+	    (timeout-- > 0));
-+      if(timeout == 0) {
-+	warn("Timeout while waiting for DMA-TX-Intr to leave unlink EP\n");
-+      }
-+      
-+      count++;
-+    }
-+    curr_ep = phys_to_virt(curr_ep->next);
-+  } while (curr_ep != first_ep);
-+
-+  if(count != urb_priv->intr_ep_pool_length) {
-+    intr_warn("Unlinked %d of %d Intr EPs for URB:0x%x[%d]\n", count,
-+	      urb_priv->intr_ep_pool_length, (unsigned int)urb,
-+	      urb_priv->urb_num);
-+  } else {
-+    intr_dbg("Unlinked %d of %d interrupt EPs for URB:0x%x\n", count,
-+	     urb_priv->intr_ep_pool_length, (unsigned int)urb);
-+  }
-+}
-+
-+static void check_finished_bulk_tx_epids(struct usb_hcd *hcd,
-+						    int timer) {
-+  unsigned long flags;
-+  int epid;
-+  struct urb *urb;
-+  struct crisv10_urb_priv * urb_priv;
-+  __u32 epid_data;
-+
-+  /* Protect TxEPList */
-+  local_irq_save(flags);
-+
-+  for (epid = 0; epid < NBR_OF_EPIDS; epid++) {
-+    /* A finished EP descriptor is disabled and has a valid sub pointer */
-+    if (!(TxBulkEPList[epid].command & IO_MASK(USB_EP_command, enable)) &&
-+	(TxBulkEPList[epid].sub != 0)) {
-+
-+      /* Get the active URB for this epid */
-+      urb = activeUrbList[epid];
-+      /* Sanity checks */
-+      ASSERT(urb);
-+      urb_priv = (struct crisv10_urb_priv *)urb->hcpriv;
-+      ASSERT(urb_priv);
-+      
-+      /* Only handle finished out Bulk EPs here,
-+	 and let RX interrupt take care of the rest */
-+      if(!epid_out_traffic(epid)) {
-+	continue;
-+      }
-+
-+      if(timer) {
-+	tc_warn("Found finished %s Bulk epid:%d URB:0x%x[%d] from timeout\n",
-+		epid_out_traffic(epid) ? "Out" : "In", epid, (unsigned int)urb,
-+		urb_priv->urb_num);
-+      } else {
-+	tc_dbg("Found finished %s Bulk epid:%d URB:0x%x[%d] from interrupt\n",
-+	       epid_out_traffic(epid) ? "Out" : "In", epid, (unsigned int)urb,
-+	       urb_priv->urb_num);
-+      }
-+
-+      if(urb_priv->urb_state == UNLINK) {
-+	/* This Bulk URB is requested to be unlinked, that means that the EP
-+	   has been disabled and we might not have sent all data */
-+	tc_finish_urb(hcd, urb, urb->status);
-+	continue;
-+      }
-+
-+      ASSERT(urb_priv->urb_state == STARTED);
-+      if (phys_to_virt(TxBulkEPList[epid].sub) != urb_priv->last_sb) {
-+	tc_err("Endpoint got disabled before reaching last sb\n");
-+      }
-+	
-+      epid_data = etrax_epid_get(epid);
-+      if (IO_EXTRACT(R_USB_EPT_DATA, error_code, epid_data) ==
-+	  IO_STATE_VALUE(R_USB_EPT_DATA, error_code, no_error)) {
-+	/* This means that the endpoint has no error, is disabled
-+	   and had inserted traffic, i.e. transfer successfully completed. */
-+	tc_finish_urb(hcd, urb, 0);
-+      } else {
-+	/* Shouldn't happen. We expect errors to be caught by epid
-+	   attention. */
-+	tc_err("Found disabled bulk EP desc (epid:%d error:%d)\n",
-+	       epid, IO_EXTRACT(R_USB_EPT_DATA, error_code, epid_data));
-+      }
-+    } else {
-+      tc_dbg("Ignoring In Bulk epid:%d, let RX interrupt handle it\n", epid);
-+    }
-+  }
-+
-+  local_irq_restore(flags);
-+}
-+
-+static void check_finished_ctrl_tx_epids(struct usb_hcd *hcd) {
-+  unsigned long flags;
-+  int epid;
-+  struct urb *urb;
-+  struct crisv10_urb_priv * urb_priv;
-+  __u32 epid_data;
-+
-+  /* Protect TxEPList */
-+  local_irq_save(flags);
-+
-+  for (epid = 0; epid < NBR_OF_EPIDS; epid++) {
-+    if(epid == DUMMY_EPID)
-+      continue;
-+
-+    /* A finished EP descriptor is disabled and has a valid sub pointer */
-+    if (!(TxCtrlEPList[epid].command & IO_MASK(USB_EP_command, enable)) &&
-+	(TxCtrlEPList[epid].sub != 0)) {
-+      
-+      /* Get the active URB for this epid */
-+      urb = activeUrbList[epid];
-+
-+      if(urb == NULL) {
-+	tc_warn("Found finished Ctrl epid:%d with no active URB\n", epid);
-+	continue;
-+      }
-+      
-+      /* Sanity checks */
-+      ASSERT(usb_pipein(urb->pipe));
-+      urb_priv = (struct crisv10_urb_priv *)urb->hcpriv;
-+      ASSERT(urb_priv);
-+      if (phys_to_virt(TxCtrlEPList[epid].sub) != urb_priv->last_sb) {
-+	tc_err("Endpoint got disabled before reaching last sb\n");
-+      }
-+
-+      epid_data = etrax_epid_get(epid);
-+      if (IO_EXTRACT(R_USB_EPT_DATA, error_code, epid_data) ==
-+	  IO_STATE_VALUE(R_USB_EPT_DATA, error_code, no_error)) {
-+	/* This means that the endpoint has no error, is disabled
-+	   and had inserted traffic, i.e. transfer successfully completed. */
-+
-+	/* Check if RX-interrupt for In Ctrl has been processed before
-+	   finishing the URB */
-+	if(urb_priv->ctrl_rx_done) {
-+	  tc_dbg("Finishing In Ctrl URB:0x%x[%d] in tx_interrupt\n",
-+		 (unsigned int)urb, urb_priv->urb_num);
-+	  tc_finish_urb(hcd, urb, 0);
-+	} else {
-+	  /* If we get zout descriptor interrupt before RX was done for a
-+	     In Ctrl transfer, then we flag that and it will be finished
-+	     in the RX-Interrupt */
-+	  urb_priv->ctrl_zout_done = 1;
-+	  tc_dbg("Got zout descr interrupt before RX interrupt\n");
-+	}
-+      } else {
-+	/* Shouldn't happen. We expect errors to be caught by epid
-+	   attention. */
-+	tc_err("Found disabled Ctrl EP desc (epid:%d URB:0x%x[%d]) error_code:%d\n", epid, (unsigned int)urb, urb_priv->urb_num, IO_EXTRACT(R_USB_EPT_DATA, error_code, epid_data));
-+	__dump_ep_desc(&(TxCtrlEPList[epid]));
-+	__dump_ept_data(epid);
-+      }      
-+    }
-+  }
-+  local_irq_restore(flags);
-+}
-+
-+  /* hinko ignore usb_pipeisoc */
-+#if 0
-+/* This function goes through all epids that are setup for Out Isoc transfers
-+   and marks (isoc_out_done) all queued URBs that the DMA has finished
-+   transfer for.
-+   No URB completetion is done here to make interrupt routine return quickly.
-+   URBs are completed later with help of complete_isoc_bottom_half() that
-+   becomes schedules when this functions is finished. */
-+static void check_finished_isoc_tx_epids(void) {
-+  unsigned long flags;
-+  int epid;
-+  struct urb *urb;
-+  struct crisv10_urb_priv * urb_priv;
-+  struct USB_SB_Desc* sb_desc;
-+  int epid_done;
-+
-+  /* Protect TxIsocEPList */
-+  local_irq_save(flags);
-+
-+  for (epid = 0; epid < NBR_OF_EPIDS; epid++) {
-+    if (TxIsocEPList[epid].sub == 0 || epid == INVALID_EPID ||
-+	!epid_out_traffic(epid)) {
-+      /* Nothing here to see. */
-+      continue;
-+    }
-+    ASSERT(epid_inuse(epid));
-+    ASSERT(epid_isoc(epid));
-+
-+    sb_desc = phys_to_virt(TxIsocEPList[epid].sub);
-+    /* Find the last descriptor of the currently active URB for this ep.
-+       This is the first descriptor in the sub list marked for a descriptor
-+       interrupt. */
-+    while (sb_desc && !IO_EXTRACT(USB_SB_command, intr, sb_desc->command)) {
-+      sb_desc = sb_desc->next ? phys_to_virt(sb_desc->next) : 0;
-+    }
-+    ASSERT(sb_desc);
-+
-+    isoc_dbg("Descr IRQ checking epid:%d sub:0x%x intr:0x%x\n",
-+	     epid, (unsigned int)phys_to_virt(TxIsocEPList[epid].sub),
-+	     (unsigned int)sb_desc);
-+
-+    urb = activeUrbList[epid];
-+    if(urb == NULL) {
-+      isoc_err("Isoc Descr irq on epid:%d with no active URB\n", epid);
-+      continue;
-+    }
-+
-+    epid_done = 0;
-+    while(urb && !epid_done) {
-+      /* Sanity check. */
-+      ASSERT(usb_pipetype(urb->pipe) == PIPE_ISOCHRONOUS);
-+      ASSERT(usb_pipeout(urb->pipe));
-+      
-+      urb_priv = (struct crisv10_urb_priv *)urb->hcpriv;
-+      ASSERT(urb_priv);
-+      ASSERT(urb_priv->urb_state == STARTED ||
-+	     urb_priv->urb_state == UNLINK);
-+      
-+      if (sb_desc != urb_priv->last_sb) {
-+	/* This urb has been sent. */
-+	urb_priv->isoc_out_done = 1;
-+
-+      } else { /* Found URB that has last_sb as the interrupt reason */
-+
-+	/* Check if EP has been disabled, meaning that all transfers are done*/
-+	if(!(TxIsocEPList[epid].command & IO_MASK(USB_EP_command, enable))) {
-+	  ASSERT((sb_desc->command & IO_MASK(USB_SB_command, eol)) ==
-+		 IO_STATE(USB_SB_command, eol, yes));
-+	  ASSERT(sb_desc->next == 0);
-+	  urb_priv->isoc_out_done = 1;
-+	} else {
-+	  isoc_dbg("Skipping URB:0x%x[%d] because EP not disabled yet\n",
-+		   (unsigned int)urb, urb_priv->urb_num);
-+	}
-+	/* Stop looking any further in queue */
-+	epid_done = 1;	
-+      }
-+
-+      if (!epid_done) {
-+	if(urb == activeUrbList[epid]) {
-+	  urb = urb_list_first(epid);
-+	} else {
-+	  urb = urb_list_next(urb, epid);
-+	}
-+      }
-+    } /* END: while(urb && !epid_done) */
-+  }
-+
-+  local_irq_restore(flags);
-+}
-+
-+
-+/* This is where the Out Isoc URBs are realy completed. This function is
-+   scheduled from tc_dma_tx_interrupt() when one or more Out Isoc transfers
-+   are done. This functions completes all URBs earlier marked with
-+   isoc_out_done by fast interrupt routine check_finished_isoc_tx_epids() */
-+
-+static void complete_isoc_bottom_half(void *data) {
-+  struct crisv10_isoc_complete_data *comp_data;
-+  struct usb_iso_packet_descriptor *packet;
-+  struct crisv10_urb_priv * urb_priv;
-+  unsigned long flags;
-+  struct urb* urb;
-+  int epid_done;
-+  int epid;
-+  int i;
-+
-+  comp_data = (struct crisv10_isoc_complete_data*)data;
-+
-+  local_irq_save(flags);
-+
-+  for (epid = 0; epid < NBR_OF_EPIDS - 1; epid++) {
-+    if(!epid_inuse(epid) || !epid_isoc(epid) || !epid_out_traffic(epid) || epid == DUMMY_EPID) {
-+      /* Only check valid Out Isoc epids */
-+      continue;
-+    }
-+
-+    isoc_dbg("Isoc bottom-half checking epid:%d, sub:0x%x\n", epid,
-+	     (unsigned int)phys_to_virt(TxIsocEPList[epid].sub));
-+
-+    /* The descriptor interrupt handler has marked all transmitted Out Isoc
-+       URBs with isoc_out_done.  Now we traverse all epids and for all that
-+       have out Isoc traffic we traverse its URB list and complete the
-+       transmitted URBs. */
-+    epid_done = 0;
-+    while (!epid_done) {
-+
-+      /* Get the active urb (if any) */
-+      urb = activeUrbList[epid];
-+      if (urb == 0) {
-+	isoc_dbg("No active URB on epid:%d anymore\n", epid);
-+	epid_done = 1;
-+	continue;
-+      }
-+
-+      /* Sanity check. */
-+      ASSERT(usb_pipetype(urb->pipe) == PIPE_ISOCHRONOUS);
-+      ASSERT(usb_pipeout(urb->pipe));
-+
-+      urb_priv = (struct crisv10_urb_priv *)urb->hcpriv;
-+      ASSERT(urb_priv);
-+
-+      if (!(urb_priv->isoc_out_done)) {
-+	/* We have reached URB that isn't flaged done yet, stop traversing. */
-+	isoc_dbg("Stoped traversing Out Isoc URBs on epid:%d"
-+		 " before not yet flaged URB:0x%x[%d]\n",
-+		 epid, (unsigned int)urb, urb_priv->urb_num);
-+	epid_done = 1;
-+	continue;
-+      }
-+
-+      /* This urb has been sent. */
-+      isoc_dbg("Found URB:0x%x[%d] that is flaged isoc_out_done\n",
-+	       (unsigned int)urb, urb_priv->urb_num);
-+
-+      /* Set ok on transfered packets for this URB and finish it */
-+      for (i = 0; i < urb->number_of_packets; i++) {
-+	packet = &urb->iso_frame_desc[i];
-+	packet->status = 0;
-+	packet->actual_length = packet->length;
-+      }
-+      urb_priv->isoc_packet_counter = urb->number_of_packets;
-+      tc_finish_urb(comp_data->hcd, urb, 0);
-+
-+    } /* END: while(!epid_done) */
-+  } /* END: for(epid...) */
-+
-+  local_irq_restore(flags);
-+  kmem_cache_free(isoc_compl_cache, comp_data);
-+}
-+#endif
-+
-+static void check_finished_intr_tx_epids(struct usb_hcd *hcd) {
-+  unsigned long flags;
-+  int epid;
-+  struct urb *urb;
-+  struct crisv10_urb_priv * urb_priv;
-+  volatile struct USB_EP_Desc *curr_ep;   /* Current EP, the iterator. */
-+  volatile struct USB_EP_Desc *next_ep;   /* The EP after current. */
-+
-+  /* Protect TxintrEPList */
-+  local_irq_save(flags);
-+
-+  for (epid = 0; epid < NBR_OF_EPIDS; epid++) {
-+    if(!epid_inuse(epid) || !epid_intr(epid) || !epid_out_traffic(epid)) {
-+      /* Nothing to see on this epid. Only check valid Out Intr epids */
-+      continue;
-+    }
-+
-+    urb = activeUrbList[epid];
-+    if(urb == 0) {
-+      intr_warn("Found Out Intr epid:%d with no active URB\n", epid);
-+      continue;
-+    }
-+
-+    /* Sanity check. */
-+    ASSERT(usb_pipetype(urb->pipe) == PIPE_INTERRUPT);
-+    ASSERT(usb_pipeout(urb->pipe));
-+    
-+    urb_priv = (struct crisv10_urb_priv *)urb->hcpriv;
-+    ASSERT(urb_priv);
-+
-+    /* Go through EPs between first and second sof-EP. It's here Out Intr EPs
-+       are inserted.*/
-+    curr_ep = &TxIntrEPList[0];
-+    do {
-+      next_ep = (struct USB_EP_Desc *)phys_to_virt(curr_ep->next);
-+      if(next_ep == urb_priv->intr_ep_pool[0]) {
-+	/* We found the Out Intr EP for this epid */
-+	
-+	/* Disable it so it doesn't get processed again */
-+	next_ep->command &= ~IO_MASK(USB_EP_command, enable);
-+
-+	/* Finish the active Out Intr URB with status OK */
-+	tc_finish_urb(hcd, urb, 0);
-+      }
-+      curr_ep = phys_to_virt(curr_ep->next);
-+    } while (curr_ep != &TxIntrEPList[1]);
-+
-+  }
-+  local_irq_restore(flags);
-+}
-+
-+/* Interrupt handler for DMA8/IRQ24 with subchannels (called from hardware intr) */
-+static irqreturn_t tc_dma_tx_interrupt(int irq, void *vhc) {
-+  struct usb_hcd *hcd = (struct usb_hcd*)vhc;
-+  ASSERT(hcd);
-+
-+  if (*R_IRQ_READ2 & IO_MASK(R_IRQ_READ2, dma8_sub0_descr)) {
-+    /* Clear this interrupt */
-+    *R_DMA_CH8_SUB0_CLR_INTR = IO_STATE(R_DMA_CH8_SUB0_CLR_INTR, clr_descr, do);
-+    restart_dma8_sub0();
-+  }
-+
-+  if (*R_IRQ_READ2 & IO_MASK(R_IRQ_READ2, dma8_sub1_descr)) {
-+    /* Clear this interrupt */
-+    *R_DMA_CH8_SUB1_CLR_INTR = IO_STATE(R_DMA_CH8_SUB1_CLR_INTR, clr_descr, do);
-+    check_finished_ctrl_tx_epids(hcd);
-+  }
-+
-+  if (*R_IRQ_READ2 & IO_MASK(R_IRQ_READ2, dma8_sub2_descr)) {
-+    /* Clear this interrupt */
-+    *R_DMA_CH8_SUB2_CLR_INTR = IO_STATE(R_DMA_CH8_SUB2_CLR_INTR, clr_descr, do);
-+    check_finished_intr_tx_epids(hcd);
-+  }
-+
-+  /* hinko ignore usb_pipeisoc */
-+#if 0
-+  if (*R_IRQ_READ2 & IO_MASK(R_IRQ_READ2, dma8_sub3_descr)) {
-+    struct crisv10_isoc_complete_data* comp_data;
-+
-+    /* Flag done Out Isoc for later completion */
-+    check_finished_isoc_tx_epids();
-+
-+    /* Clear this interrupt */
-+    *R_DMA_CH8_SUB3_CLR_INTR = IO_STATE(R_DMA_CH8_SUB3_CLR_INTR, clr_descr, do);
-+    /* Schedule bottom half of Out Isoc completion function. This function
-+       finishes the URBs marked with isoc_out_done */
-+    comp_data = (struct crisv10_isoc_complete_data*)
-+      kmem_cache_alloc(isoc_compl_cache, GFP_ATOMIC);
-+    ASSERT(comp_data != NULL);
-+    comp_data ->hcd = hcd;
-+
-+    //INIT_WORK(&comp_data->usb_bh, complete_isoc_bottom_half, comp_data);
-+    INIT_WORK(&comp_data->usb_bh, complete_isoc_bottom_half);
-+    schedule_work(&comp_data->usb_bh);
-+  }
-+#endif
-+
-+  return IRQ_HANDLED;
-+}
-+
-+/* Interrupt handler for DMA9/IRQ25 (called from hardware intr) */
-+static irqreturn_t tc_dma_rx_interrupt(int irq, void *vhc) {
-+  unsigned long flags;
-+  struct urb *urb;
-+  struct usb_hcd *hcd = (struct usb_hcd*)vhc;
-+  struct crisv10_urb_priv *urb_priv;
-+  int epid = 0;
-+  int real_error;
-+
-+  ASSERT(hcd);
-+
-+  /* Clear this interrupt. */
-+  *R_DMA_CH9_CLR_INTR = IO_STATE(R_DMA_CH9_CLR_INTR, clr_eop, do);
-+
-+  /* Custom clear interrupt for this interrupt */
-+  /* The reason we cli here is that we call the driver's callback functions. */
-+  local_irq_save(flags);
-+
-+  /* Note that this while loop assumes that all packets span only
-+     one rx descriptor. */
-+  while(myNextRxDesc->status & IO_MASK(USB_IN_status, eop)) {
-+    epid = IO_EXTRACT(USB_IN_status, epid, myNextRxDesc->status);
-+    /* Get the active URB for this epid */
-+    urb = activeUrbList[epid];
-+
-+    ASSERT(epid_inuse(epid));
-+    if (!urb) {
-+      dma_err("No urb for epid %d in rx interrupt\n", epid);
-+      goto skip_out;
-+    }
-+
-+    /* Check if any errors on epid */
-+    real_error = 0;
-+    if (myNextRxDesc->status & IO_MASK(USB_IN_status, error)) {
-+      __u32 r_usb_ept_data;
-+
-+      if (usb_pipeisoc(urb->pipe)) {
-+	r_usb_ept_data = etrax_epid_iso_get(epid);
-+	if((r_usb_ept_data & IO_MASK(R_USB_EPT_DATA_ISO, valid)) &&
-+	   (IO_EXTRACT(R_USB_EPT_DATA_ISO, error_code, r_usb_ept_data) == 0) &&
-+	   (myNextRxDesc->status & IO_MASK(USB_IN_status, nodata))) {
-+	  /* Not an error, just a failure to receive an expected iso
-+	     in packet in this frame.  This is not documented
-+	     in the designers reference. Continue processing.
-+	  */
-+	} else real_error = 1;
-+      } else real_error = 1;
-+    }
-+
-+    if(real_error) {
-+      dma_err("Error in RX descr on epid:%d for URB 0x%x",
-+	      epid, (unsigned int)urb);
-+      dump_ept_data(epid);
-+      dump_in_desc(myNextRxDesc);
-+      goto skip_out;
-+    }
-+
-+    urb_priv = (struct crisv10_urb_priv *)urb->hcpriv;
-+    ASSERT(urb_priv);
-+    ASSERT(urb_priv->urb_state == STARTED ||
-+	   urb_priv->urb_state == UNLINK);
-+
-+    if ((usb_pipetype(urb->pipe) == PIPE_BULK) ||
-+	(usb_pipetype(urb->pipe) == PIPE_CONTROL) ||
-+	(usb_pipetype(urb->pipe) == PIPE_INTERRUPT)) {
-+
-+      /* We get nodata for empty data transactions, and the rx descriptor's
-+	 hw_len field is not valid in that case. No data to copy in other
-+	 words. */
-+      if (myNextRxDesc->status & IO_MASK(USB_IN_status, nodata)) {
-+	/* No data to copy */
-+      } else {
-+	/*
-+	dma_dbg("Processing RX for URB:0x%x epid:%d (data:%d ofs:%d)\n",
-+		(unsigned int)urb, epid, myNextRxDesc->hw_len,
-+		urb_priv->rx_offset);
-+	*/
-+	/* Only copy data if URB isn't flaged to be unlinked*/
-+	if(urb_priv->urb_state != UNLINK) {
-+	  /* Make sure the data fits in the buffer. */
-+	  if(urb_priv->rx_offset + myNextRxDesc->hw_len
-+	     <= urb->transfer_buffer_length) {
-+
-+	    /* Copy the data to URBs buffer */
-+	    memcpy(urb->transfer_buffer + urb_priv->rx_offset,
-+		   phys_to_virt(myNextRxDesc->buf), myNextRxDesc->hw_len);
-+	    urb_priv->rx_offset += myNextRxDesc->hw_len;
-+	  } else {
-+	    /* Signal overflow when returning URB */
-+	    urb->status = -EOVERFLOW;
-+	    tc_finish_urb_later(hcd, urb, urb->status);
-+	  }
-+	}
-+      }
-+
-+      /* Check if it was the last packet in the transfer */
-+      if (myNextRxDesc->status & IO_MASK(USB_IN_status, eot)) {
-+	/* Special handling for In Ctrl URBs. */
-+	if(usb_pipecontrol(urb->pipe) && usb_pipein(urb->pipe) &&
-+	   !(urb_priv->ctrl_zout_done)) {
-+	  /* Flag that RX part of Ctrl transfer is done. Because zout descr
-+	     interrupt hasn't happend yet will the URB be finished in the
-+	     TX-Interrupt. */
-+	  urb_priv->ctrl_rx_done = 1;
-+	  tc_dbg("Not finishing In Ctrl URB:0x%x from rx_interrupt, waiting"
-+		 " for zout\n", (unsigned int)urb);
-+	} else {
-+	  tc_finish_urb(hcd, urb, 0);
-+	}
-+      }
-+    } else { /* ISOC RX */
-+      /*
-+      isoc_dbg("Processing RX for epid:%d (URB:0x%x) ISOC pipe\n",
-+	       epid, (unsigned int)urb);
-+      */
-+
-+      struct usb_iso_packet_descriptor *packet;
-+
-+      if (urb_priv->urb_state == UNLINK) {
-+	isoc_warn("Ignoring Isoc Rx data for urb being unlinked.\n");
-+	goto skip_out;
-+      } else if (urb_priv->urb_state == NOT_STARTED) {
-+	isoc_err("What? Got Rx data for Isoc urb that isn't started?\n");
-+	goto skip_out;
-+      }
-+
-+      packet = &urb->iso_frame_desc[urb_priv->isoc_packet_counter];
-+      ASSERT(packet);
-+      packet->status = 0;
-+
-+      if (myNextRxDesc->status & IO_MASK(USB_IN_status, nodata)) {
-+	/* We get nodata for empty data transactions, and the rx descriptor's
-+	   hw_len field is not valid in that case. We copy 0 bytes however to
-+	   stay in synch. */
-+	packet->actual_length = 0;
-+      } else {
-+	packet->actual_length = myNextRxDesc->hw_len;
-+	/* Make sure the data fits in the buffer. */
-+	ASSERT(packet->actual_length <= packet->length);
-+	memcpy(urb->transfer_buffer + packet->offset,
-+	       phys_to_virt(myNextRxDesc->buf), packet->actual_length);
-+	if(packet->actual_length > 0)
-+	  isoc_dbg("Copied %d bytes, packet %d for URB:0x%x[%d]\n",
-+		   packet->actual_length, urb_priv->isoc_packet_counter,
-+		   (unsigned int)urb, urb_priv->urb_num);
-+      }
-+
-+      /* Increment the packet counter. */
-+      urb_priv->isoc_packet_counter++;
-+
-+      /* Note that we don't care about the eot field in the rx descriptor's
-+	 status. It will always be set for isoc traffic. */
-+      if (urb->number_of_packets == urb_priv->isoc_packet_counter) {
-+	/* Complete the urb with status OK. */
-+	tc_finish_urb(hcd, urb, 0);
-+      }
-+    }
-+
-+  skip_out:
-+    myNextRxDesc->status = 0;
-+    myNextRxDesc->command |= IO_MASK(USB_IN_command, eol);
-+    myLastRxDesc->command &= ~IO_MASK(USB_IN_command, eol);
-+    myLastRxDesc = myNextRxDesc;
-+    myNextRxDesc = phys_to_virt(myNextRxDesc->next);
-+    flush_etrax_cache();
-+    *R_DMA_CH9_CMD = IO_STATE(R_DMA_CH9_CMD, cmd, restart);
-+  }
-+
-+  local_irq_restore(flags);
-+
-+  return IRQ_HANDLED;
-+}
-+
-+static void tc_bulk_start_timer_func(unsigned long dummy) {
-+  /* We might enable an EP descriptor behind the current DMA position when
-+     it's about to decide that there are no more bulk traffic and it should
-+     stop the bulk channel.
-+     Therefore we periodically check if the bulk channel is stopped and there
-+     is an enabled bulk EP descriptor, in which case we start the bulk
-+     channel. */
-+  
-+  if (!(*R_DMA_CH8_SUB0_CMD & IO_MASK(R_DMA_CH8_SUB0_CMD, cmd))) {
-+    int epid;
-+
-+    timer_dbg("bulk_start_timer: Bulk DMA channel not running.\n");
-+
-+    for (epid = 0; epid < NBR_OF_EPIDS; epid++) {
-+      if (TxBulkEPList[epid].command & IO_MASK(USB_EP_command, enable)) {
-+	timer_warn("Found enabled EP for epid %d, starting bulk channel.\n",
-+		   epid);
-+	restart_dma8_sub0();
-+
-+	/* Restart the bulk eot timer since we just started the bulk channel.*/
-+	mod_timer(&bulk_eot_timer, jiffies + BULK_EOT_TIMER_INTERVAL);
-+
-+	/* No need to search any further. */
-+	break;
-+      }
-+    }
-+  } else {
-+    timer_dbg("bulk_start_timer: Bulk DMA channel running.\n");
-+  }
-+}
-+
-+static void tc_bulk_eot_timer_func(unsigned long dummy) {
-+  struct usb_hcd *hcd = (struct usb_hcd*)dummy;
-+  ASSERT(hcd);
-+  /* Because of a race condition in the top half, we might miss a bulk eot.
-+     This timer "simulates" a bulk eot if we don't get one for a while,
-+     hopefully correcting the situation. */
-+  timer_dbg("bulk_eot_timer timed out.\n");
-+  check_finished_bulk_tx_epids(hcd, 1);
-+}
-+
-+
-+/*************************************************************/
-+/*************************************************************/
-+/* Device driver block                                       */
-+/*************************************************************/
-+/*************************************************************/
-+
-+/* Forward declarations for device driver functions */
-+static int devdrv_hcd_probe(struct device *);
-+static int devdrv_hcd_remove(struct device *);
-+#ifdef CONFIG_PM
-+static int devdrv_hcd_suspend(struct device *, u32, u32);
-+static int devdrv_hcd_resume(struct device *, u32);
-+#endif /* CONFIG_PM */
-+
-+/* the device */
-+static struct platform_device *devdrv_hc_platform_device;
-+
-+/* device driver interface */
-+static struct device_driver devdrv_hc_device_driver = {
-+  .name =			(char *) hc_name,
-+  .bus =			&platform_bus_type,
-+
-+  .probe =		devdrv_hcd_probe,
-+  .remove =		devdrv_hcd_remove,
-+
-+#ifdef CONFIG_PM
-+  .suspend =		devdrv_hcd_suspend,
-+  .resume =		devdrv_hcd_resume,
-+#endif /* CONFIG_PM */
-+};
-+
-+/* initialize the host controller and driver  */
-+static int __init_or_module devdrv_hcd_probe(struct device *dev)
-+{
-+  struct usb_hcd *hcd;
-+  struct crisv10_hcd *crisv10_hcd;
-+  int retval;
-+  int rev_maj, rev_min;
-+
-+  /* Check DMA burst length */
-+  if(IO_EXTRACT(R_BUS_CONFIG, dma_burst, *R_BUS_CONFIG) !=
-+     IO_STATE(R_BUS_CONFIG, dma_burst, burst32)) {
-+    devdrv_err("Invalid DMA burst length in Etrax 100LX,"
-+	       " needs to be 32\n");
-+    return -EPERM;
-+  }
-+
-+  hcd = usb_create_hcd(&crisv10_hc_driver, dev, dev_name(dev));
-+  if (!hcd)
-+    return -ENOMEM;
-+
-+  crisv10_hcd = hcd_to_crisv10_hcd(hcd);
-+  spin_lock_init(&crisv10_hcd->lock);
-+  crisv10_hcd->num_ports = num_ports();
-+  crisv10_hcd->running = 0;
-+
-+  dev_set_drvdata(dev, crisv10_hcd);
-+
-+  devdrv_dbg("ETRAX USB IRQs HC:%d  RX:%d  TX:%d\n", ETRAX_USB_HC_IRQ,
-+	  ETRAX_USB_RX_IRQ, ETRAX_USB_TX_IRQ);
-+
-+  /* Print out chip version read from registers */
-+  rev_maj = *R_USB_REVISION & IO_MASK(R_USB_REVISION, major);
-+  rev_min = *R_USB_REVISION & IO_MASK(R_USB_REVISION, minor);
-+  if(rev_min == 0) {
-+    devdrv_info("Etrax 100LX USB Revision %d v1,2\n", rev_maj);
-+  } else {
-+    devdrv_info("Etrax 100LX USB Revision %d v%d\n", rev_maj, rev_min);
-+  }
-+
-+  devdrv_info("Bulk timer interval, start:%d eot:%d\n",
-+	      BULK_START_TIMER_INTERVAL,
-+	      BULK_EOT_TIMER_INTERVAL);
-+
-+
-+  /* Init root hub data structures */
-+  if(rh_init()) {
-+    devdrv_err("Failed init data for Root Hub\n");
-+    retval = -ENOMEM;
-+  }
-+
-+  if(port_in_use(0)) {
-+    if (cris_request_io_interface(if_usb_1, "ETRAX100LX USB-HCD")) {
-+      printk(KERN_CRIT "usb-host: request IO interface usb1 failed");
-+      retval = -EBUSY;
-+      goto out;
-+    }
-+    devdrv_info("Claimed interface for USB physical port 1\n");
-+  }
-+  if(port_in_use(1)) {
-+    if (cris_request_io_interface(if_usb_2, "ETRAX100LX USB-HCD")) {
-+      /* Free first interface if second failed to be claimed */
-+      if(port_in_use(0)) {
-+	cris_free_io_interface(if_usb_1);
-+      }
-+      printk(KERN_CRIT "usb-host: request IO interface usb2 failed");
-+      retval = -EBUSY;
-+      goto out;
-+    }
-+    devdrv_info("Claimed interface for USB physical port 2\n");
-+  }
-+  
-+  /* Init transfer controller structs and locks */
-+  if((retval = tc_init(hcd)) != 0) {
-+    goto out;
-+  }
-+
-+  /* Attach interrupt functions for DMA and init DMA controller */
-+  if((retval = tc_dma_init(hcd)) != 0) {
-+    goto out;
-+  }
-+
-+  /* Attach the top IRQ handler for USB controller interrupts */
-+  if (request_irq(ETRAX_USB_HC_IRQ, crisv10_hcd_top_irq, 0,
-+		  "ETRAX 100LX built-in USB (HC)", hcd)) {
-+    err("Could not allocate IRQ %d for USB", ETRAX_USB_HC_IRQ);
-+    retval = -EBUSY;
-+    goto out;
-+  }
-+
-+  /* iso_eof is only enabled when isoc traffic is running. */
-+  *R_USB_IRQ_MASK_SET =
-+    /* IO_STATE(R_USB_IRQ_MASK_SET, iso_eof, set) | */
-+    IO_STATE(R_USB_IRQ_MASK_SET, bulk_eot, set) |
-+    IO_STATE(R_USB_IRQ_MASK_SET, epid_attn, set) |
-+    IO_STATE(R_USB_IRQ_MASK_SET, port_status, set) |
-+    IO_STATE(R_USB_IRQ_MASK_SET, ctl_status, set);
-+
-+
-+  crisv10_ready_wait();
-+  /* Reset the USB interface. */
-+  *R_USB_COMMAND =
-+    IO_STATE(R_USB_COMMAND, port_sel, nop) |
-+    IO_STATE(R_USB_COMMAND, port_cmd, reset) |
-+    IO_STATE(R_USB_COMMAND, ctrl_cmd, reset);
-+
-+  /* Designer's Reference, p. 8 - 10 says we should Initate R_USB_FM_PSTART to
-+     0x2A30 (10800), to guarantee that control traffic gets 10% of the
-+     bandwidth, and periodic transfer may allocate the rest (90%).
-+     This doesn't work though.
-+     The value 11960 is chosen to be just after the SOF token, with a couple
-+     of bit times extra for possible bit stuffing. */
-+  *R_USB_FM_PSTART = IO_FIELD(R_USB_FM_PSTART, value, 11960);
-+
-+  crisv10_ready_wait();
-+  /* Configure the USB interface as a host controller. */
-+  *R_USB_COMMAND =
-+    IO_STATE(R_USB_COMMAND, port_sel, nop) |
-+    IO_STATE(R_USB_COMMAND, port_cmd, reset) |
-+    IO_STATE(R_USB_COMMAND, ctrl_cmd, host_config);
-+
-+
-+  /* Check so controller not busy before enabling ports */
-+  crisv10_ready_wait();
-+
-+  /* Enable selected USB ports */
-+  if(port_in_use(0)) {
-+    *R_USB_PORT1_DISABLE = IO_STATE(R_USB_PORT1_DISABLE, disable, no);
-+  } else {
-+    *R_USB_PORT1_DISABLE = IO_STATE(R_USB_PORT1_DISABLE, disable, yes);
-+  }
-+  if(port_in_use(1)) {
-+    *R_USB_PORT2_DISABLE = IO_STATE(R_USB_PORT2_DISABLE, disable, no);
-+  } else {
-+    *R_USB_PORT2_DISABLE = IO_STATE(R_USB_PORT2_DISABLE, disable, yes);
-+  }
-+
-+  crisv10_ready_wait();
-+  /* Start processing of USB traffic. */
-+  *R_USB_COMMAND =
-+    IO_STATE(R_USB_COMMAND, port_sel, nop) |
-+    IO_STATE(R_USB_COMMAND, port_cmd, reset) |
-+    IO_STATE(R_USB_COMMAND, ctrl_cmd, host_run);
-+
-+  /* Do not continue probing initialization before USB interface is done */
-+  crisv10_ready_wait();
-+
-+  /* Register our Host Controller to USB Core
-+   * Finish the remaining parts of generic HCD initialization: allocate the
-+   * buffers of consistent memory, register the bus
-+   * and call the driver's reset() and start() routines. */
-+  retval = usb_add_hcd(hcd, ETRAX_USB_HC_IRQ, IRQF_DISABLED);
-+  if (retval != 0) {
-+    devdrv_err("Failed registering HCD driver\n");
-+    goto out;
-+  }
-+
-+  return 0;
-+
-+ out:
-+  devdrv_hcd_remove(dev);
-+  return retval;
-+}
-+
-+
-+/* cleanup after the host controller and driver */
-+static int __init_or_module devdrv_hcd_remove(struct device *dev)
-+{
-+  struct crisv10_hcd *crisv10_hcd = dev_get_drvdata(dev);
-+  struct usb_hcd *hcd;
-+
-+  if (!crisv10_hcd)
-+    return 0;
-+  hcd = crisv10_hcd_to_hcd(crisv10_hcd);
-+
-+
-+  /* Stop USB Controller in Etrax 100LX */
-+  crisv10_hcd_reset(hcd);
-+
-+  usb_remove_hcd(hcd);
-+  devdrv_dbg("Removed HCD from USB Core\n");
-+
-+  /* Free USB Controller IRQ */
-+  free_irq(ETRAX_USB_HC_IRQ, NULL);
-+
-+  /* Free resources */
-+  tc_dma_destroy();
-+  tc_destroy();
-+
-+
-+  if(port_in_use(0)) {
-+    cris_free_io_interface(if_usb_1);
-+  }
-+  if(port_in_use(1)) {
-+    cris_free_io_interface(if_usb_2);
-+  }
-+
-+  devdrv_dbg("Freed all claimed resources\n");
-+
-+  return 0;
-+}
-+
-+
-+#ifdef	CONFIG_PM
-+
-+static int devdrv_hcd_suspend(struct usb_hcd *hcd, u32 state, u32 level)
-+{
-+  return 0; /* no-op for now */
-+}
-+
-+static int devdrv_hcd_resume(struct usb_hcd *hcd, u32 level)
-+{
-+  return 0; /* no-op for now */
-+}
-+
-+#endif /* CONFIG_PM */
-+
-+
-+
-+/*************************************************************/
-+/*************************************************************/
-+/* Module block                                              */
-+/*************************************************************/
-+/*************************************************************/
-+ 
-+/* register driver */
-+static int __init module_hcd_init(void) 
-+{
-+  
-+  if (usb_disabled())
-+    return -ENODEV;
-+
-+  /* Here we select enabled ports by following defines created from
-+     menuconfig */
-+#ifndef CONFIG_ETRAX_USB_HOST_PORT1
-+  ports &= ~(1<<0);
-+#endif
-+#ifndef CONFIG_ETRAX_USB_HOST_PORT2
-+  ports &= ~(1<<1);
-+#endif
-+
-+  printk(KERN_INFO "%s version "VERSION" "COPYRIGHT"\n", product_desc);
-+
-+  devdrv_hc_platform_device =
-+    platform_device_register_simple((char *) hc_name, 0, NULL, 0);
-+
-+  if (IS_ERR(devdrv_hc_platform_device))
-+    return PTR_ERR(devdrv_hc_platform_device);
-+  return driver_register(&devdrv_hc_device_driver);
-+  /* 
-+   * Note that we do not set the DMA mask for the device,
-+   * i.e. we pretend that we will use PIO, since no specific
-+   * allocation routines are needed for DMA buffers. This will
-+   * cause the HCD buffer allocation routines to fall back to
-+   * kmalloc().
-+   */
-+}
-+
-+/* unregister driver */
-+static void __exit module_hcd_exit(void) 
-+{	
-+  driver_unregister(&devdrv_hc_device_driver);
-+}
-+
-+
-+/* Module hooks */
-+module_init(module_hcd_init);
-+module_exit(module_hcd_exit);
-diff -Nur linux-2.6.36.orig/drivers/usb/host/hc-crisv10.h linux-2.6.36/drivers/usb/host/hc-crisv10.h
---- linux-2.6.36.orig/drivers/usb/host/hc-crisv10.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36/drivers/usb/host/hc-crisv10.h	2010-11-15 17:57:18.000000000 +0100
-@@ -0,0 +1,331 @@
-+#ifndef __LINUX_ETRAX_USB_H
-+#define __LINUX_ETRAX_USB_H
-+
-+#include <linux/types.h>
-+#include <linux/list.h>
-+
-+struct USB_IN_Desc {
-+  volatile __u16 sw_len;
-+  volatile __u16 command;
-+  volatile unsigned long next;
-+  volatile unsigned long buf;
-+  volatile __u16 hw_len;
-+  volatile __u16 status;
-+};
-+
-+struct USB_SB_Desc {
-+  volatile __u16 sw_len;
-+  volatile __u16 command;
-+  volatile unsigned long next;
-+  volatile unsigned long buf;
-+};
-+
-+struct USB_EP_Desc {
-+  volatile __u16 hw_len;
-+  volatile __u16 command;
-+  volatile unsigned long sub;
-+  volatile unsigned long next;
-+};
-+
-+
-+/* Root Hub port status struct */
-+struct crisv10_rh {
-+  volatile __u16 wPortChange[2];
-+  volatile __u16 wPortStatusPrev[2];
-+};
-+
-+/* HCD description */
-+struct crisv10_hcd {
-+  spinlock_t		lock;
-+  __u8			num_ports;
-+  __u8                  running;
-+};
-+
-+
-+/* Endpoint HC private data description */
-+struct crisv10_ep_priv {
-+  int epid;
-+};
-+
-+/* Additional software state info for a USB Controller epid */
-+struct etrax_epid {
-+  __u8 inuse;       /* !0 = setup in Etrax and used for a endpoint */
-+  __u8 disabled;    /* !0 = Temporarly disabled to avoid resubmission */
-+  __u8 type;        /* Setup as: PIPE_BULK, PIPE_CONTROL ... */
-+  __u8 out_traffic; /* !0 = This epid is for out traffic */
-+};
-+
-+/* Struct to hold information of scheduled later URB completion */
-+struct urb_later_data {
-+//  struct work_struct ws;
-+  struct delayed_work ws;
-+  struct usb_hcd *hcd;
-+  struct urb *urb;
-+  int urb_num;
-+  int status;
-+};
-+
-+
-+typedef enum {
-+  STARTED,
-+  NOT_STARTED,
-+  UNLINK,
-+} crisv10_urb_state_t;
-+
-+
-+struct crisv10_urb_priv {
-+  /* Sequence number for this URB. Every new submited URB gets this from
-+     a incrementing counter. Used when a URB is scheduled for later finish to
-+     be sure that the intended URB hasn't already been completed (device
-+     drivers has a tendency to reuse URBs once they are completed, causing us
-+     to not be able to single old ones out only based on the URB pointer.) */
-+  __u32 urb_num;
-+
-+  /* The first_sb field is used for freeing all SB descriptors belonging
-+     to an urb. The corresponding ep descriptor's sub pointer cannot be
-+     used for this since the DMA advances the sub pointer as it processes
-+     the sb list. */
-+  struct USB_SB_Desc *first_sb;
-+
-+  /* The last_sb field referes to the last SB descriptor that belongs to
-+     this urb. This is important to know so we can free the SB descriptors
-+     that ranges between first_sb and last_sb. */
-+  struct USB_SB_Desc *last_sb;
-+  
-+  /* The rx_offset field is used in ctrl and bulk traffic to keep track
-+     of the offset in the urb's transfer_buffer where incoming data should be
-+     copied to. */
-+  __u32 rx_offset;
-+  
-+  /* Counter used in isochronous transfers to keep track of the
-+     number of packets received/transmitted.  */
-+  __u32 isoc_packet_counter;
-+
-+  /* Flag that marks if this Isoc Out URB has finished it's transfer. Used
-+     because several URBs can be finished before list is processed */
-+  __u8  isoc_out_done;
-+  
-+  /* This field is used to pass information about the urb's current state
-+     between the various interrupt handlers (thus marked volatile). */
-+  volatile crisv10_urb_state_t urb_state;
-+  
-+  /* In Ctrl transfers consist of (at least) 3 packets: SETUP, IN and ZOUT.
-+     When DMA8 sub-channel 2 has processed the SB list for this sequence we
-+     get a interrupt. We also get a interrupt for In transfers and which
-+     one of these interrupts that comes first depends of data size and device.
-+     To be sure that we have got both interrupts before we complete the URB
-+     we have these to flags that shows which part that has completed.
-+     We can then check when we get one of the interrupts that if the other has
-+     occured it's safe for us to complete the URB, otherwise we set appropriate
-+     flag and do the completion when we get the other interrupt. */
-+  volatile unsigned char ctrl_zout_done;
-+  volatile unsigned char ctrl_rx_done;
-+
-+  /* Connection between the submitted urb and ETRAX epid number */
-+  __u8 epid;
-+  
-+  /* The rx_data_list field is used for periodic traffic, to hold
-+     received data for later processing in the the complete_urb functions,
-+     where the data us copied to the urb's transfer_buffer. Basically, we
-+     use this intermediate storage because we don't know when it's safe to
-+     reuse the transfer_buffer (FIXME?). */
-+  struct list_head rx_data_list;
-+
-+
-+  /* The interval time rounded up to closest 2^N */
-+  int interval;
-+
-+  /* Pool of EP descriptors needed if it's a INTR transfer.
-+     Amount of EPs in pool correspons to how many INTR that should
-+     be inserted in TxIntrEPList (max 128, defined by MAX_INTR_INTERVAL) */
-+  struct USB_EP_Desc* intr_ep_pool[128];
-+
-+  /* The mount of EPs allocated for this INTR URB */
-+  int intr_ep_pool_length;
-+
-+  /* Pointer to info struct if URB is scheduled to be finished later */
-+  struct urb_later_data* later_data;
-+};
-+
-+
-+/* This struct is for passing data from the top half to the bottom half irq
-+   handlers */
-+struct crisv10_irq_reg {
-+  struct usb_hcd* hcd;
-+  __u32 r_usb_epid_attn;
-+  __u8 r_usb_status;
-+  __u16 r_usb_rh_port_status_1;
-+  __u16 r_usb_rh_port_status_2;
-+  __u32 r_usb_irq_mask_read;
-+  __u32 r_usb_fm_number;
-+  struct work_struct usb_bh;
-+};
-+
-+
-+/* This struct is for passing data from the isoc top half to the isoc bottom
-+   half. */
-+struct crisv10_isoc_complete_data {
-+  struct usb_hcd *hcd;
-+  struct urb *urb;
-+  struct work_struct usb_bh;
-+};
-+
-+/* Entry item for URB lists for each endpint */
-+typedef struct urb_entry
-+{
-+	struct urb *urb;
-+	struct list_head list;
-+} urb_entry_t;
-+
-+/* ---------------------------------------------------------------------------
-+   Virtual Root HUB
-+   ------------------------------------------------------------------------- */
-+/* destination of request */
-+#define RH_INTERFACE               0x01
-+#define RH_ENDPOINT                0x02
-+#define RH_OTHER                   0x03
-+
-+#define RH_CLASS                   0x20
-+#define RH_VENDOR                  0x40
-+
-+/* Requests: bRequest << 8 | bmRequestType */
-+#define RH_GET_STATUS           0x0080
-+#define RH_CLEAR_FEATURE        0x0100
-+#define RH_SET_FEATURE          0x0300
-+#define RH_SET_ADDRESS		0x0500
-+#define RH_GET_DESCRIPTOR	0x0680
-+#define RH_SET_DESCRIPTOR       0x0700
-+#define RH_GET_CONFIGURATION	0x0880
-+#define RH_SET_CONFIGURATION	0x0900
-+#define RH_GET_STATE            0x0280
-+#define RH_GET_INTERFACE        0x0A80
-+#define RH_SET_INTERFACE        0x0B00
-+#define RH_SYNC_FRAME           0x0C80
-+/* Our Vendor Specific Request */
-+#define RH_SET_EP               0x2000
-+
-+
-+/* Hub port features */
-+#define RH_PORT_CONNECTION         0x00
-+#define RH_PORT_ENABLE             0x01
-+#define RH_PORT_SUSPEND            0x02
-+#define RH_PORT_OVER_CURRENT       0x03
-+#define RH_PORT_RESET              0x04
-+#define RH_PORT_POWER              0x08
-+#define RH_PORT_LOW_SPEED          0x09
-+#define RH_C_PORT_CONNECTION       0x10
-+#define RH_C_PORT_ENABLE           0x11
-+#define RH_C_PORT_SUSPEND          0x12
-+#define RH_C_PORT_OVER_CURRENT     0x13
-+#define RH_C_PORT_RESET            0x14
-+
-+/* Hub features */
-+#define RH_C_HUB_LOCAL_POWER       0x00
-+#define RH_C_HUB_OVER_CURRENT      0x01
-+
-+#define RH_DEVICE_REMOTE_WAKEUP    0x00
-+#define RH_ENDPOINT_STALL          0x01
-+
-+/* Our Vendor Specific feature */
-+#define RH_REMOVE_EP               0x00
-+
-+
-+#define RH_ACK                     0x01
-+#define RH_REQ_ERR                 -1
-+#define RH_NACK                    0x00
-+
-+/* Field definitions for */
-+
-+#define USB_IN_command__eol__BITNR      0 /* command macros */
-+#define USB_IN_command__eol__WIDTH      1
-+#define USB_IN_command__eol__no         0
-+#define USB_IN_command__eol__yes        1
-+
-+#define USB_IN_command__intr__BITNR     3
-+#define USB_IN_command__intr__WIDTH     1
-+#define USB_IN_command__intr__no        0
-+#define USB_IN_command__intr__yes       1
-+
-+#define USB_IN_status__eop__BITNR       1 /* status macros. */
-+#define USB_IN_status__eop__WIDTH       1
-+#define USB_IN_status__eop__no          0
-+#define USB_IN_status__eop__yes         1
-+
-+#define USB_IN_status__eot__BITNR       5
-+#define USB_IN_status__eot__WIDTH       1
-+#define USB_IN_status__eot__no          0
-+#define USB_IN_status__eot__yes         1
-+
-+#define USB_IN_status__error__BITNR     6
-+#define USB_IN_status__error__WIDTH     1
-+#define USB_IN_status__error__no        0
-+#define USB_IN_status__error__yes       1
-+
-+#define USB_IN_status__nodata__BITNR    7
-+#define USB_IN_status__nodata__WIDTH    1
-+#define USB_IN_status__nodata__no       0
-+#define USB_IN_status__nodata__yes      1
-+
-+#define USB_IN_status__epid__BITNR      8
-+#define USB_IN_status__epid__WIDTH      5
-+
-+#define USB_EP_command__eol__BITNR      0
-+#define USB_EP_command__eol__WIDTH      1
-+#define USB_EP_command__eol__no         0
-+#define USB_EP_command__eol__yes        1
-+
-+#define USB_EP_command__eof__BITNR      1
-+#define USB_EP_command__eof__WIDTH      1
-+#define USB_EP_command__eof__no         0
-+#define USB_EP_command__eof__yes        1
-+
-+#define USB_EP_command__intr__BITNR     3
-+#define USB_EP_command__intr__WIDTH     1
-+#define USB_EP_command__intr__no        0
-+#define USB_EP_command__intr__yes       1
-+
-+#define USB_EP_command__enable__BITNR   4
-+#define USB_EP_command__enable__WIDTH   1
-+#define USB_EP_command__enable__no      0
-+#define USB_EP_command__enable__yes     1
-+
-+#define USB_EP_command__hw_valid__BITNR 5
-+#define USB_EP_command__hw_valid__WIDTH 1
-+#define USB_EP_command__hw_valid__no    0
-+#define USB_EP_command__hw_valid__yes   1
-+
-+#define USB_EP_command__epid__BITNR     8
-+#define USB_EP_command__epid__WIDTH     5
-+
-+#define USB_SB_command__eol__BITNR      0 /* command macros. */
-+#define USB_SB_command__eol__WIDTH      1
-+#define USB_SB_command__eol__no         0
-+#define USB_SB_command__eol__yes        1
-+
-+#define USB_SB_command__eot__BITNR      1
-+#define USB_SB_command__eot__WIDTH      1
-+#define USB_SB_command__eot__no         0
-+#define USB_SB_command__eot__yes        1
-+
-+#define USB_SB_command__intr__BITNR     3
-+#define USB_SB_command__intr__WIDTH     1
-+#define USB_SB_command__intr__no        0
-+#define USB_SB_command__intr__yes       1
-+
-+#define USB_SB_command__tt__BITNR       4
-+#define USB_SB_command__tt__WIDTH       2
-+#define USB_SB_command__tt__zout        0
-+#define USB_SB_command__tt__in          1
-+#define USB_SB_command__tt__out         2
-+#define USB_SB_command__tt__setup       3
-+
-+
-+#define USB_SB_command__rem__BITNR      8
-+#define USB_SB_command__rem__WIDTH      6
-+
-+#define USB_SB_command__full__BITNR     6
-+#define USB_SB_command__full__WIDTH     1
-+#define USB_SB_command__full__no        0
-+#define USB_SB_command__full__yes       1
-+
-+#endif
-diff -Nur linux-2.6.36.orig/lib/klist.c linux-2.6.36/lib/klist.c
---- linux-2.6.36.orig/lib/klist.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/lib/klist.c	2010-11-15 17:57:18.000000000 +0100
-@@ -60,7 +60,7 @@
- {
- 	knode->n_klist = klist;
- 	/* no knode deserves to start its life dead */
--	WARN_ON(knode_dead(knode));
-+	//WARN_ON(knode_dead(knode));
- }
- 
- static void knode_kill(struct klist_node *knode)
diff --git a/target/cris/sys-available/foxboard-lx b/target/cris/sys-available/foxboard-lx
deleted file mode 100644
index edef0ffc8..000000000
--- a/target/cris/sys-available/foxboard-lx
+++ /dev/null
@@ -1,10 +0,0 @@
-config ADK_TARGET_SYSTEM_FOXBOARD_LX
-	bool "FOX Board LX"
-	select ADK_cris
-	select ADK_foxboard_lx
-	select ADK_CPU_CRIS_V10
-	select ADK_TARGET_WITH_MTD
-	select ADK_TARGET_WITH_USB
-	help
-	  Build a system for FOX Board LX models.
-
diff --git a/target/cris/sys-available/qemu-crisv32 b/target/cris/sys-available/qemu-crisv32
deleted file mode 100644
index 37ecbf9e8..000000000
--- a/target/cris/sys-available/qemu-crisv32
+++ /dev/null
@@ -1,15 +0,0 @@
-config ADK_TARGET_SYSTEM_QEMU_CRIS
-	bool "Qemu Emulator"
-	select ADK_cris
-	select ADK_qemu_cris
-	select ADK_CPU_CRIS_V32
-	select ADK_KERNEL_ETRAXFS
-	select ADK_KERNEL_MTD_MTDRAM
-	select ADK_TARGET_WITH_INPUT
-	select ADK_TARGET_WITH_PCI
-	select ADK_TARGET_WITH_HDD
-	select ADK_TARGET_WITH_MTD
-	select ADK_HARDWARE_QEMU
-	help
-	 Support for Qemu Emulator (CRIS).
-
diff --git a/target/cris/sys-available/toolchain-cris b/target/cris/sys-available/toolchain-cris
deleted file mode 100644
index 129619e72..000000000
--- a/target/cris/sys-available/toolchain-cris
+++ /dev/null
@@ -1,9 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_CRIS
-	bool "Toolchain only"
-	select ADK_cris
-	select ADK_toolchain_cris
-	select ADK_CPU_CRIS_V10
-	select ADK_TOOLCHAIN
-	help
-	  Build a cris toolchain (crisv10).
-
diff --git a/target/cris/target.mk b/target/cris/target.mk
deleted file mode 100644
index 9f143ef11..000000000
--- a/target/cris/target.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-include $(TOPDIR)/mk/kernel-ver.mk
-ARCH:=			cris
-CPU_ARCH:=		$(ADK_TARGET_CPU_ARCH)
-TARGET_OPTIMIZATION:=	-Os -pipe -fno-auto-inc-dec -fno-peephole2
-TARGET_CFLAGS_ARCH:=    $(ADK_TARGET_CFLAGS)
diff --git a/target/cris/uclibc.config b/target/cris/uclibc.config
deleted file mode 100644
index 34906ece4..000000000
--- a/target/cris/uclibc.config
+++ /dev/null
@@ -1,248 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Version: 0.9.33.2
-# Fri Sep 21 11:43:37 2012
-#
-# TARGET_alpha is not set
-# TARGET_arm is not set
-# TARGET_avr32 is not set
-# TARGET_bfin is not set
-# TARGET_c6x is not set
-TARGET_cris=y
-# TARGET_e1 is not set
-# TARGET_frv is not set
-# TARGET_h8300 is not set
-# TARGET_hppa is not set
-# TARGET_i386 is not set
-# TARGET_i960 is not set
-# TARGET_ia64 is not set
-# TARGET_m68k is not set
-# TARGET_microblaze is not set
-# TARGET_mips is not set
-# TARGET_nios is not set
-# TARGET_nios2 is not set
-# TARGET_powerpc is not set
-# TARGET_sh is not set
-# TARGET_sh64 is not set
-# TARGET_sparc is not set
-# TARGET_v850 is not set
-# TARGET_vax is not set
-# TARGET_x86_64 is not set
-# TARGET_xtensa is not set
-
-#
-# Target Architecture Features and Options
-#
-TARGET_ARCH="cris"
-FORCE_OPTIONS_FOR_ARCH=y
-CONFIG_CRIS=y
-# CONFIG_CRISV32 is not set
-TARGET_SUBARCH=""
-
-#
-# Using ELF file format
-#
-ARCH_LITTLE_ENDIAN=y
-
-#
-# Using Little Endian
-#
-ARCH_HAS_MMU=y
-ARCH_USE_MMU=y
-UCLIBC_HAS_FLOATS=y
-UCLIBC_HAS_FPU=y
-DO_C99_MATH=y
-# DO_XSI_MATH is not set
-UCLIBC_HAS_FENV=y
-KERNEL_HEADERS=""
-HAVE_DOT_CONFIG=y
-
-#
-# General Library Settings
-#
-DOPIC=y
-HAVE_SHARED=y
-# FORCE_SHAREABLE_TEXT_SEGMENTS is not set
-LDSO_LDD_SUPPORT=y
-LDSO_CACHE_SUPPORT=y
-# LDSO_PRELOAD_ENV_SUPPORT is not set
-# LDSO_PRELOAD_FILE_SUPPORT is not set
-LDSO_BASE_FILENAME="ld.so"
-# LDSO_STANDALONE_SUPPORT is not set
-# LDSO_PRELINK_SUPPORT is not set
-# UCLIBC_STATIC_LDCONFIG is not set
-LDSO_RUNPATH=y
-LDSO_SEARCH_INTERP_PATH=y
-LDSO_LD_LIBRARY_PATH=y
-# LDSO_NO_CLEANUP is not set
-UCLIBC_CTOR_DTOR=y
-# LDSO_GNU_HASH_SUPPORT is not set
-# HAS_NO_THREADS is not set
-LINUXTHREADS_OLD=y
-# LINUXTHREADS_NEW is not set
-# UCLIBC_HAS_THREADS_NATIVE is not set
-UCLIBC_HAS_THREADS=y
-PTHREADS_DEBUG_SUPPORT=y
-UCLIBC_HAS_SYSLOG=y
-UCLIBC_HAS_LFS=y
-# MALLOC is not set
-# MALLOC_SIMPLE is not set
-MALLOC_STANDARD=y
-MALLOC_GLIBC_COMPAT=y
-UCLIBC_DYNAMIC_ATEXIT=y
-COMPAT_ATEXIT=y
-UCLIBC_SUSV3_LEGACY=y
-# UCLIBC_SUSV3_LEGACY_MACROS is not set
-UCLIBC_SUSV4_LEGACY=y
-# UCLIBC_STRICT_HEADERS is not set
-# UCLIBC_HAS_STUBS is not set
-UCLIBC_HAS_SHADOW=y
-UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
-UCLIBC_HAS___PROGNAME=y
-UCLIBC_HAS_PTY=y
-ASSUME_DEVPTS=y
-UNIX98PTY_ONLY=y
-UCLIBC_HAS_GETPT=y
-UCLIBC_HAS_LIBUTIL=y
-UCLIBC_HAS_TM_EXTENSIONS=y
-UCLIBC_HAS_TZ_CACHING=y
-UCLIBC_HAS_TZ_FILE=y
-UCLIBC_HAS_TZ_FILE_READ_MANY=y
-UCLIBC_TZ_FILE_PATH="/etc/TZ"
-UCLIBC_FALLBACK_TO_ETC_LOCALTIME=y
-
-#
-# Advanced Library Settings
-#
-UCLIBC_PWD_BUFFER_SIZE=256
-UCLIBC_GRP_BUFFER_SIZE=256
-
-#
-# Support various families of functions
-#
-UCLIBC_LINUX_MODULE_26=y
-# UCLIBC_LINUX_MODULE_24 is not set
-UCLIBC_LINUX_SPECIFIC=y
-UCLIBC_HAS_GNU_ERROR=y
-UCLIBC_BSD_SPECIFIC=y
-UCLIBC_HAS_BSD_ERR=y
-# UCLIBC_HAS_OBSOLETE_BSD_SIGNAL is not set
-# UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL is not set
-# UCLIBC_NTP_LEGACY is not set
-# UCLIBC_SV4_DEPRECATED is not set
-UCLIBC_HAS_REALTIME=y
-UCLIBC_HAS_ADVANCED_REALTIME=y
-UCLIBC_HAS_EPOLL=y
-# UCLIBC_HAS_XATTR is not set
-# UCLIBC_HAS_PROFILING is not set
-UCLIBC_HAS_CRYPT_IMPL=y
-# UCLIBC_HAS_SHA256_CRYPT_IMPL is not set
-# UCLIBC_HAS_SHA512_CRYPT_IMPL is not set
-UCLIBC_HAS_CRYPT=y
-UCLIBC_HAS_NETWORK_SUPPORT=y
-UCLIBC_HAS_SOCKET=y
-UCLIBC_HAS_IPV4=y
-UCLIBC_HAS_IPV6=y
-UCLIBC_HAS_RPC=y
-UCLIBC_HAS_FULL_RPC=y
-UCLIBC_HAS_REENTRANT_RPC=y
-UCLIBC_USE_NETLINK=y
-UCLIBC_SUPPORT_AI_ADDRCONFIG=y
-UCLIBC_HAS_BSD_RES_CLOSE=y
-UCLIBC_HAS_COMPAT_RES_STATE=y
-# UCLIBC_HAS_EXTRA_COMPAT_RES_STATE is not set
-UCLIBC_HAS_RESOLVER_SUPPORT=y
-UCLIBC_HAS_LIBRESOLV_STUB=y
-UCLIBC_HAS_LIBNSL_STUB=y
-
-#
-# String and Stdio Support
-#
-UCLIBC_HAS_STRING_GENERIC_OPT=y
-UCLIBC_HAS_STRING_ARCH_OPT=y
-UCLIBC_HAS_CTYPE_TABLES=y
-UCLIBC_HAS_CTYPE_SIGNED=y
-# UCLIBC_HAS_CTYPE_UNSAFE is not set
-UCLIBC_HAS_CTYPE_CHECKED=y
-# UCLIBC_HAS_CTYPE_ENFORCED is not set
-UCLIBC_HAS_WCHAR=y
-# UCLIBC_HAS_LOCALE is not set
-UCLIBC_HAS_HEXADECIMAL_FLOATS=y
-UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
-UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
-UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
-# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_256 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
-UCLIBC_HAS_STDIO_BUFSIZ_4096=y
-# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
-UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
-# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set
-UCLIBC_HAS_STDIO_GETC_MACRO=y
-UCLIBC_HAS_STDIO_PUTC_MACRO=y
-UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
-# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set
-UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y
-# UCLIBC_HAS_FOPEN_CLOSEEXEC_MODE is not set
-UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
-UCLIBC_HAS_PRINTF_M_SPEC=y
-UCLIBC_HAS_ERRNO_MESSAGES=y
-# UCLIBC_HAS_SYS_ERRLIST is not set
-UCLIBC_HAS_SIGNUM_MESSAGES=y
-# UCLIBC_HAS_SYS_SIGLIST is not set
-UCLIBC_HAS_GNU_GETOPT=y
-UCLIBC_HAS_GNU_GETSUBOPT=y
-
-#
-# Big and Tall
-#
-UCLIBC_HAS_REGEX=y
-# UCLIBC_HAS_REGEX_OLD is not set
-UCLIBC_HAS_FNMATCH=y
-# UCLIBC_HAS_FNMATCH_OLD is not set
-UCLIBC_HAS_WORDEXP=y
-UCLIBC_HAS_NFTW=y
-UCLIBC_HAS_FTW=y
-# UCLIBC_HAS_FTS is not set
-UCLIBC_HAS_GLOB=y
-UCLIBC_HAS_GNU_GLOB=y
-# UCLIBC_HAS_UTMPX is not set
-
-#
-# Library Installation Options
-#
-RUNTIME_PREFIX="/"
-DEVEL_PREFIX="/usr/"
-MULTILIB_DIR="lib"
-HARDWIRED_ABSPATH=y
-
-#
-# Security options
-#
-UCLIBC_HAS_ARC4RANDOM=y
-# UCLIBC_HAS_SSP is not set
-UCLIBC_BUILD_RELRO=y
-# UCLIBC_BUILD_NOW is not set
-UCLIBC_BUILD_NOEXECSTACK=y
-
-#
-# Development/debugging options
-#
-CROSS_COMPILER_PREFIX=""
-UCLIBC_EXTRA_CFLAGS=""
-# DODEBUG is not set
-# DODEBUG_PT is not set
-DOSTRIP=y
-# DOASSERTS is not set
-# SUPPORT_LD_DEBUG is not set
-# SUPPORT_LD_DEBUG_EARLY is not set
-# UCLIBC_MALLOC_DEBUGGING is not set
-# UCLIBC_HAS_BACKTRACE is not set
-WARNINGS="-Wall"
-EXTRA_WARNINGS=y
-# DOMULTI is not set
-# UCLIBC_MJN3_ONLY is not set
diff --git a/target/cris/uclibc.config.v32 b/target/cris/uclibc.config.v32
deleted file mode 100644
index 72aebfcaa..000000000
--- a/target/cris/uclibc.config.v32
+++ /dev/null
@@ -1,247 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Version: 0.9.33.2
-# Fri Sep 21 11:44:04 2012
-#
-# TARGET_alpha is not set
-# TARGET_arm is not set
-# TARGET_avr32 is not set
-# TARGET_bfin is not set
-# TARGET_c6x is not set
-TARGET_cris=y
-# TARGET_e1 is not set
-# TARGET_frv is not set
-# TARGET_h8300 is not set
-# TARGET_hppa is not set
-# TARGET_i386 is not set
-# TARGET_i960 is not set
-# TARGET_ia64 is not set
-# TARGET_m68k is not set
-# TARGET_microblaze is not set
-# TARGET_mips is not set
-# TARGET_nios is not set
-# TARGET_nios2 is not set
-# TARGET_powerpc is not set
-# TARGET_sh is not set
-# TARGET_sh64 is not set
-# TARGET_sparc is not set
-# TARGET_v850 is not set
-# TARGET_vax is not set
-# TARGET_x86_64 is not set
-# TARGET_xtensa is not set
-
-#
-# Target Architecture Features and Options
-#
-TARGET_ARCH="cris"
-FORCE_OPTIONS_FOR_ARCH=y
-# CONFIG_CRIS is not set
-CONFIG_CRISV32=y
-TARGET_SUBARCH=""
-
-#
-# Using ELF file format
-#
-ARCH_LITTLE_ENDIAN=y
-
-#
-# Using Little Endian
-#
-ARCH_HAS_MMU=y
-ARCH_USE_MMU=y
-UCLIBC_HAS_FLOATS=y
-UCLIBC_HAS_FPU=y
-DO_C99_MATH=y
-# DO_XSI_MATH is not set
-UCLIBC_HAS_FENV=y
-KERNEL_HEADERS=""
-HAVE_DOT_CONFIG=y
-
-#
-# General Library Settings
-#
-DOPIC=y
-HAVE_SHARED=y
-# FORCE_SHAREABLE_TEXT_SEGMENTS is not set
-LDSO_LDD_SUPPORT=y
-LDSO_CACHE_SUPPORT=y
-# LDSO_PRELOAD_ENV_SUPPORT is not set
-# LDSO_PRELOAD_FILE_SUPPORT is not set
-LDSO_BASE_FILENAME="ld.so"
-# LDSO_STANDALONE_SUPPORT is not set
-# LDSO_PRELINK_SUPPORT is not set
-# UCLIBC_STATIC_LDCONFIG is not set
-LDSO_RUNPATH=y
-LDSO_SEARCH_INTERP_PATH=y
-LDSO_LD_LIBRARY_PATH=y
-# LDSO_NO_CLEANUP is not set
-UCLIBC_CTOR_DTOR=y
-# LDSO_GNU_HASH_SUPPORT is not set
-# HAS_NO_THREADS is not set
-LINUXTHREADS_OLD=y
-# LINUXTHREADS_NEW is not set
-# UCLIBC_HAS_THREADS_NATIVE is not set
-UCLIBC_HAS_THREADS=y
-PTHREADS_DEBUG_SUPPORT=y
-UCLIBC_HAS_SYSLOG=y
-UCLIBC_HAS_LFS=y
-# MALLOC is not set
-# MALLOC_SIMPLE is not set
-MALLOC_STANDARD=y
-MALLOC_GLIBC_COMPAT=y
-UCLIBC_DYNAMIC_ATEXIT=y
-COMPAT_ATEXIT=y
-UCLIBC_SUSV3_LEGACY=y
-# UCLIBC_SUSV3_LEGACY_MACROS is not set
-UCLIBC_SUSV4_LEGACY=y
-# UCLIBC_STRICT_HEADERS is not set
-# UCLIBC_HAS_STUBS is not set
-UCLIBC_HAS_SHADOW=y
-UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
-UCLIBC_HAS___PROGNAME=y
-UCLIBC_HAS_PTY=y
-ASSUME_DEVPTS=y
-UNIX98PTY_ONLY=y
-UCLIBC_HAS_GETPT=y
-UCLIBC_HAS_LIBUTIL=y
-UCLIBC_HAS_TM_EXTENSIONS=y
-UCLIBC_HAS_TZ_CACHING=y
-UCLIBC_HAS_TZ_FILE=y
-UCLIBC_HAS_TZ_FILE_READ_MANY=y
-UCLIBC_TZ_FILE_PATH="/etc/TZ"
-UCLIBC_FALLBACK_TO_ETC_LOCALTIME=y
-
-#
-# Advanced Library Settings
-#
-UCLIBC_PWD_BUFFER_SIZE=256
-UCLIBC_GRP_BUFFER_SIZE=256
-
-#
-# Support various families of functions
-#
-UCLIBC_LINUX_MODULE_26=y
-# UCLIBC_LINUX_MODULE_24 is not set
-UCLIBC_LINUX_SPECIFIC=y
-UCLIBC_HAS_GNU_ERROR=y
-UCLIBC_BSD_SPECIFIC=y
-UCLIBC_HAS_BSD_ERR=y
-# UCLIBC_HAS_OBSOLETE_BSD_SIGNAL is not set
-# UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL is not set
-# UCLIBC_NTP_LEGACY is not set
-# UCLIBC_SV4_DEPRECATED is not set
-UCLIBC_HAS_REALTIME=y
-UCLIBC_HAS_ADVANCED_REALTIME=y
-UCLIBC_HAS_EPOLL=y
-# UCLIBC_HAS_XATTR is not set
-# UCLIBC_HAS_PROFILING is not set
-UCLIBC_HAS_CRYPT_IMPL=y
-# UCLIBC_HAS_SHA256_CRYPT_IMPL is not set
-# UCLIBC_HAS_SHA512_CRYPT_IMPL is not set
-UCLIBC_HAS_CRYPT=y
-UCLIBC_HAS_NETWORK_SUPPORT=y
-UCLIBC_HAS_SOCKET=y
-UCLIBC_HAS_IPV4=y
-UCLIBC_HAS_IPV6=y
-UCLIBC_HAS_RPC=y
-UCLIBC_HAS_FULL_RPC=y
-UCLIBC_HAS_REENTRANT_RPC=y
-UCLIBC_USE_NETLINK=y
-UCLIBC_SUPPORT_AI_ADDRCONFIG=y
-UCLIBC_HAS_BSD_RES_CLOSE=y
-UCLIBC_HAS_COMPAT_RES_STATE=y
-# UCLIBC_HAS_EXTRA_COMPAT_RES_STATE is not set
-UCLIBC_HAS_RESOLVER_SUPPORT=y
-UCLIBC_HAS_LIBRESOLV_STUB=y
-UCLIBC_HAS_LIBNSL_STUB=y
-
-#
-# String and Stdio Support
-#
-UCLIBC_HAS_STRING_GENERIC_OPT=y
-UCLIBC_HAS_STRING_ARCH_OPT=y
-UCLIBC_HAS_CTYPE_TABLES=y
-UCLIBC_HAS_CTYPE_SIGNED=y
-# UCLIBC_HAS_CTYPE_UNSAFE is not set
-UCLIBC_HAS_CTYPE_CHECKED=y
-# UCLIBC_HAS_CTYPE_ENFORCED is not set
-UCLIBC_HAS_WCHAR=y
-# UCLIBC_HAS_LOCALE is not set
-UCLIBC_HAS_HEXADECIMAL_FLOATS=y
-UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
-UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
-UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
-# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_256 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
-UCLIBC_HAS_STDIO_BUFSIZ_4096=y
-# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
-UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
-# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set
-UCLIBC_HAS_STDIO_GETC_MACRO=y
-UCLIBC_HAS_STDIO_PUTC_MACRO=y
-UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
-# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set
-UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y
-# UCLIBC_HAS_FOPEN_CLOSEEXEC_MODE is not set
-UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
-UCLIBC_HAS_PRINTF_M_SPEC=y
-UCLIBC_HAS_ERRNO_MESSAGES=y
-# UCLIBC_HAS_SYS_ERRLIST is not set
-UCLIBC_HAS_SIGNUM_MESSAGES=y
-# UCLIBC_HAS_SYS_SIGLIST is not set
-UCLIBC_HAS_GNU_GETOPT=y
-UCLIBC_HAS_GNU_GETSUBOPT=y
-
-#
-# Big and Tall
-#
-UCLIBC_HAS_REGEX=y
-# UCLIBC_HAS_REGEX_OLD is not set
-UCLIBC_HAS_FNMATCH=y
-# UCLIBC_HAS_FNMATCH_OLD is not set
-UCLIBC_HAS_WORDEXP=y
-UCLIBC_HAS_NFTW=y
-UCLIBC_HAS_FTW=y
-# UCLIBC_HAS_FTS is not set
-UCLIBC_HAS_GLOB=y
-UCLIBC_HAS_GNU_GLOB=y
-# UCLIBC_HAS_UTMPX is not set
-
-#
-# Library Installation Options
-#
-RUNTIME_PREFIX="/"
-DEVEL_PREFIX="/usr/"
-MULTILIB_DIR="lib"
-HARDWIRED_ABSPATH=y
-
-#
-# Security options
-#
-UCLIBC_HAS_ARC4RANDOM=y
-# UCLIBC_HAS_SSP is not set
-UCLIBC_BUILD_RELRO=y
-# UCLIBC_BUILD_NOW is not set
-UCLIBC_BUILD_NOEXECSTACK=y
-
-#
-# Development/debugging options
-#
-CROSS_COMPILER_PREFIX=""
-UCLIBC_EXTRA_CFLAGS=""
-DODEBUG=y
-DODEBUG_PT=y
-DOASSERTS=y
-SUPPORT_LD_DEBUG=y
-SUPPORT_LD_DEBUG_EARLY=y
-# UCLIBC_MALLOC_DEBUGGING is not set
-# UCLIBC_HAS_BACKTRACE is not set
-WARNINGS="-Wall"
-EXTRA_WARNINGS=y
-# DOMULTI is not set
-# UCLIBC_MJN3_ONLY is not set
diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block
index fb5bf080f..832f76a56 100644
--- a/target/linux/config/Config.in.block
+++ b/target/linux/config/Config.in.block
@@ -347,7 +347,6 @@ config ADK_KPACKAGE_KMOD_BLK_DEV_MD
 	tristate
 	depends on !ADK_KERNEL_BLK_DEV_MD
 	select ADK_KERNEL_MD
-	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX
 	help
 
 config ADK_KERNEL_MD_RAID0
@@ -385,7 +384,6 @@ config ADK_KPACKAGE_KMOD_BLK_DEV_DM
 	prompt "kmod-blk-dev-dm................... Device Mapper support"
 	select ADK_KERNEL_MD
 	depends on !ADK_KERNEL_BLK_DEV_DM
-	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX
 	tristate
 	help
 	  Device-mapper is a low level volume manager.  It works by allowing
@@ -433,7 +431,6 @@ config ADK_KPACKAGE_KMOD_BLK_DEV_DRBD
 	tristate
 	select ADK_KERNEL_BLK_DEV
 	select ADK_KERNEL_CONNECTOR
-	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX
 	help
           DRBD - http://www.drbd.org
           
diff --git a/target/linux/config/Config.in.debug b/target/linux/config/Config.in.debug
index cea0198d1..6236b329b 100644
--- a/target/linux/config/Config.in.debug
+++ b/target/linux/config/Config.in.debug
@@ -90,7 +90,6 @@ config ADK_KPACKAGE_KMOD_OPROFILE
 	prompt "kernel support for oprofile"
 	tristate
 	select ADK_KERNEL_PROFILING
-	depends on !ADK_LINUX_CRIS
 	depends on !ADK_LINUX_M68K
 	default n
 	help
diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs
index a764e7491..85065c093 100644
--- a/target/linux/config/Config.in.fs
+++ b/target/linux/config/Config.in.fs
@@ -199,7 +199,6 @@ config ADK_KERNEL_XFS_FS
 	prompt "xfs............................... XFS filesystem support (kernel)"
 	boolean
 	select ADK_KERNEL_EXPORTFS
-	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX && !ADK_LINUX_AVR32
 	default n
 
 config ADK_KPACKAGE_KMOD_XFS_FS
@@ -209,7 +208,6 @@ config ADK_KPACKAGE_KMOD_XFS_FS
 	select ADK_KPACKAGE_KMOD_CRYPTO_CRC32C
 	select ADK_KERNEL_BLOCK
 	depends on !ADK_KERNEL_XFS_FS
-	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX && !ADK_LINUX_AVR32
 	default n
 	help
 	  XFS is a high performance journaling filesystem which originated
diff --git a/target/linux/config/Config.in.fsnet b/target/linux/config/Config.in.fsnet
index c22ae210c..11d64d044 100644
--- a/target/linux/config/Config.in.fsnet
+++ b/target/linux/config/Config.in.fsnet
@@ -110,7 +110,7 @@ config ADK_KERNEL_NFSD_V4
 	default n
 
 config ADK_KPACKAGE_KMOD_NFSD
-	prompt "kmod-fs-nfsd...................... NFS server support (includes V3 support)"
+	prompt "kmod-nfsd......................... NFS server support"
 	tristate
 	default n
 	select ADK_KERNEL_EXPORTFS
diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input
index c2516c27d..ac66ab230 100644
--- a/target/linux/config/Config.in.input
+++ b/target/linux/config/Config.in.input
@@ -145,7 +145,6 @@ config ADK_KPACKAGE_KMOD_USB_HID
 	select ADK_KERNEL_INPUT_MOUSEDEV
 	select ADK_KERNEL_INPUT_MOUSE
 	depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
-        depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX
 	depends on ADK_TARGET_WITH_USB
 	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default y if ADK_TARGET_SYSTEM_QEMU_SH4
diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel
index 4082d79e7..785ae6475 100644
--- a/target/linux/config/Config.in.kernel
+++ b/target/linux/config/Config.in.kernel
@@ -4,24 +4,6 @@ config ADK_KERNEL_STAGING
 config ADK_KERNEL_EXPERIMENTAL
 	boolean
 
-config ADK_KERNEL_ETRAX_MTD_SIZE
-        hex
-        depends on ADK_TARGET_SYSTEM_FOXBOARD_LX
-        default "0x00400000" if ADK_TARGET_FOXBOARD_MODEL_LX416
-        default "0x00800000" if ADK_TARGET_FOXBOARD_MODEL_LX832
-
-config ADK_KERNEL_ETRAX_DRAM_SIZE
-        int
-        depends on ADK_TARGET_SYSTEM_FOXBOARD_LX
-        default "16" if ADK_TARGET_FOXBOARD_MODEL_LX416
-        default "32" if ADK_TARGET_FOXBOARD_MODEL_LX832
-
-config ADK_KERNEL_ETRAX_DEF_R_SDRAM_TIMING
-        hex
-        depends on ADK_TARGET_SYSTEM_FOXBOARD_LX
-        default "0x80608002" if ADK_TARGET_FOXBOARD_MODEL_LX416
-        default "0x80008002" if ADK_TARGET_FOXBOARD_MODEL_LX832
-
 config ADK_KERNEL_BLK_DEV_INITRD
 	boolean
 
diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice
index b2eb73b57..d7d7ae013 100644
--- a/target/linux/config/Config.in.netdevice
+++ b/target/linux/config/Config.in.netdevice
@@ -443,7 +443,6 @@ config ADK_KPACKAGE_KMOD_HOSTAP
 	tristate
 	select ADK_KPACKAGE_KMOD_MAC80211
 	default n
-	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX
 	depends on ADK_TARGET_WITH_PCMCIA
 	help
 	  HostAP Driver for wireless chips.
@@ -462,7 +461,6 @@ config ADK_KPACKAGE_KMOD_RTL8187
 	prompt "kmod-rtl8187................. Realtek RTL8187/RTL8187B wireless cards"
 	tristate
 	depends on ADK_TARGET_WITH_USB
-	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX
 	select ADK_KPACKAGE_KMOD_MAC80211
 	select ADK_KPACKAGE_KMOD_EEPROM_93CX6
 	default n
diff --git a/target/linux/config/Config.in.systems b/target/linux/config/Config.in.systems
index 239f3495e..9609cf5b2 100644
--- a/target/linux/config/Config.in.systems
+++ b/target/linux/config/Config.in.systems
@@ -60,9 +60,6 @@ config ADK_KERNEL_ARCH_AT91SAM9260
 config ADK_KERNEL_MACH_ACMENETUSFOXG20
 	boolean
 
-config ADK_KERNEL_ARCH_BCM2708
-	boolean
-
 config ADK_KERNEL_BCM47XX_SSB
 	boolean
 
@@ -75,7 +72,3 @@ config ADK_KERNEL_CPU_BIG_ENDIAN
 
 config ADK_KERNEL_CPU_LITTLE_ENDIAN
 	boolean
-
-# cris systems
-config ADK_KERNEL_ETRAXFS
-	boolean
diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb
index e2e3051da..53413abde 100644
--- a/target/linux/config/Config.in.usb
+++ b/target/linux/config/Config.in.usb
@@ -44,7 +44,6 @@ config ADK_KPACKAGE_KMOD_USB
 	default y if ADK_NATIVE_SYSTEM_INTEL_ATOM
 	default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default y if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
-	default y if ADK_TARGET_SYSTEM_FOXBOARD_LX
 	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
 	help
@@ -83,7 +82,6 @@ config ADK_KPACKAGE_KMOD_USB_UHCI_HCD
 	depends on ADK_KPACKAGE_KMOD_USB
 	depends on !ADK_KERNEL_USB_UHCI_HCD
 	depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
-	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX
 	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default y if ADK_TARGET_SYSTEM_IBM_X40
 	default y if ADK_NATIVE_SYSTEM_IBM_X40
@@ -107,7 +105,6 @@ config ADK_KPACKAGE_KMOD_USB_OHCI_HCD
 	select ADK_PACKAGE_KMOD_USB_CONTROLLER
 	depends on ADK_KPACKAGE_KMOD_USB
 	#depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
-	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX
 	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
@@ -134,7 +131,6 @@ config ADK_KPACKAGE_KMOD_USB_ISP116X_HCD
 	select ADK_PACKAGE_KMOD_USB_CONTROLLER
 	depends on ADK_KPACKAGE_KMOD_USB
 	depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
-	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX
 	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
 	help
@@ -149,7 +145,6 @@ config ADK_KPACKAGE_KMOD_USB_SL811_HCD
 	select ADK_PACKAGE_KMOD_USB_CONTROLLER
 	depends on ADK_KPACKAGE_KMOD_USB
 	depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
-	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX
 	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
 	help
@@ -173,7 +168,6 @@ config ADK_KPACKAGE_KMOD_USB_EHCI_HCD
 	select ADK_PACKAGE_KMOD_USB_CONTROLLER
 	depends on !ADK_KERNEL_USB_EHCI_HCD
 	depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
-	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX
 	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
 	depends on ADK_KPACKAGE_KMOD_USB
 	default y if ADK_TARGET_SYSTEM_QEMU_I686
@@ -211,7 +205,6 @@ config ADK_KPACKAGE_KMOD_USB_EHCI_HCD
 config ADK_PACKAGE_KMOD_USB_CONTROLLER
 	tristate
 	default y if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
-	default y if ADK_TARGET_SYSTEM_FOXBOARD_LX
 	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
 
diff --git a/target/linux/kernel.config b/target/linux/kernel.config
index 8bf3aafe6..491b04c92 100644
--- a/target/linux/kernel.config
+++ b/target/linux/kernel.config
@@ -26,6 +26,7 @@ CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_STANDALONE=y
 CONFIG_NO_HZ=y
 CONFIG_PRINTK=y
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_BUG=n
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
diff --git a/target/linux/patches/3.11.10/cris-etrax.patch b/target/linux/patches/3.11.10/cris-etrax.patch
deleted file mode 100644
index a80d9a8b8..000000000
--- a/target/linux/patches/3.11.10/cris-etrax.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur linux-2.6.39.orig/arch/cris/arch-v32/drivers/i2c.h linux-2.6.39/arch/cris/arch-v32/drivers/i2c.h
---- linux-2.6.39.orig/arch/cris/arch-v32/drivers/i2c.h	2011-05-19 06:06:34.000000000 +0200
-+++ linux-2.6.39/arch/cris/arch-v32/drivers/i2c.h	2011-08-24 19:15:05.000000000 +0200
-@@ -2,7 +2,7 @@
- #include <linux/init.h>
- 
- /* High level I2C actions */
--int __init i2c_init(void);
-+static int __init i2c_init(void);
- int i2c_write(unsigned char theSlave, void *data, size_t nbytes);
- int i2c_read(unsigned char theSlave, void *data, size_t nbytes);
- int i2c_writereg(unsigned char theSlave, unsigned char theReg, unsigned char theValue);
diff --git a/target/linux/patches/3.12.6/cris-etrax.patch b/target/linux/patches/3.12.6/cris-etrax.patch
deleted file mode 100644
index a80d9a8b8..000000000
--- a/target/linux/patches/3.12.6/cris-etrax.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur linux-2.6.39.orig/arch/cris/arch-v32/drivers/i2c.h linux-2.6.39/arch/cris/arch-v32/drivers/i2c.h
---- linux-2.6.39.orig/arch/cris/arch-v32/drivers/i2c.h	2011-05-19 06:06:34.000000000 +0200
-+++ linux-2.6.39/arch/cris/arch-v32/drivers/i2c.h	2011-08-24 19:15:05.000000000 +0200
-@@ -2,7 +2,7 @@
- #include <linux/init.h>
- 
- /* High level I2C actions */
--int __init i2c_init(void);
-+static int __init i2c_init(void);
- int i2c_write(unsigned char theSlave, void *data, size_t nbytes);
- int i2c_read(unsigned char theSlave, void *data, size_t nbytes);
- int i2c_writereg(unsigned char theSlave, unsigned char theReg, unsigned char theValue);
diff --git a/target/linux/patches/3.4.71/cris-etrax.patch b/target/linux/patches/3.4.71/cris-etrax.patch
deleted file mode 100644
index a80d9a8b8..000000000
--- a/target/linux/patches/3.4.71/cris-etrax.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur linux-2.6.39.orig/arch/cris/arch-v32/drivers/i2c.h linux-2.6.39/arch/cris/arch-v32/drivers/i2c.h
---- linux-2.6.39.orig/arch/cris/arch-v32/drivers/i2c.h	2011-05-19 06:06:34.000000000 +0200
-+++ linux-2.6.39/arch/cris/arch-v32/drivers/i2c.h	2011-08-24 19:15:05.000000000 +0200
-@@ -2,7 +2,7 @@
- #include <linux/init.h>
- 
- /* High level I2C actions */
--int __init i2c_init(void);
-+static int __init i2c_init(void);
- int i2c_write(unsigned char theSlave, void *data, size_t nbytes);
- int i2c_read(unsigned char theSlave, void *data, size_t nbytes);
- int i2c_writereg(unsigned char theSlave, unsigned char theReg, unsigned char theValue);
diff --git a/target/m68k/patches/cris.patch b/target/m68k/patches/cris.patch
deleted file mode 100644
index 0fefa318c..000000000
--- a/target/m68k/patches/cris.patch
+++ /dev/null
@@ -1,5713 +0,0 @@
-diff -Nur linux-2.6.36.orig/arch/cris/Kconfig linux-2.6.36/arch/cris/Kconfig
---- linux-2.6.36.orig/arch/cris/Kconfig	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/arch/cris/Kconfig	2010-11-15 17:57:17.000000000 +0100
-@@ -177,6 +177,12 @@
- 	help
- 	  Size of DRAM (decimal in MB) typically 2, 8 or 16.
- 
-+config ETRAX_MTD_SIZE
-+	hex "MTD size (hex)"
-+	default "0x00800000"
-+	help
-+	  Size of MTD device typically 4 or 8 MB.
-+
- config ETRAX_VMEM_SIZE
-        int "Video memory size (dec, in MB)"
-        depends on ETRAX_ARCH_V32 && !ETRAXFS
-@@ -282,7 +288,7 @@
- 	select MTD_CFI_AMDSTD
- 	select MTD_JEDECPROBE if ETRAX_ARCH_V32
- 	select MTD_CHAR
--	select MTD_BLOCK
-+	select MTD_BLOCK_RO
- 	select MTD_PARTITIONS
- 	select MTD_CONCAT
- 	select MTD_COMPLEX_MAPPINGS
-@@ -671,6 +677,11 @@
- 
- source "drivers/ide/Kconfig"
- 
-+#mysteriously part of this standard linux driver was removed from cris build! - info@crisos.org  
-+source "drivers/scsi/Kconfig"
-+
-+source "drivers/media/Kconfig"
-+
- source "drivers/net/Kconfig"
- 
- source "drivers/i2c/Kconfig"
-diff -Nur linux-2.6.36.orig/arch/cris/Makefile linux-2.6.36/arch/cris/Makefile
---- linux-2.6.36.orig/arch/cris/Makefile	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/arch/cris/Makefile	2010-11-15 17:57:17.000000000 +0100
-@@ -40,10 +40,10 @@
- 
- LD = $(CROSS_COMPILE)ld -mcrislinux
- 
--OBJCOPYFLAGS := -O binary -R .note -R .comment -S
-+OBJCOPYFLAGS := -O binary -R .bss -R .note -R .note.gnu.build-id -R .comment -S
- 
- KBUILD_AFLAGS += -mlinux -march=$(arch-y) $(inc)
--KBUILD_CFLAGS += -mlinux -march=$(arch-y) -pipe $(inc)
-+KBUILD_CFLAGS += -mlinux -march=$(arch-y) -pipe -fno-peephole2 $(inc)
- KBUILD_CPPFLAGS += $(inc)
- 
- ifdef CONFIG_FRAME_POINTER
-diff -Nur linux-2.6.36.orig/arch/cris/arch-v10/drivers/axisflashmap.c linux-2.6.36/arch/cris/arch-v10/drivers/axisflashmap.c
---- linux-2.6.36.orig/arch/cris/arch-v10/drivers/axisflashmap.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/arch/cris/arch-v10/drivers/axisflashmap.c	2010-11-15 17:57:17.000000000 +0100
-@@ -113,7 +113,7 @@
- 
- /* If no partition-table was found, we use this default-set. */
- #define MAX_PARTITIONS         7
--#define NUM_DEFAULT_PARTITIONS 3
-+#define NUM_DEFAULT_PARTITIONS 4
- 
- /*
-  * Default flash size is 2MB. CONFIG_ETRAX_PTABLE_SECTOR is most likely the
-@@ -122,19 +122,24 @@
-  */
- static struct mtd_partition axis_default_partitions[NUM_DEFAULT_PARTITIONS] = {
- 	{
--		.name = "boot firmware",
--		.size = CONFIG_ETRAX_PTABLE_SECTOR,
-+		.name = "kernel",
-+		.size = 0x00,
- 		.offset = 0
- 	},
- 	{
--		.name = "kernel",
--		.size = 0x200000 - (6 * CONFIG_ETRAX_PTABLE_SECTOR),
--		.offset = CONFIG_ETRAX_PTABLE_SECTOR
-+		.name = "rootfs",
-+		.size = 0x200000 ,
-+		.offset = 0x200000
- 	},
- 	{
--		.name = "filesystem",
--		.size = 5 * CONFIG_ETRAX_PTABLE_SECTOR,
--		.offset = 0x200000 - (5 * CONFIG_ETRAX_PTABLE_SECTOR)
-+		.name = "cfgfs",
-+		.size = 0x20000 ,
-+		.offset = CONFIG_ETRAX_MTD_SIZE - 0x20000
-+	},
-+	{
-+		.name = "linux",
-+		.size = CONFIG_ETRAX_MTD_SIZE - 0x20000,
-+		.offset = 0
- 	}
- };
- 
-@@ -281,6 +286,11 @@
- 	struct partitiontable_entry *ptable;
- 	int use_default_ptable = 1; /* Until proven otherwise. */
- 	const char pmsg[] = "  /dev/flash%d at 0x%08x, size 0x%08x\n";
-+	unsigned int kernel_part_size = 0;
-+	unsigned char *flash_mem = (unsigned char*)(FLASH_CACHED_ADDR);
-+	unsigned int flash_scan_count = 0;
-+	const char *part_magic = "ACME_PART_MAGIC";
-+	unsigned int magic_len = strlen(part_magic);
- 
- 	if (!(mymtd = flash_probe())) {
- 		/* There's no reason to use this module if no flash chip can
-@@ -292,6 +302,31 @@
- 		       mymtd->name, mymtd->size);
- 		axisflash_mtd = mymtd;
- 	}
-+	/* scan flash to findout where out partition starts */
-+
-+	printk(KERN_INFO "Scanning flash for end of kernel magic\n");
-+	for(flash_scan_count = 0; flash_scan_count < 100000; flash_scan_count++){
-+		if(strncmp(&flash_mem[flash_scan_count], part_magic, magic_len - 1) == 0)
-+		{
-+			kernel_part_size = flash_mem[flash_scan_count + magic_len ];
-+			kernel_part_size <<= 8;
-+			kernel_part_size += flash_mem[flash_scan_count + magic_len + 2];
-+			kernel_part_size <<= 8;
-+			kernel_part_size += flash_mem[flash_scan_count + magic_len + 1];
-+			kernel_part_size <<= 8;
-+			kernel_part_size += flash_mem[flash_scan_count + magic_len + 3];
-+			printk(KERN_INFO "Kernel ends at 0x%.08X\n", kernel_part_size);
-+			flash_scan_count = 1100000;
-+		}
-+	}
-+
-+
-+	if(kernel_part_size){
-+		kernel_part_size = (kernel_part_size & 0xffff0000);
-+		axis_default_partitions[0].size = kernel_part_size;
-+		axis_default_partitions[1].size =  mymtd->size - axis_default_partitions[0].size - axis_default_partitions[2].size;
-+		axis_default_partitions[1].offset = axis_default_partitions[0].size;
-+	}
- 
- 	if (mymtd) {
- 		mymtd->owner = THIS_MODULE;
-@@ -360,21 +395,6 @@
- 		use_default_ptable = !ptable_ok;
- 	}
- 
--	if (romfs_in_flash) {
--		/* Add an overlapping device for the root partition (romfs). */
--
--		axis_partitions[pidx].name = "romfs";
--		axis_partitions[pidx].size = romfs_length;
--		axis_partitions[pidx].offset = romfs_start - FLASH_CACHED_ADDR;
--		axis_partitions[pidx].mask_flags |= MTD_WRITEABLE;
--
--		printk(KERN_INFO
--                       " Adding readonly flash partition for romfs image:\n");
--		printk(pmsg, pidx, axis_partitions[pidx].offset,
--		       axis_partitions[pidx].size);
--		pidx++;
--	}
--
- #ifdef CONFIG_ETRAX_AXISFLASHMAP_MTD0WHOLE
- 	if (mymtd) {
- 		main_partition.size = mymtd->size;
-@@ -397,36 +417,6 @@
- 		if (err)
- 			panic("axisflashmap could not add MTD partitions!\n");
- 	}
--
--	if (!romfs_in_flash) {
--		/* Create an RAM device for the root partition (romfs). */
--
--#if !defined(CONFIG_MTD_MTDRAM) || (CONFIG_MTDRAM_TOTAL_SIZE != 0) || (CONFIG_MTDRAM_ABS_POS != 0)
--		/* No use trying to boot this kernel from RAM. Panic! */
--		printk(KERN_EMERG "axisflashmap: Cannot create an MTD RAM "
--		       "device due to kernel (mis)configuration!\n");
--		panic("This kernel cannot boot from RAM!\n");
--#else
--		struct mtd_info *mtd_ram;
--
--		mtd_ram = kmalloc(sizeof(struct mtd_info), GFP_KERNEL);
--		if (!mtd_ram)
--			panic("axisflashmap couldn't allocate memory for "
--			      "mtd_info!\n");
--
--		printk(KERN_INFO " Adding RAM partition for romfs image:\n");
--		printk(pmsg, pidx, (unsigned)romfs_start,
--			(unsigned)romfs_length);
--
--		err = mtdram_init_device(mtd_ram,
--			(void *)romfs_start,
--			romfs_length,
--			"romfs");
--		if (err)
--			panic("axisflashmap could not initialize MTD RAM "
--			      "device!\n");
--#endif
--	}
- 	return err;
- }
- 
-diff -Nur linux-2.6.36.orig/arch/cris/arch-v10/drivers/ds1302.c linux-2.6.36/arch/cris/arch-v10/drivers/ds1302.c
---- linux-2.6.36.orig/arch/cris/arch-v10/drivers/ds1302.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/arch/cris/arch-v10/drivers/ds1302.c	2010-11-15 17:57:17.000000000 +0100
-@@ -22,6 +22,7 @@
- #include <linux/smp_lock.h>
- #include <linux/bcd.h>
- #include <linux/capability.h>
-+#include <linux/device.h>
- 
- #include <asm/uaccess.h>
- #include <asm/system.h>
-@@ -499,6 +500,10 @@
- 	return 0;
- }
- 
-+#ifdef CONFIG_SYSFS
-+static struct class *rtc_class;
-+#endif
-+
- static int __init ds1302_register(void)
- {
- 	ds1302_init();
-@@ -507,6 +512,12 @@
- 		       ds1302_name, RTC_MAJOR_NR);
- 		return -1;
- 	}
-+	#ifdef CONFIG_SYSFS
-+	rtc_class = class_create(THIS_MODULE, "rtc");
-+	class_device_create(rtc_class, NULL, MKDEV(RTC_MAJOR_NR, 0),
-+		NULL, "rtc");
-+	#endif
-+
-         return 0;
- 
- }
-diff -Nur linux-2.6.36.orig/arch/cris/arch-v10/drivers/gpio.c linux-2.6.36/arch/cris/arch-v10/drivers/gpio.c
---- linux-2.6.36.orig/arch/cris/arch-v10/drivers/gpio.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/arch/cris/arch-v10/drivers/gpio.c	2010-11-15 17:57:17.000000000 +0100
-@@ -20,6 +20,7 @@
- #include <linux/poll.h>
- #include <linux/init.h>
- #include <linux/interrupt.h>
-+#include <linux/device.h>
- 
- #include <asm/etraxgpio.h>
- #include <arch/svinto.h>
-@@ -797,6 +798,10 @@
- 
- /* main driver initialization routine, called from mem.c */
- 
-+#ifdef CONFIG_SYSFS
-+static struct class *gpio_class;
-+#endif
-+
- static int __init gpio_init(void)
- {
- 	int res;
-@@ -810,6 +815,13 @@
- 		return res;
- 	}
- 
-+#ifdef CONFIG_SYSFS
-+	gpio_class = class_create(THIS_MODULE, "gpio");
-+	device_create(gpio_class, NULL, MKDEV(GPIO_MAJOR, 0), NULL, "gpioa");
-+	device_create(gpio_class, NULL, MKDEV(GPIO_MAJOR, 1), NULL, "gpiob");
-+	device_create(gpio_class, NULL, MKDEV(GPIO_MAJOR, 2), NULL, "leds");
-+	device_create(gpio_class, NULL, MKDEV(GPIO_MAJOR, 3), NULL, "gpiog");
-+#endif
- 	/* Clear all leds */
- #if defined (CONFIG_ETRAX_CSP0_LEDS) ||  defined (CONFIG_ETRAX_PA_LEDS) || defined (CONFIG_ETRAX_PB_LEDS)
- 	CRIS_LED_NETWORK_SET(0);
-diff -Nur linux-2.6.36.orig/arch/cris/arch-v10/lib/hw_settings.S linux-2.6.36/arch/cris/arch-v10/lib/hw_settings.S
---- linux-2.6.36.orig/arch/cris/arch-v10/lib/hw_settings.S	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/arch/cris/arch-v10/lib/hw_settings.S	2010-11-15 17:57:17.000000000 +0100
-@@ -58,3 +58,5 @@
- 	.dword R_PORT_PB_SET
- 	.dword PB_SET_VALUE
- 	.dword 0 ; No more register values
-+	.ascii "ACME_PART_MAGIC" 
-+	.dword 0xdeadc0de
-diff -Nur linux-2.6.36.orig/arch/cris/arch-v10/mm/init.c linux-2.6.36/arch/cris/arch-v10/mm/init.c
---- linux-2.6.36.orig/arch/cris/arch-v10/mm/init.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/arch/cris/arch-v10/mm/init.c	2010-11-15 17:57:17.000000000 +0100
-@@ -184,6 +184,9 @@
- 
- 	free_area_init_node(0, zones_size, PAGE_OFFSET >> PAGE_SHIFT, 0);
- }
-+void free_initrd_mem(unsigned long start, unsigned long end)
-+{
-+}
- 
- /* Initialize remaps of some I/O-ports. It is important that this
-  * is called before any driver is initialized.
-diff -Nur linux-2.6.36.orig/arch/cris/boot/Makefile linux-2.6.36/arch/cris/boot/Makefile
---- linux-2.6.36.orig/arch/cris/boot/Makefile	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/arch/cris/boot/Makefile	2010-11-15 17:57:17.000000000 +0100
-@@ -5,7 +5,7 @@
- objcopyflags-$(CONFIG_ETRAX_ARCH_V10) += -R .note -R .comment
- objcopyflags-$(CONFIG_ETRAX_ARCH_V32) += --remove-section=.bss --remove-section=.note.gnu.build-id
- 
--OBJCOPYFLAGS = -O binary $(objcopyflags-y)
-+#OBJCOPYFLAGS = -O binary $(objcopyflags-y)
- 
- 
- subdir- := compressed rescue
-@@ -17,7 +17,6 @@
- 
- $(obj)/compressed/vmlinux: $(obj)/Image FORCE
- 	$(Q)$(MAKE) $(build)=$(obj)/compressed $@
--	$(Q)$(MAKE) $(build)=$(obj)/rescue $(obj)/rescue/rescue.bin
- 
- $(obj)/zImage:  $(obj)/compressed/vmlinux
- 	@cp $< $@
-diff -Nur linux-2.6.36.orig/arch/cris/boot/compressed/Makefile linux-2.6.36/arch/cris/boot/compressed/Makefile
---- linux-2.6.36.orig/arch/cris/boot/compressed/Makefile	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/arch/cris/boot/compressed/Makefile	2010-11-15 17:57:17.000000000 +0100
-@@ -18,7 +18,7 @@
- OBJECTS-$(CONFIG_ETRAX_ARCH_V32) = $(obj)/head_v32.o
- OBJECTS-$(CONFIG_ETRAX_ARCH_V10) = $(obj)/head_v10.o
- OBJECTS= $(OBJECTS-y) $(obj)/misc.o
--OBJCOPYFLAGS = -O binary --remove-section=.bss
-+#OBJCOPYFLAGS = -O binary --remove-section=.bss
- 
- quiet_cmd_image = BUILD   $@
- cmd_image = cat $(obj)/decompress.bin $(obj)/piggy.gz > $@
-diff -Nur linux-2.6.36.orig/drivers/net/cris/eth_v10.c linux-2.6.36/drivers/net/cris/eth_v10.c
---- linux-2.6.36.orig/drivers/net/cris/eth_v10.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/drivers/net/cris/eth_v10.c	2010-11-15 17:57:17.000000000 +0100
-@@ -1718,7 +1718,7 @@
- static void
- e100_netpoll(struct net_device* netdev)
- {
--	e100rxtx_interrupt(NETWORK_DMA_TX_IRQ_NBR, netdev, NULL);
-+	e100rxtx_interrupt(NETWORK_DMA_TX_IRQ_NBR, netdev);
- }
- #endif
- 
-diff -Nur linux-2.6.36.orig/drivers/serial/crisv10.c linux-2.6.36/drivers/serial/crisv10.c
---- linux-2.6.36.orig/drivers/serial/crisv10.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/drivers/serial/crisv10.c	2010-11-15 17:57:17.000000000 +0100
-@@ -13,6 +13,7 @@
- #include <linux/errno.h>
- #include <linux/signal.h>
- #include <linux/sched.h>
-+#include <linux/smp_lock.h> 
- #include <linux/timer.h>
- #include <linux/interrupt.h>
- #include <linux/tty.h>
-@@ -27,6 +28,7 @@
- #include <linux/kernel.h>
- #include <linux/mutex.h>
- #include <linux/bitops.h>
-+#include <linux/device.h>
- #include <linux/seq_file.h>
- #include <linux/delay.h>
- #include <linux/module.h>
-@@ -4426,6 +4428,7 @@
- #endif
- };
- 
-+static struct class *rs_class;
- static int __init rs_init(void)
- {
- 	int i;
-@@ -4559,6 +4562,24 @@
- #endif
- #endif /* CONFIG_SVINTO_SIM */
- 
-+	rs_class = class_create(THIS_MODULE, "rs_tty");
-+#ifdef CONFIG_ETRAX_SERIAL_PORT0 
-+	device_create(rs_class, NULL,
-+		MKDEV(TTY_MAJOR, 64), NULL, "ttyS0");
-+#endif
-+#ifdef CONFIG_ETRAX_SERIAL_PORT1 
-+	device_create(rs_class, NULL,
-+		MKDEV(TTY_MAJOR, 65), NULL, "ttyS1");
-+#endif
-+#ifdef CONFIG_ETRAX_SERIAL_PORT2 
-+	device_create(rs_class, NULL,
-+		MKDEV(TTY_MAJOR, 66), NULL, "ttyS2");
-+#endif
-+#ifdef CONFIG_ETRAX_SERIAL_PORT3 
-+	device_create(rs_class, NULL,
-+		MKDEV(TTY_MAJOR, 67), NULL, "ttyS3");
-+#endif
-+
- 	return 0;
- }
- 
-diff -Nur linux-2.6.36.orig/drivers/usb/Makefile linux-2.6.36/drivers/usb/Makefile
---- linux-2.6.36.orig/drivers/usb/Makefile	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/drivers/usb/Makefile	2010-11-15 17:57:18.000000000 +0100
-@@ -21,6 +21,7 @@
- obj-$(CONFIG_USB_R8A66597_HCD)	+= host/
- obj-$(CONFIG_USB_HWA_HCD)	+= host/
- obj-$(CONFIG_USB_ISP1760_HCD)	+= host/
-+obj-$(CONFIG_ETRAX_USB_HOST)	+= host/
- obj-$(CONFIG_USB_IMX21_HCD)	+= host/
- 
- obj-$(CONFIG_USB_C67X00_HCD)	+= c67x00/
-diff -Nur linux-2.6.36.orig/drivers/usb/host/Makefile linux-2.6.36/drivers/usb/host/Makefile
---- linux-2.6.36.orig/drivers/usb/host/Makefile	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/drivers/usb/host/Makefile	2010-11-15 17:57:18.000000000 +0100
-@@ -32,5 +32,6 @@
- obj-$(CONFIG_USB_R8A66597_HCD)	+= r8a66597-hcd.o
- obj-$(CONFIG_USB_ISP1760_HCD)	+= isp1760.o
- obj-$(CONFIG_USB_HWA_HCD)	+= hwa-hc.o
-+obj-$(CONFIG_ETRAX_USB_HOST)	+= hc-crisv10.o
- obj-$(CONFIG_USB_IMX21_HCD)	+= imx21-hcd.o
- 
-diff -Nur linux-2.6.36.orig/drivers/usb/host/hc-cris-dbg.h linux-2.6.36/drivers/usb/host/hc-cris-dbg.h
---- linux-2.6.36.orig/drivers/usb/host/hc-cris-dbg.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36/drivers/usb/host/hc-cris-dbg.h	2010-11-15 17:57:17.000000000 +0100
-@@ -0,0 +1,146 @@
-+
-+/* macros for debug output */
-+
-+#define warn(fmt, args...) \
-+        printk(KERN_INFO "crisv10 warn: ");printk(fmt, ## args)
-+
-+#define hcd_dbg(hcd, fmt, args...) \
-+	dev_info(hcd->self.controller, fmt, ## args)
-+#define hcd_err(hcd, fmt, args...) \
-+	dev_err(hcd->self.controller, fmt, ## args)
-+#define hcd_info(hcd, fmt, args...) \
-+	dev_info(hcd->self.controller, fmt, ## args)
-+#define hcd_warn(hcd, fmt, args...) \
-+	dev_warn(hcd->self.controller, fmt, ## args)
-+
-+/*
-+#define devdrv_dbg(fmt, args...) \
-+        printk(KERN_INFO "usb_devdrv dbg: ");printk(fmt, ## args)
-+*/
-+#define devdrv_dbg(fmt, args...) {}
-+
-+#define devdrv_err(fmt, args...) \
-+        printk(KERN_ERR "usb_devdrv error: ");printk(fmt, ## args)
-+#define devdrv_info(fmt, args...) \
-+        printk(KERN_INFO "usb_devdrv: ");printk(fmt, ## args)
-+
-+#define irq_dbg(fmt, args...) \
-+        printk(KERN_INFO "crisv10_irq dbg: ");printk(fmt, ## args)
-+#define irq_err(fmt, args...) \
-+        printk(KERN_ERR "crisv10_irq error: ");printk(fmt, ## args)
-+#define irq_warn(fmt, args...) \
-+        printk(KERN_INFO "crisv10_irq warn: ");printk(fmt, ## args)
-+#define irq_info(fmt, args...) \
-+        printk(KERN_INFO "crisv10_hcd: ");printk(fmt, ## args)
-+
-+/*
-+#define rh_dbg(fmt, args...) \
-+  printk(KERN_DEBUG "crisv10_rh dbg: ");printk(fmt, ## args)
-+*/
-+#define rh_dbg(fmt, args...) {}
-+
-+#define rh_err(fmt, args...) \
-+        printk(KERN_ERR "crisv10_rh error: ");printk(fmt, ## args)
-+#define rh_warn(fmt, args...) \
-+        printk(KERN_INFO "crisv10_rh warning: ");printk(fmt, ## args)
-+#define rh_info(fmt, args...) \
-+        printk(KERN_INFO "crisv10_rh: ");printk(fmt, ## args)
-+
-+/*
-+#define tc_dbg(fmt, args...) \
-+        printk(KERN_INFO "crisv10_tc dbg: ");printk(fmt, ## args)
-+*/
-+#define tc_dbg(fmt, args...) {while(0){}}
-+
-+#define tc_err(fmt, args...) \
-+        printk(KERN_ERR "crisv10_tc error: ");printk(fmt, ## args)
-+/*
-+#define tc_warn(fmt, args...) \
-+        printk(KERN_INFO "crisv10_tc warning: ");printk(fmt, ## args)
-+*/
-+#define tc_warn(fmt, args...) {while(0){}}
-+
-+#define tc_info(fmt, args...) \
-+        printk(KERN_INFO "crisv10_tc: ");printk(fmt, ## args)
-+
-+
-+/* Debug print-outs for various traffic types */
-+
-+#define intr_warn(fmt, args...) \
-+        printk(KERN_INFO "crisv10_intr warning: ");printk(fmt, ## args)
-+
-+#define intr_dbg(fmt, args...) \
-+        printk(KERN_DEBUG "crisv10_intr dbg: ");printk(fmt, ## args)
-+/*
-+#define intr_dbg(fmt, args...) {while(0){}}
-+*/
-+
-+
-+#define isoc_err(fmt, args...) \
-+        printk(KERN_ERR "crisv10_isoc error: ");printk(fmt, ## args)
-+/*
-+#define isoc_warn(fmt, args...) \
-+        printk(KERN_INFO "crisv10_isoc warning: ");printk(fmt, ## args)
-+*/
-+#define isoc_warn(fmt, args...) {while(0){}}
-+
-+/*
-+#define isoc_dbg(fmt, args...) \
-+        printk(KERN_INFO "crisv10_isoc dbg: ");printk(fmt, ## args)
-+*/
-+#define isoc_dbg(fmt, args...) {while(0){}}
-+
-+/*
-+#define timer_warn(fmt, args...) \
-+        printk(KERN_INFO "crisv10_timer warning: ");printk(fmt, ## args)
-+*/
-+#define timer_warn(fmt, args...) {while(0){}}
-+
-+/*
-+#define timer_dbg(fmt, args...) \
-+        printk(KERN_INFO "crisv10_timer dbg: ");printk(fmt, ## args)
-+*/
-+#define timer_dbg(fmt, args...) {while(0){}}
-+
-+
-+/* Debug printouts for events related to late finishing of URBs */
-+
-+#define late_dbg(fmt, args...) \
-+        printk(KERN_INFO "crisv10_late dbg: ");printk(fmt, ## args)
-+/*
-+#define late_dbg(fmt, args...) {while(0){}}
-+*/
-+
-+#define late_warn(fmt, args...) \
-+        printk(KERN_INFO "crisv10_late warning: ");printk(fmt, ## args)
-+/*
-+#define errno_dbg(fmt, args...) \
-+        printk(KERN_INFO "crisv10_errno dbg: ");printk(fmt, ## args)
-+*/
-+#define errno_dbg(fmt, args...) {while(0){}}
-+
-+
-+#define dma_dbg(fmt, args...) \
-+        printk(KERN_INFO "crisv10_dma dbg: ");printk(fmt, ## args)
-+#define dma_err(fmt, args...) \
-+        printk(KERN_ERR "crisv10_dma error: ");printk(fmt, ## args)
-+#define dma_warn(fmt, args...) \
-+        printk(KERN_INFO "crisv10_dma warning: ");printk(fmt, ## args)
-+#define dma_info(fmt, args...) \
-+        printk(KERN_INFO "crisv10_dma: ");printk(fmt, ## args)
-+
-+
-+
-+#define str_dir(pipe) \
-+	(usb_pipeout(pipe) ? "out" : "in")
-+#define str_type(pipe) \
-+	({								\
-+		char *s = "?";						\
-+		switch (usb_pipetype(pipe)) {				\
-+		case PIPE_ISOCHRONOUS:	s = "iso";  break;		\
-+		case PIPE_INTERRUPT:	s = "intr"; break;		\
-+		case PIPE_CONTROL:	s = "ctrl"; break;		\
-+		case PIPE_BULK:		s = "bulk"; break;		\
-+		};							\
-+		s;							\
-+	})
-diff -Nur linux-2.6.36.orig/drivers/usb/host/hc-crisv10.c linux-2.6.36/drivers/usb/host/hc-crisv10.c
---- linux-2.6.36.orig/drivers/usb/host/hc-crisv10.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36/drivers/usb/host/hc-crisv10.c	2010-11-15 17:57:18.000000000 +0100
-@@ -0,0 +1,4801 @@
-+/*
-+ *
-+ * ETRAX 100LX USB Host Controller Driver
-+ *
-+ * Copyright (C) 2005, 2006  Axis Communications AB
-+ *
-+ * Author: Konrad Eriksson <konrad.eriksson@axis.se>
-+ *
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/moduleparam.h>
-+#include <linux/slab.h>
-+#include <linux/spinlock.h>
-+#include <linux/usb.h>
-+#include <linux/platform_device.h>
-+#include <linux/usb/hcd.h>
-+
-+#include <asm/io.h>
-+#include <asm/irq.h>
-+#include <arch/dma.h>
-+#include <arch/io_interface_mux.h>
-+
-+#include "hc-crisv10.h"
-+#include "hc-cris-dbg.h"
-+
-+
-+/***************************************************************************/
-+/***************************************************************************/
-+/* Host Controller settings                                                */
-+/***************************************************************************/
-+/***************************************************************************/
-+
-+#define VERSION			"1.00 hinko.4"
-+#define COPYRIGHT		"(c) 2005, 2006 Axis Communications AB"
-+#define DESCRIPTION     "ETRAX 100LX USB Host Controller"
-+
-+#define ETRAX_USB_HC_IRQ USB_HC_IRQ_NBR
-+#define ETRAX_USB_RX_IRQ USB_DMA_RX_IRQ_NBR
-+#define ETRAX_USB_TX_IRQ USB_DMA_TX_IRQ_NBR
-+
-+/* Number of physical ports in Etrax 100LX */
-+#define USB_ROOT_HUB_PORTS 2
-+
-+const char hc_name[] = "hc-crisv10";
-+const char product_desc[] = DESCRIPTION;
-+
-+/* The number of epids is, among other things, used for pre-allocating
-+   ctrl, bulk and isoc EP descriptors (one for each epid).
-+   Assumed to be > 1 when initiating the DMA lists. */
-+#define NBR_OF_EPIDS       32
-+
-+/* Support interrupt traffic intervals up to 128 ms. */
-+#define MAX_INTR_INTERVAL  128
-+
-+/* If periodic traffic (intr or isoc) is to be used, then one entry in the EP
-+   table must be "invalid". By this we mean that we shouldn't care about epid
-+   attentions for this epid, or at least handle them differently from epid
-+   attentions for "valid" epids. This define determines which one to use
-+   (don't change it). */
-+#define INVALID_EPID       31
-+/* A special epid for the bulk dummys. */
-+#define DUMMY_EPID         30
-+
-+/* Module settings */
-+
-+MODULE_DESCRIPTION(DESCRIPTION);
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Konrad Eriksson <konrad.eriksson@axis.se>");
-+
-+
-+/* Module parameters */
-+
-+/* 0 = No ports enabled
-+   1 = Only port 1 enabled (on board ethernet on devboard)
-+   2 = Only port 2 enabled (external connector on devboard)
-+   3 = Both ports enabled
-+*/
-+static unsigned int ports = 3;
-+module_param(ports, uint, S_IRUGO);
-+MODULE_PARM_DESC(ports, "Bitmask indicating USB ports to use");
-+
-+
-+/***************************************************************************/
-+/***************************************************************************/
-+/* Shared global variables for this module                                 */
-+/***************************************************************************/
-+/***************************************************************************/
-+
-+/* EP descriptor lists for non period transfers. Must be 32-bit aligned. */
-+static volatile struct USB_EP_Desc TxBulkEPList[NBR_OF_EPIDS] __attribute__ ((aligned (4)));
-+
-+static volatile struct USB_EP_Desc TxCtrlEPList[NBR_OF_EPIDS] __attribute__ ((aligned (4)));
-+
-+/* EP descriptor lists for period transfers. Must be 32-bit aligned. */
-+static volatile struct USB_EP_Desc TxIntrEPList[MAX_INTR_INTERVAL] __attribute__ ((aligned (4)));
-+static volatile struct USB_SB_Desc TxIntrSB_zout __attribute__ ((aligned (4)));
-+
-+static volatile struct USB_EP_Desc TxIsocEPList[NBR_OF_EPIDS] __attribute__ ((aligned (4)));
-+static volatile struct USB_SB_Desc TxIsocSB_zout __attribute__ ((aligned (4)));
-+
-+//static volatile struct USB_SB_Desc TxIsocSBList[NBR_OF_EPIDS] __attribute__ ((aligned (4))); 
-+
-+/* After each enabled bulk EP IN we put two disabled EP descriptors with the eol flag set,
-+   causing the DMA to stop the DMA channel. The first of these two has the intr flag set, which
-+   gives us a dma8_sub0_descr interrupt. When we receive this, we advance the DMA one step in the
-+   EP list and then restart the bulk channel, thus forcing a switch between bulk EP descriptors
-+   in each frame. */
-+static volatile struct USB_EP_Desc TxBulkDummyEPList[NBR_OF_EPIDS][2] __attribute__ ((aligned (4)));
-+
-+/* List of URB pointers, where each points to the active URB for a epid.
-+   For Bulk, Ctrl and Intr this means which URB that currently is added to
-+   DMA lists (Isoc URBs are all directly added to DMA lists). As soon as
-+   URB has completed is the queue examined and the first URB in queue is
-+   removed and moved to the activeUrbList while its state change to STARTED and
-+   its transfer(s) gets added to DMA list (exception Isoc where URBs enter
-+   state STARTED directly and added transfers added to DMA lists). */
-+static struct urb *activeUrbList[NBR_OF_EPIDS];
-+
-+/* Additional software state info for each epid */
-+static struct etrax_epid epid_state[NBR_OF_EPIDS];
-+
-+/* Timer handles for bulk traffic timer used to avoid DMA bug where DMA stops
-+   even if there is new data waiting to be processed */
-+static struct timer_list bulk_start_timer = TIMER_INITIALIZER(NULL, 0, 0);
-+static struct timer_list bulk_eot_timer = TIMER_INITIALIZER(NULL, 0, 0);
-+
-+/* We want the start timer to expire before the eot timer, because the former
-+   might start traffic, thus making it unnecessary for the latter to time
-+   out. */
-+#define BULK_START_TIMER_INTERVAL (HZ/50) /* 20 ms */
-+#define BULK_EOT_TIMER_INTERVAL (HZ/16) /* 60 ms */
-+
-+/* Delay before a URB completion happen when it's scheduled to be delayed */
-+#define LATER_TIMER_DELAY (HZ/50) /* 20 ms */
-+
-+/* Simplifying macros for checking software state info of a epid */
-+/* ----------------------------------------------------------------------- */
-+#define epid_inuse(epid)       epid_state[epid].inuse
-+#define epid_out_traffic(epid) epid_state[epid].out_traffic
-+#define epid_isoc(epid)   (epid_state[epid].type == PIPE_ISOCHRONOUS ? 1 : 0)
-+#define epid_intr(epid)   (epid_state[epid].type == PIPE_INTERRUPT ? 1 : 0)
-+
-+
-+/***************************************************************************/
-+/***************************************************************************/
-+/* DEBUG FUNCTIONS                                                         */
-+/***************************************************************************/
-+/***************************************************************************/
-+/* Note that these functions are always available in their "__" variants,
-+   for use in error situations. The "__" missing variants are controlled by
-+   the USB_DEBUG_DESC/USB_DEBUG_URB macros. */
-+static void __dump_urb(struct urb* purb)
-+{
-+  struct crisv10_urb_priv *urb_priv = purb->hcpriv;
-+  int urb_num = -1;
-+  if(urb_priv) {
-+    urb_num = urb_priv->urb_num;
-+  }
-+  printk("\nURB:0x%x[%d]\n", (unsigned int)purb, urb_num);
-+  printk("dev                   :0x%08lx\n", (unsigned long)purb->dev);
-+  printk("pipe                  :0x%08x\n", purb->pipe);
-+  printk("status                :%d\n", purb->status);
-+  printk("transfer_flags        :0x%08x\n", purb->transfer_flags);
-+  printk("transfer_buffer       :0x%08lx\n", (unsigned long)purb->transfer_buffer);
-+  printk("transfer_buffer_length:%d\n", purb->transfer_buffer_length);
-+  printk("actual_length         :%d\n", purb->actual_length);
-+  printk("setup_packet          :0x%08lx\n", (unsigned long)purb->setup_packet);
-+  printk("start_frame           :%d\n", purb->start_frame);
-+  printk("number_of_packets     :%d\n", purb->number_of_packets);
-+  printk("interval              :%d\n", purb->interval);
-+  printk("error_count           :%d\n", purb->error_count);
-+  printk("context               :0x%08lx\n", (unsigned long)purb->context);
-+  printk("complete              :0x%08lx\n\n", (unsigned long)purb->complete);
-+}
-+
-+static void __dump_in_desc(volatile struct USB_IN_Desc *in)
-+{
-+  printk("\nUSB_IN_Desc at 0x%08lx\n", (unsigned long)in);
-+  printk("  sw_len  : 0x%04x (%d)\n", in->sw_len, in->sw_len);
-+  printk("  command : 0x%04x\n", in->command);
-+  printk("  next    : 0x%08lx\n", in->next);
-+  printk("  buf     : 0x%08lx\n", in->buf);
-+  printk("  hw_len  : 0x%04x (%d)\n", in->hw_len, in->hw_len);
-+  printk("  status  : 0x%04x\n\n", in->status);
-+}
-+
-+static void __dump_sb_desc(volatile struct USB_SB_Desc *sb)
-+{
-+  char tt = (sb->command & 0x30) >> 4;
-+  char *tt_string;
-+
-+  switch (tt) {
-+  case 0:
-+    tt_string = "zout";
-+    break;
-+  case 1:
-+    tt_string = "in";
-+    break;
-+  case 2:
-+    tt_string = "out";
-+    break;
-+  case 3:
-+    tt_string = "setup";
-+    break;
-+  default:
-+    tt_string = "unknown (weird)";
-+  }
-+
-+  printk(" USB_SB_Desc at 0x%08lx ", (unsigned long)sb);
-+  printk(" command:0x%04x (", sb->command);
-+  printk("rem:%d ", (sb->command & 0x3f00) >> 8);
-+  printk("full:%d ", (sb->command & 0x40) >> 6);
-+  printk("tt:%d(%s) ", tt, tt_string);
-+  printk("intr:%d ", (sb->command & 0x8) >> 3);
-+  printk("eot:%d ", (sb->command & 0x2) >> 1);
-+  printk("eol:%d)", sb->command & 0x1);
-+  printk(" sw_len:0x%04x(%d)", sb->sw_len, sb->sw_len);
-+  printk(" next:0x%08lx", sb->next);
-+  printk(" buf:0x%08lx\n", sb->buf);
-+}
-+
-+
-+static void __dump_ep_desc(volatile struct USB_EP_Desc *ep)
-+{
-+  printk("USB_EP_Desc at 0x%08lx ", (unsigned long)ep);
-+  printk(" command:0x%04x (", ep->command);
-+  printk("ep_id:%d ", (ep->command & 0x1f00) >> 8);
-+  printk("enable:%d ", (ep->command & 0x10) >> 4);
-+  printk("intr:%d ", (ep->command & 0x8) >> 3);
-+  printk("eof:%d ", (ep->command & 0x2) >> 1);
-+  printk("eol:%d)", ep->command & 0x1);
-+  printk(" hw_len:0x%04x(%d)", ep->hw_len, ep->hw_len);
-+  printk(" next:0x%08lx", ep->next);
-+  printk(" sub:0x%08lx\n", ep->sub);
-+}
-+
-+static inline void __dump_ep_list(int pipe_type)
-+{
-+  volatile struct USB_EP_Desc *ep;
-+  volatile struct USB_EP_Desc *first_ep;
-+  volatile struct USB_SB_Desc *sb;
-+
-+  switch (pipe_type)
-+    {
-+    case PIPE_BULK:
-+      first_ep = &TxBulkEPList[0];
-+      break;
-+    case PIPE_CONTROL:
-+      first_ep = &TxCtrlEPList[0];
-+      break;
-+    case PIPE_INTERRUPT:
-+      first_ep = &TxIntrEPList[0];
-+      break;
-+    case PIPE_ISOCHRONOUS:
-+      first_ep = &TxIsocEPList[0];
-+      break;
-+    default:
-+      warn("Cannot dump unknown traffic type");
-+      return;
-+    }
-+  ep = first_ep;
-+
-+  printk("\n\nDumping EP list...\n\n");
-+
-+  do {
-+    __dump_ep_desc(ep);
-+    /* Cannot phys_to_virt on 0 as it turns into 80000000, which is != 0. */
-+    sb = ep->sub ? phys_to_virt(ep->sub) : 0;
-+    while (sb) {
-+      __dump_sb_desc(sb);
-+      sb = sb->next ? phys_to_virt(sb->next) : 0;
-+    }
-+    ep = (volatile struct USB_EP_Desc *)(phys_to_virt(ep->next));
-+
-+  } while (ep != first_ep);
-+}
-+
-+static inline void __dump_ept_data(int epid)
-+{
-+  unsigned long flags;
-+  __u32 r_usb_ept_data;
-+
-+  if (epid < 0 || epid > 31) {
-+    printk("Cannot dump ept data for invalid epid %d\n", epid);
-+    return;
-+  }
-+
-+  local_irq_save(flags);
-+  *R_USB_EPT_INDEX = IO_FIELD(R_USB_EPT_INDEX, value, epid);
-+  nop();
-+  r_usb_ept_data = *R_USB_EPT_DATA;
-+  local_irq_restore(flags);
-+
-+  printk(" R_USB_EPT_DATA = 0x%x for epid %d :\n", r_usb_ept_data, epid);
-+  if (r_usb_ept_data == 0) {
-+    /* No need for more detailed printing. */
-+    return;
-+  }
-+  printk("  valid           : %d\n", (r_usb_ept_data & 0x80000000) >> 31);
-+  printk("  hold            : %d\n", (r_usb_ept_data & 0x40000000) >> 30);
-+  printk("  error_count_in  : %d\n", (r_usb_ept_data & 0x30000000) >> 28);
-+  printk("  t_in            : %d\n", (r_usb_ept_data & 0x08000000) >> 27);
-+  printk("  low_speed       : %d\n", (r_usb_ept_data & 0x04000000) >> 26);
-+  printk("  port            : %d\n", (r_usb_ept_data & 0x03000000) >> 24);
-+  printk("  error_code      : %d\n", (r_usb_ept_data & 0x00c00000) >> 22);
-+  printk("  t_out           : %d\n", (r_usb_ept_data & 0x00200000) >> 21);
-+  printk("  error_count_out : %d\n", (r_usb_ept_data & 0x00180000) >> 19);
-+  printk("  max_len         : %d\n", (r_usb_ept_data & 0x0003f800) >> 11);
-+  printk("  ep              : %d\n", (r_usb_ept_data & 0x00000780) >> 7);
-+  printk("  dev             : %d\n", (r_usb_ept_data & 0x0000003f));
-+}
-+
-+static inline void __dump_ept_data_iso(int epid)
-+{
-+  unsigned long flags;
-+  __u32 ept_data;
-+
-+  if (epid < 0 || epid > 31) {
-+    printk("Cannot dump ept data for invalid epid %d\n", epid);
-+    return;
-+  }
-+
-+  local_irq_save(flags);
-+  *R_USB_EPT_INDEX = IO_FIELD(R_USB_EPT_INDEX, value, epid);
-+  nop();
-+  ept_data = *R_USB_EPT_DATA_ISO;
-+  local_irq_restore(flags);
-+
-+  printk(" R_USB_EPT_DATA = 0x%x for epid %d :\n", ept_data, epid);
-+  if (ept_data == 0) {
-+    /* No need for more detailed printing. */
-+    return;
-+  }
-+  printk("  valid           : %d\n", IO_EXTRACT(R_USB_EPT_DATA_ISO, valid,
-+						ept_data));
-+  printk("  port            : %d\n", IO_EXTRACT(R_USB_EPT_DATA_ISO, port,
-+						ept_data));
-+  printk("  error_code      : %d\n", IO_EXTRACT(R_USB_EPT_DATA_ISO, error_code,
-+						ept_data));
-+  printk("  max_len         : %d\n", IO_EXTRACT(R_USB_EPT_DATA_ISO, max_len,
-+						ept_data));
-+  printk("  ep              : %d\n", IO_EXTRACT(R_USB_EPT_DATA_ISO, ep,
-+						ept_data));
-+  printk("  dev             : %d\n", IO_EXTRACT(R_USB_EPT_DATA_ISO, dev,
-+						ept_data));
-+}
-+
-+static inline void __dump_ept_data_list(void)
-+{
-+  int i;
-+
-+  printk("Dumping the whole R_USB_EPT_DATA list\n");
-+
-+  for (i = 0; i < 32; i++) {
-+    __dump_ept_data(i);
-+  }
-+}
-+
-+static void debug_epid(int epid) {
-+  int i;
-+  
-+  if(epid_isoc(epid)) {
-+    __dump_ept_data_iso(epid);
-+  } else {
-+    __dump_ept_data(epid);
-+  }
-+
-+  printk("Bulk:\n");
-+  for(i = 0; i < 32; i++) {
-+    if(IO_EXTRACT(USB_EP_command, epid, TxBulkEPList[i].command) ==
-+       epid) {
-+      printk("%d: ", i); __dump_ep_desc(&(TxBulkEPList[i]));
-+    }
-+  }
-+
-+  printk("Ctrl:\n");
-+  for(i = 0; i < 32; i++) {
-+    if(IO_EXTRACT(USB_EP_command, epid, TxCtrlEPList[i].command) ==
-+       epid) {
-+      printk("%d: ", i); __dump_ep_desc(&(TxCtrlEPList[i]));
-+    }
-+  }
-+
-+  printk("Intr:\n");
-+  for(i = 0; i < MAX_INTR_INTERVAL; i++) {
-+    if(IO_EXTRACT(USB_EP_command, epid, TxIntrEPList[i].command) ==
-+       epid) {
-+      printk("%d: ", i); __dump_ep_desc(&(TxIntrEPList[i]));
-+    }
-+  }
-+  
-+  printk("Isoc:\n");
-+  for(i = 0; i < 32; i++) {
-+    if(IO_EXTRACT(USB_EP_command, epid, TxIsocEPList[i].command) ==
-+       epid) {
-+      printk("%d: ", i); __dump_ep_desc(&(TxIsocEPList[i]));
-+    }
-+  }
-+
-+  __dump_ept_data_list();
-+  __dump_ep_list(PIPE_INTERRUPT);
-+  printk("\n\n");
-+}
-+
-+
-+
-+char* hcd_status_to_str(__u8 bUsbStatus) {
-+  static char hcd_status_str[128];
-+  hcd_status_str[0] = '\0';
-+  if(bUsbStatus & IO_STATE(R_USB_STATUS, ourun, yes)) {
-+    strcat(hcd_status_str, "ourun ");
-+  }
-+  if(bUsbStatus & IO_STATE(R_USB_STATUS, perror, yes)) {
-+    strcat(hcd_status_str, "perror ");
-+  }
-+  if(bUsbStatus & IO_STATE(R_USB_STATUS, device_mode, yes)) {
-+    strcat(hcd_status_str, "device_mode ");
-+  }
-+  if(bUsbStatus & IO_STATE(R_USB_STATUS, host_mode, yes)) {
-+    strcat(hcd_status_str, "host_mode ");
-+  }
-+  if(bUsbStatus & IO_STATE(R_USB_STATUS, started, yes)) {
-+    strcat(hcd_status_str, "started ");
-+  }
-+  if(bUsbStatus & IO_STATE(R_USB_STATUS, running, yes)) {
-+    strcat(hcd_status_str, "running ");
-+  }
-+  return hcd_status_str;
-+}
-+
-+
-+char* sblist_to_str(struct USB_SB_Desc* sb_desc) {
-+  static char sblist_to_str_buff[128];
-+  char tmp[32], tmp2[32];
-+  sblist_to_str_buff[0] = '\0';
-+  while(sb_desc != NULL) {
-+    switch(IO_EXTRACT(USB_SB_command, tt, sb_desc->command)) {
-+    case 0: sprintf(tmp, "zout");  break;
-+    case 1: sprintf(tmp, "in");    break;
-+    case 2: sprintf(tmp, "out");   break;
-+    case 3: sprintf(tmp, "setup"); break;
-+    }
-+    sprintf(tmp2, "(%s %d)", tmp, sb_desc->sw_len);
-+    strcat(sblist_to_str_buff, tmp2);
-+    if(sb_desc->next != 0) {
-+      sb_desc = phys_to_virt(sb_desc->next);
-+    } else {
-+      sb_desc = NULL;
-+    }
-+  }
-+  return sblist_to_str_buff;
-+}
-+
-+char* port_status_to_str(__u16 wPortStatus) {
-+  static char port_status_str[128];
-+  port_status_str[0] = '\0';
-+  if(wPortStatus & IO_STATE(R_USB_RH_PORT_STATUS_1, connected, yes)) {
-+    strcat(port_status_str, "connected ");
-+  }
-+  if(wPortStatus & IO_STATE(R_USB_RH_PORT_STATUS_1, enabled, yes)) {
-+    strcat(port_status_str, "enabled ");
-+  }
-+  if(wPortStatus & IO_STATE(R_USB_RH_PORT_STATUS_1, suspended, yes)) {
-+    strcat(port_status_str, "suspended ");
-+  }
-+  if(wPortStatus & IO_STATE(R_USB_RH_PORT_STATUS_1, reset, yes)) {
-+    strcat(port_status_str, "reset ");
-+  }
-+  if(wPortStatus & IO_STATE(R_USB_RH_PORT_STATUS_1, speed, full)) {
-+    strcat(port_status_str, "full-speed ");
-+  } else {
-+    strcat(port_status_str, "low-speed ");
-+  }
-+  return port_status_str;
-+}
-+
-+
-+char* endpoint_to_str(struct usb_endpoint_descriptor *ed) {
-+  static char endpoint_to_str_buff[128];
-+  char tmp[32];
-+  int epnum = ed->bEndpointAddress & 0x0F;
-+  int dir = ed->bEndpointAddress & 0x80;
-+  int type = ed->bmAttributes & 0x03;
-+  endpoint_to_str_buff[0] = '\0';
-+  sprintf(endpoint_to_str_buff, "ep:%d ", epnum);
-+  switch(type) {
-+  case 0:
-+    sprintf(tmp, " ctrl");
-+    break;
-+  case 1:
-+    sprintf(tmp, " isoc");
-+    break;
-+  case 2:
-+    sprintf(tmp, " bulk");
-+    break;
-+  case 3:
-+    sprintf(tmp, " intr");
-+    break;
-+  }
-+  strcat(endpoint_to_str_buff, tmp);
-+  if(dir) {
-+    sprintf(tmp, " in");
-+  } else {
-+    sprintf(tmp, " out");
-+  }
-+  strcat(endpoint_to_str_buff, tmp);
-+
-+  return endpoint_to_str_buff;
-+}
-+
-+/* Debug helper functions for Transfer Controller */
-+char* pipe_to_str(unsigned int pipe) {
-+  static char pipe_to_str_buff[128];
-+  char tmp[64];
-+  sprintf(pipe_to_str_buff, "dir:%s", str_dir(pipe));
-+  sprintf(tmp, " type:%s", str_type(pipe));
-+  strcat(pipe_to_str_buff, tmp);
-+
-+  sprintf(tmp, " dev:%d", usb_pipedevice(pipe));
-+  strcat(pipe_to_str_buff, tmp);
-+  sprintf(tmp, " ep:%d", usb_pipeendpoint(pipe));
-+  strcat(pipe_to_str_buff, tmp);
-+  return pipe_to_str_buff;
-+}
-+
-+
-+#define USB_DEBUG_DESC 1
-+
-+#ifdef USB_DEBUG_DESC
-+#define dump_in_desc(x) __dump_in_desc(x)
-+#define dump_sb_desc(...) __dump_sb_desc(...)
-+#define dump_ep_desc(x) __dump_ep_desc(x)
-+#define dump_ept_data(x) __dump_ept_data(x)
-+#else
-+#define dump_in_desc(...) do {} while (0)
-+#define dump_sb_desc(...) do {} while (0)
-+#define dump_ep_desc(...) do {} while (0)
-+#endif
-+
-+
-+/* Uncomment this to enable massive function call trace
-+   #define USB_DEBUG_TRACE */
-+//#define USB_DEBUG_TRACE 1
-+
-+#ifdef USB_DEBUG_TRACE
-+#define DBFENTER (printk(": Entering: %s\n", __FUNCTION__))
-+#define DBFEXIT  (printk(": Exiting:  %s\n", __FUNCTION__))
-+#else
-+#define DBFENTER do {} while (0)
-+#define DBFEXIT  do {} while (0)
-+#endif
-+
-+#define CHECK_ALIGN(x) if (((__u32)(x)) & 0x00000003) \
-+{panic("Alignment check (DWORD) failed at %s:%s:%d\n", __FILE__, __FUNCTION__, __LINE__);}
-+
-+/* Most helpful debugging aid */
-+#define ASSERT(expr) ((void) ((expr) ? 0 : (err("assert failed at: %s %d",__FUNCTION__, __LINE__))))
-+
-+
-+/***************************************************************************/
-+/***************************************************************************/
-+/* Forward declarations                                                    */
-+/***************************************************************************/
-+/***************************************************************************/
-+void crisv10_hcd_epid_attn_irq(struct crisv10_irq_reg *reg);
-+void crisv10_hcd_port_status_irq(struct crisv10_irq_reg *reg);
-+void crisv10_hcd_ctl_status_irq(struct crisv10_irq_reg *reg);
-+void crisv10_hcd_isoc_eof_irq(struct crisv10_irq_reg *reg);
-+
-+void rh_port_status_change(__u16[]);
-+int  rh_clear_port_feature(__u8, __u16);
-+int  rh_set_port_feature(__u8, __u16);
-+static void rh_disable_port(unsigned int port);
-+
-+static void check_finished_bulk_tx_epids(struct usb_hcd *hcd,
-+					 int timer);
-+
-+//static int  tc_setup_epid(struct usb_host_endpoint *ep, struct urb *urb,
-+//			 int mem_flags);
-+static int tc_setup_epid(struct urb *urb, int mem_flags);
-+static void tc_free_epid(struct usb_host_endpoint *ep);
-+static int  tc_allocate_epid(void);
-+static void tc_finish_urb(struct usb_hcd *hcd, struct urb *urb, int status);
-+static void tc_finish_urb_later(struct usb_hcd *hcd, struct urb *urb,
-+				int status);
-+
-+static int  urb_priv_create(struct usb_hcd *hcd, struct urb *urb, int epid,
-+			   int mem_flags);
-+static void urb_priv_free(struct usb_hcd *hcd, struct urb *urb);
-+
-+static inline struct urb *urb_list_first(int epid);
-+static inline void        urb_list_add(struct urb *urb, int epid,
-+				      int mem_flags);
-+static inline urb_entry_t *urb_list_entry(struct urb *urb, int epid);
-+static inline void        urb_list_del(struct urb *urb, int epid);
-+static inline void        urb_list_move_last(struct urb *urb, int epid);
-+static inline struct urb *urb_list_next(struct urb *urb, int epid);
-+
-+int create_sb_for_urb(struct urb *urb, int mem_flags);
-+int init_intr_urb(struct urb *urb, int mem_flags);
-+
-+static inline void  etrax_epid_set(__u8 index, __u32 data);
-+static inline void  etrax_epid_clear_error(__u8 index);
-+static inline void  etrax_epid_set_toggle(__u8 index, __u8 dirout,
-+					      __u8 toggle);
-+static inline __u8  etrax_epid_get_toggle(__u8 index, __u8 dirout);
-+static inline __u32 etrax_epid_get(__u8 index);
-+
-+/* We're accessing the same register position in Etrax so
-+   when we do full access the internal difference doesn't matter */
-+#define etrax_epid_iso_set(index, data) etrax_epid_set(index, data)
-+#define etrax_epid_iso_get(index) etrax_epid_get(index)
-+
-+
-+//static void        tc_dma_process_isoc_urb(struct urb *urb);
-+static void        tc_dma_process_queue(int epid);
-+static void        tc_dma_unlink_intr_urb(struct urb *urb);
-+static irqreturn_t tc_dma_tx_interrupt(int irq, void *vhc);
-+static irqreturn_t tc_dma_rx_interrupt(int irq, void *vhc);
-+
-+static void tc_bulk_start_timer_func(unsigned long dummy);
-+static void tc_bulk_eot_timer_func(unsigned long dummy);
-+
-+
-+/*************************************************************/
-+/*************************************************************/
-+/* Host Controler Driver block                               */
-+/*************************************************************/
-+/*************************************************************/
-+
-+/* HCD operations */
-+static irqreturn_t crisv10_hcd_top_irq(int irq, void*);
-+static int crisv10_hcd_reset(struct usb_hcd *);
-+static int crisv10_hcd_start(struct usb_hcd *);
-+static void crisv10_hcd_stop(struct usb_hcd *);
-+#ifdef CONFIG_PM
-+static int crisv10_hcd_suspend(struct device *, u32, u32);
-+static int crisv10_hcd_resume(struct device *, u32);
-+#endif /* CONFIG_PM */
-+static int crisv10_hcd_get_frame(struct usb_hcd *);
-+
-+//static int  tc_urb_enqueue(struct usb_hcd *, struct usb_host_endpoint *ep, struct urb *, gfp_t mem_flags);
-+static int tc_urb_enqueue(struct usb_hcd *hcd, struct urb *urb, gfp_t mem_flags);
-+//static int  tc_urb_dequeue(struct usb_hcd *, struct urb *);
-+static int tc_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status);
-+static void tc_endpoint_disable(struct usb_hcd *, struct usb_host_endpoint *ep);
-+
-+static int rh_status_data_request(struct usb_hcd *, char *);
-+static int rh_control_request(struct usb_hcd *, u16, u16, u16, char*, u16);
-+
-+#ifdef CONFIG_PM
-+static int crisv10_hcd_hub_suspend(struct usb_hcd *);
-+static int crisv10_hcd_hub_resume(struct usb_hcd *);
-+#endif /* CONFIG_PM */
-+#ifdef CONFIG_USB_OTG
-+static int crisv10_hcd_start_port_reset(struct usb_hcd *, unsigned);
-+#endif /* CONFIG_USB_OTG */
-+
-+/* host controller driver interface */
-+static const struct hc_driver crisv10_hc_driver = 
-+  {
-+    .description =	hc_name,
-+    .product_desc =	product_desc,
-+    .hcd_priv_size =	sizeof(struct crisv10_hcd),
-+
-+    /* Attaching IRQ handler manualy in probe() */
-+    /* .irq =		crisv10_hcd_irq, */
-+
-+    .flags =		HCD_USB11,
-+
-+    /* called to init HCD and root hub */
-+    .reset =		crisv10_hcd_reset,
-+    .start =		crisv10_hcd_start,	
-+
-+    /* cleanly make HCD stop writing memory and doing I/O */
-+    .stop =		crisv10_hcd_stop,
-+
-+    /* return current frame number */
-+    .get_frame_number =	crisv10_hcd_get_frame,
-+
-+
-+    /* Manage i/o requests via the Transfer Controller */
-+    .urb_enqueue =	tc_urb_enqueue,
-+    .urb_dequeue =	tc_urb_dequeue,
-+
-+    /* hw synch, freeing endpoint resources that urb_dequeue can't */
-+    .endpoint_disable = tc_endpoint_disable,
-+
-+
-+    /* Root Hub support */
-+    .hub_status_data =	rh_status_data_request,
-+    .hub_control =	rh_control_request,
-+#ifdef CONFIG_PM
-+    .hub_suspend =	rh_suspend_request,
-+    .hub_resume =	rh_resume_request,
-+#endif /* CONFIG_PM */
-+#ifdef	CONFIG_USB_OTG
-+    .start_port_reset =	crisv10_hcd_start_port_reset,
-+#endif /* CONFIG_USB_OTG */
-+  };
-+
-+
-+/*
-+ * conversion between pointers to a hcd and the corresponding
-+ * crisv10_hcd 
-+ */
-+
-+static inline struct crisv10_hcd *hcd_to_crisv10_hcd(struct usb_hcd *hcd)
-+{
-+	return (struct crisv10_hcd *) hcd->hcd_priv;
-+}
-+
-+static inline struct usb_hcd *crisv10_hcd_to_hcd(struct crisv10_hcd *hcd)
-+{
-+	return container_of((void *) hcd, struct usb_hcd, hcd_priv);
-+}
-+
-+/* check if specified port is in use */
-+static inline int port_in_use(unsigned int port)
-+{
-+	return ports & (1 << port);
-+}
-+
-+/* number of ports in use */
-+static inline unsigned int num_ports(void)
-+{
-+	unsigned int i, num = 0;
-+	for (i = 0; i < USB_ROOT_HUB_PORTS; i++)
-+		if (port_in_use(i))
-+			num++;
-+	return num;
-+}
-+
-+/* map hub port number to the port number used internally by the HC */
-+static inline unsigned int map_port(unsigned int port)
-+{
-+  unsigned int i, num = 0;
-+  for (i = 0; i < USB_ROOT_HUB_PORTS; i++)
-+    if (port_in_use(i))
-+      if (++num == port)
-+	return i;
-+  return -1;
-+}
-+
-+/* size of descriptors in slab cache */
-+#ifndef MAX
-+#define MAX(x, y)		((x) > (y) ? (x) : (y))
-+#endif
-+
-+
-+/******************************************************************/
-+/* Hardware Interrupt functions                                   */
-+/******************************************************************/
-+
-+/* Fast interrupt handler for HC */
-+static irqreturn_t crisv10_hcd_top_irq(int irq, void *vcd)
-+{
-+  struct usb_hcd *hcd = vcd;
-+  struct crisv10_irq_reg reg;
-+  __u32 irq_mask;
-+  unsigned long flags;
-+
-+  DBFENTER;
-+
-+  ASSERT(hcd != NULL);
-+  reg.hcd = hcd;
-+
-+  /* Turn of other interrupts while handling these sensitive cases */
-+  local_irq_save(flags);
-+  
-+  /* Read out which interrupts that are flaged */
-+  irq_mask = *R_USB_IRQ_MASK_READ;
-+  reg.r_usb_irq_mask_read = irq_mask;
-+
-+  /* Reading R_USB_STATUS clears the ctl_status interrupt. Note that
-+     R_USB_STATUS must be read before R_USB_EPID_ATTN since reading the latter
-+     clears the ourun and perror fields of R_USB_STATUS. */
-+  reg.r_usb_status = *R_USB_STATUS;
-+  
-+  /* Reading R_USB_EPID_ATTN clears the iso_eof, bulk_eot and epid_attn
-+     interrupts. */
-+  reg.r_usb_epid_attn = *R_USB_EPID_ATTN;
-+  
-+  /* Reading R_USB_RH_PORT_STATUS_1 and R_USB_RH_PORT_STATUS_2 clears the
-+     port_status interrupt. */
-+  reg.r_usb_rh_port_status_1 = *R_USB_RH_PORT_STATUS_1;
-+  reg.r_usb_rh_port_status_2 = *R_USB_RH_PORT_STATUS_2;
-+  
-+  /* Reading R_USB_FM_NUMBER clears the sof interrupt. */
-+  /* Note: the lower 11 bits contain the actual frame number, sent with each
-+     sof. */
-+  reg.r_usb_fm_number = *R_USB_FM_NUMBER;
-+
-+  /* Interrupts are handled in order of priority. */
-+  if (irq_mask & IO_MASK(R_USB_IRQ_MASK_READ, port_status)) {
-+    crisv10_hcd_port_status_irq(&reg);
-+  }
-+  if (irq_mask & IO_MASK(R_USB_IRQ_MASK_READ, epid_attn)) {
-+    crisv10_hcd_epid_attn_irq(&reg);
-+  }
-+  if (irq_mask & IO_MASK(R_USB_IRQ_MASK_READ, ctl_status)) {
-+    crisv10_hcd_ctl_status_irq(&reg);
-+  }
-+  if (irq_mask & IO_MASK(R_USB_IRQ_MASK_READ, iso_eof)) {
-+    crisv10_hcd_isoc_eof_irq(&reg);
-+  }
-+  if (irq_mask & IO_MASK(R_USB_IRQ_MASK_READ, bulk_eot)) {
-+    /* Update/restart the bulk start timer since obviously the channel is
-+       running. */
-+    mod_timer(&bulk_start_timer, jiffies + BULK_START_TIMER_INTERVAL);
-+    /* Update/restart the bulk eot timer since we just received an bulk eot
-+       interrupt. */
-+    mod_timer(&bulk_eot_timer, jiffies + BULK_EOT_TIMER_INTERVAL);
-+
-+    /* Check for finished bulk transfers on epids */
-+    check_finished_bulk_tx_epids(hcd, 0);
-+  }
-+  local_irq_restore(flags);
-+
-+  DBFEXIT;
-+  return IRQ_HANDLED;
-+}
-+
-+
-+void crisv10_hcd_epid_attn_irq(struct crisv10_irq_reg *reg) {
-+  struct usb_hcd *hcd = reg->hcd;
-+  struct crisv10_urb_priv *urb_priv;
-+  int epid;
-+  DBFENTER;
-+
-+  for (epid = 0; epid < NBR_OF_EPIDS; epid++) {
-+    if (test_bit(epid, (void *)&reg->r_usb_epid_attn)) {
-+      struct urb *urb;
-+      __u32 ept_data;
-+      int error_code;
-+
-+      if (epid == DUMMY_EPID || epid == INVALID_EPID) {
-+	/* We definitely don't care about these ones. Besides, they are
-+	   always disabled, so any possible disabling caused by the
-+	   epid attention interrupt is irrelevant. */
-+	warn("Got epid_attn for INVALID_EPID or DUMMY_EPID (%d).", epid);
-+	continue;
-+      }
-+
-+      if(!epid_inuse(epid)) {
-+	irq_err("Epid attention on epid:%d that isn't in use\n", epid);
-+	printk("R_USB_STATUS: 0x%x\n", reg->r_usb_status);
-+	debug_epid(epid);
-+	continue;
-+      }
-+
-+      /* Note that although there are separate R_USB_EPT_DATA and
-+	 R_USB_EPT_DATA_ISO registers, they are located at the same address and
-+	 are of the same size. In other words, this read should be ok for isoc
-+	 also. */
-+      ept_data = etrax_epid_get(epid);
-+      error_code = IO_EXTRACT(R_USB_EPT_DATA, error_code, ept_data);
-+
-+      /* Get the active URB for this epid. We blatantly assume
-+	 that only this URB could have caused the epid attention. */
-+      urb = activeUrbList[epid];
-+      if (urb == NULL) {
-+	irq_err("Attention on epid:%d error:%d with no active URB.\n",
-+		epid, error_code);
-+	printk("R_USB_STATUS: 0x%x\n", reg->r_usb_status);
-+	debug_epid(epid);
-+	continue;
-+      }
-+
-+      urb_priv = (struct crisv10_urb_priv *)urb->hcpriv;
-+      ASSERT(urb_priv);
-+
-+      /* Using IO_STATE_VALUE on R_USB_EPT_DATA should be ok for isoc also. */
-+      if (error_code == IO_STATE_VALUE(R_USB_EPT_DATA, error_code, no_error)) {
-+
-+	/* Isoc traffic doesn't have error_count_in/error_count_out. */
-+	if ((usb_pipetype(urb->pipe) != PIPE_ISOCHRONOUS) &&
-+	    (IO_EXTRACT(R_USB_EPT_DATA, error_count_in, ept_data) == 3 ||
-+	     IO_EXTRACT(R_USB_EPT_DATA, error_count_out, ept_data) == 3)) {
-+	  /* Check if URB allready is marked for late-finish, we can get
-+	     several 3rd error for Intr traffic when a device is unplugged */
-+	  if(urb_priv->later_data == NULL) {
-+	    /* 3rd error. */
-+	    irq_warn("3rd error for epid:%d (%s %s) URB:0x%x[%d]\n", epid,
-+		     str_dir(urb->pipe), str_type(urb->pipe),
-+		     (unsigned int)urb, urb_priv->urb_num);
-+	  
-+	    tc_finish_urb_later(hcd, urb, -EPROTO);
-+	  }
-+
-+	} else if (reg->r_usb_status & IO_MASK(R_USB_STATUS, perror)) {
-+	  irq_warn("Perror for epid:%d\n", epid);
-+	  printk("FM_NUMBER: %d\n", reg->r_usb_fm_number & 0x7ff);
-+	  printk("R_USB_STATUS: 0x%x\n", reg->r_usb_status);
-+	  __dump_urb(urb);
-+	  debug_epid(epid);
-+
-+	  if (!(ept_data & IO_MASK(R_USB_EPT_DATA, valid))) {
-+	    /* invalid ep_id */
-+	    panic("Perror because of invalid epid."
-+		  " Deconfigured too early?");
-+	  } else {
-+	    /* past eof1, near eof, zout transfer, setup transfer */
-+	    /* Dump the urb and the relevant EP descriptor. */
-+	    panic("Something wrong with DMA descriptor contents."
-+		  " Too much traffic inserted?");
-+	  }
-+	} else if (reg->r_usb_status & IO_MASK(R_USB_STATUS, ourun)) {
-+	  /* buffer ourun */
-+	  printk("FM_NUMBER: %d\n", reg->r_usb_fm_number & 0x7ff);
-+	  printk("R_USB_STATUS: 0x%x\n", reg->r_usb_status);
-+	  __dump_urb(urb);
-+	  debug_epid(epid);
-+
-+	  panic("Buffer overrun/underrun for epid:%d. DMA too busy?", epid);
-+	} else {
-+	  irq_warn("Attention on epid:%d (%s %s) with no error code\n", epid,
-+		   str_dir(urb->pipe), str_type(urb->pipe));
-+	  printk("R_USB_STATUS: 0x%x\n", reg->r_usb_status);
-+	  __dump_urb(urb);
-+	  debug_epid(epid);
-+	}
-+
-+      } else if (error_code == IO_STATE_VALUE(R_USB_EPT_DATA, error_code,
-+					      stall)) {
-+	/* Not really a protocol error, just says that the endpoint gave
-+	   a stall response. Note that error_code cannot be stall for isoc. */
-+	if (usb_pipetype(urb->pipe) == PIPE_ISOCHRONOUS) {
-+	  panic("Isoc traffic cannot stall");
-+	}
-+
-+	tc_dbg("Stall for epid:%d (%s %s) URB:0x%x\n", epid,
-+	       str_dir(urb->pipe), str_type(urb->pipe), (unsigned int)urb);
-+	tc_finish_urb(hcd, urb, -EPIPE);
-+
-+      } else if (error_code == IO_STATE_VALUE(R_USB_EPT_DATA, error_code,
-+					      bus_error)) {
-+	/* Two devices responded to a transaction request. Must be resolved
-+	   by software. FIXME: Reset ports? */
-+	panic("Bus error for epid %d."
-+	      " Two devices responded to transaction request\n",
-+	      epid);
-+
-+      } else if (error_code == IO_STATE_VALUE(R_USB_EPT_DATA, error_code,
-+					      buffer_error)) {
-+	/* DMA overrun or underrun. */
-+	irq_warn("Buffer overrun/underrun for epid:%d (%s %s)\n", epid,
-+		 str_dir(urb->pipe), str_type(urb->pipe));
-+
-+	/* It seems that error_code = buffer_error in
-+	   R_USB_EPT_DATA/R_USB_EPT_DATA_ISO and ourun = yes in R_USB_STATUS
-+	   are the same error. */
-+	tc_finish_urb(hcd, urb, -EPROTO);
-+      } else {
-+	  irq_warn("Unknown attention on epid:%d (%s %s)\n", epid,
-+		   str_dir(urb->pipe), str_type(urb->pipe));
-+	  dump_ept_data(epid);
-+      }
-+    }
-+  }
-+  DBFEXIT;
-+}
-+
-+void crisv10_hcd_port_status_irq(struct crisv10_irq_reg *reg)
-+{
-+  __u16 port_reg[USB_ROOT_HUB_PORTS];
-+  DBFENTER;
-+  port_reg[0] = reg->r_usb_rh_port_status_1;
-+  port_reg[1] = reg->r_usb_rh_port_status_2;
-+  rh_port_status_change(port_reg);
-+  DBFEXIT;
-+}
-+
-+void crisv10_hcd_isoc_eof_irq(struct crisv10_irq_reg *reg)
-+{
-+  int epid;
-+  struct urb *urb;
-+  struct crisv10_urb_priv *urb_priv;
-+
-+  DBFENTER;
-+
-+  for (epid = 0; epid < NBR_OF_EPIDS - 1; epid++) {
-+
-+    /* Only check epids that are in use, is valid and has SB list */
-+    if (!epid_inuse(epid) || epid == INVALID_EPID ||
-+	TxIsocEPList[epid].sub == 0 || epid == DUMMY_EPID) {
-+      /* Nothing here to see. */
-+      continue;
-+    }
-+    ASSERT(epid_isoc(epid));
-+
-+    /* Get the active URB for this epid (if any). */
-+    urb = activeUrbList[epid];
-+    if (urb == 0) {
-+      isoc_warn("Ignoring NULL urb for epid:%d\n", epid);
-+      continue;
-+    }
-+    if(!epid_out_traffic(epid)) {
-+      /* Sanity check. */
-+      ASSERT(usb_pipetype(urb->pipe) == PIPE_ISOCHRONOUS);
-+
-+      urb_priv = (struct crisv10_urb_priv *)urb->hcpriv;
-+      ASSERT(urb_priv);
-+
-+      if (urb_priv->urb_state == NOT_STARTED) {
-+	/* If ASAP is not set and urb->start_frame is the current frame,
-+	   start the transfer. */
-+	if (!(urb->transfer_flags & URB_ISO_ASAP) &&
-+	    (urb->start_frame == (*R_USB_FM_NUMBER & 0x7ff))) {
-+	  /* EP should not be enabled if we're waiting for start_frame */
-+	  ASSERT((TxIsocEPList[epid].command &
-+		  IO_STATE(USB_EP_command, enable, yes)) == 0);
-+
-+	  isoc_warn("Enabling isoc IN EP descr for epid %d\n", epid);
-+	  TxIsocEPList[epid].command |= IO_STATE(USB_EP_command, enable, yes);
-+
-+	  /* This urb is now active. */
-+	  urb_priv->urb_state = STARTED;
-+	  continue;
-+	}
-+      }
-+    }
-+  }
-+
-+  DBFEXIT;
-+}
-+
-+void crisv10_hcd_ctl_status_irq(struct crisv10_irq_reg *reg)
-+{
-+  struct crisv10_hcd* crisv10_hcd = hcd_to_crisv10_hcd(reg->hcd);
-+
-+  DBFENTER;
-+  ASSERT(crisv10_hcd);
-+
-+  irq_dbg("ctr_status_irq, controller status: %s\n",
-+	  hcd_status_to_str(reg->r_usb_status));
-+  
-+  /* FIXME: What should we do if we get ourun or perror? Dump the EP and SB
-+     list for the corresponding epid? */
-+  if (reg->r_usb_status & IO_MASK(R_USB_STATUS, ourun)) {
-+    panic("USB controller got ourun.");
-+  }
-+  if (reg->r_usb_status & IO_MASK(R_USB_STATUS, perror)) {
-+    
-+    /* Before, etrax_usb_do_intr_recover was called on this epid if it was
-+       an interrupt pipe. I don't see how re-enabling all EP descriptors
-+       will help if there was a programming error. */
-+    panic("USB controller got perror.");
-+  }
-+
-+  /* Keep track of USB Controller, if it's running or not */
-+  if(reg->r_usb_status & IO_STATE(R_USB_STATUS, running, yes)) {
-+    crisv10_hcd->running = 1;
-+  } else {
-+    crisv10_hcd->running = 0;
-+  }
-+  
-+  if (reg->r_usb_status & IO_MASK(R_USB_STATUS, device_mode)) {
-+    /* We should never operate in device mode. */
-+    panic("USB controller in device mode.");
-+  }
-+
-+  /* Set the flag to avoid getting "Unlink after no-IRQ? Controller is probably
-+     using the wrong IRQ" from hcd_unlink_urb() in drivers/usb/core/hcd.c */
-+  set_bit(HCD_FLAG_SAW_IRQ, &reg->hcd->flags);
-+  
-+  DBFEXIT;
-+}
-+
-+
-+/******************************************************************/
-+/* Host Controller interface functions                            */
-+/******************************************************************/
-+
-+static inline void crisv10_ready_wait(void) {
-+  volatile int timeout = 10000;
-+  /* Check the busy bit of USB controller in Etrax */
-+  while((*R_USB_COMMAND & IO_MASK(R_USB_COMMAND, busy)) &&
-+	(timeout-- > 0));
-+  if(timeout == 0) {
-+    warn("Timeout while waiting for USB controller to be idle\n");
-+  }
-+}
-+
-+/* reset host controller */
-+static int crisv10_hcd_reset(struct usb_hcd *hcd)
-+{
-+  DBFENTER;
-+  hcd_dbg(hcd, "reset\n");
-+
-+
-+  /* Reset the USB interface. */
-+  /*
-+  *R_USB_COMMAND =
-+    IO_STATE(R_USB_COMMAND, port_sel, nop) |
-+    IO_STATE(R_USB_COMMAND, port_cmd, reset) |
-+    IO_STATE(R_USB_COMMAND, ctrl_cmd, reset);
-+  nop();
-+  */
-+  DBFEXIT;
-+  return 0;
-+}
-+
-+/* start host controller */
-+static int crisv10_hcd_start(struct usb_hcd *hcd)
-+{
-+  DBFENTER;
-+  hcd_dbg(hcd, "start\n");
-+
-+  crisv10_ready_wait();
-+
-+  /* Start processing of USB traffic. */
-+  *R_USB_COMMAND =
-+    IO_STATE(R_USB_COMMAND, port_sel, nop) |
-+    IO_STATE(R_USB_COMMAND, port_cmd, reset) |
-+    IO_STATE(R_USB_COMMAND, ctrl_cmd, host_run);
-+
-+  nop();
-+
-+  hcd->state = HC_STATE_RUNNING;
-+
-+  DBFEXIT;
-+  return 0;
-+}
-+
-+/* stop host controller */
-+static void crisv10_hcd_stop(struct usb_hcd *hcd)
-+{
-+  DBFENTER;
-+  hcd_dbg(hcd, "stop\n");
-+  crisv10_hcd_reset(hcd);
-+  DBFEXIT;
-+}
-+
-+/* return the current frame number */
-+static int crisv10_hcd_get_frame(struct usb_hcd *hcd)
-+{
-+  DBFENTER;
-+  DBFEXIT;
-+  return (*R_USB_FM_NUMBER & 0x7ff);
-+}
-+
-+#ifdef	CONFIG_USB_OTG
-+
-+static int crisv10_hcd_start_port_reset(struct usb_hcd *hcd, unsigned port)
-+{
-+  return 0; /* no-op for now */
-+}
-+
-+#endif /* CONFIG_USB_OTG */
-+
-+
-+/******************************************************************/
-+/* Root Hub functions                                             */
-+/******************************************************************/
-+
-+/* root hub status */
-+static const struct usb_hub_status rh_hub_status = 
-+  {
-+    .wHubStatus =		0,
-+    .wHubChange =		0,
-+  };
-+
-+/* root hub descriptor */
-+static const u8 rh_hub_descr[] =
-+  {
-+    0x09,			/* bDescLength	       */
-+    0x29,			/* bDescriptorType     */
-+    USB_ROOT_HUB_PORTS,         /* bNbrPorts	       */
-+    0x00,			/* wHubCharacteristics */
-+    0x00,		 
-+    0x01,			/* bPwrOn2pwrGood      */
-+    0x00,			/* bHubContrCurrent    */
-+    0x00,			/* DeviceRemovable     */
-+    0xff			/* PortPwrCtrlMask     */
-+  };
-+
-+/* Actual holder of root hub status*/
-+struct crisv10_rh rh;
-+
-+/* Initialize root hub data structures (called from dvdrv_hcd_probe()) */
-+int rh_init(void) {
-+  int i;
-+  /* Reset port status flags */
-+  for (i = 0; i < USB_ROOT_HUB_PORTS; i++) {
-+    rh.wPortChange[i] = 0;
-+    rh.wPortStatusPrev[i] = 0;
-+  }
-+  return 0;
-+}
-+
-+#define RH_FEAT_MASK ((1<<USB_PORT_FEAT_CONNECTION)|\
-+		      (1<<USB_PORT_FEAT_ENABLE)|\
-+		      (1<<USB_PORT_FEAT_SUSPEND)|\
-+		      (1<<USB_PORT_FEAT_RESET))
-+
-+/* Handle port status change interrupt (called from bottom part interrupt) */
-+void rh_port_status_change(__u16 port_reg[]) {
-+  int i;
-+  __u16 wChange;
-+
-+  for(i = 0; i < USB_ROOT_HUB_PORTS; i++) {
-+    /* Xor out changes since last read, masked for important flags */
-+    wChange = (port_reg[i] & RH_FEAT_MASK) ^ rh.wPortStatusPrev[i];
-+    /* Or changes together with (if any) saved changes */
-+    rh.wPortChange[i] |= wChange;
-+    /* Save new status */
-+    rh.wPortStatusPrev[i] = port_reg[i];
-+
-+    if(wChange) {
-+      rh_dbg("Interrupt port_status change port%d: %s  Current-status:%s\n", i+1,
-+	     port_status_to_str(wChange),
-+	     port_status_to_str(port_reg[i]));
-+    }
-+  }
-+}
-+
-+/* Construct port status change bitmap for the root hub */
-+static int rh_status_data_request(struct usb_hcd *hcd, char *buf)
-+{
-+  struct crisv10_hcd* crisv10_hcd = hcd_to_crisv10_hcd(hcd);
-+  unsigned int i;
-+
-+//  DBFENTER;
-+  
-+  /*
-+   * corresponds to hub status change EP (USB 2.0 spec section 11.13.4)
-+   * return bitmap indicating ports with status change
-+   */
-+  *buf = 0;
-+  spin_lock(&crisv10_hcd->lock);
-+  for (i = 1; i <= crisv10_hcd->num_ports; i++) {
-+    if (rh.wPortChange[map_port(i)]) {
-+      *buf |= (1 << i);
-+      rh_dbg("rh_status_data_request, change on port %d: %s  Current Status: %s\n", i,
-+	     port_status_to_str(rh.wPortChange[map_port(i)]),
-+	     port_status_to_str(rh.wPortStatusPrev[map_port(i)]));
-+    }
-+  }
-+  spin_unlock(&crisv10_hcd->lock);
-+
-+// DBFEXIT;
-+
-+  return *buf == 0 ? 0 : 1;
-+}
-+
-+/* Handle a control request for the root hub (called from hcd_driver) */
-+static int rh_control_request(struct usb_hcd *hcd, 
-+			      u16 typeReq, 
-+			      u16 wValue, 
-+			      u16 wIndex,
-+			      char *buf, 
-+			      u16 wLength) {
-+
-+  struct crisv10_hcd *crisv10_hcd = hcd_to_crisv10_hcd(hcd);
-+  int retval = 0;
-+  int len;
-+  DBFENTER;
-+
-+  switch (typeReq) {
-+  case GetHubDescriptor:
-+    rh_dbg("GetHubDescriptor\n");
-+    len = min_t(unsigned int, sizeof rh_hub_descr, wLength);
-+    memcpy(buf, rh_hub_descr, len);
-+    buf[2] = crisv10_hcd->num_ports;
-+    break;
-+  case GetHubStatus:
-+    rh_dbg("GetHubStatus\n");
-+    len = min_t(unsigned int, sizeof rh_hub_status, wLength);
-+    memcpy(buf, &rh_hub_status, len);
-+    break;
-+  case GetPortStatus:
-+    if (!wIndex || wIndex > crisv10_hcd->num_ports)
-+      goto error;
-+    rh_dbg("GetportStatus, port:%d change:%s  status:%s\n", wIndex,
-+	   port_status_to_str(rh.wPortChange[map_port(wIndex)]),
-+	   port_status_to_str(rh.wPortStatusPrev[map_port(wIndex)]));
-+    *(u16 *) buf = cpu_to_le16(rh.wPortStatusPrev[map_port(wIndex)]);
-+    *(u16 *) (buf + 2) = cpu_to_le16(rh.wPortChange[map_port(wIndex)]);
-+    break;
-+  case SetHubFeature:
-+    rh_dbg("SetHubFeature\n");
-+  case ClearHubFeature:
-+    rh_dbg("ClearHubFeature\n");
-+    switch (wValue) {
-+    case C_HUB_OVER_CURRENT:
-+    case C_HUB_LOCAL_POWER:
-+      rh_warn("Not implemented hub request:%d \n", typeReq);
-+      /* not implemented */
-+      break;
-+    default:
-+      goto error;
-+    }
-+    break;
-+  case SetPortFeature:
-+    if (!wIndex || wIndex > crisv10_hcd->num_ports)
-+      goto error;
-+    if(rh_set_port_feature(map_port(wIndex), wValue))
-+      goto error;
-+    break;
-+  case ClearPortFeature:
-+    if (!wIndex || wIndex > crisv10_hcd->num_ports)
-+      goto error;
-+    if(rh_clear_port_feature(map_port(wIndex), wValue))
-+      goto error;
-+    break;
-+  default:
-+    rh_warn("Unknown hub request: %d\n", typeReq);
-+  error:
-+    retval = -EPIPE;
-+  }
-+  DBFEXIT;
-+  return retval;
-+}
-+
-+int rh_set_port_feature(__u8 bPort, __u16 wFeature) {
-+  __u8 bUsbCommand = 0;
-+  switch(wFeature) {
-+  case USB_PORT_FEAT_RESET:
-+    rh_dbg("SetPortFeature: reset\n");
-+    bUsbCommand |= IO_STATE(R_USB_COMMAND, port_cmd, reset);
-+    goto set;
-+    break;
-+  case USB_PORT_FEAT_SUSPEND:
-+    rh_dbg("SetPortFeature: suspend\n");
-+    bUsbCommand |= IO_STATE(R_USB_COMMAND, port_cmd, suspend);
-+    goto set;
-+    break;
-+  case USB_PORT_FEAT_POWER:
-+    rh_dbg("SetPortFeature: power\n");
-+    break;
-+  case USB_PORT_FEAT_C_CONNECTION:
-+    rh_dbg("SetPortFeature: c_connection\n");
-+    break;
-+  case USB_PORT_FEAT_C_RESET:
-+    rh_dbg("SetPortFeature: c_reset\n");
-+    break;
-+  case USB_PORT_FEAT_C_OVER_CURRENT:
-+    rh_dbg("SetPortFeature: c_over_current\n");
-+    break;
-+
-+  set:
-+    /* Select which port via the port_sel field */
-+    bUsbCommand |= IO_FIELD(R_USB_COMMAND, port_sel, bPort+1);
-+
-+    /* Make sure the controller isn't busy. */
-+    crisv10_ready_wait();
-+    /* Send out the actual command to the USB controller */
-+    *R_USB_COMMAND = bUsbCommand;
-+
-+    /* If port reset then also bring USB controller into running state */
-+    if(wFeature == USB_PORT_FEAT_RESET) {
-+      /* Wait a while for controller to first become started after port reset */
-+      udelay(12000); /* 12ms blocking wait */
-+      
-+      /* Make sure the controller isn't busy. */
-+      crisv10_ready_wait();
-+
-+      /* If all enabled ports were disabled the host controller goes down into
-+	 started mode, so we need to bring it back into the running state.
-+	 (This is safe even if it's already in the running state.) */
-+      *R_USB_COMMAND =
-+	IO_STATE(R_USB_COMMAND, port_sel, nop) |
-+	IO_STATE(R_USB_COMMAND, port_cmd, reset) |
-+	IO_STATE(R_USB_COMMAND, ctrl_cmd, host_run);
-+    }
-+
-+    break;
-+  default:
-+    rh_dbg("SetPortFeature: unknown feature\n");
-+    return -1;
-+  }
-+  return 0;
-+}
-+
-+int rh_clear_port_feature(__u8 bPort, __u16 wFeature) {
-+  switch(wFeature) {
-+  case USB_PORT_FEAT_ENABLE:
-+    rh_dbg("ClearPortFeature: enable\n");
-+    rh_disable_port(bPort);
-+    break;
-+  case USB_PORT_FEAT_SUSPEND:
-+    rh_dbg("ClearPortFeature: suspend\n");
-+    break;
-+  case USB_PORT_FEAT_POWER:
-+    rh_dbg("ClearPortFeature: power\n");
-+    break;
-+
-+  case USB_PORT_FEAT_C_ENABLE:
-+    rh_dbg("ClearPortFeature: c_enable\n");
-+    goto clear;
-+  case USB_PORT_FEAT_C_SUSPEND:
-+    rh_dbg("ClearPortFeature: c_suspend\n");
-+    goto clear;
-+  case USB_PORT_FEAT_C_CONNECTION:
-+    rh_dbg("ClearPortFeature: c_connection\n");
-+    goto clear;
-+  case USB_PORT_FEAT_C_OVER_CURRENT:
-+    rh_dbg("ClearPortFeature: c_over_current\n");
-+    goto clear;
-+  case USB_PORT_FEAT_C_RESET:
-+    rh_dbg("ClearPortFeature: c_reset\n");
-+    goto clear;
-+  clear:
-+    rh.wPortChange[bPort] &= ~(1 << (wFeature - 16));
-+    break;
-+  default:
-+    rh_dbg("ClearPortFeature: unknown feature\n");
-+    return -1;
-+  }
-+  return 0;
-+}
-+
-+
-+#ifdef	CONFIG_PM
-+/* Handle a suspend request for the root hub (called from hcd_driver) */
-+static int rh_suspend_request(struct usb_hcd *hcd)
-+{
-+  return 0; /* no-op for now */
-+}
-+
-+/* Handle a resume request for the root hub (called from hcd_driver) */
-+static int rh_resume_request(struct usb_hcd *hcd)
-+{
-+  return 0; /* no-op for now */
-+}
-+#endif /* CONFIG_PM */
-+
-+
-+
-+/* Wrapper function for workaround port disable registers in USB controller  */
-+static void rh_disable_port(unsigned int port) {
-+  volatile int timeout = 10000;
-+  volatile char* usb_portx_disable;
-+  switch(port) {
-+  case 0:
-+    usb_portx_disable = R_USB_PORT1_DISABLE;
-+    break;
-+  case 1:
-+    usb_portx_disable = R_USB_PORT2_DISABLE;
-+    break;
-+  default:
-+    /* Invalid port index */
-+    return;
-+  }
-+  /* Set disable flag in special register  */
-+  *usb_portx_disable = IO_STATE(R_USB_PORT1_DISABLE, disable, yes);
-+  /* Wait until not enabled anymore */
-+  while((rh.wPortStatusPrev[port] &
-+	IO_STATE(R_USB_RH_PORT_STATUS_1, enabled, yes)) &&
-+	(timeout-- > 0));
-+  if(timeout == 0) {
-+    warn("Timeout while waiting for port %d to become disabled\n", port);
-+  }
-+  /* clear disable flag in special register  */
-+  *usb_portx_disable = IO_STATE(R_USB_PORT1_DISABLE, disable, no);
-+  rh_info("Physical port %d disabled\n", port+1);
-+}
-+
-+
-+/******************************************************************/
-+/* Transfer Controller (TC) functions                             */
-+/******************************************************************/
-+
-+/* FIXME: Should RX_BUF_SIZE be a config option, or maybe we should adjust it
-+   dynamically?
-+   To adjust it dynamically we would have to get an interrupt when we reach
-+   the end of the rx descriptor list, or when we get close to the end, and
-+   then allocate more descriptors. */
-+#define NBR_OF_RX_DESC     512
-+#define RX_DESC_BUF_SIZE   1024
-+#define RX_BUF_SIZE        (NBR_OF_RX_DESC * RX_DESC_BUF_SIZE)
-+
-+
-+/* Local variables for Transfer Controller */
-+/* --------------------------------------- */
-+
-+/* This is a circular (double-linked) list of the active urbs for each epid.
-+   The head is never removed, and new urbs are linked onto the list as
-+   urb_entry_t elements. Don't reference urb_list directly; use the wrapper
-+   functions instead (which includes spin_locks) */
-+static struct list_head urb_list[NBR_OF_EPIDS];
-+
-+/* Read about the need and usage of this lock in submit_ctrl_urb. */
-+/* Lock for URB lists for each EPID */
-+static spinlock_t urb_list_lock;
-+
-+/* Lock for EPID array register (R_USB_EPT_x) in Etrax */
-+static spinlock_t etrax_epid_lock;
-+
-+/* Lock for dma8 sub0 handling */
-+static spinlock_t etrax_dma8_sub0_lock;
-+
-+/* DMA IN cache bug. Align the DMA IN buffers to 32 bytes, i.e. a cache line.
-+   Since RX_DESC_BUF_SIZE is 1024 is a multiple of 32, all rx buffers will be
-+   cache aligned. */
-+static volatile unsigned char RxBuf[RX_BUF_SIZE] __attribute__ ((aligned (32)));
-+static volatile struct USB_IN_Desc RxDescList[NBR_OF_RX_DESC] __attribute__ ((aligned (4)));
-+
-+/* Pointers into RxDescList. */
-+static volatile struct USB_IN_Desc *myNextRxDesc;
-+static volatile struct USB_IN_Desc *myLastRxDesc;
-+
-+/* A zout transfer makes a memory access at the address of its buf pointer,
-+   which means that setting this buf pointer to 0 will cause an access to the
-+   flash. In addition to this, setting sw_len to 0 results in a 16/32 bytes
-+   (depending on DMA burst size) transfer.
-+   Instead, we set it to 1, and point it to this buffer. */
-+static int zout_buffer[4] __attribute__ ((aligned (4)));
-+
-+/* Cache for allocating new EP and SB descriptors. */
-+//static kmem_cache_t *usb_desc_cache;
-+static struct kmem_cache *usb_desc_cache;
-+
-+/* Cache for the data allocated in the isoc descr top half. */
-+//static kmem_cache_t *isoc_compl_cache;
-+static struct kmem_cache *isoc_compl_cache;
-+
-+/* Cache for the data allocated when delayed finishing of URBs */
-+//static kmem_cache_t *later_data_cache;
-+static struct kmem_cache *later_data_cache;
-+
-+/* Counter to keep track of how many Isoc EP we have sat up. Used to enable
-+   and disable iso_eof interrupt. We only need these interrupts when we have
-+   Isoc data endpoints (consumes CPU cycles).
-+   FIXME: This could be more fine granular, so this interrupt is only enabled
-+   when we have a In Isoc URB not URB_ISO_ASAP flaged queued. */
-+static int isoc_epid_counter;
-+
-+/* Protecting wrapper functions for R_USB_EPT_x */
-+/* -------------------------------------------- */
-+static inline void etrax_epid_set(__u8 index, __u32 data) {
-+  unsigned long flags;
-+  spin_lock_irqsave(&etrax_epid_lock, flags);
-+  *R_USB_EPT_INDEX = IO_FIELD(R_USB_EPT_INDEX, value, index);
-+  nop();
-+  *R_USB_EPT_DATA = data;
-+  spin_unlock_irqrestore(&etrax_epid_lock, flags);
-+}
-+
-+static inline void etrax_epid_clear_error(__u8 index) {
-+  unsigned long flags;
-+  spin_lock_irqsave(&etrax_epid_lock, flags);
-+  *R_USB_EPT_INDEX = IO_FIELD(R_USB_EPT_INDEX, value, index);
-+  nop();
-+  *R_USB_EPT_DATA &=
-+    ~(IO_MASK(R_USB_EPT_DATA, error_count_in) |
-+      IO_MASK(R_USB_EPT_DATA, error_count_out) |
-+      IO_MASK(R_USB_EPT_DATA, error_code));
-+  spin_unlock_irqrestore(&etrax_epid_lock, flags);
-+}
-+
-+static inline void etrax_epid_set_toggle(__u8 index, __u8 dirout,
-+                                             __u8 toggle) {
-+  unsigned long flags;
-+  spin_lock_irqsave(&etrax_epid_lock, flags);
-+  *R_USB_EPT_INDEX = IO_FIELD(R_USB_EPT_INDEX, value, index);
-+  nop();
-+  if(dirout) {
-+    *R_USB_EPT_DATA &= ~IO_MASK(R_USB_EPT_DATA, t_out);
-+    *R_USB_EPT_DATA |= IO_FIELD(R_USB_EPT_DATA, t_out, toggle);
-+  } else {
-+    *R_USB_EPT_DATA &= ~IO_MASK(R_USB_EPT_DATA, t_in);
-+    *R_USB_EPT_DATA |= IO_FIELD(R_USB_EPT_DATA, t_in, toggle);
-+  }
-+  spin_unlock_irqrestore(&etrax_epid_lock, flags);
-+}
-+
-+static inline __u8 etrax_epid_get_toggle(__u8 index, __u8 dirout) {
-+  unsigned long flags;
-+  __u8 toggle;
-+  spin_lock_irqsave(&etrax_epid_lock, flags);
-+  *R_USB_EPT_INDEX = IO_FIELD(R_USB_EPT_INDEX, value, index);
-+  nop();
-+  if (dirout) {
-+    toggle = IO_EXTRACT(R_USB_EPT_DATA, t_out, *R_USB_EPT_DATA);
-+  } else {
-+    toggle = IO_EXTRACT(R_USB_EPT_DATA, t_in, *R_USB_EPT_DATA);
-+  }
-+  spin_unlock_irqrestore(&etrax_epid_lock, flags);
-+  return toggle;
-+}
-+
-+
-+static inline __u32 etrax_epid_get(__u8 index) {
-+  unsigned long flags;
-+  __u32 data;
-+  spin_lock_irqsave(&etrax_epid_lock, flags);
-+  *R_USB_EPT_INDEX = IO_FIELD(R_USB_EPT_INDEX, value, index);
-+  nop();
-+  data = *R_USB_EPT_DATA;
-+  spin_unlock_irqrestore(&etrax_epid_lock, flags);
-+  return data;
-+}
-+
-+
-+
-+
-+/* Main functions for Transfer Controller */
-+/* -------------------------------------- */
-+
-+/* Init structs, memories and lists used by Transfer Controller */
-+int tc_init(struct usb_hcd *hcd) {
-+  int i;
-+  /* Clear software state info for all epids */
-+  memset(epid_state, 0, sizeof(struct etrax_epid) * NBR_OF_EPIDS);
-+
-+  /* Set Invalid and Dummy as being in use and disabled */
-+  epid_state[INVALID_EPID].inuse = 1;
-+  epid_state[DUMMY_EPID].inuse = 1;
-+  epid_state[INVALID_EPID].disabled = 1;
-+  epid_state[DUMMY_EPID].disabled = 1;
-+
-+  /* Clear counter for how many Isoc epids we have sat up */
-+  isoc_epid_counter = 0;
-+
-+  /* Initialize the urb list by initiating a head for each list.
-+     Also reset list hodling active URB for each epid */
-+  for (i = 0; i < NBR_OF_EPIDS; i++) {
-+    INIT_LIST_HEAD(&urb_list[i]);
-+    activeUrbList[i] = NULL;
-+  }
-+
-+  /* Init lock for URB lists */
-+  spin_lock_init(&urb_list_lock);
-+  /* Init lock for Etrax R_USB_EPT register */
-+  spin_lock_init(&etrax_epid_lock);
-+  /* Init lock for Etrax dma8 sub0 handling */
-+  spin_lock_init(&etrax_dma8_sub0_lock);
-+
-+  /* We use kmem_cache_* to make sure that all DMA desc. are dword aligned */
-+
-+  /* Note that we specify sizeof(struct USB_EP_Desc) as the size, but also
-+     allocate SB descriptors from this cache. This is ok since
-+     sizeof(struct USB_EP_Desc) == sizeof(struct USB_SB_Desc). */
-+//  usb_desc_cache = kmem_cache_create("usb_desc_cache",
-+//				     sizeof(struct USB_EP_Desc), 0,
-+//				     SLAB_HWCACHE_ALIGN, 0, 0);
-+  usb_desc_cache = kmem_cache_create(
-+				  "usb_desc_cache",
-+				  sizeof(struct USB_EP_Desc),
-+				  0,
-+				  SLAB_HWCACHE_ALIGN,
-+				  NULL);
-+  if(usb_desc_cache == NULL) {
-+    return -ENOMEM;
-+  }
-+
-+  /* Create slab cache for speedy allocation of memory for isoc bottom-half
-+     interrupt handling */
-+//  isoc_compl_cache =
-+//    kmem_cache_create("isoc_compl_cache",
-+//		      sizeof(struct crisv10_isoc_complete_data),
-+//		      0, SLAB_HWCACHE_ALIGN, 0, 0);
-+  isoc_compl_cache = kmem_cache_create(
-+				  "isoc_compl_cache",
-+				  sizeof(struct crisv10_isoc_complete_data),
-+				  0,
-+				  SLAB_HWCACHE_ALIGN,
-+				  NULL
-+				  );
-+
-+  if(isoc_compl_cache == NULL) {
-+    return -ENOMEM;
-+  }
-+
-+  /* Create slab cache for speedy allocation of memory for later URB finish
-+     struct */
-+//  later_data_cache =
-+//    kmem_cache_create("later_data_cache",
-+//		      sizeof(struct urb_later_data),
-+//		      0, SLAB_HWCACHE_ALIGN, 0, 0);
-+
-+  later_data_cache = kmem_cache_create(
-+				  "later_data_cache",
-+				  sizeof(struct urb_later_data),
-+				  0,
-+				  SLAB_HWCACHE_ALIGN,
-+				  NULL
-+				  );
-+  
-+  if(later_data_cache == NULL) {
-+    return -ENOMEM;
-+  }
-+
-+
-+  /* Initiate the bulk start timer. */
-+  init_timer(&bulk_start_timer);
-+  bulk_start_timer.expires = jiffies + BULK_START_TIMER_INTERVAL;
-+  bulk_start_timer.function = tc_bulk_start_timer_func;
-+  add_timer(&bulk_start_timer);
-+
-+
-+  /* Initiate the bulk eot timer. */
-+  init_timer(&bulk_eot_timer);
-+  bulk_eot_timer.expires = jiffies + BULK_EOT_TIMER_INTERVAL;
-+  bulk_eot_timer.function = tc_bulk_eot_timer_func;
-+  bulk_eot_timer.data = (unsigned long)hcd;
-+  add_timer(&bulk_eot_timer);
-+
-+  return 0;
-+}
-+
-+/* Uninitialize all resources used by Transfer Controller */
-+void tc_destroy(void) {
-+
-+  /* Destroy all slab cache */
-+  kmem_cache_destroy(usb_desc_cache);
-+  kmem_cache_destroy(isoc_compl_cache);
-+  kmem_cache_destroy(later_data_cache);
-+
-+  /* Remove timers */
-+  del_timer(&bulk_start_timer);
-+  del_timer(&bulk_eot_timer);
-+}
-+
-+static void restart_dma8_sub0(void) {
-+  unsigned long flags;
-+  spin_lock_irqsave(&etrax_dma8_sub0_lock, flags);
-+  /* Verify that the dma is not running */
-+  if ((*R_DMA_CH8_SUB0_CMD & IO_MASK(R_DMA_CH8_SUB0_CMD, cmd)) == 0) {
-+    struct USB_EP_Desc *ep = (struct USB_EP_Desc *)phys_to_virt(*R_DMA_CH8_SUB0_EP);
-+    while (DUMMY_EPID == IO_EXTRACT(USB_EP_command, epid, ep->command)) {
-+      ep = (struct USB_EP_Desc *)phys_to_virt(ep->next);
-+    }
-+    /* Advance the DMA to the next EP descriptor that is not a DUMMY_EPID.
-+	 * ep->next is already a physical address. virt_to_phys is needed, see
-+	 * http://mhonarc.axis.se/dev-etrax/msg08630.html
-+	 */
-+    //*R_DMA_CH8_SUB0_EP = ep->next;
-+	*R_DMA_CH8_SUB0_EP = virt_to_phys(ep);
-+    /* Restart the DMA */
-+    *R_DMA_CH8_SUB0_CMD = IO_STATE(R_DMA_CH8_SUB0_CMD, cmd, start);
-+  }
-+  spin_unlock_irqrestore(&etrax_dma8_sub0_lock, flags);
-+}
-+
-+/* queue an URB with the transfer controller (called from hcd_driver) */
-+//static int tc_urb_enqueue(struct usb_hcd *hcd, 
-+//			  struct usb_host_endpoint *ep,
-+//			  struct urb *urb, 
-+//			  gfp_t mem_flags) {
-+static int tc_urb_enqueue(struct usb_hcd *hcd, struct urb *urb, gfp_t mem_flags)
-+{
-+  int epid;
-+  int retval;
-+//  int bustime = 0;
-+  int maxpacket;
-+  unsigned long flags;
-+  struct crisv10_urb_priv *urb_priv;
-+  struct crisv10_hcd* crisv10_hcd = hcd_to_crisv10_hcd(hcd);
-+  DBFENTER;
-+
-+  if(!(crisv10_hcd->running)) {
-+    /* The USB Controller is not running, probably because no device is 
-+       attached. No idea to enqueue URBs then */
-+    tc_warn("Rejected enqueueing of URB:0x%x because no dev attached\n",
-+	    (unsigned int)urb);
-+    return -ENOENT;
-+  }
-+
-+  maxpacket = usb_maxpacket(urb->dev, urb->pipe, usb_pipeout(urb->pipe));
-+  
-+  /* hinko ignore usb_pipeisoc */
-+#if 0
-+  /* Special case check for In Isoc transfers. Specification states that each
-+     In Isoc transfer consists of one packet and therefore it should fit into
-+     the transfer-buffer of an URB.
-+     We do the check here to be sure (an invalid scenario can be produced with
-+     parameters to the usbtest suite) */
-+  if(usb_pipeisoc(urb->pipe) && usb_pipein(urb->pipe) &&
-+     (urb->transfer_buffer_length < maxpacket)) {
-+    tc_err("Submit In Isoc URB with buffer length:%d to pipe with maxpacketlen: %d\n", urb->transfer_buffer_length, maxpacket);
-+    return -EMSGSIZE;
-+  }
-+
-+  /* Check if there is enough bandwidth for periodic transfer  */
-+  if(usb_pipeint(urb->pipe) || usb_pipeisoc(urb->pipe)) {
-+    /* only check (and later claim) if not already claimed */
-+    if (urb->bandwidth == 0) {
-+      bustime = usb_check_bandwidth(urb->dev, urb);
-+      if (bustime < 0) {
-+	tc_err("Not enough periodic bandwidth\n");
-+	return -ENOSPC;
-+      }
-+    }
-+  }
-+#endif
-+  
-+  /* Check if there is a epid for URBs destination, if not this function
-+     set up one. */
-+  //epid = tc_setup_epid(ep, urb, mem_flags);
-+  epid = tc_setup_epid(urb, mem_flags);
-+  if (epid < 0) {
-+    tc_err("Failed setup epid:%d for URB:0x%x\n", epid, (unsigned int)urb);
-+    DBFEXIT;
-+    return -ENOMEM;
-+  }
-+
-+  if(urb == activeUrbList[epid]) {
-+    tc_err("Resubmition of allready active URB:0x%x\n", (unsigned int)urb);
-+    return -ENXIO;
-+  }
-+
-+  if(urb_list_entry(urb, epid)) {
-+    tc_err("Resubmition of allready queued URB:0x%x\n", (unsigned int)urb);
-+    return -ENXIO;
-+  }
-+
-+  /* If we actively have flaged endpoint as disabled then refuse submition */
-+  if(epid_state[epid].disabled) {
-+    return -ENOENT;
-+  }
-+
-+  /* Allocate and init HC-private data for URB */
-+  if(urb_priv_create(hcd, urb, epid, mem_flags) != 0) {
-+    DBFEXIT;
-+    return -ENOMEM;
-+  }
-+  urb_priv = urb->hcpriv;
-+
-+  tc_dbg("Enqueue URB:0x%x[%d] epid:%d (%s) bufflen:%d\n",
-+	 (unsigned int)urb, urb_priv->urb_num, epid,
-+	 pipe_to_str(urb->pipe), urb->transfer_buffer_length);
-+
-+  /* Create and link SBs required for this URB */
-+  retval = create_sb_for_urb(urb, mem_flags);
-+  if(retval != 0) {
-+    tc_err("Failed to create SBs for URB:0x%x[%d]\n", (unsigned int)urb,
-+	   urb_priv->urb_num);
-+    urb_priv_free(hcd, urb);
-+    DBFEXIT;
-+    return retval;
-+  }
-+
-+  /* Init intr EP pool if this URB is a INTR transfer. This pool is later
-+     used when inserting EPs in the TxIntrEPList. We do the alloc here
-+     so we can't run out of memory later */
-+  if(usb_pipeint(urb->pipe)) {
-+    retval = init_intr_urb(urb, mem_flags);
-+    if(retval != 0) {
-+      tc_warn("Failed to init Intr URB\n");
-+      urb_priv_free(hcd, urb);
-+      DBFEXIT;
-+      return retval;
-+    }
-+  }
-+
-+  /* Disable other access when inserting USB */
-+
-+  /* BUG on sleeping inside int disabled if using local_irq_save/local_irq_restore
-+   * her - because urb_list_add() and tc_dma_process_queue() save irqs again !??!
-+   */
-+//  local_irq_save(flags);
-+
-+  /* hinko ignore usb_pipeisoc */
-+#if 0
-+  /* Claim bandwidth, if needed */
-+  if(bustime) {
-+    usb_claim_bandwidth(urb->dev, urb, bustime, 0);
-+  }
-+  
-+  /* Add URB to EP queue */
-+  urb_list_add(urb, epid, mem_flags);
-+
-+  if(usb_pipeisoc(urb->pipe)) {
-+    /* Special processing of Isoc URBs. */
-+    tc_dma_process_isoc_urb(urb);
-+  } else {
-+    /* Process EP queue for rest of the URB types (Bulk, Ctrl, Intr) */
-+    tc_dma_process_queue(epid);
-+  }
-+#endif
-+  /* Add URB to EP queue */
-+  urb_list_add(urb, epid, mem_flags);
-+
-+  /*hinko link/unlink urb -> ep */
-+  spin_lock_irqsave(&crisv10_hcd->lock, flags);
-+  //spin_lock(&crisv10_hcd->lock);
-+  retval = usb_hcd_link_urb_to_ep(hcd, urb);
-+  if (retval) {
-+    spin_unlock_irqrestore(&crisv10_hcd->lock, flags);
-+    tc_warn("Failed to link urb to ep\n");
-+    urb_priv_free(hcd, urb);
-+    DBFEXIT;
-+    return retval;
-+  }
-+  spin_unlock_irqrestore(&crisv10_hcd->lock, flags);
-+  //spin_unlock(&crisv10_hcd->lock);
-+  
-+  /* Process EP queue for rest of the URB types (Bulk, Ctrl, Intr) */
-+  tc_dma_process_queue(epid);
-+
-+//  local_irq_restore(flags);
-+
-+  DBFEXIT;
-+  return 0;
-+}
-+
-+/* remove an URB from the transfer controller queues (called from hcd_driver)*/
-+//static int tc_urb_dequeue(struct usb_hcd *hcd, struct urb *urb)
-+static int tc_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
-+{
-+  struct crisv10_urb_priv *urb_priv;
-+  unsigned long flags;
-+  int epid;
-+
-+  DBFENTER;
-+  /* Disable interrupts here since a descriptor interrupt for the isoc epid
-+     will modify the sb list.  This could possibly be done more granular, but
-+     urb_dequeue should not be used frequently anyway.
-+  */
-+  local_irq_save(flags);
-+
-+  urb_priv = urb->hcpriv;
-+
-+  if (!urb_priv) {
-+    /* This happens if a device driver calls unlink on an urb that
-+       was never submitted (lazy driver) or if the urb was completed
-+       while dequeue was being called. */
-+    tc_warn("Dequeing of not enqueued URB:0x%x\n", (unsigned int)urb);
-+    local_irq_restore(flags);
-+    return 0;
-+  }
-+  epid = urb_priv->epid;
-+
-+  tc_warn("Dequeing %s URB:0x%x[%d] (%s %s epid:%d) status:%d %s\n",
-+	  (urb == activeUrbList[epid]) ? "active" : "queued",
-+	  (unsigned int)urb, urb_priv->urb_num, str_dir(urb->pipe),
-+	  str_type(urb->pipe), epid, urb->status,
-+	  (urb_priv->later_data) ? "later-sched" : "");
-+
-+  /* For Bulk, Ctrl and Intr are only one URB active at a time. So any URB
-+     that isn't active can be dequeued by just removing it from the queue */
-+  if(usb_pipebulk(urb->pipe) || usb_pipecontrol(urb->pipe) ||
-+     usb_pipeint(urb->pipe)) {
-+
-+    /* Check if URB haven't gone further than the queue */
-+    if(urb != activeUrbList[epid]) {
-+      ASSERT(urb_priv->later_data == NULL);
-+      tc_warn("Dequeing URB:0x%x[%d] (%s %s epid:%d) from queue"
-+	      " (not active)\n", (unsigned int)urb, urb_priv->urb_num,
-+	      str_dir(urb->pipe), str_type(urb->pipe), epid);
-+      
-+      /* Finish the URB with error status from USB core */
-+      tc_finish_urb(hcd, urb, urb->status);
-+      local_irq_restore(flags);
-+      return 0;
-+    }
-+  }
-+
-+  /* Set URB status to Unlink for handling when interrupt comes. */
-+  urb_priv->urb_state = UNLINK;
-+
-+  /* Differentiate dequeing of Bulk and Ctrl from Isoc and Intr */
-+  switch(usb_pipetype(urb->pipe)) {
-+  case PIPE_BULK:
-+    /* Check if EP still is enabled */
-+    if (TxBulkEPList[epid].command & IO_MASK(USB_EP_command, enable)) {
-+      /* The EP was enabled, disable it. */
-+      TxBulkEPList[epid].command &= ~IO_MASK(USB_EP_command, enable);
-+    }
-+    /* Kicking dummy list out of the party. */
-+    TxBulkEPList[epid].next = virt_to_phys(&TxBulkEPList[(epid + 1) % NBR_OF_EPIDS]);
-+    break;
-+  case PIPE_CONTROL:
-+    /* Check if EP still is enabled */
-+    if (TxCtrlEPList[epid].command & IO_MASK(USB_EP_command, enable)) {
-+      /* The EP was enabled, disable it. */
-+      TxCtrlEPList[epid].command &= ~IO_MASK(USB_EP_command, enable);
-+    }
-+    break;
-+  case PIPE_ISOCHRONOUS:
-+    /* Disabling, busy-wait and unlinking of Isoc SBs will be done in
-+       finish_isoc_urb(). Because there might the case when URB is dequeued
-+       but there are other valid URBs waiting */
-+
-+    /* Check if In Isoc EP still is enabled */
-+    if (TxIsocEPList[epid].command & IO_MASK(USB_EP_command, enable)) {
-+      /* The EP was enabled, disable it. */
-+      TxIsocEPList[epid].command &= ~IO_MASK(USB_EP_command, enable);
-+    }
-+    break;
-+  case PIPE_INTERRUPT:
-+    /* Special care is taken for interrupt URBs. EPs are unlinked in
-+       tc_finish_urb */
-+    break;
-+  default:
-+    break;
-+  }
-+
-+  /* Asynchronous unlink, finish the URB later from scheduled or other
-+     event (data finished, error) */
-+  tc_finish_urb_later(hcd, urb, urb->status);
-+
-+  local_irq_restore(flags);
-+  DBFEXIT;
-+  return 0;
-+}
-+
-+
-+static void tc_sync_finish_epid(struct usb_hcd *hcd, int epid) {
-+  volatile int timeout = 10000;
-+  struct urb* urb;
-+  struct crisv10_urb_priv* urb_priv;
-+  unsigned long flags;
-+  
-+  volatile struct USB_EP_Desc *first_ep;  /* First EP in the list. */
-+  volatile struct USB_EP_Desc *curr_ep;   /* Current EP, the iterator. */
-+  volatile struct USB_EP_Desc *next_ep;   /* The EP after current. */
-+
-+  int type = epid_state[epid].type;
-+
-+  /* Setting this flag will cause enqueue() to return -ENOENT for new
-+     submitions on this endpoint and finish_urb() wont process queue further */
-+  epid_state[epid].disabled = 1;
-+
-+  switch(type) {
-+  case PIPE_BULK:
-+    /* Check if EP still is enabled */
-+    if (TxBulkEPList[epid].command & IO_MASK(USB_EP_command, enable)) {
-+      /* The EP was enabled, disable it. */
-+      TxBulkEPList[epid].command &= ~IO_MASK(USB_EP_command, enable);
-+      tc_warn("sync_finish: Disabling EP for epid:%d\n", epid);
-+
-+      /* Do busy-wait until DMA not using this EP descriptor anymore */
-+      while((*R_DMA_CH8_SUB0_EP ==
-+	     virt_to_phys(&TxBulkEPList[epid])) &&
-+	    (timeout-- > 0));
-+      if(timeout == 0) {
-+	warn("Timeout while waiting for DMA-TX-Bulk to leave EP for"
-+	     " epid:%d\n", epid);
-+      }
-+    }
-+    break;
-+
-+  case PIPE_CONTROL:
-+    /* Check if EP still is enabled */
-+    if (TxCtrlEPList[epid].command & IO_MASK(USB_EP_command, enable)) {
-+      /* The EP was enabled, disable it. */
-+      TxCtrlEPList[epid].command &= ~IO_MASK(USB_EP_command, enable);
-+      tc_warn("sync_finish: Disabling EP for epid:%d\n", epid);
-+
-+      /* Do busy-wait until DMA not using this EP descriptor anymore */
-+      while((*R_DMA_CH8_SUB1_EP ==
-+	     virt_to_phys(&TxCtrlEPList[epid])) &&
-+	    (timeout-- > 0));
-+      if(timeout == 0) {
-+	warn("Timeout while waiting for DMA-TX-Ctrl to leave EP for"
-+	     " epid:%d\n", epid);
-+      }
-+    }
-+    break;
-+
-+  case PIPE_INTERRUPT:
-+    local_irq_save(flags);
-+    /* Disable all Intr EPs belonging to epid */
-+    first_ep = &TxIntrEPList[0];
-+    curr_ep = first_ep;
-+    do {
-+      next_ep = (struct USB_EP_Desc *)phys_to_virt(curr_ep->next);
-+      if (IO_EXTRACT(USB_EP_command, epid, next_ep->command) == epid) {
-+	/* Disable EP */
-+	next_ep->command &= ~IO_MASK(USB_EP_command, enable);
-+      }
-+      curr_ep = phys_to_virt(curr_ep->next);
-+    } while (curr_ep != first_ep);
-+
-+    local_irq_restore(flags);
-+    break;
-+
-+  case PIPE_ISOCHRONOUS:
-+    /* Check if EP still is enabled */
-+    if (TxIsocEPList[epid].command & IO_MASK(USB_EP_command, enable)) {
-+      tc_warn("sync_finish: Disabling Isoc EP for epid:%d\n", epid);
-+      /* The EP was enabled, disable it. */
-+      TxIsocEPList[epid].command &= ~IO_MASK(USB_EP_command, enable);
-+      
-+      while((*R_DMA_CH8_SUB3_EP == virt_to_phys(&TxIsocEPList[epid])) &&
-+	    (timeout-- > 0));
-+      if(timeout == 0) {
-+	warn("Timeout while waiting for DMA-TX-Isoc to leave EP for"
-+	     " epid:%d\n", epid);
-+      }
-+    }
-+    break;
-+  }
-+
-+  local_irq_save(flags);
-+
-+  /* Finish if there is active URB for this endpoint */
-+  if(activeUrbList[epid] != NULL) {
-+    urb = activeUrbList[epid];
-+    urb_priv = urb->hcpriv;
-+    ASSERT(urb_priv);
-+    tc_warn("Sync finish %s URB:0x%x[%d] (%s %s epid:%d) status:%d %s\n",
-+	    (urb == activeUrbList[epid]) ? "active" : "queued",
-+	    (unsigned int)urb, urb_priv->urb_num, str_dir(urb->pipe),
-+	    str_type(urb->pipe), epid, urb->status,
-+	    (urb_priv->later_data) ? "later-sched" : "");
-+
-+    tc_finish_urb(hcd, activeUrbList[epid], -ENOENT);
-+    ASSERT(activeUrbList[epid] == NULL);
-+  }
-+
-+  /* Finish any queued URBs for this endpoint. There won't be any resubmitions
-+     because epid_disabled causes enqueue() to fail for this endpoint */
-+  while((urb = urb_list_first(epid)) != NULL) {
-+    urb_priv = urb->hcpriv;
-+    ASSERT(urb_priv);
-+
-+    tc_warn("Sync finish %s URB:0x%x[%d] (%s %s epid:%d) status:%d %s\n",
-+	    (urb == activeUrbList[epid]) ? "active" : "queued",
-+	    (unsigned int)urb, urb_priv->urb_num, str_dir(urb->pipe),
-+	    str_type(urb->pipe), epid, urb->status,
-+	    (urb_priv->later_data) ? "later-sched" : "");
-+
-+    tc_finish_urb(hcd, urb, -ENOENT);
-+  }
-+  epid_state[epid].disabled = 0;
-+  local_irq_restore(flags);
-+}
-+
-+/* free resources associated with an endpoint (called from hcd_driver) */
-+static void tc_endpoint_disable(struct usb_hcd *hcd, 
-+				struct usb_host_endpoint *ep) {
-+  DBFENTER;
-+  /* Only free epid if it has been allocated. We get two endpoint_disable
-+     requests for ctrl endpoints so ignore the second one */
-+  if(ep->hcpriv != NULL) {
-+    struct crisv10_ep_priv *ep_priv = ep->hcpriv;
-+    int epid = ep_priv->epid;
-+    tc_warn("endpoint_disable ep:0x%x ep-priv:0x%x (%s) (epid:%d freed)\n",
-+	   (unsigned int)ep, (unsigned int)ep->hcpriv,
-+	   endpoint_to_str(&(ep->desc)), epid);
-+
-+    tc_sync_finish_epid(hcd, epid);
-+
-+    ASSERT(activeUrbList[epid] == NULL);
-+    ASSERT(list_empty(&urb_list[epid]));
-+
-+    tc_free_epid(ep);
-+  } else {
-+    tc_dbg("endpoint_disable ep:0x%x ep-priv:0x%x (%s)\n", (unsigned int)ep,
-+	   (unsigned int)ep->hcpriv, endpoint_to_str(&(ep->desc)));
-+  }
-+  DBFEXIT;
-+}
-+
-+//static void tc_finish_urb_later_proc(void *data) {
-+static void tc_finish_urb_later_proc(struct work_struct *work) {
-+  unsigned long flags;
-+  //struct urb_later_data* uld = (struct urb_later_data*)data;
-+  struct urb_later_data* uld = container_of(work, struct urb_later_data, ws.work);
-+  local_irq_save(flags);
-+  if(uld->urb == NULL) {
-+    late_dbg("Later finish of URB = NULL (allready finished)\n");
-+  } else {
-+    struct crisv10_urb_priv* urb_priv = uld->urb->hcpriv;
-+    ASSERT(urb_priv);
-+    if(urb_priv->urb_num == uld->urb_num) {
-+      late_dbg("Later finish of URB:0x%x[%d]\n", (unsigned int)(uld->urb),
-+	       urb_priv->urb_num);
-+      if(uld->status != uld->urb->status) {
-+	errno_dbg("Later-finish URB with status:%d, later-status:%d\n",
-+		  uld->urb->status, uld->status);
-+      }
-+      if(uld != urb_priv->later_data) {
-+	panic("Scheduled uld not same as URBs uld\n");
-+      }
-+      tc_finish_urb(uld->hcd, uld->urb, uld->status);
-+    } else {
-+      late_warn("Ignoring later finish of URB:0x%x[%d]"
-+		", urb_num doesn't match current URB:0x%x[%d]",
-+		(unsigned int)(uld->urb), uld->urb_num,
-+		(unsigned int)(uld->urb), urb_priv->urb_num);
-+    }
-+  }
-+  local_irq_restore(flags);
-+  kmem_cache_free(later_data_cache, uld);
-+}
-+
-+static void tc_finish_urb_later(struct usb_hcd *hcd, struct urb *urb,
-+				int status) {
-+  struct crisv10_urb_priv *urb_priv = urb->hcpriv;
-+  struct urb_later_data* uld;
-+
-+  ASSERT(urb_priv);
-+
-+  if(urb_priv->later_data != NULL) {
-+    /* Later-finish allready scheduled for this URB, just update status to
-+       return when finishing later */
-+    errno_dbg("Later-finish schedule change URB status:%d with new"
-+	      " status:%d\n", urb_priv->later_data->status, status);
-+    
-+    urb_priv->later_data->status = status;
-+    return;
-+  }
-+
-+  uld = kmem_cache_alloc(later_data_cache, GFP_ATOMIC);
-+  ASSERT(uld);
-+
-+  uld->hcd = hcd;
-+  uld->urb = urb;
-+  uld->urb_num = urb_priv->urb_num;
-+  uld->status = status;
-+
-+  //INIT_WORK(&uld->ws, tc_finish_urb_later_proc, uld);
-+  INIT_DELAYED_WORK(&uld->ws, tc_finish_urb_later_proc);
-+  urb_priv->later_data = uld;
-+
-+  /* Schedule the finishing of the URB to happen later */
-+  schedule_delayed_work(&uld->ws, LATER_TIMER_DELAY);
-+}
-+
-+  /* hinko ignore usb_pipeisoc */
-+#if 0
-+static void tc_finish_isoc_urb(struct usb_hcd *hcd, struct urb *urb,
-+			       int status);
-+#endif
-+
-+static void tc_finish_urb(struct usb_hcd *hcd, struct urb *urb, int status) {
-+  struct crisv10_hcd* crisv10_hcd = hcd_to_crisv10_hcd(hcd);
-+  struct crisv10_urb_priv *urb_priv = urb->hcpriv;
-+  int epid;
-+  char toggle;
-+  int urb_num;
-+  unsigned long flags;
-+
-+  DBFENTER;
-+  ASSERT(urb_priv != NULL);
-+  epid = urb_priv->epid;
-+  urb_num = urb_priv->urb_num;
-+
-+  if(urb != activeUrbList[epid]) {
-+    if(urb_list_entry(urb, epid)) {
-+      /* Remove this URB from the list. Only happens when URB are finished
-+	 before having been processed (dequeing) */
-+      urb_list_del(urb, epid);
-+    } else {
-+      tc_warn("Finishing of URB:0x%x[%d] neither active or in queue for"
-+	      " epid:%d\n", (unsigned int)urb, urb_num, epid);
-+    }
-+  }
-+
-+  /* Cancel any pending later-finish of this URB */
-+  if(urb_priv->later_data) {
-+    urb_priv->later_data->urb = NULL;
-+  }
-+
-+  /* For an IN pipe, we always set the actual length, regardless of whether
-+     there was an error or not (which means the device driver can use the data
-+     if it wants to). */
-+  if(usb_pipein(urb->pipe)) {
-+    urb->actual_length = urb_priv->rx_offset;
-+  } else {
-+    /* Set actual_length for OUT urbs also; the USB mass storage driver seems
-+       to want that. */
-+    if (status == 0 && urb->status == -EINPROGRESS) {
-+      urb->actual_length = urb->transfer_buffer_length;
-+    } else {
-+      /*  We wouldn't know of any partial writes if there was an error. */
-+      urb->actual_length = 0;
-+    }
-+  }
-+
-+
-+  /* URB status mangling */
-+  if(urb->status == -EINPROGRESS) {
-+    /* The USB core hasn't changed the status, let's set our finish status */
-+    urb->status = status;
-+
-+    if ((status == 0) && (urb->transfer_flags & URB_SHORT_NOT_OK) &&
-+	usb_pipein(urb->pipe) &&
-+	(urb->actual_length != urb->transfer_buffer_length)) {
-+      /* URB_SHORT_NOT_OK means that short reads (shorter than the endpoint's
-+	 max length) is to be treated as an error. */
-+      errno_dbg("Finishing URB:0x%x[%d] with SHORT_NOT_OK flag and short"
-+		" data:%d\n", (unsigned int)urb, urb_num,
-+		urb->actual_length);
-+      urb->status = -EREMOTEIO;
-+    }
-+
-+    if(urb_priv->urb_state == UNLINK) {
-+      /* URB has been requested to be unlinked asynchronously */
-+      urb->status = -ECONNRESET;
-+      errno_dbg("Fixing unlink status of URB:0x%x[%d] to:%d\n",
-+		(unsigned int)urb, urb_num, urb->status);
-+    }
-+  } else {
-+    /* The USB Core wants to signal some error via the URB, pass it through */
-+  }
-+
-+  /* hinko ignore usb_pipeisoc */
-+#if 0
-+  /* use completely different finish function for Isoc URBs */
-+  if(usb_pipeisoc(urb->pipe)) {
-+    tc_finish_isoc_urb(hcd, urb, status);
-+    return;
-+  }
-+#endif
-+
-+  /* Do special unlinking of EPs for Intr traffic */
-+  if(usb_pipeint(urb->pipe)) {
-+    tc_dma_unlink_intr_urb(urb);
-+  }
-+
-+  /* hinko ignore usb_pipeisoc */
-+#if 0
-+  /* Release allocated bandwidth for periodic transfers */
-+  if(usb_pipeint(urb->pipe) || usb_pipeisoc(urb->pipe))
-+    usb_release_bandwidth(urb->dev, urb, 0);
-+#endif
-+  
-+  /* This URB is active on EP */
-+  if(urb == activeUrbList[epid]) {
-+    /* We need to fiddle with the toggle bits because the hardware doesn't do
-+       it for us. */
-+    toggle = etrax_epid_get_toggle(epid, usb_pipeout(urb->pipe));
-+    usb_settoggle(urb->dev, usb_pipeendpoint(urb->pipe),
-+		  usb_pipeout(urb->pipe), toggle);
-+
-+    /* Checks for Ctrl and Bulk EPs */
-+    switch(usb_pipetype(urb->pipe)) {
-+    case PIPE_BULK:
-+      /* Check so Bulk EP realy is disabled before finishing active URB  */
-+      ASSERT((TxBulkEPList[epid].command & IO_MASK(USB_EP_command, enable)) ==
-+	     IO_STATE(USB_EP_command, enable, no));
-+      /* Disable sub-pointer for EP to avoid next tx_interrupt() to
-+	 process Bulk EP. */
-+      TxBulkEPList[epid].sub = 0;
-+      /* No need to wait for the DMA before changing the next pointer.
-+	 The modulo NBR_OF_EPIDS isn't actually necessary, since we will never use
-+	 the last one (INVALID_EPID) for actual traffic. */
-+      TxBulkEPList[epid].next = 
-+	virt_to_phys(&TxBulkEPList[(epid + 1) % NBR_OF_EPIDS]);
-+      break;
-+    case PIPE_CONTROL:
-+      /* Check so Ctrl EP realy is disabled before finishing active URB  */
-+      ASSERT((TxCtrlEPList[epid].command & IO_MASK(USB_EP_command, enable)) ==
-+	     IO_STATE(USB_EP_command, enable, no));
-+      /* Disable sub-pointer for EP to avoid next tx_interrupt() to
-+	 process Ctrl EP. */
-+      TxCtrlEPList[epid].sub = 0;
-+      break;
-+    }
-+  }
-+
-+  /* Free HC-private URB data*/
-+  urb_priv_free(hcd, urb);
-+
-+  if(urb->status) {
-+    errno_dbg("finish_urb (URB:0x%x[%d] %s %s) (data:%d) status:%d\n",
-+	      (unsigned int)urb, urb_num, str_dir(urb->pipe),
-+	      str_type(urb->pipe), urb->actual_length, urb->status);
-+  } else {
-+    tc_dbg("finish_urb (URB:0x%x[%d] %s %s) (data:%d) status:%d\n",
-+	   (unsigned int)urb, urb_num, str_dir(urb->pipe),
-+	   str_type(urb->pipe), urb->actual_length, urb->status);
-+  }
-+
-+  /* If we just finished an active URB, clear active pointer. */
-+  if (urb == activeUrbList[epid]) {
-+    /* Make URB not active on EP anymore */
-+    activeUrbList[epid] = NULL;
-+
-+    if(urb->status == 0) {
-+      /* URB finished sucessfully, process queue to see if there are any more
-+	 URBs waiting before we call completion function.*/
-+      if(crisv10_hcd->running) {
-+	/* Only process queue if USB controller is running */
-+	tc_dma_process_queue(epid);
-+      } else {
-+	tc_warn("No processing of queue for epid:%d, USB Controller not"
-+		" running\n", epid);
-+      }
-+    }
-+  }
-+
-+  /*  Hand the URB from HCD to its USB device driver, using its completion
-+      functions */
-+//  usb_hcd_giveback_urb (hcd, urb);
-+	/**
-+	 * usb_hcd_unlink_urb_from_ep - remove an URB from its endpoint queue
-+	 * @hcd: host controller to which @urb was submitted
-+	 * @urb: URB being unlinked
-+	 *
-+	 * Host controller drivers should call this routine before calling
-+	 * usb_hcd_giveback_urb().  The HCD's private spinlock must be held and
-+	 * interrupts must be disabled.  The actions carried out here are required
-+	 * for URB completion.
-+	 */
-+  
-+  /*hinko link/unlink urb -> ep */
-+  //spin_lock(&crisv10_hcd->lock);
-+  spin_lock_irqsave(&crisv10_hcd->lock, flags);
-+  usb_hcd_unlink_urb_from_ep(hcd, urb);
-+  usb_hcd_giveback_urb(hcd, urb, status);
-+  //spin_unlock(&crisv10_hcd->lock);
-+  spin_unlock_irqrestore(&crisv10_hcd->lock, flags);
-+
-+  /* Check the queue once more if the URB returned with error, because we
-+     didn't do it before the completion function because the specification
-+     states that the queue should not restart until all it's unlinked
-+     URBs have been fully retired, with the completion functions run */
-+  if(crisv10_hcd->running) {
-+    /* Only process queue if USB controller is running */
-+    tc_dma_process_queue(epid);
-+  } else {
-+    tc_warn("No processing of queue for epid:%d, USB Controller not running\n",
-+	    epid);
-+  }
-+
-+  DBFEXIT;
-+}
-+
-+  /* hinko ignore usb_pipeisoc */
-+#if 0
-+static void tc_finish_isoc_urb(struct usb_hcd *hcd, struct urb *urb,
-+			       int status) {
-+  struct crisv10_urb_priv *urb_priv = urb->hcpriv;
-+  int epid, i;
-+  volatile int timeout = 10000;
-+
-+  ASSERT(urb_priv);
-+  epid = urb_priv->epid;
-+
-+  ASSERT(usb_pipeisoc(urb->pipe));
-+
-+  /* Set that all isoc packets have status and length set before
-+     completing the urb. */
-+  for (i = urb_priv->isoc_packet_counter; i < urb->number_of_packets; i++){
-+    urb->iso_frame_desc[i].actual_length = 0;
-+    urb->iso_frame_desc[i].status = -EPROTO;
-+  }
-+
-+  /* Check if the URB is currently active (done or error) */
-+  if(urb == activeUrbList[epid]) {
-+    /* Check if there are another In Isoc URB queued for this epid */
-+    if (!list_empty(&urb_list[epid])&& !epid_state[epid].disabled) {
-+      /* Move it from queue to active and mark it started so Isoc transfers
-+	 won't be interrupted.
-+	 All Isoc URBs data transfers are already added to DMA lists so we
-+	 don't have to insert anything in DMA lists here. */
-+      activeUrbList[epid] = urb_list_first(epid);
-+      ((struct crisv10_urb_priv *)(activeUrbList[epid]->hcpriv))->urb_state =
-+	STARTED;
-+      urb_list_del(activeUrbList[epid], epid);
-+
-+      if(urb->status) {
-+	errno_dbg("finish_isoc_urb (URB:0x%x[%d] %s %s) (%d of %d packets)"
-+		  " status:%d, new waiting URB:0x%x[%d]\n",
-+		  (unsigned int)urb, urb_priv->urb_num, str_dir(urb->pipe),
-+		  str_type(urb->pipe), urb_priv->isoc_packet_counter,
-+		  urb->number_of_packets, urb->status,
-+		  (unsigned int)activeUrbList[epid],
-+		  ((struct crisv10_urb_priv *)(activeUrbList[epid]->hcpriv))->urb_num);
-+      }
-+
-+    } else { /* No other URB queued for this epid */
-+      if(urb->status) {
-+	errno_dbg("finish_isoc_urb (URB:0x%x[%d] %s %s) (%d of %d packets)"
-+		  " status:%d, no new URB waiting\n",
-+		  (unsigned int)urb, urb_priv->urb_num, str_dir(urb->pipe),
-+		  str_type(urb->pipe), urb_priv->isoc_packet_counter,
-+		  urb->number_of_packets, urb->status);
-+      }
-+
-+      /* Check if EP is still enabled, then shut it down. */
-+      if (TxIsocEPList[epid].command & IO_MASK(USB_EP_command, enable)) {
-+	isoc_dbg("Isoc EP enabled for epid:%d, disabling it\n", epid);
-+
-+	/* Should only occur for In Isoc EPs where SB isn't consumed. */
-+	ASSERT(usb_pipein(urb->pipe));
-+
-+	/* Disable it and wait for it to stop */
-+	TxIsocEPList[epid].command &= ~IO_MASK(USB_EP_command, enable);
-+	
-+	/* Ah, the luxury of busy-wait. */
-+	while((*R_DMA_CH8_SUB3_EP == virt_to_phys(&TxIsocEPList[epid])) &&
-+	      (timeout-- > 0));
-+	if(timeout == 0) {
-+	  warn("Timeout while waiting for DMA-TX-Isoc to leave EP for epid:%d\n", epid);
-+	}
-+      }
-+
-+      /* Unlink SB to say that epid is finished. */
-+      TxIsocEPList[epid].sub = 0;
-+      TxIsocEPList[epid].hw_len = 0;
-+
-+      /* No URB active for EP anymore */
-+      activeUrbList[epid] = NULL;
-+    }
-+  } else { /* Finishing of not active URB (queued up with SBs thought) */
-+    isoc_warn("finish_isoc_urb (URB:0x%x %s) (%d of %d packets) status:%d,"
-+	      " SB queued but not active\n",
-+	      (unsigned int)urb, str_dir(urb->pipe),
-+	      urb_priv->isoc_packet_counter, urb->number_of_packets,
-+	      urb->status);
-+    if(usb_pipeout(urb->pipe)) {
-+      /* Finishing of not yet active Out Isoc URB needs unlinking of SBs. */
-+      struct USB_SB_Desc *iter_sb, *prev_sb, *next_sb;
-+
-+      iter_sb = TxIsocEPList[epid].sub ?
-+	phys_to_virt(TxIsocEPList[epid].sub) : 0;
-+      prev_sb = 0;
-+
-+      /* SB that is linked before this URBs first SB */
-+      while (iter_sb && (iter_sb != urb_priv->first_sb)) {
-+	prev_sb = iter_sb;
-+	iter_sb = iter_sb->next ? phys_to_virt(iter_sb->next) : 0;
-+      }
-+
-+      if (iter_sb == 0) {
-+	/* Unlink of the URB currently being transmitted. */
-+	prev_sb = 0;
-+	iter_sb = TxIsocEPList[epid].sub ? phys_to_virt(TxIsocEPList[epid].sub) : 0;
-+      }
-+
-+      while (iter_sb && (iter_sb != urb_priv->last_sb)) {
-+	iter_sb = iter_sb->next ? phys_to_virt(iter_sb->next) : 0;
-+      }
-+
-+      if (iter_sb) {
-+	next_sb = iter_sb->next ? phys_to_virt(iter_sb->next) : 0;
-+      } else {
-+	/* This should only happen if the DMA has completed
-+	   processing the SB list for this EP while interrupts
-+	   are disabled. */
-+	isoc_dbg("Isoc urb not found, already sent?\n");
-+	next_sb = 0;
-+      }
-+      if (prev_sb) {
-+	prev_sb->next = next_sb ? virt_to_phys(next_sb) : 0;
-+      } else {
-+	TxIsocEPList[epid].sub = next_sb ? virt_to_phys(next_sb) : 0;
-+      }
-+    }
-+  }
-+
-+  /* Free HC-private URB data*/
-+  urb_priv_free(hcd, urb);
-+
-+  usb_release_bandwidth(urb->dev, urb, 0);
-+
-+  /*  Hand the URB from HCD to its USB device driver, using its completion
-+      functions */
-+  usb_hcd_giveback_urb (hcd, urb);
-+}
-+#endif
-+
-+static __u32 urb_num = 0;
-+
-+/* allocate and initialize URB private data */
-+static int urb_priv_create(struct usb_hcd *hcd, struct urb *urb, int epid,
-+			   int mem_flags) {
-+  struct crisv10_urb_priv *urb_priv;
-+  
-+  urb_priv = kmalloc(sizeof *urb_priv, mem_flags);
-+  if (!urb_priv)
-+    return -ENOMEM;
-+  memset(urb_priv, 0, sizeof *urb_priv);
-+
-+  urb_priv->epid = epid;
-+  urb_priv->urb_state = NOT_STARTED;
-+
-+  urb->hcpriv = urb_priv;
-+  /* Assign URB a sequence number, and increment counter */
-+  urb_priv->urb_num = urb_num;
-+  urb_num++;
-+  return 0;
-+}
-+
-+/* free URB private data */
-+static void urb_priv_free(struct usb_hcd *hcd, struct urb *urb) {
-+  int i;
-+  struct crisv10_urb_priv *urb_priv = urb->hcpriv;
-+  ASSERT(urb_priv != 0);
-+
-+  /* Check it has any SBs linked that needs to be freed*/
-+  if(urb_priv->first_sb != NULL) {
-+    struct USB_SB_Desc *next_sb, *first_sb, *last_sb;
-+    int i = 0;
-+    first_sb = urb_priv->first_sb;
-+    last_sb = urb_priv->last_sb;
-+    ASSERT(last_sb);
-+    while(first_sb != last_sb) {
-+      next_sb = (struct USB_SB_Desc *)phys_to_virt(first_sb->next);
-+      kmem_cache_free(usb_desc_cache, first_sb);
-+      first_sb = next_sb;
-+      i++;
-+    }
-+    kmem_cache_free(usb_desc_cache, last_sb);
-+    i++;
-+  }
-+
-+  /* Check if it has any EPs in its Intr pool that also needs to be freed */
-+  if(urb_priv->intr_ep_pool_length > 0) {
-+    for(i = 0; i < urb_priv->intr_ep_pool_length; i++) {
-+      kfree(urb_priv->intr_ep_pool[i]);
-+    }
-+    /*
-+    tc_dbg("Freed %d EPs from URB:0x%x EP pool\n",
-+	     urb_priv->intr_ep_pool_length, (unsigned int)urb);
-+    */
-+  }
-+
-+  kfree(urb_priv);
-+  urb->hcpriv = NULL;
-+}
-+
-+static int ep_priv_create(struct usb_host_endpoint *ep, int mem_flags) {
-+  struct crisv10_ep_priv *ep_priv;
-+  
-+  ep_priv = kmalloc(sizeof *ep_priv, mem_flags);
-+  if (!ep_priv)
-+    return -ENOMEM;
-+  memset(ep_priv, 0, sizeof *ep_priv);
-+
-+  ep->hcpriv = ep_priv;
-+  return 0;
-+}
-+
-+static void ep_priv_free(struct usb_host_endpoint *ep) {
-+  struct crisv10_ep_priv *ep_priv = ep->hcpriv;
-+  ASSERT(ep_priv);
-+  kfree(ep_priv);
-+  ep->hcpriv = NULL;
-+}
-+
-+/* EPID handling functions, managing EP-list in Etrax through wrappers */
-+/* ------------------------------------------------------------------- */
-+
-+/* Sets up a new EPID for an endpoint or returns existing if found */
-+//static int tc_setup_epid(struct usb_host_endpoint *ep, struct urb *urb,
-+//			 int mem_flags) {
-+static int tc_setup_epid(struct urb *urb, int mem_flags)
-+{
-+  int epid;
-+  char devnum, endpoint, out_traffic, slow;
-+  int maxlen;
-+  __u32 epid_data;
-+  struct usb_host_endpoint *ep = urb->ep;
-+  struct crisv10_ep_priv *ep_priv = ep->hcpriv;
-+  
-+  DBFENTER;
-+  
-+  /* Check if a valid epid already is setup for this endpoint */
-+  if(ep_priv != NULL) {
-+    return ep_priv->epid;
-+  }
-+
-+  /* We must find and initiate a new epid for this urb. */
-+  epid = tc_allocate_epid();
-+  
-+  if (epid == -1) {
-+    /* Failed to allocate a new epid. */
-+    DBFEXIT;
-+    return epid;
-+  }
-+  
-+  /* We now have a new epid to use. Claim it. */
-+  epid_state[epid].inuse = 1;
-+  
-+  /* Init private data for new endpoint */
-+  if(ep_priv_create(ep, mem_flags) != 0) {
-+    return -ENOMEM;
-+  }
-+  ep_priv = ep->hcpriv;
-+  ep_priv->epid = epid;
-+
-+  devnum = usb_pipedevice(urb->pipe);
-+  endpoint = usb_pipeendpoint(urb->pipe);
-+  slow = (urb->dev->speed == USB_SPEED_LOW);
-+  maxlen = usb_maxpacket(urb->dev, urb->pipe, usb_pipeout(urb->pipe));
-+
-+  if (usb_pipetype(urb->pipe) == PIPE_CONTROL) {
-+    /* We want both IN and OUT control traffic to be put on the same
-+       EP/SB list. */
-+    out_traffic = 1;
-+  } else {
-+    out_traffic = usb_pipeout(urb->pipe);
-+  }
-+    
-+  if (usb_pipetype(urb->pipe) == PIPE_ISOCHRONOUS) {
-+    epid_data = IO_STATE(R_USB_EPT_DATA_ISO, valid, yes) |
-+      /* FIXME: Change any to the actual port? */
-+      IO_STATE(R_USB_EPT_DATA_ISO, port, any) |
-+      IO_FIELD(R_USB_EPT_DATA_ISO, max_len, maxlen) |
-+      IO_FIELD(R_USB_EPT_DATA_ISO, ep, endpoint) |
-+      IO_FIELD(R_USB_EPT_DATA_ISO, dev, devnum);
-+    etrax_epid_iso_set(epid, epid_data);
-+  } else {
-+    epid_data = IO_STATE(R_USB_EPT_DATA, valid, yes) |
-+      IO_FIELD(R_USB_EPT_DATA, low_speed, slow) |
-+      /* FIXME: Change any to the actual port? */
-+      IO_STATE(R_USB_EPT_DATA, port, any) |
-+      IO_FIELD(R_USB_EPT_DATA, max_len, maxlen) |
-+      IO_FIELD(R_USB_EPT_DATA, ep, endpoint) |
-+      IO_FIELD(R_USB_EPT_DATA, dev, devnum);
-+    etrax_epid_set(epid, epid_data);
-+  }
-+  
-+  epid_state[epid].out_traffic = out_traffic;
-+  epid_state[epid].type = usb_pipetype(urb->pipe);
-+
-+  tc_warn("Setting up ep:0x%x epid:%d (addr:%d endp:%d max_len:%d %s %s %s)\n",
-+	  (unsigned int)ep, epid, devnum, endpoint, maxlen,
-+	  str_type(urb->pipe), out_traffic ? "out" : "in",
-+	  slow ? "low" : "full");
-+
-+  /* Enable Isoc eof interrupt if we set up the first Isoc epid */
-+  if(usb_pipeisoc(urb->pipe)) {
-+    isoc_epid_counter++;
-+    if(isoc_epid_counter == 1) {
-+      isoc_warn("Enabled Isoc eof interrupt\n");
-+      *R_USB_IRQ_MASK_SET |= IO_STATE(R_USB_IRQ_MASK_SET, iso_eof, set);
-+    }
-+  }
-+
-+  DBFEXIT;
-+  return epid;
-+}
-+
-+static void tc_free_epid(struct usb_host_endpoint *ep) {
-+  unsigned long flags;
-+  struct crisv10_ep_priv *ep_priv = ep->hcpriv;
-+  int epid;
-+  volatile int timeout = 10000;
-+
-+  DBFENTER;
-+
-+  if (ep_priv == NULL) {
-+    tc_warn("Trying to free unused epid on ep:0x%x\n", (unsigned int)ep);
-+    DBFEXIT;
-+    return;
-+  }
-+
-+  epid = ep_priv->epid;
-+
-+  /* Disable Isoc eof interrupt if we free the last Isoc epid */
-+  if(epid_isoc(epid)) {
-+    ASSERT(isoc_epid_counter > 0);
-+    isoc_epid_counter--;
-+    if(isoc_epid_counter == 0) {
-+      *R_USB_IRQ_MASK_SET &= ~IO_STATE(R_USB_IRQ_MASK_SET, iso_eof, set);
-+      isoc_warn("Disabled Isoc eof interrupt\n");
-+    }
-+  }
-+
-+  /* Take lock manualy instead of in epid_x_x wrappers,
-+     because we need to be polling here */
-+  spin_lock_irqsave(&etrax_epid_lock, flags);
-+  
-+  *R_USB_EPT_INDEX = IO_FIELD(R_USB_EPT_INDEX, value, epid);
-+  nop();
-+  while((*R_USB_EPT_DATA & IO_MASK(R_USB_EPT_DATA, hold)) &&
-+	(timeout-- > 0));
-+  if(timeout == 0) {
-+    warn("Timeout while waiting for epid:%d to drop hold\n", epid);
-+  }
-+  /* This will, among other things, set the valid field to 0. */
-+  *R_USB_EPT_DATA = 0;
-+  spin_unlock_irqrestore(&etrax_epid_lock, flags);
-+  
-+  /* Free resource in software state info list */
-+  epid_state[epid].inuse = 0;
-+
-+  /* Free private endpoint data */
-+  ep_priv_free(ep);
-+  
-+  DBFEXIT;
-+}
-+
-+static int tc_allocate_epid(void) {
-+  int i;
-+  DBFENTER;
-+  for (i = 0; i < NBR_OF_EPIDS; i++) {
-+    if (!epid_inuse(i)) {
-+      DBFEXIT;
-+      return i;
-+    }
-+  }
-+  
-+  tc_warn("Found no free epids\n");
-+  DBFEXIT;
-+  return -1;
-+}
-+
-+
-+/* Wrappers around the list functions (include/linux/list.h). */
-+/* ---------------------------------------------------------- */
-+static inline int __urb_list_empty(int epid) {
-+  int retval;
-+  retval = list_empty(&urb_list[epid]);
-+  return retval;
-+}
-+
-+/* Returns first urb for this epid, or NULL if list is empty. */
-+static inline struct urb *urb_list_first(int epid) {
-+  unsigned long flags;
-+  struct urb *first_urb = 0;
-+  spin_lock_irqsave(&urb_list_lock, flags);
-+  if (!__urb_list_empty(epid)) {
-+    /* Get the first urb (i.e. head->next). */
-+    urb_entry_t *urb_entry = list_entry((&urb_list[epid])->next, urb_entry_t, list);
-+    first_urb = urb_entry->urb;
-+  }
-+  spin_unlock_irqrestore(&urb_list_lock, flags);
-+  return first_urb;
-+}
-+
-+/* Adds an urb_entry last in the list for this epid. */
-+static inline void urb_list_add(struct urb *urb, int epid, int mem_flags) {
-+  unsigned long flags;
-+  urb_entry_t *urb_entry = (urb_entry_t *)kmalloc(sizeof(urb_entry_t), mem_flags);
-+  ASSERT(urb_entry);
-+  
-+  urb_entry->urb = urb;
-+  spin_lock_irqsave(&urb_list_lock, flags);
-+  list_add_tail(&urb_entry->list, &urb_list[epid]);
-+  spin_unlock_irqrestore(&urb_list_lock, flags);
-+}
-+
-+/* Search through the list for an element that contains this urb. (The list
-+   is expected to be short and the one we are about to delete will often be
-+   the first in the list.)
-+   Should be protected by spin_locks in calling function */
-+static inline urb_entry_t *__urb_list_entry(struct urb *urb, int epid) {
-+  struct list_head *entry;
-+  struct list_head *tmp;
-+  urb_entry_t *urb_entry;
-+  
-+  list_for_each_safe(entry, tmp, &urb_list[epid]) {
-+    urb_entry = list_entry(entry, urb_entry_t, list);
-+    ASSERT(urb_entry);
-+    ASSERT(urb_entry->urb);
-+    
-+    if (urb_entry->urb == urb) {
-+      return urb_entry;
-+    }
-+  }
-+  return 0;
-+}
-+
-+/* Same function as above but for global use. Protects list by spinlock */
-+static inline urb_entry_t *urb_list_entry(struct urb *urb, int epid) {
-+  unsigned long flags;
-+  urb_entry_t *urb_entry;
-+  spin_lock_irqsave(&urb_list_lock, flags);
-+  urb_entry = __urb_list_entry(urb, epid);
-+  spin_unlock_irqrestore(&urb_list_lock, flags);
-+  return (urb_entry);
-+}
-+
-+/* Delete an urb from the list. */
-+static inline void urb_list_del(struct urb *urb, int epid) {
-+  unsigned long flags;
-+  urb_entry_t *urb_entry;
-+
-+  /* Delete entry and free. */
-+  spin_lock_irqsave(&urb_list_lock, flags);
-+  urb_entry = __urb_list_entry(urb, epid);
-+  ASSERT(urb_entry);
-+
-+  list_del(&urb_entry->list);
-+  spin_unlock_irqrestore(&urb_list_lock, flags);
-+  kfree(urb_entry);
-+}
-+
-+/* Move an urb to the end of the list. */
-+static inline void urb_list_move_last(struct urb *urb, int epid) {
-+  unsigned long flags;
-+  urb_entry_t *urb_entry;
-+  
-+  spin_lock_irqsave(&urb_list_lock, flags);
-+  urb_entry = __urb_list_entry(urb, epid);
-+  ASSERT(urb_entry);
-+
-+  list_del(&urb_entry->list);
-+  list_add_tail(&urb_entry->list, &urb_list[epid]);
-+  spin_unlock_irqrestore(&urb_list_lock, flags);
-+}
-+
-+/* Get the next urb in the list. */
-+static inline struct urb *urb_list_next(struct urb *urb, int epid) {
-+  unsigned long flags;
-+  urb_entry_t *urb_entry;
-+
-+  spin_lock_irqsave(&urb_list_lock, flags);
-+  urb_entry = __urb_list_entry(urb, epid);
-+  ASSERT(urb_entry);
-+
-+  if (urb_entry->list.next != &urb_list[epid]) {
-+    struct list_head *elem = urb_entry->list.next;
-+    urb_entry = list_entry(elem, urb_entry_t, list);
-+    spin_unlock_irqrestore(&urb_list_lock, flags);
-+    return urb_entry->urb;
-+  } else {
-+    spin_unlock_irqrestore(&urb_list_lock, flags);
-+    return NULL;
-+  }
-+}
-+
-+struct USB_EP_Desc* create_ep(int epid, struct USB_SB_Desc* sb_desc,
-+			      int mem_flags) {
-+  struct USB_EP_Desc *ep_desc;
-+  ep_desc = (struct USB_EP_Desc *) kmem_cache_alloc(usb_desc_cache, mem_flags);
-+  if(ep_desc == NULL)
-+    return NULL;
-+  memset(ep_desc, 0, sizeof(struct USB_EP_Desc));
-+
-+  ep_desc->hw_len = 0;
-+  ep_desc->command = (IO_FIELD(USB_EP_command, epid, epid) |
-+		      IO_STATE(USB_EP_command, enable, yes));
-+  if(sb_desc == NULL) {
-+    ep_desc->sub = 0;
-+  } else {
-+    ep_desc->sub = virt_to_phys(sb_desc);
-+  }
-+  return ep_desc;
-+}
-+
-+#define TT_ZOUT  0
-+#define TT_IN    1
-+#define TT_OUT   2
-+#define TT_SETUP 3
-+
-+#define CMD_EOL  IO_STATE(USB_SB_command, eol, yes)
-+#define CMD_INTR IO_STATE(USB_SB_command, intr, yes)
-+#define CMD_FULL IO_STATE(USB_SB_command, full, yes)
-+
-+/* Allocation and setup of a generic SB. Used to create SETUP, OUT and ZOUT
-+   SBs. Also used by create_sb_in() to avoid same allocation procedure at two
-+   places */
-+struct USB_SB_Desc* create_sb(struct USB_SB_Desc* sb_prev, int tt, void* data,
-+			      int datalen, int mem_flags) {
-+  struct USB_SB_Desc *sb_desc;
-+  sb_desc = (struct USB_SB_Desc*)kmem_cache_alloc(usb_desc_cache, mem_flags);
-+  if(sb_desc == NULL)
-+    return NULL;
-+  memset(sb_desc, 0, sizeof(struct USB_SB_Desc));
-+
-+  sb_desc->command = IO_FIELD(USB_SB_command, tt, tt) |
-+                     IO_STATE(USB_SB_command, eot, yes);
-+
-+  sb_desc->sw_len = datalen;
-+  if(data != NULL) {
-+    sb_desc->buf = virt_to_phys(data);
-+  } else {
-+    sb_desc->buf = 0;
-+  }
-+  if(sb_prev != NULL) {
-+    sb_prev->next = virt_to_phys(sb_desc);
-+  }
-+  return sb_desc;
-+}
-+
-+/* Creates a copy of an existing SB by allocation space for it and copy
-+   settings */
-+struct USB_SB_Desc* create_sb_copy(struct USB_SB_Desc* sb_orig, int mem_flags) {
-+  struct USB_SB_Desc *sb_desc;
-+  sb_desc = (struct USB_SB_Desc*)kmem_cache_alloc(usb_desc_cache, mem_flags);
-+  if(sb_desc == NULL)
-+    return NULL;
-+
-+  memcpy(sb_desc, sb_orig, sizeof(struct USB_SB_Desc));
-+  return sb_desc;
-+}
-+
-+/* A specific create_sb function for creation of in SBs. This is due to
-+   that datalen in In SBs shows how many packets we are expecting. It also
-+   sets up the rem field to show if how many bytes we expect in last packet
-+   if it's not a full one */
-+struct USB_SB_Desc* create_sb_in(struct USB_SB_Desc* sb_prev, int datalen,
-+				 int maxlen, int mem_flags) {
-+  struct USB_SB_Desc *sb_desc;
-+  sb_desc = create_sb(sb_prev, TT_IN, NULL,
-+		      datalen ? (datalen - 1) / maxlen + 1 : 0, mem_flags);
-+  if(sb_desc == NULL)
-+    return NULL;
-+  sb_desc->command |= IO_FIELD(USB_SB_command, rem, datalen % maxlen);
-+  return sb_desc;
-+}
-+
-+void set_sb_cmds(struct USB_SB_Desc *sb_desc, __u16 flags) {
-+  sb_desc->command |= flags;
-+}
-+
-+int create_sb_for_urb(struct urb *urb, int mem_flags) {
-+  int is_out = !usb_pipein(urb->pipe);
-+  int type = usb_pipetype(urb->pipe);
-+  int maxlen = usb_maxpacket(urb->dev, urb->pipe, is_out);
-+  int buf_len = urb->transfer_buffer_length;
-+  void *buf = buf_len > 0 ? urb->transfer_buffer : NULL;
-+  struct USB_SB_Desc *sb_desc = NULL;
-+
-+  struct crisv10_urb_priv *urb_priv = (struct crisv10_urb_priv *)urb->hcpriv;
-+  ASSERT(urb_priv != NULL);
-+
-+  switch(type) {
-+  case PIPE_CONTROL:
-+    /* Setup stage */
-+    sb_desc = create_sb(NULL, TT_SETUP, urb->setup_packet, 8, mem_flags);
-+    if(sb_desc == NULL)
-+      return -ENOMEM;
-+    set_sb_cmds(sb_desc, CMD_FULL);
-+
-+    /* Attach first SB to URB */
-+    urb_priv->first_sb = sb_desc;    
-+
-+    if (is_out) { /* Out Control URB */
-+      /* If this Control OUT transfer has an optional data stage we add
-+	 an OUT token before the mandatory IN (status) token */
-+      if ((buf_len > 0) && buf) {
-+	sb_desc = create_sb(sb_desc, TT_OUT, buf, buf_len, mem_flags);
-+	if(sb_desc == NULL)
-+	  return -ENOMEM;
-+	set_sb_cmds(sb_desc, CMD_FULL);
-+      }
-+
-+      /* Status stage */
-+      /* The data length has to be exactly 1. This is due to a requirement
-+         of the USB specification that a host must be prepared to receive
-+         data in the status phase */
-+      sb_desc = create_sb(sb_desc, TT_IN, NULL, 1, mem_flags);
-+      if(sb_desc == NULL)
-+	return -ENOMEM;
-+    } else { /* In control URB */
-+      /* Data stage */
-+      sb_desc = create_sb_in(sb_desc, buf_len, maxlen, mem_flags);
-+      if(sb_desc == NULL)
-+	return -ENOMEM;
-+
-+      /* Status stage */
-+      /* Read comment at zout_buffer declaration for an explanation to this. */
-+      sb_desc = create_sb(sb_desc, TT_ZOUT, &zout_buffer[0], 1, mem_flags);
-+      if(sb_desc == NULL)
-+	return -ENOMEM;
-+      /* Set descriptor interrupt flag for in URBs so we can finish URB after
-+         zout-packet has been sent */
-+      set_sb_cmds(sb_desc, CMD_INTR | CMD_FULL);
-+    }
-+    /* Set end-of-list flag in last SB */
-+    set_sb_cmds(sb_desc, CMD_EOL);
-+    /* Attach last SB to URB */
-+    urb_priv->last_sb = sb_desc;
-+    break;
-+
-+  case PIPE_BULK:
-+    if (is_out) { /* Out Bulk URB */
-+      sb_desc = create_sb(NULL, TT_OUT, buf, buf_len, mem_flags);
-+      if(sb_desc == NULL)
-+	return -ENOMEM;
-+      /* The full field is set to yes, even if we don't actually check that
-+	 this is a full-length transfer (i.e., that transfer_buffer_length %
-+	 maxlen = 0).
-+	 Setting full prevents the USB controller from sending an empty packet
-+	 in that case.  However, if URB_ZERO_PACKET was set we want that. */
-+      if (!(urb->transfer_flags & URB_ZERO_PACKET)) {
-+	set_sb_cmds(sb_desc, CMD_FULL);
-+      }
-+    } else { /* In Bulk URB */
-+      sb_desc = create_sb_in(NULL, buf_len, maxlen, mem_flags);
-+      if(sb_desc == NULL)
-+	return -ENOMEM;
-+    }
-+    /* Set end-of-list flag for last SB */
-+    set_sb_cmds(sb_desc, CMD_EOL);
-+
-+    /* Attach SB to URB */
-+    urb_priv->first_sb = sb_desc;
-+    urb_priv->last_sb = sb_desc;
-+    break;
-+
-+  case PIPE_INTERRUPT:
-+    if(is_out) { /* Out Intr URB */
-+      sb_desc = create_sb(NULL, TT_OUT, buf, buf_len, mem_flags);
-+      if(sb_desc == NULL)
-+	return -ENOMEM;
-+
-+      /* The full field is set to yes, even if we don't actually check that
-+	 this is a full-length transfer (i.e., that transfer_buffer_length %
-+	 maxlen = 0).
-+	 Setting full prevents the USB controller from sending an empty packet
-+	 in that case.  However, if URB_ZERO_PACKET was set we want that. */
-+      if (!(urb->transfer_flags & URB_ZERO_PACKET)) {
-+	set_sb_cmds(sb_desc, CMD_FULL);
-+      }
-+      /* Only generate TX interrupt if it's a Out URB*/
-+      set_sb_cmds(sb_desc, CMD_INTR);
-+
-+    } else { /* In Intr URB */
-+      sb_desc = create_sb_in(NULL, buf_len, maxlen, mem_flags);
-+      if(sb_desc == NULL)
-+	return -ENOMEM;
-+    }
-+    /* Set end-of-list flag for last SB */
-+    set_sb_cmds(sb_desc, CMD_EOL);
-+
-+    /* Attach SB to URB */
-+    urb_priv->first_sb = sb_desc;
-+    urb_priv->last_sb = sb_desc;
-+
-+    break;
-+  case PIPE_ISOCHRONOUS:
-+    if(is_out) { /* Out Isoc URB */
-+      int i;
-+      if(urb->number_of_packets == 0) {
-+	tc_err("Can't create SBs for Isoc URB with zero packets\n");
-+	return -EPIPE;
-+      }
-+      /* Create one SB descriptor for each packet and link them together. */
-+      for(i = 0; i < urb->number_of_packets; i++) {
-+	if (urb->iso_frame_desc[i].length > 0) {
-+
-+	  sb_desc = create_sb(sb_desc, TT_OUT, urb->transfer_buffer +
-+			      urb->iso_frame_desc[i].offset,
-+			      urb->iso_frame_desc[i].length, mem_flags);
-+	  if(sb_desc == NULL)
-+	    return -ENOMEM;
-+
-+	  /* Check if it's a full length packet */
-+	  if (urb->iso_frame_desc[i].length ==
-+	      usb_maxpacket(urb->dev, urb->pipe, usb_pipeout(urb->pipe))) {
-+	    set_sb_cmds(sb_desc, CMD_FULL);
-+	  }
-+	  
-+	} else { /* zero length packet */
-+	  sb_desc = create_sb(sb_desc, TT_ZOUT, &zout_buffer[0], 1, mem_flags);
-+	  if(sb_desc == NULL)
-+	    return -ENOMEM;
-+	  set_sb_cmds(sb_desc, CMD_FULL);
-+	}
-+	/* Attach first SB descriptor to URB */
-+	if (i == 0) {
-+	  urb_priv->first_sb = sb_desc;
-+	}
-+      }
-+      /* Set interrupt and end-of-list flags in last SB */
-+      set_sb_cmds(sb_desc, CMD_INTR | CMD_EOL);
-+      /* Attach last SB descriptor to URB */
-+      urb_priv->last_sb = sb_desc;
-+      tc_dbg("Created %d out SBs for Isoc URB:0x%x\n",
-+	       urb->number_of_packets, (unsigned int)urb);
-+    } else { /* In Isoc URB */
-+      /* Actual number of packets is not relevant for periodic in traffic as
-+	 long as it is more than zero.  Set to 1 always. */
-+      sb_desc = create_sb(sb_desc, TT_IN, NULL, 1, mem_flags);
-+      if(sb_desc == NULL)
-+	return -ENOMEM;
-+      /* Set end-of-list flags for SB */
-+      set_sb_cmds(sb_desc, CMD_EOL);
-+
-+      /* Attach SB to URB */
-+      urb_priv->first_sb = sb_desc;
-+      urb_priv->last_sb = sb_desc;
-+    }
-+    break;
-+  default:
-+    tc_err("Unknown pipe-type\n");
-+    return -EPIPE;
-+    break;
-+  }
-+  return 0;
-+}
-+
-+int init_intr_urb(struct urb *urb, int mem_flags) {
-+  struct crisv10_urb_priv *urb_priv = (struct crisv10_urb_priv *)urb->hcpriv;
-+  struct USB_EP_Desc* ep_desc;
-+  int interval;
-+  int i;
-+  int ep_count;
-+
-+  ASSERT(urb_priv != NULL);
-+  ASSERT(usb_pipeint(urb->pipe));
-+  /* We can't support interval longer than amount of eof descriptors in
-+     TxIntrEPList */
-+  if(urb->interval > MAX_INTR_INTERVAL) {
-+    tc_err("Interrupt interval %dms too big (max: %dms)\n", urb->interval,
-+	   MAX_INTR_INTERVAL);
-+    return -EINVAL;
-+  }
-+
-+  /* We assume that the SB descriptors already have been setup */
-+  ASSERT(urb_priv->first_sb != NULL);
-+
-+  /* Round of the interval to 2^n, it is obvious that this code favours
-+     smaller numbers, but that is actually a good thing */
-+  /* FIXME: The "rounding error" for larger intervals will be quite
-+     large. For in traffic this shouldn't be a problem since it will only
-+     mean that we "poll" more often. */
-+  interval = urb->interval;
-+  for (i = 0; interval; i++) {
-+    interval = interval >> 1;
-+  }
-+  urb_priv->interval = 1 << (i - 1);
-+
-+  /* We can only have max interval for Out Interrupt due to that we can only
-+     handle one linked in EP for a certain epid in the Intr descr array at the
-+     time. The USB Controller in the Etrax 100LX continues to process Intr EPs
-+     so we have no way of knowing which one that caused the actual transfer if
-+     we have several linked in. */
-+  if(usb_pipeout(urb->pipe)) {
-+    urb_priv->interval = MAX_INTR_INTERVAL;
-+  }
-+
-+  /* Calculate amount of EPs needed */
-+  ep_count = MAX_INTR_INTERVAL / urb_priv->interval;
-+
-+  for(i = 0; i < ep_count; i++) {
-+    ep_desc = create_ep(urb_priv->epid, urb_priv->first_sb, mem_flags);
-+    if(ep_desc == NULL) {
-+      /* Free any descriptors that we may have allocated before failure */
-+      while(i > 0) {
-+	i--;
-+	kfree(urb_priv->intr_ep_pool[i]);
-+      }
-+      return -ENOMEM;
-+    }
-+    urb_priv->intr_ep_pool[i] = ep_desc;
-+  }
-+  urb_priv->intr_ep_pool_length = ep_count;
-+  return 0;
-+}
-+
-+/* DMA RX/TX functions */
-+/* ----------------------- */
-+
-+static void tc_dma_init_rx_list(void) {
-+  int i;
-+
-+  /* Setup descriptor list except last one */
-+  for (i = 0; i < (NBR_OF_RX_DESC - 1); i++) {
-+    RxDescList[i].sw_len = RX_DESC_BUF_SIZE;
-+    RxDescList[i].command = 0;
-+    RxDescList[i].next = virt_to_phys(&RxDescList[i + 1]);
-+    RxDescList[i].buf = virt_to_phys(RxBuf + (i * RX_DESC_BUF_SIZE));
-+    RxDescList[i].hw_len = 0;
-+    RxDescList[i].status = 0;
-+    
-+    /* DMA IN cache bug. (struct etrax_dma_descr has the same layout as
-+       USB_IN_Desc for the relevant fields.) */
-+    prepare_rx_descriptor((struct etrax_dma_descr*)&RxDescList[i]);
-+    
-+  }
-+  /* Special handling of last descriptor */
-+  RxDescList[i].sw_len = RX_DESC_BUF_SIZE;
-+  RxDescList[i].command = IO_STATE(USB_IN_command, eol, yes);
-+  RxDescList[i].next = virt_to_phys(&RxDescList[0]);
-+  RxDescList[i].buf = virt_to_phys(RxBuf + (i * RX_DESC_BUF_SIZE));
-+  RxDescList[i].hw_len = 0;
-+  RxDescList[i].status = 0;
-+  
-+  /* Setup list pointers that show progress in list */
-+  myNextRxDesc = &RxDescList[0];
-+  myLastRxDesc = &RxDescList[NBR_OF_RX_DESC - 1];
-+  
-+  flush_etrax_cache();
-+  /* Point DMA to first descriptor in list and start it */
-+  *R_DMA_CH9_FIRST = virt_to_phys(myNextRxDesc);
-+  *R_DMA_CH9_CMD = IO_STATE(R_DMA_CH9_CMD, cmd, start);
-+}
-+
-+
-+static void tc_dma_init_tx_bulk_list(void) {
-+  int i;
-+  volatile struct USB_EP_Desc *epDescr;
-+
-+  for (i = 0; i < (NBR_OF_EPIDS - 1); i++) {
-+    epDescr = &(TxBulkEPList[i]);
-+    CHECK_ALIGN(epDescr);
-+    epDescr->hw_len = 0;
-+    epDescr->command = IO_FIELD(USB_EP_command, epid, i);
-+    epDescr->sub = 0;
-+    epDescr->next = virt_to_phys(&TxBulkEPList[i + 1]);
-+
-+    /* Initiate two EPs, disabled and with the eol flag set. No need for any
-+       preserved epid. */
-+    
-+    /* The first one has the intr flag set so we get an interrupt when the DMA
-+       channel is about to become disabled. */
-+    CHECK_ALIGN(&TxBulkDummyEPList[i][0]);
-+    TxBulkDummyEPList[i][0].hw_len = 0;
-+    TxBulkDummyEPList[i][0].command = (IO_FIELD(USB_EP_command, epid, DUMMY_EPID) |
-+				       IO_STATE(USB_EP_command, eol, yes) |
-+				       IO_STATE(USB_EP_command, intr, yes));
-+    TxBulkDummyEPList[i][0].sub = 0;
-+    TxBulkDummyEPList[i][0].next = virt_to_phys(&TxBulkDummyEPList[i][1]);
-+    
-+    /* The second one. */
-+    CHECK_ALIGN(&TxBulkDummyEPList[i][1]);
-+    TxBulkDummyEPList[i][1].hw_len = 0;
-+    TxBulkDummyEPList[i][1].command = (IO_FIELD(USB_EP_command, epid, DUMMY_EPID) |
-+				       IO_STATE(USB_EP_command, eol, yes));
-+    TxBulkDummyEPList[i][1].sub = 0;
-+    /* The last dummy's next pointer is the same as the current EP's next pointer. */
-+    TxBulkDummyEPList[i][1].next = virt_to_phys(&TxBulkEPList[i + 1]);
-+  }
-+
-+  /* Special handling of last descr in list, make list circular */
-+  epDescr = &TxBulkEPList[i];
-+  CHECK_ALIGN(epDescr);
-+  epDescr->hw_len = 0;
-+  epDescr->command = IO_STATE(USB_EP_command, eol, yes) |
-+    IO_FIELD(USB_EP_command, epid, i);
-+  epDescr->sub = 0;
-+  epDescr->next = virt_to_phys(&TxBulkEPList[0]);
-+  
-+  /* Init DMA sub-channel pointers to last item in each list */
-+  *R_DMA_CH8_SUB0_EP = virt_to_phys(&TxBulkEPList[i]);
-+  /* No point in starting the bulk channel yet.
-+   *R_DMA_CH8_SUB0_CMD = IO_STATE(R_DMA_CH8_SUB0_CMD, cmd, start); */
-+}
-+
-+static void tc_dma_init_tx_ctrl_list(void) {
-+  int i;
-+  volatile struct USB_EP_Desc *epDescr;
-+
-+  for (i = 0; i < (NBR_OF_EPIDS - 1); i++) {
-+    epDescr = &(TxCtrlEPList[i]);
-+    CHECK_ALIGN(epDescr);
-+    epDescr->hw_len = 0;
-+    epDescr->command = IO_FIELD(USB_EP_command, epid, i);
-+    epDescr->sub = 0;
-+    epDescr->next = virt_to_phys(&TxCtrlEPList[i + 1]);
-+  }
-+  /* Special handling of last descr in list, make list circular */
-+  epDescr = &TxCtrlEPList[i];
-+  CHECK_ALIGN(epDescr);
-+  epDescr->hw_len = 0;
-+  epDescr->command = IO_STATE(USB_EP_command, eol, yes) |
-+    IO_FIELD(USB_EP_command, epid, i);
-+  epDescr->sub = 0;
-+  epDescr->next = virt_to_phys(&TxCtrlEPList[0]);
-+  
-+  /* Init DMA sub-channel pointers to last item in each list */
-+  *R_DMA_CH8_SUB1_EP = virt_to_phys(&TxCtrlEPList[i]);
-+  /* No point in starting the ctrl channel yet.
-+   *R_DMA_CH8_SUB1_CMD = IO_STATE(R_DMA_CH8_SUB0_CMD, cmd, start); */
-+}
-+
-+
-+static void tc_dma_init_tx_intr_list(void) {
-+  int i;
-+
-+  TxIntrSB_zout.sw_len = 1;
-+  TxIntrSB_zout.next = 0;
-+  TxIntrSB_zout.buf = virt_to_phys(&zout_buffer[0]);
-+  TxIntrSB_zout.command = (IO_FIELD(USB_SB_command, rem, 0) |
-+			   IO_STATE(USB_SB_command, tt, zout) |
-+			   IO_STATE(USB_SB_command, full, yes) |
-+			   IO_STATE(USB_SB_command, eot, yes) |
-+			   IO_STATE(USB_SB_command, eol, yes));
-+  
-+  for (i = 0; i < (MAX_INTR_INTERVAL - 1); i++) {
-+    CHECK_ALIGN(&TxIntrEPList[i]);
-+    TxIntrEPList[i].hw_len = 0;
-+    TxIntrEPList[i].command =
-+      (IO_STATE(USB_EP_command, eof, yes) |
-+       IO_STATE(USB_EP_command, enable, yes) |
-+       IO_FIELD(USB_EP_command, epid, INVALID_EPID));
-+    TxIntrEPList[i].sub = virt_to_phys(&TxIntrSB_zout);
-+    TxIntrEPList[i].next = virt_to_phys(&TxIntrEPList[i + 1]);
-+  }
-+
-+  /* Special handling of last descr in list, make list circular */
-+  CHECK_ALIGN(&TxIntrEPList[i]);
-+  TxIntrEPList[i].hw_len = 0;
-+  TxIntrEPList[i].command =
-+    (IO_STATE(USB_EP_command, eof, yes) |
-+     IO_STATE(USB_EP_command, eol, yes) |
-+     IO_STATE(USB_EP_command, enable, yes) |
-+     IO_FIELD(USB_EP_command, epid, INVALID_EPID));
-+  TxIntrEPList[i].sub = virt_to_phys(&TxIntrSB_zout);
-+  TxIntrEPList[i].next = virt_to_phys(&TxIntrEPList[0]);
-+
-+  intr_dbg("Initiated Intr EP descriptor list\n");
-+
-+
-+  /* Connect DMA 8 sub-channel 2 to first in list */
-+  *R_DMA_CH8_SUB2_EP = virt_to_phys(&TxIntrEPList[0]);
-+}
-+
-+static void tc_dma_init_tx_isoc_list(void) {
-+  int i;
-+
-+  DBFENTER;
-+
-+  /* Read comment at zout_buffer declaration for an explanation to this. */
-+  TxIsocSB_zout.sw_len = 1;
-+  TxIsocSB_zout.next = 0;
-+  TxIsocSB_zout.buf = virt_to_phys(&zout_buffer[0]);
-+  TxIsocSB_zout.command = (IO_FIELD(USB_SB_command, rem, 0) |
-+			   IO_STATE(USB_SB_command, tt, zout) |
-+			   IO_STATE(USB_SB_command, full, yes) |
-+			   IO_STATE(USB_SB_command, eot, yes) |
-+			   IO_STATE(USB_SB_command, eol, yes));
-+
-+  /* The last isochronous EP descriptor is a dummy. */
-+  for (i = 0; i < (NBR_OF_EPIDS - 1); i++) {
-+    CHECK_ALIGN(&TxIsocEPList[i]);
-+    TxIsocEPList[i].hw_len = 0;
-+    TxIsocEPList[i].command = IO_FIELD(USB_EP_command, epid, i);
-+    TxIsocEPList[i].sub = 0;
-+    TxIsocEPList[i].next = virt_to_phys(&TxIsocEPList[i + 1]);
-+  }
-+
-+  CHECK_ALIGN(&TxIsocEPList[i]);
-+  TxIsocEPList[i].hw_len = 0;
-+
-+  /* Must enable the last EP descr to get eof interrupt. */
-+  TxIsocEPList[i].command = (IO_STATE(USB_EP_command, enable, yes) |
-+			     IO_STATE(USB_EP_command, eof, yes) |
-+			     IO_STATE(USB_EP_command, eol, yes) |
-+			     IO_FIELD(USB_EP_command, epid, INVALID_EPID));
-+  TxIsocEPList[i].sub = virt_to_phys(&TxIsocSB_zout);
-+  TxIsocEPList[i].next = virt_to_phys(&TxIsocEPList[0]);
-+
-+  *R_DMA_CH8_SUB3_EP = virt_to_phys(&TxIsocEPList[0]);
-+  *R_DMA_CH8_SUB3_CMD = IO_STATE(R_DMA_CH8_SUB3_CMD, cmd, start);
-+}
-+
-+static int tc_dma_init(struct usb_hcd *hcd) {
-+  tc_dma_init_rx_list();
-+  tc_dma_init_tx_bulk_list();
-+  tc_dma_init_tx_ctrl_list();
-+  tc_dma_init_tx_intr_list();
-+  tc_dma_init_tx_isoc_list();
-+
-+  if (cris_request_dma(USB_TX_DMA_NBR,
-+		       "ETRAX 100LX built-in USB (Tx)",
-+		       DMA_VERBOSE_ON_ERROR,
-+		       dma_usb)) {
-+    err("Could not allocate DMA ch 8 for USB");
-+    return -EBUSY;
-+  }
-+ 	
-+  if (cris_request_dma(USB_RX_DMA_NBR,
-+		       "ETRAX 100LX built-in USB (Rx)",
-+		       DMA_VERBOSE_ON_ERROR,
-+		       dma_usb)) {
-+    err("Could not allocate DMA ch 9 for USB");
-+    return -EBUSY;
-+  }
-+
-+  *R_IRQ_MASK2_SET =
-+    /* Note that these interrupts are not used. */
-+    IO_STATE(R_IRQ_MASK2_SET, dma8_sub0_descr, set) |
-+    /* Sub channel 1 (ctrl) descr. interrupts are used. */
-+    IO_STATE(R_IRQ_MASK2_SET, dma8_sub1_descr, set) |
-+    IO_STATE(R_IRQ_MASK2_SET, dma8_sub2_descr, set) |
-+    /* Sub channel 3 (isoc) descr. interrupts are used. */
-+    IO_STATE(R_IRQ_MASK2_SET, dma8_sub3_descr, set);
-+  
-+  /* Note that the dma9_descr interrupt is not used. */
-+  *R_IRQ_MASK2_SET =
-+    IO_STATE(R_IRQ_MASK2_SET, dma9_eop, set) |
-+    IO_STATE(R_IRQ_MASK2_SET, dma9_descr, set);
-+
-+  if (request_irq(ETRAX_USB_RX_IRQ, tc_dma_rx_interrupt, 0,
-+		  "ETRAX 100LX built-in USB (Rx)", hcd)) {
-+    err("Could not allocate IRQ %d for USB", ETRAX_USB_RX_IRQ);
-+    return -EBUSY;
-+  }
-+  
-+  if (request_irq(ETRAX_USB_TX_IRQ, tc_dma_tx_interrupt, 0,
-+		  "ETRAX 100LX built-in USB (Tx)", hcd)) {
-+    err("Could not allocate IRQ %d for USB", ETRAX_USB_TX_IRQ);
-+    return -EBUSY;
-+  }
-+
-+  return 0;
-+}
-+
-+static void tc_dma_destroy(void) {
-+  free_irq(ETRAX_USB_RX_IRQ, NULL);
-+  free_irq(ETRAX_USB_TX_IRQ, NULL);
-+
-+  cris_free_dma(USB_TX_DMA_NBR, "ETRAX 100LX built-in USB (Tx)");
-+  cris_free_dma(USB_RX_DMA_NBR, "ETRAX 100LX built-in USB (Rx)");
-+
-+}
-+
-+static void tc_dma_link_intr_urb(struct urb *urb);
-+
-+/* Handle processing of Bulk, Ctrl and Intr queues */
-+static void tc_dma_process_queue(int epid) {
-+  struct urb *urb;
-+  struct crisv10_urb_priv *urb_priv = urb->hcpriv;
-+  unsigned long flags;
-+  char toggle;
-+
-+  if(epid_state[epid].disabled) {
-+    /* Don't process any URBs on a disabled endpoint */
-+    return;
-+  }
-+
-+  /* Do not disturb us while fiddling with EPs and epids */
-+  local_irq_save(flags);
-+
-+  /* For bulk, Ctrl and Intr can we only have one URB active at a time for
-+     a specific EP. */
-+  if(activeUrbList[epid] != NULL) {
-+    /* An URB is already active on EP, skip checking queue */
-+    local_irq_restore(flags);
-+    return;
-+  }
-+
-+  urb = urb_list_first(epid);
-+  if(urb == NULL) {
-+    /* No URB waiting in EP queue. Nothing do to */
-+    local_irq_restore(flags);
-+    return;
-+  }
-+
-+  urb_priv = urb->hcpriv;
-+  ASSERT(urb_priv != NULL);
-+  ASSERT(urb_priv->urb_state == NOT_STARTED);
-+  ASSERT(!usb_pipeisoc(urb->pipe));
-+
-+  /* Remove this URB from the queue and move it to active */
-+  activeUrbList[epid] = urb;
-+  urb_list_del(urb, epid);
-+
-+  urb_priv->urb_state = STARTED;
-+
-+  /* Reset error counters (regardless of which direction this traffic is). */
-+  etrax_epid_clear_error(epid);
-+
-+  /* Special handling of Intr EP lists */
-+  if(usb_pipeint(urb->pipe)) {
-+    tc_dma_link_intr_urb(urb);
-+    local_irq_restore(flags);
-+    return;
-+  }
-+
-+  /* Software must preset the toggle bits for Bulk and Ctrl */
-+  if(usb_pipecontrol(urb->pipe)) {
-+    /* Toggle bits are initialized only during setup transaction in a
-+       CTRL transfer */
-+    etrax_epid_set_toggle(epid, 0, 0);
-+    etrax_epid_set_toggle(epid, 1, 0);
-+  } else {
-+    toggle = usb_gettoggle(urb->dev, usb_pipeendpoint(urb->pipe),
-+			   usb_pipeout(urb->pipe));
-+    etrax_epid_set_toggle(epid, usb_pipeout(urb->pipe), toggle);
-+  }
-+
-+  tc_dbg("Added SBs from (URB:0x%x %s %s) to epid %d: %s\n",
-+	 (unsigned int)urb, str_dir(urb->pipe), str_type(urb->pipe), epid,
-+	 sblist_to_str(urb_priv->first_sb));
-+
-+  /* We start the DMA sub channel without checking if it's running or not,
-+     because:
-+     1) If it's already running, issuing the start command is a nop.
-+     2) We avoid a test-and-set race condition. */
-+  switch(usb_pipetype(urb->pipe)) {
-+  case PIPE_BULK:
-+    /* Assert that the EP descriptor is disabled. */
-+    ASSERT(!(TxBulkEPList[epid].command & IO_MASK(USB_EP_command, enable)));
-+
-+    /* Set up and enable the EP descriptor. */
-+    TxBulkEPList[epid].sub = virt_to_phys(urb_priv->first_sb);
-+    TxBulkEPList[epid].hw_len = 0;
-+    TxBulkEPList[epid].command |= IO_STATE(USB_EP_command, enable, yes);
-+
-+    /* Check if the dummy list is already with us (if several urbs were queued). */
-+    if (usb_pipein(urb->pipe) && (TxBulkEPList[epid].next != virt_to_phys(&TxBulkDummyEPList[epid][0]))) {
-+      tc_dbg("Inviting dummy list to the party for urb 0x%lx, epid %d", 
-+	     (unsigned long)urb, epid);
-+      
-+      /* We don't need to check if the DMA is at this EP or not before changing the
-+	 next pointer, since we will do it in one 32-bit write (EP descriptors are
-+	 32-bit aligned). */
-+      TxBulkEPList[epid].next = virt_to_phys(&TxBulkDummyEPList[epid][0]);
-+    }
-+
-+    restart_dma8_sub0();
-+
-+    /* Update/restart the bulk start timer since we just started the channel.*/
-+    mod_timer(&bulk_start_timer, jiffies + BULK_START_TIMER_INTERVAL);
-+    /* Update/restart the bulk eot timer since we just inserted traffic. */
-+    mod_timer(&bulk_eot_timer, jiffies + BULK_EOT_TIMER_INTERVAL);
-+    break;
-+  case PIPE_CONTROL:
-+    /* Assert that the EP descriptor is disabled. */
-+    ASSERT(!(TxCtrlEPList[epid].command & IO_MASK(USB_EP_command, enable)));
-+
-+    /* Set up and enable the EP descriptor. */
-+    TxCtrlEPList[epid].sub = virt_to_phys(urb_priv->first_sb);
-+    TxCtrlEPList[epid].hw_len = 0;
-+    TxCtrlEPList[epid].command |= IO_STATE(USB_EP_command, enable, yes);
-+
-+    *R_DMA_CH8_SUB1_CMD = IO_STATE(R_DMA_CH8_SUB1_CMD, cmd, start);
-+    break;
-+  }
-+  local_irq_restore(flags);
-+}
-+
-+static void tc_dma_link_intr_urb(struct urb *urb) {
-+  struct crisv10_urb_priv *urb_priv = urb->hcpriv;
-+  volatile struct USB_EP_Desc *tmp_ep;
-+  struct USB_EP_Desc *ep_desc;
-+  int i = 0, epid;
-+  int pool_idx = 0;
-+
-+  ASSERT(urb_priv != NULL);
-+  epid = urb_priv->epid;
-+  ASSERT(urb_priv->interval > 0);
-+  ASSERT(urb_priv->intr_ep_pool_length > 0);
-+
-+  tmp_ep = &TxIntrEPList[0];
-+
-+  /* Only insert one EP descriptor in list for Out Intr URBs.
-+     We can only handle Out Intr with interval of 128ms because
-+     it's not possible to insert several Out Intr EPs because they
-+     are not consumed by the DMA. */
-+  if(usb_pipeout(urb->pipe)) {
-+    ep_desc = urb_priv->intr_ep_pool[0];
-+    ASSERT(ep_desc);
-+    ep_desc->next = tmp_ep->next;
-+    tmp_ep->next = virt_to_phys(ep_desc);
-+    i++;
-+  } else {
-+    /* Loop through Intr EP descriptor list and insert EP for URB at
-+       specified interval */
-+    do {
-+      /* Each EP descriptor with eof flag sat signals a new frame */
-+      if (tmp_ep->command & IO_MASK(USB_EP_command, eof)) {
-+	/* Insert a EP from URBs EP pool at correct interval */
-+	if ((i % urb_priv->interval) == 0) {
-+	  ep_desc = urb_priv->intr_ep_pool[pool_idx];
-+	  ASSERT(ep_desc);
-+	  ep_desc->next = tmp_ep->next;
-+	  tmp_ep->next = virt_to_phys(ep_desc);
-+	  pool_idx++;
-+	  ASSERT(pool_idx <= urb_priv->intr_ep_pool_length);
-+	}
-+	i++;
-+      }
-+      tmp_ep = (struct USB_EP_Desc *)phys_to_virt(tmp_ep->next);
-+    } while(tmp_ep != &TxIntrEPList[0]);
-+  }
-+
-+  intr_dbg("Added SBs to intr epid %d: %s interval:%d (%d EP)\n", epid,
-+	   sblist_to_str(urb_priv->first_sb), urb_priv->interval, pool_idx);
-+
-+  /* We start the DMA sub channel without checking if it's running or not,
-+     because:
-+     1) If it's already running, issuing the start command is a nop.
-+     2) We avoid a test-and-set race condition. */
-+  *R_DMA_CH8_SUB2_CMD = IO_STATE(R_DMA_CH8_SUB2_CMD, cmd, start);
-+}
-+
-+  /* hinko ignore usb_pipeisoc */
-+#if 0
-+static void tc_dma_process_isoc_urb(struct urb *urb) {
-+  unsigned long flags;
-+  struct crisv10_urb_priv *urb_priv = urb->hcpriv;
-+  int epid;
-+
-+  /* Do not disturb us while fiddling with EPs and epids */
-+  local_irq_save(flags);
-+
-+  ASSERT(urb_priv);
-+  ASSERT(urb_priv->first_sb);
-+  epid = urb_priv->epid;
-+
-+  if(activeUrbList[epid] == NULL) {
-+    /* EP is idle, so make this URB active */
-+    activeUrbList[epid] = urb;
-+    urb_list_del(urb, epid);
-+    ASSERT(TxIsocEPList[epid].sub == 0);
-+    ASSERT(!(TxIsocEPList[epid].command &
-+	     IO_STATE(USB_EP_command, enable, yes)));
-+
-+    /* Differentiate between In and Out Isoc. Because In SBs are not consumed*/
-+    if(usb_pipein(urb->pipe)) {
-+    /* Each EP for In Isoc will have only one SB descriptor, setup when
-+       submitting the first active urb. We do it here by copying from URBs
-+       pre-allocated SB. */
-+      memcpy((void *)&(TxIsocSBList[epid]), urb_priv->first_sb,
-+	     sizeof(TxIsocSBList[epid]));
-+      TxIsocEPList[epid].hw_len = 0;
-+      TxIsocEPList[epid].sub = virt_to_phys(&(TxIsocSBList[epid]));
-+    } else {
-+      /* For Out Isoc we attach the pre-allocated list of SBs for the URB */
-+      TxIsocEPList[epid].hw_len = 0;
-+      TxIsocEPList[epid].sub = virt_to_phys(urb_priv->first_sb);
-+
-+      isoc_dbg("Attached first URB:0x%x[%d] to epid:%d first_sb:0x%x"
-+	       " last_sb::0x%x\n",
-+	       (unsigned int)urb, urb_priv->urb_num, epid,
-+	       (unsigned int)(urb_priv->first_sb),
-+	       (unsigned int)(urb_priv->last_sb));
-+    }
-+
-+    if (urb->transfer_flags & URB_ISO_ASAP) {
-+      /* The isoc transfer should be started as soon as possible. The
-+	 start_frame field is a return value if URB_ISO_ASAP was set. Comparing
-+	 R_USB_FM_NUMBER with a USB Chief trace shows that the first isoc IN
-+	 token is sent 2 frames later. I'm not sure how this affects usage of
-+	 the start_frame field by the device driver, or how it affects things
-+	 when USB_ISO_ASAP is not set, so therefore there's no compensation for
-+	 the 2 frame "lag" here. */
-+      urb->start_frame = (*R_USB_FM_NUMBER & 0x7ff);
-+      TxIsocEPList[epid].command |= IO_STATE(USB_EP_command, enable, yes);
-+      urb_priv->urb_state = STARTED;
-+      isoc_dbg("URB_ISO_ASAP set, urb->start_frame set to %d\n",
-+	       urb->start_frame);
-+    } else {
-+      /* Not started yet. */
-+      urb_priv->urb_state = NOT_STARTED;
-+      isoc_warn("urb_priv->urb_state set to NOT_STARTED for URB:0x%x\n",
-+		(unsigned int)urb);
-+    }
-+
-+  } else {
-+    /* An URB is already active on the EP. Leave URB in queue and let
-+       finish_isoc_urb process it after current active URB */
-+    ASSERT(TxIsocEPList[epid].sub != 0);
-+
-+    if(usb_pipein(urb->pipe)) {
-+      /* Because there already is a active In URB on this epid we do nothing
-+         and the finish_isoc_urb() function will handle switching to next URB*/
-+
-+    } else { /* For Out Isoc, insert new URBs traffic last in SB-list. */
-+      struct USB_SB_Desc *temp_sb_desc;
-+
-+      /* Set state STARTED to all Out Isoc URBs added to SB list because we
-+         don't know how many of them that are finished before descr interrupt*/
-+      urb_priv->urb_state = STARTED;
-+
-+      /* Find end of current SB list by looking for SB with eol flag sat */
-+      temp_sb_desc = phys_to_virt(TxIsocEPList[epid].sub);
-+      while ((temp_sb_desc->command & IO_MASK(USB_SB_command, eol)) !=
-+	     IO_STATE(USB_SB_command, eol, yes)) {
-+	ASSERT(temp_sb_desc->next);
-+	temp_sb_desc = phys_to_virt(temp_sb_desc->next);
-+      }
-+
-+      isoc_dbg("Appended URB:0x%x[%d] (first:0x%x last:0x%x) to epid:%d"
-+	       " sub:0x%x eol:0x%x\n",
-+	       (unsigned int)urb, urb_priv->urb_num,
-+	       (unsigned int)(urb_priv->first_sb),
-+	       (unsigned int)(urb_priv->last_sb), epid,
-+	       (unsigned int)phys_to_virt(TxIsocEPList[epid].sub),
-+	       (unsigned int)temp_sb_desc);
-+
-+      /* Next pointer must be set before eol is removed. */
-+      temp_sb_desc->next = virt_to_phys(urb_priv->first_sb);
-+      /* Clear the previous end of list flag since there is a new in the
-+	 added SB descriptor list. */
-+      temp_sb_desc->command &= ~IO_MASK(USB_SB_command, eol);
-+
-+      if (!(TxIsocEPList[epid].command & IO_MASK(USB_EP_command, enable))) {
-+	__u32 epid_data;
-+	/* 8.8.5 in Designer's Reference says we should check for and correct
-+	   any errors in the EP here.  That should not be necessary if
-+	   epid_attn is handled correctly, so we assume all is ok. */
-+	epid_data = etrax_epid_iso_get(epid);
-+	if (IO_EXTRACT(R_USB_EPT_DATA, error_code, epid_data) !=
-+	    IO_STATE_VALUE(R_USB_EPT_DATA, error_code, no_error)) {
-+	  isoc_err("Disabled Isoc EP with error:%d on epid:%d when appending"
-+		   " URB:0x%x[%d]\n",
-+		   IO_EXTRACT(R_USB_EPT_DATA, error_code, epid_data), epid,
-+		   (unsigned int)urb, urb_priv->urb_num);
-+	}
-+
-+	/* The SB list was exhausted. */
-+	if (virt_to_phys(urb_priv->last_sb) != TxIsocEPList[epid].sub) {
-+	  /* The new sublist did not get processed before the EP was
-+	     disabled.  Setup the EP again. */
-+
-+	  if(virt_to_phys(temp_sb_desc) == TxIsocEPList[epid].sub) {
-+	    isoc_dbg("EP for epid:%d stoped at SB:0x%x before newly inserted"
-+		     ", restarting from this URBs SB:0x%x\n",
-+		     epid, (unsigned int)temp_sb_desc,
-+		     (unsigned int)(urb_priv->first_sb));
-+	    TxIsocEPList[epid].hw_len = 0;
-+	    TxIsocEPList[epid].sub = virt_to_phys(urb_priv->first_sb);
-+	    urb->start_frame = (*R_USB_FM_NUMBER & 0x7ff);
-+	    /* Enable the EP again so data gets processed this time */
-+	    TxIsocEPList[epid].command |=
-+	      IO_STATE(USB_EP_command, enable, yes);
-+
-+	  } else {
-+	    /* The EP has been disabled but not at end this URB (god knows
-+	       where). This should generate an epid_attn so we should not be
-+	       here */
-+	    isoc_warn("EP was disabled on sb:0x%x before SB list for"
-+		     " URB:0x%x[%d] got processed\n",
-+		     (unsigned int)phys_to_virt(TxIsocEPList[epid].sub),
-+		     (unsigned int)urb, urb_priv->urb_num);
-+	  }
-+	} else {
-+	  /* This might happend if we are slow on this function and isn't
-+	     an error. */
-+	  isoc_dbg("EP was disabled and finished with SBs from appended"
-+		   " URB:0x%x[%d]\n", (unsigned int)urb, urb_priv->urb_num);
-+	}
-+      }
-+    }
-+  }
-+  
-+  /* Start the DMA sub channel */
-+  *R_DMA_CH8_SUB3_CMD = IO_STATE(R_DMA_CH8_SUB3_CMD, cmd, start);
-+
-+  local_irq_restore(flags);
-+}
-+#endif
-+
-+static void tc_dma_unlink_intr_urb(struct urb *urb) {
-+  struct crisv10_urb_priv *urb_priv = urb->hcpriv;
-+  volatile struct USB_EP_Desc *first_ep;  /* First EP in the list. */
-+  volatile struct USB_EP_Desc *curr_ep;   /* Current EP, the iterator. */
-+  volatile struct USB_EP_Desc *next_ep;   /* The EP after current. */
-+  volatile struct USB_EP_Desc *unlink_ep; /* The one we should remove from
-+					     the list. */
-+  int count = 0;
-+  volatile int timeout = 10000;
-+  int epid;
-+
-+  /* Read 8.8.4 in Designer's Reference, "Removing an EP Descriptor from the
-+     List". */
-+  ASSERT(urb_priv);
-+  ASSERT(urb_priv->intr_ep_pool_length > 0);
-+  epid = urb_priv->epid;
-+
-+  /* First disable all Intr EPs belonging to epid for this URB */
-+  first_ep = &TxIntrEPList[0];
-+  curr_ep = first_ep;
-+  do {
-+    next_ep = (struct USB_EP_Desc *)phys_to_virt(curr_ep->next);
-+    if (IO_EXTRACT(USB_EP_command, epid, next_ep->command) == epid) {
-+      /* Disable EP */
-+      next_ep->command &= ~IO_MASK(USB_EP_command, enable);
-+    }
-+    curr_ep = phys_to_virt(curr_ep->next);
-+  } while (curr_ep != first_ep);
-+
-+
-+  /* Now unlink all EPs belonging to this epid from Descr list */
-+  first_ep = &TxIntrEPList[0];
-+  curr_ep = first_ep;
-+  do {
-+    next_ep = (struct USB_EP_Desc *)phys_to_virt(curr_ep->next);
-+    if (IO_EXTRACT(USB_EP_command, epid, next_ep->command) == epid) {
-+      /* This is the one we should unlink. */
-+      unlink_ep = next_ep;
-+
-+      /* Actually unlink the EP from the DMA list. */
-+      curr_ep->next = unlink_ep->next;
-+
-+      /* Wait until the DMA is no longer at this descriptor. */
-+      while((*R_DMA_CH8_SUB2_EP == virt_to_phys(unlink_ep)) &&
-+	    (timeout-- > 0));
-+      if(timeout == 0) {
-+	warn("Timeout while waiting for DMA-TX-Intr to leave unlink EP\n");
-+      }
-+      
-+      count++;
-+    }
-+    curr_ep = phys_to_virt(curr_ep->next);
-+  } while (curr_ep != first_ep);
-+
-+  if(count != urb_priv->intr_ep_pool_length) {
-+    intr_warn("Unlinked %d of %d Intr EPs for URB:0x%x[%d]\n", count,
-+	      urb_priv->intr_ep_pool_length, (unsigned int)urb,
-+	      urb_priv->urb_num);
-+  } else {
-+    intr_dbg("Unlinked %d of %d interrupt EPs for URB:0x%x\n", count,
-+	     urb_priv->intr_ep_pool_length, (unsigned int)urb);
-+  }
-+}
-+
-+static void check_finished_bulk_tx_epids(struct usb_hcd *hcd,
-+						    int timer) {
-+  unsigned long flags;
-+  int epid;
-+  struct urb *urb;
-+  struct crisv10_urb_priv * urb_priv;
-+  __u32 epid_data;
-+
-+  /* Protect TxEPList */
-+  local_irq_save(flags);
-+
-+  for (epid = 0; epid < NBR_OF_EPIDS; epid++) {
-+    /* A finished EP descriptor is disabled and has a valid sub pointer */
-+    if (!(TxBulkEPList[epid].command & IO_MASK(USB_EP_command, enable)) &&
-+	(TxBulkEPList[epid].sub != 0)) {
-+
-+      /* Get the active URB for this epid */
-+      urb = activeUrbList[epid];
-+      /* Sanity checks */
-+      ASSERT(urb);
-+      urb_priv = (struct crisv10_urb_priv *)urb->hcpriv;
-+      ASSERT(urb_priv);
-+      
-+      /* Only handle finished out Bulk EPs here,
-+	 and let RX interrupt take care of the rest */
-+      if(!epid_out_traffic(epid)) {
-+	continue;
-+      }
-+
-+      if(timer) {
-+	tc_warn("Found finished %s Bulk epid:%d URB:0x%x[%d] from timeout\n",
-+		epid_out_traffic(epid) ? "Out" : "In", epid, (unsigned int)urb,
-+		urb_priv->urb_num);
-+      } else {
-+	tc_dbg("Found finished %s Bulk epid:%d URB:0x%x[%d] from interrupt\n",
-+	       epid_out_traffic(epid) ? "Out" : "In", epid, (unsigned int)urb,
-+	       urb_priv->urb_num);
-+      }
-+
-+      if(urb_priv->urb_state == UNLINK) {
-+	/* This Bulk URB is requested to be unlinked, that means that the EP
-+	   has been disabled and we might not have sent all data */
-+	tc_finish_urb(hcd, urb, urb->status);
-+	continue;
-+      }
-+
-+      ASSERT(urb_priv->urb_state == STARTED);
-+      if (phys_to_virt(TxBulkEPList[epid].sub) != urb_priv->last_sb) {
-+	tc_err("Endpoint got disabled before reaching last sb\n");
-+      }
-+	
-+      epid_data = etrax_epid_get(epid);
-+      if (IO_EXTRACT(R_USB_EPT_DATA, error_code, epid_data) ==
-+	  IO_STATE_VALUE(R_USB_EPT_DATA, error_code, no_error)) {
-+	/* This means that the endpoint has no error, is disabled
-+	   and had inserted traffic, i.e. transfer successfully completed. */
-+	tc_finish_urb(hcd, urb, 0);
-+      } else {
-+	/* Shouldn't happen. We expect errors to be caught by epid
-+	   attention. */
-+	tc_err("Found disabled bulk EP desc (epid:%d error:%d)\n",
-+	       epid, IO_EXTRACT(R_USB_EPT_DATA, error_code, epid_data));
-+      }
-+    } else {
-+      tc_dbg("Ignoring In Bulk epid:%d, let RX interrupt handle it\n", epid);
-+    }
-+  }
-+
-+  local_irq_restore(flags);
-+}
-+
-+static void check_finished_ctrl_tx_epids(struct usb_hcd *hcd) {
-+  unsigned long flags;
-+  int epid;
-+  struct urb *urb;
-+  struct crisv10_urb_priv * urb_priv;
-+  __u32 epid_data;
-+
-+  /* Protect TxEPList */
-+  local_irq_save(flags);
-+
-+  for (epid = 0; epid < NBR_OF_EPIDS; epid++) {
-+    if(epid == DUMMY_EPID)
-+      continue;
-+
-+    /* A finished EP descriptor is disabled and has a valid sub pointer */
-+    if (!(TxCtrlEPList[epid].command & IO_MASK(USB_EP_command, enable)) &&
-+	(TxCtrlEPList[epid].sub != 0)) {
-+      
-+      /* Get the active URB for this epid */
-+      urb = activeUrbList[epid];
-+
-+      if(urb == NULL) {
-+	tc_warn("Found finished Ctrl epid:%d with no active URB\n", epid);
-+	continue;
-+      }
-+      
-+      /* Sanity checks */
-+      ASSERT(usb_pipein(urb->pipe));
-+      urb_priv = (struct crisv10_urb_priv *)urb->hcpriv;
-+      ASSERT(urb_priv);
-+      if (phys_to_virt(TxCtrlEPList[epid].sub) != urb_priv->last_sb) {
-+	tc_err("Endpoint got disabled before reaching last sb\n");
-+      }
-+
-+      epid_data = etrax_epid_get(epid);
-+      if (IO_EXTRACT(R_USB_EPT_DATA, error_code, epid_data) ==
-+	  IO_STATE_VALUE(R_USB_EPT_DATA, error_code, no_error)) {
-+	/* This means that the endpoint has no error, is disabled
-+	   and had inserted traffic, i.e. transfer successfully completed. */
-+
-+	/* Check if RX-interrupt for In Ctrl has been processed before
-+	   finishing the URB */
-+	if(urb_priv->ctrl_rx_done) {
-+	  tc_dbg("Finishing In Ctrl URB:0x%x[%d] in tx_interrupt\n",
-+		 (unsigned int)urb, urb_priv->urb_num);
-+	  tc_finish_urb(hcd, urb, 0);
-+	} else {
-+	  /* If we get zout descriptor interrupt before RX was done for a
-+	     In Ctrl transfer, then we flag that and it will be finished
-+	     in the RX-Interrupt */
-+	  urb_priv->ctrl_zout_done = 1;
-+	  tc_dbg("Got zout descr interrupt before RX interrupt\n");
-+	}
-+      } else {
-+	/* Shouldn't happen. We expect errors to be caught by epid
-+	   attention. */
-+	tc_err("Found disabled Ctrl EP desc (epid:%d URB:0x%x[%d]) error_code:%d\n", epid, (unsigned int)urb, urb_priv->urb_num, IO_EXTRACT(R_USB_EPT_DATA, error_code, epid_data));
-+	__dump_ep_desc(&(TxCtrlEPList[epid]));
-+	__dump_ept_data(epid);
-+      }      
-+    }
-+  }
-+  local_irq_restore(flags);
-+}
-+
-+  /* hinko ignore usb_pipeisoc */
-+#if 0
-+/* This function goes through all epids that are setup for Out Isoc transfers
-+   and marks (isoc_out_done) all queued URBs that the DMA has finished
-+   transfer for.
-+   No URB completetion is done here to make interrupt routine return quickly.
-+   URBs are completed later with help of complete_isoc_bottom_half() that
-+   becomes schedules when this functions is finished. */
-+static void check_finished_isoc_tx_epids(void) {
-+  unsigned long flags;
-+  int epid;
-+  struct urb *urb;
-+  struct crisv10_urb_priv * urb_priv;
-+  struct USB_SB_Desc* sb_desc;
-+  int epid_done;
-+
-+  /* Protect TxIsocEPList */
-+  local_irq_save(flags);
-+
-+  for (epid = 0; epid < NBR_OF_EPIDS; epid++) {
-+    if (TxIsocEPList[epid].sub == 0 || epid == INVALID_EPID ||
-+	!epid_out_traffic(epid)) {
-+      /* Nothing here to see. */
-+      continue;
-+    }
-+    ASSERT(epid_inuse(epid));
-+    ASSERT(epid_isoc(epid));
-+
-+    sb_desc = phys_to_virt(TxIsocEPList[epid].sub);
-+    /* Find the last descriptor of the currently active URB for this ep.
-+       This is the first descriptor in the sub list marked for a descriptor
-+       interrupt. */
-+    while (sb_desc && !IO_EXTRACT(USB_SB_command, intr, sb_desc->command)) {
-+      sb_desc = sb_desc->next ? phys_to_virt(sb_desc->next) : 0;
-+    }
-+    ASSERT(sb_desc);
-+
-+    isoc_dbg("Descr IRQ checking epid:%d sub:0x%x intr:0x%x\n",
-+	     epid, (unsigned int)phys_to_virt(TxIsocEPList[epid].sub),
-+	     (unsigned int)sb_desc);
-+
-+    urb = activeUrbList[epid];
-+    if(urb == NULL) {
-+      isoc_err("Isoc Descr irq on epid:%d with no active URB\n", epid);
-+      continue;
-+    }
-+
-+    epid_done = 0;
-+    while(urb && !epid_done) {
-+      /* Sanity check. */
-+      ASSERT(usb_pipetype(urb->pipe) == PIPE_ISOCHRONOUS);
-+      ASSERT(usb_pipeout(urb->pipe));
-+      
-+      urb_priv = (struct crisv10_urb_priv *)urb->hcpriv;
-+      ASSERT(urb_priv);
-+      ASSERT(urb_priv->urb_state == STARTED ||
-+	     urb_priv->urb_state == UNLINK);
-+      
-+      if (sb_desc != urb_priv->last_sb) {
-+	/* This urb has been sent. */
-+	urb_priv->isoc_out_done = 1;
-+
-+      } else { /* Found URB that has last_sb as the interrupt reason */
-+
-+	/* Check if EP has been disabled, meaning that all transfers are done*/
-+	if(!(TxIsocEPList[epid].command & IO_MASK(USB_EP_command, enable))) {
-+	  ASSERT((sb_desc->command & IO_MASK(USB_SB_command, eol)) ==
-+		 IO_STATE(USB_SB_command, eol, yes));
-+	  ASSERT(sb_desc->next == 0);
-+	  urb_priv->isoc_out_done = 1;
-+	} else {
-+	  isoc_dbg("Skipping URB:0x%x[%d] because EP not disabled yet\n",
-+		   (unsigned int)urb, urb_priv->urb_num);
-+	}
-+	/* Stop looking any further in queue */
-+	epid_done = 1;	
-+      }
-+
-+      if (!epid_done) {
-+	if(urb == activeUrbList[epid]) {
-+	  urb = urb_list_first(epid);
-+	} else {
-+	  urb = urb_list_next(urb, epid);
-+	}
-+      }
-+    } /* END: while(urb && !epid_done) */
-+  }
-+
-+  local_irq_restore(flags);
-+}
-+
-+
-+/* This is where the Out Isoc URBs are realy completed. This function is
-+   scheduled from tc_dma_tx_interrupt() when one or more Out Isoc transfers
-+   are done. This functions completes all URBs earlier marked with
-+   isoc_out_done by fast interrupt routine check_finished_isoc_tx_epids() */
-+
-+static void complete_isoc_bottom_half(void *data) {
-+  struct crisv10_isoc_complete_data *comp_data;
-+  struct usb_iso_packet_descriptor *packet;
-+  struct crisv10_urb_priv * urb_priv;
-+  unsigned long flags;
-+  struct urb* urb;
-+  int epid_done;
-+  int epid;
-+  int i;
-+
-+  comp_data = (struct crisv10_isoc_complete_data*)data;
-+
-+  local_irq_save(flags);
-+
-+  for (epid = 0; epid < NBR_OF_EPIDS - 1; epid++) {
-+    if(!epid_inuse(epid) || !epid_isoc(epid) || !epid_out_traffic(epid) || epid == DUMMY_EPID) {
-+      /* Only check valid Out Isoc epids */
-+      continue;
-+    }
-+
-+    isoc_dbg("Isoc bottom-half checking epid:%d, sub:0x%x\n", epid,
-+	     (unsigned int)phys_to_virt(TxIsocEPList[epid].sub));
-+
-+    /* The descriptor interrupt handler has marked all transmitted Out Isoc
-+       URBs with isoc_out_done.  Now we traverse all epids and for all that
-+       have out Isoc traffic we traverse its URB list and complete the
-+       transmitted URBs. */
-+    epid_done = 0;
-+    while (!epid_done) {
-+
-+      /* Get the active urb (if any) */
-+      urb = activeUrbList[epid];
-+      if (urb == 0) {
-+	isoc_dbg("No active URB on epid:%d anymore\n", epid);
-+	epid_done = 1;
-+	continue;
-+      }
-+
-+      /* Sanity check. */
-+      ASSERT(usb_pipetype(urb->pipe) == PIPE_ISOCHRONOUS);
-+      ASSERT(usb_pipeout(urb->pipe));
-+
-+      urb_priv = (struct crisv10_urb_priv *)urb->hcpriv;
-+      ASSERT(urb_priv);
-+
-+      if (!(urb_priv->isoc_out_done)) {
-+	/* We have reached URB that isn't flaged done yet, stop traversing. */
-+	isoc_dbg("Stoped traversing Out Isoc URBs on epid:%d"
-+		 " before not yet flaged URB:0x%x[%d]\n",
-+		 epid, (unsigned int)urb, urb_priv->urb_num);
-+	epid_done = 1;
-+	continue;
-+      }
-+
-+      /* This urb has been sent. */
-+      isoc_dbg("Found URB:0x%x[%d] that is flaged isoc_out_done\n",
-+	       (unsigned int)urb, urb_priv->urb_num);
-+
-+      /* Set ok on transfered packets for this URB and finish it */
-+      for (i = 0; i < urb->number_of_packets; i++) {
-+	packet = &urb->iso_frame_desc[i];
-+	packet->status = 0;
-+	packet->actual_length = packet->length;
-+      }
-+      urb_priv->isoc_packet_counter = urb->number_of_packets;
-+      tc_finish_urb(comp_data->hcd, urb, 0);
-+
-+    } /* END: while(!epid_done) */
-+  } /* END: for(epid...) */
-+
-+  local_irq_restore(flags);
-+  kmem_cache_free(isoc_compl_cache, comp_data);
-+}
-+#endif
-+
-+static void check_finished_intr_tx_epids(struct usb_hcd *hcd) {
-+  unsigned long flags;
-+  int epid;
-+  struct urb *urb;
-+  struct crisv10_urb_priv * urb_priv;
-+  volatile struct USB_EP_Desc *curr_ep;   /* Current EP, the iterator. */
-+  volatile struct USB_EP_Desc *next_ep;   /* The EP after current. */
-+
-+  /* Protect TxintrEPList */
-+  local_irq_save(flags);
-+
-+  for (epid = 0; epid < NBR_OF_EPIDS; epid++) {
-+    if(!epid_inuse(epid) || !epid_intr(epid) || !epid_out_traffic(epid)) {
-+      /* Nothing to see on this epid. Only check valid Out Intr epids */
-+      continue;
-+    }
-+
-+    urb = activeUrbList[epid];
-+    if(urb == 0) {
-+      intr_warn("Found Out Intr epid:%d with no active URB\n", epid);
-+      continue;
-+    }
-+
-+    /* Sanity check. */
-+    ASSERT(usb_pipetype(urb->pipe) == PIPE_INTERRUPT);
-+    ASSERT(usb_pipeout(urb->pipe));
-+    
-+    urb_priv = (struct crisv10_urb_priv *)urb->hcpriv;
-+    ASSERT(urb_priv);
-+
-+    /* Go through EPs between first and second sof-EP. It's here Out Intr EPs
-+       are inserted.*/
-+    curr_ep = &TxIntrEPList[0];
-+    do {
-+      next_ep = (struct USB_EP_Desc *)phys_to_virt(curr_ep->next);
-+      if(next_ep == urb_priv->intr_ep_pool[0]) {
-+	/* We found the Out Intr EP for this epid */
-+	
-+	/* Disable it so it doesn't get processed again */
-+	next_ep->command &= ~IO_MASK(USB_EP_command, enable);
-+
-+	/* Finish the active Out Intr URB with status OK */
-+	tc_finish_urb(hcd, urb, 0);
-+      }
-+      curr_ep = phys_to_virt(curr_ep->next);
-+    } while (curr_ep != &TxIntrEPList[1]);
-+
-+  }
-+  local_irq_restore(flags);
-+}
-+
-+/* Interrupt handler for DMA8/IRQ24 with subchannels (called from hardware intr) */
-+static irqreturn_t tc_dma_tx_interrupt(int irq, void *vhc) {
-+  struct usb_hcd *hcd = (struct usb_hcd*)vhc;
-+  ASSERT(hcd);
-+
-+  if (*R_IRQ_READ2 & IO_MASK(R_IRQ_READ2, dma8_sub0_descr)) {
-+    /* Clear this interrupt */
-+    *R_DMA_CH8_SUB0_CLR_INTR = IO_STATE(R_DMA_CH8_SUB0_CLR_INTR, clr_descr, do);
-+    restart_dma8_sub0();
-+  }
-+
-+  if (*R_IRQ_READ2 & IO_MASK(R_IRQ_READ2, dma8_sub1_descr)) {
-+    /* Clear this interrupt */
-+    *R_DMA_CH8_SUB1_CLR_INTR = IO_STATE(R_DMA_CH8_SUB1_CLR_INTR, clr_descr, do);
-+    check_finished_ctrl_tx_epids(hcd);
-+  }
-+
-+  if (*R_IRQ_READ2 & IO_MASK(R_IRQ_READ2, dma8_sub2_descr)) {
-+    /* Clear this interrupt */
-+    *R_DMA_CH8_SUB2_CLR_INTR = IO_STATE(R_DMA_CH8_SUB2_CLR_INTR, clr_descr, do);
-+    check_finished_intr_tx_epids(hcd);
-+  }
-+
-+  /* hinko ignore usb_pipeisoc */
-+#if 0
-+  if (*R_IRQ_READ2 & IO_MASK(R_IRQ_READ2, dma8_sub3_descr)) {
-+    struct crisv10_isoc_complete_data* comp_data;
-+
-+    /* Flag done Out Isoc for later completion */
-+    check_finished_isoc_tx_epids();
-+
-+    /* Clear this interrupt */
-+    *R_DMA_CH8_SUB3_CLR_INTR = IO_STATE(R_DMA_CH8_SUB3_CLR_INTR, clr_descr, do);
-+    /* Schedule bottom half of Out Isoc completion function. This function
-+       finishes the URBs marked with isoc_out_done */
-+    comp_data = (struct crisv10_isoc_complete_data*)
-+      kmem_cache_alloc(isoc_compl_cache, GFP_ATOMIC);
-+    ASSERT(comp_data != NULL);
-+    comp_data ->hcd = hcd;
-+
-+    //INIT_WORK(&comp_data->usb_bh, complete_isoc_bottom_half, comp_data);
-+    INIT_WORK(&comp_data->usb_bh, complete_isoc_bottom_half);
-+    schedule_work(&comp_data->usb_bh);
-+  }
-+#endif
-+
-+  return IRQ_HANDLED;
-+}
-+
-+/* Interrupt handler for DMA9/IRQ25 (called from hardware intr) */
-+static irqreturn_t tc_dma_rx_interrupt(int irq, void *vhc) {
-+  unsigned long flags;
-+  struct urb *urb;
-+  struct usb_hcd *hcd = (struct usb_hcd*)vhc;
-+  struct crisv10_urb_priv *urb_priv;
-+  int epid = 0;
-+  int real_error;
-+
-+  ASSERT(hcd);
-+
-+  /* Clear this interrupt. */
-+  *R_DMA_CH9_CLR_INTR = IO_STATE(R_DMA_CH9_CLR_INTR, clr_eop, do);
-+
-+  /* Custom clear interrupt for this interrupt */
-+  /* The reason we cli here is that we call the driver's callback functions. */
-+  local_irq_save(flags);
-+
-+  /* Note that this while loop assumes that all packets span only
-+     one rx descriptor. */
-+  while(myNextRxDesc->status & IO_MASK(USB_IN_status, eop)) {
-+    epid = IO_EXTRACT(USB_IN_status, epid, myNextRxDesc->status);
-+    /* Get the active URB for this epid */
-+    urb = activeUrbList[epid];
-+
-+    ASSERT(epid_inuse(epid));
-+    if (!urb) {
-+      dma_err("No urb for epid %d in rx interrupt\n", epid);
-+      goto skip_out;
-+    }
-+
-+    /* Check if any errors on epid */
-+    real_error = 0;
-+    if (myNextRxDesc->status & IO_MASK(USB_IN_status, error)) {
-+      __u32 r_usb_ept_data;
-+
-+      if (usb_pipeisoc(urb->pipe)) {
-+	r_usb_ept_data = etrax_epid_iso_get(epid);
-+	if((r_usb_ept_data & IO_MASK(R_USB_EPT_DATA_ISO, valid)) &&
-+	   (IO_EXTRACT(R_USB_EPT_DATA_ISO, error_code, r_usb_ept_data) == 0) &&
-+	   (myNextRxDesc->status & IO_MASK(USB_IN_status, nodata))) {
-+	  /* Not an error, just a failure to receive an expected iso
-+	     in packet in this frame.  This is not documented
-+	     in the designers reference. Continue processing.
-+	  */
-+	} else real_error = 1;
-+      } else real_error = 1;
-+    }
-+
-+    if(real_error) {
-+      dma_err("Error in RX descr on epid:%d for URB 0x%x",
-+	      epid, (unsigned int)urb);
-+      dump_ept_data(epid);
-+      dump_in_desc(myNextRxDesc);
-+      goto skip_out;
-+    }
-+
-+    urb_priv = (struct crisv10_urb_priv *)urb->hcpriv;
-+    ASSERT(urb_priv);
-+    ASSERT(urb_priv->urb_state == STARTED ||
-+	   urb_priv->urb_state == UNLINK);
-+
-+    if ((usb_pipetype(urb->pipe) == PIPE_BULK) ||
-+	(usb_pipetype(urb->pipe) == PIPE_CONTROL) ||
-+	(usb_pipetype(urb->pipe) == PIPE_INTERRUPT)) {
-+
-+      /* We get nodata for empty data transactions, and the rx descriptor's
-+	 hw_len field is not valid in that case. No data to copy in other
-+	 words. */
-+      if (myNextRxDesc->status & IO_MASK(USB_IN_status, nodata)) {
-+	/* No data to copy */
-+      } else {
-+	/*
-+	dma_dbg("Processing RX for URB:0x%x epid:%d (data:%d ofs:%d)\n",
-+		(unsigned int)urb, epid, myNextRxDesc->hw_len,
-+		urb_priv->rx_offset);
-+	*/
-+	/* Only copy data if URB isn't flaged to be unlinked*/
-+	if(urb_priv->urb_state != UNLINK) {
-+	  /* Make sure the data fits in the buffer. */
-+	  if(urb_priv->rx_offset + myNextRxDesc->hw_len
-+	     <= urb->transfer_buffer_length) {
-+
-+	    /* Copy the data to URBs buffer */
-+	    memcpy(urb->transfer_buffer + urb_priv->rx_offset,
-+		   phys_to_virt(myNextRxDesc->buf), myNextRxDesc->hw_len);
-+	    urb_priv->rx_offset += myNextRxDesc->hw_len;
-+	  } else {
-+	    /* Signal overflow when returning URB */
-+	    urb->status = -EOVERFLOW;
-+	    tc_finish_urb_later(hcd, urb, urb->status);
-+	  }
-+	}
-+      }
-+
-+      /* Check if it was the last packet in the transfer */
-+      if (myNextRxDesc->status & IO_MASK(USB_IN_status, eot)) {
-+	/* Special handling for In Ctrl URBs. */
-+	if(usb_pipecontrol(urb->pipe) && usb_pipein(urb->pipe) &&
-+	   !(urb_priv->ctrl_zout_done)) {
-+	  /* Flag that RX part of Ctrl transfer is done. Because zout descr
-+	     interrupt hasn't happend yet will the URB be finished in the
-+	     TX-Interrupt. */
-+	  urb_priv->ctrl_rx_done = 1;
-+	  tc_dbg("Not finishing In Ctrl URB:0x%x from rx_interrupt, waiting"
-+		 " for zout\n", (unsigned int)urb);
-+	} else {
-+	  tc_finish_urb(hcd, urb, 0);
-+	}
-+      }
-+    } else { /* ISOC RX */
-+      /*
-+      isoc_dbg("Processing RX for epid:%d (URB:0x%x) ISOC pipe\n",
-+	       epid, (unsigned int)urb);
-+      */
-+
-+      struct usb_iso_packet_descriptor *packet;
-+
-+      if (urb_priv->urb_state == UNLINK) {
-+	isoc_warn("Ignoring Isoc Rx data for urb being unlinked.\n");
-+	goto skip_out;
-+      } else if (urb_priv->urb_state == NOT_STARTED) {
-+	isoc_err("What? Got Rx data for Isoc urb that isn't started?\n");
-+	goto skip_out;
-+      }
-+
-+      packet = &urb->iso_frame_desc[urb_priv->isoc_packet_counter];
-+      ASSERT(packet);
-+      packet->status = 0;
-+
-+      if (myNextRxDesc->status & IO_MASK(USB_IN_status, nodata)) {
-+	/* We get nodata for empty data transactions, and the rx descriptor's
-+	   hw_len field is not valid in that case. We copy 0 bytes however to
-+	   stay in synch. */
-+	packet->actual_length = 0;
-+      } else {
-+	packet->actual_length = myNextRxDesc->hw_len;
-+	/* Make sure the data fits in the buffer. */
-+	ASSERT(packet->actual_length <= packet->length);
-+	memcpy(urb->transfer_buffer + packet->offset,
-+	       phys_to_virt(myNextRxDesc->buf), packet->actual_length);
-+	if(packet->actual_length > 0)
-+	  isoc_dbg("Copied %d bytes, packet %d for URB:0x%x[%d]\n",
-+		   packet->actual_length, urb_priv->isoc_packet_counter,
-+		   (unsigned int)urb, urb_priv->urb_num);
-+      }
-+
-+      /* Increment the packet counter. */
-+      urb_priv->isoc_packet_counter++;
-+
-+      /* Note that we don't care about the eot field in the rx descriptor's
-+	 status. It will always be set for isoc traffic. */
-+      if (urb->number_of_packets == urb_priv->isoc_packet_counter) {
-+	/* Complete the urb with status OK. */
-+	tc_finish_urb(hcd, urb, 0);
-+      }
-+    }
-+
-+  skip_out:
-+    myNextRxDesc->status = 0;
-+    myNextRxDesc->command |= IO_MASK(USB_IN_command, eol);
-+    myLastRxDesc->command &= ~IO_MASK(USB_IN_command, eol);
-+    myLastRxDesc = myNextRxDesc;
-+    myNextRxDesc = phys_to_virt(myNextRxDesc->next);
-+    flush_etrax_cache();
-+    *R_DMA_CH9_CMD = IO_STATE(R_DMA_CH9_CMD, cmd, restart);
-+  }
-+
-+  local_irq_restore(flags);
-+
-+  return IRQ_HANDLED;
-+}
-+
-+static void tc_bulk_start_timer_func(unsigned long dummy) {
-+  /* We might enable an EP descriptor behind the current DMA position when
-+     it's about to decide that there are no more bulk traffic and it should
-+     stop the bulk channel.
-+     Therefore we periodically check if the bulk channel is stopped and there
-+     is an enabled bulk EP descriptor, in which case we start the bulk
-+     channel. */
-+  
-+  if (!(*R_DMA_CH8_SUB0_CMD & IO_MASK(R_DMA_CH8_SUB0_CMD, cmd))) {
-+    int epid;
-+
-+    timer_dbg("bulk_start_timer: Bulk DMA channel not running.\n");
-+
-+    for (epid = 0; epid < NBR_OF_EPIDS; epid++) {
-+      if (TxBulkEPList[epid].command & IO_MASK(USB_EP_command, enable)) {
-+	timer_warn("Found enabled EP for epid %d, starting bulk channel.\n",
-+		   epid);
-+	restart_dma8_sub0();
-+
-+	/* Restart the bulk eot timer since we just started the bulk channel.*/
-+	mod_timer(&bulk_eot_timer, jiffies + BULK_EOT_TIMER_INTERVAL);
-+
-+	/* No need to search any further. */
-+	break;
-+      }
-+    }
-+  } else {
-+    timer_dbg("bulk_start_timer: Bulk DMA channel running.\n");
-+  }
-+}
-+
-+static void tc_bulk_eot_timer_func(unsigned long dummy) {
-+  struct usb_hcd *hcd = (struct usb_hcd*)dummy;
-+  ASSERT(hcd);
-+  /* Because of a race condition in the top half, we might miss a bulk eot.
-+     This timer "simulates" a bulk eot if we don't get one for a while,
-+     hopefully correcting the situation. */
-+  timer_dbg("bulk_eot_timer timed out.\n");
-+  check_finished_bulk_tx_epids(hcd, 1);
-+}
-+
-+
-+/*************************************************************/
-+/*************************************************************/
-+/* Device driver block                                       */
-+/*************************************************************/
-+/*************************************************************/
-+
-+/* Forward declarations for device driver functions */
-+static int devdrv_hcd_probe(struct device *);
-+static int devdrv_hcd_remove(struct device *);
-+#ifdef CONFIG_PM
-+static int devdrv_hcd_suspend(struct device *, u32, u32);
-+static int devdrv_hcd_resume(struct device *, u32);
-+#endif /* CONFIG_PM */
-+
-+/* the device */
-+static struct platform_device *devdrv_hc_platform_device;
-+
-+/* device driver interface */
-+static struct device_driver devdrv_hc_device_driver = {
-+  .name =			(char *) hc_name,
-+  .bus =			&platform_bus_type,
-+
-+  .probe =		devdrv_hcd_probe,
-+  .remove =		devdrv_hcd_remove,
-+
-+#ifdef CONFIG_PM
-+  .suspend =		devdrv_hcd_suspend,
-+  .resume =		devdrv_hcd_resume,
-+#endif /* CONFIG_PM */
-+};
-+
-+/* initialize the host controller and driver  */
-+static int __init_or_module devdrv_hcd_probe(struct device *dev)
-+{
-+  struct usb_hcd *hcd;
-+  struct crisv10_hcd *crisv10_hcd;
-+  int retval;
-+  int rev_maj, rev_min;
-+
-+  /* Check DMA burst length */
-+  if(IO_EXTRACT(R_BUS_CONFIG, dma_burst, *R_BUS_CONFIG) !=
-+     IO_STATE(R_BUS_CONFIG, dma_burst, burst32)) {
-+    devdrv_err("Invalid DMA burst length in Etrax 100LX,"
-+	       " needs to be 32\n");
-+    return -EPERM;
-+  }
-+
-+  hcd = usb_create_hcd(&crisv10_hc_driver, dev, dev_name(dev));
-+  if (!hcd)
-+    return -ENOMEM;
-+
-+  crisv10_hcd = hcd_to_crisv10_hcd(hcd);
-+  spin_lock_init(&crisv10_hcd->lock);
-+  crisv10_hcd->num_ports = num_ports();
-+  crisv10_hcd->running = 0;
-+
-+  dev_set_drvdata(dev, crisv10_hcd);
-+
-+  devdrv_dbg("ETRAX USB IRQs HC:%d  RX:%d  TX:%d\n", ETRAX_USB_HC_IRQ,
-+	  ETRAX_USB_RX_IRQ, ETRAX_USB_TX_IRQ);
-+
-+  /* Print out chip version read from registers */
-+  rev_maj = *R_USB_REVISION & IO_MASK(R_USB_REVISION, major);
-+  rev_min = *R_USB_REVISION & IO_MASK(R_USB_REVISION, minor);
-+  if(rev_min == 0) {
-+    devdrv_info("Etrax 100LX USB Revision %d v1,2\n", rev_maj);
-+  } else {
-+    devdrv_info("Etrax 100LX USB Revision %d v%d\n", rev_maj, rev_min);
-+  }
-+
-+  devdrv_info("Bulk timer interval, start:%d eot:%d\n",
-+	      BULK_START_TIMER_INTERVAL,
-+	      BULK_EOT_TIMER_INTERVAL);
-+
-+
-+  /* Init root hub data structures */
-+  if(rh_init()) {
-+    devdrv_err("Failed init data for Root Hub\n");
-+    retval = -ENOMEM;
-+  }
-+
-+  if(port_in_use(0)) {
-+    if (cris_request_io_interface(if_usb_1, "ETRAX100LX USB-HCD")) {
-+      printk(KERN_CRIT "usb-host: request IO interface usb1 failed");
-+      retval = -EBUSY;
-+      goto out;
-+    }
-+    devdrv_info("Claimed interface for USB physical port 1\n");
-+  }
-+  if(port_in_use(1)) {
-+    if (cris_request_io_interface(if_usb_2, "ETRAX100LX USB-HCD")) {
-+      /* Free first interface if second failed to be claimed */
-+      if(port_in_use(0)) {
-+	cris_free_io_interface(if_usb_1);
-+      }
-+      printk(KERN_CRIT "usb-host: request IO interface usb2 failed");
-+      retval = -EBUSY;
-+      goto out;
-+    }
-+    devdrv_info("Claimed interface for USB physical port 2\n");
-+  }
-+  
-+  /* Init transfer controller structs and locks */
-+  if((retval = tc_init(hcd)) != 0) {
-+    goto out;
-+  }
-+
-+  /* Attach interrupt functions for DMA and init DMA controller */
-+  if((retval = tc_dma_init(hcd)) != 0) {
-+    goto out;
-+  }
-+
-+  /* Attach the top IRQ handler for USB controller interrupts */
-+  if (request_irq(ETRAX_USB_HC_IRQ, crisv10_hcd_top_irq, 0,
-+		  "ETRAX 100LX built-in USB (HC)", hcd)) {
-+    err("Could not allocate IRQ %d for USB", ETRAX_USB_HC_IRQ);
-+    retval = -EBUSY;
-+    goto out;
-+  }
-+
-+  /* iso_eof is only enabled when isoc traffic is running. */
-+  *R_USB_IRQ_MASK_SET =
-+    /* IO_STATE(R_USB_IRQ_MASK_SET, iso_eof, set) | */
-+    IO_STATE(R_USB_IRQ_MASK_SET, bulk_eot, set) |
-+    IO_STATE(R_USB_IRQ_MASK_SET, epid_attn, set) |
-+    IO_STATE(R_USB_IRQ_MASK_SET, port_status, set) |
-+    IO_STATE(R_USB_IRQ_MASK_SET, ctl_status, set);
-+
-+
-+  crisv10_ready_wait();
-+  /* Reset the USB interface. */
-+  *R_USB_COMMAND =
-+    IO_STATE(R_USB_COMMAND, port_sel, nop) |
-+    IO_STATE(R_USB_COMMAND, port_cmd, reset) |
-+    IO_STATE(R_USB_COMMAND, ctrl_cmd, reset);
-+
-+  /* Designer's Reference, p. 8 - 10 says we should Initate R_USB_FM_PSTART to
-+     0x2A30 (10800), to guarantee that control traffic gets 10% of the
-+     bandwidth, and periodic transfer may allocate the rest (90%).
-+     This doesn't work though.
-+     The value 11960 is chosen to be just after the SOF token, with a couple
-+     of bit times extra for possible bit stuffing. */
-+  *R_USB_FM_PSTART = IO_FIELD(R_USB_FM_PSTART, value, 11960);
-+
-+  crisv10_ready_wait();
-+  /* Configure the USB interface as a host controller. */
-+  *R_USB_COMMAND =
-+    IO_STATE(R_USB_COMMAND, port_sel, nop) |
-+    IO_STATE(R_USB_COMMAND, port_cmd, reset) |
-+    IO_STATE(R_USB_COMMAND, ctrl_cmd, host_config);
-+
-+
-+  /* Check so controller not busy before enabling ports */
-+  crisv10_ready_wait();
-+
-+  /* Enable selected USB ports */
-+  if(port_in_use(0)) {
-+    *R_USB_PORT1_DISABLE = IO_STATE(R_USB_PORT1_DISABLE, disable, no);
-+  } else {
-+    *R_USB_PORT1_DISABLE = IO_STATE(R_USB_PORT1_DISABLE, disable, yes);
-+  }
-+  if(port_in_use(1)) {
-+    *R_USB_PORT2_DISABLE = IO_STATE(R_USB_PORT2_DISABLE, disable, no);
-+  } else {
-+    *R_USB_PORT2_DISABLE = IO_STATE(R_USB_PORT2_DISABLE, disable, yes);
-+  }
-+
-+  crisv10_ready_wait();
-+  /* Start processing of USB traffic. */
-+  *R_USB_COMMAND =
-+    IO_STATE(R_USB_COMMAND, port_sel, nop) |
-+    IO_STATE(R_USB_COMMAND, port_cmd, reset) |
-+    IO_STATE(R_USB_COMMAND, ctrl_cmd, host_run);
-+
-+  /* Do not continue probing initialization before USB interface is done */
-+  crisv10_ready_wait();
-+
-+  /* Register our Host Controller to USB Core
-+   * Finish the remaining parts of generic HCD initialization: allocate the
-+   * buffers of consistent memory, register the bus
-+   * and call the driver's reset() and start() routines. */
-+  retval = usb_add_hcd(hcd, ETRAX_USB_HC_IRQ, IRQF_DISABLED);
-+  if (retval != 0) {
-+    devdrv_err("Failed registering HCD driver\n");
-+    goto out;
-+  }
-+
-+  return 0;
-+
-+ out:
-+  devdrv_hcd_remove(dev);
-+  return retval;
-+}
-+
-+
-+/* cleanup after the host controller and driver */
-+static int __init_or_module devdrv_hcd_remove(struct device *dev)
-+{
-+  struct crisv10_hcd *crisv10_hcd = dev_get_drvdata(dev);
-+  struct usb_hcd *hcd;
-+
-+  if (!crisv10_hcd)
-+    return 0;
-+  hcd = crisv10_hcd_to_hcd(crisv10_hcd);
-+
-+
-+  /* Stop USB Controller in Etrax 100LX */
-+  crisv10_hcd_reset(hcd);
-+
-+  usb_remove_hcd(hcd);
-+  devdrv_dbg("Removed HCD from USB Core\n");
-+
-+  /* Free USB Controller IRQ */
-+  free_irq(ETRAX_USB_HC_IRQ, NULL);
-+
-+  /* Free resources */
-+  tc_dma_destroy();
-+  tc_destroy();
-+
-+
-+  if(port_in_use(0)) {
-+    cris_free_io_interface(if_usb_1);
-+  }
-+  if(port_in_use(1)) {
-+    cris_free_io_interface(if_usb_2);
-+  }
-+
-+  devdrv_dbg("Freed all claimed resources\n");
-+
-+  return 0;
-+}
-+
-+
-+#ifdef	CONFIG_PM
-+
-+static int devdrv_hcd_suspend(struct usb_hcd *hcd, u32 state, u32 level)
-+{
-+  return 0; /* no-op for now */
-+}
-+
-+static int devdrv_hcd_resume(struct usb_hcd *hcd, u32 level)
-+{
-+  return 0; /* no-op for now */
-+}
-+
-+#endif /* CONFIG_PM */
-+
-+
-+
-+/*************************************************************/
-+/*************************************************************/
-+/* Module block                                              */
-+/*************************************************************/
-+/*************************************************************/
-+ 
-+/* register driver */
-+static int __init module_hcd_init(void) 
-+{
-+  
-+  if (usb_disabled())
-+    return -ENODEV;
-+
-+  /* Here we select enabled ports by following defines created from
-+     menuconfig */
-+#ifndef CONFIG_ETRAX_USB_HOST_PORT1
-+  ports &= ~(1<<0);
-+#endif
-+#ifndef CONFIG_ETRAX_USB_HOST_PORT2
-+  ports &= ~(1<<1);
-+#endif
-+
-+  printk(KERN_INFO "%s version "VERSION" "COPYRIGHT"\n", product_desc);
-+
-+  devdrv_hc_platform_device =
-+    platform_device_register_simple((char *) hc_name, 0, NULL, 0);
-+
-+  if (IS_ERR(devdrv_hc_platform_device))
-+    return PTR_ERR(devdrv_hc_platform_device);
-+  return driver_register(&devdrv_hc_device_driver);
-+  /* 
-+   * Note that we do not set the DMA mask for the device,
-+   * i.e. we pretend that we will use PIO, since no specific
-+   * allocation routines are needed for DMA buffers. This will
-+   * cause the HCD buffer allocation routines to fall back to
-+   * kmalloc().
-+   */
-+}
-+
-+/* unregister driver */
-+static void __exit module_hcd_exit(void) 
-+{	
-+  driver_unregister(&devdrv_hc_device_driver);
-+}
-+
-+
-+/* Module hooks */
-+module_init(module_hcd_init);
-+module_exit(module_hcd_exit);
-diff -Nur linux-2.6.36.orig/drivers/usb/host/hc-crisv10.h linux-2.6.36/drivers/usb/host/hc-crisv10.h
---- linux-2.6.36.orig/drivers/usb/host/hc-crisv10.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36/drivers/usb/host/hc-crisv10.h	2010-11-15 17:57:18.000000000 +0100
-@@ -0,0 +1,331 @@
-+#ifndef __LINUX_ETRAX_USB_H
-+#define __LINUX_ETRAX_USB_H
-+
-+#include <linux/types.h>
-+#include <linux/list.h>
-+
-+struct USB_IN_Desc {
-+  volatile __u16 sw_len;
-+  volatile __u16 command;
-+  volatile unsigned long next;
-+  volatile unsigned long buf;
-+  volatile __u16 hw_len;
-+  volatile __u16 status;
-+};
-+
-+struct USB_SB_Desc {
-+  volatile __u16 sw_len;
-+  volatile __u16 command;
-+  volatile unsigned long next;
-+  volatile unsigned long buf;
-+};
-+
-+struct USB_EP_Desc {
-+  volatile __u16 hw_len;
-+  volatile __u16 command;
-+  volatile unsigned long sub;
-+  volatile unsigned long next;
-+};
-+
-+
-+/* Root Hub port status struct */
-+struct crisv10_rh {
-+  volatile __u16 wPortChange[2];
-+  volatile __u16 wPortStatusPrev[2];
-+};
-+
-+/* HCD description */
-+struct crisv10_hcd {
-+  spinlock_t		lock;
-+  __u8			num_ports;
-+  __u8                  running;
-+};
-+
-+
-+/* Endpoint HC private data description */
-+struct crisv10_ep_priv {
-+  int epid;
-+};
-+
-+/* Additional software state info for a USB Controller epid */
-+struct etrax_epid {
-+  __u8 inuse;       /* !0 = setup in Etrax and used for a endpoint */
-+  __u8 disabled;    /* !0 = Temporarly disabled to avoid resubmission */
-+  __u8 type;        /* Setup as: PIPE_BULK, PIPE_CONTROL ... */
-+  __u8 out_traffic; /* !0 = This epid is for out traffic */
-+};
-+
-+/* Struct to hold information of scheduled later URB completion */
-+struct urb_later_data {
-+//  struct work_struct ws;
-+  struct delayed_work ws;
-+  struct usb_hcd *hcd;
-+  struct urb *urb;
-+  int urb_num;
-+  int status;
-+};
-+
-+
-+typedef enum {
-+  STARTED,
-+  NOT_STARTED,
-+  UNLINK,
-+} crisv10_urb_state_t;
-+
-+
-+struct crisv10_urb_priv {
-+  /* Sequence number for this URB. Every new submited URB gets this from
-+     a incrementing counter. Used when a URB is scheduled for later finish to
-+     be sure that the intended URB hasn't already been completed (device
-+     drivers has a tendency to reuse URBs once they are completed, causing us
-+     to not be able to single old ones out only based on the URB pointer.) */
-+  __u32 urb_num;
-+
-+  /* The first_sb field is used for freeing all SB descriptors belonging
-+     to an urb. The corresponding ep descriptor's sub pointer cannot be
-+     used for this since the DMA advances the sub pointer as it processes
-+     the sb list. */
-+  struct USB_SB_Desc *first_sb;
-+
-+  /* The last_sb field referes to the last SB descriptor that belongs to
-+     this urb. This is important to know so we can free the SB descriptors
-+     that ranges between first_sb and last_sb. */
-+  struct USB_SB_Desc *last_sb;
-+  
-+  /* The rx_offset field is used in ctrl and bulk traffic to keep track
-+     of the offset in the urb's transfer_buffer where incoming data should be
-+     copied to. */
-+  __u32 rx_offset;
-+  
-+  /* Counter used in isochronous transfers to keep track of the
-+     number of packets received/transmitted.  */
-+  __u32 isoc_packet_counter;
-+
-+  /* Flag that marks if this Isoc Out URB has finished it's transfer. Used
-+     because several URBs can be finished before list is processed */
-+  __u8  isoc_out_done;
-+  
-+  /* This field is used to pass information about the urb's current state
-+     between the various interrupt handlers (thus marked volatile). */
-+  volatile crisv10_urb_state_t urb_state;
-+  
-+  /* In Ctrl transfers consist of (at least) 3 packets: SETUP, IN and ZOUT.
-+     When DMA8 sub-channel 2 has processed the SB list for this sequence we
-+     get a interrupt. We also get a interrupt for In transfers and which
-+     one of these interrupts that comes first depends of data size and device.
-+     To be sure that we have got both interrupts before we complete the URB
-+     we have these to flags that shows which part that has completed.
-+     We can then check when we get one of the interrupts that if the other has
-+     occured it's safe for us to complete the URB, otherwise we set appropriate
-+     flag and do the completion when we get the other interrupt. */
-+  volatile unsigned char ctrl_zout_done;
-+  volatile unsigned char ctrl_rx_done;
-+
-+  /* Connection between the submitted urb and ETRAX epid number */
-+  __u8 epid;
-+  
-+  /* The rx_data_list field is used for periodic traffic, to hold
-+     received data for later processing in the the complete_urb functions,
-+     where the data us copied to the urb's transfer_buffer. Basically, we
-+     use this intermediate storage because we don't know when it's safe to
-+     reuse the transfer_buffer (FIXME?). */
-+  struct list_head rx_data_list;
-+
-+
-+  /* The interval time rounded up to closest 2^N */
-+  int interval;
-+
-+  /* Pool of EP descriptors needed if it's a INTR transfer.
-+     Amount of EPs in pool correspons to how many INTR that should
-+     be inserted in TxIntrEPList (max 128, defined by MAX_INTR_INTERVAL) */
-+  struct USB_EP_Desc* intr_ep_pool[128];
-+
-+  /* The mount of EPs allocated for this INTR URB */
-+  int intr_ep_pool_length;
-+
-+  /* Pointer to info struct if URB is scheduled to be finished later */
-+  struct urb_later_data* later_data;
-+};
-+
-+
-+/* This struct is for passing data from the top half to the bottom half irq
-+   handlers */
-+struct crisv10_irq_reg {
-+  struct usb_hcd* hcd;
-+  __u32 r_usb_epid_attn;
-+  __u8 r_usb_status;
-+  __u16 r_usb_rh_port_status_1;
-+  __u16 r_usb_rh_port_status_2;
-+  __u32 r_usb_irq_mask_read;
-+  __u32 r_usb_fm_number;
-+  struct work_struct usb_bh;
-+};
-+
-+
-+/* This struct is for passing data from the isoc top half to the isoc bottom
-+   half. */
-+struct crisv10_isoc_complete_data {
-+  struct usb_hcd *hcd;
-+  struct urb *urb;
-+  struct work_struct usb_bh;
-+};
-+
-+/* Entry item for URB lists for each endpint */
-+typedef struct urb_entry
-+{
-+	struct urb *urb;
-+	struct list_head list;
-+} urb_entry_t;
-+
-+/* ---------------------------------------------------------------------------
-+   Virtual Root HUB
-+   ------------------------------------------------------------------------- */
-+/* destination of request */
-+#define RH_INTERFACE               0x01
-+#define RH_ENDPOINT                0x02
-+#define RH_OTHER                   0x03
-+
-+#define RH_CLASS                   0x20
-+#define RH_VENDOR                  0x40
-+
-+/* Requests: bRequest << 8 | bmRequestType */
-+#define RH_GET_STATUS           0x0080
-+#define RH_CLEAR_FEATURE        0x0100
-+#define RH_SET_FEATURE          0x0300
-+#define RH_SET_ADDRESS		0x0500
-+#define RH_GET_DESCRIPTOR	0x0680
-+#define RH_SET_DESCRIPTOR       0x0700
-+#define RH_GET_CONFIGURATION	0x0880
-+#define RH_SET_CONFIGURATION	0x0900
-+#define RH_GET_STATE            0x0280
-+#define RH_GET_INTERFACE        0x0A80
-+#define RH_SET_INTERFACE        0x0B00
-+#define RH_SYNC_FRAME           0x0C80
-+/* Our Vendor Specific Request */
-+#define RH_SET_EP               0x2000
-+
-+
-+/* Hub port features */
-+#define RH_PORT_CONNECTION         0x00
-+#define RH_PORT_ENABLE             0x01
-+#define RH_PORT_SUSPEND            0x02
-+#define RH_PORT_OVER_CURRENT       0x03
-+#define RH_PORT_RESET              0x04
-+#define RH_PORT_POWER              0x08
-+#define RH_PORT_LOW_SPEED          0x09
-+#define RH_C_PORT_CONNECTION       0x10
-+#define RH_C_PORT_ENABLE           0x11
-+#define RH_C_PORT_SUSPEND          0x12
-+#define RH_C_PORT_OVER_CURRENT     0x13
-+#define RH_C_PORT_RESET            0x14
-+
-+/* Hub features */
-+#define RH_C_HUB_LOCAL_POWER       0x00
-+#define RH_C_HUB_OVER_CURRENT      0x01
-+
-+#define RH_DEVICE_REMOTE_WAKEUP    0x00
-+#define RH_ENDPOINT_STALL          0x01
-+
-+/* Our Vendor Specific feature */
-+#define RH_REMOVE_EP               0x00
-+
-+
-+#define RH_ACK                     0x01
-+#define RH_REQ_ERR                 -1
-+#define RH_NACK                    0x00
-+
-+/* Field definitions for */
-+
-+#define USB_IN_command__eol__BITNR      0 /* command macros */
-+#define USB_IN_command__eol__WIDTH      1
-+#define USB_IN_command__eol__no         0
-+#define USB_IN_command__eol__yes        1
-+
-+#define USB_IN_command__intr__BITNR     3
-+#define USB_IN_command__intr__WIDTH     1
-+#define USB_IN_command__intr__no        0
-+#define USB_IN_command__intr__yes       1
-+
-+#define USB_IN_status__eop__BITNR       1 /* status macros. */
-+#define USB_IN_status__eop__WIDTH       1
-+#define USB_IN_status__eop__no          0
-+#define USB_IN_status__eop__yes         1
-+
-+#define USB_IN_status__eot__BITNR       5
-+#define USB_IN_status__eot__WIDTH       1
-+#define USB_IN_status__eot__no          0
-+#define USB_IN_status__eot__yes         1
-+
-+#define USB_IN_status__error__BITNR     6
-+#define USB_IN_status__error__WIDTH     1
-+#define USB_IN_status__error__no        0
-+#define USB_IN_status__error__yes       1
-+
-+#define USB_IN_status__nodata__BITNR    7
-+#define USB_IN_status__nodata__WIDTH    1
-+#define USB_IN_status__nodata__no       0
-+#define USB_IN_status__nodata__yes      1
-+
-+#define USB_IN_status__epid__BITNR      8
-+#define USB_IN_status__epid__WIDTH      5
-+
-+#define USB_EP_command__eol__BITNR      0
-+#define USB_EP_command__eol__WIDTH      1
-+#define USB_EP_command__eol__no         0
-+#define USB_EP_command__eol__yes        1
-+
-+#define USB_EP_command__eof__BITNR      1
-+#define USB_EP_command__eof__WIDTH      1
-+#define USB_EP_command__eof__no         0
-+#define USB_EP_command__eof__yes        1
-+
-+#define USB_EP_command__intr__BITNR     3
-+#define USB_EP_command__intr__WIDTH     1
-+#define USB_EP_command__intr__no        0
-+#define USB_EP_command__intr__yes       1
-+
-+#define USB_EP_command__enable__BITNR   4
-+#define USB_EP_command__enable__WIDTH   1
-+#define USB_EP_command__enable__no      0
-+#define USB_EP_command__enable__yes     1
-+
-+#define USB_EP_command__hw_valid__BITNR 5
-+#define USB_EP_command__hw_valid__WIDTH 1
-+#define USB_EP_command__hw_valid__no    0
-+#define USB_EP_command__hw_valid__yes   1
-+
-+#define USB_EP_command__epid__BITNR     8
-+#define USB_EP_command__epid__WIDTH     5
-+
-+#define USB_SB_command__eol__BITNR      0 /* command macros. */
-+#define USB_SB_command__eol__WIDTH      1
-+#define USB_SB_command__eol__no         0
-+#define USB_SB_command__eol__yes        1
-+
-+#define USB_SB_command__eot__BITNR      1
-+#define USB_SB_command__eot__WIDTH      1
-+#define USB_SB_command__eot__no         0
-+#define USB_SB_command__eot__yes        1
-+
-+#define USB_SB_command__intr__BITNR     3
-+#define USB_SB_command__intr__WIDTH     1
-+#define USB_SB_command__intr__no        0
-+#define USB_SB_command__intr__yes       1
-+
-+#define USB_SB_command__tt__BITNR       4
-+#define USB_SB_command__tt__WIDTH       2
-+#define USB_SB_command__tt__zout        0
-+#define USB_SB_command__tt__in          1
-+#define USB_SB_command__tt__out         2
-+#define USB_SB_command__tt__setup       3
-+
-+
-+#define USB_SB_command__rem__BITNR      8
-+#define USB_SB_command__rem__WIDTH      6
-+
-+#define USB_SB_command__full__BITNR     6
-+#define USB_SB_command__full__WIDTH     1
-+#define USB_SB_command__full__no        0
-+#define USB_SB_command__full__yes       1
-+
-+#endif
-diff -Nur linux-2.6.36.orig/lib/klist.c linux-2.6.36/lib/klist.c
---- linux-2.6.36.orig/lib/klist.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/lib/klist.c	2010-11-15 17:57:18.000000000 +0100
-@@ -60,7 +60,7 @@
- {
- 	knode->n_klist = klist;
- 	/* no knode deserves to start its life dead */
--	WARN_ON(knode_dead(knode));
-+	//WARN_ON(knode_dead(knode));
- }
- 
- static void knode_kill(struct klist_node *knode)
diff --git a/target/m68k/sys-available/toolchain-m68k b/target/m68k/sys-available/toolchain-m68k
index 82cb7e662..4cfe403a7 100644
--- a/target/m68k/sys-available/toolchain-m68k
+++ b/target/m68k/sys-available/toolchain-m68k
@@ -4,5 +4,5 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_M68K
 	select ADK_toolchain_m68k
 	select ADK_TOOLCHAIN
 	help
-	  Build a cris toolchain (m68k).
+	  Build a m68k toolchain.
 
diff --git a/target/mips/sys-available/broadcom-bcm47xx b/target/mips/sys-available/broadcom-bcm47xx
index 97f66972f..532df8046 100644
--- a/target/mips/sys-available/broadcom-bcm47xx
+++ b/target/mips/sys-available/broadcom-bcm47xx
@@ -7,6 +7,7 @@ config ADK_TARGET_SYSTEM_BROADCOM_BCM47XX
 	select ADK_TARGET_WITH_MTD
 	select ADK_TARGET_WITH_SSB
 	select ADK_TARGET_WITH_WATCHDOG
+	depends on ADK_BROKEN
 	help
 	  Broadcom BCM47xx systems.
 
diff --git a/target/mips/sys-available/fon-fon2100 b/target/mips/sys-available/fon-fon2100
index f0df99dee..b0de9abe7 100644
--- a/target/mips/sys-available/fon-fon2100
+++ b/target/mips/sys-available/fon-fon2100
@@ -7,6 +7,7 @@ config ADK_TARGET_SYSTEM_FON_FON2100
 	select ADK_TARGET_WITH_MTD
 	select ADK_TARGET_WITH_AHB
 	select ADK_TARGET_KERNEL_VMLINUZ
+	depends on ADK_BROKEN
 	help
 	  Support for FON's FON2100.
 
diff --git a/target/mips/sys-available/linksys-ag241 b/target/mips/sys-available/linksys-ag241
index f2b9620f2..2bec0b522 100644
--- a/target/mips/sys-available/linksys-ag241
+++ b/target/mips/sys-available/linksys-ag241
@@ -11,6 +11,7 @@ config ADK_TARGET_SYSTEM_LINKSYS_AG241
 	select ADK_KPACKAGE_KMOD_ATM_BR2684
 	select ADK_PACKAGE_KMOD_SANGAM_ATM
 	select ADK_PACKAGE_BR2684CTL
+	depends on ADK_BROKEN
 	help
 	  Linksys AG241 DSL router.
 	  (Texas Instruments AR7 platform)
diff --git a/target/mips/sys-available/mikrotik-rb4xx b/target/mips/sys-available/mikrotik-rb4xx
index 421f4abb7..2894fda87 100644
--- a/target/mips/sys-available/mikrotik-rb4xx
+++ b/target/mips/sys-available/mikrotik-rb4xx
@@ -10,6 +10,7 @@ config ADK_TARGET_SYSTEM_MIKROTIK_RB4XX
 	select ADK_TARGET_WITH_MINIPCI
 	select ADK_TARGET_WITH_WATCHDOG
 	select ADK_TARGET_WITH_NAND
+	depends on ADK_BROKEN
 	help
 	  Support for Mikrotik RB411/RB433.
 
diff --git a/target/mips/sys-available/mikrotik-rb532 b/target/mips/sys-available/mikrotik-rb532
index e069f0b77..bdea0dfb8 100644
--- a/target/mips/sys-available/mikrotik-rb532
+++ b/target/mips/sys-available/mikrotik-rb532
@@ -9,6 +9,7 @@ config ADK_TARGET_SYSTEM_MIKROTIK_RB532
 	select ADK_TARGET_WITH_NAND
 	select ADK_TARGET_WITH_LEDS
 	select ADK_KERNEL_MIKROTIK_RB532
+	depends on ADK_BROKEN
 	help
 	  Support for Mikrotik RB532.
 
diff --git a/target/native/target.mk b/target/native/target.mk
index 747465318..0d32eb1bd 100644
--- a/target/native/target.mk
+++ b/target/native/target.mk
@@ -5,11 +5,9 @@ CPU_ARCH:=		$(shell gcc -dumpmachine | sed -e s'/-.*//' \
 	   		 -e 's/arm.*/arm/g' \
 	 		 -e 's/m68k.*/m68k/' \
 			 -e 's/ppc/powerpc/g' \
-			 -e 's/v850.*/v850/g' \
 			 -e 's/sh[234]/sh/' \
 	   		 -e 's/mips-.*/mips/' \
 	  		 -e 's/mipsel-.*/mipsel/' \
-			 -e 's/cris.*/cris/' \
 			 -e 's/i[3-9]86/i686/' \
 	    		)
 TARGET_OPTIMIZATION:=	-Os -pipe
diff --git a/target/packages/pkg-available/mpdbox b/target/packages/pkg-available/mpdbox
index e8862ea44..519250f0b 100644
--- a/target/packages/pkg-available/mpdbox
+++ b/target/packages/pkg-available/mpdbox
@@ -1,13 +1,16 @@
 config ADK_PKG_MPDBOX
 	bool "Choose packages for MPDBox system"
 	default n
+	select ADK_PACKAGE_MPDBOX
 	select ADK_PACKAGE_LIBMPDCLIENT
 	select ADK_PACKAGE_MPC
 	select ADK_PACKAGE_MPD
 	select ADK_PACKAGE_MPD_WITH_ALSA
+	select ADK_PACKAGE_MPD_WITH_PULSE
 	select ADK_PACKAGE_MPD_WITH_MP3
 	select ADK_PACKAGE_MPD_WITH_MP4
 	select ADK_PACKAGE_MPD_WITH_OGG
+	select ADK_PACKAGE_MPD_WITH_OPUS
 	select ADK_PACKAGE_MPD_WITH_FLAC
 	select ADK_PACKAGE_MPD_WITH_WAV
 	select ADK_PACKAGE_MPD_WITH_MMS
@@ -16,7 +19,12 @@ config ADK_PKG_MPDBOX
 	select ADK_PACKAGE_MPD_WITH_CURL
 	select ADK_PACKAGE_MPD_WITH_SAMPLERATE
 	select ADK_PACKAGE_MPD_WITH_HTTPD
+	select ADK_PACKAGE_NFS_UTILS
+	select ADK_PACKAGE_NFS_UTILS_WITH_KERBEROS
+	select ADK_PACKAGE_NFS_UTILS_CLIENT
+	select ADK_PACKAGE_CPUFREQUTILS
 	select ADK_PACKAGE_FILE
+	select ADK_PACKAGE_HTOP
 	select ADK_PACKAGE_DROPBEAR
 	select ADK_PACKAGE_DROPBEAR_WITH_UTMP
 	select ADK_PACKAGE_FFMPEG
diff --git a/target/ppc64/kernel.config b/target/ppc64/kernel.config
deleted file mode 100644
index 0152165ff..000000000
--- a/target/ppc64/kernel.config
+++ /dev/null
@@ -1,1253 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 3.11.5 Kernel Configuration
-#
-CONFIG_PPC64=y
-
-#
-# Processor support
-#
-CONFIG_PPC_BOOK3S_64=y
-# CONFIG_PPC_BOOK3E_64 is not set
-# CONFIG_GENERIC_CPU is not set
-# CONFIG_CELL_CPU is not set
-# CONFIG_POWER4_CPU is not set
-# CONFIG_POWER5_CPU is not set
-# CONFIG_POWER6_CPU is not set
-CONFIG_POWER7_CPU=y
-CONFIG_PPC_BOOK3S=y
-CONFIG_POWER3=y
-CONFIG_POWER4=y
-# CONFIG_TUNE_CELL is not set
-CONFIG_PPC_FPU=y
-# CONFIG_ALTIVEC is not set
-# CONFIG_PPC_ICSWX is not set
-CONFIG_PPC_STD_MMU=y
-CONFIG_PPC_STD_MMU_64=y
-# CONFIG_PPC_MM_SLICES is not set
-CONFIG_PPC_HAVE_PMU_SUPPORT=y
-# CONFIG_SMP is not set
-CONFIG_PPC_DOORBELL=y
-CONFIG_64BIT=y
-CONFIG_WORD_SIZE=64
-CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
-CONFIG_ARCH_DMA_ADDR_T_64BIT=y
-CONFIG_MMU=y
-CONFIG_HAVE_SETUP_PER_CPU_AREA=y
-CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
-CONFIG_NR_IRQS=512
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-CONFIG_ARCH_HAS_ILOG2_U32=y
-CONFIG_ARCH_HAS_ILOG2_U64=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_PPC=y
-CONFIG_EARLY_PRINTK=y
-CONFIG_COMPAT=y
-CONFIG_SYSVIPC_COMPAT=y
-CONFIG_SCHED_OMIT_FRAME_POINTER=y
-CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-CONFIG_PPC_OF=y
-CONFIG_PPC_UDBG_16550=y
-# CONFIG_GENERIC_TBSYNC is not set
-CONFIG_AUDIT_ARCH=y
-CONFIG_GENERIC_BUG=y
-# CONFIG_EPAPR_BOOT is not set
-# CONFIG_DEFAULT_UIMAGE is not set
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-# CONFIG_PPC_DCR_NATIVE is not set
-# CONFIG_PPC_DCR_MMIO is not set
-# CONFIG_PPC_OF_PLATFORM_PCI is not set
-CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
-CONFIG_ARCH_SUPPORTS_UPROBES=y
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-CONFIG_IRQ_WORK=y
-
-#
-# General setup
-#
-CONFIG_BROKEN_ON_SMP=y
-CONFIG_INIT_ENV_ARG_LIMIT=32
-CONFIG_CROSS_COMPILE=""
-# CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION=""
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_DEFAULT_HOSTNAME="openadk"
-# CONFIG_SWAP is not set
-CONFIG_SYSVIPC=y
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_POSIX_MQUEUE_SYSCTL=y
-# CONFIG_FHANDLE is not set
-# CONFIG_AUDIT is not set
-CONFIG_HAVE_GENERIC_HARDIRQS=y
-
-#
-# IRQ subsystem
-#
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_IRQ_SHOW=y
-CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
-CONFIG_IRQ_DOMAIN=y
-CONFIG_IRQ_FORCED_THREADING=y
-CONFIG_SPARSE_IRQ=y
-CONFIG_GENERIC_TIME_VSYSCALL_OLD=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-
-#
-# Timers subsystem
-#
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ_COMMON=y
-# CONFIG_HZ_PERIODIC is not set
-CONFIG_NO_HZ_IDLE=y
-# CONFIG_NO_HZ is not set
-# CONFIG_HIGH_RES_TIMERS is not set
-
-#
-# CPU/Task time and stats accounting
-#
-CONFIG_VIRT_CPU_ACCOUNTING=y
-# CONFIG_TICK_CPU_ACCOUNTING is not set
-CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y
-# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
-# CONFIG_BSD_PROCESS_ACCT is not set
-# CONFIG_TASKSTATS is not set
-
-#
-# RCU Subsystem
-#
-CONFIG_TINY_RCU=y
-# CONFIG_PREEMPT_RCU is not set
-# CONFIG_RCU_STALL_COMMON is not set
-# CONFIG_TREE_RCU_TRACE is not set
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_LOG_BUF_SHIFT=15
-# CONFIG_CGROUPS is not set
-# CONFIG_CHECKPOINT_RESTORE is not set
-# CONFIG_NAMESPACES is not set
-CONFIG_UIDGID_CONVERTED=y
-# CONFIG_UIDGID_STRICT_TYPE_CHECKS is not set
-# CONFIG_SCHED_AUTOGROUP is not set
-# CONFIG_SYSFS_DEPRECATED is not set
-# CONFIG_RELAY is not set
-# CONFIG_BLK_DEV_INITRD is not set
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_SYSCTL=y
-CONFIG_ANON_INODES=y
-CONFIG_SYSCTL_EXCEPTION_TRACE=y
-CONFIG_HAVE_PCSPKR_PLATFORM=y
-CONFIG_EXPERT=y
-CONFIG_SYSCTL_SYSCALL=y
-# CONFIG_KALLSYMS is not set
-CONFIG_PRINTK=y
-CONFIG_BUG=y
-CONFIG_PCSPKR_PLATFORM=y
-# CONFIG_BASE_FULL is not set
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-CONFIG_SIGNALFD=y
-CONFIG_TIMERFD=y
-CONFIG_EVENTFD=y
-CONFIG_SHMEM=y
-CONFIG_AIO=y
-# CONFIG_PCI_QUIRKS is not set
-CONFIG_EMBEDDED=y
-CONFIG_HAVE_PERF_EVENTS=y
-
-#
-# Kernel Performance Events And Counters
-#
-# CONFIG_PERF_EVENTS is not set
-# CONFIG_VM_EVENT_COUNTERS is not set
-# CONFIG_COMPAT_BRK is not set
-CONFIG_SLAB=y
-# CONFIG_SLUB is not set
-# CONFIG_SLOB is not set
-# CONFIG_PROFILING is not set
-CONFIG_HAVE_OPROFILE=y
-# CONFIG_KPROBES is not set
-# CONFIG_JUMP_LABEL is not set
-# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
-CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
-CONFIG_ARCH_USE_BUILTIN_BSWAP=y
-CONFIG_HAVE_IOREMAP_PROT=y
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_ARCH_TRACEHOOK=y
-CONFIG_HAVE_DMA_ATTRS=y
-CONFIG_GENERIC_SMP_IDLE_THREAD=y
-CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
-CONFIG_HAVE_DMA_API_DEBUG=y
-CONFIG_HAVE_ARCH_JUMP_LABEL=y
-CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
-CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
-CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
-CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
-CONFIG_HAVE_CONTEXT_TRACKING=y
-CONFIG_HAVE_VIRT_CPU_ACCOUNTING=y
-CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
-CONFIG_MODULES_USE_ELF_RELA=y
-CONFIG_CLONE_BACKWARDS=y
-CONFIG_OLD_SIGSUSPEND=y
-CONFIG_COMPAT_OLD_SIGACTION=y
-
-#
-# GCOV-based kernel profiling
-#
-# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
-CONFIG_SLABINFO=y
-CONFIG_RT_MUTEXES=y
-CONFIG_BASE_SMALL=1
-CONFIG_MODULES=y
-# CONFIG_MODULE_FORCE_LOAD is not set
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-# CONFIG_MODVERSIONS is not set
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-# CONFIG_MODULE_SIG is not set
-CONFIG_BLOCK=y
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_BLK_DEV_BSGLIB is not set
-# CONFIG_BLK_DEV_INTEGRITY is not set
-
-#
-# Partition Types
-#
-# CONFIG_PARTITION_ADVANCED is not set
-CONFIG_MSDOS_PARTITION=y
-CONFIG_EFI_PARTITION=y
-CONFIG_BLOCK_COMPAT=y
-
-#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_DEFAULT_NOOP=y
-CONFIG_DEFAULT_IOSCHED="noop"
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-CONFIG_INLINE_READ_UNLOCK=y
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-CONFIG_INLINE_WRITE_UNLOCK=y
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-# CONFIG_FREEZER is not set
-CONFIG_PPC_MSI_BITMAP=y
-CONFIG_PPC_XICS=y
-CONFIG_PPC_ICP_NATIVE=y
-CONFIG_PPC_ICP_HV=y
-CONFIG_PPC_ICS_RTAS=y
-# CONFIG_GE_FPGA is not set
-
-#
-# Platform support
-#
-# CONFIG_PPC_POWERNV is not set
-# CONFIG_POWERNV_MSI is not set
-CONFIG_PPC_PSERIES=y
-# CONFIG_PPC_SPLPAR is not set
-CONFIG_PSERIES_MSI=y
-# CONFIG_PSERIES_ENERGY is not set
-# CONFIG_IO_EVENT_IRQ is not set
-# CONFIG_LPARCFG is not set
-# CONFIG_PPC_SMLPAR is not set
-# CONFIG_PPC_PMAC is not set
-# CONFIG_PPC_MAPLE is not set
-# CONFIG_PPC_PASEMI is not set
-# CONFIG_PPC_PS3 is not set
-# CONFIG_PPC_CELL is not set
-# CONFIG_PPC_CELL_NATIVE is not set
-# CONFIG_PPC_IBM_CELL_BLADE is not set
-# CONFIG_PPC_CELLEB is not set
-# CONFIG_PPC_CELL_QPACE is not set
-# CONFIG_PQ2ADS is not set
-# CONFIG_PPC_WSP is not set
-# CONFIG_KVM_GUEST is not set
-# CONFIG_EPAPR_PARAVIRT is not set
-CONFIG_PPC_NATIVE=y
-CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
-# CONFIG_UDBG_RTAS_CONSOLE is not set
-CONFIG_PPC_SMP_MUXED_IPI=y
-# CONFIG_IPIC is not set
-CONFIG_MPIC=y
-# CONFIG_PPC_EPAPR_HV_PIC is not set
-# CONFIG_MPIC_WEIRD is not set
-# CONFIG_MPIC_MSGR is not set
-CONFIG_PPC_I8259=y
-# CONFIG_U3_DART is not set
-CONFIG_PPC_RTAS=y
-CONFIG_RTAS_ERROR_LOGGING=y
-CONFIG_PPC_RTAS_DAEMON=y
-# CONFIG_RTAS_PROC is not set
-# CONFIG_MMIO_NVRAM is not set
-# CONFIG_MPIC_U3_HT_IRQS is not set
-CONFIG_IBMVIO=y
-# CONFIG_IBMEBUS is not set
-CONFIG_EEH=y
-# CONFIG_PPC_MPC106 is not set
-# CONFIG_PPC_970_NAP is not set
-# CONFIG_PPC_P7_NAP is not set
-
-#
-# CPU Frequency scaling
-#
-# CONFIG_CPU_FREQ is not set
-
-#
-# CPUIdle driver
-#
-# CONFIG_CPU_IDLE is not set
-# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
-# CONFIG_FSL_ULI1575 is not set
-# CONFIG_SIMPLE_GPIO is not set
-
-#
-# Kernel options
-#
-# CONFIG_HZ_100 is not set
-CONFIG_HZ_250=y
-# CONFIG_HZ_300 is not set
-# CONFIG_HZ_1000 is not set
-CONFIG_HZ=250
-# CONFIG_SCHED_HRTICK is not set
-CONFIG_PREEMPT_NONE=y
-# CONFIG_PREEMPT_VOLUNTARY is not set
-# CONFIG_PREEMPT is not set
-CONFIG_BINFMT_ELF=y
-CONFIG_COMPAT_BINFMT_ELF=y
-CONFIG_BINFMT_SCRIPT=y
-# CONFIG_HAVE_AOUT is not set
-# CONFIG_BINFMT_MISC is not set
-# CONFIG_COREDUMP is not set
-CONFIG_IOMMU_HELPER=y
-# CONFIG_SWIOTLB is not set
-CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-CONFIG_ARCH_HAS_WALK_MEMORY=y
-CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-# CONFIG_KEXEC is not set
-# CONFIG_CRASH_DUMP is not set
-# CONFIG_NUMA is not set
-CONFIG_ARCH_SELECT_MEMORY_MODEL=y
-CONFIG_ARCH_FLATMEM_ENABLE=y
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_SYS_SUPPORTS_HUGETLBFS=y
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_FLATMEM_MANUAL=y
-# CONFIG_SPARSEMEM_MANUAL is not set
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
-CONFIG_HAVE_MEMBLOCK=y
-CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
-# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
-CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_SPLIT_PTLOCK_CPUS=4
-# CONFIG_COMPACTION is not set
-# CONFIG_MIGRATION is not set
-CONFIG_PHYS_ADDR_T_64BIT=y
-CONFIG_ZONE_DMA_FLAG=1
-# CONFIG_BOUNCE is not set
-# CONFIG_KSM is not set
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-# CONFIG_CROSS_MEMORY_ATTACH is not set
-CONFIG_NEED_PER_CPU_KM=y
-# CONFIG_CLEANCACHE is not set
-# CONFIG_ZBUD is not set
-# CONFIG_PPC_HAS_HASH_64K is not set
-CONFIG_PPC_4K_PAGES=y
-# CONFIG_PPC_64K_PAGES is not set
-CONFIG_FORCE_MAX_ZONEORDER=13
-# CONFIG_PPC_DENORMALISATION is not set
-CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE="console=hvsi0 console=hvc0 console=ttyS0,9600 console=tty0"
-CONFIG_EXTRA_TARGETS=""
-# CONFIG_SUSPEND is not set
-# CONFIG_PM_RUNTIME is not set
-# CONFIG_SECCOMP is not set
-CONFIG_ISA_DMA_API=y
-
-#
-# Bus options
-#
-CONFIG_ZONE_DMA=y
-CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_NEED_SG_DMA_LENGTH=y
-CONFIG_GENERIC_ISA_DMA=y
-# CONFIG_PPC_INDIRECT_PCI is not set
-CONFIG_PPC_PCI_CHOICE=y
-CONFIG_PCI=y
-CONFIG_PCI_DOMAINS=y
-CONFIG_PCI_SYSCALL=y
-# CONFIG_PCIEPORTBUS is not set
-CONFIG_ARCH_SUPPORTS_MSI=y
-CONFIG_PCI_MSI=y
-# CONFIG_PCI_DEBUG is not set
-# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
-# CONFIG_PCI_STUB is not set
-# CONFIG_PCI_IOV is not set
-# CONFIG_PCI_PRI is not set
-# CONFIG_PCI_PASID is not set
-
-#
-# PCI host controller drivers
-#
-# CONFIG_PCCARD is not set
-# CONFIG_HOTPLUG_PCI is not set
-# CONFIG_HAS_RAPIDIO is not set
-# CONFIG_RAPIDIO is not set
-# CONFIG_NONSTATIC_KERNEL is not set
-# CONFIG_RELOCATABLE is not set
-CONFIG_PAGE_OFFSET=0xc000000000000000
-CONFIG_KERNEL_START=0xc000000000000000
-CONFIG_PHYSICAL_START=0x00000000
-CONFIG_NET=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=y
-# CONFIG_PACKET_DIAG is not set
-CONFIG_UNIX=y
-# CONFIG_UNIX_DIAG is not set
-# CONFIG_XFRM_USER is not set
-# CONFIG_NET_KEY is not set
-CONFIG_INET=y
-# CONFIG_IP_MULTICAST is not set
-# CONFIG_IP_ADVANCED_ROUTER is not set
-# CONFIG_IP_PNP is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_IPGRE_DEMUX is not set
-# CONFIG_NET_IP_TUNNEL is not set
-# CONFIG_ARPD is not set
-# CONFIG_SYN_COOKIES is not set
-# CONFIG_INET_AH is not set
-# CONFIG_INET_ESP is not set
-# CONFIG_INET_IPCOMP is not set
-# CONFIG_INET_XFRM_TUNNEL is not set
-# CONFIG_INET_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_LRO is not set
-# CONFIG_INET_DIAG is not set
-# CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
-# CONFIG_TCP_MD5SIG is not set
-# CONFIG_IPV6 is not set
-# CONFIG_NETWORK_SECMARK is not set
-# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
-# CONFIG_NETFILTER is not set
-# CONFIG_IP_DCCP is not set
-# CONFIG_IP_SCTP is not set
-# CONFIG_RDS is not set
-# CONFIG_TIPC is not set
-# CONFIG_ATM is not set
-# CONFIG_L2TP is not set
-# CONFIG_BRIDGE is not set
-CONFIG_HAVE_NET_DSA=y
-# CONFIG_VLAN_8021Q is not set
-# CONFIG_DECNET is not set
-# CONFIG_LLC2 is not set
-# CONFIG_IPX is not set
-# CONFIG_ATALK is not set
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_PHONET is not set
-# CONFIG_IEEE802154 is not set
-# CONFIG_NET_SCHED is not set
-# CONFIG_DCB is not set
-# CONFIG_BATMAN_ADV is not set
-# CONFIG_OPENVSWITCH is not set
-# CONFIG_VSOCKETS is not set
-# CONFIG_NETLINK_MMAP is not set
-# CONFIG_NETLINK_DIAG is not set
-# CONFIG_NET_MPLS_GSO is not set
-CONFIG_NET_RX_BUSY_POLL=y
-CONFIG_BQL=y
-# CONFIG_BPF_JIT is not set
-
-#
-# Network testing
-#
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_HAMRADIO is not set
-# CONFIG_CAN is not set
-# CONFIG_IRDA is not set
-# CONFIG_BT is not set
-# CONFIG_AF_RXRPC is not set
-# CONFIG_WIRELESS is not set
-# CONFIG_WIMAX is not set
-# CONFIG_RFKILL is not set
-# CONFIG_NET_9P is not set
-# CONFIG_CAIF is not set
-# CONFIG_CEPH_LIB is not set
-# CONFIG_NFC is not set
-CONFIG_HAVE_BPF_JIT=y
-
-#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-# CONFIG_STANDALONE is not set
-# CONFIG_PREVENT_FIRMWARE_BUILD is not set
-# CONFIG_FW_LOADER is not set
-# CONFIG_DEBUG_DRIVER is not set
-# CONFIG_DEBUG_DEVRES is not set
-# CONFIG_SYS_HYPERVISOR is not set
-# CONFIG_GENERIC_CPU_DEVICES is not set
-# CONFIG_DMA_SHARED_BUFFER is not set
-
-#
-# Bus devices
-#
-# CONFIG_CONNECTOR is not set
-# CONFIG_MTD is not set
-CONFIG_DTC=y
-CONFIG_OF=y
-
-#
-# Device Tree and Open Firmware support
-#
-# CONFIG_PROC_DEVICETREE is not set
-# CONFIG_OF_SELFTEST is not set
-CONFIG_OF_FLATTREE=y
-CONFIG_OF_EARLY_FLATTREE=y
-CONFIG_OF_DYNAMIC=y
-CONFIG_OF_ADDRESS=y
-CONFIG_OF_IRQ=y
-CONFIG_OF_NET=y
-CONFIG_OF_PCI=y
-CONFIG_OF_PCI_IRQ=y
-# CONFIG_PARPORT is not set
-# CONFIG_BLK_DEV is not set
-
-#
-# Misc devices
-#
-# CONFIG_SENSORS_LIS3LV02D is not set
-# CONFIG_DUMMY_IRQ is not set
-# CONFIG_PHANTOM is not set
-# CONFIG_SGI_IOC4 is not set
-# CONFIG_TIFM_CORE is not set
-# CONFIG_ATMEL_SSC is not set
-# CONFIG_ENCLOSURE_SERVICES is not set
-# CONFIG_HP_ILO is not set
-# CONFIG_PCH_PHUB is not set
-# CONFIG_SRAM is not set
-# CONFIG_C2PORT is not set
-
-#
-# EEPROM support
-#
-# CONFIG_EEPROM_93CX6 is not set
-# CONFIG_CB710_CORE is not set
-
-#
-# Texas Instruments shared transport line discipline
-#
-
-#
-# Altera FPGA firmware download module
-#
-CONFIG_HAVE_IDE=y
-# CONFIG_IDE is not set
-
-#
-# SCSI device support
-#
-CONFIG_SCSI_MOD=y
-# CONFIG_RAID_ATTRS is not set
-# CONFIG_SCSI is not set
-# CONFIG_SCSI_DMA is not set
-# CONFIG_SCSI_NETLINK is not set
-# CONFIG_ATA is not set
-# CONFIG_MD is not set
-# CONFIG_FUSION is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-# CONFIG_FIREWIRE is not set
-# CONFIG_FIREWIRE_NOSY is not set
-# CONFIG_I2O is not set
-# CONFIG_MACINTOSH_DRIVERS is not set
-CONFIG_NETDEVICES=y
-CONFIG_NET_CORE=y
-# CONFIG_BONDING is not set
-# CONFIG_DUMMY is not set
-# CONFIG_EQUALIZER is not set
-# CONFIG_NET_TEAM is not set
-# CONFIG_MACVLAN is not set
-# CONFIG_VXLAN is not set
-# CONFIG_NETCONSOLE is not set
-# CONFIG_NETPOLL is not set
-# CONFIG_NET_POLL_CONTROLLER is not set
-# CONFIG_TUN is not set
-# CONFIG_VETH is not set
-# CONFIG_NLMON is not set
-# CONFIG_ARCNET is not set
-
-#
-# CAIF transport drivers
-#
-
-#
-# Distributed Switch Architecture drivers
-#
-# CONFIG_NET_DSA_MV88E6XXX is not set
-# CONFIG_NET_DSA_MV88E6060 is not set
-# CONFIG_NET_DSA_MV88E6XXX_NEED_PPU is not set
-# CONFIG_NET_DSA_MV88E6131 is not set
-# CONFIG_NET_DSA_MV88E6123_61_65 is not set
-# CONFIG_ETHERNET is not set
-# CONFIG_FDDI is not set
-# CONFIG_HIPPI is not set
-# CONFIG_PHYLIB is not set
-# CONFIG_PPP is not set
-# CONFIG_SLIP is not set
-# CONFIG_WLAN is not set
-
-#
-# Enable WiMAX (Networking options) to see the WiMAX drivers
-#
-# CONFIG_WAN is not set
-# CONFIG_VMXNET3 is not set
-# CONFIG_ISDN is not set
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-# CONFIG_INPUT_FF_MEMLESS is not set
-# CONFIG_INPUT_POLLDEV is not set
-# CONFIG_INPUT_SPARSEKMAP is not set
-# CONFIG_INPUT_MATRIXKMAP is not set
-
-#
-# Userland interfaces
-#
-# CONFIG_INPUT_MOUSEDEV is not set
-# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_EVDEV is not set
-# CONFIG_INPUT_EVBUG is not set
-
-#
-# Input Device Drivers
-#
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_TABLET is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-# CONFIG_INPUT_MISC is not set
-
-#
-# Hardware I/O ports
-#
-# CONFIG_SERIO is not set
-# CONFIG_GAMEPORT is not set
-
-#
-# Character devices
-#
-CONFIG_TTY=y
-CONFIG_VT=y
-# CONFIG_CONSOLE_TRANSLATIONS is not set
-CONFIG_VT_CONSOLE=y
-CONFIG_HW_CONSOLE=y
-# CONFIG_VT_HW_CONSOLE_BINDING is not set
-CONFIG_UNIX98_PTYS=y
-# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_SERIAL_NONSTANDARD is not set
-# CONFIG_NOZOMI is not set
-# CONFIG_N_GSM is not set
-# CONFIG_TRACE_SINK is not set
-# CONFIG_PPC_EPAPR_HV_BYTECHAN is not set
-# CONFIG_DEVKMEM is not set
-
-#
-# Serial drivers
-#
-# CONFIG_SERIAL_8250 is not set
-
-#
-# Non-8250 serial port support
-#
-# CONFIG_SERIAL_MFD_HSU is not set
-# CONFIG_SERIAL_ICOM is not set
-# CONFIG_SERIAL_JSM is not set
-# CONFIG_SERIAL_SCCNXP is not set
-# CONFIG_SERIAL_TIMBERDALE is not set
-# CONFIG_SERIAL_ALTERA_JTAGUART is not set
-# CONFIG_SERIAL_ALTERA_UART is not set
-# CONFIG_SERIAL_PCH_UART is not set
-# CONFIG_SERIAL_XILINX_PS_UART is not set
-# CONFIG_SERIAL_ARC is not set
-# CONFIG_SERIAL_RP2 is not set
-# CONFIG_SERIAL_FSL_LPUART is not set
-# CONFIG_TTY_PRINTK is not set
-CONFIG_HVC_DRIVER=y
-CONFIG_HVC_IRQ=y
-CONFIG_HVC_CONSOLE=y
-# CONFIG_HVC_OLD_HVSI is not set
-# CONFIG_HVC_RTAS is not set
-CONFIG_HVC_UDBG=y
-# CONFIG_HVCS is not set
-# CONFIG_IBM_BSR is not set
-# CONFIG_IPMI_HANDLER is not set
-# CONFIG_HW_RANDOM is not set
-# CONFIG_GEN_RTC is not set
-# CONFIG_R3964 is not set
-# CONFIG_APPLICOM is not set
-# CONFIG_RAW_DRIVER is not set
-# CONFIG_HANGCHECK_TIMER is not set
-# CONFIG_TCG_TPM is not set
-CONFIG_DEVPORT=y
-# CONFIG_BRCM_CHAR_DRIVERS is not set
-# CONFIG_I2C is not set
-# CONFIG_SPI is not set
-# CONFIG_HSI is not set
-
-#
-# PPS support
-#
-# CONFIG_PPS is not set
-
-#
-# PPS generators support
-#
-
-#
-# PTP clock support
-#
-# CONFIG_PTP_1588_CLOCK is not set
-
-#
-# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
-#
-CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
-CONFIG_GPIO_DEVRES=y
-# CONFIG_GPIOLIB is not set
-# CONFIG_W1 is not set
-# CONFIG_POWER_SUPPLY is not set
-# CONFIG_POWER_AVS is not set
-# CONFIG_HWMON is not set
-# CONFIG_THERMAL is not set
-# CONFIG_WATCHDOG is not set
-CONFIG_SSB_POSSIBLE=y
-
-#
-# Sonics Silicon Backplane
-#
-# CONFIG_SSB is not set
-CONFIG_BCMA_POSSIBLE=y
-
-#
-# Broadcom specific AMBA
-#
-# CONFIG_BCMA is not set
-
-#
-# Multifunction device drivers
-#
-# CONFIG_MFD_CORE is not set
-# CONFIG_MFD_CROS_EC is not set
-# CONFIG_HTC_PASIC3 is not set
-# CONFIG_LPC_ICH is not set
-# CONFIG_LPC_SCH is not set
-# CONFIG_MFD_JANZ_CMODIO is not set
-# CONFIG_MFD_KEMPLD is not set
-# CONFIG_MFD_RDC321X is not set
-# CONFIG_MFD_RTSX_PCI is not set
-# CONFIG_MFD_SM501 is not set
-# CONFIG_ABX500_CORE is not set
-# CONFIG_MFD_SYSCON is not set
-# CONFIG_MFD_TI_AM335X_TSCADC is not set
-# CONFIG_MFD_TMIO is not set
-# CONFIG_MFD_VX855 is not set
-# CONFIG_REGULATOR is not set
-# CONFIG_MEDIA_SUPPORT is not set
-
-#
-# Graphics support
-#
-# CONFIG_AGP is not set
-# CONFIG_VGA_ARB is not set
-# CONFIG_DRM is not set
-# CONFIG_VGASTATE is not set
-# CONFIG_VIDEO_OUTPUT_CONTROL is not set
-CONFIG_FB=y
-# CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FB_DDC is not set
-# CONFIG_FB_BOOT_VESA_SUPPORT is not set
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-# CONFIG_FB_SYS_FILLRECT is not set
-# CONFIG_FB_SYS_COPYAREA is not set
-# CONFIG_FB_SYS_IMAGEBLIT is not set
-# CONFIG_FB_FOREIGN_ENDIAN is not set
-# CONFIG_FB_SYS_FOPS is not set
-# CONFIG_FB_SVGALIB is not set
-CONFIG_FB_MACMODES=y
-# CONFIG_FB_BACKLIGHT is not set
-# CONFIG_FB_MODE_HELPERS is not set
-# CONFIG_FB_TILEBLITTING is not set
-
-#
-# Frame buffer hardware drivers
-#
-# CONFIG_FB_CIRRUS is not set
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_CYBER2000 is not set
-CONFIG_FB_OF=y
-# CONFIG_FB_ASILIANT is not set
-# CONFIG_FB_IMSTT is not set
-# CONFIG_FB_VGA16 is not set
-# CONFIG_FB_S1D13XXX is not set
-# CONFIG_FB_NVIDIA is not set
-# CONFIG_FB_RIVA is not set
-# CONFIG_FB_I740 is not set
-# CONFIG_FB_MATROX is not set
-# CONFIG_FB_RADEON is not set
-# CONFIG_FB_ATY128 is not set
-# CONFIG_FB_ATY is not set
-# CONFIG_FB_S3 is not set
-# CONFIG_FB_SAVAGE is not set
-# CONFIG_FB_SIS is not set
-# CONFIG_FB_NEOMAGIC is not set
-# CONFIG_FB_KYRO is not set
-# CONFIG_FB_3DFX is not set
-# CONFIG_FB_VOODOO1 is not set
-# CONFIG_FB_VT8623 is not set
-# CONFIG_FB_TRIDENT is not set
-# CONFIG_FB_ARK is not set
-# CONFIG_FB_PM3 is not set
-# CONFIG_FB_CARMINE is not set
-# CONFIG_FB_IBM_GXT4500 is not set
-# CONFIG_FB_GOLDFISH is not set
-# CONFIG_FB_VIRTUAL is not set
-# CONFIG_FB_METRONOME is not set
-# CONFIG_FB_MB862XX is not set
-# CONFIG_FB_BROADSHEET is not set
-# CONFIG_FB_AUO_K190X is not set
-# CONFIG_FB_SIMPLE is not set
-# CONFIG_EXYNOS_VIDEO is not set
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-
-#
-# Console display driver support
-#
-CONFIG_VGA_CONSOLE=y
-# CONFIG_VGACON_SOFT_SCROLLBACK is not set
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
-# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-# CONFIG_LOGO is not set
-# CONFIG_SOUND is not set
-
-#
-# HID support
-#
-# CONFIG_HID is not set
-# CONFIG_USB_SUPPORT is not set
-# CONFIG_UWB is not set
-# CONFIG_MMC is not set
-# CONFIG_MEMSTICK is not set
-# CONFIG_NEW_LEDS is not set
-# CONFIG_ACCESSIBILITY is not set
-# CONFIG_INFINIBAND is not set
-# CONFIG_EDAC is not set
-# CONFIG_RTC_CLASS is not set
-# CONFIG_DMADEVICES is not set
-# CONFIG_AUXDISPLAY is not set
-# CONFIG_UIO is not set
-# CONFIG_VIRT_DRIVERS is not set
-
-#
-# Virtio drivers
-#
-# CONFIG_VIRTIO_PCI is not set
-# CONFIG_VIRTIO_MMIO is not set
-
-#
-# Microsoft Hyper-V guest support
-#
-# CONFIG_STAGING is not set
-
-#
-# Hardware Spinlock drivers
-#
-CONFIG_I8253_LOCK=y
-CONFIG_CLKBLD_I8253=y
-# CONFIG_MAILBOX is not set
-CONFIG_IOMMU_SUPPORT=y
-CONFIG_OF_IOMMU=y
-# CONFIG_SPAPR_TCE_IOMMU is not set
-
-#
-# Remoteproc drivers
-#
-# CONFIG_STE_MODEM_RPROC is not set
-
-#
-# Rpmsg drivers
-#
-# CONFIG_PM_DEVFREQ is not set
-# CONFIG_EXTCON is not set
-# CONFIG_MEMORY is not set
-# CONFIG_IIO is not set
-# CONFIG_VME_BUS is not set
-# CONFIG_PWM is not set
-CONFIG_IRQCHIP=y
-# CONFIG_IPACK_BUS is not set
-# CONFIG_RESET_CONTROLLER is not set
-# CONFIG_FMC is not set
-
-#
-# File systems
-#
-CONFIG_EXT2_FS=y
-# CONFIG_EXT2_FS_XATTR is not set
-# CONFIG_EXT2_FS_XIP is not set
-# CONFIG_EXT3_FS is not set
-# CONFIG_EXT4_FS is not set
-# CONFIG_REISERFS_FS is not set
-# CONFIG_JFS_FS is not set
-# CONFIG_XFS_FS is not set
-# CONFIG_GFS2_FS is not set
-# CONFIG_BTRFS_FS is not set
-# CONFIG_NILFS2_FS is not set
-# CONFIG_FS_POSIX_ACL is not set
-CONFIG_EXPORTFS=y
-CONFIG_FILE_LOCKING=y
-CONFIG_FSNOTIFY=y
-CONFIG_DNOTIFY=y
-CONFIG_INOTIFY_USER=y
-CONFIG_FANOTIFY=y
-# CONFIG_QUOTA is not set
-# CONFIG_QUOTACTL is not set
-# CONFIG_AUTOFS4_FS is not set
-# CONFIG_FUSE_FS is not set
-
-#
-# Caches
-#
-# CONFIG_FSCACHE is not set
-
-#
-# CD-ROM/DVD Filesystems
-#
-# CONFIG_ISO9660_FS is not set
-# CONFIG_UDF_FS is not set
-
-#
-# DOS/FAT/NT Filesystems
-#
-# CONFIG_MSDOS_FS is not set
-# CONFIG_VFAT_FS is not set
-# CONFIG_NTFS_FS is not set
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-# CONFIG_PROC_KCORE is not set
-CONFIG_PROC_SYSCTL=y
-# CONFIG_PROC_PAGE_MONITOR is not set
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-# CONFIG_TMPFS_POSIX_ACL is not set
-# CONFIG_TMPFS_XATTR is not set
-# CONFIG_HUGETLBFS is not set
-# CONFIG_HUGETLB_PAGE is not set
-# CONFIG_CONFIGFS_FS is not set
-# CONFIG_MISC_FILESYSTEMS is not set
-# CONFIG_NETWORK_FILESYSTEMS is not set
-# CONFIG_NLS is not set
-# CONFIG_BINARY_PRINTF is not set
-
-#
-# Library routines
-#
-CONFIG_BITREVERSE=y
-CONFIG_GENERIC_STRNCPY_FROM_USER=y
-CONFIG_GENERIC_STRNLEN_USER=y
-CONFIG_GENERIC_NET_UTILS=y
-CONFIG_GENERIC_PCI_IOMAP=y
-CONFIG_GENERIC_IO=y
-# CONFIG_CRC_CCITT is not set
-# CONFIG_CRC16 is not set
-# CONFIG_CRC_T10DIF is not set
-# CONFIG_CRC_ITU_T is not set
-CONFIG_CRC32=y
-# CONFIG_CRC32_SELFTEST is not set
-CONFIG_CRC32_SLICEBY8=y
-# CONFIG_CRC32_SLICEBY4 is not set
-# CONFIG_CRC32_SARWATE is not set
-# CONFIG_CRC32_BIT is not set
-# CONFIG_CRC7 is not set
-# CONFIG_LIBCRC32C is not set
-# CONFIG_CRC8 is not set
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=y
-# CONFIG_XZ_DEC is not set
-# CONFIG_XZ_DEC_BCJ is not set
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-CONFIG_HAS_DMA=y
-CONFIG_DQL=y
-CONFIG_NLATTR=y
-CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
-# CONFIG_AVERAGE is not set
-# CONFIG_CORDIC is not set
-# CONFIG_DDR is not set
-CONFIG_FONT_SUPPORT=y
-# CONFIG_FONTS is not set
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
-
-#
-# Kernel hacking
-#
-
-#
-# printk and dmesg options
-#
-CONFIG_PRINTK_TIME=y
-CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
-
-#
-# Compile-time checks and compiler options
-#
-CONFIG_DEBUG_INFO=y
-# CONFIG_DEBUG_INFO_REDUCED is not set
-# CONFIG_ENABLE_WARN_DEPRECATED is not set
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_FRAME_WARN=1024
-# CONFIG_STRIP_ASM_SYMS is not set
-# CONFIG_READABLE_ASM is not set
-# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_DEBUG_FS is not set
-# CONFIG_HEADERS_CHECK is not set
-# CONFIG_DEBUG_SECTION_MISMATCH is not set
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
-# CONFIG_MAGIC_SYSRQ is not set
-CONFIG_DEBUG_KERNEL=y
-
-#
-# Memory Debugging
-#
-# CONFIG_DEBUG_PAGEALLOC is not set
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_DEBUG_SLAB is not set
-CONFIG_HAVE_DEBUG_KMEMLEAK=y
-# CONFIG_DEBUG_KMEMLEAK is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_MEMORY_INIT is not set
-CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
-# CONFIG_DEBUG_STACKOVERFLOW is not set
-# CONFIG_DEBUG_SHIRQ is not set
-
-#
-# Debug Lockups and Hangs
-#
-# CONFIG_LOCKUP_DETECTOR is not set
-# CONFIG_DETECT_HUNG_TASK is not set
-# CONFIG_PANIC_ON_OOPS is not set
-CONFIG_PANIC_ON_OOPS_VALUE=0
-# CONFIG_SCHED_DEBUG is not set
-# CONFIG_SCHEDSTATS is not set
-# CONFIG_TIMER_STATS is not set
-
-#
-# Lock Debugging (spinlocks, mutexes, etc...)
-#
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_RT_MUTEX_TESTER is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_LOCK_STAT is not set
-# CONFIG_DEBUG_ATOMIC_SLEEP is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-# CONFIG_DEBUG_KOBJECT is not set
-# CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_DEBUG_WRITECOUNT is not set
-# CONFIG_DEBUG_LIST is not set
-# CONFIG_DEBUG_SG is not set
-# CONFIG_DEBUG_NOTIFIERS is not set
-# CONFIG_DEBUG_CREDENTIALS is not set
-
-#
-# RCU Debugging
-#
-# CONFIG_SPARSE_RCU_POINTER is not set
-# CONFIG_RCU_TORTURE_TEST is not set
-# CONFIG_RCU_TRACE is not set
-# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_NOTIFIER_ERROR_INJECTION is not set
-# CONFIG_FAULT_INJECTION is not set
-# CONFIG_LATENCYTOP is not set
-CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
-CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
-CONFIG_TRACING_SUPPORT=y
-# CONFIG_FTRACE is not set
-
-#
-# Runtime Testing
-#
-# CONFIG_TEST_LIST_SORT is not set
-# CONFIG_BACKTRACE_SELF_TEST is not set
-# CONFIG_RBTREE_TEST is not set
-# CONFIG_INTERVAL_TREE_TEST is not set
-# CONFIG_ATOMIC64_SELFTEST is not set
-# CONFIG_TEST_STRING_HELPERS is not set
-# CONFIG_TEST_KSTRTOX is not set
-# CONFIG_DMA_API_DEBUG is not set
-# CONFIG_SAMPLES is not set
-CONFIG_HAVE_ARCH_KGDB=y
-# CONFIG_KGDB is not set
-# CONFIG_PPC_DISABLE_WERROR is not set
-CONFIG_PPC_WERROR=y
-CONFIG_PRINT_STACK_DEPTH=64
-# CONFIG_CODE_PATCHING_SELFTEST is not set
-# CONFIG_FTR_FIXUP_SELFTEST is not set
-# CONFIG_MSI_BITMAP_SELFTEST is not set
-# CONFIG_XMON is not set
-CONFIG_BOOTX_TEXT=y
-# CONFIG_PPC_EARLY_DEBUG is not set
-# CONFIG_STRICT_DEVMEM is not set
-
-#
-# Security options
-#
-# CONFIG_KEYS is not set
-# CONFIG_SECURITY_DMESG_RESTRICT is not set
-# CONFIG_SECURITY is not set
-# CONFIG_SECURITYFS is not set
-CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_DEFAULT_SECURITY=""
-CONFIG_CRYPTO=y
-
-#
-# Crypto core or helper
-#
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
-# CONFIG_CRYPTO_MANAGER is not set
-# CONFIG_CRYPTO_MANAGER2 is not set
-# CONFIG_CRYPTO_USER is not set
-# CONFIG_CRYPTO_GF128MUL is not set
-# CONFIG_CRYPTO_NULL is not set
-# CONFIG_CRYPTO_CRYPTD is not set
-# CONFIG_CRYPTO_AUTHENC is not set
-# CONFIG_CRYPTO_TEST is not set
-
-#
-# Authenticated Encryption with Associated Data
-#
-# CONFIG_CRYPTO_CCM is not set
-# CONFIG_CRYPTO_GCM is not set
-# CONFIG_CRYPTO_SEQIV is not set
-
-#
-# Block modes
-#
-# CONFIG_CRYPTO_CBC is not set
-# CONFIG_CRYPTO_CTR is not set
-# CONFIG_CRYPTO_CTS is not set
-# CONFIG_CRYPTO_ECB is not set
-# CONFIG_CRYPTO_LRW is not set
-# CONFIG_CRYPTO_PCBC is not set
-# CONFIG_CRYPTO_XTS is not set
-
-#
-# Hash modes
-#
-# CONFIG_CRYPTO_CMAC is not set
-# CONFIG_CRYPTO_HMAC is not set
-# CONFIG_CRYPTO_XCBC is not set
-# CONFIG_CRYPTO_VMAC is not set
-
-#
-# Digest
-#
-# CONFIG_CRYPTO_CRC32C is not set
-# CONFIG_CRYPTO_CRC32 is not set
-# CONFIG_CRYPTO_GHASH is not set
-# CONFIG_CRYPTO_MD4 is not set
-# CONFIG_CRYPTO_MD5 is not set
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
-# CONFIG_CRYPTO_RMD128 is not set
-# CONFIG_CRYPTO_RMD160 is not set
-# CONFIG_CRYPTO_RMD256 is not set
-# CONFIG_CRYPTO_RMD320 is not set
-# CONFIG_CRYPTO_SHA1 is not set
-# CONFIG_CRYPTO_SHA1_PPC is not set
-# CONFIG_CRYPTO_SHA256 is not set
-# CONFIG_CRYPTO_SHA512 is not set
-# CONFIG_CRYPTO_TGR192 is not set
-# CONFIG_CRYPTO_WP512 is not set
-
-#
-# Ciphers
-#
-CONFIG_CRYPTO_AES=y
-# CONFIG_CRYPTO_ANUBIS is not set
-# CONFIG_CRYPTO_ARC4 is not set
-# CONFIG_CRYPTO_BLOWFISH is not set
-# CONFIG_CRYPTO_CAMELLIA is not set
-# CONFIG_CRYPTO_CAST5 is not set
-# CONFIG_CRYPTO_CAST6 is not set
-# CONFIG_CRYPTO_DES is not set
-# CONFIG_CRYPTO_FCRYPT is not set
-# CONFIG_CRYPTO_KHAZAD is not set
-# CONFIG_CRYPTO_SALSA20 is not set
-# CONFIG_CRYPTO_SEED is not set
-# CONFIG_CRYPTO_SERPENT is not set
-# CONFIG_CRYPTO_TEA is not set
-# CONFIG_CRYPTO_TWOFISH is not set
-
-#
-# Compression
-#
-# CONFIG_CRYPTO_DEFLATE is not set
-# CONFIG_CRYPTO_ZLIB is not set
-# CONFIG_CRYPTO_LZO is not set
-# CONFIG_CRYPTO_LZ4 is not set
-# CONFIG_CRYPTO_LZ4HC is not set
-
-#
-# Random Number Generation
-#
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-# CONFIG_CRYPTO_USER_API_HASH is not set
-# CONFIG_CRYPTO_USER_API_SKCIPHER is not set
-# CONFIG_CRYPTO_HW is not set
-# CONFIG_PPC_CLOCK is not set
-# CONFIG_VIRTUALIZATION is not set
diff --git a/target/tarch.lst b/target/tarch.lst
index ec6de9b70..d515ddfd5 100644
--- a/target/tarch.lst
+++ b/target/tarch.lst
@@ -1,6 +1,5 @@
 arm
 armeb
-cris
 m68k
 microblaze
 mips
diff --git a/target/tools/boot_linux b/target/tools/boot_linux
deleted file mode 100755
index f7da261e2..000000000
--- a/target/tools/boot_linux
+++ /dev/null
@@ -1,511 +0,0 @@
-#!/usr/bin/perl -w
-
-#*****************************************************************************
-#!
-#! FILE NAME  : boot_linux
-#!
-#! PARAMETERS : -b <bootimage>     the name of the boot image to use
-#!              -d <device>        the interface to use, e.g., eth1
-#!                                 (defaults is eth0)
-#!              -f                 save it in flash memory at address 0x10000
-#!              -F                 save it in flash memory at address 0
-#!              -h                 show some help
-#!              -i <image>         name of the image to use (default is fimage)
-#!              -o <offset>        the offset in the flash where the flashing
-#!                                 starts
-#!              -O <offset>        the offset in the image file where the
-#!                                 flashing starts from
-#!              -p                 print the resulting etrax100boot command
-#!                                 instead of executing it
-#!              -s <size>          how much to flash (default is the size of
-#!                                 the flash minus the offset specified using
-#!                                 -o or -f)
-#!              -S <size>          the size of the flash
-#!
-#!              All sizes and offsets above can be specified as decimal
-#!              numbers, or as hexadecimal numbers by prefixing them with 0x.
-#!              It is also possible to use the suffixes k and M to specify
-#!              kilo (1024) or mega (1048576).
-#!
-#! DESCRIPTION: Extract the start of the image and any registers that should
-#!              be set from the kimage or fimage file, and then boot it.
-#!
-#! FUNCTIONS  : convert_size
-#!              extract_hw_settings
-#!              get_dword
-#!              calculate_sdram_init
-#!              sdram_command
-#!              print_help
-#!
-#!----------------------------------------------------------------------------
-#! HISTORY
-#!
-#! $Log: boot_linux,v $
-#! Revision 1.16  2004/11/01 16:32:27  starvik
-#! Corrected help text to avoid confusion
-#!
-#! Revision 1.15  2003/01/29 11:48:57  pkj
-#! Calculate a flash size large enough for the given image if the
-#! -S option is not specified.
-#!
-#! Revision 1.14  2002/11/18 14:40:09  pkj
-#! Make use of the --loop option to etrax100boot when initialising
-#! SDRAM memories. This requires a lot fewer options to be passed
-#! to the boot loader.
-#!
-#! Revision 1.13  2002/08/15 16:29:02  pkj
-#! * The -S option now accepts the size in bytes (just like the -s option).
-#!   For backwards compatibility it still assumes sizes of 16 and less to
-#!   be specified in MB.
-#! * The suffixes k and M can now be used with all sizes and offsets to
-#!   specify them in kilo or mega.
-#!
-#! Revision 1.12  2002/08/15 15:27:34  pkj
-#! Use $opts{'x'} instead of $opt_x.
-#!
-#! Revision 1.11  2002/07/04 17:06:39  pkj
-#! * No longer specifies a bootfile by default (not needed any longer).
-#! * Implemented option -b to specify a bootfile.
-#! * Removed references to option -l (it was never implemented).
-#!
-#! Revision 1.10  2002/06/04 11:50:23  starvik
-#! Check if mrs_data is specified in kernelconfig (necessary for MCM)
-#!
-#! Revision 1.9  2002/01/29 10:38:26  pkj
-#! Change illegal to invalid.
-#!
-#! Revision 1.8  2001/09/13 12:32:10  pkj
-#! * Added option -S to specify the size of the flash (in MB),  as -s
-#!   is used to specify how much to flash nowadays.
-#! * Made the default size of the flash depend on the size of the image
-#!   file. If it is bigger than 0x200100 then the flash is assumed to
-#!   be 4 MB, otherwise it is assumed to be 2 MB.
-#! * Added verification of various options.
-#!
-#! Revision 1.7  2001/09/13 10:25:11  pkj
-#! Minor clean-up.
-#!
-#! Revision 1.6  2001/06/29 10:05:16  pkj
-#! Corrected check for SDRAM.
-#!
-#! Revision 1.5  2001/06/29 09:11:55  pkj
-#! Synchronised boot_elinux and boot_linux.
-#!
-#!----------------------------------------------------------------------------
-#! (C) Copyright 2001, Axis Communications AB, LUND, SWEDEN
-#!****************************************************************************
-
-#****************** INCLUDE FILES SECTION ************************************
-
-use strict;
-
-use Getopt::Std;
-use File::Basename;
-
-#****************** VARIABLE DECLARATION SECTION *****************************
-
-use vars qw($my_name %opts);
-use vars qw($text_start $cmd);
-use vars qw($image_name $image_size);
-use vars qw($offset $source_offset $flash_size $flashing_size);
-use vars qw($sdram_timing_address $sdram_config_address);
-use vars qw($sdram_precharge $sdram_nop $sdram_refresh $sdram_mrs);
-
-#****************** CONSTANT SECTION *****************************************
-
-# Register addresses
-$sdram_timing_address = "b0000008";
-$sdram_config_address = "b000000c";
-
-# SDRAM commands
-$sdram_precharge = 3;
-$sdram_nop = 0;
-$sdram_refresh = 2;
-$sdram_mrs = 1;
-
-#****************** MAIN PROGRAM SECTION *************************************
-
-# The name of this program.
-$my_name = basename($0);
-
-# Get options
-getopts('b:d:fFhi:o:O:ps:S:', \%opts);
-
-&print_help if ($opts{'h'});
-
-# Name and existance of the image
-$image_name = ($opts{'i'} ? $opts{'i'} : 'fimage');
-die "Could not find the image $image_name!\n" unless (-s $image_name);
-
-if ($opts{'f'} || $opts{'F'})
-{
-  $image_size = -s $image_name;
-
-  $offset = ($opts{'f'} ? 0x10000 : 0);
-
-  $offset = &convert_size($opts{'o'}) if (defined($opts{'o'}));
-
-  die("$my_name: Invalid destination offset\n") if ($offset !~ /^\d+$/);
-
-  my $base_name = basename($image_name);
-  if ($base_name eq 'timage' || $base_name eq 'flash1.img')
-  {
-    $source_offset = 0;
-  }
-  else
-  {
-    $source_offset = $offset;
-  }
-
-  $source_offset = &convert_size($opts{'O'}) if (defined($opts{'O'}));
-
-  die("$my_name: Invalid source offset\n") if ($source_offset !~ /^\d+$/);
-  die("$my_name: Source offset > image size\n") if ($source_offset > $image_size);
-
-  if (defined($opts{'S'}))
-  {
-    # Backwards compatibility to allow specifying the flash size in MB
-    # without using an M suffix
-    $opts{'S'} .= 'M' if ($opts{'S'} =~ /^\d+$/ && $opts{'S'} <= 16);
-
-    $flash_size = &convert_size($opts{'S'});
-  }
-  else
-  {
-    # Calculate a flash size large enough for the image without the checksum
-    # and HWID.
-    $flash_size = ($image_size - $source_offset + $offset) & 0xFFFF0000;
-  }
-
-  die("$my_name: Invalid flash size\n") if ($flash_size !~ /^\d+$/);
-  die("$my_name: Destination offset > flash size\n") if ($offset > $flash_size);
-  if (defined($opts{'s'}))
-  {
-    $flashing_size = &convert_size($opts{'s'});
-  }
-  else
-  {
-    $flashing_size = $flash_size - $offset;
-  }
-
-  die("$my_name: Invalid size to flash\n") if ($flashing_size !~ /^\d+$/);
-
-  if ($flashing_size > $flash_size - $offset)
-  {
-    $flashing_size = $flash_size - $offset;
-    printf("Warning: Flashing size limited to 0x%lx due to the offset (0x%lx) and flash size (0x%lx).\n", $flashing_size, $offset, $flash_size);
-  }
-
-  if ($flashing_size > $image_size - $source_offset)
-  {
-    $flashing_size = $image_size - $source_offset;
-    printf("Warning: Flashing size limited to 0x%lx due to the offset (0x%lx) and image size (0x%lx).\n", $flashing_size, $source_offset, $image_size);
-  }
-}
-
-# Create the command line to boot the image
-if (system('./etrax100boot --help > /dev/null') == 0)
-{
-  $cmd = './etrax100boot';
-}
-elsif (system('svinto_boot --help > /dev/null') == 0)
-{
-  $cmd = 'svinto_boot';
-}
-else
-{
-  die("Cannot find e100boot program in your PATH!\n");
-}
-
-$cmd .= " --device $opts{'d'}" if ($opts{'d'});
-
-$cmd .= &extract_hw_settings;
-
-$cmd .= " --bootfile $opts{'b'}" if ($opts{'b'});
-$cmd .= " --file $image_name $text_start";
-
-if ($opts{'f'} || $opts{'F'})
-{
-  $cmd .= sprintf(" --flash %lx %lx %lx --jump 0",
-		  hex($text_start) + $source_offset, $offset, $flashing_size);
-}
-else
-{
-  $cmd .= " --jump $text_start";
-}
-
-if ($opts{'p'})
-{
-  print "Command:\n$cmd\n";
-}
-else
-{
-  system($cmd);
-}
-
-exit 0;
-
-#****************** FUNCTION DEFINITION SECTION ******************************
-
-#*****************************************************************************
-##
-## FUNCTION NAME: convert_size
-##
-##****************************************************************************
-
-sub convert_size
-{
-  my($arg) = @_;
-  my $size;
-
-  if ($arg =~ /^0x([\da-fA-F]+)([kM])?$/)
-  {
-    $size = hex($1);
-  }
-  elsif ($arg =~ /^(\d+)([kM])?$/)
-  {
-    $size = $1;
-  }
-  else
-  {
-    return -1;
-  }
-
-  if (!defined($2))
-  {
-    return $size;
-  }
-  elsif ($2 eq 'k')
-  {
-    return $size * 1024;
-  }
-  elsif ($2 eq 'M')
-  {
-    return $size * 1048576;
-  }
-}
-
-#*****************************************************************************
-##
-## FUNCTION NAME: extract_hw_settings
-##
-##****************************************************************************
-
-sub extract_hw_settings
-{
-  my $data;
-  my $dbg_port;
-  my $sdram_enabled;
-  my $return_value = "";
-  my $sdram_config;
-
-  # The hw information table has the following format
-  #
-  # "HW_PARAM_MAGIC"
-  # text_start (dword)
-  # serial debg port (dword)
-  # sdram enabled (dword)
-  # register address (dword)
-  # register value (dword)
-  # ...
-  # 0
-
-  open(FILE, "$image_name") || die("Could not open '$image_name'");
-
-  while (<FILE>)
-  {
-    if (m/HW_PARAM_MAGIC/g)
-    {
-      # Seek to first byte after magic
-      seek(FILE, -length($_) + pos($_), 1);
-      last;
-    }
-  }
-
-  $text_start = &get_dword;
-  $dbg_port = &get_dword;
-  $sdram_enabled = int(&get_dword);
-
-  while (1)
-  {
-    my $register = &get_dword;
-    my $value = &get_dword;
-
-    last if ($register eq "00000000");
-
-    if ($sdram_enabled)
-    {
-      if ($register eq $sdram_config_address)
-      {
-	$sdram_config = $value;
-      }
-      elsif ($register eq $sdram_timing_address)
-      {
-	$return_value .= &calculate_sdram_init($value, $sdram_config);
-	next;
-      }
-    }
-
-    $return_value .= " --setreg $register $value";
-  }
-
-  close(FILE);
-
-  return $return_value;
-}
-
-#*****************************************************************************
-##
-## FUNCTION NAME: get_dword
-##
-##****************************************************************************
-
-sub get_dword
-{
-  my $data;
-
-  read(FILE, $data, 4);
-  return unpack("H8", pack("V", unpack("N", $data)));
-}
-
-#*****************************************************************************
-##
-## FUNCTION NAME: calculate_sdram_init
-##
-##****************************************************************************
-
-sub calculate_sdram_init
-{
-  # Refer to ETRAX 100LX Designers Reference for a description of SDRAM
-  # initialization
-  my $sdram_init_val = hex($_[0]);
-  my $sdram_config_val = hex($_[1]);
-  my $bus_width = $sdram_config_val & 0x00800000;
-  my $speed;
-  my $cas_latency;
-  my $mrs_data;
-  my $temp;
-  my $return_value;
-  my $value;
-
-  $mrs_data = ($sdram_init_val & 0x00ff0000) >> 16;
-  $sdram_init_val &= 0x8000ffff; # Make sure mrs data is 0
-  $sdram_init_val |= 0x80000000; # Make sure sdram is enabled
-  $speed = $sdram_init_val & 0x1000;
-  $cas_latency = $sdram_init_val & 0x3;
-  if ($speed) # 100 MHz
-  {
-    $cas_latency += 2;
-  }
-  else # 50 MHz
-  {
-    $cas_latency += 1;
-  }
-
-  # Calculate value of mrs_data
-  # CAS latency = 2 && bus_width = 32 => 0x40
-  # CAS latency = 3 && bus_width = 32 => 0x60
-  # CAS latency = 2 && bus_width = 16 => 0x20
-  # CAS latency = 3 && bus_width = 16 => 0x30
-  if ($mrs_data == 0)
-  {
-    if ($bus_width == 0) # 16 bits
-    {
-      $mrs_data = $cas_latency == 2 ? 0x20 : 0x30;
-    }
-    else # 32 bits
-    {
-      $mrs_data = $cas_latency == 2 ? 0x40 : 0x60;
-    }
-  }
-
-  $temp = $sdram_init_val | 0x0000c000; # Disable refresh
-  $return_value .= &sdram_command($temp);
-  $return_value .= " --pause 20000";
-
-  $return_value .= &sdram_command($temp, $sdram_precharge);
-  $return_value .= &sdram_command($temp, $sdram_nop);
-
-  $return_value .= " --setreg +0 7";
-  $return_value .= " --label label1";
-  $return_value .= &sdram_command($temp, $sdram_refresh);
-  $return_value .= &sdram_command($temp, $sdram_nop);
-  $return_value .= " --loop +0 label1";
-
-  $return_value .= &sdram_command($temp, $sdram_mrs, $mrs_data);
-  $return_value .= &sdram_command($temp, $sdram_nop);
-
-  $return_value .= &sdram_command($sdram_init_val);
-
-  return $return_value;
-}
-
-#*****************************************************************************
-##
-## FUNCTION NAME: sdram_command
-##
-##****************************************************************************
-
-sub sdram_command
-{
-  my($temp, $value, $mrs_data) = @_;
-
-  $value ||= 0;
-  if ($value == $sdram_mrs)
-  {
-    $value = sprintf("%lx", $temp | ($value << 9) | ($mrs_data << 16));
-  }
-  else
-  {
-    $value = sprintf("%lx", $temp | ($value << 9));
-  }
-
-  return " --setreg $sdram_timing_address $value";
-}
-
-#*****************************************************************************
-##
-## FUNCTION NAME: print_help
-##
-##****************************************************************************
-
-sub print_help
-{
-  print "\nAXIS $my_name, ", '$Revision: 1.16 $ $Date: 2004/11/01 16:32:27 $ ', "\n";
-  die <<EOT;
-Copyright (C) 2001-2002 Axis Communications AB
-
-DESCRIPTION:
-  This program is used to boot (and flash) a linux image to a box.
-  It tries to extract the required ETRAX 100 settings from the image file.
-
-SYNTAX:
-  $my_name [options]
-
-OPTIONS:
-  -b <bootfile>           : The boot image to use.
-  -d <device>             : The network interface to use, default is eth0.
-  -f                      : Save the image in the flash memory starting at
-                            address 0x10000.
-  -F                      : Save the image in the flash memory starting at
-                            address 0.
-  -h                      : Print this help text.
-  -i <image>              : The path and name of the image to use, default
-                            is fimage.
-  -o <offset>             : The offset in the flash where the flashing starts.
-  -O <offset>             : The offset in the image file where the flashing
-                            starts from.
-  -p                      : Print the resulting etrax100boot command instead
-                            of executing it.
-  -s <size>               : How much to flash (default is the size of the
-			    flash minus the offset specified using -o or -f).
-  -S <size>               : The size of the flash.
-
-  All sizes and offsets above can be specified as decimal numbers, or as
-  hexadecimal numbers by prefixing them with 0x. It is also possible to use
-  the suffixes k and M to specify kilo (1024) or mega (1048576).
-
-EOT
-}
-
-#****************** END OF FILE boot_linux ***********************************
diff --git a/target/tools/e100boot/Makefile b/target/tools/e100boot/Makefile
deleted file mode 100644
index 2cdf28837..000000000
--- a/target/tools/e100boot/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=		e100boot
-PKG_VERSION:=		0.1
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		11fd53e7824dc550e4cffbc4cd114c3e
-PKG_SITES:=		http://download.tuxfamily.org/crisos/repository/source/
-DISTFILES:=		${PKG_NAME}.tar.bz2
-WRKDIST=                ${WRKDIR}/${PKG_NAME}
-
-include ../rules.mk
-
-all: $(BIN_DIR)/etrax100boot
-
-$(WRKBUILD)/.compiled: ${WRKDIST}/.prepared
-	$(MAKE) -C $(WRKBUILD)
-	touch $@
-
-$(BIN_DIR)/etrax100boot: $(WRKBUILD)/.compiled
-	$(INSTALL_BIN) $(WRKBUILD)/sbl/e100boot.stripped $(BIN_DIR)/etrax100boot
-
-include $(TOPDIR)/mk/tools.mk
diff --git a/target/x86/sys-available/pcengines-alix1c b/target/x86/sys-available/pcengines-alix1c
index b14dd98a4..b45be89a4 100644
--- a/target/x86/sys-available/pcengines-alix1c
+++ b/target/x86/sys-available/pcengines-alix1c
@@ -21,6 +21,7 @@ config ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	select ADK_TARGET_WITH_WATCHDOG
 	select ADK_TARGET_WITH_USB_BOOT
 	select ADK_TARGET_KERNEL_BZIMAGE
+	depends on ADK_BROKEN
 	help
          System profile for PCEngines ALIX1C. 
 
diff --git a/target/x86/sys-available/pcengines-alix2d13 b/target/x86/sys-available/pcengines-alix2d13
index ee74dd18c..d0843cc4d 100644
--- a/target/x86/sys-available/pcengines-alix2d13
+++ b/target/x86/sys-available/pcengines-alix2d13
@@ -15,6 +15,7 @@ config ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
 	select ADK_TARGET_WITH_WATCHDOG
 	select ADK_TARGET_WITH_CF
 	select ADK_TARGET_KERNEL_BZIMAGE
+	depends on ADK_BROKEN
 	help
          System profile for PCEngines ALIX2D13.
 
diff --git a/target/x86/sys-available/pcengines-alix2d2 b/target/x86/sys-available/pcengines-alix2d2
index 84a63f9f6..fd83a700a 100644
--- a/target/x86/sys-available/pcengines-alix2d2
+++ b/target/x86/sys-available/pcengines-alix2d2
@@ -14,6 +14,7 @@ config ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
 	select ADK_TARGET_WITH_WATCHDOG
 	select ADK_TARGET_WITH_CF
 	select ADK_TARGET_KERNEL_BZIMAGE
+	depends on ADK_BROKEN
 	help
          System profile for PCEngines ALIX2D2.
 
diff --git a/target/x86/sys-available/pcengines-wrap b/target/x86/sys-available/pcengines-wrap
index 5de5e3214..2fa4e13c4 100644
--- a/target/x86/sys-available/pcengines-wrap
+++ b/target/x86/sys-available/pcengines-wrap
@@ -8,6 +8,7 @@ config ADK_TARGET_SYSTEM_PCENGINES_WRAP
 	select ADK_TARGET_WITH_MINIPCI
 	select ADK_TARGET_WITH_WATCHDOG
 	select ADK_TARGET_KERNEL_BZIMAGE
+	depends on ADK_BROKEN
 	help
          System profile for PCEngines WRAP board.
 
diff --git a/toolchain/binutils/Makefile.inc b/toolchain/binutils/Makefile.inc
index be8642093..16cfc47df 100644
--- a/toolchain/binutils/Makefile.inc
+++ b/toolchain/binutils/Makefile.inc
@@ -2,15 +2,8 @@
 # material, please see the LICENCE file in the top-level directory.
 
 PKG_NAME:=		binutils
-
-ifeq ($(ADK_LINUX_AVR32),y)
-PKG_VERSION:=		2.21
-PKG_MD5SUM:=		c84c5acc9d266f1a7044b51c85a823f5
-else
 PKG_VERSION:=		2.24
 PKG_MD5SUM:=		e0f71a7b2ddab0f8612336ac81d9636b
-endif
-
 PKG_RELEASE:=		1
 PKG_SITES:=		${MASTER_SITE_GNU:=binutils/}
 DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/toolchain/binutils/patches/2.21/binutils-avr32.patch b/toolchain/binutils/patches/2.21/binutils-avr32.patch
deleted file mode 100644
index d4ea74e04..000000000
--- a/toolchain/binutils/patches/2.21/binutils-avr32.patch
+++ /dev/null
@@ -1,65436 +0,0 @@
-diff -Nur binutils-2.21.orig/bfd/archures.c binutils-2.21/bfd/archures.c
---- binutils-2.21.orig/bfd/archures.c	2010-07-23 16:52:46.000000000 +0200
-+++ binutils-2.21/bfd/archures.c	2011-08-28 14:56:18.897982521 +0200
-@@ -373,6 +373,12 @@
- .#define bfd_mach_avr5		5
- .#define bfd_mach_avr51		51
- .#define bfd_mach_avr6		6
-+.  bfd_arch_avr32,     {* Atmel AVR32 *}
-+.#define bfd_mach_avr32_ap	7000
-+.#define bfd_mach_avr32_uc	3000
-+.#define bfd_mach_avr32_ucr1    3001
-+.#define bfd_mach_avr32_ucr2    3002
-+.#define bfd_mach_avr32_ucr3    3003
- .  bfd_arch_bfin,        {* ADI Blackfin *}
- .#define bfd_mach_bfin          1
- .  bfd_arch_cr16,       {* National Semiconductor CompactRISC (ie CR16). *}
-@@ -469,6 +475,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;
-+extern const bfd_arch_info_type bfd_avr32_arch;
- extern const bfd_arch_info_type bfd_bfin_arch;
- extern const bfd_arch_info_type bfd_cr16_arch;
- extern const bfd_arch_info_type bfd_cr16c_arch;
-@@ -546,6 +553,7 @@
-     &bfd_arc_arch,
-     &bfd_arm_arch,
-     &bfd_avr_arch,
-+    &bfd_avr32_arch,
-     &bfd_bfin_arch,
-     &bfd_cr16_arch,
-     &bfd_cr16c_arch,
-diff -Nur binutils-2.21.orig/bfd/bfd-in2.h binutils-2.21/bfd/bfd-in2.h
---- binutils-2.21.orig/bfd/bfd-in2.h	2010-11-03 03:31:02.000000000 +0100
-+++ binutils-2.21/bfd/bfd-in2.h	2011-08-28 14:56:18.897982521 +0200
-@@ -2053,6 +2053,12 @@
- #define bfd_mach_avr5          5
- #define bfd_mach_avr51         51
- #define bfd_mach_avr6          6
-+  bfd_arch_avr32,     /* Atmel AVR32 */
-+#define bfd_mach_avr32_ap      7000
-+#define bfd_mach_avr32_uc      3000
-+#define bfd_mach_avr32_ucr1    3001
-+#define bfd_mach_avr32_ucr2    3002
-+#define bfd_mach_avr32_ucr3    3003
-   bfd_arch_bfin,        /* ADI Blackfin */
- #define bfd_mach_bfin          1
-   bfd_arch_cr16,       /* National Semiconductor CompactRISC (ie CR16). */
-@@ -3989,6 +3995,88 @@
-   BFD_RELOC_RX_ABS16UL,
-   BFD_RELOC_RX_RELAX,
- 
-+/* Difference between two labels: L2 - L1. The value of L1 is encoded
-+as sym + addend, while the initial difference after assembly is
-+inserted into the object file by the assembler.  */
-+  BFD_RELOC_AVR32_DIFF32,
-+  BFD_RELOC_AVR32_DIFF16,
-+  BFD_RELOC_AVR32_DIFF8,
-+
-+/* Reference to a symbol through the Global Offset Table. The linker
-+will allocate an entry for symbol in the GOT and insert the offset
-+of this entry as the relocation value.  */
-+  BFD_RELOC_AVR32_GOT32,
-+  BFD_RELOC_AVR32_GOT16,
-+  BFD_RELOC_AVR32_GOT8,
-+
-+/* Normal (non-pc-relative) code relocations. Alignment and signedness
-+is indicated by the suffixes. S means signed, U means unsigned. W
-+means word-aligned, H means halfword-aligned, neither means
-+byte-aligned (no alignment.) SUB5 is the same relocation as 16S.  */
-+  BFD_RELOC_AVR32_21S,
-+  BFD_RELOC_AVR32_16U,
-+  BFD_RELOC_AVR32_16S,
-+  BFD_RELOC_AVR32_SUB5,
-+  BFD_RELOC_AVR32_8S_EXT,
-+  BFD_RELOC_AVR32_8S,
-+  BFD_RELOC_AVR32_15S,
-+
-+/* PC-relative relocations are signed if neither 'U' nor 'S' is
-+specified. However, we explicitly tack on a 'B' to indicate no
-+alignment, to avoid confusion with data relocs. All of these resolve
-+to sym + addend - offset, except the one with 'N' (negated) suffix.
-+This particular one resolves to offset - sym - addend.  */
-+  BFD_RELOC_AVR32_22H_PCREL,
-+  BFD_RELOC_AVR32_18W_PCREL,
-+  BFD_RELOC_AVR32_16B_PCREL,
-+  BFD_RELOC_AVR32_16N_PCREL,
-+  BFD_RELOC_AVR32_14UW_PCREL,
-+  BFD_RELOC_AVR32_11H_PCREL,
-+  BFD_RELOC_AVR32_10UW_PCREL,
-+  BFD_RELOC_AVR32_9H_PCREL,
-+  BFD_RELOC_AVR32_9UW_PCREL,
-+
-+/* Subtract the link-time address of the GOT from (symbol + addend)
-+and insert the result.  */
-+  BFD_RELOC_AVR32_GOTPC,
-+
-+/* Reference to a symbol through the GOT. The linker will allocate an
-+entry for symbol in the GOT and insert the offset of this entry as
-+the relocation value. addend must be zero. As usual, 'S' means
-+signed, 'W' means word-aligned, etc.  */
-+  BFD_RELOC_AVR32_GOTCALL,
-+  BFD_RELOC_AVR32_LDA_GOT,
-+  BFD_RELOC_AVR32_GOT21S,
-+  BFD_RELOC_AVR32_GOT18SW,
-+  BFD_RELOC_AVR32_GOT16S,
-+
-+/* 32-bit constant pool entry. I don't think 8- and 16-bit entries make
-+a whole lot of sense.  */
-+  BFD_RELOC_AVR32_32_CPENT,
-+
-+/* Constant pool references. Some of these relocations are signed,
-+others are unsigned. It doesn't really matter, since the constant
-+pool always comes after the code that references it.  */
-+  BFD_RELOC_AVR32_CPCALL,
-+  BFD_RELOC_AVR32_16_CP,
-+  BFD_RELOC_AVR32_9W_CP,
-+
-+/* sym must be the absolute symbol. The addend specifies the alignment
-+order, e.g. if addend is 2, the linker must add padding so that the
-+next address is aligned to a 4-byte boundary.  */
-+  BFD_RELOC_AVR32_ALIGN,
-+
-+/* Code relocations that will never make it to the output file.  */
-+  BFD_RELOC_AVR32_14UW,
-+  BFD_RELOC_AVR32_10UW,
-+  BFD_RELOC_AVR32_10SW,
-+  BFD_RELOC_AVR32_STHH_W,
-+  BFD_RELOC_AVR32_7UW,
-+  BFD_RELOC_AVR32_6S,
-+  BFD_RELOC_AVR32_6UW,
-+  BFD_RELOC_AVR32_4UH,
-+  BFD_RELOC_AVR32_3U,
-+
- /* Direct 12 bit.  */
-   BFD_RELOC_390_12,
- 
-diff -Nur binutils-2.21.orig/bfd/config.bfd binutils-2.21/bfd/config.bfd
---- binutils-2.21.orig/bfd/config.bfd	2010-12-01 12:03:10.000000000 +0100
-+++ binutils-2.21/bfd/config.bfd	2011-08-28 14:56:18.947986784 +0200
-@@ -346,6 +346,10 @@
-     targ_underscore=yes
-     ;;
- 
-+  avr32-*-*)
-+    targ_defvec=bfd_elf32_avr32_vec
-+    ;;
-+
-   c30-*-*aout* | tic30-*-*aout*)
-     targ_defvec=tic30_aout_vec
-     ;;
-diff -Nur binutils-2.21.orig/bfd/configure binutils-2.21/bfd/configure
---- binutils-2.21.orig/bfd/configure	2010-12-08 09:37:34.000000000 +0100
-+++ binutils-2.21/bfd/configure	2011-08-28 14:56:19.017982476 +0200
-@@ -15040,6 +15040,7 @@
-     bfd_pei_ia64_vec)		tb="$tb pei-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" ;;
-+    bfd_elf32_avr32_vec)	tb="$tb elf32-avr32.lo elf32.lo $elf" ;;
-     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 -Nur binutils-2.21.orig/bfd/configure.in binutils-2.21/bfd/configure.in
---- binutils-2.21.orig/bfd/configure.in	2010-12-08 09:37:33.000000000 +0100
-+++ binutils-2.21/bfd/configure.in	2011-08-28 14:56:19.017982476 +0200
-@@ -675,6 +675,7 @@
-     bfd_pei_ia64_vec)		tb="$tb pei-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" ;;
-+    bfd_elf32_avr32_vec)	tb="$tb elf32-avr32.lo elf32.lo $elf" ;;
-     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 -Nur binutils-2.21.orig/bfd/cpu-avr32.c binutils-2.21/bfd/cpu-avr32.c
---- binutils-2.21.orig/bfd/cpu-avr32.c	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.21/bfd/cpu-avr32.c	2011-08-28 14:56:19.107979672 +0200
-@@ -0,0 +1,52 @@
-+/* BFD library support routines for AVR32.
-+   Copyright 2003,2004,2005,2006,2007,2008,2009 Atmel Corporation.
-+
-+   Written by Haavard Skinnemoen, Atmel Norway, <hskinnemoen@atmel.com>
-+
-+   This is part of BFD, the Binary File Descriptor library.
-+
-+   This program is free software; you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; either version 2 of the License, or
-+   (at your option) any later version.
-+
-+   This program is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with this program; if not, write to the Free Software
-+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-+
-+#include "bfd.h"
-+#include "sysdep.h"
-+#include "libbfd.h"
-+
-+#define N(machine, print, default, next)			\
-+  {								\
-+    32,				/* 32 bits in a word */		\
-+    32,				/* 32 bits in an address */	\
-+    8,				/* 8 bits in a byte */		\
-+    bfd_arch_avr32,		/* architecture */		\
-+    machine,			/* machine */			\
-+    "avr32",			/* arch name */			\
-+    print,			/* printable name */		\
-+    1,				/* section align power */	\
-+    default,			/* the default machine? */	\
-+    bfd_default_compatible,					\
-+    bfd_default_scan,						\
-+    next,							\
-+  }
-+
-+static const bfd_arch_info_type cpu_info[] =
-+{
-+  N(bfd_mach_avr32_ap, "avr32:ap", FALSE, &cpu_info[1]),
-+  N(bfd_mach_avr32_uc, "avr32:uc", FALSE, &cpu_info[2]),
-+  N(bfd_mach_avr32_ucr1, "avr32:ucr1", FALSE, &cpu_info[3]),
-+  N(bfd_mach_avr32_ucr2, "avr32:ucr2", FALSE, &cpu_info[4]),
-+  N(bfd_mach_avr32_ucr3, "avr32:ucr3", FALSE, NULL),
-+};
-+
-+const bfd_arch_info_type bfd_avr32_arch =
-+  N(bfd_mach_avr32_ap, "avr32", TRUE, &cpu_info[0]);
-diff -Nur binutils-2.21.orig/bfd/elf32-avr32.c binutils-2.21/bfd/elf32-avr32.c
---- binutils-2.21.orig/bfd/elf32-avr32.c	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.21/bfd/elf32-avr32.c	2011-08-28 15:18:33.157989524 +0200
-@@ -0,0 +1,3916 @@
-+/* AVR32-specific support for 32-bit ELF.
-+   Copyright 2003,2004,2005,2006,2007,2008,2009 Atmel Corporation.
-+
-+   Written by Haavard Skinnemoen, Atmel Norway, <hskinnemoen@atmel.com>
-+
-+   This file is part of BFD, the Binary File Descriptor library.
-+
-+   This program is free software; you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; either version 2 of the License, or
-+   (at your option) any later version.
-+
-+   This program is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with this program; if not, write to the Free Software
-+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-+
-+#include "bfd.h"
-+#include "sysdep.h"
-+#include "bfdlink.h"
-+#include "libbfd.h"
-+#include "elf-bfd.h"
-+#include "elf/avr32.h"
-+#include "elf32-avr32.h"
-+
-+#define xDEBUG
-+#define xRELAX_DEBUG
-+
-+#ifdef DEBUG
-+# define pr_debug(fmt, args...) fprintf(stderr, fmt, ##args)
-+#else
-+# define pr_debug(fmt, args...) do { } while (0)
-+#endif
-+
-+#ifdef RELAX_DEBUG
-+# define RDBG(fmt, args...) fprintf(stderr, fmt, ##args)
-+#else
-+# define RDBG(fmt, args...) do { } while (0)
-+#endif
-+
-+/* When things go wrong, we want it to blow up, damnit! */
-+#undef BFD_ASSERT
-+#undef abort
-+#define BFD_ASSERT(expr)					\
-+  do								\
-+    {								\
-+      if (!(expr))						\
-+	{							\
-+	  bfd_assert(__FILE__, __LINE__);			\
-+	  abort();						\
-+	}							\
-+    }								\
-+  while (0)
-+
-+/* The name of the dynamic interpreter. This is put in the .interp section. */
-+#define ELF_DYNAMIC_INTERPRETER		"/lib/ld.so.1"
-+
-+#define AVR32_GOT_HEADER_SIZE		8
-+#define AVR32_FUNCTION_STUB_SIZE	8
-+
-+#define ELF_R_INFO(x, y) ELF32_R_INFO(x, y)
-+#define ELF_R_TYPE(x) ELF32_R_TYPE(x)
-+#define ELF_R_SYM(x) ELF32_R_SYM(x)
-+
-+#define NOP_OPCODE 0xd703
-+
-+
-+/* Mapping between BFD relocations and ELF relocations */
-+
-+static reloc_howto_type *
-+bfd_elf32_bfd_reloc_type_lookup(bfd *abfd, bfd_reloc_code_real_type code);
-+
-+static reloc_howto_type *
-+bfd_elf32_bfd_reloc_name_lookup(bfd *abfd, const char *r_name);
-+
-+static void
-+avr32_info_to_howto (bfd *abfd, arelent *cache_ptr, Elf_Internal_Rela *dst);
-+
-+/* Generic HOWTO */
-+#define GENH(name, align, size, bitsize, pcrel, bitpos, complain, mask)	\
-+  HOWTO(name, align, size, bitsize, pcrel, bitpos,			\
-+	complain_overflow_##complain, bfd_elf_generic_reloc, #name,	\
-+	FALSE, 0, mask, pcrel)
-+
-+static reloc_howto_type elf_avr32_howto_table[] = {
-+  /*   NAME		 ALN SZ BSZ PCREL  BP COMPLAIN  MASK	    */
-+  GENH(R_AVR32_NONE,	  0, 0, 0,  FALSE, 0, dont,	0x00000000),
-+
-+  GENH(R_AVR32_32,	  0, 2, 32, FALSE, 0, dont,	0xffffffff),
-+  GENH(R_AVR32_16,	  0, 1, 16, FALSE, 0, bitfield,	0x0000ffff),
-+  GENH(R_AVR32_8,	  0, 0,  8, FALSE, 0, bitfield,	0x000000ff),
-+  GENH(R_AVR32_32_PCREL,  0, 2, 32, TRUE,  0, signed,   0xffffffff),
-+  GENH(R_AVR32_16_PCREL,  0, 1, 16, TRUE,  0, signed,   0x0000ffff),
-+  GENH(R_AVR32_8_PCREL,	  0, 0,  8, TRUE,  0, signed,   0x000000ff),
-+
-+  /* Difference between two symbol (sym2 - sym1).  The reloc encodes
-+     the value of sym1.  The field contains the difference before any
-+     relaxing is done.  */
-+  GENH(R_AVR32_DIFF32,	  0, 2, 32, FALSE, 0, dont,	0xffffffff),
-+  GENH(R_AVR32_DIFF16,	  0, 1, 16, FALSE, 0, signed,	0x0000ffff),
-+  GENH(R_AVR32_DIFF8,	  0, 0,  8, FALSE, 0, signed,	0x000000ff),
-+
-+  GENH(R_AVR32_GOT32,	  0, 2, 32, FALSE, 0, signed,	0xffffffff),
-+  GENH(R_AVR32_GOT16,	  0, 1, 16, FALSE, 0, signed,	0x0000ffff),
-+  GENH(R_AVR32_GOT8,	  0, 0,  8, FALSE, 0, signed,	0x000000ff),
-+
-+  GENH(R_AVR32_21S,	  0, 2, 21, FALSE, 0, signed,	0x1e10ffff),
-+  GENH(R_AVR32_16U,	  0, 2, 16, FALSE, 0, unsigned,	0x0000ffff),
-+  GENH(R_AVR32_16S,	  0, 2, 16, FALSE, 0, signed,	0x0000ffff),
-+  GENH(R_AVR32_8S,	  0, 1,  8, FALSE, 4, signed,	0x00000ff0),
-+  GENH(R_AVR32_8S_EXT,	  0, 2,  8, FALSE, 0, signed,	0x000000ff),
-+
-+  GENH(R_AVR32_22H_PCREL, 1, 2, 21, TRUE,  0, signed,	0x1e10ffff),
-+  GENH(R_AVR32_18W_PCREL, 2, 2, 16, TRUE,  0, signed,	0x0000ffff),
-+  GENH(R_AVR32_16B_PCREL, 0, 2, 16, TRUE,  0, signed,	0x0000ffff),
-+  GENH(R_AVR32_16N_PCREL, 0, 2, 16, TRUE,  0, signed,	0x0000ffff),
-+  GENH(R_AVR32_14UW_PCREL, 2, 2, 12, TRUE, 0, unsigned, 0x0000f0ff),
-+  GENH(R_AVR32_11H_PCREL, 1, 1, 10, TRUE,  4, signed,	0x00000ff3),
-+  GENH(R_AVR32_10UW_PCREL, 2, 2, 8, TRUE,  0, unsigned, 0x000000ff),
-+  GENH(R_AVR32_9H_PCREL,  1, 1,  8, TRUE,  4, signed,	0x00000ff0),
-+  GENH(R_AVR32_9UW_PCREL, 2, 1,  7, TRUE,  4, unsigned,	0x000007f0),
-+
-+  GENH(R_AVR32_HI16,	 16, 2, 16, FALSE, 0, dont,	0x0000ffff),
-+  GENH(R_AVR32_LO16,	  0, 2, 16, FALSE, 0, dont,	0x0000ffff),
-+
-+  GENH(R_AVR32_GOTPC,	  0, 2, 32, FALSE, 0, dont,	0xffffffff),
-+  GENH(R_AVR32_GOTCALL,   2, 2, 21, FALSE, 0, signed,	0x1e10ffff),
-+  GENH(R_AVR32_LDA_GOT,	  2, 2, 21, FALSE, 0, signed,	0x1e10ffff),
-+  GENH(R_AVR32_GOT21S,	  0, 2, 21, FALSE, 0, signed,	0x1e10ffff),
-+  GENH(R_AVR32_GOT18SW,	  2, 2, 16, FALSE, 0, signed,	0x0000ffff),
-+  GENH(R_AVR32_GOT16S,	  0, 2, 16, FALSE, 0, signed,	0x0000ffff),
-+  GENH(R_AVR32_GOT7UW,	  2, 1,  5, FALSE, 4, unsigned, 0x000001f0),
-+
-+  GENH(R_AVR32_32_CPENT,  0, 2, 32, FALSE, 0, dont,	0xffffffff),
-+  GENH(R_AVR32_CPCALL,	  2, 2, 16, TRUE,  0, signed,	0x0000ffff),
-+  GENH(R_AVR32_16_CP,	  0, 2, 16, TRUE,  0, signed,	0x0000ffff),
-+  GENH(R_AVR32_9W_CP,	  2, 1,  7, TRUE,  4, unsigned, 0x000007f0),
-+
-+  GENH(R_AVR32_RELATIVE,  0, 2, 32, FALSE, 0, signed,	0xffffffff),
-+  GENH(R_AVR32_GLOB_DAT,  0, 2, 32, FALSE, 0, dont,	0xffffffff),
-+  GENH(R_AVR32_JMP_SLOT,  0, 2, 32, FALSE, 0, dont,	0xffffffff),
-+
-+  GENH(R_AVR32_ALIGN,	  0, 1, 0,  FALSE, 0, unsigned, 0x00000000),
-+
-+  GENH(R_AVR32_15S,	  2, 2, 15, FALSE, 0, signed,	0x00007fff),
-+};
-+
-+struct elf_reloc_map
-+{
-+  bfd_reloc_code_real_type bfd_reloc_val;
-+  unsigned char elf_reloc_val;
-+};
-+
-+static const struct elf_reloc_map avr32_reloc_map[] =
-+{
-+  { BFD_RELOC_NONE,			R_AVR32_NONE },
-+
-+  { BFD_RELOC_32,			R_AVR32_32 },
-+  { BFD_RELOC_16,			R_AVR32_16 },
-+  { BFD_RELOC_8,			R_AVR32_8 },
-+  { BFD_RELOC_32_PCREL,			R_AVR32_32_PCREL },
-+  { BFD_RELOC_16_PCREL,			R_AVR32_16_PCREL },
-+  { BFD_RELOC_8_PCREL,			R_AVR32_8_PCREL },
-+  { BFD_RELOC_AVR32_DIFF32,		R_AVR32_DIFF32 },
-+  { BFD_RELOC_AVR32_DIFF16,		R_AVR32_DIFF16 },
-+  { BFD_RELOC_AVR32_DIFF8,		R_AVR32_DIFF8 },
-+  { BFD_RELOC_AVR32_GOT32,		R_AVR32_GOT32 },
-+  { BFD_RELOC_AVR32_GOT16,		R_AVR32_GOT16 },
-+  { BFD_RELOC_AVR32_GOT8,		R_AVR32_GOT8 },
-+
-+  { BFD_RELOC_AVR32_21S,		R_AVR32_21S },
-+  { BFD_RELOC_AVR32_16U,		R_AVR32_16U },
-+  { BFD_RELOC_AVR32_16S,		R_AVR32_16S },
-+  { BFD_RELOC_AVR32_SUB5,		R_AVR32_16S },
-+  { BFD_RELOC_AVR32_8S_EXT,		R_AVR32_8S_EXT },
-+  { BFD_RELOC_AVR32_8S,			R_AVR32_8S },
-+
-+  { BFD_RELOC_AVR32_22H_PCREL,		R_AVR32_22H_PCREL },
-+  { BFD_RELOC_AVR32_18W_PCREL,		R_AVR32_18W_PCREL },
-+  { BFD_RELOC_AVR32_16B_PCREL,		R_AVR32_16B_PCREL },
-+  { BFD_RELOC_AVR32_16N_PCREL,		R_AVR32_16N_PCREL },
-+  { BFD_RELOC_AVR32_11H_PCREL,		R_AVR32_11H_PCREL },
-+  { BFD_RELOC_AVR32_10UW_PCREL,		R_AVR32_10UW_PCREL },
-+  { BFD_RELOC_AVR32_9H_PCREL,		R_AVR32_9H_PCREL },
-+  { BFD_RELOC_AVR32_9UW_PCREL,		R_AVR32_9UW_PCREL },
-+
-+  { BFD_RELOC_HI16,			R_AVR32_HI16 },
-+  { BFD_RELOC_LO16,			R_AVR32_LO16 },
-+
-+  { BFD_RELOC_AVR32_GOTPC,		R_AVR32_GOTPC },
-+  { BFD_RELOC_AVR32_GOTCALL,		R_AVR32_GOTCALL },
-+  { BFD_RELOC_AVR32_LDA_GOT,		R_AVR32_LDA_GOT },
-+  { BFD_RELOC_AVR32_GOT21S,		R_AVR32_GOT21S },
-+  { BFD_RELOC_AVR32_GOT18SW,		R_AVR32_GOT18SW },
-+  { BFD_RELOC_AVR32_GOT16S,		R_AVR32_GOT16S },
-+  /* GOT7UW should never be generated by the assembler */
-+
-+  { BFD_RELOC_AVR32_32_CPENT,		R_AVR32_32_CPENT },
-+  { BFD_RELOC_AVR32_CPCALL,		R_AVR32_CPCALL },
-+  { BFD_RELOC_AVR32_16_CP,		R_AVR32_16_CP },
-+  { BFD_RELOC_AVR32_9W_CP,		R_AVR32_9W_CP },
-+
-+  { BFD_RELOC_AVR32_ALIGN,		R_AVR32_ALIGN },
-+
-+  { BFD_RELOC_AVR32_15S,		R_AVR32_15S },
-+};
-+
-+static reloc_howto_type *
-+bfd_elf32_bfd_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
-+				 bfd_reloc_code_real_type code)
-+{
-+  unsigned int i;
-+
-+  for (i = 0; i < sizeof(avr32_reloc_map) / sizeof(struct elf_reloc_map); i++)
-+    {
-+      if (avr32_reloc_map[i].bfd_reloc_val == code)
-+	return &elf_avr32_howto_table[avr32_reloc_map[i].elf_reloc_val];
-+    }
-+
-+  return NULL;
-+}
-+
-+static reloc_howto_type *
-+bfd_elf32_bfd_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
-+                 const char *r_name)
-+{
-+  unsigned int i;
-+
-+  for (i = 0;
-+       i < sizeof (elf_avr32_howto_table) / sizeof (elf_avr32_howto_table[0]);
-+       i++)
-+    if (elf_avr32_howto_table[i].name != NULL
-+    && strcasecmp (elf_avr32_howto_table[i].name, r_name) == 0)
-+      return &elf_avr32_howto_table[i];
-+
-+  return NULL;
-+}
-+
-+/* Set the howto pointer for an AVR32 ELF reloc.  */
-+static void
-+avr32_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED,
-+		     arelent *cache_ptr,
-+		     Elf_Internal_Rela *dst)
-+{
-+  unsigned int r_type;
-+
-+  r_type = ELF32_R_TYPE (dst->r_info);
-+  BFD_ASSERT (r_type < (unsigned int) R_AVR32_max);
-+  cache_ptr->howto = &elf_avr32_howto_table[r_type];
-+}
-+
-+
-+/* AVR32 ELF linker hash table and associated hash entries. */
-+
-+static struct bfd_hash_entry *
-+avr32_elf_link_hash_newfunc(struct bfd_hash_entry *entry,
-+			    struct bfd_hash_table *table,
-+			    const char *string);
-+static void
-+avr32_elf_copy_indirect_symbol(struct bfd_link_info *info,
-+			       struct elf_link_hash_entry *dir,
-+			       struct elf_link_hash_entry *ind);
-+static struct bfd_link_hash_table *
-+avr32_elf_link_hash_table_create(bfd *abfd);
-+
-+/*
-+  Try to limit memory usage to something reasonable when sorting the
-+  GOT.  If just a couple of entries end up getting more references
-+  than this, it won't affect performance at all, but if there are many
-+  of them, we could end up with the wrong symbols being assigned the
-+  first GOT entries.
-+*/
-+#define MAX_NR_GOT_HOLES	2048
-+
-+/*
-+  AVR32 GOT entry.  We need to keep track of refcounts and offsets
-+  simultaneously, since we need the offsets during relaxation, and we
-+  also want to be able to drop GOT entries during relaxation. In
-+  addition to this, we want to keep the list of GOT entries sorted so
-+  that we can keep the most-used entries at the lowest offsets.
-+*/
-+struct got_entry
-+{
-+  struct got_entry *next;
-+  struct got_entry **pprev;
-+  int refcount;
-+  bfd_signed_vma offset;
-+};
-+
-+struct elf_avr32_link_hash_entry
-+{
-+  struct elf_link_hash_entry root;
-+
-+  /* Number of runtime relocations against this symbol.  */
-+  unsigned int possibly_dynamic_relocs;
-+
-+  /* If there are anything but R_AVR32_GOT18 relocations against this
-+     symbol, it means that someone may be taking the address of the
-+     function, and we should therefore not create a stub.  */
-+  bfd_boolean no_fn_stub;
-+
-+  /* If there is a R_AVR32_32 relocation in a read-only section
-+     against this symbol, we could be in trouble. If we're linking a
-+     shared library or this symbol is defined in one, it means we must
-+     emit a run-time reloc for it and that's not allowed in read-only
-+     sections.  */
-+  asection *readonly_reloc_sec;
-+  bfd_vma readonly_reloc_offset;
-+
-+  /* Record which frag (if any) contains the symbol.  This is used
-+     during relaxation in order to avoid having to update all symbols
-+     whenever we move something.  For local symbols, this information
-+     is in the local_sym_frag member of struct elf_obj_tdata.  */
-+  struct fragment *sym_frag;
-+};
-+#define avr32_elf_hash_entry(ent) ((struct elf_avr32_link_hash_entry *)(ent))
-+
-+struct elf_avr32_link_hash_table
-+{
-+  struct elf_link_hash_table root;
-+
-+  /* Shortcuts to get to dynamic linker sections.  */
-+  asection *sgot;
-+  asection *srelgot;
-+  asection *sstub;
-+
-+  /* We use a variation of Pigeonhole Sort to sort the GOT.  After the
-+     initial refcounts have been determined, we initialize
-+     nr_got_holes to the highest refcount ever seen and allocate an
-+     array of nr_got_holes entries for got_hole.  Each GOT entry is
-+     then stored in this array at the index given by its refcount.
-+
-+     When a GOT entry has its refcount decremented during relaxation,
-+     it is moved to a lower index in the got_hole array.
-+   */
-+  struct got_entry **got_hole;
-+  int nr_got_holes;
-+
-+  /* Dynamic relocations to local symbols.  Only used when linking a
-+     shared library and -Bsymbolic is not given.  */
-+  unsigned int local_dynamic_relocs;
-+
-+  bfd_boolean relocations_analyzed;
-+  bfd_boolean symbols_adjusted;
-+  bfd_boolean repeat_pass;
-+  bfd_boolean direct_data_refs;
-+  unsigned int relax_iteration;
-+  unsigned int relax_pass;
-+};
-+#define avr32_elf_hash_table(p)				\
-+  ((struct elf_avr32_link_hash_table *)((p)->hash))
-+
-+static struct bfd_hash_entry *
-+avr32_elf_link_hash_newfunc(struct bfd_hash_entry *entry,
-+			    struct bfd_hash_table *table,
-+			    const char *string)
-+{
-+  struct elf_avr32_link_hash_entry *ret = avr32_elf_hash_entry(entry);
-+
-+  /* Allocate the structure if it hasn't already been allocated by a
-+     subclass */
-+  if (ret == NULL)
-+    ret = (struct elf_avr32_link_hash_entry *)
-+      bfd_hash_allocate(table, sizeof(struct elf_avr32_link_hash_entry));
-+
-+  if (ret == NULL)
-+    return NULL;
-+
-+  memset(ret, 0, sizeof(struct elf_avr32_link_hash_entry));
-+
-+  /* Give the superclass a chance */
-+  ret = (struct elf_avr32_link_hash_entry *)
-+    _bfd_elf_link_hash_newfunc((struct bfd_hash_entry *)ret, table, string);
-+
-+  return (struct bfd_hash_entry *)ret;
-+}
-+
-+/* Copy data from an indirect symbol to its direct symbol, hiding the
-+   old indirect symbol.  Process additional relocation information.
-+   Also called for weakdefs, in which case we just let
-+   _bfd_elf_link_hash_copy_indirect copy the flags for us.  */
-+
-+static void
-+avr32_elf_copy_indirect_symbol(struct bfd_link_info *info,
-+			       struct elf_link_hash_entry *dir,
-+			       struct elf_link_hash_entry *ind)
-+{
-+  struct elf_avr32_link_hash_entry *edir, *eind;
-+
-+  _bfd_elf_link_hash_copy_indirect (info, dir, ind);
-+
-+  if (ind->root.type != bfd_link_hash_indirect)
-+    return;
-+
-+  edir = (struct elf_avr32_link_hash_entry *)dir;
-+  eind = (struct elf_avr32_link_hash_entry *)ind;
-+
-+  edir->possibly_dynamic_relocs += eind->possibly_dynamic_relocs;
-+  edir->no_fn_stub = edir->no_fn_stub || eind->no_fn_stub;
-+}
-+
-+static struct bfd_link_hash_table *
-+avr32_elf_link_hash_table_create(bfd *abfd)
-+{
-+  struct elf_avr32_link_hash_table *ret;
-+
-+  ret = bfd_zmalloc(sizeof(*ret));
-+  if (ret == NULL)
-+    return NULL;
-+
-+  if (! _bfd_elf_link_hash_table_init(&ret->root, abfd,
-+				      avr32_elf_link_hash_newfunc,
-+                      sizeof (struct elf_avr32_link_hash_entry),
-+				GENERIC_ELF_DATA))
-+    {
-+      free(ret);
-+      return NULL;
-+    }
-+
-+  /* Prevent the BFD core from creating bogus got_entry pointers */
-+  ret->root.init_got_refcount.glist = NULL;
-+  ret->root.init_plt_refcount.glist = NULL;
-+  ret->root.init_got_offset.glist = NULL;
-+  ret->root.init_plt_offset.glist = NULL;
-+
-+  return &ret->root.root;
-+}
-+
-+
-+/* Initial analysis and creation of dynamic sections and symbols */
-+
-+static asection *
-+create_dynamic_section(bfd *dynobj, const char *name, flagword flags,
-+		       unsigned int align_power);
-+static struct elf_link_hash_entry *
-+create_dynamic_symbol(bfd *dynobj, struct bfd_link_info *info,
-+		      const char *name, asection *sec,
-+		      bfd_vma offset);
-+static bfd_boolean
-+avr32_elf_create_got_section (bfd *dynobj, struct bfd_link_info *info);
-+static bfd_boolean
-+avr32_elf_create_dynamic_sections (bfd *dynobj, struct bfd_link_info *info);
-+static bfd_boolean
-+avr32_check_relocs (bfd *abfd, struct bfd_link_info *info, asection *sec,
-+		    const Elf_Internal_Rela *relocs);
-+static bfd_boolean
-+avr32_elf_adjust_dynamic_symbol(struct bfd_link_info *info,
-+				struct elf_link_hash_entry *h);
-+
-+static asection *
-+create_dynamic_section(bfd *dynobj, const char *name, flagword flags,
-+		       unsigned int align_power)
-+{
-+  asection *sec;
-+
-+  sec = bfd_make_section(dynobj, name);
-+  if (!sec
-+      || !bfd_set_section_flags(dynobj, sec, flags)
-+      || !bfd_set_section_alignment(dynobj, sec, align_power))
-+    return NULL;
-+
-+  return sec;
-+}
-+
-+static struct elf_link_hash_entry *
-+create_dynamic_symbol(bfd *dynobj, struct bfd_link_info *info,
-+		      const char *name, asection *sec,
-+		      bfd_vma offset)
-+{
-+  struct bfd_link_hash_entry *bh = NULL;
-+  struct elf_link_hash_entry *h;
-+  const struct elf_backend_data *bed = get_elf_backend_data (dynobj);
-+
-+  if (!(_bfd_generic_link_add_one_symbol
-+	(info, dynobj, name, BSF_GLOBAL, sec, offset, NULL, FALSE,
-+	 bed->collect, &bh)))
-+    return NULL;
-+
-+  h = (struct elf_link_hash_entry *)bh;
-+  h->def_regular = 1;
-+  h->type = STT_OBJECT;
-+  h->other = STV_HIDDEN;
-+
-+  return h;
-+}
-+
-+static bfd_boolean
-+avr32_elf_create_got_section (bfd *dynobj, struct bfd_link_info *info)
-+{
-+  struct elf_avr32_link_hash_table *htab;
-+  flagword flags;
-+  const struct elf_backend_data *bed = get_elf_backend_data (dynobj);
-+
-+  htab = avr32_elf_hash_table(info);
-+  flags = bed->dynamic_sec_flags;
-+
-+  if (htab->sgot)
-+    return TRUE;
-+
-+  htab->sgot = create_dynamic_section(dynobj, ".got", flags, 2);
-+  if (!htab->srelgot)
-+    htab->srelgot = create_dynamic_section(dynobj, ".rela.got",
-+					   flags | SEC_READONLY, 2);
-+
-+  if (!htab->sgot || !htab->srelgot)
-+    return FALSE;
-+
-+  htab->root.hgot = create_dynamic_symbol(dynobj, info, "_GLOBAL_OFFSET_TABLE_",
-+					  htab->sgot, 0);
-+  if (!htab->root.hgot)
-+    return FALSE;
-+
-+  /* Make room for the GOT header */
-+  htab->sgot->size += bed->got_header_size;
-+
-+  return TRUE;
-+}
-+
-+/* (1) Create all dynamic (i.e. linker generated) sections that we may
-+   need during the link */
-+
-+static bfd_boolean
-+avr32_elf_create_dynamic_sections (bfd *dynobj, struct bfd_link_info *info)
-+{
-+  struct elf_avr32_link_hash_table *htab;
-+  flagword flags;
-+  const struct elf_backend_data *bed = get_elf_backend_data (dynobj);
-+
-+  pr_debug("(1) create dynamic sections\n");
-+
-+  htab = avr32_elf_hash_table(info);
-+  flags = bed->dynamic_sec_flags;
-+
-+  if (!avr32_elf_create_got_section (dynobj, info))
-+    return FALSE;
-+
-+  if (!htab->sstub)
-+    htab->sstub = create_dynamic_section(dynobj, ".stub",
-+					 flags | SEC_READONLY | SEC_CODE, 2);
-+
-+  if (!htab->sstub)
-+    return FALSE;
-+
-+  return TRUE;
-+}
-+
-+/* (2) Go through all the relocs and count any potential GOT- or
-+   PLT-references to each symbol */
-+
-+static bfd_boolean
-+avr32_check_relocs (bfd *abfd, struct bfd_link_info *info, asection *sec,
-+		    const Elf_Internal_Rela *relocs)
-+{
-+  Elf_Internal_Shdr *symtab_hdr;
-+  struct elf_avr32_link_hash_table *htab;
-+  struct elf_link_hash_entry **sym_hashes;
-+  const Elf_Internal_Rela *rel, *rel_end;
-+  struct got_entry **local_got_ents;
-+  struct got_entry *got;
-+  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
-+  asection *sgot;
-+  bfd *dynobj;
-+
-+  pr_debug("(2) check relocs for %s:<%s> (size 0x%lx)\n",
-+	   abfd->filename, sec->name, sec->size);
-+
-+  if (info->relocatable)
-+    return TRUE;
-+
-+  dynobj = elf_hash_table(info)->dynobj;
-+  symtab_hdr = &elf_tdata(abfd)->symtab_hdr;
-+  sym_hashes = elf_sym_hashes(abfd);
-+  htab = avr32_elf_hash_table(info);
-+  local_got_ents = elf_local_got_ents(abfd);
-+  sgot = htab->sgot;
-+
-+  rel_end = relocs + sec->reloc_count;
-+  for (rel = relocs; rel < rel_end; rel++)
-+    {
-+      unsigned long r_symndx, r_type;
-+      struct elf_avr32_link_hash_entry *h;
-+
-+      r_symndx = ELF32_R_SYM(rel->r_info);
-+      r_type = ELF32_R_TYPE(rel->r_info);
-+
-+      /* Local symbols use local_got_ents, while others store the same
-+	 information in the hash entry */
-+      if (r_symndx < symtab_hdr->sh_info)
-+	{
-+	  pr_debug("  (2a) processing local symbol %lu\n", r_symndx);
-+	  h = NULL;
-+	}
-+      else
-+	{
-+	  h = (struct elf_avr32_link_hash_entry *)
-+	    sym_hashes[r_symndx - symtab_hdr->sh_info];
-+	  while (h->root.type == bfd_link_hash_indirect
-+		 || h->root.type == bfd_link_hash_warning)
-+	    h = (struct elf_avr32_link_hash_entry *)h->root.root.u.i.link;
-+	  pr_debug("  (2a) processing symbol %s\n", h->root.root.root.string);
-+	}
-+
-+      /* Some relocs require special sections to be created.  */
-+      switch (r_type)
-+	{
-+	case R_AVR32_GOT32:
-+	case R_AVR32_GOT16:
-+	case R_AVR32_GOT8:
-+	case R_AVR32_GOT21S:
-+	case R_AVR32_GOT18SW:
-+	case R_AVR32_GOT16S:
-+	case R_AVR32_GOT7UW:
-+	case R_AVR32_LDA_GOT:
-+	case R_AVR32_GOTCALL:
-+	  if (rel->r_addend)
-+	    {
-+	      if (info->callbacks->reloc_dangerous
-+		  (info, _("Non-zero addend on GOT-relative relocation"),
-+		   abfd, sec, rel->r_offset) == FALSE)
-+		return FALSE;
-+	    }
-+	  /* fall through */
-+	case R_AVR32_GOTPC:
-+	  if (dynobj == NULL)
-+	    elf_hash_table(info)->dynobj = dynobj = abfd;
-+	  if (sgot == NULL && !avr32_elf_create_got_section(dynobj, info))
-+	    return FALSE;
-+	  break;
-+	case R_AVR32_32:
-+	  /* We may need to create .rela.dyn later on.  */
-+	  if (dynobj == NULL
-+	      && (info->shared || h != NULL)
-+	      && (sec->flags & SEC_ALLOC))
-+	    elf_hash_table(info)->dynobj = dynobj = abfd;
-+	  break;
-+	}
-+
-+      if (h != NULL && r_type != R_AVR32_GOT18SW)
-+	h->no_fn_stub = TRUE;
-+
-+      switch (r_type)
-+	{
-+	case R_AVR32_GOT32:
-+	case R_AVR32_GOT16:
-+	case R_AVR32_GOT8:
-+	case R_AVR32_GOT21S:
-+	case R_AVR32_GOT18SW:
-+	case R_AVR32_GOT16S:
-+	case R_AVR32_GOT7UW:
-+	case R_AVR32_LDA_GOT:
-+	case R_AVR32_GOTCALL:
-+	  if (h != NULL)
-+	    {
-+	      got = h->root.got.glist;
-+	      if (!got)
-+		{
-+		  got = bfd_zalloc(abfd, sizeof(struct got_entry));
-+		  if (!got)
-+		    return FALSE;
-+		  h->root.got.glist = got;
-+		}
-+	    }
-+	  else
-+	    {
-+	      if (!local_got_ents)
-+		{
-+		  bfd_size_type size;
-+		  bfd_size_type i;
-+		  struct got_entry *tmp_entry;
-+
-+		  size = symtab_hdr->sh_info;
-+		  size *= sizeof(struct got_entry *) + sizeof(struct got_entry);
-+		  local_got_ents = bfd_zalloc(abfd, size);
-+		  if (!local_got_ents)
-+		    return FALSE;
-+
-+		  elf_local_got_ents(abfd) = local_got_ents;
-+
-+		  tmp_entry = (struct got_entry *)(local_got_ents
-+						   + symtab_hdr->sh_info);
-+		  for (i = 0; i < symtab_hdr->sh_info; i++)
-+		    local_got_ents[i] = &tmp_entry[i];
-+		}
-+
-+	      got = local_got_ents[r_symndx];
-+	    }
-+
-+	  got->refcount++;
-+	  if (got->refcount > htab->nr_got_holes)
-+	    htab->nr_got_holes = got->refcount;
-+	  break;
-+
-+	case R_AVR32_32:
-+	  if ((info->shared || h != NULL)
-+	      && (sec->flags & SEC_ALLOC))
-+	    {
-+	      if (htab->srelgot == NULL)
-+		{
-+		  htab->srelgot = create_dynamic_section(dynobj, ".rela.got",
-+							 bed->dynamic_sec_flags
-+							 | SEC_READONLY, 2);
-+		  if (htab->srelgot == NULL)
-+		    return FALSE;
-+		}
-+
-+	      if (sec->flags & SEC_READONLY
-+		  && !h->readonly_reloc_sec)
-+		{
-+		  h->readonly_reloc_sec = sec;
-+		  h->readonly_reloc_offset = rel->r_offset;
-+		}
-+
-+	      if (h != NULL)
-+		{
-+		  pr_debug("Non-GOT reference to symbol %s\n",
-+			   h->root.root.root.string);
-+		  h->possibly_dynamic_relocs++;
-+		}
-+	      else
-+		{
-+		  pr_debug("Non-GOT reference to local symbol %lu\n",
-+			   r_symndx);
-+		  htab->local_dynamic_relocs++;
-+		}
-+	    }
-+
-+	  break;
-+
-+	  /* TODO: GNU_VTINHERIT and GNU_VTENTRY */
-+	}
-+    }
-+
-+  return TRUE;
-+}
-+
-+/* (3) Adjust a symbol defined by a dynamic object and referenced by a
-+   regular object.  The current definition is in some section of the
-+   dynamic object, but we're not including those sections.  We have to
-+   change the definition to something the rest of the link can
-+   understand.  */
-+
-+static bfd_boolean
-+avr32_elf_adjust_dynamic_symbol(struct bfd_link_info *info,
-+				struct elf_link_hash_entry *h)
-+{
-+  struct elf_avr32_link_hash_table *htab;
-+  struct elf_avr32_link_hash_entry *havr;
-+  bfd *dynobj;
-+
-+  pr_debug("(3) adjust dynamic symbol %s\n", h->root.root.string);
-+
-+  htab = avr32_elf_hash_table(info);
-+  havr = (struct elf_avr32_link_hash_entry *)h;
-+  dynobj = elf_hash_table(info)->dynobj;
-+
-+  /* Make sure we know what is going on here.  */
-+  BFD_ASSERT (dynobj != NULL
-+	      && (h->u.weakdef != NULL
-+		  || (h->def_dynamic
-+		      && h->ref_regular
-+		      && !h->def_regular)));
-+
-+  /* We don't want dynamic relocations in read-only sections. */
-+  if (havr->readonly_reloc_sec)
-+    {
-+      if (info->callbacks->reloc_dangerous
-+	  (info, _("dynamic relocation in read-only section"),
-+	   havr->readonly_reloc_sec->owner, havr->readonly_reloc_sec,
-+	   havr->readonly_reloc_offset) == FALSE)
-+	return FALSE;
-+    }
-+
-+  /* If this is a function, create a stub if possible and set the
-+     symbol to the stub location.  */
-+  if (0 && !havr->no_fn_stub)
-+    {
-+      if (!h->def_regular)
-+	{
-+	  asection *s = htab->sstub;
-+
-+	  BFD_ASSERT(s != NULL);
-+
-+	  h->root.u.def.section = s;
-+	  h->root.u.def.value = s->size;
-+	  h->plt.offset = s->size;
-+	  s->size += AVR32_FUNCTION_STUB_SIZE;
-+
-+	  return TRUE;
-+	}
-+    }
-+  else if (h->type == STT_FUNC)
-+    {
-+      /* This will set the entry for this symbol in the GOT to 0, and
-+	 the dynamic linker will take care of this. */
-+      h->root.u.def.value = 0;
-+      return TRUE;
-+    }
-+
-+  /* If this is a weak symbol, and there is a real definition, the
-+     processor independent code will have arranged for us to see the
-+     real definition first, and we can just use the same value.  */
-+  if (h->u.weakdef != NULL)
-+    {
-+      BFD_ASSERT(h->u.weakdef->root.type == bfd_link_hash_defined
-+		 || h->u.weakdef->root.type == bfd_link_hash_defweak);
-+      h->root.u.def.section = h->u.weakdef->root.u.def.section;
-+      h->root.u.def.value = h->u.weakdef->root.u.def.value;
-+      return TRUE;
-+    }
-+
-+  /* This is a reference to a symbol defined by a dynamic object which
-+     is not a function.  */
-+
-+  return TRUE;
-+}
-+
-+
-+/* Garbage-collection of unused sections */
-+
-+static asection *
-+avr32_elf_gc_mark_hook(asection *sec,
-+		       struct bfd_link_info *info ATTRIBUTE_UNUSED,
-+		       Elf_Internal_Rela *rel,
-+		       struct elf_link_hash_entry *h,
-+		       Elf_Internal_Sym *sym)
-+{
-+  if (h)
-+    {
-+      switch (ELF32_R_TYPE(rel->r_info))
-+	{
-+	  /* TODO: VTINHERIT/VTENTRY */
-+	default:
-+	  switch (h->root.type)
-+	    {
-+	    case bfd_link_hash_defined:
-+	    case bfd_link_hash_defweak:
-+	      return h->root.u.def.section;
-+
-+	    case bfd_link_hash_common:
-+	      return h->root.u.c.p->section;
-+
-+	    default:
-+	      break;
-+	    }
-+	}
-+    }
-+  else
-+    return bfd_section_from_elf_index(sec->owner, sym->st_shndx);
-+
-+  return NULL;
-+}
-+
-+/* Update the GOT entry reference counts for the section being removed. */
-+static bfd_boolean
-+avr32_elf_gc_sweep_hook(bfd *abfd,
-+			struct bfd_link_info *info ATTRIBUTE_UNUSED,
-+			asection *sec,
-+			const Elf_Internal_Rela *relocs)
-+{
-+  Elf_Internal_Shdr *symtab_hdr;
-+  struct elf_avr32_link_hash_entry **sym_hashes;
-+  struct got_entry **local_got_ents;
-+  const Elf_Internal_Rela *rel, *relend;
-+
-+  if (!(sec->flags & SEC_ALLOC))
-+    return TRUE;
-+
-+  symtab_hdr = &elf_tdata(abfd)->symtab_hdr;
-+  sym_hashes = (struct elf_avr32_link_hash_entry **)elf_sym_hashes(abfd);
-+  local_got_ents = elf_local_got_ents(abfd);
-+
-+  relend = relocs + sec->reloc_count;
-+  for (rel = relocs; rel < relend; rel++)
-+    {
-+      unsigned long r_symndx;
-+      unsigned int r_type;
-+      struct elf_avr32_link_hash_entry *h = NULL;
-+
-+      r_symndx = ELF32_R_SYM(rel->r_info);
-+      if (r_symndx >= symtab_hdr->sh_info)
-+	{
-+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
-+	  while (h->root.root.type == bfd_link_hash_indirect
-+		 || h->root.root.type == bfd_link_hash_warning)
-+	    h = (struct elf_avr32_link_hash_entry *)h->root.root.u.i.link;
-+	}
-+
-+      r_type = ELF32_R_TYPE(rel->r_info);
-+
-+      switch (r_type)
-+	{
-+	case R_AVR32_GOT32:
-+	case R_AVR32_GOT16:
-+	case R_AVR32_GOT8:
-+	case R_AVR32_GOT21S:
-+	case R_AVR32_GOT18SW:
-+	case R_AVR32_GOT16S:
-+	case R_AVR32_GOT7UW:
-+	case R_AVR32_LDA_GOT:
-+	case R_AVR32_GOTCALL:
-+	  if (h)
-+	    h->root.got.glist->refcount--;
-+	  else
-+	    local_got_ents[r_symndx]->refcount--;
-+	  break;
-+
-+	case R_AVR32_32:
-+	  if (info->shared || h)
-+	    {
-+	      if (h)
-+		h->possibly_dynamic_relocs--;
-+	      else
-+		avr32_elf_hash_table(info)->local_dynamic_relocs--;
-+	    }
-+
-+	default:
-+	  break;
-+	}
-+    }
-+
-+  return TRUE;
-+}
-+
-+/* Sizing and refcounting of dynamic sections */
-+
-+static void
-+insert_got_entry(struct elf_avr32_link_hash_table *htab, struct got_entry *got);
-+static void
-+unref_got_entry(struct elf_avr32_link_hash_table *htab, struct got_entry *got);
-+static void
-+ref_got_entry(struct elf_avr32_link_hash_table *htab, struct got_entry *got);
-+static bfd_boolean
-+assign_got_offsets(struct elf_avr32_link_hash_table *htab);
-+static bfd_boolean
-+allocate_dynrelocs(struct elf_link_hash_entry *h, void *_info);
-+static bfd_boolean
-+avr32_elf_size_dynamic_sections (bfd *output_bfd,
-+				 struct bfd_link_info *info);
-+
-+static void
-+insert_got_entry(struct elf_avr32_link_hash_table *htab, struct got_entry *got)
-+{
-+  /* Any entries with got_refcount > htab->nr_got_holes end up in the
-+   * last pigeonhole without any sorting. We expect the number of such
-+   * entries to be small, so it is very unlikely to affect
-+   * performance.  */
-+  int entry = got->refcount;
-+
-+  if (entry > htab->nr_got_holes)
-+    entry = htab->nr_got_holes;
-+
-+  got->pprev = &htab->got_hole[entry];
-+  got->next = htab->got_hole[entry];
-+
-+  if (got->next)
-+    got->next->pprev = &got->next;
-+
-+  htab->got_hole[entry] = got;
-+}
-+
-+/* Decrement the refcount of a GOT entry and update its position in
-+   the pigeonhole array.  */
-+static void
-+unref_got_entry(struct elf_avr32_link_hash_table *htab, struct got_entry *got)
-+{
-+  BFD_ASSERT(got->refcount > 0);
-+
-+  if (got->next)
-+    got->next->pprev = got->pprev;
-+
-+  *(got->pprev) = got->next;
-+  got->refcount--;
-+  insert_got_entry(htab, got);
-+}
-+
-+static void
-+ref_got_entry(struct elf_avr32_link_hash_table *htab, struct got_entry *got)
-+{
-+  if (got->next)
-+    got->next->pprev = got->pprev;
-+
-+  *(got->pprev) = got->next;
-+  got->refcount++;
-+  insert_got_entry(htab, got);
-+
-+  BFD_ASSERT(got->refcount > 0);
-+}
-+
-+/* Assign offsets to all GOT entries we intend to keep.  The entries
-+   that are referenced most often are placed at low offsets so that we
-+   can use compact instructions as much as possible.
-+
-+   Returns TRUE if any offsets or the total size of the GOT changed.  */
-+
-+static bfd_boolean
-+assign_got_offsets(struct elf_avr32_link_hash_table *htab)
-+{
-+  struct got_entry *got;
-+  bfd_size_type got_size = 0;
-+  bfd_boolean changed = FALSE;
-+  bfd_signed_vma offset;
-+  int i;
-+
-+  /* The GOT header provides the address of the DYNAMIC segment, so
-+     we need that even if the GOT is otherwise empty.  */
-+  if (htab->root.dynamic_sections_created)
-+    got_size = AVR32_GOT_HEADER_SIZE;
-+
-+  for (i = htab->nr_got_holes; i > 0; i--)
-+    {
-+      got = htab->got_hole[i];
-+      while (got)
-+	{
-+	  if (got->refcount > 0)
-+	    {
-+	      offset = got_size;
-+	      if (got->offset != offset)
-+		{
-+		  RDBG("GOT offset changed: %ld -> %ld\n",
-+		       got->offset, offset);
-+		  changed = TRUE;
-+		}
-+	      got->offset = offset;
-+	      got_size += 4;
-+	    }
-+	  got = got->next;
-+	}
-+    }
-+
-+  if (htab->sgot->size != got_size)
-+    {
-+      RDBG("GOT size changed: %lu -> %lu\n", htab->sgot->size,
-+	   got_size);
-+      changed = TRUE;
-+    }
-+  htab->sgot->size = got_size;
-+
-+  RDBG("assign_got_offsets: total size %lu (%s)\n",
-+       got_size, changed ? "changed" : "no change");
-+
-+  return changed;
-+}
-+
-+static bfd_boolean
-+allocate_dynrelocs(struct elf_link_hash_entry *h, void *_info)
-+{
-+  struct bfd_link_info *info = _info;
-+  struct elf_avr32_link_hash_table *htab;
-+  struct elf_avr32_link_hash_entry *havr;
-+  struct got_entry *got;
-+
-+  pr_debug("  (4b) allocate_dynrelocs: %s\n", h->root.root.string);
-+
-+  if (h->root.type == bfd_link_hash_indirect)
-+    return TRUE;
-+
-+  if (h->root.type == bfd_link_hash_warning)
-+    /* When warning symbols are created, they **replace** the "real"
-+       entry in the hash table, thus we never get to see the real
-+       symbol in a hash traversal.  So look at it now.  */
-+    h = (struct elf_link_hash_entry *) h->root.u.i.link;
-+
-+  htab = avr32_elf_hash_table(info);
-+  havr = (struct elf_avr32_link_hash_entry *)h;
-+
-+  got = h->got.glist;
-+
-+  /* If got is NULL, the symbol is never referenced through the GOT */
-+  if (got && got->refcount > 0)
-+    {
-+      insert_got_entry(htab, got);
-+
-+      /* Shared libraries need relocs for all GOT entries unless the
-+	 symbol is forced local or -Bsymbolic is used.  Others need
-+	 relocs for everything that is not guaranteed to be defined in
-+	 a regular object.  */
-+      if ((info->shared
-+	   && !info->symbolic
-+	   && h->dynindx != -1)
-+	  || (htab->root.dynamic_sections_created
-+	      && h->def_dynamic
-+	      && !h->def_regular))
-+	htab->srelgot->size += sizeof(Elf32_External_Rela);
-+    }
-+
-+  if (havr->possibly_dynamic_relocs
-+      && (info->shared
-+	  || (elf_hash_table(info)->dynamic_sections_created
-+	      && h->def_dynamic
-+	      && !h->def_regular)))
-+    {
-+      pr_debug("Allocating %d dynamic reloc against symbol %s...\n",
-+	       havr->possibly_dynamic_relocs, h->root.root.string);
-+      htab->srelgot->size += (havr->possibly_dynamic_relocs
-+			      * sizeof(Elf32_External_Rela));
-+    }
-+
-+  return TRUE;
-+}
-+
-+/* (4) Calculate the sizes of the linker-generated sections and
-+   allocate memory for them.  */
-+
-+static bfd_boolean
-+avr32_elf_size_dynamic_sections (bfd *output_bfd,
-+				 struct bfd_link_info *info)
-+{
-+  struct elf_avr32_link_hash_table *htab;
-+  bfd *dynobj;
-+  asection *s;
-+  bfd *ibfd;
-+  bfd_boolean relocs;
-+
-+  pr_debug("(4) size dynamic sections\n");
-+
-+  htab = avr32_elf_hash_table(info);
-+  dynobj = htab->root.dynobj;
-+  BFD_ASSERT(dynobj != NULL);
-+
-+  if (htab->root.dynamic_sections_created)
-+    {
-+      /* Initialize the contents of the .interp section to the name of
-+	 the dynamic loader */
-+      if (info->executable)
-+	{
-+	  s = bfd_get_section_by_name(dynobj, ".interp");
-+	  BFD_ASSERT(s != NULL);
-+	  s->size = sizeof(ELF_DYNAMIC_INTERPRETER);
-+	  s->contents = (unsigned char *)ELF_DYNAMIC_INTERPRETER;
-+	}
-+    }
-+
-+  if (htab->nr_got_holes > 0)
-+    {
-+      /* Allocate holes for the pigeonhole sort algorithm */
-+      pr_debug("Highest GOT refcount: %d\n", htab->nr_got_holes);
-+
-+      /* Limit the memory usage by clipping the number of pigeonholes
-+       * at a predefined maximum. All entries with a higher refcount
-+       * will end up in the last pigeonhole.  */
-+    if (htab->nr_got_holes >= MAX_NR_GOT_HOLES)
-+    {
-+        htab->nr_got_holes = MAX_NR_GOT_HOLES - 1;
-+
-+        pr_debug("Limiting maximum number of GOT pigeonholes to %u\n",
-+                    htab->nr_got_holes);
-+    }
-+      htab->got_hole = bfd_zalloc(output_bfd,
-+				  sizeof(struct got_entry *)
-+				  * (htab->nr_got_holes + 1));
-+      if (!htab->got_hole)
-+	return FALSE;
-+
-+      /* Set up .got offsets for local syms.  */
-+      for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
-+	{
-+	  struct got_entry **local_got;
-+	  struct got_entry **end_local_got;
-+	  Elf_Internal_Shdr *symtab_hdr;
-+	  bfd_size_type locsymcount;
-+
-+	  pr_debug("  (4a) processing file %s...\n", ibfd->filename);
-+
-+	  BFD_ASSERT(bfd_get_flavour(ibfd) == bfd_target_elf_flavour);
-+
-+	  local_got = elf_local_got_ents(ibfd);
-+	  if (!local_got)
-+	    continue;
-+
-+	  symtab_hdr = &elf_tdata(ibfd)->symtab_hdr;
-+	  locsymcount = symtab_hdr->sh_info;
-+	  end_local_got = local_got + locsymcount;
-+
-+	  for (; local_got < end_local_got; ++local_got)
-+	    insert_got_entry(htab, *local_got);
-+	}
-+    }
-+
-+  /* Allocate global sym .got entries and space for global sym
-+     dynamic relocs */
-+  elf_link_hash_traverse(&htab->root, allocate_dynrelocs, info);
-+
-+  /* Now that we have sorted the GOT entries, we are ready to
-+     assign offsets and determine the initial size of the GOT. */
-+  if (htab->sgot)
-+    assign_got_offsets(htab);
-+
-+  /* Allocate space for local sym dynamic relocs */
-+  BFD_ASSERT(htab->local_dynamic_relocs == 0 || info->shared);
-+  if (htab->local_dynamic_relocs)
-+    htab->srelgot->size += (htab->local_dynamic_relocs
-+			    * sizeof(Elf32_External_Rela));
-+
-+  /* We now have determined the sizes of the various dynamic
-+     sections. Allocate memory for them. */
-+  relocs = FALSE;
-+  for (s = dynobj->sections; s; s = s->next)
-+    {
-+      if ((s->flags & SEC_LINKER_CREATED) == 0)
-+	continue;
-+
-+      if (s == htab->sgot
-+	  || s == htab->sstub)
-+	{
-+	  /* Strip this section if we don't need it */
-+	}
-+      else if (strncmp (bfd_get_section_name(dynobj, s), ".rela", 5) == 0)
-+	{
-+	  if (s->size != 0)
-+	    relocs = TRUE;
-+
-+	  s->reloc_count = 0;
-+	}
-+      else
-+	{
-+	  /* It's not one of our sections */
-+	  continue;
-+	}
-+
-+      if (s->size == 0)
-+	{
-+	  /* Strip unneeded sections */
-+	  pr_debug("Stripping section %s from output...\n", s->name);
-+	  /* deleted function in 2.17
-+      _bfd_strip_section_from_output(info, s);
-+      */
-+	  continue;
-+	}
-+
-+      s->contents = bfd_zalloc(dynobj, s->size);
-+      if (s->contents == NULL)
-+	return FALSE;
-+    }
-+
-+  if (htab->root.dynamic_sections_created)
-+    {
-+      /* Add some entries to the .dynamic section.  We fill in the
-+	 values later, in sh_elf_finish_dynamic_sections, but we
-+	 must add the entries now so that we get the correct size for
-+	 the .dynamic section.  The DT_DEBUG entry is filled in by the
-+	 dynamic linker and used by the debugger.  */
-+#define add_dynamic_entry(TAG, VAL) _bfd_elf_add_dynamic_entry(info, TAG, VAL)
-+
-+      if (!add_dynamic_entry(DT_PLTGOT, 0))
-+	return FALSE;
-+      if (!add_dynamic_entry(DT_AVR32_GOTSZ, 0))
-+	return FALSE;
-+
-+      if (info->executable)
-+	{
-+	  if (!add_dynamic_entry(DT_DEBUG, 0))
-+	    return FALSE;
-+	}
-+      if (relocs)
-+	{
-+	  if (!add_dynamic_entry(DT_RELA, 0)
-+	      || !add_dynamic_entry(DT_RELASZ, 0)
-+	      || !add_dynamic_entry(DT_RELAENT,
-+				    sizeof(Elf32_External_Rela)))
-+	    return FALSE;
-+	}
-+    }
-+#undef add_dynamic_entry
-+
-+  return TRUE;
-+}
-+
-+
-+/* Access to internal relocations, section contents and symbols.
-+   (stolen from the xtensa port)  */
-+
-+static Elf_Internal_Rela *
-+retrieve_internal_relocs (bfd *abfd, asection *sec, bfd_boolean keep_memory);
-+static void
-+pin_internal_relocs (asection *sec, Elf_Internal_Rela *internal_relocs);
-+static void
-+release_internal_relocs (asection *sec, Elf_Internal_Rela *internal_relocs);
-+static bfd_byte *
-+retrieve_contents (bfd *abfd, asection *sec, bfd_boolean keep_memory);
-+/*
-+static void
-+pin_contents (asection *sec, bfd_byte *contents);
-+*/
-+static void
-+release_contents (asection *sec, bfd_byte *contents);
-+static Elf_Internal_Sym *
-+retrieve_local_syms (bfd *input_bfd, bfd_boolean keep_memory);
-+/*
-+static void
-+pin_local_syms (bfd *input_bfd, Elf_Internal_Sym *isymbuf);
-+*/
-+static void
-+release_local_syms (bfd *input_bfd, Elf_Internal_Sym *isymbuf);
-+
-+/* During relaxation, we need to modify relocations, section contents,
-+   and symbol definitions, and we need to keep the original values from
-+   being reloaded from the input files, i.e., we need to "pin" the
-+   modified values in memory.  We also want to continue to observe the
-+   setting of the "keep-memory" flag.  The following functions wrap the
-+   standard BFD functions to take care of this for us.  */
-+
-+static Elf_Internal_Rela *
-+retrieve_internal_relocs (bfd *abfd, asection *sec, bfd_boolean keep_memory)
-+{
-+  /* _bfd_elf_link_read_relocs knows about caching, so no need for us
-+     to be clever here.  */
-+  return _bfd_elf_link_read_relocs(abfd, sec, NULL, NULL, keep_memory);
-+}
-+
-+static void
-+pin_internal_relocs (asection *sec, Elf_Internal_Rela *internal_relocs)
-+{
-+  elf_section_data (sec)->relocs = internal_relocs;
-+}
-+
-+static void
-+release_internal_relocs (asection *sec, Elf_Internal_Rela *internal_relocs)
-+{
-+  if (internal_relocs
-+      && elf_section_data (sec)->relocs != internal_relocs)
-+    free (internal_relocs);
-+}
-+
-+static bfd_byte *
-+retrieve_contents (bfd *abfd, asection *sec, bfd_boolean keep_memory)
-+{
-+  bfd_byte *contents;
-+  bfd_size_type sec_size;
-+
-+  sec_size = bfd_get_section_limit (abfd, sec);
-+  contents = elf_section_data (sec)->this_hdr.contents;
-+
-+  if (contents == NULL && sec_size != 0)
-+    {
-+      if (!bfd_malloc_and_get_section (abfd, sec, &contents))
-+	{
-+	  if (contents)
-+	    free (contents);
-+	  return NULL;
-+	}
-+      if (keep_memory)
-+	elf_section_data (sec)->this_hdr.contents = contents;
-+    }
-+  return contents;
-+}
-+
-+/*
-+static void
-+pin_contents (asection *sec, bfd_byte *contents)
-+{
-+  elf_section_data (sec)->this_hdr.contents = contents;
-+}
-+*/
-+static void
-+release_contents (asection *sec, bfd_byte *contents)
-+{
-+  if (contents && elf_section_data (sec)->this_hdr.contents != contents)
-+    free (contents);
-+}
-+
-+static Elf_Internal_Sym *
-+retrieve_local_syms (bfd *input_bfd, bfd_boolean keep_memory)
-+{
-+  Elf_Internal_Shdr *symtab_hdr;
-+  Elf_Internal_Sym *isymbuf;
-+  size_t locsymcount;
-+
-+  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
-+  locsymcount = symtab_hdr->sh_info;
-+
-+  isymbuf = (Elf_Internal_Sym *) symtab_hdr->contents;
-+  if (isymbuf == NULL && locsymcount != 0)
-+    {
-+      isymbuf = bfd_elf_get_elf_syms (input_bfd, symtab_hdr, locsymcount, 0,
-+				      NULL, NULL, NULL);
-+      if (isymbuf && keep_memory)
-+	symtab_hdr->contents = (unsigned char *) isymbuf;
-+    }
-+
-+  return isymbuf;
-+}
-+
-+/*
-+static void
-+pin_local_syms (bfd *input_bfd, Elf_Internal_Sym *isymbuf)
-+{
-+  elf_tdata (input_bfd)->symtab_hdr.contents = (unsigned char *)isymbuf;
-+}
-+
-+*/
-+static void
-+release_local_syms (bfd *input_bfd, Elf_Internal_Sym *isymbuf)
-+{
-+  if (isymbuf && (elf_tdata (input_bfd)->symtab_hdr.contents
-+		  != (unsigned char *)isymbuf))
-+    free (isymbuf);
-+}
-+
-+/* Data structures used during relaxation. */
-+
-+enum relax_state_id {
-+  RS_ERROR = -1,
-+  RS_NONE = 0,
-+  RS_ALIGN,
-+  RS_CPENT,
-+  RS_PIC_CALL,
-+  RS_PIC_MCALL,
-+  RS_PIC_RCALL2,
-+  RS_PIC_RCALL1,
-+  RS_PIC_LDA,
-+  RS_PIC_LDW4,
-+  RS_PIC_LDW3,
-+  RS_PIC_SUB5,
-+  RS_NOPIC_MCALL,
-+  RS_NOPIC_RCALL2,
-+  RS_NOPIC_RCALL1,
-+  RS_NOPIC_LDW4,
-+  RS_NOPIC_LDDPC,
-+  RS_NOPIC_SUB5,
-+  RS_NOPIC_MOV2,
-+  RS_NOPIC_MOV1,
-+  RS_RCALL2,
-+  RS_RCALL1,
-+  RS_BRC2,
-+  RS_BRC1,
-+  RS_BRAL,
-+  RS_RJMP,
-+  RS_MAX,
-+};
-+
-+enum reference_type {
-+  REF_ABSOLUTE,
-+  REF_PCREL,
-+  REF_CPOOL,
-+  REF_GOT,
-+};
-+
-+struct relax_state
-+{
-+  const char *name;
-+  enum relax_state_id id;
-+  enum relax_state_id direct;
-+  enum relax_state_id next;
-+  enum relax_state_id prev;
-+
-+  enum reference_type reftype;
-+
-+  unsigned int r_type;
-+
-+  bfd_vma opcode;
-+  bfd_vma opcode_mask;
-+
-+  bfd_signed_vma range_min;
-+  bfd_signed_vma range_max;
-+
-+  bfd_size_type size;
-+};
-+
-+/*
-+ * This is for relocs that
-+ *   a) has an addend or is of type R_AVR32_DIFF32, and
-+ *   b) references a different section than it's in, and
-+ *   c) references a section that is relaxable
-+ *
-+ * as well as relocs that references the constant pool, in which case
-+ * the add_frag member points to the frag containing the constant pool
-+ * entry.
-+ *
-+ * Such relocs must be fixed up whenever we delete any code. Sections
-+ * that don't have any relocs with all of the above properties don't
-+ * have any additional reloc data, but sections that do will have
-+ * additional data for all its relocs.
-+ */
-+struct avr32_reloc_data
-+{
-+  struct fragment *add_frag;
-+  struct fragment *sub_frag;
-+};
-+
-+/*
-+ * A 'fragment' is a relaxable entity, that is, code may be added or
-+ * deleted at the end of a fragment. When this happens, all subsequent
-+ * fragments in the list will have their offsets updated.
-+ */
-+struct fragment
-+{
-+  enum relax_state_id state;
-+  enum relax_state_id initial_state;
-+
-+  Elf_Internal_Rela *rela;
-+  bfd_size_type size;
-+  bfd_vma offset;
-+  int size_adjust;
-+  int offset_adjust;
-+  bfd_boolean has_grown;
-+
-+  /* Only used by constant pool entries.  When this drops to zero, the
-+     frag is discarded (i.e. size_adjust is set to -4.)  */
-+  int refcount;
-+};
-+
-+struct avr32_relax_data
-+{
-+  unsigned int frag_count;
-+  struct fragment *frag;
-+  struct avr32_reloc_data *reloc_data;
-+
-+  /* TRUE if this section has one or more relaxable relocations */
-+  bfd_boolean is_relaxable;
-+  unsigned int iteration;
-+};
-+
-+struct avr32_section_data
-+{
-+  struct bfd_elf_section_data elf;
-+  struct avr32_relax_data relax_data;
-+};
-+
-+/* Relax state definitions */
-+
-+#define PIC_MOV2_OPCODE		0xe0600000
-+#define PIC_MOV2_MASK		0xe1e00000
-+#define PIC_MOV2_RANGE_MIN	(-1048576 * 4)
-+#define PIC_MOV2_RANGE_MAX	(1048575 * 4)
-+#define PIC_MCALL_OPCODE	0xf0160000
-+#define PIC_MCALL_MASK		0xffff0000
-+#define PIC_MCALL_RANGE_MIN	(-131072)
-+#define PIC_MCALL_RANGE_MAX	(131068)
-+#define RCALL2_OPCODE		0xe0a00000
-+#define RCALL2_MASK		0xe1ef0000
-+#define RCALL2_RANGE_MIN	(-2097152)
-+#define RCALL2_RANGE_MAX	(2097150)
-+#define RCALL1_OPCODE		0xc00c0000
-+#define RCALL1_MASK		0xf00c0000
-+#define RCALL1_RANGE_MIN	(-1024)
-+#define RCALL1_RANGE_MAX	(1022)
-+#define PIC_LDW4_OPCODE		0xecf00000
-+#define PIC_LDW4_MASK		0xfff00000
-+#define PIC_LDW4_RANGE_MIN	(-32768)
-+#define PIC_LDW4_RANGE_MAX	(32767)
-+#define PIC_LDW3_OPCODE		0x6c000000
-+#define PIC_LDW3_MASK		0xfe000000
-+#define PIC_LDW3_RANGE_MIN	(0)
-+#define PIC_LDW3_RANGE_MAX	(124)
-+#define SUB5_PC_OPCODE		0xfec00000
-+#define SUB5_PC_MASK		0xfff00000
-+#define SUB5_PC_RANGE_MIN	(-32768)
-+#define SUB5_PC_RANGE_MAX	(32767)
-+#define NOPIC_MCALL_OPCODE	0xf01f0000
-+#define NOPIC_MCALL_MASK	0xffff0000
-+#define NOPIC_MCALL_RANGE_MIN	PIC_MCALL_RANGE_MIN
-+#define NOPIC_MCALL_RANGE_MAX	PIC_MCALL_RANGE_MAX
-+#define NOPIC_LDW4_OPCODE	0xfef00000
-+#define NOPIC_LDW4_MASK		0xfff00000
-+#define NOPIC_LDW4_RANGE_MIN	PIC_LDW4_RANGE_MIN
-+#define NOPIC_LDW4_RANGE_MAX	PIC_LDW4_RANGE_MAX
-+#define LDDPC_OPCODE		0x48000000
-+#define LDDPC_MASK		0xf8000000
-+#define LDDPC_RANGE_MIN		0
-+#define LDDPC_RANGE_MAX		508
-+
-+#define NOPIC_MOV2_OPCODE  0xe0600000
-+#define NOPIC_MOV2_MASK        0xe1e00000
-+#define NOPIC_MOV2_RANGE_MIN   (-1048576)
-+#define NOPIC_MOV2_RANGE_MAX   (1048575)
-+#define NOPIC_MOV1_OPCODE  0x30000000
-+#define NOPIC_MOV1_MASK        0xf0000000
-+#define NOPIC_MOV1_RANGE_MIN   (-128)
-+#define NOPIC_MOV1_RANGE_MAX   (127)
-+
-+/* Only brc2 variants with cond[3] == 0 is considered, since the
-+   others are not relaxable.  bral is a special case and is handled
-+   separately.  */
-+#define BRC2_OPCODE		0xe0800000
-+#define BRC2_MASK		0xe1e80000
-+#define BRC2_RANGE_MIN		(-2097152)
-+#define BRC2_RANGE_MAX		(2097150)
-+#define BRC1_OPCODE		0xc0000000
-+#define BRC1_MASK		0xf0080000
-+#define BRC1_RANGE_MIN		(-256)
-+#define BRC1_RANGE_MAX		(254)
-+#define BRAL_OPCODE		0xe08f0000
-+#define BRAL_MASK		0xe1ef0000
-+#define BRAL_RANGE_MIN		BRC2_RANGE_MIN
-+#define BRAL_RANGE_MAX		BRC2_RANGE_MAX
-+#define RJMP_OPCODE		0xc0080000
-+#define RJMP_MASK		0xf00c0000
-+#define RJMP_RANGE_MIN		(-1024)
-+#define RJMP_RANGE_MAX		(1022)
-+
-+/* Define a relax state using the GOT  */
-+#define RG(id, dir, next, prev, r_type, opc, size)			\
-+  { "RS_"#id, RS_##id, RS_##dir, RS_##next, RS_##prev, REF_GOT,		\
-+      R_AVR32_##r_type,	opc##_OPCODE, opc##_MASK,			\
-+      opc##_RANGE_MIN, opc##_RANGE_MAX, size }
-+/* Define a relax state using the Constant Pool  */
-+#define RC(id, dir, next, prev, r_type, opc, size)			\
-+  { "RS_"#id, RS_##id, RS_##dir, RS_##next, RS_##prev, REF_CPOOL,	\
-+      R_AVR32_##r_type,	opc##_OPCODE, opc##_MASK,			\
-+      opc##_RANGE_MIN, opc##_RANGE_MAX, size }
-+
-+/* Define a relax state using pc-relative direct reference  */
-+#define RP(id, dir, next, prev, r_type, opc, size)			\
-+  { "RS_"#id, RS_##id, RS_##dir, RS_##next, RS_##prev, REF_PCREL,	\
-+      R_AVR32_##r_type,	opc##_OPCODE, opc##_MASK,			\
-+      opc##_RANGE_MIN, opc##_RANGE_MAX, size }
-+
-+/* Define a relax state using non-pc-relative direct reference */
-+#define RD(id, dir, next, prev, r_type, opc, size)         \
-+  { "RS_"#id, RS_##id, RS_##dir, RS_##next, RS_##prev, REF_ABSOLUTE,   \
-+      R_AVR32_##r_type,    opc##_OPCODE, opc##_MASK,           \
-+      opc##_RANGE_MIN, opc##_RANGE_MAX, size }
-+
-+/* Define a relax state that will be handled specially  */
-+#define RS(id, r_type, size)						\
-+  { "RS_"#id, RS_##id, RS_NONE, RS_NONE, RS_NONE, REF_ABSOLUTE,		\
-+      R_AVR32_##r_type, 0, 0, 0, 0, size }
-+
-+const struct relax_state relax_state[RS_MAX] = {
-+  RS(NONE, NONE, 0),
-+  RS(ALIGN, ALIGN, 0),
-+  RS(CPENT, 32_CPENT, 4),
-+
-+  RG(PIC_CALL, PIC_RCALL1, PIC_MCALL, NONE, GOTCALL, PIC_MOV2, 10),
-+  RG(PIC_MCALL, PIC_RCALL1, NONE, PIC_CALL, GOT18SW, PIC_MCALL, 4),
-+  RP(PIC_RCALL2, NONE, PIC_RCALL1, PIC_MCALL, 22H_PCREL, RCALL2, 4),
-+  RP(PIC_RCALL1, NONE, NONE, PIC_RCALL2, 11H_PCREL, RCALL1, 2),
-+
-+  RG(PIC_LDA, PIC_SUB5, PIC_LDW4, NONE, LDA_GOT, PIC_MOV2, 8),
-+  RG(PIC_LDW4, PIC_SUB5, PIC_LDW3, PIC_LDA, GOT16S, PIC_LDW4, 4),
-+  RG(PIC_LDW3, PIC_SUB5, NONE, PIC_LDW4, GOT7UW, PIC_LDW3, 2),
-+  RP(PIC_SUB5, NONE, NONE, PIC_LDW3, 16N_PCREL, SUB5_PC, 4),
-+
-+  RC(NOPIC_MCALL, NOPIC_RCALL1, NONE, NONE, CPCALL, NOPIC_MCALL, 4),
-+  RP(NOPIC_RCALL2, NONE, NOPIC_RCALL1, NOPIC_MCALL, 22H_PCREL, RCALL2, 4),
-+  RP(NOPIC_RCALL1, NONE, NONE, NOPIC_RCALL2, 11H_PCREL, RCALL1, 2),
-+
-+  RC(NOPIC_LDW4, NOPIC_MOV1, NOPIC_LDDPC, NONE, 16_CP, NOPIC_LDW4, 4),
-+  RC(NOPIC_LDDPC, NOPIC_MOV1, NONE, NOPIC_LDW4, 9W_CP, LDDPC, 2),
-+  RP(NOPIC_SUB5, NOPIC_MOV1, NONE, NOPIC_LDDPC, 16N_PCREL, SUB5_PC, 4),
-+  RD(NOPIC_MOV2, NONE, NOPIC_MOV1, NOPIC_SUB5, 21S, NOPIC_MOV2, 4),
-+  RD(NOPIC_MOV1, NONE, NONE, NOPIC_MOV2, 8S, NOPIC_MOV1, 2),
-+
-+  RP(RCALL2, NONE, RCALL1, NONE, 22H_PCREL, RCALL2, 4),
-+  RP(RCALL1, NONE, NONE, RCALL2, 11H_PCREL, RCALL1, 2),
-+  RP(BRC2, NONE, BRC1, NONE, 22H_PCREL, BRC2, 4),
-+  RP(BRC1, NONE, NONE, BRC2, 9H_PCREL, BRC1, 2),
-+  RP(BRAL, NONE, RJMP, NONE, 22H_PCREL, BRAL, 4),
-+  RP(RJMP, NONE, NONE, BRAL, 11H_PCREL, RJMP, 2),
-+};
-+
-+static bfd_boolean
-+avr32_elf_new_section_hook(bfd *abfd, asection *sec)
-+{
-+  struct avr32_section_data *sdata;
-+
-+  sdata = bfd_zalloc(abfd, sizeof(struct avr32_section_data));
-+  if (!sdata)
-+    return FALSE;
-+
-+  sec->used_by_bfd = sdata;
-+  return _bfd_elf_new_section_hook(abfd, sec);
-+}
-+
-+static struct avr32_relax_data *
-+avr32_relax_data(asection *sec)
-+{
-+  struct avr32_section_data *sdata;
-+
-+  BFD_ASSERT(sec->used_by_bfd);
-+
-+  sdata = (struct avr32_section_data *)elf_section_data(sec);
-+  return &sdata->relax_data;
-+}
-+
-+/* Link-time relaxation */
-+
-+static bfd_boolean
-+avr32_elf_relax_section(bfd *abfd, asection *sec,
-+			struct bfd_link_info *info, bfd_boolean *again);
-+
-+enum relax_pass_id {
-+  RELAX_PASS_SIZE_FRAGS,
-+  RELAX_PASS_MOVE_DATA,
-+};
-+
-+/* Stolen from the xtensa port */
-+static int
-+internal_reloc_compare (const void *ap, const void *bp)
-+{
-+  const Elf_Internal_Rela *a = (const Elf_Internal_Rela *) ap;
-+  const Elf_Internal_Rela *b = (const Elf_Internal_Rela *) bp;
-+
-+  if (a->r_offset != b->r_offset)
-+    return (a->r_offset - b->r_offset);
-+
-+  /* We don't need to sort on these criteria for correctness,
-+     but enforcing a more strict ordering prevents unstable qsort
-+     from behaving differently with different implementations.
-+     Without the code below we get correct but different results
-+     on Solaris 2.7 and 2.8.  We would like to always produce the
-+     same results no matter the host.  */
-+
-+  if (a->r_info != b->r_info)
-+    return (a->r_info - b->r_info);
-+
-+  return (a->r_addend - b->r_addend);
-+}
-+
-+static enum relax_state_id
-+get_pcrel22_relax_state(bfd *abfd, asection *sec, struct bfd_link_info *info,
-+			const Elf_Internal_Rela *rela)
-+{
-+  bfd_byte *contents;
-+  bfd_vma insn;
-+  enum relax_state_id rs = RS_NONE;
-+
-+  contents = retrieve_contents(abfd, sec, info->keep_memory);
-+  if (!contents)
-+    return RS_ERROR;
-+
-+  insn = bfd_get_32(abfd, contents + rela->r_offset);
-+  if ((insn & RCALL2_MASK) == RCALL2_OPCODE)
-+    rs = RS_RCALL2;
-+  else if ((insn & BRAL_MASK) == BRAL_OPCODE)
-+    /* Optimizing bral -> rjmp gets us into all kinds of
-+       trouble with jump tables. Better not do it.  */
-+    rs = RS_NONE;
-+  else if ((insn & BRC2_MASK) == BRC2_OPCODE)
-+    rs = RS_BRC2;
-+
-+  release_contents(sec, contents);
-+
-+  return rs;
-+}
-+
-+static enum relax_state_id
-+get_initial_relax_state(bfd *abfd, asection *sec, struct bfd_link_info *info,
-+			const Elf_Internal_Rela *rela)
-+{
-+  switch (ELF_R_TYPE(rela->r_info))
-+    {
-+    case R_AVR32_GOTCALL:
-+      return RS_PIC_CALL;
-+    case R_AVR32_GOT18SW:
-+      return RS_PIC_MCALL;
-+    case R_AVR32_LDA_GOT:
-+      return RS_PIC_LDA;
-+    case R_AVR32_GOT16S:
-+      return RS_PIC_LDW4;
-+    case R_AVR32_CPCALL:
-+      return RS_NOPIC_MCALL;
-+    case R_AVR32_16_CP:
-+      return RS_NOPIC_LDW4;
-+    case R_AVR32_9W_CP:
-+      return RS_NOPIC_LDDPC;
-+    case R_AVR32_ALIGN:
-+      return RS_ALIGN;
-+    case R_AVR32_32_CPENT:
-+      return RS_CPENT;
-+    case R_AVR32_22H_PCREL:
-+      return get_pcrel22_relax_state(abfd, sec, info, rela);
-+    case R_AVR32_9H_PCREL:
-+      return RS_BRC1;
-+    default:
-+      return RS_NONE;
-+    }
-+}
-+
-+static bfd_boolean
-+reloc_is_cpool_ref(const Elf_Internal_Rela *rela)
-+{
-+  switch (ELF_R_TYPE(rela->r_info))
-+    {
-+    case R_AVR32_CPCALL:
-+    case R_AVR32_16_CP:
-+    case R_AVR32_9W_CP:
-+      return TRUE;
-+    default:
-+      return FALSE;
-+    }
-+}
-+
-+static struct fragment *
-+new_frag(bfd *abfd ATTRIBUTE_UNUSED, asection *sec,
-+	 struct avr32_relax_data *rd, enum relax_state_id state,
-+	 Elf_Internal_Rela *rela)
-+{
-+  struct fragment *frag;
-+  bfd_size_type r_size;
-+  bfd_vma r_offset;
-+  unsigned int i = rd->frag_count;
-+
-+  BFD_ASSERT(state >= RS_NONE && state < RS_MAX);
-+
-+  rd->frag_count++;
-+  frag = bfd_realloc(rd->frag, sizeof(struct fragment) * rd->frag_count);
-+  if (!frag)
-+    return NULL;
-+  rd->frag = frag;
-+
-+  frag += i;
-+  memset(frag, 0, sizeof(struct fragment));
-+
-+  if (state == RS_ALIGN)
-+    r_size = (((rela->r_offset + (1 << rela->r_addend) - 1)
-+	       & ~((1 << rela->r_addend) - 1)) - rela->r_offset);
-+  else
-+    r_size = relax_state[state].size;
-+
-+  if (rela)
-+    r_offset = rela->r_offset;
-+  else
-+    r_offset = sec->size;
-+
-+  if (i == 0)
-+    {
-+      frag->offset = 0;
-+      frag->size = r_offset + r_size;
-+    }
-+  else
-+    {
-+      frag->offset = rd->frag[i - 1].offset + rd->frag[i - 1].size;
-+      frag->size = r_offset + r_size - frag->offset;
-+    }
-+
-+  if (state != RS_CPENT)
-+    /* Make sure we don't discard this frag */
-+    frag->refcount = 1;
-+
-+  frag->initial_state = frag->state = state;
-+  frag->rela = rela;
-+
-+  return frag;
-+}
-+
-+static struct fragment *
-+find_frag(asection *sec, bfd_vma offset)
-+{
-+  struct fragment *first, *last;
-+  struct avr32_relax_data *rd = avr32_relax_data(sec);
-+
-+  if (rd->frag_count == 0)
-+    return NULL;
-+
-+  first = &rd->frag[0];
-+  last = &rd->frag[rd->frag_count - 1];
-+
-+  /* This may be a reloc referencing the end of a section.  The last
-+     frag will never have a reloc associated with it, so its size will
-+     never change, thus the offset adjustment of the last frag will
-+     always be the same as the offset adjustment of the end of the
-+     section.  */
-+  if (offset == sec->size)
-+    {
-+      BFD_ASSERT(last->offset + last->size == sec->size);
-+      BFD_ASSERT(!last->rela);
-+      return last;
-+    }
-+
-+  while (first <= last)
-+    {
-+      struct fragment *mid;
-+
-+      mid = (last - first) / 2 + first;
-+      if ((mid->offset + mid->size) <= offset)
-+	first = mid + 1;
-+      else if (mid->offset > offset)
-+	last = mid - 1;
-+      else
-+	return mid;
-+    }
-+
-+  return NULL;
-+}
-+
-+/* Look through all relocs in a section and determine if any relocs
-+   may be affected by relaxation in other sections.  If so, allocate
-+   an array of additional relocation data which links the affected
-+   relocations to the frag(s) where the relaxation may occur.
-+
-+   This function also links cpool references to cpool entries and
-+   increments the refcount of the latter when this happens.  */
-+
-+static bfd_boolean
-+allocate_reloc_data(bfd *abfd, asection *sec, Elf_Internal_Rela *relocs,
-+		    struct bfd_link_info *info)
-+{
-+  Elf_Internal_Shdr *symtab_hdr;
-+  Elf_Internal_Sym *isymbuf = NULL;
-+  struct avr32_relax_data *rd;
-+  unsigned int i;
-+  bfd_boolean ret = FALSE;
-+
-+  symtab_hdr = &elf_tdata(abfd)->symtab_hdr;
-+  rd = avr32_relax_data(sec);
-+
-+  RDBG("%s<%s>: allocate_reloc_data\n", abfd->filename, sec->name);
-+
-+  for (i = 0; i < sec->reloc_count; i++)
-+    {
-+      Elf_Internal_Rela *rel = &relocs[i];
-+      asection *sym_sec;
-+      unsigned long r_symndx;
-+      bfd_vma sym_value;
-+
-+      if (!rel->r_addend && ELF_R_TYPE(rel->r_info) != R_AVR32_DIFF32
-+	  && !reloc_is_cpool_ref(rel))
-+	continue;
-+
-+      r_symndx = ELF_R_SYM(rel->r_info);
-+
-+      if (r_symndx < symtab_hdr->sh_info)
-+	{
-+	  Elf_Internal_Sym *isym;
-+
-+	  if (!isymbuf)
-+	    isymbuf = retrieve_local_syms(abfd, info->keep_memory);
-+	  if (!isymbuf)
-+	    return FALSE;
-+
-+	  isym = &isymbuf[r_symndx];
-+	  sym_sec = bfd_section_from_elf_index(abfd, isym->st_shndx);
-+	  sym_value = isym->st_value;
-+	}
-+      else
-+	{
-+	  struct elf_link_hash_entry *h;
-+
-+	  h = elf_sym_hashes(abfd)[r_symndx - symtab_hdr->sh_info];
-+
-+	  while (h->root.type == bfd_link_hash_indirect
-+		 || h->root.type == bfd_link_hash_warning)
-+	    h = (struct elf_link_hash_entry *)h->root.u.i.link;
-+
-+	  if (h->root.type != bfd_link_hash_defined
-+	      && h->root.type != bfd_link_hash_defweak)
-+	    continue;
-+
-+	  sym_sec = h->root.u.def.section;
-+	  sym_value = h->root.u.def.value;
-+	}
-+
-+      if (sym_sec && avr32_relax_data(sym_sec)->is_relaxable)
-+	{
-+	  bfd_size_type size;
-+	  struct fragment *frag;
-+
-+	  if (!rd->reloc_data)
-+	    {
-+	      size = sizeof(struct avr32_reloc_data) * sec->reloc_count;
-+	      rd->reloc_data = bfd_zalloc(abfd, size);
-+	      if (!rd->reloc_data)
-+		goto out;
-+	    }
-+
-+	  RDBG("[%3d] 0x%04lx: target: 0x%lx + 0x%lx",
-+	       i, rel->r_offset, sym_value, rel->r_addend);
-+
-+	  frag = find_frag(sym_sec, sym_value + rel->r_addend);
-+	  BFD_ASSERT(frag);
-+	  rd->reloc_data[i].add_frag = frag;
-+
-+	  RDBG(" -> %s<%s>:%04lx\n", sym_sec->owner->filename, sym_sec->name,
-+	       frag->rela ? frag->rela->r_offset : sym_sec->size);
-+
-+	  if (reloc_is_cpool_ref(rel))
-+	    {
-+	      BFD_ASSERT(ELF_R_TYPE(frag->rela->r_info) == R_AVR32_32_CPENT);
-+	      frag->refcount++;
-+	    }
-+
-+	  if (ELF_R_TYPE(rel->r_info) == R_AVR32_DIFF32)
-+	    {
-+	      bfd_byte *contents;
-+	      bfd_signed_vma diff;
-+
-+	      contents = retrieve_contents(abfd, sec, info->keep_memory);
-+	      if (!contents)
-+		goto out;
-+
-+	      diff = bfd_get_signed_32(abfd, contents + rel->r_offset);
-+	      frag = find_frag(sym_sec, sym_value + rel->r_addend + diff);
-+	      BFD_ASSERT(frag);
-+	      rd->reloc_data[i].sub_frag = frag;
-+
-+	      release_contents(sec, contents);
-+	    }
-+	}
-+    }
-+
-+  ret = TRUE;
-+
-+ out:
-+  release_local_syms(abfd, isymbuf);
-+  return ret;
-+}
-+
-+static bfd_boolean
-+global_sym_set_frag(struct elf_avr32_link_hash_entry *havr,
-+		    struct bfd_link_info *info ATTRIBUTE_UNUSED)
-+{
-+  struct fragment *frag;
-+  asection *sec;
-+
-+  if (havr->root.root.type != bfd_link_hash_defined
-+      && havr->root.root.type != bfd_link_hash_defweak)
-+    return TRUE;
-+
-+  sec = havr->root.root.u.def.section;
-+  if (bfd_is_const_section(sec)
-+      || !avr32_relax_data(sec)->is_relaxable)
-+    return TRUE;
-+
-+  frag = find_frag(sec, havr->root.root.u.def.value);
-+  if (!frag)
-+    {
-+      unsigned int i;
-+      struct avr32_relax_data *rd = avr32_relax_data(sec);
-+
-+      RDBG("In %s: No frag for %s <%s+%lu> (limit %lu)\n",
-+	   sec->owner->filename, havr->root.root.root.string,
-+	   sec->name, havr->root.root.u.def.value, sec->size);
-+      for (i = 0; i < rd->frag_count; i++)
-+	RDBG("    %8lu - %8lu\n", rd->frag[i].offset,
-+	     rd->frag[i].offset + rd->frag[i].size);
-+    }
-+  BFD_ASSERT(frag);
-+
-+  havr->sym_frag = frag;
-+  return TRUE;
-+}
-+
-+static bfd_boolean
-+analyze_relocations(struct bfd_link_info *info)
-+{
-+  bfd *abfd;
-+  asection *sec;
-+
-+  /* Divide all relaxable sections into fragments */
-+  for (abfd = info->input_bfds; abfd; abfd = abfd->link_next)
-+    {
-+      if (!(elf_elfheader(abfd)->e_flags & EF_AVR32_LINKRELAX))
-+	{
-+	  if (!(*info->callbacks->warning)
-+	      (info, _("input is not relaxable"), NULL, abfd, NULL, 0))
-+	    return FALSE;
-+	  continue;
-+	}
-+
-+      for (sec = abfd->sections; sec; sec = sec->next)
-+	{
-+	  struct avr32_relax_data *rd;
-+	  struct fragment *frag;
-+	  Elf_Internal_Rela *relocs;
-+	  unsigned int i;
-+	  bfd_boolean ret = TRUE;
-+
-+	  if (!(sec->flags & SEC_RELOC) || sec->reloc_count == 0)
-+	    continue;
-+
-+	  rd = avr32_relax_data(sec);
-+
-+	  relocs = retrieve_internal_relocs(abfd, sec, info->keep_memory);
-+	  if (!relocs)
-+	    return FALSE;
-+
-+	  qsort(relocs, sec->reloc_count, sizeof(Elf_Internal_Rela),
-+		internal_reloc_compare);
-+
-+	  for (i = 0; i < sec->reloc_count; i++)
-+	    {
-+	      enum relax_state_id state;
-+
-+	      ret = FALSE;
-+	      state = get_initial_relax_state(abfd, sec, info, &relocs[i]);
-+	      if (state == RS_ERROR)
-+		break;
-+
-+	      if (state)
-+		{
-+		  frag = new_frag(abfd, sec, rd, state, &relocs[i]);
-+		  if (!frag)
-+		    break;
-+
-+		  pin_internal_relocs(sec, relocs);
-+		  rd->is_relaxable = TRUE;
-+		}
-+
-+	      ret = TRUE;
-+	    }
-+
-+	  release_internal_relocs(sec, relocs);
-+	  if (!ret)
-+	    return ret;
-+
-+	  if (rd->is_relaxable)
-+	    {
-+	      frag = new_frag(abfd, sec, rd, RS_NONE, NULL);
-+	      if (!frag)
-+		return FALSE;
-+	    }
-+	}
-+    }
-+
-+  /* Link each global symbol to the fragment where it's defined.  */
-+  elf_link_hash_traverse(elf_hash_table(info), global_sym_set_frag, info);
-+
-+  /* Do the same for local symbols. */
-+  for (abfd = info->input_bfds; abfd; abfd = abfd->link_next)
-+    {
-+      Elf_Internal_Sym *isymbuf, *isym;
-+      struct fragment **local_sym_frag;
-+      unsigned int i, sym_count;
-+
-+      sym_count = elf_tdata(abfd)->symtab_hdr.sh_info;
-+      if (sym_count == 0)
-+	continue;
-+
-+      local_sym_frag = bfd_zalloc(abfd, sym_count * sizeof(struct fragment *));
-+      if (!local_sym_frag)
-+	return FALSE;
-+      elf_tdata(abfd)->local_sym_frag = local_sym_frag;
-+
-+      isymbuf = retrieve_local_syms(abfd, info->keep_memory);
-+      if (!isymbuf)
-+	return FALSE;
-+
-+      for (i = 0; i < sym_count; i++)
-+	{
-+	  struct avr32_relax_data *rd;
-+	  struct fragment *frag;
-+	  asection *sec;
-+
-+	  isym = &isymbuf[i];
-+
-+	  sec = bfd_section_from_elf_index(abfd, isym->st_shndx);
-+	  if (!sec)
-+	    continue;
-+
-+	  rd = avr32_relax_data(sec);
-+	  if (!rd->is_relaxable)
-+	    continue;
-+
-+	  frag = find_frag(sec, isym->st_value);
-+	  BFD_ASSERT(frag);
-+
-+	  local_sym_frag[i] = frag;
-+	}
-+
-+      release_local_syms(abfd, isymbuf);
-+    }
-+
-+  /* And again for relocs with addends and constant pool references */
-+  for (abfd = info->input_bfds; abfd; abfd = abfd->link_next)
-+    for (sec = abfd->sections; sec; sec = sec->next)
-+      {
-+	Elf_Internal_Rela *relocs;
-+	bfd_boolean ret;
-+
-+	if (!(sec->flags & SEC_RELOC) || sec->reloc_count == 0)
-+	  continue;
-+
-+	relocs = retrieve_internal_relocs(abfd, sec, info->keep_memory);
-+	if (!relocs)
-+	  return FALSE;
-+
-+	ret = allocate_reloc_data(abfd, sec, relocs, info);
-+
-+	release_internal_relocs(sec, relocs);
-+	if (ret == FALSE)
-+	  return ret;
-+      }
-+
-+  return TRUE;
-+}
-+
-+static bfd_boolean
-+rs_is_good_enough(const struct relax_state *rs, struct fragment *frag,
-+		  bfd_vma symval, bfd_vma addr, struct got_entry *got,
-+		  struct avr32_reloc_data *ind_data,
-+		  bfd_signed_vma offset_adjust)
-+{
-+  bfd_signed_vma target = 0;
-+
-+  switch (rs->reftype)
-+    {
-+    case REF_ABSOLUTE:
-+      target = symval;
-+      break;
-+    case REF_PCREL:
-+      target = symval - addr;
-+      break;
-+    case REF_CPOOL:
-+      /* cpool frags are always in the same section and always after
-+	 all frags referring to it.  So it's always correct to add in
-+	 offset_adjust here.  */
-+      target = (ind_data->add_frag->offset + ind_data->add_frag->offset_adjust
-+		+ offset_adjust - frag->offset - frag->offset_adjust);
-+      break;
-+    case REF_GOT:
-+      target = got->offset;
-+      break;
-+    default:
-+      abort();
-+    }
-+
-+  if (target >= rs->range_min && target <= rs->range_max)
-+    return TRUE;
-+  else
-+    return FALSE;
-+}
-+
-+static bfd_boolean
-+avr32_size_frags(bfd *abfd, asection *sec, struct bfd_link_info *info)
-+{
-+  struct elf_avr32_link_hash_table *htab;
-+  struct avr32_relax_data *rd;
-+  Elf_Internal_Shdr *symtab_hdr;
-+  Elf_Internal_Rela *relocs = NULL;
-+  Elf_Internal_Sym *isymbuf = NULL;
-+  struct got_entry **local_got_ents;
-+  struct fragment **local_sym_frag;
-+  bfd_boolean ret = FALSE;
-+  bfd_signed_vma delta = 0;
-+  unsigned int i;
-+
-+  htab = avr32_elf_hash_table(info);
-+  rd = avr32_relax_data(sec);
-+
-+  if (sec == htab->sgot)
-+    {
-+      RDBG("Relaxing GOT section (vma: 0x%lx)\n",
-+	   sec->output_section->vma + sec->output_offset);
-+      if (assign_got_offsets(htab))
-+	htab->repeat_pass = TRUE;
-+      return TRUE;
-+    }
-+
-+  if (!rd->is_relaxable)
-+    return TRUE;
-+
-+  if (!sec->rawsize)
-+    sec->rawsize = sec->size;
-+
-+  symtab_hdr = &elf_tdata(abfd)->symtab_hdr;
-+  relocs = retrieve_internal_relocs(abfd, sec, info->keep_memory);
-+  if (!relocs)
-+    goto out;
-+
-+  isymbuf = retrieve_local_syms(abfd, info->keep_memory);
-+  if (!isymbuf)
-+    goto out;
-+
-+  local_got_ents = elf_local_got_ents(abfd);
-+  local_sym_frag = elf_tdata(abfd)->local_sym_frag;
-+
-+  RDBG("size_frags: %s<%s>\n  vma: 0x%08lx, size: 0x%08lx\n",
-+       abfd->filename, sec->name,
-+       sec->output_section->vma + sec->output_offset, sec->size);
-+
-+  for (i = 0; i < rd->frag_count; i++)
-+    {
-+      struct fragment *frag = &rd->frag[i];
-+      struct avr32_reloc_data *r_data = NULL, *ind_data = NULL;
-+      const struct relax_state *state, *next_state;
-+      struct fragment *target_frag = NULL;
-+      asection *sym_sec = NULL;
-+      Elf_Internal_Rela *rela;
-+      struct got_entry *got;
-+      bfd_vma symval, r_offset, addend, addr;
-+      bfd_signed_vma size_adjust = 0, distance;
-+      unsigned long r_symndx;
-+      bfd_boolean defined = TRUE, dynamic = FALSE;
-+      unsigned char sym_type;
-+
-+      frag->offset_adjust += delta;
-+      state = next_state = &relax_state[frag->state];
-+      rela = frag->rela;
-+
-+      BFD_ASSERT(state->id == frag->state);
-+
-+      RDBG("  0x%04lx%c%d: %s [size %ld]", rela ? rela->r_offset : sec->rawsize,
-+	   (frag->offset_adjust < 0)?'-':'+',
-+	   abs(frag->offset_adjust), state->name, state->size);
-+
-+      if (!rela)
-+	{
-+	  RDBG(": no reloc, ignoring\n");
-+	  continue;
-+	}
-+
-+      BFD_ASSERT((unsigned int)(rela - relocs) < sec->reloc_count);
-+      BFD_ASSERT(state != RS_NONE);
-+
-+      r_offset = rela->r_offset + frag->offset_adjust;
-+      addr = sec->output_section->vma + sec->output_offset + r_offset;
-+
-+      switch (frag->state)
-+	{
-+	case RS_ALIGN:
-+	  size_adjust = ((addr + (1 << rela->r_addend) - 1)
-+			 & ~((1 << rela->r_addend) - 1));
-+	  size_adjust -= (sec->output_section->vma + sec->output_offset
-+			  + frag->offset + frag->offset_adjust
-+			  + frag->size + frag->size_adjust);
-+
-+	  RDBG(": adjusting size %lu -> %lu\n", frag->size + frag->size_adjust,
-+	       frag->size + frag->size_adjust + size_adjust);
-+	  break;
-+
-+	case RS_CPENT:
-+	  if (frag->refcount == 0 && frag->size_adjust == 0)
-+	    {
-+	      RDBG(": discarding frag\n");
-+	      size_adjust = -4;
-+	    }
-+	  else if (frag->refcount > 0 && frag->size_adjust < 0)
-+	    {
-+	      RDBG(": un-discarding frag\n");
-+	      size_adjust = 4;
-+	    }
-+	  break;
-+
-+	default:
-+	  if (rd->reloc_data)
-+	    r_data = &rd->reloc_data[frag->rela - relocs];
-+
-+	  /* If this is a cpool reference, we want the symbol that the
-+	     cpool entry refers to, not the symbol for the cpool entry
-+	     itself, as we already know what frag it's in.  */
-+	  if (relax_state[frag->initial_state].reftype == REF_CPOOL)
-+	    {
-+	      Elf_Internal_Rela *irela = r_data->add_frag->rela;
-+
-+	      r_symndx = ELF_R_SYM(irela->r_info);
-+	      addend = irela->r_addend;
-+
-+	      /* The constant pool must be in the same section as the
-+		 reloc referring to it.  */
-+	      BFD_ASSERT((unsigned long)(irela - relocs) < sec->reloc_count);
-+
-+	      ind_data = r_data;
-+	      r_data = &rd->reloc_data[irela - relocs];
-+	    }
-+	  else
-+	    {
-+	      r_symndx = ELF_R_SYM(rela->r_info);
-+	      addend = rela->r_addend;
-+	    }
-+
-+	  /* Get the value of the symbol referred to by the reloc.  */
-+	  if (r_symndx < symtab_hdr->sh_info)
-+	    {
-+	      Elf_Internal_Sym *isym;
-+
-+	      isym = isymbuf + r_symndx;
-+	      symval = 0;
-+
-+	      RDBG(" local sym %lu: ", r_symndx);
-+
-+	      if (isym->st_shndx == SHN_UNDEF)
-+		defined = FALSE;
-+	      else if (isym->st_shndx == SHN_ABS)
-+		sym_sec = bfd_abs_section_ptr;
-+	      else if (isym->st_shndx == SHN_COMMON)
-+		sym_sec = bfd_com_section_ptr;
-+	      else
-+		sym_sec = bfd_section_from_elf_index(abfd, isym->st_shndx);
-+
-+	      symval = isym->st_value;
-+	      sym_type = ELF_ST_TYPE(isym->st_info);
-+	      target_frag = local_sym_frag[r_symndx];
-+
-+	      if (local_got_ents)
-+		got = local_got_ents[r_symndx];
-+	      else
-+		got = NULL;
-+	    }
-+	  else
-+	    {
-+	      /* Global symbol */
-+	      unsigned long index;
-+	      struct elf_link_hash_entry *h;
-+	      struct elf_avr32_link_hash_entry *havr;
-+
-+	      index = r_symndx - symtab_hdr->sh_info;
-+	      h = elf_sym_hashes(abfd)[index];
-+	      BFD_ASSERT(h != NULL);
-+
-+	      while (h->root.type == bfd_link_hash_indirect
-+		     || h->root.type == bfd_link_hash_warning)
-+		h = (struct elf_link_hash_entry *)h->root.u.i.link;
-+
-+	      havr = (struct elf_avr32_link_hash_entry *)h;
-+	      got = h->got.glist;
-+
-+	      symval = 0;
-+
-+	      RDBG(" %s: ", h->root.root.string);
-+
-+	      if (h->root.type != bfd_link_hash_defined
-+		  && h->root.type != bfd_link_hash_defweak)
-+		{
-+		  RDBG("(undef)");
-+		  defined = FALSE;
-+		}
-+	      else if ((info->shared && !info->symbolic && h->dynindx != -1)
-+		       || (htab->root.dynamic_sections_created
-+			   && h->def_dynamic && !h->def_regular))
-+		{
-+		  RDBG("(dynamic)");
-+		  dynamic = TRUE;
-+		  sym_sec = h->root.u.def.section;
-+		}
-+	      else
-+		{
-+		  sym_sec = h->root.u.def.section;
-+		  symval = h->root.u.def.value;
-+		  target_frag = havr->sym_frag;
-+		}
-+
-+	      sym_type = h->type;
-+	    }
-+
-+	  /* Thanks to elf32-ppc for this one.  */
-+	  if (sym_sec && sym_sec->sec_info_type == ELF_INFO_TYPE_MERGE)
-+	    {
-+	      /* At this stage in linking, no SEC_MERGE symbol has been
-+		 adjusted, so all references to such symbols need to be
-+		 passed through _bfd_merged_section_offset.  (Later, in
-+		 relocate_section, all SEC_MERGE symbols *except* for
-+		 section symbols have been adjusted.)
-+
-+	         SEC_MERGE sections are not relaxed by us, as they
-+	         shouldn't contain any code.  */
-+
-+	      BFD_ASSERT(!target_frag && !(r_data && r_data->add_frag));
-+
-+	      /* gas may reduce relocations against symbols in SEC_MERGE
-+		 sections to a relocation against the section symbol when
-+		 the original addend was zero.  When the reloc is against
-+		 a section symbol we should include the addend in the
-+		 offset passed to _bfd_merged_section_offset, since the
-+		 location of interest is the original symbol.  On the
-+		 other hand, an access to "sym+addend" where "sym" is not
-+		 a section symbol should not include the addend;  Such an
-+		 access is presumed to be an offset from "sym";  The
-+		 location of interest is just "sym".  */
-+	      RDBG("\n    MERGE: %s: 0x%lx+0x%lx+0x%lx -> ",
-+		   (sym_type == STT_SECTION)?"section":"not section",
-+		   sym_sec->output_section->vma + sym_sec->output_offset,
-+		   symval, addend);
-+
-+	      if (sym_type == STT_SECTION)
-+		symval += addend;
-+
-+	      symval = (_bfd_merged_section_offset
-+			(abfd, &sym_sec,
-+			 elf_section_data(sym_sec)->sec_info, symval));
-+
-+	      if (sym_type != STT_SECTION)
-+		symval += addend;
-+	    }
-+	  else
-+	    symval += addend;
-+
-+	  if (defined && !dynamic)
-+	    {
-+	      RDBG("0x%lx+0x%lx",
-+		   sym_sec->output_section->vma + sym_sec->output_offset,
-+		   symval);
-+	      symval += sym_sec->output_section->vma + sym_sec->output_offset;
-+	    }
-+
-+	  if (r_data && r_data->add_frag)
-+	    /* If the add_frag pointer is set, it means that this reloc
-+	       has an addend that may be affected by relaxation.  */
-+	    target_frag = r_data->add_frag;
-+
-+	  if (target_frag)
-+	    {
-+	      symval += target_frag->offset_adjust;
-+
-+	      /* If target_frag comes after this frag in the same
-+		 section, we should assume that it will be moved by
-+		 the same amount we are.  */
-+	      if ((target_frag - rd->frag) < (int)rd->frag_count
-+		  && target_frag > frag)
-+		symval += delta;
-+	    }
-+
-+	  distance = symval - addr;
-+
-+	  /* First, try to make a direct reference.  If the symbol is
-+	     dynamic or undefined, we must take care not to change its
-+	     reference type, that is, we can't make it direct.
-+
-+	     Also, it seems like some sections may actually be resized
-+	     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
-+	     direct references to SEC_DATA sections.
-+
-+	     Oh, and .bss isn't actually SEC_DATA, so we disallow
-+	     !SEC_HAS_CONTENTS as well. */
-+	  if (!dynamic && defined
-+	      && (htab->direct_data_refs
-+		  || (!(sym_sec->flags & SEC_DATA)
-+		      && (sym_sec->flags & SEC_HAS_CONTENTS)))
-+	      && next_state->direct)
-+	    {
-+	      next_state = &relax_state[next_state->direct];
-+	      RDBG(" D-> %s", next_state->name);
-+	    }
-+
-+	  /* Iterate backwards until we find a state that fits.  */
-+	  while (next_state->prev
-+		 && !rs_is_good_enough(next_state, frag, symval, addr,
-+				       got, ind_data, delta))
-+	    {
-+	      next_state = &relax_state[next_state->prev];
-+	      RDBG(" P-> %s", next_state->name);
-+	    }
-+
-+	  /* Then try to find the best possible state.  */
-+	  while (next_state->next)
-+	    {
-+	      const struct relax_state *candidate;
-+
-+	      candidate = &relax_state[next_state->next];
-+	      if (!rs_is_good_enough(candidate, frag, symval, addr, got,
-+				     ind_data, delta))
-+		break;
-+
-+	      next_state = candidate;
-+	      RDBG(" N-> %s", next_state->name);
-+	    }
-+
-+	  RDBG(" [size %ld]\n", next_state->size);
-+
-+	  BFD_ASSERT(next_state->id);
-+	  BFD_ASSERT(!dynamic || next_state->reftype == REF_GOT);
-+
-+	  size_adjust = next_state->size - state->size;
-+
-+	  /* There's a theoretical possibility that shrinking one frag
-+	     may cause another to grow, which may cause the first one to
-+	     grow as well, and we're back where we started.  Avoid this
-+	     scenario by disallowing a frag that has grown to ever
-+	     shrink again.  */
-+	  if (state->reftype == REF_GOT && next_state->reftype != REF_GOT)
-+	    {
-+	      if (frag->has_grown)
-+		next_state = state;
-+	      else
-+		unref_got_entry(htab, got);
-+	    }
-+	  else if (state->reftype != REF_GOT && next_state->reftype == REF_GOT)
-+	    {
-+	      ref_got_entry(htab, got);
-+	      frag->has_grown = TRUE;
-+	    }
-+	  else if (state->reftype == REF_CPOOL
-+		   && next_state->reftype != REF_CPOOL)
-+	    {
-+	      if (frag->has_grown)
-+		next_state = state;
-+	      else
-+		ind_data->add_frag->refcount--;
-+	    }
-+	  else if (state->reftype != REF_CPOOL
-+		   && next_state->reftype == REF_CPOOL)
-+	    {
-+	      ind_data->add_frag->refcount++;
-+	      frag->has_grown = TRUE;
-+	    }
-+	  else
-+	    {
-+	      if (frag->has_grown && size_adjust < 0)
-+		next_state = state;
-+	      else if (size_adjust > 0)
-+		frag->has_grown = TRUE;
-+	    }
-+
-+	  size_adjust = next_state->size - state->size;
-+	  frag->state = next_state->id;
-+
-+	  break;
-+	}
-+
-+      if (size_adjust)
-+	htab->repeat_pass = TRUE;
-+
-+      frag->size_adjust += size_adjust;
-+      sec->size += size_adjust;
-+      delta += size_adjust;
-+
-+      BFD_ASSERT((frag->offset + frag->offset_adjust
-+		  + frag->size + frag->size_adjust)
-+		 == (frag[1].offset + frag[1].offset_adjust + delta));
-+    }
-+
-+  ret = TRUE;
-+
-+ out:
-+  release_local_syms(abfd, isymbuf);
-+  release_internal_relocs(sec, relocs);
-+  return ret;
-+}
-+
-+static bfd_boolean
-+adjust_global_symbol(struct elf_avr32_link_hash_entry *havr,
-+		     struct bfd_link_info *info ATTRIBUTE_UNUSED)
-+{
-+  struct elf_link_hash_entry *h = &havr->root;
-+
-+  if (havr->sym_frag && (h->root.type == bfd_link_hash_defined
-+			 || h->root.type == bfd_link_hash_defweak))
-+    {
-+      RDBG("adjust_global_symbol: %s 0x%08lx -> 0x%08lx\n",
-+	   h->root.root.string, h->root.u.def.value,
-+	   h->root.u.def.value + havr->sym_frag->offset_adjust);
-+      h->root.u.def.value += havr->sym_frag->offset_adjust;
-+    }
-+  return TRUE;
-+}
-+
-+static bfd_boolean
-+adjust_syms(struct bfd_link_info *info)
-+{
-+  struct elf_avr32_link_hash_table *htab;
-+  bfd *abfd;
-+
-+  htab = avr32_elf_hash_table(info);
-+  elf_link_hash_traverse(&htab->root, adjust_global_symbol, info);
-+
-+  for (abfd = info->input_bfds; abfd; abfd = abfd->link_next)
-+    {
-+      Elf_Internal_Sym *isymbuf;
-+      struct fragment **local_sym_frag, *frag;
-+      unsigned int i, sym_count;
-+
-+      sym_count = elf_tdata(abfd)->symtab_hdr.sh_info;
-+      if (sym_count == 0)
-+	continue;
-+
-+      isymbuf = retrieve_local_syms(abfd, info->keep_memory);
-+      if (!isymbuf)
-+	return FALSE;
-+
-+      local_sym_frag = elf_tdata(abfd)->local_sym_frag;
-+
-+      for (i = 0; i < sym_count; i++)
-+	{
-+	  frag = local_sym_frag[i];
-+	  if (frag)
-+	    {
-+	      RDBG("adjust_local_symbol: %s[%u] 0x%08lx -> 0x%08lx\n",
-+		   abfd->filename, i, isymbuf[i].st_value,
-+		   isymbuf[i].st_value + frag->offset_adjust);
-+	      isymbuf[i].st_value += frag->offset_adjust;
-+	    }
-+	}
-+
-+      release_local_syms(abfd, isymbuf);
-+    }
-+
-+  htab->symbols_adjusted = TRUE;
-+  return TRUE;
-+}
-+
-+static bfd_boolean
-+adjust_relocs(bfd *abfd, asection *sec, struct bfd_link_info *info)
-+{
-+  struct avr32_relax_data *rd;
-+  Elf_Internal_Rela *relocs;
-+  Elf_Internal_Shdr *symtab_hdr;
-+  unsigned int i;
-+  bfd_boolean ret = FALSE;
-+
-+  rd = avr32_relax_data(sec);
-+  if (!rd->reloc_data)
-+    return TRUE;
-+
-+  RDBG("adjust_relocs: %s<%s> (count: %u)\n", abfd->filename, sec->name,
-+       sec->reloc_count);
-+
-+  relocs = retrieve_internal_relocs(abfd, sec, info->keep_memory);
-+  if (!relocs)
-+    return FALSE;
-+
-+  symtab_hdr = &elf_tdata(abfd)->symtab_hdr;
-+
-+  for (i = 0; i < sec->reloc_count; i++)
-+    {
-+      Elf_Internal_Rela *rela = &relocs[i];
-+      struct avr32_reloc_data *r_data = &rd->reloc_data[i];
-+      struct fragment *sym_frag;
-+      unsigned long r_symndx;
-+
-+      if (r_data->add_frag)
-+	{
-+	  r_symndx = ELF_R_SYM(rela->r_info);
-+
-+	  if (r_symndx < symtab_hdr->sh_info)
-+	    sym_frag = elf_tdata(abfd)->local_sym_frag[r_symndx];
-+	  else
-+	    {
-+	      struct elf_link_hash_entry *h;
-+
-+	      h = elf_sym_hashes(abfd)[r_symndx - symtab_hdr->sh_info];
-+
-+	      while (h->root.type == bfd_link_hash_indirect
-+		     || h->root.type == bfd_link_hash_warning)
-+		h = (struct elf_link_hash_entry *)h->root.u.i.link;
-+
-+	      BFD_ASSERT(h->root.type == bfd_link_hash_defined
-+			 || h->root.type == bfd_link_hash_defweak);
-+
-+	      sym_frag = ((struct elf_avr32_link_hash_entry *)h)->sym_frag;
-+	    }
-+
-+	  RDBG("    addend: 0x%08lx -> 0x%08lx\n",
-+	       rela->r_addend,
-+	       rela->r_addend + r_data->add_frag->offset_adjust
-+	       - (sym_frag ? sym_frag->offset_adjust : 0));
-+
-+	  /* If this is against a section symbol, we won't find any
-+	     sym_frag, so we'll just adjust the addend.  */
-+	  rela->r_addend += r_data->add_frag->offset_adjust;
-+	  if (sym_frag)
-+	    rela->r_addend -= sym_frag->offset_adjust;
-+
-+	  if (r_data->sub_frag)
-+	    {
-+	      bfd_byte *contents;
-+	      bfd_signed_vma diff;
-+
-+	      contents = retrieve_contents(abfd, sec, info->keep_memory);
-+	      if (!contents)
-+		goto out;
-+
-+	      /* I realize now that sub_frag is misnamed.  It's
-+		 actually add_frag which is subtracted in this
-+		 case...  */
-+	      diff = bfd_get_signed_32(abfd, contents + rela->r_offset);
-+	      diff += (r_data->sub_frag->offset_adjust
-+		       - r_data->add_frag->offset_adjust);
-+	      bfd_put_32(abfd, diff, contents + rela->r_offset);
-+
-+	      RDBG("   0x%lx: DIFF32 updated: 0x%lx\n", rela->r_offset, diff);
-+
-+	      release_contents(sec, contents);
-+	    }
-+	}
-+      else
-+	BFD_ASSERT(!r_data->sub_frag);
-+    }
-+
-+  ret = TRUE;
-+
-+ out:
-+  release_internal_relocs(sec, relocs);
-+  return ret;
-+}
-+
-+static bfd_boolean
-+avr32_move_data(bfd *abfd, asection *sec, struct bfd_link_info *info)
-+{
-+  struct elf_avr32_link_hash_table *htab;
-+  struct avr32_relax_data *rd;
-+  struct fragment *frag, *fragend;
-+  Elf_Internal_Rela *relocs = NULL;
-+  bfd_byte *contents = NULL;
-+  unsigned int i;
-+  bfd_boolean ret = FALSE;
-+
-+  htab = avr32_elf_hash_table(info);
-+  rd = avr32_relax_data(sec);
-+
-+  if (!htab->symbols_adjusted)
-+    if (!adjust_syms(info))
-+      return FALSE;
-+
-+  if (rd->is_relaxable)
-+    {
-+      /* Resize the section first, so that we can be sure that enough
-+	 memory is allocated in case the section has grown.  */
-+      if (sec->size > sec->rawsize
-+	  && elf_section_data(sec)->this_hdr.contents)
-+	{
-+	  /* We must not use cached data if the section has grown.  */
-+	  free(elf_section_data(sec)->this_hdr.contents);
-+	  elf_section_data(sec)->this_hdr.contents = NULL;
-+	}
-+
-+      relocs = retrieve_internal_relocs(abfd, sec, info->keep_memory);
-+      if (!relocs)
-+	goto out;
-+      contents = retrieve_contents(abfd, sec, info->keep_memory);
-+      if (!contents)
-+	goto out;
-+
-+      fragend = rd->frag + rd->frag_count;
-+
-+      RDBG("move_data: %s<%s>: relocs=%p, contents=%p\n",
-+	   abfd->filename, sec->name, relocs, contents);
-+
-+      /* First, move the data into place. We must take care to move
-+	 frags in the right order so that we don't accidentally
-+	 overwrite parts of the next frag.  */
-+      for (frag = rd->frag; frag < fragend; frag++)
-+	{
-+	  RDBG("    0x%08lx%c0x%x: size 0x%lx%c0x%x\n",
-+	       frag->offset, frag->offset_adjust >= 0 ? '+' : '-',
-+	       abs(frag->offset_adjust),
-+	       frag->size, frag->size_adjust >= 0 ? '+' : '-',
-+	       abs(frag->size_adjust));
-+	  if (frag->offset_adjust > 0)
-+	    {
-+	      struct fragment *prev = frag - 1;
-+	      struct fragment *last;
-+
-+	      for (last = frag; last < fragend && last->offset_adjust > 0;
-+		   last++) ;
-+
-+	      if (last == fragend)
-+		last--;
-+
-+	      for (frag = last; frag != prev; frag--)
-+		{
-+		  if (frag->offset_adjust
-+		      && frag->size + frag->size_adjust > 0)
-+		    {
-+		      RDBG("memmove 0x%lx -> 0x%lx (size %lu)\n",
-+			   frag->offset, frag->offset + frag->offset_adjust,
-+			   frag->size + frag->size_adjust);
-+		      memmove(contents + frag->offset + frag->offset_adjust,
-+			      contents + frag->offset,
-+			      frag->size + frag->size_adjust);
-+		    }
-+		}
-+	      frag = last;
-+	    }
-+	  else if (frag->offset_adjust && frag->size + frag->size_adjust > 0)
-+	    {
-+	      RDBG("memmove 0x%lx -> 0x%lx (size %lu)\n",
-+		   frag->offset, frag->offset + frag->offset_adjust,
-+		   frag->size + frag->size_adjust);
-+	      memmove(contents + frag->offset + frag->offset_adjust,
-+		      contents + frag->offset,
-+		      frag->size + frag->size_adjust);
-+	    }
-+	}
-+
-+      i = 0;
-+
-+      for (frag = rd->frag; frag < fragend; frag++)
-+	{
-+	  const struct relax_state *state, *istate;
-+	  struct avr32_reloc_data *r_data = NULL;
-+
-+	  istate = &relax_state[frag->initial_state];
-+	  state = &relax_state[frag->state];
-+
-+	  if (rd->reloc_data)
-+	    r_data = &rd->reloc_data[frag->rela - relocs];
-+
-+	  BFD_ASSERT((long)(frag->size + frag->size_adjust) >= 0);
-+	  BFD_ASSERT(state->reftype != REF_CPOOL
-+		     || r_data->add_frag->refcount > 0);
-+
-+	  if (istate->reftype == REF_CPOOL && state->reftype != REF_CPOOL)
-+	    {
-+	      struct fragment *ifrag;
-+
-+	      /* An indirect reference through the cpool has been
-+		 converted to a direct reference.  We must update the
-+		 reloc to point to the symbol itself instead of the
-+		 constant pool entry.  The reloc type will be updated
-+		 later.  */
-+	      ifrag = r_data->add_frag;
-+	      frag->rela->r_info = ifrag->rela->r_info;
-+	      frag->rela->r_addend = ifrag->rela->r_addend;
-+
-+	      /* Copy the reloc data so the addend will be adjusted
-+		 correctly later.  */
-+	      *r_data = rd->reloc_data[ifrag->rela - relocs];
-+	    }
-+
-+	  /* Move all relocs covered by this frag.  */
-+	  if (frag->rela)
-+	    BFD_ASSERT(&relocs[i] <= frag->rela);
-+	  else
-+	    BFD_ASSERT((frag + 1) == fragend && frag->state == RS_NONE);
-+
-+	  if (frag == rd->frag)
-+	    BFD_ASSERT(i == 0);
-+	  else
-+	    BFD_ASSERT(&relocs[i] > frag[-1].rela);
-+
-+	  /* If non-null, frag->rela is the last relocation in the
-+	     fragment.  frag->rela can only be null in the last
-+	     fragment, so in that case, we'll just do the rest.  */
-+	  for (; (i < sec->reloc_count
-+		  && (!frag->rela || &relocs[i] <= frag->rela)); i++)
-+	    {
-+	      RDBG("[%4u] r_offset 0x%08lx -> 0x%08lx\n", i, relocs[i].r_offset,
-+		   relocs[i].r_offset + frag->offset_adjust);
-+	      relocs[i].r_offset += frag->offset_adjust;
-+	    }
-+
-+	  if (frag->refcount == 0)
-+	    {
-+	      /* If this frag is to be discarded, make sure we won't
-+		 relocate it later on.  */
-+	      BFD_ASSERT(frag->state == RS_CPENT);
-+	      frag->rela->r_info = ELF_R_INFO(ELF_R_SYM(frag->rela->r_info),
-+					    R_AVR32_NONE);
-+	    }
-+	  else if (frag->state == RS_ALIGN)
-+	    {
-+	      bfd_vma addr, addr_end;
-+
-+	      addr = frag->rela->r_offset;
-+	      addr_end = (frag->offset + frag->offset_adjust
-+			  + frag->size + frag->size_adjust);
-+
-+	      /* If the section is executable, insert NOPs.
-+		 Otherwise, insert zeroes.  */
-+	      if (sec->flags & SEC_CODE)
-+		{
-+		  if (addr & 1)
-+		    {
-+		      bfd_put_8(abfd, 0, contents + addr);
-+		      addr++;
-+		    }
-+
-+		  BFD_ASSERT(!((addr_end - addr) & 1));
-+
-+		  while (addr < addr_end)
-+		    {
-+		      bfd_put_16(abfd, NOP_OPCODE, contents + addr);
-+		      addr += 2;
-+		    }
-+		}
-+	      else
-+		memset(contents + addr, 0, addr_end - addr);
-+	    }
-+	  else if (state->opcode_mask)
-+	    {
-+	      bfd_vma insn;
-+
-+	      /* Update the opcode and the relocation type unless it's a
-+		 "special" relax state (i.e. RS_NONE, RS_ALIGN or
-+		 RS_CPENT.), in which case the opcode mask is zero.  */
-+	      insn = bfd_get_32(abfd, contents + frag->rela->r_offset);
-+	      insn &= ~state->opcode_mask;
-+	      insn |= state->opcode;
-+	      RDBG("    0x%lx: inserting insn %08lx\n",
-+		   frag->rela->r_offset, insn);
-+	      bfd_put_32(abfd, insn, contents + frag->rela->r_offset);
-+
-+	      frag->rela->r_info = ELF_R_INFO(ELF_R_SYM(frag->rela->r_info),
-+					      state->r_type);
-+	    }
-+
-+	  if ((frag + 1) == fragend)
-+	    BFD_ASSERT((frag->offset + frag->size + frag->offset_adjust
-+			+ frag->size_adjust) == sec->size);
-+	  else
-+	    BFD_ASSERT((frag->offset + frag->size + frag->offset_adjust
-+			+ frag->size_adjust)
-+		       == (frag[1].offset + frag[1].offset_adjust));
-+	}
-+    }
-+
-+  /* Adjust reloc addends and DIFF32 differences */
-+  if (!adjust_relocs(abfd, sec, info))
-+    return FALSE;
-+
-+  ret = TRUE;
-+
-+ out:
-+  release_contents(sec, contents);
-+  release_internal_relocs(sec, relocs);
-+  return ret;
-+}
-+
-+static bfd_boolean
-+avr32_elf_relax_section(bfd *abfd, asection *sec,
-+			struct bfd_link_info *info, bfd_boolean *again)
-+{
-+  struct elf_avr32_link_hash_table *htab;
-+  struct avr32_relax_data *rd;
-+
-+  *again = FALSE;
-+  if (info->relocatable)
-+    return TRUE;
-+
-+  htab = avr32_elf_hash_table(info);
-+  if ((!(sec->flags & SEC_RELOC) || sec->reloc_count == 0)
-+      && sec != htab->sgot)
-+    return TRUE;
-+
-+  if (!htab->relocations_analyzed)
-+    {
-+      if (!analyze_relocations(info))
-+	return FALSE;
-+      htab->relocations_analyzed = TRUE;
-+    }
-+
-+  rd = avr32_relax_data(sec);
-+
-+  if (rd->iteration != htab->relax_iteration)
-+    {
-+      if (!htab->repeat_pass)
-+	htab->relax_pass++;
-+      htab->relax_iteration++;
-+      htab->repeat_pass = FALSE;
-+    }
-+
-+  rd->iteration++;
-+
-+  switch (htab->relax_pass)
-+    {
-+    case RELAX_PASS_SIZE_FRAGS:
-+      if (!avr32_size_frags(abfd, sec, info))
-+	return FALSE;
-+      *again = TRUE;
-+      break;
-+    case RELAX_PASS_MOVE_DATA:
-+      if (!avr32_move_data(abfd, sec, info))
-+	return FALSE;
-+      break;
-+  }
-+
-+  return TRUE;
-+}
-+
-+
-+/* Relocation */
-+
-+static bfd_reloc_status_type
-+avr32_check_reloc_value(asection *sec, Elf_Internal_Rela *rela,
-+			bfd_signed_vma relocation, reloc_howto_type *howto);
-+static bfd_reloc_status_type
-+avr32_final_link_relocate(reloc_howto_type *howto, bfd *input_bfd,
-+			  asection *input_section, bfd_byte *contents,
-+			  Elf_Internal_Rela *rel, bfd_vma value);
-+static bfd_boolean
-+avr32_elf_relocate_section(bfd *output_bfd, struct bfd_link_info *info,
-+			   bfd *input_bfd, asection *input_section,
-+			   bfd_byte *contents, Elf_Internal_Rela *relocs,
-+			   Elf_Internal_Sym *local_syms,
-+			   asection **local_sections);
-+
-+
-+#define symbol_address(symbol) \
-+  symbol->value + symbol->section->output_section->vma \
-+  + symbol->section->output_offset
-+
-+#define avr32_elf_insert_field(size, field, abfd, reloc_entry, data)	\
-+  do									\
-+    {									\
-+      unsigned long x;							\
-+      x = bfd_get_##size (abfd, data + reloc_entry->address);		\
-+      x &= ~reloc_entry->howto->dst_mask;				\
-+      x |= field & reloc_entry->howto->dst_mask;			\
-+      bfd_put_##size (abfd, (bfd_vma) x, data + reloc_entry->address);	\
-+    }									\
-+  while(0)
-+
-+static bfd_reloc_status_type
-+avr32_check_reloc_value(asection *sec ATTRIBUTE_UNUSED,
-+			Elf_Internal_Rela *rela ATTRIBUTE_UNUSED,
-+			bfd_signed_vma relocation,
-+			reloc_howto_type *howto)
-+{
-+  bfd_vma reloc_u;
-+
-+  /* We take "complain_overflow_dont" to mean "don't complain on
-+     alignment either". This way, we don't have to special-case
-+     R_AVR32_HI16 */
-+  if (howto->complain_on_overflow == complain_overflow_dont)
-+    return bfd_reloc_ok;
-+
-+  /* Check if the value is correctly aligned */
-+  if (relocation & ((1 << howto->rightshift) - 1))
-+    {
-+      RDBG("misaligned: %s<%s+%lx>: %s: 0x%lx (align %u)\n",
-+	   sec->owner->filename, sec->name, rela->r_offset,
-+	   howto->name, relocation, howto->rightshift);
-+      return bfd_reloc_overflow;
-+    }
-+
-+  /* Now, get rid of the unnecessary bits */
-+  relocation >>= howto->rightshift;
-+  reloc_u = (bfd_vma)relocation;
-+
-+  switch (howto->complain_on_overflow)
-+    {
-+    case complain_overflow_unsigned:
-+    case complain_overflow_bitfield:
-+      if (reloc_u > (unsigned long)((1 << howto->bitsize) - 1))
-+	{
-+	  RDBG("unsigned overflow: %s<%s+%lx>: %s: 0x%lx (size %u)\n",
-+	       sec->owner->filename, sec->name, rela->r_offset,
-+	       howto->name, reloc_u, howto->bitsize);
-+	  RDBG("reloc vma: 0x%lx\n",
-+	       sec->output_section->vma + sec->output_offset + rela->r_offset);
-+
-+	  return bfd_reloc_overflow;
-+	}
-+      break;
-+    case complain_overflow_signed:
-+      if (relocation > (1 << (howto->bitsize - 1)) - 1)
-+	{
-+	  RDBG("signed overflow: %s<%s+%lx>: %s: 0x%lx (size %u)\n",
-+	       sec->owner->filename, sec->name, rela->r_offset,
-+	       howto->name, reloc_u, howto->bitsize);
-+	  RDBG("reloc vma: 0x%lx\n",
-+	       sec->output_section->vma + sec->output_offset + rela->r_offset);
-+
-+	  return bfd_reloc_overflow;
-+	}
-+      if (relocation < -(1 << (howto->bitsize - 1)))
-+	{
-+	  RDBG("signed overflow: %s<%s+%lx>: %s: -0x%lx (size %u)\n",
-+	       sec->owner->filename, sec->name, rela->r_offset,
-+	       howto->name, -relocation, howto->bitsize);
-+	  RDBG("reloc vma: 0x%lx\n",
-+	       sec->output_section->vma + sec->output_offset + rela->r_offset);
-+
-+	  return bfd_reloc_overflow;
-+	}
-+      break;
-+    default:
-+      abort();
-+    }
-+
-+  return bfd_reloc_ok;
-+}
-+
-+
-+static bfd_reloc_status_type
-+avr32_final_link_relocate(reloc_howto_type *howto,
-+			  bfd *input_bfd,
-+			  asection *input_section,
-+			  bfd_byte *contents,
-+			  Elf_Internal_Rela *rel,
-+			  bfd_vma value)
-+{
-+  bfd_vma field;
-+  bfd_vma relocation;
-+  bfd_reloc_status_type status;
-+  bfd_byte *p = contents + rel->r_offset;
-+  unsigned long x;
-+
-+  pr_debug("  (6b) final link relocate\n");
-+
-+  /* Sanity check the address */
-+  if (rel->r_offset > input_section->size)
-+    {
-+      (*_bfd_error_handler)
-+	("%B: %A+0x%lx: offset out of range (section size: 0x%lx)",
-+	 input_bfd, input_section, rel->r_offset, input_section->size);
-+      return bfd_reloc_outofrange;
-+    }
-+
-+  relocation = value + rel->r_addend;
-+
-+  if (howto->pc_relative)
-+    {
-+      bfd_vma addr;
-+
-+      addr = input_section->output_section->vma
-+	+ input_section->output_offset + rel->r_offset;
-+      addr &= ~0UL << howto->rightshift;
-+      relocation -= addr;
-+    }
-+
-+  switch (ELF32_R_TYPE(rel->r_info))
-+    {
-+    case R_AVR32_16N_PCREL:
-+      /* sub reg, pc, . - (sym + addend) */
-+      relocation = -relocation;
-+      break;
-+    }
-+
-+  status = avr32_check_reloc_value(input_section, rel, relocation, howto);
-+
-+  relocation >>= howto->rightshift;
-+  if (howto->bitsize == 21)
-+    field = (relocation & 0xffff)
-+      | ((relocation & 0x10000) << 4)
-+      | ((relocation & 0x1e0000) << 8);
-+  else if (howto->bitsize == 12)
-+    field = (relocation & 0xff) | ((relocation & 0xf00) << 4);
-+  else if (howto->bitsize == 10)
-+    field = ((relocation & 0xff) << 4)
-+      | ((relocation & 0x300) >> 8);
-+  else
-+    field = relocation << howto->bitpos;
-+
-+  switch (howto->size)
-+    {
-+    case 0:
-+      x = bfd_get_8 (input_bfd, p);
-+      x &= ~howto->dst_mask;
-+      x |= field & howto->dst_mask;
-+      bfd_put_8 (input_bfd, (bfd_vma) x, p);
-+      break;
-+    case 1:
-+      x = bfd_get_16 (input_bfd, p);
-+      x &= ~howto->dst_mask;
-+      x |= field & howto->dst_mask;
-+      bfd_put_16 (input_bfd, (bfd_vma) x, p);
-+      break;
-+    case 2:
-+      x = bfd_get_32 (input_bfd, p);
-+      x &= ~howto->dst_mask;
-+      x |= field & howto->dst_mask;
-+      bfd_put_32 (input_bfd, (bfd_vma) x, p);
-+      break;
-+    default:
-+      abort();
-+    }
-+
-+  return status;
-+}
-+
-+/* (6) Apply relocations to the normal (non-dynamic) sections */
-+
-+static bfd_boolean
-+avr32_elf_relocate_section(bfd *output_bfd, struct bfd_link_info *info,
-+			   bfd *input_bfd, asection *input_section,
-+			   bfd_byte *contents, Elf_Internal_Rela *relocs,
-+			   Elf_Internal_Sym *local_syms,
-+			   asection **local_sections)
-+{
-+  struct elf_avr32_link_hash_table *htab;
-+  Elf_Internal_Shdr *symtab_hdr;
-+  Elf_Internal_Rela *rel, *relend;
-+  struct elf_link_hash_entry **sym_hashes;
-+  struct got_entry **local_got_ents;
-+  asection *sgot;
-+  asection *srelgot;
-+
-+  pr_debug("(6) relocate section %s:<%s> (size 0x%lx)\n",
-+	   input_bfd->filename, input_section->name, input_section->size);
-+
-+  /* If we're doing a partial link, we don't have to do anything since
-+     we're using RELA relocations */
-+  if (info->relocatable)
-+    return TRUE;
-+
-+  htab = avr32_elf_hash_table(info);
-+  symtab_hdr = &elf_tdata(input_bfd)->symtab_hdr;
-+  sym_hashes = elf_sym_hashes(input_bfd);
-+  local_got_ents = elf_local_got_ents(input_bfd);
-+  sgot = htab->sgot;
-+  srelgot = htab->srelgot;
-+
-+  relend = relocs + input_section->reloc_count;
-+  for (rel = relocs; rel < relend; rel++)
-+    {
-+      unsigned long r_type, r_symndx;
-+      reloc_howto_type *howto;
-+      Elf_Internal_Sym *sym = NULL;
-+      struct elf_link_hash_entry *h = NULL;
-+      asection *sec = NULL;
-+      bfd_vma value;
-+      bfd_vma offset;
-+      bfd_reloc_status_type status;
-+
-+      r_type = ELF32_R_TYPE(rel->r_info);
-+      r_symndx = ELF32_R_SYM(rel->r_info);
-+
-+      if (r_type == R_AVR32_NONE
-+	  || r_type == R_AVR32_ALIGN
-+	  || r_type == R_AVR32_DIFF32
-+	  || r_type == R_AVR32_DIFF16
-+	  || r_type == R_AVR32_DIFF8)
-+	continue;
-+
-+      /* Sanity check */
-+      if (r_type > R_AVR32_max)
-+	{
-+	  bfd_set_error(bfd_error_bad_value);
-+	  return FALSE;
-+	}
-+
-+      howto = &elf_avr32_howto_table[r_type];
-+
-+      if (r_symndx < symtab_hdr->sh_info)
-+	{
-+	  sym = local_syms + r_symndx;
-+	  sec = local_sections[r_symndx];
-+
-+	  pr_debug("  (6a) processing %s against local symbol %lu\n",
-+		   howto->name, r_symndx);
-+
-+	  /* The following function changes rel->r_addend behind our back. */
-+	  value = _bfd_elf_rela_local_sym(output_bfd, sym, &sec, rel);
-+	  pr_debug("    => value: %lx, addend: %lx\n", value, rel->r_addend);
-+	}
-+      else
-+	{
-+	  if (sym_hashes == NULL)
-+	    return FALSE;
-+
-+	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
-+	  while (h->root.type == bfd_link_hash_indirect
-+		 || h->root.type == bfd_link_hash_warning)
-+	    h = (struct elf_link_hash_entry *)h->root.u.i.link;
-+
-+	  pr_debug("  (6a) processing %s against symbol %s\n",
-+		   howto->name, h->root.root.string);
-+
-+	  if (h->root.type == bfd_link_hash_defined
-+	      || h->root.type == bfd_link_hash_defweak)
-+	    {
-+	      bfd_boolean dyn;
-+
-+	      dyn = htab->root.dynamic_sections_created;
-+	      sec = h->root.u.def.section;
-+
-+	      if (sec->output_section)
-+		value = (h->root.u.def.value
-+			 + sec->output_section->vma
-+			 + sec->output_offset);
-+	      else
-+		value = h->root.u.def.value;
-+	    }
-+	  else if (h->root.type == bfd_link_hash_undefweak)
-+	    value = 0;
-+	  else if (info->unresolved_syms_in_objects == RM_IGNORE
-+		   && ELF_ST_VISIBILITY(h->other) == STV_DEFAULT)
-+	    value = 0;
-+	  else
-+	    {
-+	      bfd_boolean err;
-+	      err = (info->unresolved_syms_in_objects == RM_GENERATE_ERROR
-+		     || ELF_ST_VISIBILITY(h->other) != STV_DEFAULT);
-+	      if (!info->callbacks->undefined_symbol
-+		  (info, h->root.root.string, input_bfd,
-+		   input_section, rel->r_offset, err))
-+		return FALSE;
-+	      value = 0;
-+	    }
-+
-+	  pr_debug("    => value: %lx, addend: %lx\n", value, rel->r_addend);
-+	}
-+
-+      switch (r_type)
-+	{
-+	case R_AVR32_GOT32:
-+	case R_AVR32_GOT16:
-+	case R_AVR32_GOT8:
-+	case R_AVR32_GOT21S:
-+	case R_AVR32_GOT18SW:
-+	case R_AVR32_GOT16S:
-+	case R_AVR32_GOT7UW:
-+	case R_AVR32_LDA_GOT:
-+	case R_AVR32_GOTCALL:
-+	  BFD_ASSERT(sgot != NULL);
-+
-+	  if (h != NULL)
-+	    {
-+	      BFD_ASSERT(h->got.glist->refcount > 0);
-+	      offset = h->got.glist->offset;
-+
-+	      BFD_ASSERT(offset < sgot->size);
-+	      if (!elf_hash_table(info)->dynamic_sections_created
-+		  || (h->def_regular
-+		      && (!info->shared
-+			  || info->symbolic
-+			  || h->dynindx == -1)))
-+		{
-+		  /* This is actually a static link, or it is a
-+		     -Bsymbolic link and the symbol is defined
-+		     locally, or the symbol was forced to be local.  */
-+		  bfd_put_32(output_bfd, value, sgot->contents + offset);
-+		}
-+	    }
-+	  else
-+	    {
-+	      BFD_ASSERT(local_got_ents &&
-+			 local_got_ents[r_symndx]->refcount > 0);
-+	      offset = local_got_ents[r_symndx]->offset;
-+
-+	      /* Local GOT entries don't have relocs.  If this is a
-+		 shared library, the dynamic linker will add the load
-+		 address to the initial value at startup.  */
-+	      BFD_ASSERT(offset < sgot->size);
-+	      pr_debug("Initializing GOT entry at offset %lu: 0x%lx\n",
-+		       offset, value);
-+	      bfd_put_32 (output_bfd, value, sgot->contents + offset);
-+	    }
-+
-+	  value = sgot->output_offset + offset;
-+	  pr_debug("GOT reference: New value %lx\n", value);
-+	  break;
-+
-+	case R_AVR32_GOTPC:
-+	  /* This relocation type is for constant pool entries used in
-+	     the calculation "Rd = PC - (PC - GOT)", where the
-+	     constant pool supplies the constant (PC - GOT)
-+	     offset. The symbol value + addend indicates where the
-+	     value of PC is taken. */
-+	  value -= sgot->output_section->vma;
-+	  break;
-+
-+	case R_AVR32_32_PCREL:
-+	  /* We must adjust r_offset to account for discarded data in
-+	     the .eh_frame section.  This is probably not the right
-+	     way to do this, since AFAICS all other architectures do
-+	     it some other way.  I just can't figure out how...  */
-+	  {
-+	    bfd_vma r_offset;
-+
-+	    r_offset = _bfd_elf_section_offset(output_bfd, info,
-+					       input_section,
-+					       rel->r_offset);
-+	    if (r_offset == (bfd_vma)-1
-+		|| r_offset == (bfd_vma)-2)
-+	      continue;
-+	    rel->r_offset = r_offset;
-+	  }
-+	  break;
-+
-+	case R_AVR32_32:
-+	  /* We need to emit a run-time relocation in the following cases:
-+	       - we're creating a shared library
-+	       - the symbol is not defined in any regular objects
-+
-+	     Of course, sections that aren't going to be part of the
-+	     run-time image will not get any relocs, and undefined
-+	     symbols won't have any either (only weak undefined
-+	     symbols should get this far).  */
-+	  if ((info->shared
-+	       || (elf_hash_table(info)->dynamic_sections_created
-+		   && h != NULL
-+		   && h->def_dynamic
-+		   && !h->def_regular))
-+	      && r_symndx != 0
-+	      && (input_section->flags & SEC_ALLOC))
-+	    {
-+	      Elf_Internal_Rela outrel;
-+	      bfd_byte *loc;
-+	      bfd_boolean skip, relocate;
-+	      struct elf_avr32_link_hash_entry *avrh;
-+
-+	      pr_debug("Going to generate dynamic reloc...\n");
-+
-+	      skip = FALSE;
-+	      relocate = FALSE;
-+
-+	      outrel.r_offset = _bfd_elf_section_offset(output_bfd, info,
-+							input_section,
-+							rel->r_offset);
-+	      if (outrel.r_offset == (bfd_vma)-1)
-+		skip = TRUE;
-+	      else if (outrel.r_offset == (bfd_vma)-2)
-+		skip = TRUE, relocate = TRUE;
-+
-+	      outrel.r_offset += (input_section->output_section->vma
-+				  + input_section->output_offset);
-+
-+	      pr_debug("    ... offset %lx, dynindx %ld\n",
-+		       outrel.r_offset, h ? h->dynindx : -1);
-+
-+	      if (skip)
-+		memset(&outrel, 0, sizeof(outrel));
-+	      else
-+		{
-+		  avrh = (struct elf_avr32_link_hash_entry *)h;
-+		  /* h->dynindx may be -1 if this symbol was marked to
-+		     become local.  */
-+		  if (h == NULL
-+		      || ((info->symbolic || h->dynindx == -1)
-+			  && h->def_regular))
-+		    {
-+		      relocate = TRUE;
-+		      outrel.r_info = ELF32_R_INFO(0, R_AVR32_RELATIVE);
-+		      outrel.r_addend = value + rel->r_addend;
-+		      pr_debug("    ... R_AVR32_RELATIVE\n");
-+		    }
-+		  else
-+		    {
-+		      BFD_ASSERT(h->dynindx != -1);
-+		      relocate = TRUE;
-+		      outrel.r_info = ELF32_R_INFO(h->dynindx, R_AVR32_GLOB_DAT);
-+		      outrel.r_addend = rel->r_addend;
-+		      pr_debug("    ... R_AVR32_GLOB_DAT\n");
-+		    }
-+		}
-+
-+	      pr_debug("srelgot reloc_count: %d, size %lu\n",
-+		       srelgot->reloc_count, srelgot->size);
-+
-+	      loc = srelgot->contents;
-+	      loc += srelgot->reloc_count++ * sizeof(Elf32_External_Rela);
-+	      bfd_elf32_swap_reloca_out(output_bfd, &outrel, loc);
-+
-+	      BFD_ASSERT(srelgot->reloc_count * sizeof(Elf32_External_Rela)
-+			 <= srelgot->size);
-+
-+	      if (!relocate)
-+		continue;
-+	    }
-+	  break;
-+	}
-+
-+      status = avr32_final_link_relocate(howto, input_bfd, input_section,
-+					 contents, rel, value);
-+
-+      switch (status)
-+	{
-+	case bfd_reloc_ok:
-+	  break;
-+
-+	case bfd_reloc_overflow:
-+	  {
-+	    const char *name;
-+
-+	    if (h != NULL)
-+	      name = h->root.root.string;
-+	    else
-+	      {
-+		name = bfd_elf_string_from_elf_section(input_bfd,
-+						       symtab_hdr->sh_link,
-+						       sym->st_name);
-+		if (name == NULL)
-+		  return FALSE;
-+		if (*name == '\0')
-+		  name = bfd_section_name(input_bfd, sec);
-+	      }
-+	    if (!((*info->callbacks->reloc_overflow)
-+		  (info, (h ? &h->root : NULL), name, howto->name,
-+		   rel->r_addend, input_bfd, input_section, rel->r_offset)))
-+	      return FALSE;
-+	  }
-+	  break;
-+
-+	case bfd_reloc_outofrange:
-+	default:
-+	  abort();
-+	}
-+    }
-+
-+  return TRUE;
-+}
-+
-+
-+/* Additional processing of dynamic sections after relocation */
-+
-+static bfd_boolean
-+avr32_elf_finish_dynamic_symbol(bfd *output_bfd, struct bfd_link_info *info,
-+				struct elf_link_hash_entry *h,
-+				Elf_Internal_Sym *sym);
-+static bfd_boolean
-+avr32_elf_finish_dynamic_sections(bfd *output_bfd, struct bfd_link_info *info);
-+
-+
-+/* (7) Initialize the contents of a dynamic symbol and/or emit
-+   relocations for it */
-+
-+static bfd_boolean
-+avr32_elf_finish_dynamic_symbol(bfd *output_bfd, struct bfd_link_info *info,
-+				struct elf_link_hash_entry *h,
-+				Elf_Internal_Sym *sym)
-+{
-+  struct elf_avr32_link_hash_table *htab;
-+  struct got_entry *got;
-+
-+  pr_debug("(7) finish dynamic symbol: %s\n", h->root.root.string);
-+
-+  htab = avr32_elf_hash_table(info);
-+  got = h->got.glist;
-+
-+  if (got && got->refcount > 0)
-+    {
-+      asection *sgot;
-+      asection *srelgot;
-+      Elf_Internal_Rela rel;
-+      bfd_byte *loc;
-+
-+      /* This symbol has an entry in the GOT. Set it up. */
-+      sgot = htab->sgot;
-+      srelgot = htab->srelgot;
-+      BFD_ASSERT(sgot && srelgot);
-+
-+      rel.r_offset = (sgot->output_section->vma
-+		      + sgot->output_offset
-+		      + got->offset);
-+
-+      /* If this is a static link, or it is a -Bsymbolic link and the
-+	 symbol is defined locally or was forced to be local because
-+	 of a version file, we just want to emit a RELATIVE reloc. The
-+	 entry in the global offset table will already have been
-+	 initialized in the relocate_section function. */
-+      if ((info->shared
-+	   && !info->symbolic
-+	   && h->dynindx != -1)
-+	  || (htab->root.dynamic_sections_created
-+	      && h->def_dynamic
-+	      && !h->def_regular))
-+	{
-+	  bfd_put_32(output_bfd, 0, sgot->contents + got->offset);
-+	  rel.r_info = ELF32_R_INFO(h->dynindx, R_AVR32_GLOB_DAT);
-+	  rel.r_addend = 0;
-+
-+	  pr_debug("GOT reloc R_AVR32_GLOB_DAT, dynindx: %ld\n", h->dynindx);
-+	  pr_debug("    srelgot reloc_count: %d, size: %lu\n",
-+		   srelgot->reloc_count, srelgot->size);
-+
-+	  loc = (srelgot->contents
-+		 + srelgot->reloc_count++ * sizeof(Elf32_External_Rela));
-+	  bfd_elf32_swap_reloca_out(output_bfd, &rel, loc);
-+
-+	  BFD_ASSERT(srelgot->reloc_count * sizeof(Elf32_External_Rela)
-+		     <= srelgot->size);
-+	}
-+    }
-+
-+  /* Mark _DYNAMIC and _GLOBAL_OFFSET_TABLE_ as absolute */
-+  if (strcmp(h->root.root.string, "_DYNAMIC") == 0
-+      || strcmp(h->root.root.string, "_GLOBAL_OFFSET_TABLE_") == 0)
-+    sym->st_shndx = SHN_ABS;
-+
-+  return TRUE;
-+}
-+
-+/* (8) Do any remaining initialization of the dynamic sections */
-+
-+static bfd_boolean
-+avr32_elf_finish_dynamic_sections(bfd *output_bfd, struct bfd_link_info *info)
-+{
-+  struct elf_avr32_link_hash_table *htab;
-+  asection *sgot, *sdyn;
-+
-+  pr_debug("(8) finish dynamic sections\n");
-+
-+  htab = avr32_elf_hash_table(info);
-+  sgot = htab->sgot;
-+  sdyn = bfd_get_section_by_name(htab->root.dynobj, ".dynamic");
-+
-+  if (htab->root.dynamic_sections_created)
-+    {
-+      Elf32_External_Dyn *dyncon, *dynconend;
-+
-+      BFD_ASSERT(sdyn && sgot && sgot->size >= AVR32_GOT_HEADER_SIZE);
-+
-+      dyncon = (Elf32_External_Dyn *)sdyn->contents;
-+      dynconend = (Elf32_External_Dyn *)(sdyn->contents + sdyn->size);
-+      for (; dyncon < dynconend; dyncon++)
-+	{
-+	  Elf_Internal_Dyn dyn;
-+	  asection *s;
-+
-+	  bfd_elf32_swap_dyn_in(htab->root.dynobj, dyncon, &dyn);
-+
-+	  switch (dyn.d_tag)
-+	    {
-+	    default:
-+	      break;
-+
-+	    case DT_PLTGOT:
-+	      s = sgot->output_section;
-+	      BFD_ASSERT(s != NULL);
-+	      dyn.d_un.d_ptr = s->vma;
-+	      bfd_elf32_swap_dyn_out(output_bfd, &dyn, dyncon);
-+	      break;
-+
-+	    case DT_AVR32_GOTSZ:
-+	      s = sgot->output_section;
-+	      BFD_ASSERT(s != NULL);
-+	      dyn.d_un.d_val = s->size;
-+	      bfd_elf32_swap_dyn_out(output_bfd, &dyn, dyncon);
-+	      break;
-+	    }
-+	}
-+
-+      /* Fill in the first two entries in the global offset table */
-+      bfd_put_32(output_bfd,
-+		 sdyn->output_section->vma + sdyn->output_offset,
-+		 sgot->contents);
-+
-+      /* The runtime linker will fill this one in with the address of
-+	 the run-time link map */
-+      bfd_put_32(output_bfd, 0, sgot->contents + 4);
-+    }
-+
-+  if (sgot)
-+    elf_section_data(sgot->output_section)->this_hdr.sh_entsize = 4;
-+
-+  return TRUE;
-+}
-+
-+
-+/* AVR32-specific private ELF data */
-+
-+static bfd_boolean
-+avr32_elf_set_private_flags(bfd *abfd, flagword flags);
-+static bfd_boolean
-+avr32_elf_copy_private_bfd_data(bfd *ibfd, bfd *obfd);
-+static bfd_boolean
-+avr32_elf_merge_private_bfd_data(bfd *ibfd, bfd *obfd);
-+static bfd_boolean
-+avr32_elf_print_private_bfd_data(bfd *abfd, void *ptr);
-+
-+static bfd_boolean
-+avr32_elf_set_private_flags(bfd *abfd, flagword flags)
-+{
-+  elf_elfheader(abfd)->e_flags = flags;
-+  elf_flags_init(abfd) = TRUE;
-+
-+  return TRUE;
-+}
-+
-+/* Copy backend specific data from one object module to another.  */
-+
-+static bfd_boolean
-+avr32_elf_copy_private_bfd_data(bfd *ibfd, bfd *obfd)
-+{
-+  elf_elfheader(obfd)->e_flags = elf_elfheader(ibfd)->e_flags;
-+  return TRUE;
-+}
-+
-+/* Merge backend specific data from an object file to the output
-+   object file when linking.  */
-+
-+static bfd_boolean
-+avr32_elf_merge_private_bfd_data(bfd *ibfd, bfd *obfd)
-+{
-+  flagword out_flags, in_flags;
-+
-+  pr_debug("(0) merge_private_bfd_data: %s -> %s\n",
-+	   ibfd->filename, obfd->filename);
-+
-+  in_flags = elf_elfheader(ibfd)->e_flags;
-+  out_flags = elf_elfheader(obfd)->e_flags;
-+
-+  if (elf_flags_init(obfd))
-+    {
-+      /* If one of the inputs are non-PIC, the output must be
-+	 considered non-PIC.  The same applies to linkrelax.  */
-+      if (!(in_flags & EF_AVR32_PIC))
-+	out_flags &= ~EF_AVR32_PIC;
-+      if (!(in_flags & EF_AVR32_LINKRELAX))
-+	out_flags &= ~EF_AVR32_LINKRELAX;
-+    }
-+  else
-+    {
-+      elf_flags_init(obfd) = TRUE;
-+      out_flags = in_flags;
-+    }
-+
-+  elf_elfheader(obfd)->e_flags = out_flags;
-+
-+  return TRUE;
-+}
-+
-+static bfd_boolean
-+avr32_elf_print_private_bfd_data(bfd *abfd, void *ptr)
-+{
-+  FILE *file = (FILE *)ptr;
-+  unsigned long flags;
-+
-+  BFD_ASSERT(abfd != NULL && ptr != NULL);
-+
-+  _bfd_elf_print_private_bfd_data(abfd, ptr);
-+
-+  flags = elf_elfheader(abfd)->e_flags;
-+
-+  fprintf(file, _("private flags = %lx:"), elf_elfheader(abfd)->e_flags);
-+
-+  if (flags & EF_AVR32_PIC)
-+    fprintf(file, " [PIC]");
-+  if (flags & EF_AVR32_LINKRELAX)
-+    fprintf(file, " [linker relaxable]");
-+
-+  flags &= ~(EF_AVR32_PIC | EF_AVR32_LINKRELAX);
-+
-+  if (flags)
-+    fprintf(file, _("<Unrecognized flag bits set>"));
-+
-+  fputc('\n', file);
-+
-+  return TRUE;
-+}
-+
-+/* Set avr32-specific linker options.  */
-+void bfd_elf32_avr32_set_options(struct bfd_link_info *info,
-+				 int direct_data_refs)
-+{
-+  struct elf_avr32_link_hash_table *htab;
-+
-+  htab = avr32_elf_hash_table (info);
-+  htab->direct_data_refs = !!direct_data_refs;
-+}
-+
-+
-+
-+/* Understanding core dumps */
-+
-+static bfd_boolean
-+avr32_elf_grok_prstatus(bfd *abfd, Elf_Internal_Note *note);
-+static bfd_boolean
-+avr32_elf_grok_psinfo(bfd *abfd, Elf_Internal_Note *note);
-+
-+static bfd_boolean
-+avr32_elf_grok_prstatus(bfd *abfd, Elf_Internal_Note *note)
-+{
-+  /* Linux/AVR32B elf_prstatus */
-+  if (note->descsz != 148)
-+    return FALSE;
-+
-+  /* pr_cursig */
-+  elf_tdata(abfd)->core_signal = bfd_get_16(abfd, note->descdata + 12);
-+
-+  /* pr_pid */
-+  elf_tdata(abfd)->core_pid = bfd_get_32(abfd, note->descdata + 24);
-+
-+  /* Make a ".reg/999" section for pr_reg. The size is for 16
-+     general-purpose registers, SR and r12_orig (18 * 4 = 72).  */
-+  return _bfd_elfcore_make_pseudosection(abfd, ".reg", 72,
-+					 note->descpos + 72);
-+}
-+
-+static bfd_boolean
-+avr32_elf_grok_psinfo(bfd *abfd, Elf_Internal_Note *note)
-+{
-+  /* Linux/AVR32B elf_prpsinfo */
-+  if (note->descsz != 128)
-+    return FALSE;
-+
-+  elf_tdata(abfd)->core_program
-+    = _bfd_elfcore_strndup(abfd, note->descdata + 32, 16);
-+  elf_tdata(abfd)->core_command
-+    = _bfd_elfcore_strndup(abfd, note->descdata + 48, 80);
-+
-+  /* Note that for some reason, a spurious space is tacked
-+     onto the end of the args in some (at least one anyway)
-+     implementations, so strip it off if it exists.  */
-+
-+  {
-+    char *command = elf_tdata (abfd)->core_command;
-+    int n = strlen (command);
-+
-+    if (0 < n && command[n - 1] == ' ')
-+      command[n - 1] = '\0';
-+  }
-+
-+  return TRUE;
-+}
-+
-+
-+#define ELF_ARCH			bfd_arch_avr32
-+#define ELF_MACHINE_CODE		EM_AVR32
-+#define ELF_MAXPAGESIZE			1024
-+
-+#define TARGET_BIG_SYM			bfd_elf32_avr32_vec
-+#define TARGET_BIG_NAME			"elf32-avr32"
-+
-+#define elf_backend_grok_prstatus	avr32_elf_grok_prstatus
-+#define elf_backend_grok_psinfo		avr32_elf_grok_psinfo
-+
-+/* Only RELA relocations are used */
-+#define elf_backend_may_use_rel_p	0
-+#define elf_backend_may_use_rela_p	1
-+#define elf_backend_default_use_rela_p	1
-+#define elf_backend_rela_normal		1
-+#define elf_info_to_howto_rel		NULL
-+#define elf_info_to_howto		avr32_info_to_howto
-+
-+#define bfd_elf32_bfd_copy_private_bfd_data	avr32_elf_copy_private_bfd_data
-+#define bfd_elf32_bfd_merge_private_bfd_data	avr32_elf_merge_private_bfd_data
-+#define bfd_elf32_bfd_set_private_flags		avr32_elf_set_private_flags
-+#define bfd_elf32_bfd_print_private_bfd_data	avr32_elf_print_private_bfd_data
-+#define bfd_elf32_new_section_hook		avr32_elf_new_section_hook
-+
-+#define elf_backend_gc_mark_hook		avr32_elf_gc_mark_hook
-+#define elf_backend_gc_sweep_hook		avr32_elf_gc_sweep_hook
-+#define elf_backend_relocate_section	avr32_elf_relocate_section
-+#define elf_backend_copy_indirect_symbol avr32_elf_copy_indirect_symbol
-+#define elf_backend_create_dynamic_sections avr32_elf_create_dynamic_sections
-+#define bfd_elf32_bfd_link_hash_table_create avr32_elf_link_hash_table_create
-+#define elf_backend_adjust_dynamic_symbol avr32_elf_adjust_dynamic_symbol
-+#define elf_backend_size_dynamic_sections avr32_elf_size_dynamic_sections
-+#define elf_backend_finish_dynamic_symbol avr32_elf_finish_dynamic_symbol
-+#define elf_backend_finish_dynamic_sections avr32_elf_finish_dynamic_sections
-+
-+#define bfd_elf32_bfd_relax_section	avr32_elf_relax_section
-+
-+/* Find out which symbols need an entry in .got. */
-+#define elf_backend_check_relocs	avr32_check_relocs
-+#define elf_backend_can_refcount	1
-+#define elf_backend_can_gc_sections	1
-+#define elf_backend_plt_readonly	1
-+#define elf_backend_plt_not_loaded	1
-+#define elf_backend_want_plt_sym	0
-+#define elf_backend_plt_alignment	2
-+#define elf_backend_want_dynbss		0
-+#define elf_backend_want_got_plt	0
-+#define elf_backend_want_got_sym	1
-+#define elf_backend_got_header_size	AVR32_GOT_HEADER_SIZE
-+
-+#include "elf32-target.h"
-diff -Nur binutils-2.21.orig/bfd/elf32-avr32.h binutils-2.21/bfd/elf32-avr32.h
---- binutils-2.21.orig/bfd/elf32-avr32.h	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.21/bfd/elf32-avr32.h	2011-08-28 14:56:19.177990713 +0200
-@@ -0,0 +1,23 @@
-+/* AVR32-specific support for 32-bit ELF.
-+   Copyright 2007,2008,2009 Atmel Corporation.
-+
-+   Written by Haavard Skinnemoen, Atmel Norway, <hskinnemoen@atmel.com>
-+
-+   This file is part of BFD, the Binary File Descriptor library.
-+
-+   This program is free software; you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; either version 2 of the License, or
-+   (at your option) any later version.
-+
-+   This program is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with this program; if not, write to the Free Software
-+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-+
-+void bfd_elf32_avr32_set_options(struct bfd_link_info *info,
-+				 int direct_data_refs);
-diff -Nur binutils-2.21.orig/bfd/elf-bfd.h binutils-2.21/bfd/elf-bfd.h
---- binutils-2.21.orig/bfd/elf-bfd.h	2010-11-04 12:35:00.000000000 +0100
-+++ binutils-2.21/bfd/elf-bfd.h	2011-08-28 14:56:19.187981894 +0200
-@@ -1553,6 +1553,10 @@
-      find_nearest_line.  */
-   struct mips_elf_find_line *find_line_info;
- 
-+  /* Used by AVR32 ELF relaxation code.  Contains an array of pointers
-+     for each local symbol to the fragment where it is defined.  */
-+  struct fragment **local_sym_frag;
-+
-   /* A place to stash dwarf1 info for this bfd.  */
-   struct dwarf1_debug *dwarf1_find_line_info;
- 
-diff -Nur binutils-2.21.orig/bfd/libbfd.h binutils-2.21/bfd/libbfd.h
---- binutils-2.21.orig/bfd/libbfd.h	2010-10-29 14:10:24.000000000 +0200
-+++ binutils-2.21/bfd/libbfd.h	2011-08-28 14:56:19.257982671 +0200
-@@ -1783,6 +1783,48 @@
-   "BFD_RELOC_AVR_LDI",
-   "BFD_RELOC_AVR_6",
-   "BFD_RELOC_AVR_6_ADIW",
-+  "BFD_RELOC_AVR32_DIFF32",
-+  "BFD_RELOC_AVR32_DIFF16",
-+  "BFD_RELOC_AVR32_DIFF8",
-+  "BFD_RELOC_AVR32_GOT32",
-+  "BFD_RELOC_AVR32_GOT16",
-+  "BFD_RELOC_AVR32_GOT8",
-+  "BFD_RELOC_AVR32_21S",
-+  "BFD_RELOC_AVR32_16U",
-+  "BFD_RELOC_AVR32_16S",
-+  "BFD_RELOC_AVR32_SUB5",
-+  "BFD_RELOC_AVR32_8S_EXT",
-+  "BFD_RELOC_AVR32_8S",
-+  "BFD_RELOC_AVR32_15S",
-+  "BFD_RELOC_AVR32_22H_PCREL",
-+  "BFD_RELOC_AVR32_18W_PCREL",
-+  "BFD_RELOC_AVR32_16B_PCREL",
-+  "BFD_RELOC_AVR32_16N_PCREL",
-+  "BFD_RELOC_AVR32_14UW_PCREL",
-+  "BFD_RELOC_AVR32_11H_PCREL",
-+  "BFD_RELOC_AVR32_10UW_PCREL",
-+  "BFD_RELOC_AVR32_9H_PCREL",
-+  "BFD_RELOC_AVR32_9UW_PCREL",
-+  "BFD_RELOC_AVR32_GOTPC",
-+  "BFD_RELOC_AVR32_GOTCALL",
-+  "BFD_RELOC_AVR32_LDA_GOT",
-+  "BFD_RELOC_AVR32_GOT21S",
-+  "BFD_RELOC_AVR32_GOT18SW",
-+  "BFD_RELOC_AVR32_GOT16S",
-+  "BFD_RELOC_AVR32_32_CPENT",
-+  "BFD_RELOC_AVR32_CPCALL",
-+  "BFD_RELOC_AVR32_16_CP",
-+  "BFD_RELOC_AVR32_9W_CP",
-+  "BFD_RELOC_AVR32_ALIGN",
-+  "BFD_RELOC_AVR32_14UW",
-+  "BFD_RELOC_AVR32_10UW",
-+  "BFD_RELOC_AVR32_10SW",
-+  "BFD_RELOC_AVR32_STHH_W",
-+  "BFD_RELOC_AVR32_7UW",
-+  "BFD_RELOC_AVR32_6S",
-+  "BFD_RELOC_AVR32_6UW",
-+  "BFD_RELOC_AVR32_4UH",
-+  "BFD_RELOC_AVR32_3U",
-   "BFD_RELOC_RX_NEG8",
-   "BFD_RELOC_RX_NEG16",
-   "BFD_RELOC_RX_NEG24",
-diff -Nur binutils-2.21.orig/bfd/Makefile.am binutils-2.21/bfd/Makefile.am
---- binutils-2.21.orig/bfd/Makefile.am	2010-12-08 09:37:33.000000000 +0100
-+++ binutils-2.21/bfd/Makefile.am	2011-08-28 14:56:19.267983645 +0200
-@@ -75,6 +75,7 @@
- 	cpu-arc.lo \
- 	cpu-arm.lo \
- 	cpu-avr.lo \
-+	cpu-avr32.lo \
- 	cpu-bfin.lo \
- 	cpu-cr16.lo \
- 	cpu-cr16c.lo \
-@@ -272,6 +273,7 @@
- 	elf32-arc.lo \
- 	elf32-arm.lo \
- 	elf32-avr.lo \
-+	elf32-avr32.lo \
- 	elf32-bfin.lo \
- 	elf32-cr16.lo \
- 	elf32-cr16c.lo \
-diff -Nur binutils-2.21.orig/bfd/reloc.c binutils-2.21/bfd/reloc.c
---- binutils-2.21.orig/bfd/reloc.c	2010-10-29 14:10:24.000000000 +0200
-+++ binutils-2.21/bfd/reloc.c	2011-08-28 14:56:19.337985626 +0200
-@@ -4275,6 +4275,131 @@
-   Renesas RX Relocations.
- 
- ENUM
-+  BFD_RELOC_AVR32_DIFF32
-+ENUMX
-+  BFD_RELOC_AVR32_DIFF16
-+ENUMX
-+  BFD_RELOC_AVR32_DIFF8
-+ENUMDOC
-+  Difference between two labels: L2 - L1. The value of L1 is encoded
-+  as sym + addend, while the initial difference after assembly is
-+  inserted into the object file by the assembler.
-+ENUM
-+  BFD_RELOC_AVR32_GOT32
-+ENUMX
-+  BFD_RELOC_AVR32_GOT16
-+ENUMX
-+  BFD_RELOC_AVR32_GOT8
-+ENUMDOC
-+  Reference to a symbol through the Global Offset Table. The linker
-+  will allocate an entry for symbol in the GOT and insert the offset
-+  of this entry as the relocation value.
-+ENUM
-+  BFD_RELOC_AVR32_21S
-+ENUMX
-+  BFD_RELOC_AVR32_16U
-+ENUMX
-+  BFD_RELOC_AVR32_16S
-+ENUMX
-+  BFD_RELOC_AVR32_SUB5
-+ENUMX
-+  BFD_RELOC_AVR32_8S_EXT
-+ENUMX
-+  BFD_RELOC_AVR32_8S
-+ENUMX
-+  BFD_RELOC_AVR32_15S
-+ENUMDOC
-+  Normal (non-pc-relative) code relocations. Alignment and signedness
-+  is indicated by the suffixes. S means signed, U means unsigned. W
-+  means word-aligned, H means halfword-aligned, neither means
-+  byte-aligned (no alignment.) SUB5 is the same relocation as 16S.
-+ENUM
-+  BFD_RELOC_AVR32_22H_PCREL
-+ENUMX
-+  BFD_RELOC_AVR32_18W_PCREL
-+ENUMX
-+  BFD_RELOC_AVR32_16B_PCREL
-+ENUMX
-+  BFD_RELOC_AVR32_16N_PCREL
-+ENUMX
-+  BFD_RELOC_AVR32_14UW_PCREL
-+ENUMX
-+  BFD_RELOC_AVR32_11H_PCREL
-+ENUMX
-+  BFD_RELOC_AVR32_10UW_PCREL
-+ENUMX
-+  BFD_RELOC_AVR32_9H_PCREL
-+ENUMX
-+  BFD_RELOC_AVR32_9UW_PCREL
-+ENUMDOC
-+  PC-relative relocations are signed if neither 'U' nor 'S' is
-+  specified. However, we explicitly tack on a 'B' to indicate no
-+  alignment, to avoid confusion with data relocs. All of these resolve
-+  to sym + addend - offset, except the one with 'N' (negated) suffix.
-+  This particular one resolves to offset - sym - addend.
-+ENUM
-+  BFD_RELOC_AVR32_GOTPC
-+ENUMDOC
-+  Subtract the link-time address of the GOT from (symbol + addend)
-+  and insert the result.
-+ENUM
-+  BFD_RELOC_AVR32_GOTCALL
-+ENUMX
-+  BFD_RELOC_AVR32_LDA_GOT
-+ENUMX
-+  BFD_RELOC_AVR32_GOT21S
-+ENUMX
-+  BFD_RELOC_AVR32_GOT18SW
-+ENUMX
-+  BFD_RELOC_AVR32_GOT16S
-+ENUMDOC
-+  Reference to a symbol through the GOT. The linker will allocate an
-+  entry for symbol in the GOT and insert the offset of this entry as
-+  the relocation value. addend must be zero. As usual, 'S' means
-+  signed, 'W' means word-aligned, etc.
-+ENUM
-+  BFD_RELOC_AVR32_32_CPENT
-+ENUMDOC
-+  32-bit constant pool entry. I don't think 8- and 16-bit entries make
-+  a whole lot of sense.
-+ENUM
-+  BFD_RELOC_AVR32_CPCALL
-+ENUMX
-+  BFD_RELOC_AVR32_16_CP
-+ENUMX
-+  BFD_RELOC_AVR32_9W_CP
-+ENUMDOC
-+  Constant pool references. Some of these relocations are signed,
-+  others are unsigned. It doesn't really matter, since the constant
-+  pool always comes after the code that references it.
-+ENUM
-+  BFD_RELOC_AVR32_ALIGN
-+ENUMDOC
-+  sym must be the absolute symbol. The addend specifies the alignment
-+  order, e.g. if addend is 2, the linker must add padding so that the
-+  next address is aligned to a 4-byte boundary.
-+ENUM
-+  BFD_RELOC_AVR32_14UW
-+ENUMX
-+  BFD_RELOC_AVR32_10UW
-+ENUMX
-+  BFD_RELOC_AVR32_10SW
-+ENUMX
-+  BFD_RELOC_AVR32_STHH_W
-+ENUMX
-+  BFD_RELOC_AVR32_7UW
-+ENUMX
-+  BFD_RELOC_AVR32_6S
-+ENUMX
-+  BFD_RELOC_AVR32_6UW
-+ENUMX
-+  BFD_RELOC_AVR32_4UH
-+ENUMX
-+  BFD_RELOC_AVR32_3U
-+ENUMDOC
-+  Code relocations that will never make it to the output file.
-+
-+ENUM
-   BFD_RELOC_390_12
- ENUMDOC
-    Direct 12 bit.
-diff -Nur binutils-2.21.orig/bfd/targets.c binutils-2.21/bfd/targets.c
---- binutils-2.21.orig/bfd/targets.c	2010-10-22 14:08:28.000000000 +0200
-+++ binutils-2.21/bfd/targets.c	2011-08-28 14:56:19.347986251 +0200
-@@ -579,6 +579,7 @@
- extern const bfd_target b_out_vec_little_host;
- extern const bfd_target bfd_pei_ia64_vec;
- extern const bfd_target bfd_elf32_avr_vec;
-+extern const bfd_target bfd_elf32_avr32_vec;
- 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;
-@@ -917,6 +918,7 @@
- 	&bfd_pei_ia64_vec,
- #endif
- 	&bfd_elf32_avr_vec,
-+	&bfd_elf32_avr32_vec,
- 	&bfd_elf32_bfin_vec,
- 	&bfd_elf32_bfinfdpic_vec,
- 
-diff -Nur binutils-2.21.orig/binutils/doc/binutils.info binutils-2.21/binutils/doc/binutils.info
---- binutils-2.21.orig/binutils/doc/binutils.info	2010-12-08 09:39:11.000000000 +0100
-+++ binutils-2.21/binutils/doc/binutils.info	2011-08-28 14:56:19.407979437 +0200
-@@ -1705,6 +1705,10 @@
-      useful when attempting to disassemble thumb code produced by other
-      compilers.
- 
-+     For the AVR32 architectures that support Floating point unit (FPU),
-+     specifying '-M decode-fpu' will enable disassembler to print the 
-+     floating point instruction instead of 'cop' instructions.
-+
-      For the x86, some of the options duplicate functions of the `-m'
-      switch, but allow finer grained control.  Multiple selections from
-      the following may be specified as a comma separated string.
-diff -Nur binutils-2.21.orig/binutils/doc/binutils.texi binutils-2.21/binutils/doc/binutils.texi
---- binutils-2.21.orig/binutils/doc/binutils.texi	2010-10-29 14:10:32.000000000 +0200
-+++ binutils-2.21/binutils/doc/binutils.texi	2011-08-28 14:56:19.467985920 +0200
-@@ -1980,6 +1980,10 @@
- useful when attempting to disassemble thumb code produced by other
- compilers.
- 
-+For the AVR32 architectures that support Floating point unit (FPU), 
-+specifying @option{-M decode-fpu} will enable disassembler to print the
-+floating point instructions instead of 'cop' instructions. 
-+
- For the x86, some of the options duplicate functions of the @option{-m}
- switch, but allow finer grained control.  Multiple selections from the
- following may be specified as a comma separated string.
-diff -Nur binutils-2.21.orig/binutils/doc/objdump.1 binutils-2.21/binutils/doc/objdump.1
---- binutils-2.21.orig/binutils/doc/objdump.1	2010-12-08 09:39:13.000000000 +0100
-+++ binutils-2.21/binutils/doc/objdump.1	2011-08-28 14:56:19.477990899 +0200
-@@ -425,6 +425,10 @@
- useful when attempting to disassemble thumb code produced by other
- compilers.
- .Sp
-+For the \s-1AVR32\s0 architectures that support Floating point unit (FPU),
-+specifying \fB\-M decode\-fpu\fR will enable disassembler to print the
-+floating point instructions instead of 'cop' instructions.
-+.Sp
- For the x86, some of the options duplicate functions of the \fB\-m\fR
- switch, but allow finer grained control.  Multiple selections from the
- following may be specified as a comma separated string.
-diff -Nur binutils-2.21.orig/binutils/readelf.c binutils-2.21/binutils/readelf.c
---- binutils-2.21.orig/binutils/readelf.c	2010-11-02 15:36:35.000000000 +0100
-+++ binutils-2.21/binutils/readelf.c	2011-08-28 15:20:54.897989766 +0200
-@@ -95,6 +95,7 @@
- #include "elf/arc.h"
- #include "elf/arm.h"
- #include "elf/avr.h"
-+#include "elf/avr32.h"
- #include "elf/bfin.h"
- #include "elf/cr16.h"
- #include "elf/cris.h"
-@@ -619,6 +620,7 @@
-     case EM_ALPHA:
-     case EM_ALTERA_NIOS2:
-     case EM_AVR:
-+    case EM_AVR32:
-     case EM_AVR_OLD:
-     case EM_BLACKFIN:
-     case EM_CR16:
-@@ -1072,6 +1074,10 @@
- 	  rtype = elf_avr_reloc_type (type);
- 	  break;
- 
-+	case EM_AVR32:
-+	  rtype = elf_avr32_reloc_type (type);
-+	  break;
-+
- 	case EM_OLD_SPARCV9:
- 	case EM_SPARC32PLUS:
- 	case EM_SPARCV9:
-diff -Nur binutils-2.21.orig/gas/as.c binutils-2.21/gas/as.c
---- binutils-2.21.orig/gas/as.c	2010-08-09 20:08:18.000000000 +0200
-+++ binutils-2.21/gas/as.c	2011-08-28 14:56:19.567981083 +0200
-@@ -459,10 +459,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}
--    /* The entry for "a" is here to prevent getopt_long_only() from
--       considering that -a is an abbreviation for --alternate.  This is
--       necessary because -a=<FILE> is a valid switch but getopt would
--       normally reject it since --alternate does not take an argument.  */
-+    /* The next two entries are here to prevent getopt_long_only() from
-+       considering that -a or -al is an abbreviation for --alternate.
-+       This is necessary because -a=<FILE> is a valid switch but getopt
-+       would normally reject it since --alternate does not take an argument.  */
-     ,{"a", optional_argument, NULL, 'a'}
-     /* Handle -al=<FILE>.  */
-     ,{"al", optional_argument, NULL, OPTION_AL}
-@@ -839,8 +839,15 @@
- 	case 'a':
- 	  if (optarg)
- 	    {
--	      if (optarg != old_argv[optind] && optarg[-1] == '=')
-+	      /* If optarg is part of the -a switch and not a separate argument
-+		 in its own right, then scan backwards to the just after the -a.
-+		 This means skipping over both '=' and 'l' which might have been
-+		 taken to be part of the -a switch itself.  */
-+	      if (optarg != old_argv[optind])
-+		{
-+		  while (optarg[-1] == '=' || optarg[-1] == 'l')
- 		--optarg;
-+		}
- 
- 	      if (md_parse_option (optc, optarg) != 0)
- 		break;
-@@ -982,7 +989,7 @@
- {
-   output_file_close (out_file_name);
-   if (!keep_it)
--    unlink_if_ordinary (out_file_name);
-+    unlink (out_file_name);
- }
- 
- /* The interface between the macro code and gas expression handling.  */
-diff -Nur binutils-2.21.orig/gas/as.h binutils-2.21/gas/as.h
---- binutils-2.21.orig/gas/as.h	2010-07-03 22:52:24.000000000 +0200
-+++ binutils-2.21/gas/as.h	2011-08-28 14:56:19.657986437 +0200
-@@ -82,6 +82,7 @@
- #endif
- #define gas_assert(P) \
-   ((void) ((P) ? 0 : (as_assert (__FILE__, __LINE__, __PRETTY_FUNCTION__), 0)))
-+#define assert(P)   gas_assert(P)
- #undef abort
- #define abort()		as_abort (__FILE__, __LINE__, __PRETTY_FUNCTION__)
- 
-diff -Nur binutils-2.21.orig/gas/atof-generic.c binutils-2.21/gas/atof-generic.c
---- binutils-2.21.orig/gas/atof-generic.c	2009-09-02 09:24:19.000000000 +0200
-+++ binutils-2.21/gas/atof-generic.c	2011-08-28 14:56:19.727983142 +0200
-@@ -121,6 +121,21 @@
- 
-   switch (first_digit[0])
-     {
-+    case 's':
-+    case 'S':
-+    case 'q':
-+    case 'Q':
-+      if (!strncasecmp ("nan", first_digit+1, 3))
-+	{
-+	  address_of_generic_floating_point_number->sign = 0;
-+	  address_of_generic_floating_point_number->exponent = 0;
-+	  address_of_generic_floating_point_number->leader =
-+	    address_of_generic_floating_point_number->low;
-+	  *address_of_string_pointer = first_digit + 4;
-+	  return 0;
-+	}
-+      break;
-+
-     case 'n':
-     case 'N':
-       if (!strncasecmp ("nan", first_digit, 3))
-diff -Nur binutils-2.21.orig/gas/autom4te.cache/output.0 binutils-2.21/gas/autom4te.cache/output.0
---- binutils-2.21.orig/gas/autom4te.cache/output.0	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.21/gas/autom4te.cache/output.0	2011-08-28 14:56:19.757981389 +0200
-@@ -0,0 +1,16661 @@
-+@%:@! /bin/sh
-+@%:@ Guess values for system-dependent variables and create Makefiles.
-+@%:@ Generated by GNU Autoconf 2.64.
-+@%:@ 
-+@%:@ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-+@%:@ 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
-+@%:@ Foundation, Inc.
-+@%:@ 
-+@%:@ This configure script is free software; the Free Software Foundation
-+@%:@ gives unlimited permission to copy, distribute and modify it.
-+## -------------------- ##
-+## M4sh Initialization. ##
-+## -------------------- ##
-+
-+# Be more Bourne compatible
-+DUALCASE=1; export DUALCASE # for MKS sh
-+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-+  emulate sh
-+  NULLCMD=:
-+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-+  # is contrary to our usage.  Disable this feature.
-+  alias -g '${1+"$@"}'='"$@"'
-+  setopt NO_GLOB_SUBST
-+else
-+  case `(set -o) 2>/dev/null` in @%:@(
-+  *posix*) :
-+    set -o posix ;; @%:@(
-+  *) :
-+     ;;
-+esac
-+fi
-+
-+
-+as_nl='
-+'
-+export as_nl
-+# Printing a long string crashes Solaris 7 /usr/bin/printf.
-+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-+# Prefer a ksh shell builtin over an external printf program on Solaris,
-+# but without wasting forks for bash or zsh.
-+if test -z "$BASH_VERSION$ZSH_VERSION" \
-+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-+  as_echo='print -r --'
-+  as_echo_n='print -rn --'
-+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-+  as_echo='printf %s\n'
-+  as_echo_n='printf %s'
-+else
-+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-+    as_echo_n='/usr/ucb/echo -n'
-+  else
-+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-+    as_echo_n_body='eval
-+      arg=$1;
-+      case $arg in @%:@(
-+      *"$as_nl"*)
-+	expr "X$arg" : "X\\(.*\\)$as_nl";
-+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-+      esac;
-+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-+    '
-+    export as_echo_n_body
-+    as_echo_n='sh -c $as_echo_n_body as_echo'
-+  fi
-+  export as_echo_body
-+  as_echo='sh -c $as_echo_body as_echo'
-+fi
-+
-+# The user is always right.
-+if test "${PATH_SEPARATOR+set}" != set; then
-+  PATH_SEPARATOR=:
-+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-+      PATH_SEPARATOR=';'
-+  }
-+fi
-+
-+
-+# IFS
-+# We need space, tab and new line, in precisely that order.  Quoting is
-+# there to prevent editors from complaining about space-tab.
-+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-+# splitting by setting IFS to empty value.)
-+IFS=" ""	$as_nl"
-+
-+# Find who we are.  Look in the path if we contain no directory separator.
-+case $0 in @%:@((
-+  *[\\/]* ) as_myself=$0 ;;
-+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-+  done
-+IFS=$as_save_IFS
-+
-+     ;;
-+esac
-+# We did not find ourselves, most probably we were run as `sh COMMAND'
-+# in which case we are not to be found in the path.
-+if test "x$as_myself" = x; then
-+  as_myself=$0
-+fi
-+if test ! -f "$as_myself"; then
-+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-+  exit 1
-+fi
-+
-+# Unset variables that we do not need and which cause bugs (e.g. in
-+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-+# suppresses any "Segmentation fault" message there.  '((' could
-+# trigger a bug in pdksh 5.2.14.
-+for as_var in BASH_ENV ENV MAIL MAILPATH
-+do eval test x\${$as_var+set} = xset \
-+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-+done
-+PS1='$ '
-+PS2='> '
-+PS4='+ '
-+
-+# NLS nuisances.
-+LC_ALL=C
-+export LC_ALL
-+LANGUAGE=C
-+export LANGUAGE
-+
-+# CDPATH.
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-+
-+if test "x$CONFIG_SHELL" = x; then
-+  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
-+  emulate sh
-+  NULLCMD=:
-+  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
-+  # is contrary to our usage.  Disable this feature.
-+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-+  setopt NO_GLOB_SUBST
-+else
-+  case \`(set -o) 2>/dev/null\` in @%:@(
-+  *posix*) :
-+    set -o posix ;; @%:@(
-+  *) :
-+     ;;
-+esac
-+fi
-+"
-+  as_required="as_fn_return () { (exit \$1); }
-+as_fn_success () { as_fn_return 0; }
-+as_fn_failure () { as_fn_return 1; }
-+as_fn_ret_success () { return 0; }
-+as_fn_ret_failure () { return 1; }
-+
-+exitcode=0
-+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
-+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
-+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
-+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
-+  
-+else
-+  exitcode=1; echo positional parameters were not saved.
-+fi
-+test x\$exitcode = x0 || exit 1"
-+  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
-+  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
-+  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
-+  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-+test \$(( 1 + 1 )) = 2 || exit 1
-+
-+  test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
-+    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
-+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
-+    PATH=/empty FPATH=/empty; export PATH FPATH
-+    test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
-+      || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1"
-+  if (eval "$as_required") 2>/dev/null; then :
-+  as_have_required=yes
-+else
-+  as_have_required=no
-+fi
-+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
-+  
-+else
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+as_found=false
-+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  as_found=:
-+  case $as_dir in @%:@(
-+	 /*)
-+	   for as_base in sh bash ksh sh5; do
-+	     # Try only shells that exist, to save several forks.
-+	     as_shell=$as_dir/$as_base
-+	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-+		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
-+  CONFIG_SHELL=$as_shell as_have_required=yes
-+		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
-+  break 2
-+fi
-+fi
-+	   done;;
-+       esac
-+  as_found=false
-+done
-+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
-+	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
-+  CONFIG_SHELL=$SHELL as_have_required=yes
-+fi; }
-+IFS=$as_save_IFS
-+
-+
-+      if test "x$CONFIG_SHELL" != x; then :
-+  # We cannot yet assume a decent shell, so we have to provide a
-+	# neutralization value for shells without unset; and this also
-+	# works around shells that cannot unset nonexistent variables.
-+	BASH_ENV=/dev/null
-+	ENV=/dev/null
-+	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-+	export CONFIG_SHELL
-+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-+fi
-+
-+    if test x$as_have_required = xno; then :
-+  $as_echo "$0: This script requires a shell more modern than all"
-+  $as_echo "$0: the shells that I found on your system."
-+  if test x${ZSH_VERSION+set} = xset ; then
-+    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-+    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
-+  else
-+    $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
-+$0: including any error possibly output before this
-+$0: message. Then install a modern shell, or manually run
-+$0: the script under such a shell if you do have one."
-+  fi
-+  exit 1
-+fi
-+fi
-+fi
-+SHELL=${CONFIG_SHELL-/bin/sh}
-+export SHELL
-+# Unset more variables known to interfere with behavior of common tools.
-+CLICOLOR_FORCE= GREP_OPTIONS=
-+unset CLICOLOR_FORCE GREP_OPTIONS
-+
-+## --------------------- ##
-+## M4sh Shell Functions. ##
-+## --------------------- ##
-+@%:@ as_fn_unset VAR
-+@%:@ ---------------
-+@%:@ Portably unset VAR.
-+as_fn_unset ()
-+{
-+  { eval $1=; unset $1;}
-+}
-+as_unset=as_fn_unset
-+
-+@%:@ as_fn_set_status STATUS
-+@%:@ -----------------------
-+@%:@ Set $? to STATUS, without forking.
-+as_fn_set_status ()
-+{
-+  return $1
-+} @%:@ as_fn_set_status
-+
-+@%:@ as_fn_exit STATUS
-+@%:@ -----------------
-+@%:@ Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-+as_fn_exit ()
-+{
-+  set +e
-+  as_fn_set_status $1
-+  exit $1
-+} @%:@ as_fn_exit
-+
-+@%:@ as_fn_mkdir_p
-+@%:@ -------------
-+@%:@ Create "$as_dir" as a directory, including parents if necessary.
-+as_fn_mkdir_p ()
-+{
-+
-+  case $as_dir in #(
-+  -*) as_dir=./$as_dir;;
-+  esac
-+  test -d "$as_dir" || eval $as_mkdir_p || {
-+    as_dirs=
-+    while :; do
-+      case $as_dir in #(
-+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-+      *) as_qdir=$as_dir;;
-+      esac
-+      as_dirs="'$as_qdir' $as_dirs"
-+      as_dir=`$as_dirname -- "$as_dir" ||
-+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$as_dir" : 'X\(//\)[^/]' \| \
-+	 X"$as_dir" : 'X\(//\)$' \| \
-+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-+$as_echo X"$as_dir" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-+      test -d "$as_dir" && break
-+    done
-+    test -z "$as_dirs" || eval "mkdir $as_dirs"
-+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
-+
-+
-+} @%:@ as_fn_mkdir_p
-+@%:@ as_fn_append VAR VALUE
-+@%:@ ----------------------
-+@%:@ Append the text in VALUE to the end of the definition contained in VAR. Take
-+@%:@ advantage of any shell optimizations that allow amortized linear growth over
-+@%:@ repeated appends, instead of the typical quadratic growth present in naive
-+@%:@ implementations.
-+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-+  eval 'as_fn_append ()
-+  {
-+    eval $1+=\$2
-+  }'
-+else
-+  as_fn_append ()
-+  {
-+    eval $1=\$$1\$2
-+  }
-+fi # as_fn_append
-+
-+@%:@ as_fn_arith ARG...
-+@%:@ ------------------
-+@%:@ Perform arithmetic evaluation on the ARGs, and store the result in the
-+@%:@ global $as_val. Take advantage of shells that can avoid forks. The arguments
-+@%:@ must be portable across $(()) and expr.
-+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-+  eval 'as_fn_arith ()
-+  {
-+    as_val=$(( $* ))
-+  }'
-+else
-+  as_fn_arith ()
-+  {
-+    as_val=`expr "$@" || test $? -eq 1`
-+  }
-+fi # as_fn_arith
-+
-+
-+@%:@ as_fn_error ERROR [LINENO LOG_FD]
-+@%:@ ---------------------------------
-+@%:@ Output "`basename @S|@0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-+@%:@ provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-+@%:@ script with status $?, using 1 if that was 0.
-+as_fn_error ()
-+{
-+  as_status=$?; test $as_status -eq 0 && as_status=1
-+  if test "$3"; then
-+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
-+  fi
-+  $as_echo "$as_me: error: $1" >&2
-+  as_fn_exit $as_status
-+} @%:@ as_fn_error
-+
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-+  as_expr=expr
-+else
-+  as_expr=false
-+fi
-+
-+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-+  as_basename=basename
-+else
-+  as_basename=false
-+fi
-+
-+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-+  as_dirname=dirname
-+else
-+  as_dirname=false
-+fi
-+
-+as_me=`$as_basename -- "$0" ||
-+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-+	 X"$0" : 'X\(//\)$' \| \
-+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-+$as_echo X/"$0" |
-+    sed '/^.*\/\([^/][^/]*\)\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\/\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\/\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-+
-+# Avoid depending upon Character Ranges.
-+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-+as_cr_digits='0123456789'
-+as_cr_alnum=$as_cr_Letters$as_cr_digits
-+
-+
-+  as_lineno_1=$LINENO as_lineno_1a=$LINENO
-+  as_lineno_2=$LINENO as_lineno_2a=$LINENO
-+  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
-+  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
-+  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
-+  sed -n '
-+    p
-+    /[$]LINENO/=
-+  ' <$as_myself |
-+    sed '
-+      s/[$]LINENO.*/&-/
-+      t lineno
-+      b
-+      :lineno
-+      N
-+      :loop
-+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-+      t loop
-+      s/-\n.*//
-+    ' >$as_me.lineno &&
-+  chmod +x "$as_me.lineno" ||
-+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
-+
-+  # Don't try to exec as it changes $[0], causing all sort of problems
-+  # (the dirname of $[0] is not the place where we might find the
-+  # original and so on.  Autoconf is especially sensitive to this).
-+  . "./$as_me.lineno"
-+  # Exit status is that of the last command.
-+  exit
-+}
-+
-+ECHO_C= ECHO_N= ECHO_T=
-+case `echo -n x` in @%:@(((((
-+-n*)
-+  case `echo 'xy\c'` in
-+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-+  xy)  ECHO_C='\c';;
-+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-+       ECHO_T='	';;
-+  esac;;
-+*)
-+  ECHO_N='-n';;
-+esac
-+
-+rm -f conf$$ conf$$.exe conf$$.file
-+if test -d conf$$.dir; then
-+  rm -f conf$$.dir/conf$$.file
-+else
-+  rm -f conf$$.dir
-+  mkdir conf$$.dir 2>/dev/null
-+fi
-+if (echo >conf$$.file) 2>/dev/null; then
-+  if ln -s conf$$.file conf$$ 2>/dev/null; then
-+    as_ln_s='ln -s'
-+    # ... but there are two gotchas:
-+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-+    # In both cases, we have to default to `cp -p'.
-+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-+      as_ln_s='cp -p'
-+  elif ln conf$$.file conf$$ 2>/dev/null; then
-+    as_ln_s=ln
-+  else
-+    as_ln_s='cp -p'
-+  fi
-+else
-+  as_ln_s='cp -p'
-+fi
-+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-+rmdir conf$$.dir 2>/dev/null
-+
-+if mkdir -p . 2>/dev/null; then
-+  as_mkdir_p='mkdir -p "$as_dir"'
-+else
-+  test -d ./-p && rmdir ./-p
-+  as_mkdir_p=false
-+fi
-+
-+if test -x / >/dev/null 2>&1; then
-+  as_test_x='test -x'
-+else
-+  if ls -dL / >/dev/null 2>&1; then
-+    as_ls_L_option=L
-+  else
-+    as_ls_L_option=
-+  fi
-+  as_test_x='
-+    eval sh -c '\''
-+      if test -d "$1"; then
-+	test -d "$1/.";
-+      else
-+	case $1 in @%:@(
-+	-*)set "./$1";;
-+	esac;
-+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in @%:@((
-+	???[sx]*):;;*)false;;esac;fi
-+    '\'' sh
-+  '
-+fi
-+as_executable_p=$as_test_x
-+
-+# 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'"
-+
-+# Sed expression to map a string onto a valid variable name.
-+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-+
-+SHELL=${CONFIG_SHELL-/bin/sh}
-+
-+
-+exec 7<&0 </dev/null 6>&1
-+
-+# Name of the host.
-+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-+# so uname gets run too.
-+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-+
-+#
-+# Initializations.
-+#
-+ac_default_prefix=/usr/local
-+ac_clean_files=
-+ac_config_libobj_dir=.
-+LIB@&t@OBJS=
-+cross_compiling=no
-+subdirs=
-+MFLAGS=
-+MAKEFLAGS=
-+
-+# Identity of this package.
-+PACKAGE_NAME=
-+PACKAGE_TARNAME=
-+PACKAGE_VERSION=
-+PACKAGE_STRING=
-+PACKAGE_BUGREPORT=
-+PACKAGE_URL=
-+
-+ac_unique_file="as.h"
-+# Factoring default headers for most tests.
-+ac_includes_default="\
-+#include <stdio.h>
-+#ifdef HAVE_SYS_TYPES_H
-+# include <sys/types.h>
-+#endif
-+#ifdef HAVE_SYS_STAT_H
-+# include <sys/stat.h>
-+#endif
-+#ifdef STDC_HEADERS
-+# include <stdlib.h>
-+# include <stddef.h>
-+#else
-+# ifdef HAVE_STDLIB_H
-+#  include <stdlib.h>
-+# endif
-+#endif
-+#ifdef HAVE_STRING_H
-+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-+#  include <memory.h>
-+# endif
-+# include <string.h>
-+#endif
-+#ifdef HAVE_STRINGS_H
-+# include <strings.h>
-+#endif
-+#ifdef HAVE_INTTYPES_H
-+# include <inttypes.h>
-+#endif
-+#ifdef HAVE_STDINT_H
-+# include <stdint.h>
-+#endif
-+#ifdef HAVE_UNISTD_H
-+# include <unistd.h>
-+#endif"
-+
-+ac_subst_vars='am__EXEEXT_FALSE
-+am__EXEEXT_TRUE
-+LTLIBOBJS
-+LIB@&t@OBJS
-+LIBM
-+ALLOCA
-+GENINSRC_NEVER_FALSE
-+GENINSRC_NEVER_TRUE
-+MAINT
-+MAINTAINER_MODE_FALSE
-+MAINTAINER_MODE_TRUE
-+MSGMERGE
-+MSGFMT
-+MKINSTALLDIRS
-+CATOBJEXT
-+GENCAT
-+INSTOBJEXT
-+DATADIRNAME
-+CATALOGS
-+POSUB
-+GMSGFMT
-+XGETTEXT
-+INCINTL
-+LIBINTL_DEP
-+LIBINTL
-+USE_NLS
-+LEXLIB
-+LEX_OUTPUT_ROOT
-+LEX
-+YFLAGS
-+YACC
-+OPCODES_LIB
-+atof
-+install_tooldir
-+te_file
-+obj_format
-+target_cpu_type
-+extra_objects
-+cgen_cpu_prefix
-+GDBINIT
-+NO_WERROR
-+WARN_CFLAGS
-+OTOOL64
-+OTOOL
-+LIPO
-+NMEDIT
-+DSYMUTIL
-+RANLIB
-+AR
-+OBJDUMP
-+LN_S
-+NM
-+ac_ct_DUMPBIN
-+DUMPBIN
-+LD
-+FGREP
-+SED
-+LIBTOOL
-+EGREP
-+GREP
-+CPP
-+am__fastdepCC_FALSE
-+am__fastdepCC_TRUE
-+CCDEPMODE
-+AMDEPBACKSLASH
-+AMDEP_FALSE
-+AMDEP_TRUE
-+am__quote
-+am__include
-+DEPDIR
-+am__untar
-+am__tar
-+AMTAR
-+am__leading_dot
-+SET_MAKE
-+AWK
-+mkdir_p
-+MKDIR_P
-+INSTALL_STRIP_PROGRAM
-+STRIP
-+install_sh
-+MAKEINFO
-+AUTOHEADER
-+AUTOMAKE
-+AUTOCONF
-+ACLOCAL
-+VERSION
-+PACKAGE
-+CYGPATH_W
-+am__isrc
-+INSTALL_DATA
-+INSTALL_SCRIPT
-+INSTALL_PROGRAM
-+OBJEXT
-+EXEEXT
-+ac_ct_CC
-+CPPFLAGS
-+LDFLAGS
-+CFLAGS
-+CC
-+target_os
-+target_vendor
-+target_cpu
-+target
-+host_os
-+host_vendor
-+host_cpu
-+host
-+build_os
-+build_vendor
-+build_cpu
-+build
-+target_alias
-+host_alias
-+build_alias
-+LIBS
-+ECHO_T
-+ECHO_N
-+ECHO_C
-+DEFS
-+mandir
-+localedir
-+libdir
-+psdir
-+pdfdir
-+dvidir
-+htmldir
-+infodir
-+docdir
-+oldincludedir
-+includedir
-+localstatedir
-+sharedstatedir
-+sysconfdir
-+datadir
-+datarootdir
-+libexecdir
-+sbindir
-+bindir
-+program_transform_name
-+prefix
-+exec_prefix
-+PACKAGE_URL
-+PACKAGE_BUGREPORT
-+PACKAGE_STRING
-+PACKAGE_VERSION
-+PACKAGE_TARNAME
-+PACKAGE_NAME
-+PATH_SEPARATOR
-+SHELL'
-+ac_subst_files=''
-+ac_user_opts='
-+enable_option_checking
-+enable_dependency_tracking
-+enable_plugins
-+enable_largefile
-+enable_shared
-+enable_static
-+with_pic
-+enable_fast_install
-+with_gnu_ld
-+enable_libtool_lock
-+enable_targets
-+enable_checking
-+enable_werror
-+enable_build_warnings
-+enable_nls
-+enable_maintainer_mode
-+with_zlib
-+'
-+      ac_precious_vars='build_alias
-+host_alias
-+target_alias
-+CC
-+CFLAGS
-+LDFLAGS
-+LIBS
-+CPPFLAGS
-+CPP
-+YACC
-+YFLAGS'
-+
-+
-+# Initialize some variables set by options.
-+ac_init_help=
-+ac_init_version=false
-+ac_unrecognized_opts=
-+ac_unrecognized_sep=
-+# The variables have the same names as the options, with
-+# dashes changed to underlines.
-+cache_file=/dev/null
-+exec_prefix=NONE
-+no_create=
-+no_recursion=
-+prefix=NONE
-+program_prefix=NONE
-+program_suffix=NONE
-+program_transform_name=s,x,x,
-+silent=
-+site=
-+srcdir=
-+verbose=
-+x_includes=NONE
-+x_libraries=NONE
-+
-+# Installation directory options.
-+# These are left unexpanded so users can "make install exec_prefix=/foo"
-+# 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.
-+# (The list follows the same order as the GNU Coding Standards.)
-+bindir='${exec_prefix}/bin'
-+sbindir='${exec_prefix}/sbin'
-+libexecdir='${exec_prefix}/libexec'
-+datarootdir='${prefix}/share'
-+datadir='${datarootdir}'
-+sysconfdir='${prefix}/etc'
-+sharedstatedir='${prefix}/com'
-+localstatedir='${prefix}/var'
-+includedir='${prefix}/include'
-+oldincludedir='/usr/include'
-+docdir='${datarootdir}/doc/${PACKAGE}'
-+infodir='${datarootdir}/info'
-+htmldir='${docdir}'
-+dvidir='${docdir}'
-+pdfdir='${docdir}'
-+psdir='${docdir}'
-+libdir='${exec_prefix}/lib'
-+localedir='${datarootdir}/locale'
-+mandir='${datarootdir}/man'
-+
-+ac_prev=
-+ac_dashdash=
-+for ac_option
-+do
-+  # If the previous option needs an argument, assign it.
-+  if test -n "$ac_prev"; then
-+    eval $ac_prev=\$ac_option
-+    ac_prev=
-+    continue
-+  fi
-+
-+  case $ac_option in
-+  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-+  *)	ac_optarg=yes ;;
-+  esac
-+
-+  # Accept the important Cygnus configure options, so we can diagnose typos.
-+
-+  case $ac_dashdash$ac_option in
-+  --)
-+    ac_dashdash=yes ;;
-+
-+  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-+    ac_prev=bindir ;;
-+  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-+    bindir=$ac_optarg ;;
-+
-+  -build | --build | --buil | --bui | --bu)
-+    ac_prev=build_alias ;;
-+  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-+    build_alias=$ac_optarg ;;
-+
-+  -cache-file | --cache-file | --cache-fil | --cache-fi \
-+  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-+    ac_prev=cache_file ;;
-+  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-+  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-+    cache_file=$ac_optarg ;;
-+
-+  --config-cache | -C)
-+    cache_file=config.cache ;;
-+
-+  -datadir | --datadir | --datadi | --datad)
-+    ac_prev=datadir ;;
-+  -datadir=* | --datadir=* | --datadi=* | --datad=*)
-+    datadir=$ac_optarg ;;
-+
-+  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-+  | --dataroo | --dataro | --datar)
-+    ac_prev=datarootdir ;;
-+  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-+  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-+    datarootdir=$ac_optarg ;;
-+
-+  -disable-* | --disable-*)
-+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-+    # Reject names that are not valid shell variable names.
-+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-+      as_fn_error "invalid feature name: $ac_useropt"
-+    ac_useropt_orig=$ac_useropt
-+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-+    case $ac_user_opts in
-+      *"
-+"enable_$ac_useropt"
-+"*) ;;
-+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
-+	 ac_unrecognized_sep=', ';;
-+    esac
-+    eval enable_$ac_useropt=no ;;
-+
-+  -docdir | --docdir | --docdi | --doc | --do)
-+    ac_prev=docdir ;;
-+  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-+    docdir=$ac_optarg ;;
-+
-+  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-+    ac_prev=dvidir ;;
-+  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-+    dvidir=$ac_optarg ;;
-+
-+  -enable-* | --enable-*)
-+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-+    # Reject names that are not valid shell variable names.
-+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-+      as_fn_error "invalid feature name: $ac_useropt"
-+    ac_useropt_orig=$ac_useropt
-+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-+    case $ac_user_opts in
-+      *"
-+"enable_$ac_useropt"
-+"*) ;;
-+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
-+	 ac_unrecognized_sep=', ';;
-+    esac
-+    eval enable_$ac_useropt=\$ac_optarg ;;
-+
-+  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-+  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-+  | --exec | --exe | --ex)
-+    ac_prev=exec_prefix ;;
-+  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-+  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-+  | --exec=* | --exe=* | --ex=*)
-+    exec_prefix=$ac_optarg ;;
-+
-+  -gas | --gas | --ga | --g)
-+    # Obsolete; use --with-gas.
-+    with_gas=yes ;;
-+
-+  -help | --help | --hel | --he | -h)
-+    ac_init_help=long ;;
-+  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-+    ac_init_help=recursive ;;
-+  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-+    ac_init_help=short ;;
-+
-+  -host | --host | --hos | --ho)
-+    ac_prev=host_alias ;;
-+  -host=* | --host=* | --hos=* | --ho=*)
-+    host_alias=$ac_optarg ;;
-+
-+  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-+    ac_prev=htmldir ;;
-+  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-+  | --ht=*)
-+    htmldir=$ac_optarg ;;
-+
-+  -includedir | --includedir | --includedi | --included | --include \
-+  | --includ | --inclu | --incl | --inc)
-+    ac_prev=includedir ;;
-+  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-+  | --includ=* | --inclu=* | --incl=* | --inc=*)
-+    includedir=$ac_optarg ;;
-+
-+  -infodir | --infodir | --infodi | --infod | --info | --inf)
-+    ac_prev=infodir ;;
-+  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-+    infodir=$ac_optarg ;;
-+
-+  -libdir | --libdir | --libdi | --libd)
-+    ac_prev=libdir ;;
-+  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-+    libdir=$ac_optarg ;;
-+
-+  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-+  | --libexe | --libex | --libe)
-+    ac_prev=libexecdir ;;
-+  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-+  | --libexe=* | --libex=* | --libe=*)
-+    libexecdir=$ac_optarg ;;
-+
-+  -localedir | --localedir | --localedi | --localed | --locale)
-+    ac_prev=localedir ;;
-+  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-+    localedir=$ac_optarg ;;
-+
-+  -localstatedir | --localstatedir | --localstatedi | --localstated \
-+  | --localstate | --localstat | --localsta | --localst | --locals)
-+    ac_prev=localstatedir ;;
-+  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-+  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
-+    localstatedir=$ac_optarg ;;
-+
-+  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-+    ac_prev=mandir ;;
-+  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-+    mandir=$ac_optarg ;;
-+
-+  -nfp | --nfp | --nf)
-+    # Obsolete; use --without-fp.
-+    with_fp=no ;;
-+
-+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-+  | --no-cr | --no-c | -n)
-+    no_create=yes ;;
-+
-+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-+    no_recursion=yes ;;
-+
-+  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-+  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-+  | --oldin | --oldi | --old | --ol | --o)
-+    ac_prev=oldincludedir ;;
-+  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-+  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-+  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-+    oldincludedir=$ac_optarg ;;
-+
-+  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-+    ac_prev=prefix ;;
-+  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-+    prefix=$ac_optarg ;;
-+
-+  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-+  | --program-pre | --program-pr | --program-p)
-+    ac_prev=program_prefix ;;
-+  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-+  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-+    program_prefix=$ac_optarg ;;
-+
-+  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-+  | --program-suf | --program-su | --program-s)
-+    ac_prev=program_suffix ;;
-+  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-+  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-+    program_suffix=$ac_optarg ;;
-+
-+  -program-transform-name | --program-transform-name \
-+  | --program-transform-nam | --program-transform-na \
-+  | --program-transform-n | --program-transform- \
-+  | --program-transform | --program-transfor \
-+  | --program-transfo | --program-transf \
-+  | --program-trans | --program-tran \
-+  | --progr-tra | --program-tr | --program-t)
-+    ac_prev=program_transform_name ;;
-+  -program-transform-name=* | --program-transform-name=* \
-+  | --program-transform-nam=* | --program-transform-na=* \
-+  | --program-transform-n=* | --program-transform-=* \
-+  | --program-transform=* | --program-transfor=* \
-+  | --program-transfo=* | --program-transf=* \
-+  | --program-trans=* | --program-tran=* \
-+  | --progr-tra=* | --program-tr=* | --program-t=*)
-+    program_transform_name=$ac_optarg ;;
-+
-+  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-+    ac_prev=pdfdir ;;
-+  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-+    pdfdir=$ac_optarg ;;
-+
-+  -psdir | --psdir | --psdi | --psd | --ps)
-+    ac_prev=psdir ;;
-+  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-+    psdir=$ac_optarg ;;
-+
-+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-+  | -silent | --silent | --silen | --sile | --sil)
-+    silent=yes ;;
-+
-+  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-+    ac_prev=sbindir ;;
-+  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-+  | --sbi=* | --sb=*)
-+    sbindir=$ac_optarg ;;
-+
-+  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-+  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-+  | --sharedst | --shareds | --shared | --share | --shar \
-+  | --sha | --sh)
-+    ac_prev=sharedstatedir ;;
-+  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-+  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-+  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-+  | --sha=* | --sh=*)
-+    sharedstatedir=$ac_optarg ;;
-+
-+  -site | --site | --sit)
-+    ac_prev=site ;;
-+  -site=* | --site=* | --sit=*)
-+    site=$ac_optarg ;;
-+
-+  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-+    ac_prev=srcdir ;;
-+  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-+    srcdir=$ac_optarg ;;
-+
-+  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-+  | --syscon | --sysco | --sysc | --sys | --sy)
-+    ac_prev=sysconfdir ;;
-+  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-+  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-+    sysconfdir=$ac_optarg ;;
-+
-+  -target | --target | --targe | --targ | --tar | --ta | --t)
-+    ac_prev=target_alias ;;
-+  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-+    target_alias=$ac_optarg ;;
-+
-+  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-+    verbose=yes ;;
-+
-+  -version | --version | --versio | --versi | --vers | -V)
-+    ac_init_version=: ;;
-+
-+  -with-* | --with-*)
-+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-+    # Reject names that are not valid shell variable names.
-+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-+      as_fn_error "invalid package name: $ac_useropt"
-+    ac_useropt_orig=$ac_useropt
-+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-+    case $ac_user_opts in
-+      *"
-+"with_$ac_useropt"
-+"*) ;;
-+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
-+	 ac_unrecognized_sep=', ';;
-+    esac
-+    eval with_$ac_useropt=\$ac_optarg ;;
-+
-+  -without-* | --without-*)
-+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-+    # Reject names that are not valid shell variable names.
-+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-+      as_fn_error "invalid package name: $ac_useropt"
-+    ac_useropt_orig=$ac_useropt
-+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-+    case $ac_user_opts in
-+      *"
-+"with_$ac_useropt"
-+"*) ;;
-+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
-+	 ac_unrecognized_sep=', ';;
-+    esac
-+    eval with_$ac_useropt=no ;;
-+
-+  --x)
-+    # Obsolete; use --with-x.
-+    with_x=yes ;;
-+
-+  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-+  | --x-incl | --x-inc | --x-in | --x-i)
-+    ac_prev=x_includes ;;
-+  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-+  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-+    x_includes=$ac_optarg ;;
-+
-+  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-+  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-+    ac_prev=x_libraries ;;
-+  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-+  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-+    x_libraries=$ac_optarg ;;
-+
-+  -*) as_fn_error "unrecognized option: \`$ac_option'
-+Try \`$0 --help' for more information."
-+    ;;
-+
-+  *=*)
-+    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-+    # Reject names that are not valid shell variable names.
-+    case $ac_envvar in #(
-+      '' | [0-9]* | *[!_$as_cr_alnum]* )
-+      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
-+    esac
-+    eval $ac_envvar=\$ac_optarg
-+    export $ac_envvar ;;
-+
-+  *)
-+    # FIXME: should be removed in autoconf 3.0.
-+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-+    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-+    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-+    ;;
-+
-+  esac
-+done
-+
-+if test -n "$ac_prev"; then
-+  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-+  as_fn_error "missing argument to $ac_option"
-+fi
-+
-+if test -n "$ac_unrecognized_opts"; then
-+  case $enable_option_checking in
-+    no) ;;
-+    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
-+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
-+  esac
-+fi
-+
-+# Check all directory arguments for consistency.
-+for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
-+		datadir sysconfdir sharedstatedir localstatedir includedir \
-+		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-+		libdir localedir mandir
-+do
-+  eval ac_val=\$$ac_var
-+  # Remove trailing slashes.
-+  case $ac_val in
-+    */ )
-+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
-+      eval $ac_var=\$ac_val;;
-+  esac
-+  # Be sure to have absolute directory names.
-+  case $ac_val in
-+    [\\/$]* | ?:[\\/]* )  continue;;
-+    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-+  esac
-+  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
-+done
-+
-+# There might be people who depend on the old broken behavior: `$host'
-+# used to hold the argument of --host etc.
-+# FIXME: To remove some day.
-+build=$build_alias
-+host=$host_alias
-+target=$target_alias
-+
-+# FIXME: To remove some day.
-+if test "x$host_alias" != x; then
-+  if test "x$build_alias" = x; then
-+    cross_compiling=maybe
-+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-+    If a cross compiler is detected then cross compile mode will be used." >&2
-+  elif test "x$build_alias" != "x$host_alias"; then
-+    cross_compiling=yes
-+  fi
-+fi
-+
-+ac_tool_prefix=
-+test -n "$host_alias" && ac_tool_prefix=$host_alias-
-+
-+test "$silent" = yes && exec 6>/dev/null
-+
-+
-+ac_pwd=`pwd` && test -n "$ac_pwd" &&
-+ac_ls_di=`ls -di .` &&
-+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-+  as_fn_error "working directory cannot be determined"
-+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-+  as_fn_error "pwd does not report name of working directory"
-+
-+
-+# Find the source files, if location was not specified.
-+if test -z "$srcdir"; then
-+  ac_srcdir_defaulted=yes
-+  # Try the directory containing this script, then the parent directory.
-+  ac_confdir=`$as_dirname -- "$as_myself" ||
-+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$as_myself" : 'X\(//\)[^/]' \| \
-+	 X"$as_myself" : 'X\(//\)$' \| \
-+	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-+$as_echo X"$as_myself" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-+  srcdir=$ac_confdir
-+  if test ! -r "$srcdir/$ac_unique_file"; then
-+    srcdir=..
-+  fi
-+else
-+  ac_srcdir_defaulted=no
-+fi
-+if test ! -r "$srcdir/$ac_unique_file"; then
-+  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-+  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
-+fi
-+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-+ac_abs_confdir=`(
-+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
-+	pwd)`
-+# When building in place, set srcdir=.
-+if test "$ac_abs_confdir" = "$ac_pwd"; then
-+  srcdir=.
-+fi
-+# Remove unnecessary trailing slashes from srcdir.
-+# Double slashes in file names in object file debugging info
-+# mess up M-x gdb in Emacs.
-+case $srcdir in
-+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-+esac
-+for ac_var in $ac_precious_vars; do
-+  eval ac_env_${ac_var}_set=\${${ac_var}+set}
-+  eval ac_env_${ac_var}_value=\$${ac_var}
-+  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-+  eval ac_cv_env_${ac_var}_value=\$${ac_var}
-+done
-+
-+#
-+# Report the --help message.
-+#
-+if test "$ac_init_help" = "long"; then
-+  # Omit some internal or obsolete options to make the list less imposing.
-+  # This message is too long to be a string in the A/UX 3.1 sh.
-+  cat <<_ACEOF
-+\`configure' configures this package to adapt to many kinds of systems.
-+
-+Usage: $0 [OPTION]... [VAR=VALUE]...
-+
-+To assign environment variables (e.g., CC, CFLAGS...), specify them as
-+VAR=VALUE.  See below for descriptions of some of the useful variables.
-+
-+Defaults for the options are specified in brackets.
-+
-+Configuration:
-+  -h, --help              display this help and exit
-+      --help=short        display options specific to this package
-+      --help=recursive    display the short help of all the included packages
-+  -V, --version           display version information and exit
-+  -q, --quiet, --silent   do not print \`checking...' messages
-+      --cache-file=FILE   cache test results in FILE [disabled]
-+  -C, --config-cache      alias for \`--cache-file=config.cache'
-+  -n, --no-create         do not create output files
-+      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-+
-+Installation directories:
-+  --prefix=PREFIX         install architecture-independent files in PREFIX
-+                          [$ac_default_prefix]
-+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-+                          [PREFIX]
-+
-+By default, \`make install' will install all the files in
-+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-+for instance \`--prefix=\$HOME'.
-+
-+For better control, use the options below.
-+
-+Fine tuning of the installation directories:
-+  --bindir=DIR            user executables [EPREFIX/bin]
-+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
-+  --libexecdir=DIR        program executables [EPREFIX/libexec]
-+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
-+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
-+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-+  --libdir=DIR            object code libraries [EPREFIX/lib]
-+  --includedir=DIR        C header files [PREFIX/include]
-+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
-+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
-+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
-+  --infodir=DIR           info documentation [DATAROOTDIR/info]
-+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
-+  --mandir=DIR            man documentation [DATAROOTDIR/man]
-+  --docdir=DIR            documentation root @<:@DATAROOTDIR/doc/PACKAGE@:>@
-+  --htmldir=DIR           html documentation [DOCDIR]
-+  --dvidir=DIR            dvi documentation [DOCDIR]
-+  --pdfdir=DIR            pdf documentation [DOCDIR]
-+  --psdir=DIR             ps documentation [DOCDIR]
-+_ACEOF
-+
-+  cat <<\_ACEOF
-+
-+Program names:
-+  --program-prefix=PREFIX            prepend PREFIX to installed program names
-+  --program-suffix=SUFFIX            append SUFFIX to installed program names
-+  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
-+
-+System types:
-+  --build=BUILD     configure for building on BUILD [guessed]
-+  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-+  --target=TARGET   configure for building compilers for TARGET [HOST]
-+_ACEOF
-+fi
-+
-+if test -n "$ac_init_help"; then
-+
-+  cat <<\_ACEOF
-+
-+Optional Features:
-+  --disable-option-checking  ignore unrecognized --enable/--with options
-+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-+  --disable-dependency-tracking  speeds up one-time build
-+  --enable-dependency-tracking   do not reject slow dependency extractors
-+  --enable-plugins        Enable support for plugins (defaults no)
-+  --disable-largefile     omit support for large files
-+  --enable-shared@<:@=PKGS@:>@  build shared libraries @<:@default=yes@:>@
-+  --enable-static@<:@=PKGS@:>@  build static libraries @<:@default=yes@:>@
-+  --enable-fast-install@<:@=PKGS@:>@ 
-+                          optimize for fast installation @<:@default=yes@:>@
-+  --disable-libtool-lock  avoid locking (might break parallel builds)
-+  --enable-targets        alternative target configurations besides the primary
-+  --enable-checking       enable run-time checks
-+  --enable-werror         treat compile warnings as errors
-+  --enable-build-warnings enable build-time compiler warnings
-+  --disable-nls           do not use Native Language Support
-+  --enable-maintainer-mode  enable make rules and dependencies not useful
-+			  (and sometimes confusing) to the casual installer
-+
-+Optional Packages:
-+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-+  --with-pic              try to use only PIC/non-PIC objects @<:@default=use
-+                          both@:>@
-+  --with-gnu-ld           assume the C compiler uses GNU ld @<:@default=no@:>@
-+  --with-zlib             include zlib support (auto/yes/no) default=auto
-+
-+Some influential environment variables:
-+  CC          C compiler command
-+  CFLAGS      C compiler flags
-+  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-+              nonstandard directory <lib dir>
-+  LIBS        libraries to pass to the linker, e.g. -l<library>
-+  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
-+              you have headers in a nonstandard directory <include dir>
-+  CPP         C preprocessor
-+  YACC        The `Yet Another C Compiler' implementation to use. Defaults to
-+              the first program found out of: `bison -y', `byacc', `yacc'.
-+  YFLAGS      The list of arguments that will be passed by default to $YACC.
-+              This script will default YFLAGS to the empty string to avoid a
-+              default value of `-d' given by some make applications.
-+
-+Use these variables to override the choices made by `configure' or to help
-+it to find libraries and programs with nonstandard names/locations.
-+
-+Report bugs to the package provider.
-+_ACEOF
-+ac_status=$?
-+fi
-+
-+if test "$ac_init_help" = "recursive"; then
-+  # If there are subdirs, report their specific --help.
-+  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-+    test -d "$ac_dir" ||
-+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
-+      continue
-+    ac_builddir=.
-+
-+case "$ac_dir" in
-+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+*)
-+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-+  # A ".." for each directory in $ac_dir_suffix.
-+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-+  case $ac_top_builddir_sub in
-+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-+  esac ;;
-+esac
-+ac_abs_top_builddir=$ac_pwd
-+ac_abs_builddir=$ac_pwd$ac_dir_suffix
-+# for backward compatibility:
-+ac_top_builddir=$ac_top_build_prefix
-+
-+case $srcdir in
-+  .)  # We are building in place.
-+    ac_srcdir=.
-+    ac_top_srcdir=$ac_top_builddir_sub
-+    ac_abs_top_srcdir=$ac_pwd ;;
-+  [\\/]* | ?:[\\/]* )  # Absolute name.
-+    ac_srcdir=$srcdir$ac_dir_suffix;
-+    ac_top_srcdir=$srcdir
-+    ac_abs_top_srcdir=$srcdir ;;
-+  *) # Relative name.
-+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-+    ac_top_srcdir=$ac_top_build_prefix$srcdir
-+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-+esac
-+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-+
-+    cd "$ac_dir" || { ac_status=$?; continue; }
-+    # Check for guested configure.
-+    if test -f "$ac_srcdir/configure.gnu"; then
-+      echo &&
-+      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-+    elif test -f "$ac_srcdir/configure"; then
-+      echo &&
-+      $SHELL "$ac_srcdir/configure" --help=recursive
-+    else
-+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-+    fi || ac_status=$?
-+    cd "$ac_pwd" || { ac_status=$?; break; }
-+  done
-+fi
-+
-+test -n "$ac_init_help" && exit $ac_status
-+if $ac_init_version; then
-+  cat <<\_ACEOF
-+configure
-+generated by GNU Autoconf 2.64
-+
-+Copyright (C) 2009 Free Software Foundation, Inc.
-+This configure script is free software; the Free Software Foundation
-+gives unlimited permission to copy, distribute and modify it.
-+_ACEOF
-+  exit
-+fi
-+
-+## ------------------------ ##
-+## Autoconf initialization. ##
-+## ------------------------ ##
-+
-+@%:@ ac_fn_c_try_compile LINENO
-+@%:@ --------------------------
-+@%:@ Try to compile conftest.$ac_ext, and return whether this succeeded.
-+ac_fn_c_try_compile ()
-+{
-+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+  rm -f conftest.$ac_objext
-+  if { { ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_compile") 2>conftest.err
-+  ac_status=$?
-+  if test -s conftest.err; then
-+    grep -v '^ *+' conftest.err >conftest.er1
-+    cat conftest.er1 >&5
-+    mv -f conftest.er1 conftest.err
-+  fi
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then :
-+  ac_retval=0
-+else
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_retval=1
-+fi
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+  return $ac_retval
-+
-+} @%:@ ac_fn_c_try_compile
-+
-+@%:@ ac_fn_c_try_link LINENO
-+@%:@ -----------------------
-+@%:@ Try to link conftest.$ac_ext, and return whether this succeeded.
-+ac_fn_c_try_link ()
-+{
-+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+  rm -f conftest.$ac_objext conftest$ac_exeext
-+  if { { ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_link") 2>conftest.err
-+  ac_status=$?
-+  if test -s conftest.err; then
-+    grep -v '^ *+' conftest.err >conftest.er1
-+    cat conftest.er1 >&5
-+    mv -f conftest.er1 conftest.err
-+  fi
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then :
-+  ac_retval=0
-+else
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_retval=1
-+fi
-+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
-+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
-+  # interfere with the next link command; also delete a directory that is
-+  # left behind by Apple's compiler.  We do this before executing the actions.
-+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+  return $ac_retval
-+
-+} @%:@ ac_fn_c_try_link
-+
-+@%:@ ac_fn_c_try_cpp LINENO
-+@%:@ ----------------------
-+@%:@ Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-+ac_fn_c_try_cpp ()
-+{
-+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+  if { { ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
-+  ac_status=$?
-+  if test -s conftest.err; then
-+    grep -v '^ *+' conftest.err >conftest.er1
-+    cat conftest.er1 >&5
-+    mv -f conftest.er1 conftest.err
-+  fi
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; } >/dev/null && {
-+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then :
-+  ac_retval=0
-+else
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+    ac_retval=1
-+fi
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+  return $ac_retval
-+
-+} @%:@ ac_fn_c_try_cpp
-+
-+@%:@ ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
-+@%:@ -------------------------------------------------------
-+@%:@ Tests whether HEADER exists, giving a warning if it cannot be compiled using
-+@%:@ the include files in INCLUDES and setting the cache variable VAR
-+@%:@ accordingly.
-+ac_fn_c_check_header_mongrel ()
-+{
-+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-+$as_echo_n "checking for $2... " >&6; }
-+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-+  $as_echo_n "(cached) " >&6
-+fi
-+eval ac_res=\$$3
-+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+else
-+  # Is the header compilable?
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
-+$as_echo_n "checking $2 usability... " >&6; }
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+$4
-+@%:@include <$2>
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_header_compiler=yes
-+else
-+  ac_header_compiler=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
-+$as_echo "$ac_header_compiler" >&6; }
-+
-+# Is the header present?
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
-+$as_echo_n "checking $2 presence... " >&6; }
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+@%:@include <$2>
-+_ACEOF
-+if ac_fn_c_try_cpp "$LINENO"; then :
-+  ac_header_preproc=yes
-+else
-+  ac_header_preproc=no
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
-+$as_echo "$ac_header_preproc" >&6; }
-+
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
-+  yes:no: )
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
-+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-+    ;;
-+  no:yes:* )
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
-+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
-+$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
-+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
-+$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-+    ;;
-+esac
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-+$as_echo_n "checking for $2... " >&6; }
-+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  eval "$3=\$ac_header_compiler"
-+fi
-+eval ac_res=\$$3
-+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+fi
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+
-+} @%:@ ac_fn_c_check_header_mongrel
-+
-+@%:@ ac_fn_c_try_run LINENO
-+@%:@ ----------------------
-+@%:@ Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-+@%:@ that executables *can* be run.
-+ac_fn_c_try_run ()
-+{
-+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+  if { { ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_link") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
-+  { { case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; }; then :
-+  ac_retval=0
-+else
-+  $as_echo "$as_me: program exited with status $ac_status" >&5
-+       $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+       ac_retval=$ac_status
-+fi
-+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+  return $ac_retval
-+
-+} @%:@ ac_fn_c_try_run
-+
-+@%:@ ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
-+@%:@ -------------------------------------------------------
-+@%:@ Tests whether HEADER exists and can be compiled using the include files in
-+@%:@ INCLUDES, setting the cache variable VAR accordingly.
-+ac_fn_c_check_header_compile ()
-+{
-+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-+$as_echo_n "checking for $2... " >&6; }
-+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+$4
-+@%:@include <$2>
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  eval "$3=yes"
-+else
-+  eval "$3=no"
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+eval ac_res=\$$3
-+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+
-+} @%:@ ac_fn_c_check_header_compile
-+
-+@%:@ ac_fn_c_check_func LINENO FUNC VAR
-+@%:@ ----------------------------------
-+@%:@ Tests whether FUNC exists, setting the cache variable VAR accordingly
-+ac_fn_c_check_func ()
-+{
-+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-+$as_echo_n "checking for $2... " >&6; }
-+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define $2 innocuous_$2
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $2 (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef $2
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char $2 ();
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined __stub_$2 || defined __stub___$2
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
-+return $2 ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  eval "$3=yes"
-+else
-+  eval "$3=no"
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+fi
-+eval ac_res=\$$3
-+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+
-+} @%:@ ac_fn_c_check_func
-+
-+@%:@ ac_fn_c_check_decl LINENO SYMBOL VAR
-+@%:@ ------------------------------------
-+@%:@ Tests whether SYMBOL is declared, setting cache variable VAR accordingly.
-+ac_fn_c_check_decl ()
-+{
-+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+  as_decl_name=`echo $2|sed 's/ *(.*//'`
-+  as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
-+$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
-+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+$4
-+int
-+main ()
-+{
-+@%:@ifndef $as_decl_name
-+@%:@ifdef __cplusplus
-+  (void) $as_decl_use;
-+@%:@else
-+  (void) $as_decl_name;
-+@%:@endif
-+@%:@endif
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  eval "$3=yes"
-+else
-+  eval "$3=no"
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+eval ac_res=\$$3
-+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+
-+} @%:@ ac_fn_c_check_decl
-+cat >config.log <<_ACEOF
-+This file contains any messages produced by compilers while
-+running configure, to aid debugging if configure makes a mistake.
-+
-+It was created by $as_me, which was
-+generated by GNU Autoconf 2.64.  Invocation command line was
-+
-+  $ $0 $@
-+
-+_ACEOF
-+exec 5>>config.log
-+{
-+cat <<_ASUNAME
-+## --------- ##
-+## Platform. ##
-+## --------- ##
-+
-+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-+uname -m = `(uname -m) 2>/dev/null || echo unknown`
-+uname -r = `(uname -r) 2>/dev/null || echo unknown`
-+uname -s = `(uname -s) 2>/dev/null || echo unknown`
-+uname -v = `(uname -v) 2>/dev/null || echo unknown`
-+
-+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-+
-+/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`
-+/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
-+/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`
-+
-+_ASUNAME
-+
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    $as_echo "PATH: $as_dir"
-+  done
-+IFS=$as_save_IFS
-+
-+} >&5
-+
-+cat >&5 <<_ACEOF
-+
-+
-+## ----------- ##
-+## Core tests. ##
-+## ----------- ##
-+
-+_ACEOF
-+
-+
-+# Keep a trace of the command line.
-+# Strip out --no-create and --no-recursion so they do not pile up.
-+# Strip out --silent because we don't want to record it for future runs.
-+# Also quote any args containing shell meta-characters.
-+# Make two passes to allow for proper duplicate-argument suppression.
-+ac_configure_args=
-+ac_configure_args0=
-+ac_configure_args1=
-+ac_must_keep_next=false
-+for ac_pass in 1 2
-+do
-+  for ac_arg
-+  do
-+    case $ac_arg in
-+    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-+    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-+    | -silent | --silent | --silen | --sile | --sil)
-+      continue ;;
-+    *\'*)
-+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-+    esac
-+    case $ac_pass in
-+    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
-+    2)
-+      as_fn_append ac_configure_args1 " '$ac_arg'"
-+      if test $ac_must_keep_next = true; then
-+	ac_must_keep_next=false # Got value, back to normal.
-+      else
-+	case $ac_arg in
-+	  *=* | --config-cache | -C | -disable-* | --disable-* \
-+	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-+	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-+	  | -with-* | --with-* | -without-* | --without-* | --x)
-+	    case "$ac_configure_args0 " in
-+	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-+	    esac
-+	    ;;
-+	  -* ) ac_must_keep_next=true ;;
-+	esac
-+      fi
-+      as_fn_append ac_configure_args " '$ac_arg'"
-+      ;;
-+    esac
-+  done
-+done
-+{ ac_configure_args0=; unset ac_configure_args0;}
-+{ ac_configure_args1=; unset ac_configure_args1;}
-+
-+# 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.
-+# WARNING: Use '\'' to represent an apostrophe within the trap.
-+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-+trap 'exit_status=$?
-+  # Save into config.log some information that might help in debugging.
-+  {
-+    echo
-+
-+    cat <<\_ASBOX
-+## ---------------- ##
-+## Cache variables. ##
-+## ---------------- ##
-+_ASBOX
-+    echo
-+    # The following way of writing the cache mishandles newlines in values,
-+(
-+  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-+    eval ac_val=\$$ac_var
-+    case $ac_val in #(
-+    *${as_nl}*)
-+      case $ac_var in #(
-+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-+      esac
-+      case $ac_var in #(
-+      _ | IFS | as_nl) ;; #(
-+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-+      *) { eval $ac_var=; unset $ac_var;} ;;
-+      esac ;;
-+    esac
-+  done
-+  (set) 2>&1 |
-+    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-+    *${as_nl}ac_space=\ *)
-+      sed -n \
-+	"s/'\''/'\''\\\\'\'''\''/g;
-+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-+      ;; #(
-+    *)
-+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-+      ;;
-+    esac |
-+    sort
-+)
-+    echo
-+
-+    cat <<\_ASBOX
-+## ----------------- ##
-+## Output variables. ##
-+## ----------------- ##
-+_ASBOX
-+    echo
-+    for ac_var in $ac_subst_vars
-+    do
-+      eval ac_val=\$$ac_var
-+      case $ac_val in
-+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-+      esac
-+      $as_echo "$ac_var='\''$ac_val'\''"
-+    done | sort
-+    echo
-+
-+    if test -n "$ac_subst_files"; then
-+      cat <<\_ASBOX
-+## ------------------- ##
-+## File substitutions. ##
-+## ------------------- ##
-+_ASBOX
-+      echo
-+      for ac_var in $ac_subst_files
-+      do
-+	eval ac_val=\$$ac_var
-+	case $ac_val in
-+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-+	esac
-+	$as_echo "$ac_var='\''$ac_val'\''"
-+      done | sort
-+      echo
-+    fi
-+
-+    if test -s confdefs.h; then
-+      cat <<\_ASBOX
-+## ----------- ##
-+## confdefs.h. ##
-+## ----------- ##
-+_ASBOX
-+      echo
-+      cat confdefs.h
-+      echo
-+    fi
-+    test "$ac_signal" != 0 &&
-+      $as_echo "$as_me: caught signal $ac_signal"
-+    $as_echo "$as_me: exit $exit_status"
-+  } >&5
-+  rm -f core *.core core.conftest.* &&
-+    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-+    exit $exit_status
-+' 0
-+for ac_signal in 1 2 13 15; do
-+  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
-+done
-+ac_signal=0
-+
-+# confdefs.h avoids OS command line length limits that DEFS can exceed.
-+rm -f -r conftest* confdefs.h
-+
-+$as_echo "/* confdefs.h */" > confdefs.h
-+
-+# Predefined preprocessor variables.
-+
-+cat >>confdefs.h <<_ACEOF
-+@%:@define PACKAGE_NAME "$PACKAGE_NAME"
-+_ACEOF
-+
-+cat >>confdefs.h <<_ACEOF
-+@%:@define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-+_ACEOF
-+
-+cat >>confdefs.h <<_ACEOF
-+@%:@define PACKAGE_VERSION "$PACKAGE_VERSION"
-+_ACEOF
-+
-+cat >>confdefs.h <<_ACEOF
-+@%:@define PACKAGE_STRING "$PACKAGE_STRING"
-+_ACEOF
-+
-+cat >>confdefs.h <<_ACEOF
-+@%:@define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-+_ACEOF
-+
-+cat >>confdefs.h <<_ACEOF
-+@%:@define PACKAGE_URL "$PACKAGE_URL"
-+_ACEOF
-+
-+
-+# Let the site file select an alternate cache file if it wants to.
-+# Prefer an explicitly selected file to automatically selected ones.
-+ac_site_file1=NONE
-+ac_site_file2=NONE
-+if test -n "$CONFIG_SITE"; then
-+  ac_site_file1=$CONFIG_SITE
-+elif test "x$prefix" != xNONE; then
-+  ac_site_file1=$prefix/share/config.site
-+  ac_site_file2=$prefix/etc/config.site
-+else
-+  ac_site_file1=$ac_default_prefix/share/config.site
-+  ac_site_file2=$ac_default_prefix/etc/config.site
-+fi
-+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
-+do
-+  test "x$ac_site_file" = xNONE && continue
-+  if test -r "$ac_site_file"; then
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
-+    sed 's/^/| /' "$ac_site_file" >&5
-+    . "$ac_site_file"
-+  fi
-+done
-+
-+if test -r "$cache_file"; then
-+  # Some versions of bash will fail to source /dev/null (special
-+  # files actually), so we avoid doing that.
-+  if test -f "$cache_file"; then
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-+$as_echo "$as_me: loading cache $cache_file" >&6;}
-+    case $cache_file in
-+      [\\/]* | ?:[\\/]* ) . "$cache_file";;
-+      *)                      . "./$cache_file";;
-+    esac
-+  fi
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-+$as_echo "$as_me: creating cache $cache_file" >&6;}
-+  >$cache_file
-+fi
-+
-+# Check that the precious variables saved in the cache have kept the same
-+# value.
-+ac_cache_corrupted=false
-+for ac_var in $ac_precious_vars; do
-+  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-+  eval ac_new_set=\$ac_env_${ac_var}_set
-+  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-+  eval ac_new_val=\$ac_env_${ac_var}_value
-+  case $ac_old_set,$ac_new_set in
-+    set,)
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-+      ac_cache_corrupted=: ;;
-+    ,set)
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
-+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-+      ac_cache_corrupted=: ;;
-+    ,);;
-+    *)
-+      if test "x$ac_old_val" != "x$ac_new_val"; then
-+	# differences in whitespace do not lead to failure.
-+	ac_old_val_w=`echo x $ac_old_val`
-+	ac_new_val_w=`echo x $ac_new_val`
-+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-+	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
-+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-+	  ac_cache_corrupted=:
-+	else
-+	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
-+	  eval $ac_var=\$ac_old_val
-+	fi
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
-+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
-+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
-+      fi;;
-+  esac
-+  # Pass precious variables to config.status.
-+  if test "$ac_new_set" = set; then
-+    case $ac_new_val in
-+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-+    *) ac_arg=$ac_var=$ac_new_val ;;
-+    esac
-+    case " $ac_configure_args " in
-+      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-+      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
-+    esac
-+  fi
-+done
-+if $ac_cache_corrupted; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-+  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
-+fi
-+## -------------------- ##
-+## Main body of script. ##
-+## -------------------- ##
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+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
-+
-+
-+
-+
-+
-+
-+
-+ac_aux_dir=
-+for ac_dir in .. "$srcdir"/..; do
-+  for ac_t in install-sh install.sh shtool; do
-+    if test -f "$ac_dir/$ac_t"; then
-+      ac_aux_dir=$ac_dir
-+      ac_install_sh="$ac_aux_dir/$ac_t -c"
-+      break 2
-+    fi
-+  done
-+done
-+if test -z "$ac_aux_dir"; then
-+  as_fn_error "cannot find install-sh, install.sh, or shtool in .. \"$srcdir\"/.." "$LINENO" 5
-+fi
-+
-+# These three variables are undocumented and unsupported,
-+# and are intended to be withdrawn in a future Autoconf release.
-+# They can cause serious problems if a builder's source tree is in a directory
-+# whose full name contains unusual characters.
-+ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-+ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-+ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-+
-+
-+# Make sure we can run config.sub.
-+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-+  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
-+$as_echo_n "checking build system type... " >&6; }
-+if test "${ac_cv_build+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_build_alias=$build_alias
-+test "x$ac_build_alias" = x &&
-+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-+test "x$ac_build_alias" = x &&
-+  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
-+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-+  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-+$as_echo "$ac_cv_build" >&6; }
-+case $ac_cv_build in
-+*-*-*) ;;
-+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
-+esac
-+build=$ac_cv_build
-+ac_save_IFS=$IFS; IFS='-'
-+set x $ac_cv_build
-+shift
-+build_cpu=$1
-+build_vendor=$2
-+shift; shift
-+# Remember, the first character of IFS is used to create $*,
-+# except with old shells:
-+build_os=$*
-+IFS=$ac_save_IFS
-+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
-+$as_echo_n "checking host system type... " >&6; }
-+if test "${ac_cv_host+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test "x$host_alias" = x; then
-+  ac_cv_host=$ac_cv_build
-+else
-+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-+    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
-+fi
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-+$as_echo "$ac_cv_host" >&6; }
-+case $ac_cv_host in
-+*-*-*) ;;
-+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
-+esac
-+host=$ac_cv_host
-+ac_save_IFS=$IFS; IFS='-'
-+set x $ac_cv_host
-+shift
-+host_cpu=$1
-+host_vendor=$2
-+shift; shift
-+# Remember, the first character of IFS is used to create $*,
-+# except with old shells:
-+host_os=$*
-+IFS=$ac_save_IFS
-+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
-+$as_echo_n "checking target system type... " >&6; }
-+if test "${ac_cv_target+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test "x$target_alias" = x; then
-+  ac_cv_target=$ac_cv_host
-+else
-+  ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
-+    as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
-+fi
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5
-+$as_echo "$ac_cv_target" >&6; }
-+case $ac_cv_target in
-+*-*-*) ;;
-+*) as_fn_error "invalid value of canonical target" "$LINENO" 5;;
-+esac
-+target=$ac_cv_target
-+ac_save_IFS=$IFS; IFS='-'
-+set x $ac_cv_target
-+shift
-+target_cpu=$1
-+target_vendor=$2
-+shift; shift
-+# Remember, the first character of IFS is used to create $*,
-+# except with old shells:
-+target_os=$*
-+IFS=$ac_save_IFS
-+case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
-+
-+
-+# The aliases save the names the user supplied, while $host etc.
-+# will get canonicalized.
-+test -n "$target_alias" &&
-+  test "$program_prefix$program_suffix$program_transform_name" = \
-+    NONENONEs,x,x, &&
-+  program_prefix=${target_alias}-
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+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
-+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
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_CC+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$CC"; then
-+  ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+CC=$ac_cv_prog_CC
-+if test -n "$CC"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-+$as_echo "$CC" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$ac_cv_prog_CC"; then
-+  ac_ct_CC=$CC
-+  # Extract the first word of "gcc", so it can be a program name with args.
-+set dummy gcc; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$ac_ct_CC"; then
-+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_CC="gcc"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_CC=$ac_cv_prog_ac_ct_CC
-+if test -n "$ac_ct_CC"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-+$as_echo "$ac_ct_CC" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+  if test "x$ac_ct_CC" = x; then
-+    CC=""
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    CC=$ac_ct_CC
-+  fi
-+else
-+  CC="$ac_cv_prog_CC"
-+fi
-+
-+if test -z "$CC"; then
-+          if test -n "$ac_tool_prefix"; then
-+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}cc; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_CC+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$CC"; then
-+  ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_CC="${ac_tool_prefix}cc"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+CC=$ac_cv_prog_CC
-+if test -n "$CC"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-+$as_echo "$CC" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+  fi
-+fi
-+if test -z "$CC"; then
-+  # Extract the first word of "cc", so it can be a program name with args.
-+set dummy cc; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_CC+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$CC"; then
-+  ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+  ac_prog_rejected=no
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-+       ac_prog_rejected=yes
-+       continue
-+     fi
-+    ac_cv_prog_CC="cc"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+if test $ac_prog_rejected = yes; then
-+  # We found a bogon in the path, so make sure we never use it.
-+  set dummy $ac_cv_prog_CC
-+  shift
-+  if test $@%:@ != 0; then
-+    # We chose a different compiler from the bogus one.
-+    # However, it has the same basename, so the bogon will be chosen
-+    # first if we set CC to just the basename; use the full file name.
-+    shift
-+    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-+  fi
-+fi
-+fi
-+fi
-+CC=$ac_cv_prog_CC
-+if test -n "$CC"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-+$as_echo "$CC" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$CC"; then
-+  if test -n "$ac_tool_prefix"; then
-+  for ac_prog in cl.exe
-+  do
-+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_CC+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$CC"; then
-+  ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+CC=$ac_cv_prog_CC
-+if test -n "$CC"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-+$as_echo "$CC" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+    test -n "$CC" && break
-+  done
-+fi
-+if test -z "$CC"; then
-+  ac_ct_CC=$CC
-+  for ac_prog in cl.exe
-+do
-+  # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$ac_ct_CC"; then
-+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_CC="$ac_prog"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_CC=$ac_cv_prog_ac_ct_CC
-+if test -n "$ac_ct_CC"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-+$as_echo "$ac_ct_CC" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+  test -n "$ac_ct_CC" && break
-+done
-+
-+  if test "x$ac_ct_CC" = x; then
-+    CC=""
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    CC=$ac_ct_CC
-+  fi
-+fi
-+
-+fi
-+
-+
-+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "no acceptable C compiler found in \$PATH
-+See \`config.log' for more details." "$LINENO" 5; }
-+
-+# Provide some information about the compiler.
-+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-+set X $ac_compile
-+ac_compiler=$2
-+for ac_option in --version -v -V -qversion; do
-+  { { ac_try="$ac_compiler $ac_option >&5"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-+  ac_status=$?
-+  if test -s conftest.err; then
-+    sed '10a\
-+... rest of stderr output deleted ...
-+         10q' conftest.err >conftest.er1
-+    cat conftest.er1 >&5
-+    rm -f conftest.er1 conftest.err
-+  fi
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }
-+done
-+
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+ac_clean_files_save=$ac_clean_files
-+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
-+# 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.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-+$as_echo_n "checking for C compiler default output file name... " >&6; }
-+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-+
-+# The possible output files:
-+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
-+
-+ac_rmfiles=
-+for ac_file in $ac_files
-+do
-+  case $ac_file in
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-+    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-+  esac
-+done
-+rm -f $ac_rmfiles
-+
-+if { { ac_try="$ac_link_default"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_link_default") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then :
-+  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-+# in a Makefile.  We should not override ac_cv_exeext if it was cached,
-+# so that the user can short-circuit this test for compilers unknown to
-+# Autoconf.
-+for ac_file in $ac_files ''
-+do
-+  test -f "$ac_file" || continue
-+  case $ac_file in
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
-+	;;
-+    [ab].out )
-+	# We found the default executable, but exeext='' is most
-+	# certainly right.
-+	break;;
-+    *.* )
-+	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-+	then :; else
-+	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-+	fi
-+	# We set ac_cv_exeext here because the later test for it is not
-+	# safe: cross compilers may not add the suffix if given an `-o'
-+	# argument, so we may need to know it at that point already.
-+	# Even if this section looks crufty: it has the advantage of
-+	# actually working.
-+	break;;
-+    * )
-+	break;;
-+  esac
-+done
-+test "$ac_cv_exeext" = no && ac_cv_exeext=
-+
-+else
-+  ac_file=''
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-+$as_echo "$ac_file" >&6; }
-+if test -z "$ac_file"; then :
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ as_fn_set_status 77
-+as_fn_error "C compiler cannot create executables
-+See \`config.log' for more details." "$LINENO" 5; }; }
-+fi
-+ac_exeext=$ac_cv_exeext
-+
-+# Check that the compiler produces executables we can run.  If not, either
-+# the compiler is broken, or we cross compile.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-+$as_echo_n "checking whether the C compiler works... " >&6; }
-+# If not cross compiling, check that we can run a simple program.
-+if test "$cross_compiling" != yes; then
-+  if { ac_try='./$ac_file'
-+  { { case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; }; then
-+    cross_compiling=no
-+  else
-+    if test "$cross_compiling" = maybe; then
-+	cross_compiling=yes
-+    else
-+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "cannot run C compiled programs.
-+If you meant to cross compile, use \`--host'.
-+See \`config.log' for more details." "$LINENO" 5; }
-+    fi
-+  fi
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+
-+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
-+ac_clean_files=$ac_clean_files_save
-+# Check that the compiler produces executables we can run.  If not, either
-+# the compiler is broken, or we cross compile.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-+$as_echo_n "checking whether we are cross compiling... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-+$as_echo "$cross_compiling" >&6; }
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
-+$as_echo_n "checking for suffix of executables... " >&6; }
-+if { { ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_link") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then :
-+  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-+# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-+# work properly (i.e., refer to `conftest.exe'), while it won't with
-+# `rm'.
-+for ac_file in conftest.exe conftest conftest.*; do
-+  test -f "$ac_file" || continue
-+  case $ac_file in
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-+    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-+	  break;;
-+    * ) break;;
-+  esac
-+done
-+else
-+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "cannot compute suffix of executables: cannot compile and link
-+See \`config.log' for more details." "$LINENO" 5; }
-+fi
-+rm -f conftest$ac_cv_exeext
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-+$as_echo "$ac_cv_exeext" >&6; }
-+
-+rm -f conftest.$ac_ext
-+EXEEXT=$ac_cv_exeext
-+ac_exeext=$EXEEXT
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
-+$as_echo_n "checking for suffix of object files... " >&6; }
-+if test "${ac_cv_objext+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.o conftest.obj
-+if { { ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_compile") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then :
-+  for ac_file in conftest.o conftest.obj conftest.*; do
-+  test -f "$ac_file" || continue;
-+  case $ac_file in
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
-+    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-+       break;;
-+  esac
-+done
-+else
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "cannot compute suffix of object files: cannot compile
-+See \`config.log' for more details." "$LINENO" 5; }
-+fi
-+rm -f conftest.$ac_cv_objext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-+$as_echo "$ac_cv_objext" >&6; }
-+OBJEXT=$ac_cv_objext
-+ac_objext=$OBJEXT
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+#ifndef __GNUC__
-+       choke me
-+#endif
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_compiler_gnu=yes
-+else
-+  ac_compiler_gnu=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ac_cv_c_compiler_gnu=$ac_compiler_gnu
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-+if test $ac_compiler_gnu = yes; then
-+  GCC=yes
-+else
-+  GCC=
-+fi
-+ac_test_CFLAGS=${CFLAGS+set}
-+ac_save_CFLAGS=$CFLAGS
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-+$as_echo_n "checking whether $CC accepts -g... " >&6; }
-+if test "${ac_cv_prog_cc_g+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_save_c_werror_flag=$ac_c_werror_flag
-+   ac_c_werror_flag=yes
-+   ac_cv_prog_cc_g=no
-+   CFLAGS="-g"
-+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_prog_cc_g=yes
-+else
-+  CFLAGS=""
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  
-+else
-+  ac_c_werror_flag=$ac_save_c_werror_flag
-+	 CFLAGS="-g"
-+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_prog_cc_g=yes
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+   ac_c_werror_flag=$ac_save_c_werror_flag
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-+$as_echo "$ac_cv_prog_cc_g" >&6; }
-+if test "$ac_test_CFLAGS" = set; then
-+  CFLAGS=$ac_save_CFLAGS
-+elif test $ac_cv_prog_cc_g = yes; then
-+  if test "$GCC" = yes; then
-+    CFLAGS="-g -O2"
-+  else
-+    CFLAGS="-g"
-+  fi
-+else
-+  if test "$GCC" = yes; then
-+    CFLAGS="-O2"
-+  else
-+    CFLAGS=
-+  fi
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-+if test "${ac_cv_prog_cc_c89+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_cv_prog_cc_c89=no
-+ac_save_CC=$CC
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <stdarg.h>
-+#include <stdio.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-+struct buf { int x; };
-+FILE * (*rcsopen) (struct buf *, struct stat *, int);
-+static char *e (p, i)
-+     char **p;
-+     int i;
-+{
-+  return p[i];
-+}
-+static char *f (char * (*g) (char **, int), char **p, ...)
-+{
-+  char *s;
-+  va_list v;
-+  va_start (v,p);
-+  s = g (p, va_arg (v,int));
-+  va_end (v);
-+  return s;
-+}
-+
-+/* 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
-+   as 'x'.  The following induces an error, until -std is added to get
-+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-+   array size at least.  It's necessary to write '\x00'==0 to get something
-+   that's true only with -std.  */
-+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-+
-+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-+   inside strings and character constants.  */
-+#define FOO(x) 'x'
-+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-+
-+int test (int i, double x);
-+struct s1 {int (*f) (int a);};
-+struct s2 {int (*f) (double a);};
-+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-+int argc;
-+char **argv;
-+int
-+main ()
-+{
-+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-+do
-+  CC="$ac_save_CC $ac_arg"
-+  if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_prog_cc_c89=$ac_arg
-+fi
-+rm -f core conftest.err conftest.$ac_objext
-+  test "x$ac_cv_prog_cc_c89" != "xno" && break
-+done
-+rm -f conftest.$ac_ext
-+CC=$ac_save_CC
-+
-+fi
-+# AC_CACHE_VAL
-+case "x$ac_cv_prog_cc_c89" in
-+  x)
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-+$as_echo "none needed" >&6; } ;;
-+  xno)
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-+$as_echo "unsupported" >&6; } ;;
-+  *)
-+    CC="$CC $ac_cv_prog_cc_c89"
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-+esac
-+if test "x$ac_cv_prog_cc_c89" != xno; then :
-+  
-+fi
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+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
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
-+$as_echo_n "checking for library containing strerror... " >&6; }
-+if test "${ac_cv_search_strerror+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_func_search_save_LIBS=$LIBS
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char strerror ();
-+int
-+main ()
-+{
-+return strerror ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+for ac_lib in '' cposix; do
-+  if test -z "$ac_lib"; then
-+    ac_res="none required"
-+  else
-+    ac_res=-l$ac_lib
-+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-+  fi
-+  if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_search_strerror=$ac_res
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext
-+  if test "${ac_cv_search_strerror+set}" = set; then :
-+  break
-+fi
-+done
-+if test "${ac_cv_search_strerror+set}" = set; then :
-+  
-+else
-+  ac_cv_search_strerror=no
-+fi
-+rm conftest.$ac_ext
-+LIBS=$ac_func_search_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5
-+$as_echo "$ac_cv_search_strerror" >&6; }
-+ac_res=$ac_cv_search_strerror
-+if test "$ac_res" != no; then :
-+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-+  
-+fi
-+
-+
-+BFD_VERSION=`sed -n -e 's/^.._INIT_AUTOMAKE.*,[ 	]*\([^ 	]*\)[ 	]*).*/\1/p' < ${srcdir}/../bfd/configure.in`
-+am__api_version='1.11'
-+
-+# Find a good install program.  We prefer a C program (faster),
-+# so one script is as good as another.  But avoid the broken or
-+# incompatible versions:
-+# SysV /etc/install, /usr/sbin/install
-+# SunOS /usr/etc/install
-+# IRIX /sbin/install
-+# AIX /bin/install
-+# AmigaOS /C/install, which installs bootblocks on floppy discs
-+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-+# 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.
-+# Reject install programs that cannot install multiple files.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
-+$as_echo_n "checking for a BSD-compatible install... " >&6; }
-+if test -z "$INSTALL"; then
-+if test "${ac_cv_path_install+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    # Account for people who put trailing slashes in PATH elements.
-+case $as_dir/ in @%:@((
-+  ./ | .// | /[cC]/* | \
-+  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-+  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
-+  /usr/ucb/* ) ;;
-+  *)
-+    # OSF1 and SCO ODT 3.0 have their own names for install.
-+    # Don't use installbsd from OSF since it installs stuff as root
-+    # by default.
-+    for ac_prog in ginstall scoinst install; do
-+      for ac_exec_ext in '' $ac_executable_extensions; do
-+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
-+	  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.
-+	    :
-+	  elif test $ac_prog = install &&
-+	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-+	    # program-specific install script used by HP pwplus--don't use.
-+	    :
-+	  else
-+	    rm -rf conftest.one conftest.two conftest.dir
-+	    echo one > conftest.one
-+	    echo two > conftest.two
-+	    mkdir conftest.dir
-+	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
-+	      test -s conftest.one && test -s conftest.two &&
-+	      test -s conftest.dir/conftest.one &&
-+	      test -s conftest.dir/conftest.two
-+	    then
-+	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-+	      break 3
-+	    fi
-+	  fi
-+	fi
-+      done
-+    done
-+    ;;
-+esac
-+
-+  done
-+IFS=$as_save_IFS
-+
-+rm -rf conftest.one conftest.two conftest.dir
-+
-+fi
-+  if test "${ac_cv_path_install+set}" = set; then
-+    INSTALL=$ac_cv_path_install
-+  else
-+    # As a last resort, use the slow shell script.  Don't cache a
-+    # value for INSTALL within a source directory, because that will
-+    # break other packages using the cache if that directory is
-+    # removed, or if the value is a relative name.
-+    INSTALL=$ac_install_sh
-+  fi
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
-+$as_echo "$INSTALL" >&6; }
-+
-+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-+# It thinks the first close brace ends the variable substitution.
-+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-+
-+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-+
-+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
-+$as_echo_n "checking whether build environment is sane... " >&6; }
-+# Just in case
-+sleep 1
-+echo timestamp > conftest.file
-+# Reject unsafe characters in $srcdir or the absolute working directory
-+# name.  Accept space and tab only in the latter.
-+am_lf='
-+'
-+case `pwd` in
-+  *[\\\"\#\$\&\'\`$am_lf]*)
-+    as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
-+esac
-+case $srcdir in
-+  *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-+    as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
-+esac
-+
-+# Do `set' in a subshell so we don't clobber the current shell's
-+# arguments.  Must try -L first in case configure is actually a
-+# symlink; some systems play weird games with the mod time of symlinks
-+# (eg FreeBSD returns the mod time of the symlink's containing
-+# directory).
-+if (
-+   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-+   if test "$*" = "X"; then
-+      # -L didn't work.
-+      set X `ls -t "$srcdir/configure" conftest.file`
-+   fi
-+   rm -f conftest.file
-+   if test "$*" != "X $srcdir/configure conftest.file" \
-+      && test "$*" != "X conftest.file $srcdir/configure"; then
-+
-+      # If neither matched, then we have a broken ls.  This can happen
-+      # if, for instance, CONFIG_SHELL is bash and it inherits a
-+      # broken ls alias from the environment.  This has actually
-+      # happened.  Such a system could not be considered "sane".
-+      as_fn_error "ls -t appears to fail.  Make sure there is not a broken
-+alias in your environment" "$LINENO" 5
-+   fi
-+
-+   test "$2" = conftest.file
-+   )
-+then
-+   # Ok.
-+   :
-+else
-+   as_fn_error "newly created file is older than distributed files!
-+Check your system clock" "$LINENO" 5
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+test "$program_prefix" != NONE &&
-+  program_transform_name="s&^&$program_prefix&;$program_transform_name"
-+# Use a double $ so make ignores it.
-+test "$program_suffix" != NONE &&
-+  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-+# Double any \ or $.
-+# By default was `s,x,x', remove it if useless.
-+ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
-+program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
-+
-+# expand $ac_aux_dir to an absolute path
-+am_aux_dir=`cd $ac_aux_dir && pwd`
-+
-+if test x"${MISSING+set}" != xset; then
-+  case $am_aux_dir in
-+  *\ * | *\	*)
-+    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-+  *)
-+    MISSING="\${SHELL} $am_aux_dir/missing" ;;
-+  esac
-+fi
-+# Use eval to expand $SHELL
-+if eval "$MISSING --run true"; then
-+  am_missing_run="$MISSING --run "
-+else
-+  am_missing_run=
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
-+$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
-+fi
-+
-+if test x"${install_sh}" != xset; then
-+  case $am_aux_dir in
-+  *\ * | *\	*)
-+    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
-+  *)
-+    install_sh="\${SHELL} $am_aux_dir/install-sh"
-+  esac
-+fi
-+
-+# Installed binaries are usually stripped using `strip' when the user
-+# run `make install-strip'.  However `strip' might not be the right
-+# tool to use in cross-compilation environments, therefore Automake
-+# will honor the `STRIP' environment variable to overrule this program.
-+if test "$cross_compiling" != no; then
-+  if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}strip; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_STRIP+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$STRIP"; then
-+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+STRIP=$ac_cv_prog_STRIP
-+if test -n "$STRIP"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-+$as_echo "$STRIP" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$ac_cv_prog_STRIP"; then
-+  ac_ct_STRIP=$STRIP
-+  # Extract the first word of "strip", so it can be a program name with args.
-+set dummy strip; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$ac_ct_STRIP"; then
-+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_STRIP="strip"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-+if test -n "$ac_ct_STRIP"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-+$as_echo "$ac_ct_STRIP" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+  if test "x$ac_ct_STRIP" = x; then
-+    STRIP=":"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    STRIP=$ac_ct_STRIP
-+  fi
-+else
-+  STRIP="$ac_cv_prog_STRIP"
-+fi
-+
-+fi
-+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
-+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
-+if test -z "$MKDIR_P"; then
-+  if test "${ac_cv_path_mkdir+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_prog in mkdir gmkdir; do
-+	 for ac_exec_ext in '' $ac_executable_extensions; do
-+	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
-+	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-+	     'mkdir (GNU coreutils) '* | \
-+	     'mkdir (coreutils) '* | \
-+	     'mkdir (fileutils) '4.1*)
-+	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
-+	       break 3;;
-+	   esac
-+	 done
-+       done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+
-+  if test "${ac_cv_path_mkdir+set}" = set; then
-+    MKDIR_P="$ac_cv_path_mkdir -p"
-+  else
-+    # As a last resort, use the slow shell script.  Don't cache a
-+    # value for MKDIR_P within a source directory, because that will
-+    # break other packages using the cache if that directory is
-+    # removed, or if the value is a relative name.
-+    test -d ./--version && rmdir ./--version
-+    MKDIR_P="$ac_install_sh -d"
-+  fi
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
-+$as_echo "$MKDIR_P" >&6; }
-+
-+mkdir_p="$MKDIR_P"
-+case $mkdir_p in
-+  [\\/$]* | ?:[\\/]*) ;;
-+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-+esac
-+
-+for ac_prog in gawk mawk nawk awk
-+do
-+  # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_AWK+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$AWK"; then
-+  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_AWK="$ac_prog"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+AWK=$ac_cv_prog_AWK
-+if test -n "$AWK"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-+$as_echo "$AWK" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+  test -n "$AWK" && break
-+done
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
-+set x ${MAKE-make}
-+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat >conftest.make <<\_ACEOF
-+SHELL = /bin/sh
-+all:
-+	@echo '@@@%%%=$(MAKE)=@@@%%%'
-+_ACEOF
-+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-+case `${MAKE-make} -f conftest.make 2>/dev/null` in
-+  *@@@%%%=?*=@@@%%%*)
-+    eval ac_cv_prog_make_${ac_make}_set=yes;;
-+  *)
-+    eval ac_cv_prog_make_${ac_make}_set=no;;
-+esac
-+rm -f conftest.make
-+fi
-+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+  SET_MAKE=
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+  SET_MAKE="MAKE=${MAKE-make}"
-+fi
-+
-+rm -rf .tst 2>/dev/null
-+mkdir .tst 2>/dev/null
-+if test -d .tst; then
-+  am__leading_dot=.
-+else
-+  am__leading_dot=_
-+fi
-+rmdir .tst 2>/dev/null
-+
-+DEPDIR="${am__leading_dot}deps"
-+
-+ac_config_commands="$ac_config_commands depfiles"
-+
-+
-+am_make=${MAKE-make}
-+cat > confinc << 'END'
-+am__doit:
-+	@echo this is the am__doit target
-+.PHONY: am__doit
-+END
-+# If we don't find an include directive, just comment out the code.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
-+$as_echo_n "checking for style of include used by $am_make... " >&6; }
-+am__include="#"
-+am__quote=
-+_am_result=none
-+# First try GNU make style include.
-+echo "include confinc" > confmf
-+# Ignore all kinds of additional output from `make'.
-+case `$am_make -s -f confmf 2> /dev/null` in #(
-+*the\ am__doit\ target*)
-+  am__include=include
-+  am__quote=
-+  _am_result=GNU
-+  ;;
-+esac
-+# Now try BSD make style include.
-+if test "$am__include" = "#"; then
-+   echo '.include "confinc"' > confmf
-+   case `$am_make -s -f confmf 2> /dev/null` in #(
-+   *the\ am__doit\ target*)
-+     am__include=.include
-+     am__quote="\""
-+     _am_result=BSD
-+     ;;
-+   esac
-+fi
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
-+$as_echo "$_am_result" >&6; }
-+rm -f confinc confmf
-+
-+@%:@ Check whether --enable-dependency-tracking was given.
-+if test "${enable_dependency_tracking+set}" = set; then :
-+  enableval=$enable_dependency_tracking; 
-+fi
-+
-+if test "x$enable_dependency_tracking" != xno; then
-+  am_depcomp="$ac_aux_dir/depcomp"
-+  AMDEPBACKSLASH='\'
-+fi
-+ if test "x$enable_dependency_tracking" != xno; then
-+  AMDEP_TRUE=
-+  AMDEP_FALSE='#'
-+else
-+  AMDEP_TRUE='#'
-+  AMDEP_FALSE=
-+fi
-+
-+
-+if test "`cd $srcdir && pwd`" != "`pwd`"; then
-+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-+  # is not polluted with repeated "-I."
-+  am__isrc=' -I$(srcdir)'
-+  # test to see if srcdir already configured
-+  if test -f $srcdir/config.status; then
-+    as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
-+  fi
-+fi
-+
-+# test whether we have cygpath
-+if test -z "$CYGPATH_W"; then
-+  if (cygpath --version) >/dev/null 2>/dev/null; then
-+    CYGPATH_W='cygpath -w'
-+  else
-+    CYGPATH_W=echo
-+  fi
-+fi
-+
-+
-+# Define the identity of the package.
-+ PACKAGE=gas
-+ VERSION=${BFD_VERSION}
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+@%:@define PACKAGE "$PACKAGE"
-+_ACEOF
-+
-+ 
-+cat >>confdefs.h <<_ACEOF
-+@%:@define VERSION "$VERSION"
-+_ACEOF
-+
-+# Some tools Automake needs.
-+
-+ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
-+
-+
-+AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
-+
-+
-+AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
-+
-+
-+AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
-+
-+
-+MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-+
-+# We need awk for the "check" target.  The system "awk" is bad on
-+# some platforms.
-+# Always define AMTAR for backward compatibility.
-+
-+AMTAR=${AMTAR-"${am_missing_run}tar"}
-+
-+am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
-+
-+
-+
-+
-+depcc="$CC"   am_compiler_list=
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-+$as_echo_n "checking dependency style of $depcc... " >&6; }
-+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-+  # We make a subdir and do the tests there.  Otherwise we can end up
-+  # making bogus files that we don't know about and never remove.  For
-+  # instance it was reported that on HP-UX the gcc test will end up
-+  # making a dummy file named `D' -- because `-MD' means `put the output
-+  # in D'.
-+  mkdir conftest.dir
-+  # Copy depcomp to subdir because otherwise we won't find it if we're
-+  # using a relative directory.
-+  cp "$am_depcomp" conftest.dir
-+  cd conftest.dir
-+  # We will build objects and dependencies in a subdirectory because
-+  # it helps to detect inapplicable dependency modes.  For instance
-+  # both Tru64's cc and ICC support -MD to output dependencies as a
-+  # side effect of compilation, but ICC will put the dependencies in
-+  # the current directory while Tru64 will put them in the object
-+  # directory.
-+  mkdir sub
-+
-+  am_cv_CC_dependencies_compiler_type=none
-+  if test "$am_compiler_list" = ""; then
-+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-+  fi
-+  am__universal=false
-+  case " $depcc " in #(
-+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-+     esac
-+
-+  for depmode in $am_compiler_list; do
-+    # Setup a source with many dependencies, because some compilers
-+    # like to wrap large dependency lists on column 80 (with \), and
-+    # we should not choose a depcomp mode which is confused by this.
-+    #
-+    # We need to recreate these files for each test, as the compiler may
-+    # overwrite some of them when testing with obscure command lines.
-+    # This happens at least with the AIX C compiler.
-+    : > sub/conftest.c
-+    for i in 1 2 3 4 5 6; do
-+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+      # Solaris 8's {/usr,}/bin/sh.
-+      touch sub/conftst$i.h
-+    done
-+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-+
-+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-+    # mode.  It turns out that the SunPro C++ compiler does not properly
-+    # handle `-M -o', and we need to detect this.  Also, some Intel
-+    # versions had trouble with output in subdirs
-+    am__obj=sub/conftest.${OBJEXT-o}
-+    am__minus_obj="-o $am__obj"
-+    case $depmode in
-+    gcc)
-+      # This depmode causes a compiler race in universal mode.
-+      test "$am__universal" = false || continue
-+      ;;
-+    nosideeffect)
-+      # after this tag, mechanisms are not by side-effect, so they'll
-+      # only be used when explicitly requested
-+      if test "x$enable_dependency_tracking" = xyes; then
-+	continue
-+      else
-+	break
-+      fi
-+      ;;
-+    msvisualcpp | msvcmsys)
-+      # This compiler won't grok `-c -o', but also, the minuso test has
-+      # not run yet.  These depmodes are late enough in the game, and
-+      # so weak that their functioning should not be impacted.
-+      am__obj=conftest.${OBJEXT-o}
-+      am__minus_obj=
-+      ;;
-+    none) break ;;
-+    esac
-+    if depmode=$depmode \
-+       source=sub/conftest.c object=$am__obj \
-+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-+         >/dev/null 2>conftest.err &&
-+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-+      # icc doesn't choke on unknown options, it will just issue warnings
-+      # or remarks (even with -Werror).  So we grep stderr for any message
-+      # that says an option was ignored or not supported.
-+      # When given -MP, icc 7.0 and 7.1 complain thusly:
-+      #   icc: Command line warning: ignoring option '-M'; no argument required
-+      # The diagnosis changed in icc 8.0:
-+      #   icc: Command line remark: option '-MP' not supported
-+      if (grep 'ignoring option' conftest.err ||
-+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-+        am_cv_CC_dependencies_compiler_type=$depmode
-+        break
-+      fi
-+    fi
-+  done
-+
-+  cd ..
-+  rm -rf conftest.dir
-+else
-+  am_cv_CC_dependencies_compiler_type=none
-+fi
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
-+$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
-+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-+
-+ if 
-+  test "x$enable_dependency_tracking" != xno \
-+  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-+  am__fastdepCC_TRUE=
-+  am__fastdepCC_FALSE='#'
-+else
-+  am__fastdepCC_TRUE='#'
-+  am__fastdepCC_FALSE=
-+fi
-+
-+
-+
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+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
-+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
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_CC+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$CC"; then
-+  ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+CC=$ac_cv_prog_CC
-+if test -n "$CC"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-+$as_echo "$CC" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$ac_cv_prog_CC"; then
-+  ac_ct_CC=$CC
-+  # Extract the first word of "gcc", so it can be a program name with args.
-+set dummy gcc; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$ac_ct_CC"; then
-+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_CC="gcc"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_CC=$ac_cv_prog_ac_ct_CC
-+if test -n "$ac_ct_CC"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-+$as_echo "$ac_ct_CC" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+  if test "x$ac_ct_CC" = x; then
-+    CC=""
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    CC=$ac_ct_CC
-+  fi
-+else
-+  CC="$ac_cv_prog_CC"
-+fi
-+
-+if test -z "$CC"; then
-+          if test -n "$ac_tool_prefix"; then
-+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}cc; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_CC+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$CC"; then
-+  ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_CC="${ac_tool_prefix}cc"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+CC=$ac_cv_prog_CC
-+if test -n "$CC"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-+$as_echo "$CC" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+  fi
-+fi
-+if test -z "$CC"; then
-+  # Extract the first word of "cc", so it can be a program name with args.
-+set dummy cc; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_CC+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$CC"; then
-+  ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+  ac_prog_rejected=no
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-+       ac_prog_rejected=yes
-+       continue
-+     fi
-+    ac_cv_prog_CC="cc"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+if test $ac_prog_rejected = yes; then
-+  # We found a bogon in the path, so make sure we never use it.
-+  set dummy $ac_cv_prog_CC
-+  shift
-+  if test $@%:@ != 0; then
-+    # We chose a different compiler from the bogus one.
-+    # However, it has the same basename, so the bogon will be chosen
-+    # first if we set CC to just the basename; use the full file name.
-+    shift
-+    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-+  fi
-+fi
-+fi
-+fi
-+CC=$ac_cv_prog_CC
-+if test -n "$CC"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-+$as_echo "$CC" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$CC"; then
-+  if test -n "$ac_tool_prefix"; then
-+  for ac_prog in cl.exe
-+  do
-+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_CC+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$CC"; then
-+  ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+CC=$ac_cv_prog_CC
-+if test -n "$CC"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-+$as_echo "$CC" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+    test -n "$CC" && break
-+  done
-+fi
-+if test -z "$CC"; then
-+  ac_ct_CC=$CC
-+  for ac_prog in cl.exe
-+do
-+  # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$ac_ct_CC"; then
-+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_CC="$ac_prog"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_CC=$ac_cv_prog_ac_ct_CC
-+if test -n "$ac_ct_CC"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-+$as_echo "$ac_ct_CC" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+  test -n "$ac_ct_CC" && break
-+done
-+
-+  if test "x$ac_ct_CC" = x; then
-+    CC=""
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    CC=$ac_ct_CC
-+  fi
-+fi
-+
-+fi
-+
-+
-+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "no acceptable C compiler found in \$PATH
-+See \`config.log' for more details." "$LINENO" 5; }
-+
-+# Provide some information about the compiler.
-+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-+set X $ac_compile
-+ac_compiler=$2
-+for ac_option in --version -v -V -qversion; do
-+  { { ac_try="$ac_compiler $ac_option >&5"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-+  ac_status=$?
-+  if test -s conftest.err; then
-+    sed '10a\
-+... rest of stderr output deleted ...
-+         10q' conftest.err >conftest.er1
-+    cat conftest.er1 >&5
-+    rm -f conftest.er1 conftest.err
-+  fi
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }
-+done
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+#ifndef __GNUC__
-+       choke me
-+#endif
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_compiler_gnu=yes
-+else
-+  ac_compiler_gnu=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ac_cv_c_compiler_gnu=$ac_compiler_gnu
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-+if test $ac_compiler_gnu = yes; then
-+  GCC=yes
-+else
-+  GCC=
-+fi
-+ac_test_CFLAGS=${CFLAGS+set}
-+ac_save_CFLAGS=$CFLAGS
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-+$as_echo_n "checking whether $CC accepts -g... " >&6; }
-+if test "${ac_cv_prog_cc_g+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_save_c_werror_flag=$ac_c_werror_flag
-+   ac_c_werror_flag=yes
-+   ac_cv_prog_cc_g=no
-+   CFLAGS="-g"
-+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_prog_cc_g=yes
-+else
-+  CFLAGS=""
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  
-+else
-+  ac_c_werror_flag=$ac_save_c_werror_flag
-+	 CFLAGS="-g"
-+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_prog_cc_g=yes
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+   ac_c_werror_flag=$ac_save_c_werror_flag
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-+$as_echo "$ac_cv_prog_cc_g" >&6; }
-+if test "$ac_test_CFLAGS" = set; then
-+  CFLAGS=$ac_save_CFLAGS
-+elif test $ac_cv_prog_cc_g = yes; then
-+  if test "$GCC" = yes; then
-+    CFLAGS="-g -O2"
-+  else
-+    CFLAGS="-g"
-+  fi
-+else
-+  if test "$GCC" = yes; then
-+    CFLAGS="-O2"
-+  else
-+    CFLAGS=
-+  fi
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-+if test "${ac_cv_prog_cc_c89+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_cv_prog_cc_c89=no
-+ac_save_CC=$CC
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <stdarg.h>
-+#include <stdio.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-+struct buf { int x; };
-+FILE * (*rcsopen) (struct buf *, struct stat *, int);
-+static char *e (p, i)
-+     char **p;
-+     int i;
-+{
-+  return p[i];
-+}
-+static char *f (char * (*g) (char **, int), char **p, ...)
-+{
-+  char *s;
-+  va_list v;
-+  va_start (v,p);
-+  s = g (p, va_arg (v,int));
-+  va_end (v);
-+  return s;
-+}
-+
-+/* 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
-+   as 'x'.  The following induces an error, until -std is added to get
-+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-+   array size at least.  It's necessary to write '\x00'==0 to get something
-+   that's true only with -std.  */
-+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-+
-+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-+   inside strings and character constants.  */
-+#define FOO(x) 'x'
-+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-+
-+int test (int i, double x);
-+struct s1 {int (*f) (int a);};
-+struct s2 {int (*f) (double a);};
-+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-+int argc;
-+char **argv;
-+int
-+main ()
-+{
-+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-+do
-+  CC="$ac_save_CC $ac_arg"
-+  if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_prog_cc_c89=$ac_arg
-+fi
-+rm -f core conftest.err conftest.$ac_objext
-+  test "x$ac_cv_prog_cc_c89" != "xno" && break
-+done
-+rm -f conftest.$ac_ext
-+CC=$ac_save_CC
-+
-+fi
-+# AC_CACHE_VAL
-+case "x$ac_cv_prog_cc_c89" in
-+  x)
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-+$as_echo "none needed" >&6; } ;;
-+  xno)
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-+$as_echo "unsupported" >&6; } ;;
-+  *)
-+    CC="$CC $ac_cv_prog_cc_c89"
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-+esac
-+if test "x$ac_cv_prog_cc_c89" != xno; then :
-+  
-+fi
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+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
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+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
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-+$as_echo_n "checking how to run the C preprocessor... " >&6; }
-+# On Suns, sometimes $CPP names a directory.
-+if test -n "$CPP" && test -d "$CPP"; then
-+  CPP=
-+fi
-+if test -z "$CPP"; then
-+  if test "${ac_cv_prog_CPP+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+      # Double quotes because CPP needs to be expanded
-+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-+    do
-+      ac_preproc_ok=false
-+for ac_c_preproc_warn_flag in '' yes
-+do
-+  # Use a header file that comes with gcc, so configuring glibc
-+  # with a fresh cross-compiler works.
-+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+  # <limits.h> exists even on freestanding compilers.
-+  # On the NeXT, cc -E runs the code through the compiler's parser,
-+  # not just through cpp. "Syntax error" is here to catch this case.
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+@%:@ifdef __STDC__
-+@%:@ include <limits.h>
-+@%:@else
-+@%:@ include <assert.h>
-+@%:@endif
-+		     Syntax error
-+_ACEOF
-+if ac_fn_c_try_cpp "$LINENO"; then :
-+  
-+else
-+  # Broken: fails on valid input.
-+continue
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+
-+  # OK, works on sane cases.  Now check whether nonexistent headers
-+  # can be detected and how.
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+@%:@include <ac_nonexistent.h>
-+_ACEOF
-+if ac_fn_c_try_cpp "$LINENO"; then :
-+  # Broken: success on invalid input.
-+continue
-+else
-+  # Passes both tests.
-+ac_preproc_ok=:
-+break
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+
-+done
-+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-+rm -f conftest.err conftest.$ac_ext
-+if $ac_preproc_ok; then :
-+  break
-+fi
-+
-+    done
-+    ac_cv_prog_CPP=$CPP
-+  
-+fi
-+  CPP=$ac_cv_prog_CPP
-+else
-+  ac_cv_prog_CPP=$CPP
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-+$as_echo "$CPP" >&6; }
-+ac_preproc_ok=false
-+for ac_c_preproc_warn_flag in '' yes
-+do
-+  # Use a header file that comes with gcc, so configuring glibc
-+  # with a fresh cross-compiler works.
-+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+  # <limits.h> exists even on freestanding compilers.
-+  # On the NeXT, cc -E runs the code through the compiler's parser,
-+  # not just through cpp. "Syntax error" is here to catch this case.
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+@%:@ifdef __STDC__
-+@%:@ include <limits.h>
-+@%:@else
-+@%:@ include <assert.h>
-+@%:@endif
-+		     Syntax error
-+_ACEOF
-+if ac_fn_c_try_cpp "$LINENO"; then :
-+  
-+else
-+  # Broken: fails on valid input.
-+continue
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+
-+  # OK, works on sane cases.  Now check whether nonexistent headers
-+  # can be detected and how.
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+@%:@include <ac_nonexistent.h>
-+_ACEOF
-+if ac_fn_c_try_cpp "$LINENO"; then :
-+  # Broken: success on invalid input.
-+continue
-+else
-+  # Passes both tests.
-+ac_preproc_ok=:
-+break
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+
-+done
-+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-+rm -f conftest.err conftest.$ac_ext
-+if $ac_preproc_ok; then :
-+  
-+else
-+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "C preprocessor \"$CPP\" fails sanity check
-+See \`config.log' for more details." "$LINENO" 5; }
-+fi
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+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
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
-+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-+if test "${ac_cv_path_GREP+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -z "$GREP"; then
-+  ac_path_GREP_found=false
-+  # Loop through the user's path and test for each of PROGNAME-LIST
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_prog in grep ggrep; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-+      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-+# Check for GNU ac_path_GREP and select it if it is found.
-+  # Check for GNU $ac_path_GREP
-+case `"$ac_path_GREP" --version 2>&1` in
-+*GNU*)
-+  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-+*)
-+  ac_count=0
-+  $as_echo_n 0123456789 >"conftest.in"
-+  while :
-+  do
-+    cat "conftest.in" "conftest.in" >"conftest.tmp"
-+    mv "conftest.tmp" "conftest.in"
-+    cp "conftest.in" "conftest.nl"
-+    $as_echo 'GREP' >> "conftest.nl"
-+    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-+    as_fn_arith $ac_count + 1 && ac_count=$as_val
-+    if test $ac_count -gt ${ac_path_GREP_max-0}; then
-+      # Best one so far, save it but keep looking for a better one
-+      ac_cv_path_GREP="$ac_path_GREP"
-+      ac_path_GREP_max=$ac_count
-+    fi
-+    # 10*(2^10) chars as input seems more than enough
-+    test $ac_count -gt 10 && break
-+  done
-+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-+esac
-+
-+      $ac_path_GREP_found && break 3
-+    done
-+  done
-+  done
-+IFS=$as_save_IFS
-+  if test -z "$ac_cv_path_GREP"; then
-+    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-+  fi
-+else
-+  ac_cv_path_GREP=$GREP
-+fi
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-+$as_echo "$ac_cv_path_GREP" >&6; }
-+ GREP="$ac_cv_path_GREP"
-+ 
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-+$as_echo_n "checking for egrep... " >&6; }
-+if test "${ac_cv_path_EGREP+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-+   then ac_cv_path_EGREP="$GREP -E"
-+   else
-+     if test -z "$EGREP"; then
-+  ac_path_EGREP_found=false
-+  # Loop through the user's path and test for each of PROGNAME-LIST
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_prog in egrep; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-+      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-+# Check for GNU ac_path_EGREP and select it if it is found.
-+  # Check for GNU $ac_path_EGREP
-+case `"$ac_path_EGREP" --version 2>&1` in
-+*GNU*)
-+  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-+*)
-+  ac_count=0
-+  $as_echo_n 0123456789 >"conftest.in"
-+  while :
-+  do
-+    cat "conftest.in" "conftest.in" >"conftest.tmp"
-+    mv "conftest.tmp" "conftest.in"
-+    cp "conftest.in" "conftest.nl"
-+    $as_echo 'EGREP' >> "conftest.nl"
-+    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-+    as_fn_arith $ac_count + 1 && ac_count=$as_val
-+    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-+      # Best one so far, save it but keep looking for a better one
-+      ac_cv_path_EGREP="$ac_path_EGREP"
-+      ac_path_EGREP_max=$ac_count
-+    fi
-+    # 10*(2^10) chars as input seems more than enough
-+    test $ac_count -gt 10 && break
-+  done
-+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-+esac
-+
-+      $ac_path_EGREP_found && break 3
-+    done
-+  done
-+  done
-+IFS=$as_save_IFS
-+  if test -z "$ac_cv_path_EGREP"; then
-+    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-+  fi
-+else
-+  ac_cv_path_EGREP=$EGREP
-+fi
-+
-+   fi
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-+$as_echo "$ac_cv_path_EGREP" >&6; }
-+ EGREP="$ac_cv_path_EGREP"
-+ 
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-+$as_echo_n "checking for ANSI C header files... " >&6; }
-+if test "${ac_cv_header_stdc+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <stdlib.h>
-+#include <stdarg.h>
-+#include <string.h>
-+#include <float.h>
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_header_stdc=yes
-+else
-+  ac_cv_header_stdc=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+if test $ac_cv_header_stdc = yes; then
-+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <string.h>
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "memchr" >/dev/null 2>&1; then :
-+  
-+else
-+  ac_cv_header_stdc=no
-+fi
-+rm -f conftest*
-+
-+fi
-+
-+if test $ac_cv_header_stdc = yes; then
-+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <stdlib.h>
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "free" >/dev/null 2>&1; then :
-+  
-+else
-+  ac_cv_header_stdc=no
-+fi
-+rm -f conftest*
-+
-+fi
-+
-+if test $ac_cv_header_stdc = yes; then
-+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-+  if test "$cross_compiling" = yes; then :
-+  :
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <ctype.h>
-+#include <stdlib.h>
-+#if ((' ' & 0x0FF) == 0x020)
-+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-+#else
-+# define ISLOWER(c) \
-+		   (('a' <= (c) && (c) <= 'i') \
-+		     || ('j' <= (c) && (c) <= 'r') \
-+		     || ('s' <= (c) && (c) <= 'z'))
-+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-+#endif
-+
-+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-+int
-+main ()
-+{
-+  int i;
-+  for (i = 0; i < 256; i++)
-+    if (XOR (islower (i), ISLOWER (i))
-+	|| toupper (i) != TOUPPER (i))
-+      return 2;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+  
-+else
-+  ac_cv_header_stdc=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
-+
-+fi
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-+$as_echo "$ac_cv_header_stdc" >&6; }
-+if test $ac_cv_header_stdc = yes; then
-+  
-+$as_echo "@%:@define STDC_HEADERS 1" >>confdefs.h
-+
-+fi
-+
-+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-+		  inttypes.h stdint.h unistd.h
-+do :
-+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-+"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+@%:@define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+ 
-+fi
-+
-+done
-+
-+
-+
-+  ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
-+if test "x$ac_cv_header_minix_config_h" = x""yes; then :
-+  MINIX=yes
-+else
-+  MINIX=
-+fi
-+
-+
-+  if test "$MINIX" = yes; then
-+    
-+$as_echo "@%:@define _POSIX_SOURCE 1" >>confdefs.h
-+
-+    
-+$as_echo "@%:@define _POSIX_1_SOURCE 2" >>confdefs.h
-+
-+    
-+$as_echo "@%:@define _MINIX 1" >>confdefs.h
-+
-+  fi
-+
-+  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
-+$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
-+if test "${ac_cv_safe_to_define___extensions__+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+#	  define __EXTENSIONS__ 1
-+	  $ac_includes_default
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_safe_to_define___extensions__=yes
-+else
-+  ac_cv_safe_to_define___extensions__=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
-+$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
-+  test $ac_cv_safe_to_define___extensions__ = yes &&
-+    $as_echo "@%:@define __EXTENSIONS__ 1" >>confdefs.h
-+
-+  $as_echo "@%:@define _ALL_SOURCE 1" >>confdefs.h
-+
-+  $as_echo "@%:@define _GNU_SOURCE 1" >>confdefs.h
-+
-+  $as_echo "@%:@define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
-+
-+  $as_echo "@%:@define _TANDEM_SOURCE 1" >>confdefs.h
-+
-+
-+
-+
-+
-+# The tests for host and target for $enable_largefile require
-+# canonical names.
-+
-+
-+
-+# As the $enable_largefile decision depends on --enable-plugins we must set it
-+# even in directories otherwise not depending on the $plugins option.
-+
-+
-+@%:@ Check whether --enable-plugins was given.
-+if test "${enable_plugins+set}" = set; then :
-+  enableval=$enable_plugins; case "${enableval}" in
-+  yes | "") plugins=yes ;;
-+  no) plugins=no ;;
-+  *) plugins=yes ;;
-+ esac
-+else
-+  plugins=no
-+fi
-+
-+
-+
-+case "${host}" in
-+  sparc-*-solaris*|i[3-7]86-*-solaris*)
-+    # On native 32bit sparc and ia32 solaris, large-file and procfs support
-+    # are mutually exclusive; and without procfs support, the bfd/ elf module
-+    # cannot provide certain routines such as elfcore_write_prpsinfo
-+    # or elfcore_write_prstatus.  So unless the user explicitly requested
-+    # large-file support through the --enable-largefile switch, disable
-+    # large-file support in favor of procfs support.
-+    test "${target}" = "${host}" -a "x$plugins" = xno \
-+      && : ${enable_largefile="no"}
-+    ;;
-+esac
-+
-+@%:@ Check whether --enable-largefile was given.
-+if test "${enable_largefile+set}" = set; then :
-+  enableval=$enable_largefile; 
-+fi
-+
-+if test "$enable_largefile" != no; then
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
-+$as_echo_n "checking for special C compiler options needed for large files... " >&6; }
-+if test "${ac_cv_sys_largefile_CC+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_cv_sys_largefile_CC=no
-+     if test "$GCC" != yes; then
-+       ac_save_CC=$CC
-+       while :; do
-+	 # IRIX 6.2 and later do not support large files by default,
-+	 # so use the C compiler's -n32 option if that helps.
-+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+@%:@include <sys/types.h>
-+ /* Check that off_t can represent 2**63 - 1 correctly.
-+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-+    since some C++ compilers masquerading as C compilers
-+    incorrectly reject 9223372036854775807.  */
-+@%:@define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-+		       && LARGE_OFF_T % 2147483647 == 1)
-+		      ? 1 : -1];
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+	 if ac_fn_c_try_compile "$LINENO"; then :
-+  break
-+fi
-+rm -f core conftest.err conftest.$ac_objext
-+	 CC="$CC -n32"
-+	 if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_sys_largefile_CC=' -n32'; break
-+fi
-+rm -f core conftest.err conftest.$ac_objext
-+	 break
-+       done
-+       CC=$ac_save_CC
-+       rm -f conftest.$ac_ext
-+    fi
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
-+$as_echo "$ac_cv_sys_largefile_CC" >&6; }
-+  if test "$ac_cv_sys_largefile_CC" != no; then
-+    CC=$CC$ac_cv_sys_largefile_CC
-+  fi
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-+$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
-+if test "${ac_cv_sys_file_offset_bits+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  while :; do
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+@%:@include <sys/types.h>
-+ /* Check that off_t can represent 2**63 - 1 correctly.
-+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-+    since some C++ compilers masquerading as C compilers
-+    incorrectly reject 9223372036854775807.  */
-+@%:@define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-+		       && LARGE_OFF_T % 2147483647 == 1)
-+		      ? 1 : -1];
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_sys_file_offset_bits=no; break
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+@%:@define _FILE_OFFSET_BITS 64
-+@%:@include <sys/types.h>
-+ /* Check that off_t can represent 2**63 - 1 correctly.
-+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-+    since some C++ compilers masquerading as C compilers
-+    incorrectly reject 9223372036854775807.  */
-+@%:@define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-+		       && LARGE_OFF_T % 2147483647 == 1)
-+		      ? 1 : -1];
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_sys_file_offset_bits=64; break
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  ac_cv_sys_file_offset_bits=unknown
-+  break
-+done
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
-+$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
-+case $ac_cv_sys_file_offset_bits in #(
-+  no | unknown) ;;
-+  *) 
-+cat >>confdefs.h <<_ACEOF
-+@%:@define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
-+_ACEOF
-+;;
-+esac
-+rm -rf conftest*
-+  if test $ac_cv_sys_file_offset_bits = unknown; then
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
-+$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
-+if test "${ac_cv_sys_large_files+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  while :; do
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+@%:@include <sys/types.h>
-+ /* Check that off_t can represent 2**63 - 1 correctly.
-+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-+    since some C++ compilers masquerading as C compilers
-+    incorrectly reject 9223372036854775807.  */
-+@%:@define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-+		       && LARGE_OFF_T % 2147483647 == 1)
-+		      ? 1 : -1];
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_sys_large_files=no; break
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+@%:@define _LARGE_FILES 1
-+@%:@include <sys/types.h>
-+ /* Check that off_t can represent 2**63 - 1 correctly.
-+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-+    since some C++ compilers masquerading as C compilers
-+    incorrectly reject 9223372036854775807.  */
-+@%:@define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-+		       && LARGE_OFF_T % 2147483647 == 1)
-+		      ? 1 : -1];
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_sys_large_files=1; break
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  ac_cv_sys_large_files=unknown
-+  break
-+done
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
-+$as_echo "$ac_cv_sys_large_files" >&6; }
-+case $ac_cv_sys_large_files in #(
-+  no | unknown) ;;
-+  *) 
-+cat >>confdefs.h <<_ACEOF
-+@%:@define _LARGE_FILES $ac_cv_sys_large_files
-+_ACEOF
-+;;
-+esac
-+rm -rf conftest*
-+  fi
-+fi
-+
-+
-+
-+case `pwd` in
-+  *\ * | *\	*)
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
-+$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
-+esac
-+
-+
-+
-+macro_version='2.2.7a'
-+macro_revision='1.3134'
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+
-+
-+ltmain="$ac_aux_dir/ltmain.sh"
-+
-+# Backslashify metacharacters that are still active within
-+# double-quoted strings.
-+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
-+
-+# Same as above, but do not quote variable references.
-+double_quote_subst='s/\(["`\\]\)/\\\1/g'
-+
-+# Sed substitution to delay expansion of an escaped shell variable in a
-+# double_quote_subst'ed string.
-+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-+
-+# Sed substitution to delay expansion of an escaped single quote.
-+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-+
-+# Sed substitution to avoid accidental globbing in evaled expressions
-+no_glob_subst='s/\*/\\\*/g'
-+
-+ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
-+$as_echo_n "checking how to print strings... " >&6; }
-+# Test print first, because it will be a builtin if present.
-+if test "X`print -r -- -n 2>/dev/null`" = X-n && \
-+   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
-+  ECHO='print -r --'
-+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
-+  ECHO='printf %s\n'
-+else
-+  # Use this function as a fallback that always works.
-+  func_fallback_echo ()
-+  {
-+    eval 'cat <<_LTECHO_EOF
-+$1
-+_LTECHO_EOF'
-+  }
-+  ECHO='func_fallback_echo'
-+fi
-+
-+# func_echo_all arg...
-+# Invoke $ECHO with all args, space-separated.
-+func_echo_all ()
-+{
-+    $ECHO "" 
-+}
-+
-+case "$ECHO" in
-+  printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
-+$as_echo "printf" >&6; } ;;
-+  print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
-+$as_echo "print -r" >&6; } ;;
-+  *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
-+$as_echo "cat" >&6; } ;;
-+esac
-+
-+
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
-+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
-+if test "${ac_cv_path_SED+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-+     for ac_i in 1 2 3 4 5 6 7; do
-+       ac_script="$ac_script$as_nl$ac_script"
-+     done
-+     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
-+     { ac_script=; unset ac_script;}
-+     if test -z "$SED"; then
-+  ac_path_SED_found=false
-+  # Loop through the user's path and test for each of PROGNAME-LIST
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_prog in sed gsed; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-+      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
-+# Check for GNU ac_path_SED and select it if it is found.
-+  # Check for GNU $ac_path_SED
-+case `"$ac_path_SED" --version 2>&1` in
-+*GNU*)
-+  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
-+*)
-+  ac_count=0
-+  $as_echo_n 0123456789 >"conftest.in"
-+  while :
-+  do
-+    cat "conftest.in" "conftest.in" >"conftest.tmp"
-+    mv "conftest.tmp" "conftest.in"
-+    cp "conftest.in" "conftest.nl"
-+    $as_echo '' >> "conftest.nl"
-+    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
-+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-+    as_fn_arith $ac_count + 1 && ac_count=$as_val
-+    if test $ac_count -gt ${ac_path_SED_max-0}; then
-+      # Best one so far, save it but keep looking for a better one
-+      ac_cv_path_SED="$ac_path_SED"
-+      ac_path_SED_max=$ac_count
-+    fi
-+    # 10*(2^10) chars as input seems more than enough
-+    test $ac_count -gt 10 && break
-+  done
-+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-+esac
-+
-+      $ac_path_SED_found && break 3
-+    done
-+  done
-+  done
-+IFS=$as_save_IFS
-+  if test -z "$ac_cv_path_SED"; then
-+    as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
-+  fi
-+else
-+  ac_cv_path_SED=$SED
-+fi
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
-+$as_echo "$ac_cv_path_SED" >&6; }
-+ SED="$ac_cv_path_SED"
-+  rm -f conftest.sed
-+
-+test -z "$SED" && SED=sed
-+Xsed="$SED -e 1s/^X//"
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
-+$as_echo_n "checking for fgrep... " >&6; }
-+if test "${ac_cv_path_FGREP+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-+   then ac_cv_path_FGREP="$GREP -F"
-+   else
-+     if test -z "$FGREP"; then
-+  ac_path_FGREP_found=false
-+  # Loop through the user's path and test for each of PROGNAME-LIST
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_prog in fgrep; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+      ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
-+      { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
-+# Check for GNU ac_path_FGREP and select it if it is found.
-+  # Check for GNU $ac_path_FGREP
-+case `"$ac_path_FGREP" --version 2>&1` in
-+*GNU*)
-+  ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
-+*)
-+  ac_count=0
-+  $as_echo_n 0123456789 >"conftest.in"
-+  while :
-+  do
-+    cat "conftest.in" "conftest.in" >"conftest.tmp"
-+    mv "conftest.tmp" "conftest.in"
-+    cp "conftest.in" "conftest.nl"
-+    $as_echo 'FGREP' >> "conftest.nl"
-+    "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
-+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-+    as_fn_arith $ac_count + 1 && ac_count=$as_val
-+    if test $ac_count -gt ${ac_path_FGREP_max-0}; then
-+      # Best one so far, save it but keep looking for a better one
-+      ac_cv_path_FGREP="$ac_path_FGREP"
-+      ac_path_FGREP_max=$ac_count
-+    fi
-+    # 10*(2^10) chars as input seems more than enough
-+    test $ac_count -gt 10 && break
-+  done
-+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-+esac
-+
-+      $ac_path_FGREP_found && break 3
-+    done
-+  done
-+  done
-+IFS=$as_save_IFS
-+  if test -z "$ac_cv_path_FGREP"; then
-+    as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-+  fi
-+else
-+  ac_cv_path_FGREP=$FGREP
-+fi
-+
-+   fi
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
-+$as_echo "$ac_cv_path_FGREP" >&6; }
-+ FGREP="$ac_cv_path_FGREP"
-+ 
-+
-+test -z "$GREP" && GREP=grep
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+
-+
-+
-+@%:@ Check whether --with-gnu-ld was given.
-+if test "${with_gnu_ld+set}" = set; then :
-+  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
-+else
-+  with_gnu_ld=no
-+fi
-+
-+ac_prog=ld
-+if test "$GCC" = yes; then
-+  # Check if gcc -print-prog-name=ld gives a path.
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
-+$as_echo_n "checking for ld used by $CC... " >&6; }
-+  case $host in
-+  *-*-mingw*)
-+    # gcc leaves a trailing carriage return which upsets mingw
-+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-+  *)
-+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-+  esac
-+  case $ac_prog in
-+    # Accept absolute paths.
-+    [\\/]* | ?:[\\/]*)
-+      re_direlt='/[^/][^/]*/\.\./'
-+      # Canonicalize the pathname of ld
-+      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
-+      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
-+	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
-+      done
-+      test -z "$LD" && LD="$ac_prog"
-+      ;;
-+  "")
-+    # If it fails, then pretend we aren't using GCC.
-+    ac_prog=ld
-+    ;;
-+  *)
-+    # If it is relative, then search for the first ld in PATH.
-+    with_gnu_ld=unknown
-+    ;;
-+  esac
-+elif test "$with_gnu_ld" = yes; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
-+$as_echo_n "checking for GNU ld... " >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
-+$as_echo_n "checking for non-GNU ld... " >&6; }
-+fi
-+if test "${lt_cv_path_LD+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -z "$LD"; then
-+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+  for ac_dir in $PATH; do
-+    IFS="$lt_save_ifs"
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-+      lt_cv_path_LD="$ac_dir/$ac_prog"
-+      # Check to see if the program is GNU ld.  I'd rather use --version,
-+      # but apparently some variants of GNU ld only accept -v.
-+      # Break only if it was the GNU/non-GNU ld that we prefer.
-+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-+      *GNU* | *'with BFD'*)
-+	test "$with_gnu_ld" != no && break
-+	;;
-+      *)
-+	test "$with_gnu_ld" != yes && break
-+	;;
-+      esac
-+    fi
-+  done
-+  IFS="$lt_save_ifs"
-+else
-+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-+fi
-+fi
-+
-+LD="$lt_cv_path_LD"
-+if test -n "$LD"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-+$as_echo "$LD" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
-+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-+if test "${lt_cv_prog_gnu_ld+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
-+case `$LD -v 2>&1 </dev/null` in
-+*GNU* | *'with BFD'*)
-+  lt_cv_prog_gnu_ld=yes
-+  ;;
-+*)
-+  lt_cv_prog_gnu_ld=no
-+  ;;
-+esac
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
-+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
-+with_gnu_ld=$lt_cv_prog_gnu_ld
-+
-+
-+
-+
-+    
-+    
-+    
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
-+$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
-+if test "${lt_cv_path_NM+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$NM"; then
-+  # Let the user override the test.
-+  lt_cv_path_NM="$NM"
-+else
-+  lt_nm_to_check="${ac_tool_prefix}nm"
-+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-+    lt_nm_to_check="$lt_nm_to_check nm"
-+  fi
-+  for lt_tmp_nm in $lt_nm_to_check; do
-+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-+      IFS="$lt_save_ifs"
-+      test -z "$ac_dir" && ac_dir=.
-+      tmp_nm="$ac_dir/$lt_tmp_nm"
-+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-+	# Check to see if the nm accepts a BSD-compat flag.
-+	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
-+	#   nm: unknown option "B" ignored
-+	# Tru64's nm complains that /dev/null is an invalid object file
-+	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-+	*/dev/null* | *'Invalid file or object type'*)
-+	  lt_cv_path_NM="$tmp_nm -B"
-+	  break
-+	  ;;
-+	*)
-+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-+	  */dev/null*)
-+	    lt_cv_path_NM="$tmp_nm -p"
-+	    break
-+	    ;;
-+	  *)
-+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-+	    continue # so that we can try to find one that supports BSD flags
-+	    ;;
-+	  esac
-+	  ;;
-+	esac
-+      fi
-+    done
-+    IFS="$lt_save_ifs"
-+  done
-+  : ${lt_cv_path_NM=no}
-+fi
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
-+$as_echo "$lt_cv_path_NM" >&6; }
-+if test "$lt_cv_path_NM" != "no"; then
-+  NM="$lt_cv_path_NM"
-+else
-+  # Didn't find any BSD compatible name lister, look for dumpbin.
-+  if test -n "$DUMPBIN"; then :
-+    # Let the user override the test.
-+  else
-+    if test -n "$ac_tool_prefix"; then
-+  for ac_prog in dumpbin "link -dump"
-+  do
-+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$DUMPBIN"; then
-+  ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+DUMPBIN=$ac_cv_prog_DUMPBIN
-+if test -n "$DUMPBIN"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
-+$as_echo "$DUMPBIN" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+    test -n "$DUMPBIN" && break
-+  done
-+fi
-+if test -z "$DUMPBIN"; then
-+  ac_ct_DUMPBIN=$DUMPBIN
-+  for ac_prog in dumpbin "link -dump"
-+do
-+  # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$ac_ct_DUMPBIN"; then
-+  ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
-+if test -n "$ac_ct_DUMPBIN"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
-+$as_echo "$ac_ct_DUMPBIN" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+  test -n "$ac_ct_DUMPBIN" && break
-+done
-+
-+  if test "x$ac_ct_DUMPBIN" = x; then
-+    DUMPBIN=":"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    DUMPBIN=$ac_ct_DUMPBIN
-+  fi
-+fi
-+
-+    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
-+    *COFF*)
-+      DUMPBIN="$DUMPBIN -symbols"
-+      ;;
-+    *)
-+      DUMPBIN=:
-+      ;;
-+    esac
-+  fi
-+  
-+  if test "$DUMPBIN" != ":"; then
-+    NM="$DUMPBIN"
-+  fi
-+fi
-+test -z "$NM" && NM=nm
-+
-+
-+    
-+    
-+    
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
-+$as_echo_n "checking the name lister ($NM) interface... " >&6; }
-+if test "${lt_cv_nm_interface+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  lt_cv_nm_interface="BSD nm"
-+  echo "int some_variable = 0;" > conftest.$ac_ext
-+  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
-+  (eval "$ac_compile" 2>conftest.err)
-+  cat conftest.err >&5
-+  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-+  cat conftest.err >&5
-+  (eval echo "\"\$as_me:$LINENO: output\"" >&5)
-+  cat conftest.out >&5
-+  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-+    lt_cv_nm_interface="MS dumpbin"
-+  fi
-+  rm -f conftest*
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
-+$as_echo "$lt_cv_nm_interface" >&6; }
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
-+$as_echo_n "checking whether ln -s works... " >&6; }
-+LN_S=$as_ln_s
-+if test "$LN_S" = "ln -s"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
-+$as_echo "no, using $LN_S" >&6; }
-+fi
-+
-+# find the maximum length of command line arguments
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
-+$as_echo_n "checking the maximum length of command line arguments... " >&6; }
-+if test "${lt_cv_sys_max_cmd_len+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+    i=0
-+  teststring="ABCD"
-+
-+  case $build_os in
-+  msdosdjgpp*)
-+    # On DJGPP, this test can blow up pretty badly due to problems in libc
-+    # (any single argument exceeding 2000 bytes causes a buffer overrun
-+    # during glob expansion).  Even if it were fixed, the result of this
-+    # check would be larger than it should be.
-+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-+    ;;
-+
-+  gnu*)
-+    # Under GNU Hurd, this test is not required because there is
-+    # no limit to the length of command line arguments.
-+    # Libtool will interpret -1 as no limit whatsoever
-+    lt_cv_sys_max_cmd_len=-1;
-+    ;;
-+
-+  cygwin* | mingw* | cegcc*)
-+    # On Win9x/ME, this test blows up -- it succeeds, but takes
-+    # about 5 minutes as the teststring grows exponentially.
-+    # Worse, since 9x/ME are not pre-emptively multitasking,
-+    # you end up with a "frozen" computer, even though with patience
-+    # the test eventually succeeds (with a max line length of 256k).
-+    # Instead, let's just punt: use the minimum linelength reported by
-+    # all of the supported platforms: 8192 (on NT/2K/XP).
-+    lt_cv_sys_max_cmd_len=8192;
-+    ;;
-+
-+  mint*)
-+    # On MiNT this can take a long time and run out of memory.
-+    lt_cv_sys_max_cmd_len=8192;
-+    ;;
-+
-+  amigaos*)
-+    # On AmigaOS with pdksh, this test takes hours, literally.
-+    # So we just punt and use a minimum line length of 8192.
-+    lt_cv_sys_max_cmd_len=8192;
-+    ;;
-+
-+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-+    # This has been around since 386BSD, at least.  Likely further.
-+    if test -x /sbin/sysctl; then
-+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-+    elif test -x /usr/sbin/sysctl; then
-+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-+    else
-+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
-+    fi
-+    # And add a safety zone
-+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-+    ;;
-+
-+  interix*)
-+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
-+    lt_cv_sys_max_cmd_len=196608
-+    ;;
-+
-+  osf*)
-+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-+    # nice to cause kernel panics so lets avoid the loop below.
-+    # First set a reasonable default.
-+    lt_cv_sys_max_cmd_len=16384
-+    #
-+    if test -x /sbin/sysconfig; then
-+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-+      esac
-+    fi
-+    ;;
-+  sco3.2v5*)
-+    lt_cv_sys_max_cmd_len=102400
-+    ;;
-+  sysv5* | sco5v6* | sysv4.2uw2*)
-+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
-+    if test -n "$kargmax"; then
-+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[	 ]//'`
-+    else
-+      lt_cv_sys_max_cmd_len=32768
-+    fi
-+    ;;
-+  *)
-+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-+    if test -n "$lt_cv_sys_max_cmd_len"; then
-+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-+    else
-+      # Make teststring a little bigger before we do anything with it.
-+      # a 1K string should be a reasonable start.
-+      for i in 1 2 3 4 5 6 7 8 ; do
-+        teststring=$teststring$teststring
-+      done
-+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-+      # If test is not a shell built-in, we'll probably end up computing a
-+      # maximum length that is only half of the actual maximum length, but
-+      # we can't tell.
-+      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
-+	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
-+	      test $i != 17 # 1/2 MB should be enough
-+      do
-+        i=`expr $i + 1`
-+        teststring=$teststring$teststring
-+      done
-+      # Only check the string length outside the loop.
-+      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
-+      teststring=
-+      # Add a significant safety factor because C++ compilers can tack on
-+      # massive amounts of additional arguments before passing them to the
-+      # linker.  It appears as though 1/2 is a usable value.
-+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-+    fi
-+    ;;
-+  esac
-+
-+fi
-+
-+if test -n $lt_cv_sys_max_cmd_len ; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
-+$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
-+$as_echo "none" >&6; }
-+fi
-+max_cmd_len=$lt_cv_sys_max_cmd_len
-+
-+    
-+    
-+    
-+
-+
-+: ${CP="cp -f"}
-+: ${MV="mv -f"}
-+: ${RM="rm -f"}
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
-+$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
-+# Try some XSI features
-+xsi_shell=no
-+( _lt_dummy="a/b/c"
-+  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
-+      = c,a/b,, \
-+    && eval 'test $(( 1 + 1 )) -eq 2 \
-+    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
-+  && xsi_shell=yes
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
-+$as_echo "$xsi_shell" >&6; }
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
-+$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
-+lt_shell_append=no
-+( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
-+    >/dev/null 2>&1 \
-+  && lt_shell_append=yes
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
-+$as_echo "$lt_shell_append" >&6; }
-+
-+
-+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-+  lt_unset=unset
-+else
-+  lt_unset=false
-+fi
-+
-+    
-+    
-+    
-+
-+# test EBCDIC or ASCII
-+case `echo X|tr X '\101'` in
-+ A) # ASCII based system
-+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-+  lt_SP2NL='tr \040 \012'
-+  lt_NL2SP='tr \015\012 \040\040'
-+  ;;
-+ *) # EBCDIC based system
-+  lt_SP2NL='tr \100 \n'
-+  lt_NL2SP='tr \r\n \100\100'
-+  ;;
-+esac
-+
-+    
-+    
-+    
-+
-+    
-+    
-+    
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
-+$as_echo_n "checking for $LD option to reload object files... " >&6; }
-+if test "${lt_cv_ld_reload_flag+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  lt_cv_ld_reload_flag='-r'
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
-+$as_echo "$lt_cv_ld_reload_flag" >&6; }
-+reload_flag=$lt_cv_ld_reload_flag
-+case $reload_flag in
-+"" | " "*) ;;
-+*) reload_flag=" $reload_flag" ;;
-+esac
-+reload_cmds='$LD$reload_flag -o $output$reload_objs'
-+case $host_os in
-+  darwin*)
-+    if test "$GCC" = yes; then
-+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-+    else
-+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-+    fi
-+    ;;
-+esac
-+
-+    
-+    
-+    
-+
-+    
-+    
-+    
-+
-+if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}objdump; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$OBJDUMP"; then
-+  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+OBJDUMP=$ac_cv_prog_OBJDUMP
-+if test -n "$OBJDUMP"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
-+$as_echo "$OBJDUMP" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$ac_cv_prog_OBJDUMP"; then
-+  ac_ct_OBJDUMP=$OBJDUMP
-+  # Extract the first word of "objdump", so it can be a program name with args.
-+set dummy objdump; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$ac_ct_OBJDUMP"; then
-+  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_OBJDUMP="objdump"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
-+if test -n "$ac_ct_OBJDUMP"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
-+$as_echo "$ac_ct_OBJDUMP" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+  if test "x$ac_ct_OBJDUMP" = x; then
-+    OBJDUMP="false"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    OBJDUMP=$ac_ct_OBJDUMP
-+  fi
-+else
-+  OBJDUMP="$ac_cv_prog_OBJDUMP"
-+fi
-+
-+test -z "$OBJDUMP" && OBJDUMP=objdump
-+
-+    
-+    
-+    
-+
-+
-+
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
-+$as_echo_n "checking how to recognize dependent libraries... " >&6; }
-+if test "${lt_cv_deplibs_check_method+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  lt_cv_file_magic_cmd='$MAGIC_CMD'
-+lt_cv_file_magic_test_file=
-+lt_cv_deplibs_check_method='unknown'
-+# Need to set the preceding variable on all platforms that support
-+# interlibrary dependencies.
-+# 'none' -- dependencies not supported.
-+# `unknown' -- same as none, but documents that we really don't know.
-+# 'pass_all' -- all dependencies passed with no checks.
-+# 'test_compile' -- check by making test program.
-+# 'file_magic [[regex]]' -- check by looking for files in library path
-+# which responds to the $file_magic_cmd with a given extended regex.
-+# If you have `file' or equivalent on your system and you're not sure
-+# whether `pass_all' will *always* work, you probably want this one.
-+
-+case $host_os in
-+aix[4-9]*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+beos*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+bsdi[45]*)
-+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
-+  lt_cv_file_magic_cmd='/usr/bin/file -L'
-+  lt_cv_file_magic_test_file=/shlib/libc.so
-+  ;;
-+
-+cygwin*)
-+  # func_win32_libid is a shell function defined in ltmain.sh
-+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-+  lt_cv_file_magic_cmd='func_win32_libid'
-+  ;;
-+
-+mingw* | pw32*)
-+  # Base MSYS/MinGW do not provide the 'file' command needed by
-+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
-+  # unless we find 'file', for example because we are cross-compiling.
-+  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
-+  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
-+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-+    lt_cv_file_magic_cmd='func_win32_libid'
-+  else
-+    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-+    lt_cv_file_magic_cmd='$OBJDUMP -f'
-+  fi
-+  ;;
-+
-+cegcc*)
-+  # use the weaker test based on 'objdump'. See mingw*.
-+  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
-+  lt_cv_file_magic_cmd='$OBJDUMP -f'
-+  ;;
-+
-+darwin* | rhapsody*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+freebsd* | dragonfly*)
-+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-+    case $host_cpu in
-+    i*86 )
-+      # Not sure whether the presence of OpenBSD here was a mistake.
-+      # Let's accept both of them until this is cleared up.
-+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
-+      lt_cv_file_magic_cmd=/usr/bin/file
-+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-+      ;;
-+    esac
-+  else
-+    lt_cv_deplibs_check_method=pass_all
-+  fi
-+  ;;
-+
-+gnu*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+haiku*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+hpux10.20* | hpux11*)
-+  lt_cv_file_magic_cmd=/usr/bin/file
-+  case $host_cpu in
-+  ia64*)
-+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
-+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-+    ;;
-+  hppa*64*)
-+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'
-+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-+    ;;
-+  *)
-+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'
-+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-+    ;;
-+  esac
-+  ;;
-+
-+interix[3-9]*)
-+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
-+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
-+  ;;
-+
-+irix5* | irix6* | nonstopux*)
-+  case $LD in
-+  *-32|*"-32 ") libmagic=32-bit;;
-+  *-n32|*"-n32 ") libmagic=N32;;
-+  *-64|*"-64 ") libmagic=64-bit;;
-+  *) libmagic=never-match;;
-+  esac
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+# This must be Linux ELF.
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+netbsd*)
-+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-+  else
-+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
-+  fi
-+  ;;
-+
-+newos6*)
-+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
-+  lt_cv_file_magic_cmd=/usr/bin/file
-+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-+  ;;
-+
-+*nto* | *qnx*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+openbsd*)
-+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
-+  else
-+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-+  fi
-+  ;;
-+
-+osf3* | osf4* | osf5*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+rdos*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+solaris*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+sysv4 | sysv4.3*)
-+  case $host_vendor in
-+  motorola)
-+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-+    ;;
-+  ncr)
-+    lt_cv_deplibs_check_method=pass_all
-+    ;;
-+  sequent)
-+    lt_cv_file_magic_cmd='/bin/file'
-+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
-+    ;;
-+  sni)
-+    lt_cv_file_magic_cmd='/bin/file'
-+    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
-+    lt_cv_file_magic_test_file=/lib/libc.so
-+    ;;
-+  siemens)
-+    lt_cv_deplibs_check_method=pass_all
-+    ;;
-+  pc)
-+    lt_cv_deplibs_check_method=pass_all
-+    ;;
-+  esac
-+  ;;
-+
-+tpf*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+esac
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
-+$as_echo "$lt_cv_deplibs_check_method" >&6; }
-+file_magic_cmd=$lt_cv_file_magic_cmd
-+deplibs_check_method=$lt_cv_deplibs_check_method
-+test -z "$deplibs_check_method" && deplibs_check_method=unknown
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+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
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_AR+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$AR"; then
-+  ac_cv_prog_AR="$AR" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_AR="${ac_tool_prefix}ar"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+AR=$ac_cv_prog_AR
-+if test -n "$AR"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-+$as_echo "$AR" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$ac_cv_prog_AR"; then
-+  ac_ct_AR=$AR
-+  # Extract the first word of "ar", so it can be a program name with args.
-+set dummy ar; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$ac_ct_AR"; then
-+  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_AR="ar"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_AR=$ac_cv_prog_ac_ct_AR
-+if test -n "$ac_ct_AR"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-+$as_echo "$ac_ct_AR" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+  if test "x$ac_ct_AR" = x; then
-+    AR="false"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    AR=$ac_ct_AR
-+  fi
-+else
-+  AR="$ac_cv_prog_AR"
-+fi
-+
-+test -z "$AR" && AR=ar
-+test -z "$AR_FLAGS" && AR_FLAGS=cru
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+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
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_STRIP+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$STRIP"; then
-+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+STRIP=$ac_cv_prog_STRIP
-+if test -n "$STRIP"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-+$as_echo "$STRIP" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$ac_cv_prog_STRIP"; then
-+  ac_ct_STRIP=$STRIP
-+  # Extract the first word of "strip", so it can be a program name with args.
-+set dummy strip; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$ac_ct_STRIP"; then
-+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_STRIP="strip"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-+if test -n "$ac_ct_STRIP"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-+$as_echo "$ac_ct_STRIP" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+  if test "x$ac_ct_STRIP" = x; then
-+    STRIP=":"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    STRIP=$ac_ct_STRIP
-+  fi
-+else
-+  STRIP="$ac_cv_prog_STRIP"
-+fi
-+
-+test -z "$STRIP" && STRIP=:
-+
-+    
-+    
-+    
-+
-+
-+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
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_RANLIB+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$RANLIB"; then
-+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+RANLIB=$ac_cv_prog_RANLIB
-+if test -n "$RANLIB"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-+$as_echo "$RANLIB" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$ac_cv_prog_RANLIB"; then
-+  ac_ct_RANLIB=$RANLIB
-+  # Extract the first word of "ranlib", so it can be a program name with args.
-+set dummy ranlib; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$ac_ct_RANLIB"; then
-+  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_RANLIB="ranlib"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-+if test -n "$ac_ct_RANLIB"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-+$as_echo "$ac_ct_RANLIB" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+  if test "x$ac_ct_RANLIB" = x; then
-+    RANLIB=":"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    RANLIB=$ac_ct_RANLIB
-+  fi
-+else
-+  RANLIB="$ac_cv_prog_RANLIB"
-+fi
-+
-+test -z "$RANLIB" && RANLIB=:
-+
-+    
-+    
-+    
-+
-+
-+# Determine commands to create old-style static archives.
-+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-+old_postinstall_cmds='chmod 644 $oldlib'
-+old_postuninstall_cmds=
-+
-+if test -n "$RANLIB"; then
-+  case $host_os in
-+  openbsd*)
-+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
-+    ;;
-+  *)
-+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
-+    ;;
-+  esac
-+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-+fi
-+
-+case $host_os in
-+  darwin*)
-+    lock_old_archive_extraction=yes ;;
-+  *)
-+    lock_old_archive_extraction=no ;;
-+esac
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+
-+
-+    
-+    
-+    
-+
-+    
-+    
-+    
-+
-+    
-+    
-+    
-+
-+    
-+    
-+    
-+
-+# If no C compiler was specified, use CC.
-+LTCC=${LTCC-"$CC"}
-+
-+# If no C compiler flags were specified, use CFLAGS.
-+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-+
-+# Allow CC to be a program name with arguments.
-+compiler=$CC
-+
-+
-+# Check for command to grab the raw symbol name followed by C symbol from nm.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
-+$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
-+if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  
-+# These are sane defaults that work on at least a few old systems.
-+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-+
-+# Character class describing NM global symbol codes.
-+symcode='[BCDEGRST]'
-+
-+# Regexp to match symbols that can be accessed directly from C.
-+sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
-+
-+# Define system-specific variables.
-+case $host_os in
-+aix*)
-+  symcode='[BCDT]'
-+  ;;
-+cygwin* | mingw* | pw32* | cegcc*)
-+  symcode='[ABCDGISTW]'
-+  ;;
-+hpux*)
-+  if test "$host_cpu" = ia64; then
-+    symcode='[ABCDEGRST]'
-+  fi
-+  ;;
-+irix* | nonstopux*)
-+  symcode='[BCDEGRST]'
-+  ;;
-+osf*)
-+  symcode='[BCDEGQRST]'
-+  ;;
-+solaris*)
-+  symcode='[BDRT]'
-+  ;;
-+sco3.2v5*)
-+  symcode='[DT]'
-+  ;;
-+sysv4.2uw2*)
-+  symcode='[DT]'
-+  ;;
-+sysv5* | sco5v6* | unixware* | OpenUNIX*)
-+  symcode='[ABDT]'
-+  ;;
-+sysv4)
-+  symcode='[DFNSTU]'
-+  ;;
-+esac
-+
-+# If we're using GNU nm, then use its standard symbol codes.
-+case `$NM -V 2>&1` in
-+*GNU* | *'with BFD'*)
-+  symcode='[ABCDGIRSTW]' ;;
-+esac
-+
-+# Transform an extracted symbol line into a proper C declaration.
-+# Some systems (esp. on ia64) link data and code symbols differently,
-+# so use this general approach.
-+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-+
-+# Transform an extracted symbol line into symbol name and symbol address
-+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (void *) \&\2},/p'"
-+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
-+
-+# Handle CRLF in mingw tool chain
-+opt_cr=
-+case $build_os in
-+mingw*)
-+  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-+  ;;
-+esac
-+
-+# Try without a prefix underscore, then with it.
-+for ac_symprfx in "" "_"; do
-+
-+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-+  symxfrm="\\1 $ac_symprfx\\2 \\2"
-+
-+  # Write the raw and C identifiers.
-+  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-+    # Fake it for dumpbin and say T for any non-static function
-+    # and D for any global variable.
-+    # Also find C++ and __fastcall symbols from MSVC++,
-+    # which start with @ or ?.
-+    lt_cv_sys_global_symbol_pipe="$AWK '"\
-+"     {last_section=section; section=\$ 3};"\
-+"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
-+"     \$ 0!~/External *\|/{next};"\
-+"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
-+"     {if(hide[section]) next};"\
-+"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-+"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-+"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
-+"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
-+"     ' prfx=^$ac_symprfx"
-+  else
-+    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[	 ]\($symcode$symcode*\)[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-+  fi
-+
-+  # Check to see that the pipe works correctly.
-+  pipe_works=no
-+
-+  rm -f conftest*
-+  cat > conftest.$ac_ext <<_LT_EOF
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+char nm_test_var;
-+void nm_test_func(void);
-+void nm_test_func(void){}
-+#ifdef __cplusplus
-+}
-+#endif
-+int main(){nm_test_var='a';nm_test_func();return(0);}
-+_LT_EOF
-+
-+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-+    # Now try to grab the symbols.
-+    nlist=conftest.nm
-+    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
-+  (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; } && test -s "$nlist"; then
-+      # Try sorting and uniquifying the output.
-+      if sort "$nlist" | uniq > "$nlist"T; then
-+	mv -f "$nlist"T "$nlist"
-+      else
-+	rm -f "$nlist"T
-+      fi
-+
-+      # Make sure that we snagged all the symbols we need.
-+      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
-+	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
-+	  cat <<_LT_EOF > conftest.$ac_ext
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+_LT_EOF
-+	  # Now generate the symbol file.
-+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
-+
-+	  cat <<_LT_EOF >> conftest.$ac_ext
-+
-+/* The mapping between symbol names and symbols.  */
-+const struct {
-+  const char *name;
-+  void       *address;
-+}
-+lt__PROGRAM__LTX_preloaded_symbols[] =
-+{
-+  { "@PROGRAM@", (void *) 0 },
-+_LT_EOF
-+	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
-+	  cat <<\_LT_EOF >> conftest.$ac_ext
-+  {0, (void *) 0}
-+};
-+
-+/* This works around a problem in FreeBSD linker */
-+#ifdef FREEBSD_WORKAROUND
-+static const void *lt_preloaded_setup() {
-+  return lt__PROGRAM__LTX_preloaded_symbols;
-+}
-+#endif
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+_LT_EOF
-+	  # Now try linking the two files.
-+	  mv conftest.$ac_objext conftstm.$ac_objext
-+	  lt_save_LIBS="$LIBS"
-+	  lt_save_CFLAGS="$CFLAGS"
-+	  LIBS="conftstm.$ac_objext"
-+	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
-+	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; } && test -s conftest${ac_exeext}; then
-+	    pipe_works=yes
-+	  fi
-+	  LIBS="$lt_save_LIBS"
-+	  CFLAGS="$lt_save_CFLAGS"
-+	else
-+	  echo "cannot find nm_test_func in $nlist" >&5
-+	fi
-+      else
-+	echo "cannot find nm_test_var in $nlist" >&5
-+      fi
-+    else
-+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
-+    fi
-+  else
-+    echo "$progname: failed program was:" >&5
-+    cat conftest.$ac_ext >&5
-+  fi
-+  rm -rf conftest* conftst*
-+
-+  # Do not use the global_symbol_pipe unless it works.
-+  if test "$pipe_works" = yes; then
-+    break
-+  else
-+    lt_cv_sys_global_symbol_pipe=
-+  fi
-+done
-+
-+fi
-+
-+if test -z "$lt_cv_sys_global_symbol_pipe"; then
-+  lt_cv_sys_global_symbol_to_cdecl=
-+fi
-+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-+$as_echo "failed" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-+$as_echo "ok" >&6; }
-+fi
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+@%:@ Check whether --enable-libtool-lock was given.
-+if test "${enable_libtool_lock+set}" = set; then :
-+  enableval=$enable_libtool_lock; 
-+fi
-+
-+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-+
-+# Some flags need to be propagated to the compiler or linker for good
-+# libtool support.
-+case $host in
-+ia64-*-hpux*)
-+  # Find out which ABI we are using.
-+  echo 'int i;' > conftest.$ac_ext
-+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-+    case `/usr/bin/file conftest.$ac_objext` in
-+      *ELF-32*)
-+	HPUX_IA64_MODE="32"
-+	;;
-+      *ELF-64*)
-+	HPUX_IA64_MODE="64"
-+	;;
-+    esac
-+  fi
-+  rm -rf conftest*
-+  ;;
-+*-*-irix6*)
-+  # Find out which ABI we are using.
-+  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
-+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-+    if test "$lt_cv_prog_gnu_ld" = yes; then
-+      case `/usr/bin/file conftest.$ac_objext` in
-+	*32-bit*)
-+	  LD="${LD-ld} -melf32bsmip"
-+	  ;;
-+	*N32*)
-+	  LD="${LD-ld} -melf32bmipn32"
-+	  ;;
-+	*64-bit*)
-+	  LD="${LD-ld} -melf64bmip"
-+	;;
-+      esac
-+    else
-+      case `/usr/bin/file conftest.$ac_objext` in
-+	*32-bit*)
-+	  LD="${LD-ld} -32"
-+	  ;;
-+	*N32*)
-+	  LD="${LD-ld} -n32"
-+	  ;;
-+	*64-bit*)
-+	  LD="${LD-ld} -64"
-+	  ;;
-+      esac
-+    fi
-+  fi
-+  rm -rf conftest*
-+  ;;
-+
-+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-+  # Find out which ABI we are using.
-+  echo 'int i;' > conftest.$ac_ext
-+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-+    case `/usr/bin/file conftest.o` in
-+      *32-bit*)
-+	case $host in
-+	  x86_64-*kfreebsd*-gnu)
-+	    LD="${LD-ld} -m elf_i386_fbsd"
-+	    ;;
-+	  x86_64-*linux*)
-+	    LD="${LD-ld} -m elf_i386"
-+	    ;;
-+	  ppc64-*linux*|powerpc64-*linux*)
-+	    LD="${LD-ld} -m elf32ppclinux"
-+	    ;;
-+	  s390x-*linux*)
-+	    LD="${LD-ld} -m elf_s390"
-+	    ;;
-+	  sparc64-*linux*)
-+	    LD="${LD-ld} -m elf32_sparc"
-+	    ;;
-+	esac
-+	;;
-+      *64-bit*)
-+	case $host in
-+	  x86_64-*kfreebsd*-gnu)
-+	    LD="${LD-ld} -m elf_x86_64_fbsd"
-+	    ;;
-+	  x86_64-*linux*)
-+	    LD="${LD-ld} -m elf_x86_64"
-+	    ;;
-+	  ppc*-*linux*|powerpc*-*linux*)
-+	    LD="${LD-ld} -m elf64ppc"
-+	    ;;
-+	  s390*-*linux*|s390*-*tpf*)
-+	    LD="${LD-ld} -m elf64_s390"
-+	    ;;
-+	  sparc*-*linux*)
-+	    LD="${LD-ld} -m elf64_sparc"
-+	    ;;
-+	esac
-+	;;
-+    esac
-+  fi
-+  rm -rf conftest*
-+  ;;
-+
-+*-*-sco3.2v5*)
-+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-+  SAVE_CFLAGS="$CFLAGS"
-+  CFLAGS="$CFLAGS -belf"
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
-+$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
-+if test "${lt_cv_cc_needs_belf+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+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
-+
-+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  lt_cv_cc_needs_belf=yes
-+else
-+  lt_cv_cc_needs_belf=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+     ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+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
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
-+$as_echo "$lt_cv_cc_needs_belf" >&6; }
-+  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"
-+  fi
-+  ;;
-+sparc*-*solaris*)
-+  # Find out which ABI we are using.
-+  echo 'int i;' > conftest.$ac_ext
-+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-+    case `/usr/bin/file conftest.o` in
-+    *64-bit*)
-+      case $lt_cv_prog_gnu_ld in
-+      yes*) LD="${LD-ld} -m elf64_sparc" ;;
-+      *)
-+	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-+	  LD="${LD-ld} -64"
-+	fi
-+	;;
-+      esac
-+      ;;
-+    esac
-+  fi
-+  rm -rf conftest*
-+  ;;
-+esac
-+
-+need_locks="$enable_libtool_lock"
-+
-+
-+  case $host_os in
-+    rhapsody* | darwin*)
-+    if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$DSYMUTIL"; then
-+  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+DSYMUTIL=$ac_cv_prog_DSYMUTIL
-+if test -n "$DSYMUTIL"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
-+$as_echo "$DSYMUTIL" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$ac_cv_prog_DSYMUTIL"; then
-+  ac_ct_DSYMUTIL=$DSYMUTIL
-+  # Extract the first word of "dsymutil", so it can be a program name with args.
-+set dummy dsymutil; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$ac_ct_DSYMUTIL"; then
-+  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
-+if test -n "$ac_ct_DSYMUTIL"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
-+$as_echo "$ac_ct_DSYMUTIL" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+  if test "x$ac_ct_DSYMUTIL" = x; then
-+    DSYMUTIL=":"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    DSYMUTIL=$ac_ct_DSYMUTIL
-+  fi
-+else
-+  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
-+fi
-+
-+    if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}nmedit; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_NMEDIT+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$NMEDIT"; then
-+  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+NMEDIT=$ac_cv_prog_NMEDIT
-+if test -n "$NMEDIT"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
-+$as_echo "$NMEDIT" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$ac_cv_prog_NMEDIT"; then
-+  ac_ct_NMEDIT=$NMEDIT
-+  # Extract the first word of "nmedit", so it can be a program name with args.
-+set dummy nmedit; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$ac_ct_NMEDIT"; then
-+  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_NMEDIT="nmedit"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
-+if test -n "$ac_ct_NMEDIT"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
-+$as_echo "$ac_ct_NMEDIT" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+  if test "x$ac_ct_NMEDIT" = x; then
-+    NMEDIT=":"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    NMEDIT=$ac_ct_NMEDIT
-+  fi
-+else
-+  NMEDIT="$ac_cv_prog_NMEDIT"
-+fi
-+
-+    if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}lipo; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_LIPO+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$LIPO"; then
-+  ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+LIPO=$ac_cv_prog_LIPO
-+if test -n "$LIPO"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
-+$as_echo "$LIPO" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$ac_cv_prog_LIPO"; then
-+  ac_ct_LIPO=$LIPO
-+  # Extract the first word of "lipo", so it can be a program name with args.
-+set dummy lipo; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$ac_ct_LIPO"; then
-+  ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_LIPO="lipo"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
-+if test -n "$ac_ct_LIPO"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
-+$as_echo "$ac_ct_LIPO" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+  if test "x$ac_ct_LIPO" = x; then
-+    LIPO=":"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    LIPO=$ac_ct_LIPO
-+  fi
-+else
-+  LIPO="$ac_cv_prog_LIPO"
-+fi
-+
-+    if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}otool; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_OTOOL+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$OTOOL"; then
-+  ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+OTOOL=$ac_cv_prog_OTOOL
-+if test -n "$OTOOL"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
-+$as_echo "$OTOOL" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$ac_cv_prog_OTOOL"; then
-+  ac_ct_OTOOL=$OTOOL
-+  # Extract the first word of "otool", so it can be a program name with args.
-+set dummy otool; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$ac_ct_OTOOL"; then
-+  ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_OTOOL="otool"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
-+if test -n "$ac_ct_OTOOL"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
-+$as_echo "$ac_ct_OTOOL" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+  if test "x$ac_ct_OTOOL" = x; then
-+    OTOOL=":"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    OTOOL=$ac_ct_OTOOL
-+  fi
-+else
-+  OTOOL="$ac_cv_prog_OTOOL"
-+fi
-+
-+    if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}otool64; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_OTOOL64+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$OTOOL64"; then
-+  ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+OTOOL64=$ac_cv_prog_OTOOL64
-+if test -n "$OTOOL64"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
-+$as_echo "$OTOOL64" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$ac_cv_prog_OTOOL64"; then
-+  ac_ct_OTOOL64=$OTOOL64
-+  # Extract the first word of "otool64", so it can be a program name with args.
-+set dummy otool64; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$ac_ct_OTOOL64"; then
-+  ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_OTOOL64="otool64"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
-+if test -n "$ac_ct_OTOOL64"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
-+$as_echo "$ac_ct_OTOOL64" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+  if test "x$ac_ct_OTOOL64" = x; then
-+    OTOOL64=":"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    OTOOL64=$ac_ct_OTOOL64
-+  fi
-+else
-+  OTOOL64="$ac_cv_prog_OTOOL64"
-+fi
-+
-+    
-+    
-+    
-+    
-+
-+    
-+    
-+    
-+    
-+
-+    
-+    
-+    
-+    
-+
-+    
-+    
-+    
-+    
-+
-+    
-+    
-+    
-+    
-+
-+
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
-+$as_echo_n "checking for -single_module linker flag... " >&6; }
-+if test "${lt_cv_apple_cc_single_mod+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  lt_cv_apple_cc_single_mod=no
-+      if test -z "${LT_MULTI_MODULE}"; then
-+	# By default we will add the -single_module flag. You can override
-+	# by either setting the environment variable LT_MULTI_MODULE
-+	# non-empty at configure time, or by adding -multi_module to the
-+	# link flags.
-+	rm -rf libconftest.dylib*
-+	echo "int foo(void){return 1;}" > conftest.c
-+	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-+-dynamiclib -Wl,-single_module conftest.c" >&5
-+	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-+	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
-+        _lt_result=$?
-+	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
-+	  lt_cv_apple_cc_single_mod=yes
-+	else
-+	  cat conftest.err >&5
-+	fi
-+	rm -rf libconftest.dylib*
-+	rm -f conftest.*
-+      fi
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
-+$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
-+$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
-+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  lt_cv_ld_exported_symbols_list=no
-+      save_LDFLAGS=$LDFLAGS
-+      echo "_main" > conftest.sym
-+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  lt_cv_ld_exported_symbols_list=yes
-+else
-+  lt_cv_ld_exported_symbols_list=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+	LDFLAGS="$save_LDFLAGS"
-+    
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
-+$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
-+$as_echo_n "checking for -force_load linker flag... " >&6; }
-+if test "${lt_cv_ld_force_load+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  lt_cv_ld_force_load=no
-+      cat > conftest.c << _LT_EOF
-+int forced_loaded() { return 2;}
-+_LT_EOF
-+      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
-+      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
-+      echo "$AR cru libconftest.a conftest.o" >&5
-+      $AR cru libconftest.a conftest.o 2>&5
-+      cat > conftest.c << _LT_EOF
-+int main() { return 0;}
-+_LT_EOF
-+      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
-+      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
-+      _lt_result=$?
-+      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
-+	lt_cv_ld_force_load=yes
-+      else
-+	cat conftest.err >&5
-+      fi
-+        rm -f conftest.err libconftest.a conftest conftest.c
-+        rm -rf conftest.dSYM
-+    
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
-+$as_echo "$lt_cv_ld_force_load" >&6; }
-+    case $host_os in
-+    rhapsody* | darwin1.[012])
-+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-+    darwin1.*)
-+      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-+    darwin*) # darwin 5.x on
-+      # if running on 10.5 or later, the deployment target defaults
-+      # to the OS version, if on x86, and 10.4, the deployment
-+      # target defaults to 10.4. Don't you love it?
-+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-+	10.0,*86*-darwin8*|10.0,*-darwin[91]*)
-+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-+	10.[012]*)
-+	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-+	10.*)
-+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-+      esac
-+    ;;
-+  esac
-+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
-+      _lt_dar_single_mod='$single_module'
-+    fi
-+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
-+    else
-+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+    fi
-+    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
-+      _lt_dsymutil='~$DSYMUTIL $lib || :'
-+    else
-+      _lt_dsymutil=
-+    fi
-+    ;;
-+  esac
-+
-+for ac_header in dlfcn.h
-+do :
-+  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
-+"
-+if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+@%:@define HAVE_DLFCN_H 1
-+_ACEOF
-+ 
-+fi
-+
-+done
-+
-+
-+
-+
-+
-+# Set options
-+
-+
-+
-+        enable_dlopen=no
-+  
-+
-+  enable_win32_dll=no
-+  
-+
-+            @%:@ Check whether --enable-shared was given.
-+if test "${enable_shared+set}" = set; then :
-+  enableval=$enable_shared; p=${PACKAGE-default}
-+    case $enableval in
-+    yes) enable_shared=yes ;;
-+    no) enable_shared=no ;;
-+    *)
-+      enable_shared=no
-+      # Look at the argument we got.  We use all the common list separators.
-+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+      for pkg in $enableval; do
-+	IFS="$lt_save_ifs"
-+	if test "X$pkg" = "X$p"; then
-+	  enable_shared=yes
-+	fi
-+      done
-+      IFS="$lt_save_ifs"
-+      ;;
-+    esac
-+else
-+  enable_shared=yes
-+fi
-+
-+
-+    
-+    
-+    
-+    
-+
-+
-+
-+  @%:@ Check whether --enable-static was given.
-+if test "${enable_static+set}" = set; then :
-+  enableval=$enable_static; p=${PACKAGE-default}
-+    case $enableval in
-+    yes) enable_static=yes ;;
-+    no) enable_static=no ;;
-+    *)
-+     enable_static=no
-+      # Look at the argument we got.  We use all the common list separators.
-+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+      for pkg in $enableval; do
-+	IFS="$lt_save_ifs"
-+	if test "X$pkg" = "X$p"; then
-+	  enable_static=yes
-+	fi
-+      done
-+      IFS="$lt_save_ifs"
-+      ;;
-+    esac
-+else
-+  enable_static=yes
-+fi
-+
-+
-+    
-+    
-+    
-+    
-+
-+
-+
-+  
-+@%:@ Check whether --with-pic was given.
-+if test "${with_pic+set}" = set; then :
-+  withval=$with_pic; pic_mode="$withval"
-+else
-+  pic_mode=default
-+fi
-+
-+
-+test -z "$pic_mode" && pic_mode=default
-+
-+
-+    
-+    
-+    
-+
-+
-+  @%:@ Check whether --enable-fast-install was given.
-+if test "${enable_fast_install+set}" = set; then :
-+  enableval=$enable_fast_install; p=${PACKAGE-default}
-+    case $enableval in
-+    yes) enable_fast_install=yes ;;
-+    no) enable_fast_install=no ;;
-+    *)
-+      enable_fast_install=no
-+      # Look at the argument we got.  We use all the common list separators.
-+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+      for pkg in $enableval; do
-+	IFS="$lt_save_ifs"
-+	if test "X$pkg" = "X$p"; then
-+	  enable_fast_install=yes
-+	fi
-+      done
-+      IFS="$lt_save_ifs"
-+      ;;
-+    esac
-+else
-+  enable_fast_install=yes
-+fi
-+
-+
-+
-+    
-+    
-+    
-+
-+
-+  
-+
-+
-+# This can be used to rebuild libtool when needed
-+LIBTOOL_DEPS="$ltmain"
-+
-+# Always use our own libtool.
-+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+
-+
-+
-+    
-+    
-+    
-+
-+    
-+    
-+    
-+
-+    
-+    
-+    
-+
-+    
-+    
-+    
-+
-+    
-+    
-+    
-+
-+    
-+    
-+    
-+test -z "$LN_S" && LN_S="ln -s"
-+
-+    
-+    
-+    
-+
-+    
-+    
-+    
-+
-+    
-+    
-+    
-+
-+
-+if test -n "${ZSH_VERSION+set}" ; then
-+   setopt NO_GLOB_SUBST
-+fi
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
-+$as_echo_n "checking for objdir... " >&6; }
-+if test "${lt_cv_objdir+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  rm -f .libs 2>/dev/null
-+mkdir .libs 2>/dev/null
-+if test -d .libs; then
-+  lt_cv_objdir=.libs
-+else
-+  # MS-DOS does not allow filenames that begin with a dot.
-+  lt_cv_objdir=_libs
-+fi
-+rmdir .libs 2>/dev/null
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
-+$as_echo "$lt_cv_objdir" >&6; }
-+objdir=$lt_cv_objdir
-+
-+    
-+    
-+    
-+
-+cat >>confdefs.h <<_ACEOF
-+@%:@define LT_OBJDIR "$lt_cv_objdir/"
-+_ACEOF
-+
-+
-+
-+
-+case $host_os in
-+aix3*)
-+  # AIX sometimes has problems with the GCC collect2 program.  For some
-+  # reason, if we set the COLLECT_NAMES environment variable, the problems
-+  # vanish in a puff of smoke.
-+  if test "X${COLLECT_NAMES+set}" != Xset; then
-+    COLLECT_NAMES=
-+    export COLLECT_NAMES
-+  fi
-+  ;;
-+esac
-+
-+# Global variables:
-+ofile=libtool
-+can_build_shared=yes
-+
-+# All known linkers require a `.a' archive for static linking (except MSVC,
-+# which needs '.lib').
-+libext=a
-+
-+with_gnu_ld="$lt_cv_prog_gnu_ld"
-+
-+old_CC="$CC"
-+old_CFLAGS="$CFLAGS"
-+
-+# Set sane defaults for various variables
-+test -z "$CC" && CC=cc
-+test -z "$LTCC" && LTCC=$CC
-+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-+test -z "$LD" && LD=ld
-+test -z "$ac_objext" && ac_objext=o
-+
-+for cc_temp in $compiler""; do
-+  case $cc_temp in
-+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-+    \-*) ;;
-+    *) break;;
-+  esac
-+done
-+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
-+
-+
-+# Only perform the check for file, if the check method requires it
-+test -z "$MAGIC_CMD" && MAGIC_CMD=file
-+case $deplibs_check_method in
-+file_magic*)
-+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
-+$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
-+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  case $MAGIC_CMD in
-+[\\/*] |  ?:[\\/]*)
-+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-+  ;;
-+*)
-+  lt_save_MAGIC_CMD="$MAGIC_CMD"
-+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-+  for ac_dir in $ac_dummy; do
-+    IFS="$lt_save_ifs"
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/${ac_tool_prefix}file; then
-+      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
-+      if test -n "$file_magic_test_file"; then
-+	case $deplibs_check_method in
-+	"file_magic "*)
-+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-+	    $EGREP "$file_magic_regex" > /dev/null; then
-+	    :
-+	  else
-+	    cat <<_LT_EOF 1>&2
-+
-+*** Warning: the command libtool uses to detect shared libraries,
-+*** $file_magic_cmd, produces output that libtool cannot recognize.
-+*** The result is that libtool may fail to recognize shared libraries
-+*** as such.  This will affect the creation of libtool libraries that
-+*** depend on shared libraries, but programs linked with such libtool
-+*** libraries will work regardless of this problem.  Nevertheless, you
-+*** may want to report the problem to your system manager and/or to
-+*** bug-libtool@gnu.org
-+
-+_LT_EOF
-+	  fi ;;
-+	esac
-+      fi
-+      break
-+    fi
-+  done
-+  IFS="$lt_save_ifs"
-+  MAGIC_CMD="$lt_save_MAGIC_CMD"
-+  ;;
-+esac
-+fi
-+
-+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+if test -n "$MAGIC_CMD"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-+$as_echo "$MAGIC_CMD" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+    
-+    
-+    
-+
-+if test -z "$lt_cv_path_MAGIC_CMD"; then
-+  if test -n "$ac_tool_prefix"; then
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
-+$as_echo_n "checking for file... " >&6; }
-+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  case $MAGIC_CMD in
-+[\\/*] |  ?:[\\/]*)
-+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-+  ;;
-+*)
-+  lt_save_MAGIC_CMD="$MAGIC_CMD"
-+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-+  for ac_dir in $ac_dummy; do
-+    IFS="$lt_save_ifs"
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/file; then
-+      lt_cv_path_MAGIC_CMD="$ac_dir/file"
-+      if test -n "$file_magic_test_file"; then
-+	case $deplibs_check_method in
-+	"file_magic "*)
-+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-+	    $EGREP "$file_magic_regex" > /dev/null; then
-+	    :
-+	  else
-+	    cat <<_LT_EOF 1>&2
-+
-+*** Warning: the command libtool uses to detect shared libraries,
-+*** $file_magic_cmd, produces output that libtool cannot recognize.
-+*** The result is that libtool may fail to recognize shared libraries
-+*** as such.  This will affect the creation of libtool libraries that
-+*** depend on shared libraries, but programs linked with such libtool
-+*** libraries will work regardless of this problem.  Nevertheless, you
-+*** may want to report the problem to your system manager and/or to
-+*** bug-libtool@gnu.org
-+
-+_LT_EOF
-+	  fi ;;
-+	esac
-+      fi
-+      break
-+    fi
-+  done
-+  IFS="$lt_save_ifs"
-+  MAGIC_CMD="$lt_save_MAGIC_CMD"
-+  ;;
-+esac
-+fi
-+
-+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+if test -n "$MAGIC_CMD"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-+$as_echo "$MAGIC_CMD" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+  else
-+    MAGIC_CMD=:
-+  fi
-+fi
-+
-+  fi
-+  ;;
-+esac
-+
-+# Use C for the default configuration in the libtool script
-+
-+lt_save_CC="$CC"
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+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
-+
-+
-+# Source file extension for C test sources.
-+ac_ext=c
-+
-+# Object file extension for compiled C test sources.
-+objext=o
-+objext=$objext
-+
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code="int some_variable = 0;"
-+
-+# Code to be used in simple link tests
-+lt_simple_link_test_code='int main(){return(0);}'
-+
-+
-+
-+
-+
-+
-+
-+# If no C compiler was specified, use CC.
-+LTCC=${LTCC-"$CC"}
-+
-+# If no C compiler flags were specified, use CFLAGS.
-+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-+
-+# Allow CC to be a program name with arguments.
-+compiler=$CC
-+
-+# Save the default compiler, since it gets overwritten when the other
-+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
-+compiler_DEFAULT=$CC
-+
-+# save warnings/boilerplate of simple test code
-+ac_outfile=conftest.$ac_objext
-+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-+_lt_compiler_boilerplate=`cat conftest.err`
-+$RM conftest*
-+
-+ac_outfile=conftest.$ac_objext
-+echo "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-+_lt_linker_boilerplate=`cat conftest.err`
-+$RM -r conftest*
-+
-+
-+## CAVEAT EMPTOR:
-+## There is no encapsulation within the following macros, do not change
-+## the running order or otherwise move them around unless you know exactly
-+## what you are doing...
-+if test -n "$compiler"; then
-+  
-+lt_prog_compiler_no_builtin_flag=
-+
-+if test "$GCC" = yes; then
-+  case $cc_basename in
-+  nvcc*)
-+    lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
-+  *)
-+    lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
-+  esac
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-+$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-+if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  lt_cv_prog_compiler_rtti_exceptions=no
-+   ac_outfile=conftest.$ac_objext
-+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-+   lt_compiler_flag="-fno-rtti -fno-exceptions"
-+   # Insert the option either (1) after the last *FLAGS variable, or
-+   # (2) before a word containing "conftest.", or (3) at the end.
-+   # Note that $ac_compile itself does not contain backslashes and begins
-+   # with a dollar sign (not a hyphen), so the echo should work correctly.
-+   # The option is referenced via a variable to avoid confusing sed.
-+   lt_compile=`echo "$ac_compile" | $SED \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+   -e 's:$: $lt_compiler_flag:'`
-+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-+   (eval "$lt_compile" 2>conftest.err)
-+   ac_status=$?
-+   cat conftest.err >&5
-+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+   if (exit $ac_status) && test -s "$ac_outfile"; then
-+     # The compiler can only warn and ignore the option if not recognized
-+     # So say no if there are warnings other than the usual output.
-+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
-+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-+       lt_cv_prog_compiler_rtti_exceptions=yes
-+     fi
-+   fi
-+   $RM conftest*
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-+$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
-+
-+if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-+    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-+else
-+    :
-+fi
-+
-+fi
-+
-+    
-+    
-+    
-+
-+
-+  lt_prog_compiler_wl=
-+lt_prog_compiler_pic=
-+lt_prog_compiler_static=
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-+
-+  if test "$GCC" = yes; then
-+    lt_prog_compiler_wl='-Wl,'
-+    lt_prog_compiler_static='-static'
-+
-+    case $host_os in
-+      aix*)
-+      # All AIX code is PIC.
-+      if test "$host_cpu" = ia64; then
-+	# AIX 5 now supports IA64 processor
-+	lt_prog_compiler_static='-Bstatic'
-+      fi
-+      ;;
-+
-+    amigaos*)
-+      case $host_cpu in
-+      powerpc)
-+            # see comment about AmigaOS4 .so support
-+            lt_prog_compiler_pic='-fPIC'
-+        ;;
-+      m68k)
-+            # FIXME: we need at least 68020 code to build shared libraries, but
-+            # adding the `-m68020' flag to GCC prevents building anything better,
-+            # like `-m68040'.
-+            lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
-+        ;;
-+      esac
-+      ;;
-+
-+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+      # PIC is the default for these OSes.
-+      ;;
-+
-+    mingw* | cygwin* | pw32* | os2* | cegcc*)
-+      # This hack is so that the source file can tell whether it is being
-+      # built for inclusion in a dll (and should export symbols for example).
-+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-+      # (--disable-auto-import) libraries
-+      lt_prog_compiler_pic='-DDLL_EXPORT'
-+      ;;
-+
-+    darwin* | rhapsody*)
-+      # PIC is the default on this platform
-+      # Common symbols not allowed in MH_DYLIB files
-+      lt_prog_compiler_pic='-fno-common'
-+      ;;
-+
-+    haiku*)
-+      # PIC is the default for Haiku.
-+      # The "-static" flag exists, but is broken.
-+      lt_prog_compiler_static=
-+      ;;
-+
-+    hpux*)
-+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-+      # sets the default TLS model and affects inlining.
-+      case $host_cpu in
-+      hppa*64*)
-+	# +Z the default
-+	;;
-+      *)
-+	lt_prog_compiler_pic='-fPIC'
-+	;;
-+      esac
-+      ;;
-+
-+    interix[3-9]*)
-+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-+      # Instead, we relocate shared libraries at runtime.
-+      ;;
-+
-+    msdosdjgpp*)
-+      # Just because we use GCC doesn't mean we suddenly get shared libraries
-+      # on systems that don't support them.
-+      lt_prog_compiler_can_build_shared=no
-+      enable_shared=no
-+      ;;
-+
-+    *nto* | *qnx*)
-+      # QNX uses GNU C++, but need to define -shared option too, otherwise
-+      # it will coredump.
-+      lt_prog_compiler_pic='-fPIC -shared'
-+      ;;
-+
-+    sysv4*MP*)
-+      if test -d /usr/nec; then
-+	lt_prog_compiler_pic=-Kconform_pic
-+      fi
-+      ;;
-+
-+    *)
-+      lt_prog_compiler_pic='-fPIC'
-+      ;;
-+    esac
-+
-+    case $cc_basename in
-+    nvcc*) # Cuda Compiler Driver 2.2
-+      lt_prog_compiler_wl='-Xlinker '
-+      lt_prog_compiler_pic='-Xcompiler -fPIC'
-+      ;;
-+    esac
-+  else
-+    # PORTME Check for flag to pass linker flags through the system compiler.
-+    case $host_os in
-+    aix*)
-+      lt_prog_compiler_wl='-Wl,'
-+      if test "$host_cpu" = ia64; then
-+	# AIX 5 now supports IA64 processor
-+	lt_prog_compiler_static='-Bstatic'
-+      else
-+	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
-+      fi
-+      ;;
-+
-+    mingw* | cygwin* | pw32* | os2* | cegcc*)
-+      # This hack is so that the source file can tell whether it is being
-+      # built for inclusion in a dll (and should export symbols for example).
-+      lt_prog_compiler_pic='-DDLL_EXPORT'
-+      ;;
-+
-+    hpux9* | hpux10* | hpux11*)
-+      lt_prog_compiler_wl='-Wl,'
-+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-+      # not for PA HP-UX.
-+      case $host_cpu in
-+      hppa*64*|ia64*)
-+	# +Z the default
-+	;;
-+      *)
-+	lt_prog_compiler_pic='+Z'
-+	;;
-+      esac
-+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-+      lt_prog_compiler_static='${wl}-a ${wl}archive'
-+      ;;
-+
-+    irix5* | irix6* | nonstopux*)
-+      lt_prog_compiler_wl='-Wl,'
-+      # PIC (with -KPIC) is the default.
-+      lt_prog_compiler_static='-non_shared'
-+      ;;
-+
-+    linux* | k*bsd*-gnu | kopensolaris*-gnu)
-+      case $cc_basename in
-+      # old Intel for x86_64 which still supported -KPIC.
-+      ecc*)
-+	lt_prog_compiler_wl='-Wl,'
-+	lt_prog_compiler_pic='-KPIC'
-+	lt_prog_compiler_static='-static'
-+        ;;
-+      # icc used to be incompatible with GCC.
-+      # ICC 10 doesn't accept -KPIC any more.
-+      icc* | ifort*)
-+	lt_prog_compiler_wl='-Wl,'
-+	lt_prog_compiler_pic='-fPIC'
-+	lt_prog_compiler_static='-static'
-+        ;;
-+      # Lahey Fortran 8.1.
-+      lf95*)
-+	lt_prog_compiler_wl='-Wl,'
-+	lt_prog_compiler_pic='--shared'
-+	lt_prog_compiler_static='--static'
-+	;;
-+      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
-+        # Portland Group compilers (*not* the Pentium gcc compiler,
-+	# which looks to be a dead project)
-+	lt_prog_compiler_wl='-Wl,'
-+	lt_prog_compiler_pic='-fpic'
-+	lt_prog_compiler_static='-Bstatic'
-+        ;;
-+      ccc*)
-+        lt_prog_compiler_wl='-Wl,'
-+        # All Alpha code is PIC.
-+        lt_prog_compiler_static='-non_shared'
-+        ;;
-+      xl* | bgxl* | bgf* | mpixl*)
-+	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
-+	lt_prog_compiler_wl='-Wl,'
-+	lt_prog_compiler_pic='-qpic'
-+	lt_prog_compiler_static='-qstaticlink'
-+	;;
-+      *)
-+	case `$CC -V 2>&1 | sed 5q` in
-+	*Sun\ F* | *Sun*Fortran*)
-+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-+	  lt_prog_compiler_pic='-KPIC'
-+	  lt_prog_compiler_static='-Bstatic'
-+	  lt_prog_compiler_wl=''
-+	  ;;
-+	*Sun\ C*)
-+	  # Sun C 5.9
-+	  lt_prog_compiler_pic='-KPIC'
-+	  lt_prog_compiler_static='-Bstatic'
-+	  lt_prog_compiler_wl='-Wl,'
-+	  ;;
-+	esac
-+	;;
-+      esac
-+      ;;
-+
-+    newsos6)
-+      lt_prog_compiler_pic='-KPIC'
-+      lt_prog_compiler_static='-Bstatic'
-+      ;;
-+
-+    *nto* | *qnx*)
-+      # QNX uses GNU C++, but need to define -shared option too, otherwise
-+      # it will coredump.
-+      lt_prog_compiler_pic='-fPIC -shared'
-+      ;;
-+
-+    osf3* | osf4* | osf5*)
-+      lt_prog_compiler_wl='-Wl,'
-+      # All OSF/1 code is PIC.
-+      lt_prog_compiler_static='-non_shared'
-+      ;;
-+
-+    rdos*)
-+      lt_prog_compiler_static='-non_shared'
-+      ;;
-+
-+    solaris*)
-+      lt_prog_compiler_pic='-KPIC'
-+      lt_prog_compiler_static='-Bstatic'
-+      case $cc_basename in
-+      f77* | f90* | f95*)
-+	lt_prog_compiler_wl='-Qoption ld ';;
-+      *)
-+	lt_prog_compiler_wl='-Wl,';;
-+      esac
-+      ;;
-+
-+    sunos4*)
-+      lt_prog_compiler_wl='-Qoption ld '
-+      lt_prog_compiler_pic='-PIC'
-+      lt_prog_compiler_static='-Bstatic'
-+      ;;
-+
-+    sysv4 | sysv4.2uw2* | sysv4.3*)
-+      lt_prog_compiler_wl='-Wl,'
-+      lt_prog_compiler_pic='-KPIC'
-+      lt_prog_compiler_static='-Bstatic'
-+      ;;
-+
-+    sysv4*MP*)
-+      if test -d /usr/nec ;then
-+	lt_prog_compiler_pic='-Kconform_pic'
-+	lt_prog_compiler_static='-Bstatic'
-+      fi
-+      ;;
-+
-+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-+      lt_prog_compiler_wl='-Wl,'
-+      lt_prog_compiler_pic='-KPIC'
-+      lt_prog_compiler_static='-Bstatic'
-+      ;;
-+
-+    unicos*)
-+      lt_prog_compiler_wl='-Wl,'
-+      lt_prog_compiler_can_build_shared=no
-+      ;;
-+
-+    uts4*)
-+      lt_prog_compiler_pic='-pic'
-+      lt_prog_compiler_static='-Bstatic'
-+      ;;
-+
-+    *)
-+      lt_prog_compiler_can_build_shared=no
-+      ;;
-+    esac
-+  fi
-+
-+case $host_os in
-+  # For platforms which do not support PIC, -DPIC is meaningless:
-+  *djgpp*)
-+    lt_prog_compiler_pic=
-+    ;;
-+  *)
-+    lt_prog_compiler_pic="$lt_prog_compiler_pic@&t@ -DPIC"
-+    ;;
-+esac
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
-+$as_echo "$lt_prog_compiler_pic" >&6; }
-+
-+    
-+    
-+    
-+
-+
-+#
-+# Check to make sure the PIC flag actually works.
-+#
-+if test -n "$lt_prog_compiler_pic"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
-+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  lt_cv_prog_compiler_pic_works=no
-+   ac_outfile=conftest.$ac_objext
-+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-+   lt_compiler_flag="$lt_prog_compiler_pic@&t@ -DPIC"
-+   # Insert the option either (1) after the last *FLAGS variable, or
-+   # (2) before a word containing "conftest.", or (3) at the end.
-+   # Note that $ac_compile itself does not contain backslashes and begins
-+   # with a dollar sign (not a hyphen), so the echo should work correctly.
-+   # The option is referenced via a variable to avoid confusing sed.
-+   lt_compile=`echo "$ac_compile" | $SED \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+   -e 's:$: $lt_compiler_flag:'`
-+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-+   (eval "$lt_compile" 2>conftest.err)
-+   ac_status=$?
-+   cat conftest.err >&5
-+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+   if (exit $ac_status) && test -s "$ac_outfile"; then
-+     # The compiler can only warn and ignore the option if not recognized
-+     # So say no if there are warnings other than the usual output.
-+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
-+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-+       lt_cv_prog_compiler_pic_works=yes
-+     fi
-+   fi
-+   $RM conftest*
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
-+$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
-+
-+if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-+    case $lt_prog_compiler_pic in
-+     "" | " "*) ;;
-+     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
-+     esac
-+else
-+    lt_prog_compiler_pic=
-+     lt_prog_compiler_can_build_shared=no
-+fi
-+
-+fi
-+
-+    
-+    
-+    
-+
-+
-+#
-+# Check to make sure the static flag actually works.
-+#
-+wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-+if test "${lt_cv_prog_compiler_static_works+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  lt_cv_prog_compiler_static_works=no
-+   save_LDFLAGS="$LDFLAGS"
-+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-+     # The linker can only warn and ignore the option if not recognized
-+     # So say no if there are warnings
-+     if test -s conftest.err; then
-+       # Append any errors to the config.log.
-+       cat conftest.err 1>&5
-+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-+       if diff conftest.exp conftest.er2 >/dev/null; then
-+         lt_cv_prog_compiler_static_works=yes
-+       fi
-+     else
-+       lt_cv_prog_compiler_static_works=yes
-+     fi
-+   fi
-+   $RM -r conftest*
-+   LDFLAGS="$save_LDFLAGS"
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
-+$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
-+
-+if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-+    :
-+else
-+    lt_prog_compiler_static=
-+fi
-+
-+
-+    
-+    
-+    
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  lt_cv_prog_compiler_c_o=no
-+   $RM -r conftest 2>/dev/null
-+   mkdir conftest
-+   cd conftest
-+   mkdir out
-+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-+
-+   lt_compiler_flag="-o out/conftest2.$ac_objext"
-+   # Insert the option either (1) after the last *FLAGS variable, or
-+   # (2) before a word containing "conftest.", or (3) at the end.
-+   # Note that $ac_compile itself does not contain backslashes and begins
-+   # with a dollar sign (not a hyphen), so the echo should work correctly.
-+   lt_compile=`echo "$ac_compile" | $SED \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+   -e 's:$: $lt_compiler_flag:'`
-+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-+   (eval "$lt_compile" 2>out/conftest.err)
-+   ac_status=$?
-+   cat out/conftest.err >&5
-+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-+   then
-+     # The compiler can only warn and ignore the option if not recognized
-+     # So say no if there are warnings
-+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
-+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-+       lt_cv_prog_compiler_c_o=yes
-+     fi
-+   fi
-+   chmod u+w . 2>&5
-+   $RM conftest*
-+   # SGI C++ compiler will create directory out/ii_files/ for
-+   # template instantiation
-+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-+   $RM out/* && rmdir out
-+   cd ..
-+   $RM -r conftest
-+   $RM conftest*
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-+
-+    
-+    
-+    
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  lt_cv_prog_compiler_c_o=no
-+   $RM -r conftest 2>/dev/null
-+   mkdir conftest
-+   cd conftest
-+   mkdir out
-+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-+
-+   lt_compiler_flag="-o out/conftest2.$ac_objext"
-+   # Insert the option either (1) after the last *FLAGS variable, or
-+   # (2) before a word containing "conftest.", or (3) at the end.
-+   # Note that $ac_compile itself does not contain backslashes and begins
-+   # with a dollar sign (not a hyphen), so the echo should work correctly.
-+   lt_compile=`echo "$ac_compile" | $SED \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+   -e 's:$: $lt_compiler_flag:'`
-+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-+   (eval "$lt_compile" 2>out/conftest.err)
-+   ac_status=$?
-+   cat out/conftest.err >&5
-+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-+   then
-+     # The compiler can only warn and ignore the option if not recognized
-+     # So say no if there are warnings
-+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
-+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-+       lt_cv_prog_compiler_c_o=yes
-+     fi
-+   fi
-+   chmod u+w . 2>&5
-+   $RM conftest*
-+   # SGI C++ compiler will create directory out/ii_files/ for
-+   # template instantiation
-+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-+   $RM out/* && rmdir out
-+   cd ..
-+   $RM -r conftest
-+   $RM conftest*
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-+
-+
-+
-+
-+hard_links="nottested"
-+if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
-+  # do not overwrite the value of need_locks provided by the user
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
-+$as_echo_n "checking if we can lock with hard links... " >&6; }
-+  hard_links=yes
-+  $RM conftest*
-+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+  touch conftest.a
-+  ln conftest.a conftest.b 2>&5 || hard_links=no
-+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
-+$as_echo "$hard_links" >&6; }
-+  if test "$hard_links" = no; then
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-+    need_locks=warn
-+  fi
-+else
-+  need_locks=no
-+fi
-+
-+    
-+    
-+    
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
-+
-+  runpath_var=
-+  allow_undefined_flag=
-+  always_export_symbols=no
-+  archive_cmds=
-+  archive_expsym_cmds=
-+  compiler_needs_object=no
-+  enable_shared_with_static_runtimes=no
-+  export_dynamic_flag_spec=
-+  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+  hardcode_automatic=no
-+  hardcode_direct=no
-+  hardcode_direct_absolute=no
-+  hardcode_libdir_flag_spec=
-+  hardcode_libdir_flag_spec_ld=
-+  hardcode_libdir_separator=
-+  hardcode_minus_L=no
-+  hardcode_shlibpath_var=unsupported
-+  inherit_rpath=no
-+  link_all_deplibs=unknown
-+  module_cmds=
-+  module_expsym_cmds=
-+  old_archive_from_new_cmds=
-+  old_archive_from_expsyms_cmds=
-+  thread_safe_flag_spec=
-+  whole_archive_flag_spec=
-+  # include_expsyms should be a list of space-separated symbols to be *always*
-+  # included in the symbol list
-+  include_expsyms=
-+  # exclude_expsyms can be an extended regexp of symbols to exclude
-+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-+  # as well as any symbol that contains `d'.
-+  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
-+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-+  # platforms (ab)use it in PIC code, but their linkers get confused if
-+  # the symbol is explicitly referenced.  Since portable code cannot
-+  # rely on this symbol name, it's probably fine to never include it in
-+  # preloaded symbol tables.
-+  # Exclude shared library initialization/finalization symbols.
-+  extract_expsyms_cmds=
-+
-+  case $host_os in
-+  cygwin* | mingw* | pw32* | cegcc*)
-+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-+    # When not using gcc, we currently assume that we are using
-+    # Microsoft Visual C++.
-+    if test "$GCC" != yes; then
-+      with_gnu_ld=no
-+    fi
-+    ;;
-+  interix*)
-+    # we just hope/assume this is gcc and not c89 (= MSVC++)
-+    with_gnu_ld=yes
-+    ;;
-+  openbsd*)
-+    with_gnu_ld=no
-+    ;;
-+  esac
-+
-+  ld_shlibs=yes
-+
-+  # On some targets, GNU ld is compatible enough with the native linker
-+  # that we're better off using the native interface for both.
-+  lt_use_gnu_ld_interface=no
-+  if test "$with_gnu_ld" = yes; then
-+    case $host_os in
-+      aix*)
-+	# The AIX port of GNU ld has always aspired to compatibility
-+	# with the native linker.  However, as the warning in the GNU ld
-+	# block says, versions before 2.19.5* couldn't really create working
-+	# shared libraries, regardless of the interface used.
-+	case `$LD -v 2>&1` in
-+	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
-+	  *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;;
-+	  *\ \(GNU\ Binutils\)\ [3-9]*) ;;
-+	  *)
-+	    lt_use_gnu_ld_interface=yes
-+	    ;;
-+	esac
-+	;;
-+      *)
-+	lt_use_gnu_ld_interface=yes
-+	;;
-+    esac
-+  fi
-+
-+  if test "$lt_use_gnu_ld_interface" = yes; then
-+    # If archive_cmds runs LD, not CC, wlarc should be empty
-+    wlarc='${wl}'
-+
-+    # Set some defaults for GNU ld with shared library support. These
-+    # are reset later if shared libraries are not supported. Putting them
-+    # here allows them to be overridden if necessary.
-+    runpath_var=LD_RUN_PATH
-+    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+    export_dynamic_flag_spec='${wl}--export-dynamic'
-+    # ancient GNU ld didn't support --whole-archive et. al.
-+    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
-+      whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+    else
-+      whole_archive_flag_spec=
-+    fi
-+    supports_anon_versioning=no
-+    case `$LD -v 2>&1` in
-+      *GNU\ gold*) supports_anon_versioning=yes ;;
-+      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-+      *\ 2.11.*) ;; # other 2.11 versions
-+      *) supports_anon_versioning=yes ;;
-+    esac
-+
-+    # See if GNU ld supports shared libraries.
-+    case $host_os in
-+    aix[3-9]*)
-+      # On AIX/PPC, the GNU linker is very broken
-+      if test "$host_cpu" != ia64; then
-+	ld_shlibs=no
-+	cat <<_LT_EOF 1>&2
-+
-+*** Warning: the GNU linker, at least up to release 2.19, is reported
-+*** to be unable to reliably create shared libraries on AIX.
-+*** Therefore, libtool is disabling shared libraries support.  If you
-+*** really care for shared libraries, you may want to install binutils
-+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
-+*** You will then need to restart the configuration process.
-+
-+_LT_EOF
-+      fi
-+      ;;
-+
-+    amigaos*)
-+      case $host_cpu in
-+      powerpc)
-+            # see comment about AmigaOS4 .so support
-+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+            archive_expsym_cmds=''
-+        ;;
-+      m68k)
-+            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-+            hardcode_libdir_flag_spec='-L$libdir'
-+            hardcode_minus_L=yes
-+        ;;
-+      esac
-+      ;;
-+
-+    beos*)
-+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+	allow_undefined_flag=unsupported
-+	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-+	# support --undefined.  This deserves some investigation.  FIXME
-+	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+      else
-+	ld_shlibs=no
-+      fi
-+      ;;
-+
-+    cygwin* | mingw* | pw32* | cegcc*)
-+      # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
-+      # as there is no search path for DLLs.
-+      hardcode_libdir_flag_spec='-L$libdir'
-+      export_dynamic_flag_spec='${wl}--export-all-symbols'
-+      allow_undefined_flag=unsupported
-+      always_export_symbols=no
-+      enable_shared_with_static_runtimes=yes
-+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
-+
-+      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-+        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+	# If the export-symbols file already is a .def file (1st line
-+	# is EXPORTS), use it as is; otherwise, prepend...
-+	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-+	  cp $export_symbols $output_objdir/$soname.def;
-+	else
-+	  echo EXPORTS > $output_objdir/$soname.def;
-+	  cat $export_symbols >> $output_objdir/$soname.def;
-+	fi~
-+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+      else
-+	ld_shlibs=no
-+      fi
-+      ;;
-+
-+    haiku*)
-+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+      link_all_deplibs=yes
-+      ;;
-+
-+    interix[3-9]*)
-+      hardcode_direct=no
-+      hardcode_shlibpath_var=no
-+      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+      export_dynamic_flag_spec='${wl}-E'
-+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-+      # Instead, shared libraries are loaded at an image base (0x10000000 by
-+      # default) and relocated if they conflict, which is a slow very memory
-+      # consuming and fragmenting process.  To avoid this, we pick a random,
-+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-+      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-+      archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-+      ;;
-+
-+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
-+      tmp_diet=no
-+      if test "$host_os" = linux-dietlibc; then
-+	case $cc_basename in
-+	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
-+	esac
-+      fi
-+      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-+	 && test "$tmp_diet" = no
-+      then
-+	tmp_addflag=
-+	tmp_sharedflag='-shared'
-+	case $cc_basename,$host_cpu in
-+        pgcc*)				# Portland Group C compiler
-+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  tmp_addflag=' $pic_flag'
-+	  ;;
-+	pgf77* | pgf90* | pgf95* | pgfortran*)
-+					# Portland Group f77 and f90 compilers
-+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  tmp_addflag=' $pic_flag -Mnomain' ;;
-+	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
-+	  tmp_addflag=' -i_dynamic' ;;
-+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-+	ifc* | ifort*)			# Intel Fortran compiler
-+	  tmp_addflag=' -nofor_main' ;;
-+	lf95*)				# Lahey Fortran 8.1
-+	  whole_archive_flag_spec=
-+	  tmp_sharedflag='--shared' ;;
-+	xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
-+	  tmp_sharedflag='-qmkshrobj'
-+	  tmp_addflag= ;;
-+	nvcc*)	# Cuda Compiler Driver 2.2
-+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  compiler_needs_object=yes
-+	  ;;
-+	esac
-+	case `$CC -V 2>&1 | sed 5q` in
-+	*Sun\ C*)			# Sun C 5.9
-+	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  compiler_needs_object=yes
-+	  tmp_sharedflag='-G' ;;
-+	*Sun\ F*)			# Sun Fortran 8.3
-+	  tmp_sharedflag='-G' ;;
-+	esac
-+	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+
-+        if test "x$supports_anon_versioning" = xyes; then
-+          archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-+	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+	    echo "local: *; };" >> $output_objdir/$libname.ver~
-+	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+        fi
-+
-+	case $cc_basename in
-+	xlf* | bgf* | bgxlf* | mpixlf*)
-+	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
-+	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
-+	  hardcode_libdir_flag_spec=
-+	  hardcode_libdir_flag_spec_ld='-rpath $libdir'
-+	  archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
-+	  if test "x$supports_anon_versioning" = xyes; then
-+	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-+	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+	      echo "local: *; };" >> $output_objdir/$libname.ver~
-+	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
-+	  fi
-+	  ;;
-+	esac
-+      else
-+        ld_shlibs=no
-+      fi
-+      ;;
-+
-+    netbsd*)
-+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-+	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-+	wlarc=
-+      else
-+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+      fi
-+      ;;
-+
-+    solaris*)
-+      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
-+	ld_shlibs=no
-+	cat <<_LT_EOF 1>&2
-+
-+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-+*** create shared libraries on Solaris systems.  Therefore, libtool
-+*** is disabling shared libraries support.  We urge you to upgrade GNU
-+*** binutils to release 2.9.1 or newer.  Another option is to modify
-+*** your PATH or compiler configuration so that the native linker is
-+*** used, and then restart.
-+
-+_LT_EOF
-+      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+      else
-+	ld_shlibs=no
-+      fi
-+      ;;
-+
-+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-+      case `$LD -v 2>&1` in
-+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
-+	ld_shlibs=no
-+	cat <<_LT_EOF 1>&2
-+
-+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-+*** reliably create shared libraries on SCO systems.  Therefore, libtool
-+*** is disabling shared libraries support.  We urge you to upgrade GNU
-+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-+*** your PATH or compiler configuration so that the native linker is
-+*** used, and then restart.
-+
-+_LT_EOF
-+	;;
-+	*)
-+	  # For security reasons, it is highly recommended that you always
-+	  # use absolute paths for naming shared libraries, and exclude the
-+	  # DT_RUNPATH tag from executables and libraries.  But doing so
-+	  # requires that you compile everything twice, which is a pain.
-+	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+	    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+	  else
-+	    ld_shlibs=no
-+	  fi
-+	;;
-+      esac
-+      ;;
-+
-+    sunos4*)
-+      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+      wlarc=
-+      hardcode_direct=yes
-+      hardcode_shlibpath_var=no
-+      ;;
-+
-+    *)
-+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+      else
-+	ld_shlibs=no
-+      fi
-+      ;;
-+    esac
-+
-+    if test "$ld_shlibs" = no; then
-+      runpath_var=
-+      hardcode_libdir_flag_spec=
-+      export_dynamic_flag_spec=
-+      whole_archive_flag_spec=
-+    fi
-+  else
-+    # PORTME fill in a description of your system's linker (not GNU ld)
-+    case $host_os in
-+    aix3*)
-+      allow_undefined_flag=unsupported
-+      always_export_symbols=yes
-+      archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-+      # Note: this linker hardcodes the directories in LIBPATH if there
-+      # are no directories specified by -L.
-+      hardcode_minus_L=yes
-+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-+	# Neither direct hardcoding nor static linking is supported with a
-+	# broken collect2.
-+	hardcode_direct=unsupported
-+      fi
-+      ;;
-+
-+    aix[4-9]*)
-+      if test "$host_cpu" = ia64; then
-+	# On IA64, the linker does run time linking by default, so we don't
-+	# have to do anything special.
-+	aix_use_runtimelinking=no
-+	exp_sym_flag='-Bexport'
-+	no_entry_flag=""
-+      else
-+	# If we're using GNU nm, then we don't want the "-C" option.
-+	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-+	# Also, AIX nm treats weak defined symbols like other global
-+	# defined symbols, whereas GNU nm marks them as "W".
-+	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-+	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-+	else
-+	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-+	fi
-+	aix_use_runtimelinking=no
-+
-+	# Test if we are trying to use run time linking or normal
-+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-+	# need to do runtime linking.
-+	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
-+	  for ld_flag in $LDFLAGS; do
-+	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-+	    aix_use_runtimelinking=yes
-+	    break
-+	  fi
-+	  done
-+	  ;;
-+	esac
-+
-+	exp_sym_flag='-bexport'
-+	no_entry_flag='-bnoentry'
-+      fi
-+
-+      # When large executables or shared objects are built, AIX ld can
-+      # have problems creating the table of contents.  If linking a library
-+      # or program results in "error TOC overflow" add -mminimal-toc to
-+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-+
-+      archive_cmds=''
-+      hardcode_direct=yes
-+      hardcode_direct_absolute=yes
-+      hardcode_libdir_separator=':'
-+      link_all_deplibs=yes
-+      file_list_spec='${wl}-f,'
-+
-+      if test "$GCC" = yes; then
-+	case $host_os in aix4.[012]|aix4.[012].*)
-+	# We only want to do this on AIX 4.2 and lower, the check
-+	# below for broken collect2 doesn't work under 4.3+
-+	  collect2name=`${CC} -print-prog-name=collect2`
-+	  if test -f "$collect2name" &&
-+	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-+	  then
-+	  # We have reworked collect2
-+	  :
-+	  else
-+	  # We have old collect2
-+	  hardcode_direct=unsupported
-+	  # It fails to find uninstalled libraries when the uninstalled
-+	  # path is not listed in the libpath.  Setting hardcode_minus_L
-+	  # to unsupported forces relinking
-+	  hardcode_minus_L=yes
-+	  hardcode_libdir_flag_spec='-L$libdir'
-+	  hardcode_libdir_separator=
-+	  fi
-+	  ;;
-+	esac
-+	shared_flag='-shared'
-+	if test "$aix_use_runtimelinking" = yes; then
-+	  shared_flag="$shared_flag "'${wl}-G'
-+	fi
-+      else
-+	# not using gcc
-+	if test "$host_cpu" = ia64; then
-+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-+	# chokes on -Wl,-G. The following line is correct:
-+	  shared_flag='-G'
-+	else
-+	  if test "$aix_use_runtimelinking" = yes; then
-+	    shared_flag='${wl}-G'
-+	  else
-+	    shared_flag='${wl}-bM:SRE'
-+	  fi
-+	fi
-+      fi
-+
-+      export_dynamic_flag_spec='${wl}-bexpall'
-+      # It seems that -bexpall does not export symbols beginning with
-+      # underscore (_), so it is better to generate a list of symbols to export.
-+      always_export_symbols=yes
-+      if test "$aix_use_runtimelinking" = yes; then
-+	# Warning - without using the other runtime loading flags (-brtl),
-+	# -berok will link without error, but may produce a broken library.
-+	allow_undefined_flag='-berok'
-+        # Determine the default libpath from the value encoded in an
-+        # empty executable.
-+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  
-+lt_aix_libpath_sed='
-+    /Import File Strings/,/^$/ {
-+	/^0/ {
-+	    s/^0  *\(.*\)$/\1/
-+	    p
-+	}
-+    }'
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+# Check for a 64-bit object if we didn't find anything.
-+if test -z "$aix_libpath"; then
-+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+fi
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-+
-+        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-+        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+      else
-+	if test "$host_cpu" = ia64; then
-+	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-+	  allow_undefined_flag="-z nodefs"
-+	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-+	else
-+	 # Determine the default libpath from the value encoded in an
-+	 # empty executable.
-+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  
-+lt_aix_libpath_sed='
-+    /Import File Strings/,/^$/ {
-+	/^0/ {
-+	    s/^0  *\(.*\)$/\1/
-+	    p
-+	}
-+    }'
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+# Check for a 64-bit object if we didn't find anything.
-+if test -z "$aix_libpath"; then
-+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+fi
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-+
-+	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-+	  # Warning - without using the other run time loading flags,
-+	  # -berok will link without error, but may produce a broken library.
-+	  no_undefined_flag=' ${wl}-bernotok'
-+	  allow_undefined_flag=' ${wl}-berok'
-+	  if test "$with_gnu_ld" = yes; then
-+	    # We only use this code for GNU lds that support --whole-archive.
-+	    whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-+	  else
-+	    # Exported symbols can be pulled into shared objects from archives
-+	    whole_archive_flag_spec='$convenience'
-+	  fi
-+	  archive_cmds_need_lc=yes
-+	  # This is similar to how AIX traditionally builds its shared libraries.
-+	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-+	fi
-+      fi
-+      ;;
-+
-+    amigaos*)
-+      case $host_cpu in
-+      powerpc)
-+            # see comment about AmigaOS4 .so support
-+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+            archive_expsym_cmds=''
-+        ;;
-+      m68k)
-+            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-+            hardcode_libdir_flag_spec='-L$libdir'
-+            hardcode_minus_L=yes
-+        ;;
-+      esac
-+      ;;
-+
-+    bsdi[45]*)
-+      export_dynamic_flag_spec=-rdynamic
-+      ;;
-+
-+    cygwin* | mingw* | pw32* | cegcc*)
-+      # When not using gcc, we currently assume that we are using
-+      # Microsoft Visual C++.
-+      # hardcode_libdir_flag_spec is actually meaningless, as there is
-+      # no search path for DLLs.
-+      hardcode_libdir_flag_spec=' '
-+      allow_undefined_flag=unsupported
-+      # Tell ltmain to make .lib files, not .a files.
-+      libext=lib
-+      # Tell ltmain to make .dll files, not .so files.
-+      shrext_cmds=".dll"
-+      # FIXME: Setting linknames here is a bad hack.
-+      archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
-+      # The linker will automatically build a .lib file if we build a DLL.
-+      old_archive_from_new_cmds='true'
-+      # FIXME: Should let the user specify the lib program.
-+      old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
-+      fix_srcfile_path='`cygpath -w "$srcfile"`'
-+      enable_shared_with_static_runtimes=yes
-+      ;;
-+
-+    darwin* | rhapsody*)
-+      
-+  
-+  archive_cmds_need_lc=no
-+  hardcode_direct=no
-+  hardcode_automatic=yes
-+  hardcode_shlibpath_var=unsupported
-+  if test "$lt_cv_ld_force_load" = "yes"; then
-+    whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
-+  else
-+    whole_archive_flag_spec=''
-+  fi
-+  link_all_deplibs=yes
-+  allow_undefined_flag="$_lt_dar_allow_undefined"
-+  case $cc_basename in
-+     ifort*) _lt_dar_can_shared=yes ;;
-+     *) _lt_dar_can_shared=$GCC ;;
-+  esac
-+  if test "$_lt_dar_can_shared" = "yes"; then
-+    output_verbose_link_cmd=func_echo_all
-+    archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-+    module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-+    archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-+    module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-+    
-+  else
-+  ld_shlibs=no
-+  fi
-+
-+      ;;
-+
-+    dgux*)
-+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      hardcode_libdir_flag_spec='-L$libdir'
-+      hardcode_shlibpath_var=no
-+      ;;
-+
-+    freebsd1*)
-+      ld_shlibs=no
-+      ;;
-+
-+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-+    # support.  Future versions do this automatically, but an explicit c++rt0.o
-+    # does not break anything, and helps significantly (at the cost of a little
-+    # extra space).
-+    freebsd2.2*)
-+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-+      hardcode_libdir_flag_spec='-R$libdir'
-+      hardcode_direct=yes
-+      hardcode_shlibpath_var=no
-+      ;;
-+
-+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-+    freebsd2*)
-+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+      hardcode_direct=yes
-+      hardcode_minus_L=yes
-+      hardcode_shlibpath_var=no
-+      ;;
-+
-+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-+    freebsd* | dragonfly*)
-+      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-+      hardcode_libdir_flag_spec='-R$libdir'
-+      hardcode_direct=yes
-+      hardcode_shlibpath_var=no
-+      ;;
-+
-+    hpux9*)
-+      if test "$GCC" = yes; then
-+	archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+      else
-+	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+      fi
-+      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-+      hardcode_libdir_separator=:
-+      hardcode_direct=yes
-+
-+      # hardcode_minus_L: Not really in the search PATH,
-+      # but as the default location of the library.
-+      hardcode_minus_L=yes
-+      export_dynamic_flag_spec='${wl}-E'
-+      ;;
-+
-+    hpux10*)
-+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-+	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-+      else
-+	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-+      fi
-+      if test "$with_gnu_ld" = no; then
-+	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-+	hardcode_libdir_flag_spec_ld='+b $libdir'
-+	hardcode_libdir_separator=:
-+	hardcode_direct=yes
-+	hardcode_direct_absolute=yes
-+	export_dynamic_flag_spec='${wl}-E'
-+	# hardcode_minus_L: Not really in the search PATH,
-+	# but as the default location of the library.
-+	hardcode_minus_L=yes
-+      fi
-+      ;;
-+
-+    hpux11*)
-+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-+	case $host_cpu in
-+	hppa*64*)
-+	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	ia64*)
-+	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	*)
-+	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	esac
-+      else
-+	case $host_cpu in
-+	hppa*64*)
-+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	ia64*)
-+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	*)
-+	
-+	  # Older versions of the 11.00 compiler do not understand -b yet
-+	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
-+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
-+$as_echo_n "checking if $CC understands -b... " >&6; }
-+if test "${lt_cv_prog_compiler__b+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  lt_cv_prog_compiler__b=no
-+   save_LDFLAGS="$LDFLAGS"
-+   LDFLAGS="$LDFLAGS -b"
-+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-+     # The linker can only warn and ignore the option if not recognized
-+     # So say no if there are warnings
-+     if test -s conftest.err; then
-+       # Append any errors to the config.log.
-+       cat conftest.err 1>&5
-+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-+       if diff conftest.exp conftest.er2 >/dev/null; then
-+         lt_cv_prog_compiler__b=yes
-+       fi
-+     else
-+       lt_cv_prog_compiler__b=yes
-+     fi
-+   fi
-+   $RM -r conftest*
-+   LDFLAGS="$save_LDFLAGS"
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
-+$as_echo "$lt_cv_prog_compiler__b" >&6; }
-+
-+if test x"$lt_cv_prog_compiler__b" = xyes; then
-+    archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-+else
-+    archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-+fi
-+
-+	  ;;
-+	esac
-+      fi
-+      if test "$with_gnu_ld" = no; then
-+	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-+	hardcode_libdir_separator=:
-+
-+	case $host_cpu in
-+	hppa*64*|ia64*)
-+	  hardcode_direct=no
-+	  hardcode_shlibpath_var=no
-+	  ;;
-+	*)
-+	  hardcode_direct=yes
-+	  hardcode_direct_absolute=yes
-+	  export_dynamic_flag_spec='${wl}-E'
-+
-+	  # hardcode_minus_L: Not really in the search PATH,
-+	  # but as the default location of the library.
-+	  hardcode_minus_L=yes
-+	  ;;
-+	esac
-+      fi
-+      ;;
-+
-+    irix5* | irix6* | nonstopux*)
-+      if test "$GCC" = yes; then
-+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	# Try to use the -exported_symbol ld option, if it does not
-+	# work, assume that -exports_file does not work either and
-+	# implicitly export all symbols.
-+        save_LDFLAGS="$LDFLAGS"
-+        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+int foo(void) {}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-+        
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+        LDFLAGS="$save_LDFLAGS"
-+      else
-+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
-+      fi
-+      archive_cmds_need_lc='no'
-+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+      hardcode_libdir_separator=:
-+      inherit_rpath=yes
-+      link_all_deplibs=yes
-+      ;;
-+
-+    netbsd*)
-+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-+	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-+      else
-+	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-+      fi
-+      hardcode_libdir_flag_spec='-R$libdir'
-+      hardcode_direct=yes
-+      hardcode_shlibpath_var=no
-+      ;;
-+
-+    newsos6)
-+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      hardcode_direct=yes
-+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+      hardcode_libdir_separator=:
-+      hardcode_shlibpath_var=no
-+      ;;
-+
-+    *nto* | *qnx*)
-+      ;;
-+
-+    openbsd*)
-+      if test -f /usr/libexec/ld.so; then
-+	hardcode_direct=yes
-+	hardcode_shlibpath_var=no
-+	hardcode_direct_absolute=yes
-+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-+	  hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+	  export_dynamic_flag_spec='${wl}-E'
-+	else
-+	  case $host_os in
-+	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-+	     archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+	     hardcode_libdir_flag_spec='-R$libdir'
-+	     ;;
-+	   *)
-+	     archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	     hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+	     ;;
-+	  esac
-+	fi
-+      else
-+	ld_shlibs=no
-+      fi
-+      ;;
-+
-+    os2*)
-+      hardcode_libdir_flag_spec='-L$libdir'
-+      hardcode_minus_L=yes
-+      allow_undefined_flag=unsupported
-+      archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-+      old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-+      ;;
-+
-+    osf3*)
-+      if test "$GCC" = yes; then
-+	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+      else
-+	allow_undefined_flag=' -expect_unresolved \*'
-+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-+      fi
-+      archive_cmds_need_lc='no'
-+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+      hardcode_libdir_separator=:
-+      ;;
-+
-+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-+      if test "$GCC" = yes; then
-+	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+      else
-+	allow_undefined_flag=' -expect_unresolved \*'
-+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-+	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-+	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
-+
-+	# Both c and cxx compiler support -rpath directly
-+	hardcode_libdir_flag_spec='-rpath $libdir'
-+      fi
-+      archive_cmds_need_lc='no'
-+      hardcode_libdir_separator=:
-+      ;;
-+
-+    solaris*)
-+      no_undefined_flag=' -z defs'
-+      if test "$GCC" = yes; then
-+	wlarc='${wl}'
-+	archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-+	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-+      else
-+	case `$CC -V 2>&1` in
-+	*"Compilers 5.0"*)
-+	  wlarc=''
-+	  archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-+	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
-+	  ;;
-+	*)
-+	  wlarc='${wl}'
-+	  archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-+	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-+	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-+	  ;;
-+	esac
-+      fi
-+      hardcode_libdir_flag_spec='-R$libdir'
-+      hardcode_shlibpath_var=no
-+      case $host_os in
-+      solaris2.[0-5] | solaris2.[0-5].*) ;;
-+      *)
-+	# The compiler driver will combine and reorder linker options,
-+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
-+	# but is careful enough not to reorder.
-+	# Supported since Solaris 2.6 (maybe 2.5.1?)
-+	if test "$GCC" = yes; then
-+	  whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-+	else
-+	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
-+	fi
-+	;;
-+      esac
-+      link_all_deplibs=yes
-+      ;;
-+
-+    sunos4*)
-+      if test "x$host_vendor" = xsequent; then
-+	# Use $CC to link under sequent, because it throws in some extra .o
-+	# files that make .init and .fini sections work.
-+	archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-+      else
-+	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-+      fi
-+      hardcode_libdir_flag_spec='-L$libdir'
-+      hardcode_direct=yes
-+      hardcode_minus_L=yes
-+      hardcode_shlibpath_var=no
-+      ;;
-+
-+    sysv4)
-+      case $host_vendor in
-+	sni)
-+	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	  hardcode_direct=yes # is this really true???
-+	;;
-+	siemens)
-+	  ## LD is ld it makes a PLAMLIB
-+	  ## CC just makes a GrossModule.
-+	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-+	  reload_cmds='$CC -r -o $output$reload_objs'
-+	  hardcode_direct=no
-+        ;;
-+	motorola)
-+	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
-+	;;
-+      esac
-+      runpath_var='LD_RUN_PATH'
-+      hardcode_shlibpath_var=no
-+      ;;
-+
-+    sysv4.3*)
-+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      hardcode_shlibpath_var=no
-+      export_dynamic_flag_spec='-Bexport'
-+      ;;
-+
-+    sysv4*MP*)
-+      if test -d /usr/nec; then
-+	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	hardcode_shlibpath_var=no
-+	runpath_var=LD_RUN_PATH
-+	hardcode_runpath_var=yes
-+	ld_shlibs=yes
-+      fi
-+      ;;
-+
-+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-+      no_undefined_flag='${wl}-z,text'
-+      archive_cmds_need_lc=no
-+      hardcode_shlibpath_var=no
-+      runpath_var='LD_RUN_PATH'
-+
-+      if test "$GCC" = yes; then
-+	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+      else
-+	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+      fi
-+      ;;
-+
-+    sysv5* | sco3.2v5* | sco5v6*)
-+      # Note: We can NOT use -z defs as we might desire, because we do not
-+      # link with -lc, and that would cause any symbols used from libc to
-+      # always be unresolved, which means just about no library would
-+      # ever link correctly.  If we're not using GNU ld we use -z text
-+      # though, which does catch some bad symbols but isn't as heavy-handed
-+      # as -z defs.
-+      no_undefined_flag='${wl}-z,text'
-+      allow_undefined_flag='${wl}-z,nodefs'
-+      archive_cmds_need_lc=no
-+      hardcode_shlibpath_var=no
-+      hardcode_libdir_flag_spec='${wl}-R,$libdir'
-+      hardcode_libdir_separator=':'
-+      link_all_deplibs=yes
-+      export_dynamic_flag_spec='${wl}-Bexport'
-+      runpath_var='LD_RUN_PATH'
-+
-+      if test "$GCC" = yes; then
-+	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+      else
-+	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+      fi
-+      ;;
-+
-+    uts4*)
-+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      hardcode_libdir_flag_spec='-L$libdir'
-+      hardcode_shlibpath_var=no
-+      ;;
-+
-+    *)
-+      ld_shlibs=no
-+      ;;
-+    esac
-+
-+    if test x$host_vendor = xsni; then
-+      case $host in
-+      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+	export_dynamic_flag_spec='${wl}-Blargedynsym'
-+	;;
-+      esac
-+    fi
-+  fi
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
-+$as_echo "$ld_shlibs" >&6; }
-+test "$ld_shlibs" = no && can_build_shared=no
-+
-+with_gnu_ld=$with_gnu_ld
-+
-+
-+    
-+    
-+    
-+
-+    
-+    
-+    
-+
-+    
-+    
-+    
-+
-+
-+#
-+# Do we need to explicitly link libc?
-+#
-+case "x$archive_cmds_need_lc" in
-+x|xyes)
-+  # Assume -lc should be added
-+  archive_cmds_need_lc=yes
-+
-+  if test "$enable_shared" = yes && test "$GCC" = yes; then
-+    case $archive_cmds in
-+    *'~'*)
-+      # FIXME: we may have to deal with multi-command sequences.
-+      ;;
-+    '$CC '*)
-+      # Test whether the compiler implicitly links with -lc since on some
-+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-+      # to ld, don't add -lc before -lgcc.
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
-+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-+if test "${lt_cv_archive_cmds_need_lc+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  $RM conftest*
-+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-+
-+	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; } 2>conftest.err; then
-+	  soname=conftest
-+	  lib=conftest
-+	  libobjs=conftest.$ac_objext
-+	  deplibs=
-+	  wl=$lt_prog_compiler_wl
-+	  pic_flag=$lt_prog_compiler_pic
-+	  compiler_flags=-v
-+	  linker_flags=-v
-+	  verstring=
-+	  output_objdir=.
-+	  libname=conftest
-+	  lt_save_allow_undefined_flag=$allow_undefined_flag
-+	  allow_undefined_flag=
-+	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
-+  (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }
-+	  then
-+	    lt_cv_archive_cmds_need_lc=no
-+	  else
-+	    lt_cv_archive_cmds_need_lc=yes
-+	  fi
-+	  allow_undefined_flag=$lt_save_allow_undefined_flag
-+	else
-+	  cat conftest.err 1>&5
-+	fi
-+	$RM conftest*
-+	
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
-+$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
-+      archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
-+      ;;
-+    esac
-+  fi
-+  ;;
-+esac
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
-+$as_echo_n "checking dynamic linker characteristics... " >&6; }
-+
-+if test "$GCC" = yes; then
-+  case $host_os in
-+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-+    *) lt_awk_arg="/^libraries:/" ;;
-+  esac
-+  case $host_os in
-+    mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;;
-+    *) lt_sed_strip_eq="s,=/,/,g" ;;
-+  esac
-+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
-+  case $lt_search_path_spec in
-+  *\;*)
-+    # if the path contains ";" then we assume it to be the separator
-+    # otherwise default to the standard path separator (i.e. ":") - it is
-+    # assumed that no part of a normal pathname contains ";" but that should
-+    # okay in the real world where ";" in dirpaths is itself problematic.
-+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
-+    ;;
-+  *)
-+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
-+    ;;
-+  esac
-+  # Ok, now we have the path, separated by spaces, we can step through it
-+  # and add multilib dir if necessary.
-+  lt_tmp_lt_search_path_spec=
-+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
-+  for lt_sys_path in $lt_search_path_spec; do
-+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
-+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
-+    else
-+      test -d "$lt_sys_path" && \
-+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-+    fi
-+  done
-+  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
-+BEGIN {RS=" "; FS="/|\n";} {
-+  lt_foo="";
-+  lt_count=0;
-+  for (lt_i = NF; lt_i > 0; lt_i--) {
-+    if ($lt_i != "" && $lt_i != ".") {
-+      if ($lt_i == "..") {
-+        lt_count++;
-+      } else {
-+        if (lt_count == 0) {
-+          lt_foo="/" $lt_i lt_foo;
-+        } else {
-+          lt_count--;
-+        }
-+      }
-+    }
-+  }
-+  if (lt_foo != "") { lt_freq[lt_foo]++; }
-+  if (lt_freq[lt_foo] == 1) { print lt_foo; }
-+}'`
-+  # AWK program above erroneously prepends '/' to C:/dos/paths
-+  # for these hosts.
-+  case $host_os in
-+    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
-+      $SED 's,/\([A-Za-z]:\),\1,g'` ;;
-+  esac
-+  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
-+else
-+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-+fi
-+library_names_spec=
-+libname_spec='lib$name'
-+soname_spec=
-+shrext_cmds=".so"
-+postinstall_cmds=
-+postuninstall_cmds=
-+finish_cmds=
-+finish_eval=
-+shlibpath_var=
-+shlibpath_overrides_runpath=unknown
-+version_type=none
-+dynamic_linker="$host_os ld.so"
-+sys_lib_dlsearch_path_spec="/lib /usr/lib"
-+need_lib_prefix=unknown
-+hardcode_into_libs=no
-+
-+# when you set need_version to no, make sure it does not cause -set_version
-+# flags to be left without arguments
-+need_version=unknown
-+
-+case $host_os in
-+aix3*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-+  shlibpath_var=LIBPATH
-+
-+  # AIX 3 has no versioning support, so we append a major version to the name.
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  ;;
-+
-+aix[4-9]*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  hardcode_into_libs=yes
-+  if test "$host_cpu" = ia64; then
-+    # AIX 5 supports IA64
-+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-+    shlibpath_var=LD_LIBRARY_PATH
-+  else
-+    # With GCC up to 2.95.x, collect2 would create an import file
-+    # for dependence libraries.  The import file would start with
-+    # the line `#! .'.  This would cause the generated library to
-+    # depend on `.', always an invalid library.  This was fixed in
-+    # development snapshots of GCC prior to 3.0.
-+    case $host_os in
-+      aix4 | aix4.[01] | aix4.[01].*)
-+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-+	   echo ' yes '
-+	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
-+	:
-+      else
-+	can_build_shared=no
-+      fi
-+      ;;
-+    esac
-+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-+    # soname into executable. Probably we can add versioning support to
-+    # collect2, so additional links can be useful in future.
-+    if test "$aix_use_runtimelinking" = yes; then
-+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-+      # instead of lib<name>.a to let people know that these are not
-+      # typical AIX shared libraries.
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    else
-+      # We preserve .a as extension for shared libraries through AIX4.2
-+      # and later when we are not doing run time linking.
-+      library_names_spec='${libname}${release}.a $libname.a'
-+      soname_spec='${libname}${release}${shared_ext}$major'
-+    fi
-+    shlibpath_var=LIBPATH
-+  fi
-+  ;;
-+
-+amigaos*)
-+  case $host_cpu in
-+  powerpc)
-+    # Since July 2007 AmigaOS4 officially supports .so libraries.
-+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    ;;
-+  m68k)
-+    library_names_spec='$libname.ixlibrary $libname.a'
-+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
-+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-+    ;;
-+  esac
-+  ;;
-+
-+beos*)
-+  library_names_spec='${libname}${shared_ext}'
-+  dynamic_linker="$host_os ld.so"
-+  shlibpath_var=LIBRARY_PATH
-+  ;;
-+
-+bsdi[45]*)
-+  version_type=linux
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-+  # the default ld.so.conf also contains /usr/contrib/lib and
-+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-+  # libtool to hard-code these into programs
-+  ;;
-+
-+cygwin* | mingw* | pw32* | cegcc*)
-+  version_type=windows
-+  shrext_cmds=".dll"
-+  need_version=no
-+  need_lib_prefix=no
-+
-+  case $GCC,$host_os in
-+  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
-+    library_names_spec='$libname.dll.a'
-+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-+    postinstall_cmds='base_file=`basename \${file}`~
-+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-+      dldir=$destdir/`dirname \$dlpath`~
-+      test -d \$dldir || mkdir -p \$dldir~
-+      $install_prog $dir/$dlname \$dldir/$dlname~
-+      chmod a+x \$dldir/$dlname~
-+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-+      fi'
-+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-+      dlpath=$dir/\$dldll~
-+       $RM \$dlpath'
-+    shlibpath_overrides_runpath=yes
-+
-+    case $host_os in
-+    cygwin*)
-+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-+
-+      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
-+      ;;
-+    mingw* | cegcc*)
-+      # MinGW DLLs use traditional 'lib' prefix
-+      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-+      ;;
-+    pw32*)
-+      # pw32 DLLs use 'pw' prefix rather than 'lib'
-+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-+      ;;
-+    esac
-+    ;;
-+
-+  *)
-+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-+    ;;
-+  esac
-+  dynamic_linker='Win32 ld.exe'
-+  # FIXME: first we should search . and the directory the executable is in
-+  shlibpath_var=PATH
-+  ;;
-+
-+darwin* | rhapsody*)
-+  dynamic_linker="$host_os dyld"
-+  version_type=darwin
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-+  soname_spec='${libname}${release}${major}$shared_ext'
-+  shlibpath_overrides_runpath=yes
-+  shlibpath_var=DYLD_LIBRARY_PATH
-+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-+
-+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
-+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-+  ;;
-+
-+dgux*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
-+
-+freebsd1*)
-+  dynamic_linker=no
-+  ;;
-+
-+freebsd* | dragonfly*)
-+  # DragonFly does not have aout.  When/if they implement a new
-+  # versioning mechanism, adjust this.
-+  if test -x /usr/bin/objformat; then
-+    objformat=`/usr/bin/objformat`
-+  else
-+    case $host_os in
-+    freebsd[123]*) objformat=aout ;;
-+    *) objformat=elf ;;
-+    esac
-+  fi
-+  version_type=freebsd-$objformat
-+  case $version_type in
-+    freebsd-elf*)
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+      need_version=no
-+      need_lib_prefix=no
-+      ;;
-+    freebsd-*)
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-+      need_version=yes
-+      ;;
-+  esac
-+  shlibpath_var=LD_LIBRARY_PATH
-+  case $host_os in
-+  freebsd2*)
-+    shlibpath_overrides_runpath=yes
-+    ;;
-+  freebsd3.[01]* | freebsdelf3.[01]*)
-+    shlibpath_overrides_runpath=yes
-+    hardcode_into_libs=yes
-+    ;;
-+  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
-+  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
-+    shlibpath_overrides_runpath=no
-+    hardcode_into_libs=yes
-+    ;;
-+  *) # from 4.6 on, and DragonFly
-+    shlibpath_overrides_runpath=yes
-+    hardcode_into_libs=yes
-+    ;;
-+  esac
-+  ;;
-+
-+gnu*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  hardcode_into_libs=yes
-+  ;;
-+
-+haiku*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  dynamic_linker="$host_os runtime_loader"
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
-+  hardcode_into_libs=yes
-+  ;;
-+
-+hpux9* | hpux10* | hpux11*)
-+  # Give a soname corresponding to the major version so that dld.sl refuses to
-+  # link against other versions.
-+  version_type=sunos
-+  need_lib_prefix=no
-+  need_version=no
-+  case $host_cpu in
-+  ia64*)
-+    shrext_cmds='.so'
-+    hardcode_into_libs=yes
-+    dynamic_linker="$host_os dld.so"
-+    shlibpath_var=LD_LIBRARY_PATH
-+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    soname_spec='${libname}${release}${shared_ext}$major'
-+    if test "X$HPUX_IA64_MODE" = X32; then
-+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-+    else
-+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-+    fi
-+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-+    ;;
-+  hppa*64*)
-+    shrext_cmds='.sl'
-+    hardcode_into_libs=yes
-+    dynamic_linker="$host_os dld.sl"
-+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    soname_spec='${libname}${release}${shared_ext}$major'
-+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-+    ;;
-+  *)
-+    shrext_cmds='.sl'
-+    dynamic_linker="$host_os dld.sl"
-+    shlibpath_var=SHLIB_PATH
-+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    soname_spec='${libname}${release}${shared_ext}$major'
-+    ;;
-+  esac
-+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
-+  postinstall_cmds='chmod 555 $lib'
-+  # or fails outright, so override atomically:
-+  install_override_mode=555
-+  ;;
-+
-+interix[3-9]*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  ;;
-+
-+irix5* | irix6* | nonstopux*)
-+  case $host_os in
-+    nonstopux*) version_type=nonstopux ;;
-+    *)
-+	if test "$lt_cv_prog_gnu_ld" = yes; then
-+		version_type=linux
-+	else
-+		version_type=irix
-+	fi ;;
-+  esac
-+  need_lib_prefix=no
-+  need_version=no
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  case $host_os in
-+  irix5* | nonstopux*)
-+    libsuff= shlibsuff=
-+    ;;
-+  *)
-+    case $LD in # libtool.m4 will add one of these switches to LD
-+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-+      libsuff= shlibsuff= libmagic=32-bit;;
-+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-+      libsuff=32 shlibsuff=N32 libmagic=N32;;
-+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-+    *) libsuff= shlibsuff= libmagic=never-match;;
-+    esac
-+    ;;
-+  esac
-+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-+  shlibpath_overrides_runpath=no
-+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-+  hardcode_into_libs=yes
-+  ;;
-+
-+# No shared lib support for Linux oldld, aout, or coff.
-+linux*oldld* | linux*aout* | linux*coff*)
-+  dynamic_linker=no
-+  ;;
-+
-+# This must be Linux ELF.
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+
-+  # Some binutils ld are patched to set DT_RUNPATH
-+  if test "${lt_cv_shlibpath_overrides_runpath+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  lt_cv_shlibpath_overrides_runpath=no
-+    save_LDFLAGS=$LDFLAGS
-+    save_libdir=$libdir
-+    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
-+	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
-+  lt_cv_shlibpath_overrides_runpath=yes
-+fi
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+    LDFLAGS=$save_LDFLAGS
-+    libdir=$save_libdir
-+    
-+fi
-+
-+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
-+
-+  # This implies no fast_install, which is unacceptable.
-+  # Some rework will be needed to allow for fast_install
-+  # before this can be enabled.
-+  hardcode_into_libs=yes
-+
-+  # Append ld.so.conf contents to the search path
-+  if test -f /etc/ld.so.conf; then
-+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
-+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-+  fi
-+
-+  # We used to test for /lib/ld.so.1 and disable shared libraries on
-+  # powerpc, because MkLinux only supported shared libraries with the
-+  # GNU dynamic linker.  Since this was broken with cross compilers,
-+  # most powerpc-linux boxes support dynamic linking these days and
-+  # people can always --disable-shared, the test was removed, and we
-+  # assume the GNU/Linux dynamic linker is in use.
-+  dynamic_linker='GNU/Linux ld.so'
-+  ;;
-+
-+netbsd*)
-+  version_type=sunos
-+  need_lib_prefix=no
-+  need_version=no
-+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+    dynamic_linker='NetBSD (a.out) ld.so'
-+  else
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+    soname_spec='${libname}${release}${shared_ext}$major'
-+    dynamic_linker='NetBSD ld.elf_so'
-+  fi
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  hardcode_into_libs=yes
-+  ;;
-+
-+newsos6)
-+  version_type=linux
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  ;;
-+
-+*nto* | *qnx*)
-+  version_type=qnx
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  dynamic_linker='ldqnx.so'
-+  ;;
-+
-+openbsd*)
-+  version_type=sunos
-+  sys_lib_dlsearch_path_spec="/usr/lib"
-+  need_lib_prefix=no
-+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-+  case $host_os in
-+    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
-+    *)				need_version=no  ;;
-+  esac
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+    case $host_os in
-+      openbsd2.[89] | openbsd2.[89].*)
-+	shlibpath_overrides_runpath=no
-+	;;
-+      *)
-+	shlibpath_overrides_runpath=yes
-+	;;
-+      esac
-+  else
-+    shlibpath_overrides_runpath=yes
-+  fi
-+  ;;
-+
-+os2*)
-+  libname_spec='$name'
-+  shrext_cmds=".dll"
-+  need_lib_prefix=no
-+  library_names_spec='$libname${shared_ext} $libname.a'
-+  dynamic_linker='OS/2 ld.exe'
-+  shlibpath_var=LIBPATH
-+  ;;
-+
-+osf3* | osf4* | osf5*)
-+  version_type=osf
-+  need_lib_prefix=no
-+  need_version=no
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-+  ;;
-+
-+rdos*)
-+  dynamic_linker=no
-+  ;;
-+
-+solaris*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  hardcode_into_libs=yes
-+  # ldd complains unless libraries are executable
-+  postinstall_cmds='chmod +x $lib'
-+  ;;
-+
-+sunos4*)
-+  version_type=sunos
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  if test "$with_gnu_ld" = yes; then
-+    need_lib_prefix=no
-+  fi
-+  need_version=yes
-+  ;;
-+
-+sysv4 | sysv4.3*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  case $host_vendor in
-+    sni)
-+      shlibpath_overrides_runpath=no
-+      need_lib_prefix=no
-+      runpath_var=LD_RUN_PATH
-+      ;;
-+    siemens)
-+      need_lib_prefix=no
-+      ;;
-+    motorola)
-+      need_lib_prefix=no
-+      need_version=no
-+      shlibpath_overrides_runpath=no
-+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-+      ;;
-+  esac
-+  ;;
-+
-+sysv4*MP*)
-+  if test -d /usr/nec ;then
-+    version_type=linux
-+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-+    soname_spec='$libname${shared_ext}.$major'
-+    shlibpath_var=LD_LIBRARY_PATH
-+  fi
-+  ;;
-+
-+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-+  version_type=freebsd-elf
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  hardcode_into_libs=yes
-+  if test "$with_gnu_ld" = yes; then
-+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-+  else
-+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-+    case $host_os in
-+      sco3.2v5*)
-+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-+	;;
-+    esac
-+  fi
-+  sys_lib_dlsearch_path_spec='/usr/lib'
-+  ;;
-+
-+tpf*)
-+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  ;;
-+
-+uts4*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
-+
-+*)
-+  dynamic_linker=no
-+  ;;
-+esac
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
-+$as_echo "$dynamic_linker" >&6; }
-+test "$dynamic_linker" = no && can_build_shared=no
-+
-+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-+if test "$GCC" = yes; then
-+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-+fi
-+
-+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-+  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-+fi
-+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-+  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-+fi
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
-+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
-+hardcode_action=
-+if test -n "$hardcode_libdir_flag_spec" ||
-+   test -n "$runpath_var" ||
-+   test "X$hardcode_automatic" = "Xyes" ; then
-+
-+  # We can hardcode non-existent directories.
-+  if test "$hardcode_direct" != no &&
-+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-+     # have to relink, otherwise we might link with an installed library
-+     # when we should be linking with a yet-to-be-installed one
-+     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no &&
-+     test "$hardcode_minus_L" != no; then
-+    # Linking always hardcodes the temporary library directory.
-+    hardcode_action=relink
-+  else
-+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-+    hardcode_action=immediate
-+  fi
-+else
-+  # We cannot hardcode anything, or else we can only hardcode existing
-+  # directories.
-+  hardcode_action=unsupported
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
-+$as_echo "$hardcode_action" >&6; }
-+
-+if test "$hardcode_action" = relink ||
-+   test "$inherit_rpath" = yes; then
-+  # Fast installation is not supported
-+  enable_fast_install=no
-+elif test "$shlibpath_overrides_runpath" = yes ||
-+     test "$enable_shared" = no; then
-+  # Fast installation is not necessary
-+  enable_fast_install=needless
-+fi
-+
-+    
-+    
-+    
-+
-+
-+  if test "x$enable_dlopen" != xyes; then
-+  enable_dlopen=unknown
-+  enable_dlopen_self=unknown
-+  enable_dlopen_self_static=unknown
-+else
-+  lt_cv_dlopen=no
-+  lt_cv_dlopen_libs=
-+
-+  case $host_os in
-+  beos*)
-+    lt_cv_dlopen="load_add_on"
-+    lt_cv_dlopen_libs=
-+    lt_cv_dlopen_self=yes
-+    ;;
-+
-+  mingw* | pw32* | cegcc*)
-+    lt_cv_dlopen="LoadLibrary"
-+    lt_cv_dlopen_libs=
-+    ;;
-+
-+  cygwin*)
-+    lt_cv_dlopen="dlopen"
-+    lt_cv_dlopen_libs=
-+    ;;
-+
-+  darwin*)
-+  # if libdl is installed we need to link against it
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-+$as_echo_n "checking for dlopen in -ldl... " >&6; }
-+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldl  $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char dlopen ();
-+int
-+main ()
-+{
-+return dlopen ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_dl_dlopen=yes
-+else
-+  ac_cv_lib_dl_dlopen=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
-+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-+else
-+  
-+    lt_cv_dlopen="dyld"
-+    lt_cv_dlopen_libs=
-+    lt_cv_dlopen_self=yes
-+    
-+fi
-+
-+    ;;
-+
-+  *)
-+    ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
-+if test "x$ac_cv_func_shl_load" = x""yes; then :
-+  lt_cv_dlopen="shl_load"
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
-+$as_echo_n "checking for shl_load in -ldld... " >&6; }
-+if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldld  $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char shl_load ();
-+int
-+main ()
-+{
-+return shl_load ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_dld_shl_load=yes
-+else
-+  ac_cv_lib_dld_shl_load=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
-+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-+if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
-+  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
-+else
-+  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-+if test "x$ac_cv_func_dlopen" = x""yes; then :
-+  lt_cv_dlopen="dlopen"
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-+$as_echo_n "checking for dlopen in -ldl... " >&6; }
-+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldl  $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char dlopen ();
-+int
-+main ()
-+{
-+return dlopen ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_dl_dlopen=yes
-+else
-+  ac_cv_lib_dl_dlopen=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
-+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
-+$as_echo_n "checking for dlopen in -lsvld... " >&6; }
-+if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lsvld  $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char dlopen ();
-+int
-+main ()
-+{
-+return dlopen ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_svld_dlopen=yes
-+else
-+  ac_cv_lib_svld_dlopen=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
-+$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
-+if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
-+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
-+$as_echo_n "checking for dld_link in -ldld... " >&6; }
-+if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldld  $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char dld_link ();
-+int
-+main ()
-+{
-+return dld_link ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_dld_dld_link=yes
-+else
-+  ac_cv_lib_dld_dld_link=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
-+$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
-+if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
-+  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
-+fi
-+
-+	      
-+fi
-+
-+	    
-+fi
-+
-+	  
-+fi
-+
-+	
-+fi
-+
-+      
-+fi
-+
-+    ;;
-+  esac
-+
-+  if test "x$lt_cv_dlopen" != xno; then
-+    enable_dlopen=yes
-+  else
-+    enable_dlopen=no
-+  fi
-+
-+  case $lt_cv_dlopen in
-+  dlopen)
-+    save_CPPFLAGS="$CPPFLAGS"
-+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-+
-+    save_LDFLAGS="$LDFLAGS"
-+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-+
-+    save_LIBS="$LIBS"
-+    LIBS="$lt_cv_dlopen_libs $LIBS"
-+
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
-+$as_echo_n "checking whether a program can dlopen itself... " >&6; }
-+if test "${lt_cv_dlopen_self+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  	  if test "$cross_compiling" = yes; then :
-+  lt_cv_dlopen_self=cross
-+else
-+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-+  lt_status=$lt_dlunknown
-+  cat > conftest.$ac_ext <<_LT_EOF
-+#line __oline__ "configure"
-+#include "confdefs.h"
-+
-+#if HAVE_DLFCN_H
-+#include <dlfcn.h>
-+#endif
-+
-+#include <stdio.h>
-+
-+#ifdef RTLD_GLOBAL
-+#  define LT_DLGLOBAL		RTLD_GLOBAL
-+#else
-+#  ifdef DL_GLOBAL
-+#    define LT_DLGLOBAL		DL_GLOBAL
-+#  else
-+#    define LT_DLGLOBAL		0
-+#  endif
-+#endif
-+
-+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-+   find out it does not work in some platform. */
-+#ifndef LT_DLLAZY_OR_NOW
-+#  ifdef RTLD_LAZY
-+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-+#  else
-+#    ifdef DL_LAZY
-+#      define LT_DLLAZY_OR_NOW		DL_LAZY
-+#    else
-+#      ifdef RTLD_NOW
-+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-+#      else
-+#        ifdef DL_NOW
-+#          define LT_DLLAZY_OR_NOW	DL_NOW
-+#        else
-+#          define LT_DLLAZY_OR_NOW	0
-+#        endif
-+#      endif
-+#    endif
-+#  endif
-+#endif
-+
-+/* When -fvisbility=hidden is used, assume the code has been annotated
-+   correspondingly for the symbols needed.  */
-+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-+void fnord () __attribute__((visibility("default")));
-+#endif
-+
-+void fnord () { int i=42; }
-+int main ()
-+{
-+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-+  int status = $lt_dlunknown;
-+
-+  if (self)
-+    {
-+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-+      else
-+        {
-+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
-+          else puts (dlerror ());
-+	}
-+      /* dlclose (self); */
-+    }
-+  else
-+    puts (dlerror ());
-+
-+  return status;
-+}
-+_LT_EOF
-+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
-+    (./conftest; exit; ) >&5 2>/dev/null
-+    lt_status=$?
-+    case x$lt_status in
-+      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-+      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
-+      x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
-+    esac
-+  else :
-+    # compilation failed
-+    lt_cv_dlopen_self=no
-+  fi
-+fi
-+rm -fr conftest*
-+
-+    
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
-+$as_echo "$lt_cv_dlopen_self" >&6; }
-+
-+    if test "x$lt_cv_dlopen_self" = xyes; then
-+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
-+$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
-+if test "${lt_cv_dlopen_self_static+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  	  if test "$cross_compiling" = yes; then :
-+  lt_cv_dlopen_self_static=cross
-+else
-+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-+  lt_status=$lt_dlunknown
-+  cat > conftest.$ac_ext <<_LT_EOF
-+#line __oline__ "configure"
-+#include "confdefs.h"
-+
-+#if HAVE_DLFCN_H
-+#include <dlfcn.h>
-+#endif
-+
-+#include <stdio.h>
-+
-+#ifdef RTLD_GLOBAL
-+#  define LT_DLGLOBAL		RTLD_GLOBAL
-+#else
-+#  ifdef DL_GLOBAL
-+#    define LT_DLGLOBAL		DL_GLOBAL
-+#  else
-+#    define LT_DLGLOBAL		0
-+#  endif
-+#endif
-+
-+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-+   find out it does not work in some platform. */
-+#ifndef LT_DLLAZY_OR_NOW
-+#  ifdef RTLD_LAZY
-+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-+#  else
-+#    ifdef DL_LAZY
-+#      define LT_DLLAZY_OR_NOW		DL_LAZY
-+#    else
-+#      ifdef RTLD_NOW
-+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-+#      else
-+#        ifdef DL_NOW
-+#          define LT_DLLAZY_OR_NOW	DL_NOW
-+#        else
-+#          define LT_DLLAZY_OR_NOW	0
-+#        endif
-+#      endif
-+#    endif
-+#  endif
-+#endif
-+
-+/* When -fvisbility=hidden is used, assume the code has been annotated
-+   correspondingly for the symbols needed.  */
-+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-+void fnord () __attribute__((visibility("default")));
-+#endif
-+
-+void fnord () { int i=42; }
-+int main ()
-+{
-+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-+  int status = $lt_dlunknown;
-+
-+  if (self)
-+    {
-+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-+      else
-+        {
-+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
-+          else puts (dlerror ());
-+	}
-+      /* dlclose (self); */
-+    }
-+  else
-+    puts (dlerror ());
-+
-+  return status;
-+}
-+_LT_EOF
-+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
-+    (./conftest; exit; ) >&5 2>/dev/null
-+    lt_status=$?
-+    case x$lt_status in
-+      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-+      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
-+      x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
-+    esac
-+  else :
-+    # compilation failed
-+    lt_cv_dlopen_self_static=no
-+  fi
-+fi
-+rm -fr conftest*
-+
-+      
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
-+$as_echo "$lt_cv_dlopen_self_static" >&6; }
-+    fi
-+
-+    CPPFLAGS="$save_CPPFLAGS"
-+    LDFLAGS="$save_LDFLAGS"
-+    LIBS="$save_LIBS"
-+    ;;
-+  esac
-+
-+  case $lt_cv_dlopen_self in
-+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-+  *) enable_dlopen_self=unknown ;;
-+  esac
-+
-+  case $lt_cv_dlopen_self_static in
-+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-+  *) enable_dlopen_self_static=unknown ;;
-+  esac
-+fi
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+  
-+striplib=
-+old_striplib=
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
-+$as_echo_n "checking whether stripping libraries is possible... " >&6; }
-+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
-+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+else
-+# FIXME - insert some real tests, host_os isn't really good enough
-+  case $host_os in
-+  darwin*)
-+    if test -n "$STRIP" ; then
-+      striplib="$STRIP -x"
-+      old_striplib="$STRIP -S"
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+    else
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+    fi
-+    ;;
-+  *)
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+    ;;
-+  esac
-+fi
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+
-+  # Report which library types will actually be built
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
-+$as_echo_n "checking if libtool supports shared libraries... " >&6; }
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
-+$as_echo "$can_build_shared" >&6; }
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
-+$as_echo_n "checking whether to build shared libraries... " >&6; }
-+  test "$can_build_shared" = "no" && enable_shared=no
-+
-+  # On AIX, shared libraries and static libraries use the same namespace, and
-+  # are all built from PIC.
-+  case $host_os in
-+  aix3*)
-+    test "$enable_shared" = yes && enable_static=no
-+    if test -n "$RANLIB"; then
-+      archive_cmds="$archive_cmds~\$RANLIB \$lib"
-+      postinstall_cmds='$RANLIB $lib'
-+    fi
-+    ;;
-+
-+  aix[4-9]*)
-+    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-+      test "$enable_shared" = yes && enable_static=no
-+    fi
-+    ;;
-+  esac
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
-+$as_echo "$enable_shared" >&6; }
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
-+$as_echo_n "checking whether to build static libraries... " >&6; }
-+  # Make sure either enable_shared or enable_static is yes.
-+  test "$enable_shared" = yes || enable_static=yes
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
-+$as_echo "$enable_static" >&6; }
-+
-+  
-+
-+
-+fi
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+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
-+
-+CC="$lt_save_CC"
-+
-+
-+
-+
-+
-+
-+
-+
-+       
-+       
-+
-+
-+
-+        ac_config_commands="$ac_config_commands libtool"
-+
-+
-+
-+
-+# Only expand once:
-+
-+
-+
-+@%:@ Check whether --enable-targets was given.
-+if test "${enable_targets+set}" = set; then :
-+  enableval=$enable_targets; case "${enableval}" in
-+  yes | "") as_fn_error "enable-targets option must specify target names or 'all'" "$LINENO" 5
-+	    ;;
-+  no)	    enable_targets= ;;
-+  *)	    enable_targets=$enableval ;;
-+esac
-+fi
-+
-+ac_checking=yes
-+if grep '^RELEASE=y' ${srcdir}/../bfd/Makefile.am >/dev/null 2>/dev/null ; then
-+  ac_checking=
-+fi
-+@%:@ Check whether --enable-checking was given.
-+if test "${enable_checking+set}" = set; then :
-+  enableval=$enable_checking; case "${enableval}" in
-+  no|none)  ac_checking= ;;
-+  *)	    ac_checking=yes ;;
-+esac
-+fi
-+if test x$ac_checking != x ; then
-+  
-+$as_echo "@%:@define ENABLE_CHECKING 1" >>confdefs.h
-+
-+fi
-+
-+using_cgen=no
-+
-+
-+GCC_WARN_CFLAGS="-W -Wall -Wstrict-prototypes -Wmissing-prototypes"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+__GNUC__
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "^[0-3]$" >/dev/null 2>&1; then :
-+  
-+else
-+  GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Wshadow"
-+fi
-+rm -f conftest*
-+
-+
-+@%:@ Check whether --enable-werror was given.
-+if test "${enable_werror+set}" = set; then :
-+  enableval=$enable_werror; case "${enableval}" in
-+     yes | y) ERROR_ON_WARNING="yes" ;;
-+     no | n)  ERROR_ON_WARNING="no" ;;
-+     *) as_fn_error "bad value ${enableval} for --enable-werror" "$LINENO" 5 ;;
-+   esac
-+fi
-+
-+
-+# Disable -Wformat by default when using gcc on mingw
-+case "${host}" in
-+  *-*-mingw32*)
-+    if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
-+      GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Wno-format"
-+    fi
-+    ;;
-+  *) ;;
-+esac
-+
-+# Enable -Werror by default when using gcc
-+if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
-+    ERROR_ON_WARNING=yes
-+fi
-+
-+NO_WERROR=
-+if test "${ERROR_ON_WARNING}" = yes ; then
-+    GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Werror"
-+    NO_WERROR="-Wno-error"
-+fi
-+		   
-+if test "${GCC}" = yes ; then
-+  WARN_CFLAGS="${GCC_WARN_CFLAGS}"
-+fi
-+
-+@%:@ Check whether --enable-build-warnings was given.
-+if test "${enable_build_warnings+set}" = set; then :
-+  enableval=$enable_build_warnings; case "${enableval}" in
-+  yes)	WARN_CFLAGS="${GCC_WARN_CFLAGS}";;
-+  no)	if test "${GCC}" = yes ; then
-+	  WARN_CFLAGS="-w"
-+	fi;;
-+  ,*)   t=`echo "${enableval}" | sed -e "s/,/ /g"`
-+        WARN_CFLAGS="${GCC_WARN_CFLAGS} ${t}";;
-+  *,)   t=`echo "${enableval}" | sed -e "s/,/ /g"`
-+        WARN_CFLAGS="${t} ${GCC_WARN_CFLAGS}";;
-+  *)    WARN_CFLAGS=`echo "${enableval}" | sed -e "s/,/ /g"`;;
-+esac
-+fi
-+
-+
-+if test x"$silent" != x"yes" && test x"$WARN_CFLAGS" != x""; then
-+  echo "Setting warning flags = $WARN_CFLAGS" 6>&1
-+fi
-+
-+
-+
-+
-+
-+# Generate a header file
-+ac_config_headers="$ac_config_headers config.h:config.in"
-+
-+
-+# If we are on a DOS filesystem, we must use gdb.ini rather than
-+# .gdbinit.
-+case "${host}" in
-+  *-*-msdos* | *-*-go32* | *-*-mingw32* | *-*-windows*)
-+    GDBINIT="gdb.ini"
-+    ac_config_files="$ac_config_files gdb.ini:gdbinit.in"
-+
-+    ;;
-+  *)
-+    GDBINIT=".gdbinit"
-+    ac_config_files="$ac_config_files .gdbinit:gdbinit.in"
-+
-+    ;;
-+esac
-+
-+
-+#We need this for the host.  BOUT header is in host order.
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
-+$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-+if test "${ac_cv_c_bigendian+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_cv_c_bigendian=unknown
-+    # See if we're dealing with a universal compiler.
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#ifndef __APPLE_CC__
-+	       not a universal capable compiler
-+	     #endif
-+	     typedef int dummy;
-+	    
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  
-+	# Check for potential -arch flags.  It is not universal unless
-+	# there are at least two -arch flags with different values.
-+	ac_arch=
-+	ac_prev=
-+	for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
-+	 if test -n "$ac_prev"; then
-+	   case $ac_word in
-+	     i?86 | x86_64 | ppc | ppc64)
-+	       if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
-+		 ac_arch=$ac_word
-+	       else
-+		 ac_cv_c_bigendian=universal
-+		 break
-+	       fi
-+	       ;;
-+	   esac
-+	   ac_prev=
-+	 elif test "x$ac_word" = "x-arch"; then
-+	   ac_prev=arch
-+	 fi
-+       done
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+    if test $ac_cv_c_bigendian = unknown; then
-+      # See if sys/param.h defines the BYTE_ORDER macro.
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <sys/types.h>
-+	     #include <sys/param.h>
-+	   
-+int
-+main ()
-+{
-+#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
-+		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
-+		     && LITTLE_ENDIAN)
-+	      bogus endian macros
-+	     #endif
-+	   
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  # It does; now see whether it defined to BIG_ENDIAN or not.
-+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <sys/types.h>
-+		#include <sys/param.h>
-+	      
-+int
-+main ()
-+{
-+#if BYTE_ORDER != BIG_ENDIAN
-+		 not big endian
-+		#endif
-+	      
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_c_bigendian=yes
-+else
-+  ac_cv_c_bigendian=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+    fi
-+    if test $ac_cv_c_bigendian = unknown; then
-+      # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <limits.h>
-+	   
-+int
-+main ()
-+{
-+#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
-+	      bogus endian macros
-+	     #endif
-+	   
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  # It does; now see whether it defined to _BIG_ENDIAN or not.
-+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <limits.h>
-+	      
-+int
-+main ()
-+{
-+#ifndef _BIG_ENDIAN
-+		 not big endian
-+		#endif
-+	      
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_c_bigendian=yes
-+else
-+  ac_cv_c_bigendian=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+    fi
-+    if test $ac_cv_c_bigendian = unknown; then
-+      # Compile a test program.
-+      if test "$cross_compiling" = yes; then :
-+  # Try to guess by grepping values from an object file.
-+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+short int ascii_mm[] =
-+		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-+		short int ascii_ii[] =
-+		  { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-+		int use_ascii (int i) {
-+		  return ascii_mm[i] + ascii_ii[i];
-+		}
-+		short int ebcdic_ii[] =
-+		  { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-+		short int ebcdic_mm[] =
-+		  { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-+		int use_ebcdic (int i) {
-+		  return ebcdic_mm[i] + ebcdic_ii[i];
-+		}
-+		extern int foo;
-+	      
-+int
-+main ()
-+{
-+return use_ascii (foo) == use_ebcdic (foo);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
-+	      ac_cv_c_bigendian=yes
-+	    fi
-+	    if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
-+	      if test "$ac_cv_c_bigendian" = unknown; then
-+		ac_cv_c_bigendian=no
-+	      else
-+		# finding both strings is unlikely to happen, but who knows?
-+		ac_cv_c_bigendian=unknown
-+	      fi
-+	    fi
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+$ac_includes_default
-+int
-+main ()
-+{
-+
-+	     /* Are we little or big endian?  From Harbison&Steele.  */
-+	     union
-+	     {
-+	       long int l;
-+	       char c[sizeof (long int)];
-+	     } u;
-+	     u.l = 1;
-+	     return u.c[sizeof (long int) - 1] == 1;
-+	   
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+  ac_cv_c_bigendian=no
-+else
-+  ac_cv_c_bigendian=yes
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
-+
-+    fi
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
-+$as_echo "$ac_cv_c_bigendian" >&6; }
-+ case $ac_cv_c_bigendian in #(
-+   yes)
-+     $as_echo "@%:@define WORDS_BIGENDIAN 1" >>confdefs.h
-+;; #(
-+   no)
-+      ;; #(
-+   universal)
-+     	
-+$as_echo "@%:@define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
-+
-+     ;; #(
-+   *)
-+     as_fn_error "unknown endianness
-+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
-+ esac
-+
-+
-+te_file=generic
-+
-+# Makefile target for installing gas in $(tooldir)/bin.
-+install_tooldir=install-exec-tooldir
-+
-+canon_targets=""
-+all_targets=no
-+if test -n "$enable_targets" ; then
-+  for t in `echo $enable_targets | sed 's/,/ /g'`; do
-+    if test $t = "all"; then
-+      all_targets=yes
-+      continue
-+    fi
-+    result=`$ac_config_sub $t 2>/dev/null`
-+    if test -n "$result" ; then
-+      canon_targets="$canon_targets $result"
-+#    else
-+#      # Permit "all", etc.  We don't support it yet though.
-+#      canon_targets="$canon_targets $t"
-+    fi
-+  done
-+  _gas_uniq_list="$canon_targets"
-+_gas_uniq_newlist=""
-+for _gas_uniq_i in _gas_uniq_dummy $_gas_uniq_list ; do
-+  case $_gas_uniq_i in
-+  _gas_uniq_dummy) ;;
-+  *) case " $_gas_uniq_newlist " in
-+       *" $_gas_uniq_i "*) ;;
-+       *) _gas_uniq_newlist="$_gas_uniq_newlist $_gas_uniq_i" ;;
-+     esac ;;
-+  esac
-+done
-+canon_targets=$_gas_uniq_newlist
-+
-+fi
-+
-+emulations=""
-+
-+for this_target in $target $canon_targets ; do
-+
-+    targ=${this_target}
-+    . ${srcdir}/configure.tgt
-+
-+    case ${target_cpu} in
-+      crisv32)
-+	
-+cat >>confdefs.h <<_ACEOF
-+@%:@define DEFAULT_CRIS_ARCH $arch
-+_ACEOF
-+
-+	;;
-+    esac
-+
-+    if test ${this_target} = $target ; then
-+      target_cpu_type=${cpu_type}
-+    elif test ${target_cpu_type} != ${cpu_type} ; then
-+      continue
-+    fi
-+
-+    generic_target=${cpu_type}-${target_vendor}-${target_os}
-+    case ${generic_target} in
-+      i386-*-sco3.2v5*)
-+	if test ${this_target} = $target; then
-+	  
-+$as_echo "@%:@define SCO_ELF 1" >>confdefs.h
-+
-+	fi
-+	;;
-+
-+      i386-*-msdosdjgpp* \
-+      | i386-*-go32* \
-+      | i386-go32-rtems*)
-+	
-+$as_echo "@%:@define STRICTCOFF 1" >>confdefs.h
-+
-+	;;
-+
-+      i860-*-*)
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GAS support for ${generic_target} is preliminary and a work in progress" >&5
-+$as_echo "$as_me: WARNING: GAS support for ${generic_target} is preliminary and a work in progress" >&2;}
-+	;;
-+
-+      microblaze*)
-+        ;;
-+
-+      mips-sony-bsd*)
-+	;;
-+      mips-*-bsd*)
-+	as_fn_error "Unknown vendor for mips-bsd configuration." "$LINENO" 5
-+	;;
-+
-+      ppc-*-aix[5-9].*)
-+	
-+$as_echo "@%:@define AIX_WEAK_SUPPORT 1" >>confdefs.h
-+
-+	;;
-+      ppc-*-linux-*)
-+	case "$endian" in
-+	  big)  ;;
-+	  *)    as_fn_error "GNU/Linux must be configured big endian" "$LINENO" 5 ;;
-+	esac
-+	;;
-+      ppc-*-solaris*)
-+	if test ${this_target} = $target; then
-+	  
-+$as_echo "@%:@define TARGET_SOLARIS_COMMENT 1" >>confdefs.h
-+
-+	fi
-+	if test x${endian} = xbig; then
-+	  as_fn_error "Solaris must be configured little endian" "$LINENO" 5
-+	fi
-+	;;
-+
-+      sh*-*-symbianelf*)
-+	
-+$as_echo "@%:@define TARGET_SYMBIAN 1" >>confdefs.h
-+
-+	;;
-+    esac
-+
-+    if test ${this_target} = $target ; then
-+      endian_def=
-+      if test x${endian} = xbig; then
-+	endian_def=1
-+      elif test x${endian} = xlittle; then
-+	endian_def=0
-+      fi
-+      if test x${endian_def} != x; then
-+	
-+cat >>confdefs.h <<_ACEOF
-+@%:@define TARGET_BYTES_BIG_ENDIAN $endian_def
-+_ACEOF
-+
-+      fi
-+    fi
-+
-+# Other random stuff.
-+
-+    case ${cpu_type} in
-+      mips)
-+	# Set mips_cpu to the name of the default CPU.
-+	case ${target_cpu} in
-+	  mips | mipsbe | mipseb | mipsle | mipsel | mips64 | mips64el)
-+	    mips_cpu=from-abi
-+	    ;;
-+	  mipsisa32 | mipsisa32el)
-+	    mips_cpu=mips32
-+	    ;;
-+	  mipsisa32r2 | mipsisa32r2el)
-+	    mips_cpu=mips32r2
-+	    ;;
-+	  mipsisa64 | mipsisa64el)
-+	    mips_cpu=mips64
-+	    ;;
-+	  mipsisa64r2 | mipsisa64r2el)
-+	    mips_cpu=mips64r2
-+	    ;;
-+	  mipstx39 | mipstx39el)
-+	    mips_cpu=r3900
-+	    ;;
-+	  mips64vr | mips64vrel)
-+	    mips_cpu=vr4100
-+	    ;;
-+	  mipsisa32r2* | mipsisa64r2*)
-+	    mips_cpu=`echo $target_cpu | sed -e 's/[a-z]*..r2//' -e 's/el$//'`
-+	    ;;
-+	  mips64* | mipsisa64* | mipsisa32*)
-+	    mips_cpu=`echo $target_cpu | sed -e 's/[a-z]*..//' -e 's/el$//'`
-+	    ;;
-+	  *)
-+	    as_fn_error "$target_cpu isn't a supported MIPS CPU name" "$LINENO" 5
-+	    ;;
-+	esac
-+	# See whether it's appropriate to set E_MIPS_ABI_O32 for o32
-+	# binaries.  It's a GNU extension that some OSes don't understand.
-+	# The value only matters on ELF targets.
-+	case ${target} in
-+	  *-*-irix*)
-+	    use_e_mips_abi_o32=0
-+	    ;;
-+	  *)
-+	    use_e_mips_abi_o32=1
-+	    ;;
-+	esac
-+	# Decide whether to generate 32-bit or 64-bit code by default.
-+	# Used to resolve -march=from-abi when an embedded ABI is selected.
-+	case ${target} in
-+	  mips64*-*-* | mipsisa64*-*-*)
-+	    mips_default_64bit=1
-+	    ;;
-+	  *)
-+	    mips_default_64bit=0
-+	    ;;
-+	esac
-+	# Decide which ABI to target by default.
-+	case ${target} in
-+	  mips64*-linux* | mips-sgi-irix6*)
-+	    mips_default_abi=N32_ABI
-+	    ;;
-+	  mips*-linux*)
-+	    mips_default_abi=O32_ABI
-+	    ;;
-+	  mips64*-openbsd*)
-+	    mips_default_abi=N64_ABI
-+	    ;;
-+	  *)
-+	    mips_default_abi=NO_ABI
-+	    ;;
-+	esac
-+	
-+cat >>confdefs.h <<_ACEOF
-+@%:@define MIPS_CPU_STRING_DEFAULT "$mips_cpu"
-+_ACEOF
-+
-+	
-+cat >>confdefs.h <<_ACEOF
-+@%:@define USE_E_MIPS_ABI_O32 $use_e_mips_abi_o32
-+_ACEOF
-+
-+	
-+cat >>confdefs.h <<_ACEOF
-+@%:@define MIPS_DEFAULT_64BIT $mips_default_64bit
-+_ACEOF
-+
-+	
-+cat >>confdefs.h <<_ACEOF
-+@%:@define MIPS_DEFAULT_ABI $mips_default_abi
-+_ACEOF
-+
-+	;;
-+    esac
-+
-+    # Do we need the opcodes library?
-+    case ${cpu_type} in
-+      vax | tic30)
-+	;;
-+
-+      *)
-+	need_opcodes=yes
-+
-+	case "${enable_shared}" in
-+	yes) shared_opcodes=true ;;
-+	*opcodes*) shared_opcodes=true ;;
-+	*) shared_opcodes=false ;;
-+	esac
-+	;;
-+    esac
-+
-+    # Any other special object files needed ?
-+    case ${cpu_type} in
-+
-+      bfin)
-+        echo ${extra_objects} | grep -s "bfin-parse.o"
-+        if test $? -ne 0 ; then
-+          extra_objects="$extra_objects bfin-parse.o"
-+        fi
-+
-+        echo ${extra_objects} | grep -s "bfin-lex.o"
-+        if test $? -ne 0 ; then
-+          extra_objects="$extra_objects bfin-lex.o"
-+        fi
-+        ;;
-+
-+      fr30 | ip2k | iq2000 | lm32 | m32r | openrisc)
-+	using_cgen=yes
-+	;;
-+
-+      m32c)
-+	using_cgen=yes
-+	;;
-+      frv)
-+	using_cgen=yes
-+	;;
-+      m68k)
-+	case ${extra_objects} in
-+	*m68k-parse.o*) ;;
-+	*) extra_objects="$extra_objects m68k-parse.o" ;;
-+	esac
-+	;;
-+
-+      mep)
-+	using_cgen=yes
-+	;;
-+
-+      mips)
-+	echo ${extra_objects} | grep -s "itbl-parse.o"
-+	if test $? -ne 0 ; then
-+	  extra_objects="$extra_objects itbl-parse.o"
-+	fi
-+
-+	echo ${extra_objects} | grep -s "itbl-lex.o"
-+	if test $? -ne 0 ; then
-+	  extra_objects="$extra_objects itbl-lex.o"
-+	fi
-+
-+	echo ${extra_objects} | grep -s "itbl-ops.o"
-+	if test $? -ne 0 ; then
-+	  extra_objects="$extra_objects itbl-ops.o"
-+	fi
-+	;;
-+
-+      mt)
-+        using_cgen=yes
-+	;;
-+
-+      i386 | s390 | sparc)
-+	if test $this_target = $target ; then
-+	  
-+cat >>confdefs.h <<_ACEOF
-+@%:@define DEFAULT_ARCH "${arch}"
-+_ACEOF
-+
-+	fi
-+	;;
-+
-+      rx)
-+        echo ${extra_objects} | grep -s "rx-parse.o"
-+        if test $? -ne 0 ; then
-+          extra_objects="$extra_objects rx-parse.o"
-+        fi
-+	;;
-+
-+      xstormy16)
-+	using_cgen=yes
-+	;;
-+
-+      xc16x)
-+	using_cgen=yes
-+	;;
-+
-+      xtensa)
-+	echo ${extra_objects} | grep -s "xtensa-relax.o"
-+	if test $? -ne 0 ; then
-+	  extra_objects="$extra_objects xtensa-relax.o"
-+	fi
-+	;;
-+
-+      *)
-+	;;
-+    esac
-+
-+    if test $using_cgen = yes ; then
-+	case "x${extra_objects}" in
-+	*cgen.o*) ;;
-+	*) extra_objects="$extra_objects cgen.o" ;;
-+	esac
-+    fi
-+
-+# See if we really can support this configuration with the emulation code.
-+
-+    if test $this_target = $target ; then
-+      obj_format=$fmt
-+      te_file=$em
-+    fi
-+
-+   case ${te_file} in
-+      vms) extra_objects="$extra_objects te-vms.o" ;;
-+   esac
-+ 
-+# From target name and format, produce a list of supported emulations.
-+
-+    case ${generic_target}-${fmt} in
-+      mips-*-irix5*-*)	emulation="mipsbelf mipslelf mipself mipsbecoff mipslecoff mipsecoff" ;;
-+      mips*-*-linux*-*) case "$endian" in
-+			big)	emulation="mipsbelf mipslelf mipself" ;;
-+			*)	emulation="mipslelf mipsbelf mipself" ;;
-+			esac ;;
-+      mips-*-lnews*-ecoff) ;;
-+      mips-*-*-ecoff)	case "$endian" in
-+			big)	emulation="mipsbecoff mipslecoff mipsecoff" ;;
-+			*)	emulation="mipslecoff mipsbecoff mipsecoff" ;;
-+			esac ;;
-+      mips-*-*-elf)	case "$endian" in
-+			big)	emulation="mipsbelf mipslelf mipself" ;;
-+			*)	emulation="mipslelf mipsbelf mipself" ;;
-+			esac ;;
-+      mips-*-sysv4*MP*-*) emulation="mipsbelf mipslelf mipself mipsbecoff mipslecoff mipsecoff" ;;
-+      # i386-pc-pe-coff != i386-pc-coff.
-+      i386-*-pe-coff)	;;
-+      # Uncommenting the next line will turn on support for i386 AOUT
-+      # for the default linux configuration
-+      # i386-*-linux*-elf) emulation="i386elf i386aout" ;;
-+      #
-+      i386-*-aout)	emulation="i386aout" ;;
-+      i386-*-coff)	emulation="i386coff" ;;
-+      i386-*-elf)	emulation="i386elf" ;;
-+
-+      # Always all formats.  The first stated emulation becomes the default.
-+      cris-*-*aout*)	emulation="crisaout criself" ;;
-+      cris-*-*)		emulation="criself crisaout" ;;
-+    esac
-+
-+    emulations="$emulations $emulation"
-+
-+done
-+
-+# Turn on all targets if possible
-+if test ${all_targets} = "yes"; then
-+  case ${target_cpu_type} in
-+  i386)
-+    case ${obj_format} in
-+    aout)
-+      emulations="$emulations i386coff i386elf"
-+      ;;
-+    coff)
-+      emulations="$emulations i386aout i386elf"
-+    ;;
-+    elf)
-+      emulations="$emulations i386aout i386coff"
-+      ;;
-+    esac
-+  ;;
-+  x86_64)
-+    case ${obj_format} in
-+    aout)
-+      emulations="$emulations i386coff i386elf"
-+      ;;
-+    coff)
-+      emulations="$emulations i386aout i386elf"
-+    ;;
-+    elf)
-+      emulations="$emulations i386aout i386coff"
-+      ;;
-+    esac
-+  ;;
-+  esac
-+fi
-+
-+# Assign floating point type.  Most processors with FP support
-+# IEEE FP.  On those that don't support FP at all, usually IEEE
-+# is emulated.
-+case ${target_cpu} in
-+  vax | pdp11 )	atof=vax ;;
-+  *)		atof=ieee ;;
-+esac
-+
-+case "${obj_format}" in
-+  "") as_fn_error "GAS does not know what format to use for target ${target}" "$LINENO" 5 ;;
-+esac
-+
-+# Unfortunately the cpu in cpu-opc.h file isn't always $(TARGET_CPU).
-+cgen_cpu_prefix=""
-+if test $using_cgen = yes ; then
-+  case ${target_cpu} in
-+    *) cgen_cpu_prefix=${target_cpu} ;;
-+  esac
-+  
-+  
-+$as_echo "@%:@define USING_CGEN 1" >>confdefs.h
-+
-+fi
-+
-+
-+if test ! -r ${srcdir}/config/tc-${target_cpu_type}.c; then
-+  as_fn_error "GAS does not support target CPU ${target_cpu_type}" "$LINENO" 5
-+fi
-+
-+if test ! -r ${srcdir}/config/obj-${obj_format}.c; then
-+  as_fn_error "GAS does not have support for object file format ${obj_format}" "$LINENO" 5
-+fi
-+
-+# Some COFF configurations want these random other flags set.
-+case ${obj_format} in
-+  coff)
-+    case ${target_cpu_type} in
-+      i386) 
-+$as_echo "@%:@define I386COFF 1" >>confdefs.h
-+ ;;
-+      m68k) 
-+$as_echo "@%:@define M68KCOFF 1" >>confdefs.h
-+ ;;
-+      m88k) 
-+$as_echo "@%:@define M88KCOFF 1" >>confdefs.h
-+ ;;
-+      x86_64) 
-+$as_echo "@%:@define I386COFF 1" >>confdefs.h
-+ ;;
-+    esac
-+    ;;
-+esac
-+
-+# Getting this done right is going to be a bitch.  Each configuration specified
-+# with --enable-targets=... should be checked for environment, format, cpu
-+# setting.
-+#
-+# For each configuration, the necessary object file support code must be linked
-+# in.  This might be only one, it might be up to four.  The necessary emulation
-+# code needs to be provided, too.
-+#
-+# And then there's "--enable-targets=all"....
-+#
-+# For now, just always do it for MIPS ELF or ECOFF configurations.  Sigh.
-+
-+formats="${obj_format}"
-+emfiles=""
-+EMULATIONS=""
-+_gas_uniq_list="$emulations"
-+_gas_uniq_newlist=""
-+for _gas_uniq_i in _gas_uniq_dummy $_gas_uniq_list ; do
-+  case $_gas_uniq_i in
-+  _gas_uniq_dummy) ;;
-+  *) case " $_gas_uniq_newlist " in
-+       *" $_gas_uniq_i "*) ;;
-+       *) _gas_uniq_newlist="$_gas_uniq_newlist $_gas_uniq_i" ;;
-+     esac ;;
-+  esac
-+done
-+emulations=$_gas_uniq_newlist
-+
-+for em in . $emulations ; do
-+  case $em in
-+    .)	continue ;;
-+    mipsbelf | mipslelf | mipself)
-+	fmt=elf   file=mipself ;;
-+    mipsbecoff | mipslecoff | mipsecoff)
-+	fmt=ecoff file=mipsecoff ;;
-+    *coff)
-+	fmt=coff  file=$em ;;
-+    *aout)
-+	fmt=aout file=$em ;;
-+    *elf)
-+	fmt=elf file=$em ;;
-+  esac
-+  formats="$formats $fmt"
-+  emfiles="$emfiles e-$file.o"
-+  EMULATIONS="$EMULATIONS &$em,"
-+done
-+_gas_uniq_list="$formats"
-+_gas_uniq_newlist=""
-+for _gas_uniq_i in _gas_uniq_dummy $_gas_uniq_list ; do
-+  case $_gas_uniq_i in
-+  _gas_uniq_dummy) ;;
-+  *) case " $_gas_uniq_newlist " in
-+       *" $_gas_uniq_i "*) ;;
-+       *) _gas_uniq_newlist="$_gas_uniq_newlist $_gas_uniq_i" ;;
-+     esac ;;
-+  esac
-+done
-+formats=$_gas_uniq_newlist
-+
-+_gas_uniq_list="$emfiles"
-+_gas_uniq_newlist=""
-+for _gas_uniq_i in _gas_uniq_dummy $_gas_uniq_list ; do
-+  case $_gas_uniq_i in
-+  _gas_uniq_dummy) ;;
-+  *) case " $_gas_uniq_newlist " in
-+       *" $_gas_uniq_i "*) ;;
-+       *) _gas_uniq_newlist="$_gas_uniq_newlist $_gas_uniq_i" ;;
-+     esac ;;
-+  esac
-+done
-+emfiles=$_gas_uniq_newlist
-+
-+if test `set . $formats ; shift ; echo $#` -gt 1 ; then
-+  for fmt in $formats ; do
-+    case $fmt in
-+      aout)	
-+$as_echo "@%:@define OBJ_MAYBE_AOUT 1" >>confdefs.h
-+   ;;
-+      bout)	
-+$as_echo "@%:@define OBJ_MAYBE_BOUT 1" >>confdefs.h
-+   ;;
-+      coff)	
-+$as_echo "@%:@define OBJ_MAYBE_COFF 1" >>confdefs.h
-+    ;;
-+      ecoff)	
-+$as_echo "@%:@define OBJ_MAYBE_ECOFF 1" >>confdefs.h
-+   ;;
-+      elf)	
-+$as_echo "@%:@define OBJ_MAYBE_ELF 1" >>confdefs.h
-+     ;;
-+      generic)	
-+$as_echo "@%:@define OBJ_MAYBE_GENERIC 1" >>confdefs.h
-+ ;;
-+      som)	
-+$as_echo "@%:@define OBJ_MAYBE_SOM 1" >>confdefs.h
-+     ;;
-+    esac
-+    extra_objects="$extra_objects obj-$fmt.o"
-+  done
-+  obj_format=multi
-+fi
-+if test `set . $emfiles ; shift ; echo $#` -gt 0 ; then
-+  DEFAULT_EMULATION=`set . $emulations ; echo $2`
-+  # e-mips* has more than one emulation per file, e-i386* has just one at the
-+  # moment.  If only one emulation is specified, then don't define
-+  # USE_EMULATIONS or include any of the e-files as they will only be bloat.
-+  case "${obj_format}${emfiles}" in
-+    multi* | *mips*)
-+      extra_objects="$extra_objects $emfiles"
-+      
-+$as_echo "@%:@define USE_EMULATIONS 1" >>confdefs.h
-+ ;;
-+  esac
-+fi
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+@%:@define EMULATIONS $EMULATIONS
-+_ACEOF
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+@%:@define DEFAULT_EMULATION "$DEFAULT_EMULATION"
-+_ACEOF
-+
-+
-+reject_dev_configs=yes
-+
-+case ${reject_dev_configs}-${dev} in
-+  yes-yes) # Oops.
-+    as_fn_error "GAS does not support the ${generic_target} configuration." "$LINENO" 5
-+    ;;
-+esac
-+
-+
-+
-+
-+
-+
-+
-+# do we need the opcodes library?
-+case "${need_opcodes}" in
-+yes)
-+  OPCODES_LIB=../opcodes/libopcodes.la
-+  ;;
-+esac
-+
-+
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+@%:@define TARGET_ALIAS "${target_alias}"
-+_ACEOF
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+@%:@define TARGET_CANONICAL "${target}"
-+_ACEOF
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+@%:@define TARGET_CPU "${target_cpu}"
-+_ACEOF
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+@%:@define TARGET_VENDOR "${target_vendor}"
-+_ACEOF
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+@%:@define TARGET_OS "${target_os}"
-+_ACEOF
-+
-+
-+for ac_prog in 'bison -y' byacc
-+do
-+  # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_YACC+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$YACC"; then
-+  ac_cv_prog_YACC="$YACC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_YACC="$ac_prog"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+YACC=$ac_cv_prog_YACC
-+if test -n "$YACC"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5
-+$as_echo "$YACC" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+  test -n "$YACC" && break
-+done
-+test -n "$YACC" || YACC="yacc"
-+
-+for ac_prog in flex lex
-+do
-+  # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_LEX+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$LEX"; then
-+  ac_cv_prog_LEX="$LEX" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_LEX="$ac_prog"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+LEX=$ac_cv_prog_LEX
-+if test -n "$LEX"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LEX" >&5
-+$as_echo "$LEX" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+  test -n "$LEX" && break
-+done
-+test -n "$LEX" || LEX=":"
-+
-+if test "x$LEX" != "x:"; then
-+  cat >conftest.l <<_ACEOF
-+%%
-+a { ECHO; }
-+b { REJECT; }
-+c { yymore (); }
-+d { yyless (1); }
-+e { yyless (input () != 0); }
-+f { unput (yytext[0]); }
-+. { BEGIN INITIAL; }
-+%%
-+#ifdef YYTEXT_POINTER
-+extern char *yytext;
-+#endif
-+int
-+main (void)
-+{
-+  return ! yylex () + ! yywrap ();
-+}
-+_ACEOF
-+{ { ac_try="$LEX conftest.l"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$LEX conftest.l") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking lex output file root" >&5
-+$as_echo_n "checking lex output file root... " >&6; }
-+if test "${ac_cv_prog_lex_root+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  
-+if test -f lex.yy.c; then
-+  ac_cv_prog_lex_root=lex.yy
-+elif test -f lexyy.c; then
-+  ac_cv_prog_lex_root=lexyy
-+else
-+  as_fn_error "cannot find output from $LEX; giving up" "$LINENO" 5
-+fi
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_root" >&5
-+$as_echo "$ac_cv_prog_lex_root" >&6; }
-+LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
-+
-+if test -z "${LEXLIB+set}"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking lex library" >&5
-+$as_echo_n "checking lex library... " >&6; }
-+if test "${ac_cv_lib_lex+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  
-+    ac_save_LIBS=$LIBS
-+    ac_cv_lib_lex='none needed'
-+    for ac_lib in '' -lfl -ll; do
-+      LIBS="$ac_lib $ac_save_LIBS"
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+`cat $LEX_OUTPUT_ROOT.c`
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_lex=$ac_lib
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+      test "$ac_cv_lib_lex" != 'none needed' && break
-+    done
-+    LIBS=$ac_save_LIBS
-+  
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lex" >&5
-+$as_echo "$ac_cv_lib_lex" >&6; }
-+  test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex
-+fi
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether yytext is a pointer" >&5
-+$as_echo_n "checking whether yytext is a pointer... " >&6; }
-+if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  # POSIX says lex can declare yytext either as a pointer or an array; the
-+# default is implementation-dependent.  Figure out which it is, since
-+# not all implementations provide the %pointer and %array declarations.
-+ac_cv_prog_lex_yytext_pointer=no
-+ac_save_LIBS=$LIBS
-+LIBS="$LEXLIB $ac_save_LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#define YYTEXT_POINTER 1
-+`cat $LEX_OUTPUT_ROOT.c`
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_prog_lex_yytext_pointer=yes
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_save_LIBS
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_yytext_pointer" >&5
-+$as_echo "$ac_cv_prog_lex_yytext_pointer" >&6; }
-+if test $ac_cv_prog_lex_yytext_pointer = yes; then
-+  
-+$as_echo "@%:@define YYTEXT_POINTER 1" >>confdefs.h
-+
-+fi
-+rm -f conftest.l $LEX_OUTPUT_ROOT.c
-+
-+fi
-+if test "$LEX" = :; then
-+  LEX=${am_missing_run}flex
-+fi
-+
-+ALL_LINGUAS="fr tr es rw id ru"
-+# If we haven't got the data from the intl directory,
-+# assume NLS is disabled.
-+USE_NLS=no	
-+LIBINTL=	
-+LIBINTL_DEP=	
-+INCINTL=	
-+XGETTEXT=	
-+GMSGFMT=	
-+POSUB=		
-+
-+if test -f  ../intl/config.intl; then
-+  .  ../intl/config.intl
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
-+$as_echo_n "checking whether NLS is requested... " >&6; }
-+if test x"$USE_NLS" != xyes; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+  
-+$as_echo "@%:@define ENABLE_NLS 1" >>confdefs.h
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5
-+$as_echo_n "checking for catalogs to be installed... " >&6; }
-+  # Look for .po and .gmo files in the source directory.
-+  CATALOGS=  
-+  XLINGUAS=
-+  for cat in $srcdir/po/*.gmo $srcdir/po/*.po; do
-+    # If there aren't any .gmo files the shell will give us the
-+    # literal string "../path/to/srcdir/po/*.gmo" which has to be
-+    # weeded out.
-+    case "$cat" in *\**)
-+      continue;;
-+    esac
-+    # The quadruple backslash is collapsed to a double backslash
-+    # by the backticks, then collapsed again by the double quotes,
-+    # leaving us with one backslash in the sed expression (right
-+    # before the dot that mustn't act as a wildcard).
-+    cat=`echo $cat | sed -e "s!$srcdir/po/!!" -e "s!\\\\.po!.gmo!"`
-+    lang=`echo $cat | sed -e "s!\\\\.gmo!!"`
-+    # The user is allowed to set LINGUAS to a list of languages to
-+    # install catalogs for.  If it's empty that means "all of them."
-+    if test "x$LINGUAS" = x; then
-+      CATALOGS="$CATALOGS $cat"
-+      XLINGUAS="$XLINGUAS $lang"
-+    else
-+      case "$LINGUAS" in *$lang*)
-+        CATALOGS="$CATALOGS $cat"
-+        XLINGUAS="$XLINGUAS $lang"
-+        ;;
-+      esac
-+    fi
-+  done
-+  LINGUAS="$XLINGUAS"
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5
-+$as_echo "$LINGUAS" >&6; }
-+
-+    
-+    DATADIRNAME=share
-+  
-+  INSTOBJEXT=.mo
-+  
-+  GENCAT=gencat
-+  
-+  CATOBJEXT=.gmo
-+  
-+fi
-+
-+        MKINSTALLDIRS=
-+  if test -n "$ac_aux_dir"; then
-+    case "$ac_aux_dir" in
-+      /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;;
-+      *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;;
-+    esac
-+  fi
-+  if test -z "$MKINSTALLDIRS"; then
-+    MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
-+  fi
-+  
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
-+$as_echo_n "checking whether NLS is requested... " >&6; }
-+    @%:@ Check whether --enable-nls was given.
-+if test "${enable_nls+set}" = set; then :
-+  enableval=$enable_nls; USE_NLS=$enableval
-+else
-+  USE_NLS=yes
-+fi
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
-+$as_echo "$USE_NLS" >&6; }
-+  
-+
-+
-+        
-+    
-+        
-+# Prepare PATH_SEPARATOR.
-+# The user is always right.
-+if test "${PATH_SEPARATOR+set}" != set; then
-+  echo "#! /bin/sh" >conf$$.sh
-+  echo  "exit 0"   >>conf$$.sh
-+  chmod +x conf$$.sh
-+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-+    PATH_SEPARATOR=';'
-+  else
-+    PATH_SEPARATOR=:
-+  fi
-+  rm -f conf$$.sh
-+fi
-+
-+# Find out how to test for executable files. Don't use a zero-byte file,
-+# as systems may use methods other than mode bits to determine executability.
-+cat >conf$$.file <<_ASEOF
-+#! /bin/sh
-+exit 0
-+_ASEOF
-+chmod +x conf$$.file
-+if test -x conf$$.file >/dev/null 2>&1; then
-+  ac_executable_p="test -x"
-+else
-+  ac_executable_p="test -f"
-+fi
-+rm -f conf$$.file
-+
-+# Extract the first word of "msgfmt", so it can be a program name with args.
-+set dummy msgfmt; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_path_MSGFMT+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  case "$MSGFMT" in
-+  [\\/]* | ?:[\\/]*)
-+    ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
-+    ;;
-+  *)
-+    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
-+    for ac_dir in $PATH; do
-+      IFS="$ac_save_IFS"
-+      test -z "$ac_dir" && ac_dir=.
-+      for ac_exec_ext in '' $ac_executable_extensions; do
-+        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
-+          if $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
-+     (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-+            ac_cv_path_MSGFMT="$ac_dir/$ac_word$ac_exec_ext"
-+            break 2
-+          fi
-+        fi
-+      done
-+    done
-+    IFS="$ac_save_IFS"
-+  test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":"
-+    ;;
-+esac
-+fi
-+MSGFMT="$ac_cv_path_MSGFMT"
-+if test "$MSGFMT" != ":"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
-+$as_echo "$MSGFMT" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+  # Extract the first word of "gmsgfmt", so it can be a program name with args.
-+set dummy gmsgfmt; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_path_GMSGFMT+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  case $GMSGFMT in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-+  ;;
-+esac
-+fi
-+GMSGFMT=$ac_cv_path_GMSGFMT
-+if test -n "$GMSGFMT"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
-+$as_echo "$GMSGFMT" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+
-+        
-+# Prepare PATH_SEPARATOR.
-+# The user is always right.
-+if test "${PATH_SEPARATOR+set}" != set; then
-+  echo "#! /bin/sh" >conf$$.sh
-+  echo  "exit 0"   >>conf$$.sh
-+  chmod +x conf$$.sh
-+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-+    PATH_SEPARATOR=';'
-+  else
-+    PATH_SEPARATOR=:
-+  fi
-+  rm -f conf$$.sh
-+fi
-+
-+# Find out how to test for executable files. Don't use a zero-byte file,
-+# as systems may use methods other than mode bits to determine executability.
-+cat >conf$$.file <<_ASEOF
-+#! /bin/sh
-+exit 0
-+_ASEOF
-+chmod +x conf$$.file
-+if test -x conf$$.file >/dev/null 2>&1; then
-+  ac_executable_p="test -x"
-+else
-+  ac_executable_p="test -f"
-+fi
-+rm -f conf$$.file
-+
-+# Extract the first word of "xgettext", so it can be a program name with args.
-+set dummy xgettext; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_path_XGETTEXT+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  case "$XGETTEXT" in
-+  [\\/]* | ?:[\\/]*)
-+    ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
-+    ;;
-+  *)
-+    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
-+    for ac_dir in $PATH; do
-+      IFS="$ac_save_IFS"
-+      test -z "$ac_dir" && ac_dir=.
-+      for ac_exec_ext in '' $ac_executable_extensions; do
-+        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
-+          if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
-+     (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-+            ac_cv_path_XGETTEXT="$ac_dir/$ac_word$ac_exec_ext"
-+            break 2
-+          fi
-+        fi
-+      done
-+    done
-+    IFS="$ac_save_IFS"
-+  test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
-+    ;;
-+esac
-+fi
-+XGETTEXT="$ac_cv_path_XGETTEXT"
-+if test "$XGETTEXT" != ":"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
-+$as_echo "$XGETTEXT" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+    rm -f messages.po
-+
-+    
-+# Prepare PATH_SEPARATOR.
-+# The user is always right.
-+if test "${PATH_SEPARATOR+set}" != set; then
-+  echo "#! /bin/sh" >conf$$.sh
-+  echo  "exit 0"   >>conf$$.sh
-+  chmod +x conf$$.sh
-+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-+    PATH_SEPARATOR=';'
-+  else
-+    PATH_SEPARATOR=:
-+  fi
-+  rm -f conf$$.sh
-+fi
-+
-+# Find out how to test for executable files. Don't use a zero-byte file,
-+# as systems may use methods other than mode bits to determine executability.
-+cat >conf$$.file <<_ASEOF
-+#! /bin/sh
-+exit 0
-+_ASEOF
-+chmod +x conf$$.file
-+if test -x conf$$.file >/dev/null 2>&1; then
-+  ac_executable_p="test -x"
-+else
-+  ac_executable_p="test -f"
-+fi
-+rm -f conf$$.file
-+
-+# Extract the first word of "msgmerge", so it can be a program name with args.
-+set dummy msgmerge; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_path_MSGMERGE+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  case "$MSGMERGE" in
-+  [\\/]* | ?:[\\/]*)
-+    ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
-+    ;;
-+  *)
-+    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
-+    for ac_dir in $PATH; do
-+      IFS="$ac_save_IFS"
-+      test -z "$ac_dir" && ac_dir=.
-+      for ac_exec_ext in '' $ac_executable_extensions; do
-+        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
-+          if $ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1; then
-+            ac_cv_path_MSGMERGE="$ac_dir/$ac_word$ac_exec_ext"
-+            break 2
-+          fi
-+        fi
-+      done
-+    done
-+    IFS="$ac_save_IFS"
-+  test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":"
-+    ;;
-+esac
-+fi
-+MSGMERGE="$ac_cv_path_MSGMERGE"
-+if test "$MSGMERGE" != ":"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
-+$as_echo "$MSGMERGE" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+      if test "$GMSGFMT" != ":"; then
-+            if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
-+       (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-+      : ;
-+    else
-+      GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $GMSGFMT program is not GNU msgfmt; ignore it" >&5
-+$as_echo "found $GMSGFMT program is not GNU msgfmt; ignore it" >&6; }
-+      GMSGFMT=":"
-+    fi
-+  fi
-+
-+      if test "$XGETTEXT" != ":"; then
-+            if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
-+       (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-+      : ;
-+    else
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5
-+$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
-+      XGETTEXT=":"
-+    fi
-+        rm -f messages.po
-+  fi
-+
-+  ac_config_commands="$ac_config_commands default-1"
-+
-+
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
-+$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
-+    @%:@ Check whether --enable-maintainer-mode was given.
-+if test "${enable_maintainer_mode+set}" = set; then :
-+  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
-+else
-+  USE_MAINTAINER_MODE=no
-+fi
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
-+$as_echo "$USE_MAINTAINER_MODE" >&6; }
-+   if test $USE_MAINTAINER_MODE = yes; then
-+  MAINTAINER_MODE_TRUE=
-+  MAINTAINER_MODE_FALSE='#'
-+else
-+  MAINTAINER_MODE_TRUE='#'
-+  MAINTAINER_MODE_FALSE=
-+fi
-+
-+  MAINT=$MAINTAINER_MODE_TRUE
-+  
-+
-+ if false; then
-+  GENINSRC_NEVER_TRUE=
-+  GENINSRC_NEVER_FALSE='#'
-+else
-+  GENINSRC_NEVER_TRUE='#'
-+  GENINSRC_NEVER_FALSE=
-+fi
-+
-+
-+
-+for ac_header in string.h stdlib.h memory.h strings.h unistd.h errno.h sys/types.h limits.h time.h sys/stat.h
-+do :
-+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+@%:@define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+ 
-+fi
-+
-+done
-+
-+
-+# Put this here so that autoconf's "cross-compiling" message doesn't confuse
-+# people who are not cross-compiling but are compiling cross-assemblers.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiling a cross-assembler" >&5
-+$as_echo_n "checking whether compiling a cross-assembler... " >&6; }
-+if test "${host}" = "${target}"; then
-+  cross_gas=no
-+else
-+  cross_gas=yes
-+  
-+$as_echo "@%:@define CROSS_COMPILE 1" >>confdefs.h
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_gas" >&5
-+$as_echo "$cross_gas" >&6; }
-+
-+# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
-+# for constant arguments.  Useless!
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
-+$as_echo_n "checking for working alloca.h... " >&6; }
-+if test "${ac_cv_working_alloca_h+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+@%:@include <alloca.h>
-+int
-+main ()
-+{
-+char *p = (char *) alloca (2 * sizeof (int));
-+			  if (p) return 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_working_alloca_h=yes
-+else
-+  ac_cv_working_alloca_h=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
-+$as_echo "$ac_cv_working_alloca_h" >&6; }
-+if test $ac_cv_working_alloca_h = yes; then
-+  
-+$as_echo "@%:@define HAVE_ALLOCA_H 1" >>confdefs.h
-+
-+fi
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
-+$as_echo_n "checking for alloca... " >&6; }
-+if test "${ac_cv_func_alloca_works+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#ifdef __GNUC__
-+# define alloca __builtin_alloca
-+#else
-+# ifdef _MSC_VER
-+#  include <malloc.h>
-+#  define alloca _alloca
-+# else
-+#  ifdef HAVE_ALLOCA_H
-+#   include <alloca.h>
-+#  else
-+#   ifdef _AIX
-+ #pragma alloca
-+#   else
-+#    ifndef alloca /* predefined by HP cc +Olibcalls */
-+char *alloca ();
-+#    endif
-+#   endif
-+#  endif
-+# endif
-+#endif
-+
-+int
-+main ()
-+{
-+char *p = (char *) alloca (1);
-+				    if (p) return 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_func_alloca_works=yes
-+else
-+  ac_cv_func_alloca_works=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
-+$as_echo "$ac_cv_func_alloca_works" >&6; }
-+
-+if test $ac_cv_func_alloca_works = yes; then
-+  
-+$as_echo "@%:@define HAVE_ALLOCA 1" >>confdefs.h
-+
-+else
-+  # The SVR3 libPW and SVR4 libucb both contain incompatible functions
-+# that cause trouble.  Some versions do not even contain alloca or
-+# 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.
-+
-+ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
-+
-+$as_echo "@%:@define C_ALLOCA 1" >>confdefs.h
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5
-+$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
-+if test "${ac_cv_os_cray+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#if defined CRAY && ! defined CRAY2
-+webecray
-+#else
-+wenotbecray
-+#endif
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "webecray" >/dev/null 2>&1; then :
-+  ac_cv_os_cray=yes
-+else
-+  ac_cv_os_cray=no
-+fi
-+rm -f conftest*
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5
-+$as_echo "$ac_cv_os_cray" >&6; }
-+if test $ac_cv_os_cray = yes; then
-+  for ac_func in _getb67 GETB67 getb67; do
-+    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-+  
-+cat >>confdefs.h <<_ACEOF
-+@%:@define CRAY_STACKSEG_END $ac_func
-+_ACEOF
-+
-+    break
-+fi
-+
-+  done
-+fi
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
-+$as_echo_n "checking stack direction for C alloca... " >&6; }
-+if test "${ac_cv_c_stack_direction+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test "$cross_compiling" = yes; then :
-+  ac_cv_c_stack_direction=0
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+$ac_includes_default
-+int
-+find_stack_direction ()
-+{
-+  static char *addr = 0;
-+  auto char dummy;
-+  if (addr == 0)
-+    {
-+      addr = &dummy;
-+      return find_stack_direction ();
-+    }
-+  else
-+    return (&dummy > addr) ? 1 : -1;
-+}
-+
-+int
-+main ()
-+{
-+  return find_stack_direction () < 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+  ac_cv_c_stack_direction=1
-+else
-+  ac_cv_c_stack_direction=-1
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
-+$as_echo "$ac_cv_c_stack_direction" >&6; }
-+cat >>confdefs.h <<_ACEOF
-+@%:@define STACK_DIRECTION $ac_cv_c_stack_direction
-+_ACEOF
-+
-+
-+fi
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
-+$as_echo_n "checking for inline... " >&6; }
-+if test "${ac_cv_c_inline+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_cv_c_inline=no
-+for ac_kw in inline __inline__ __inline; do
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#ifndef __cplusplus
-+typedef int foo_t;
-+static $ac_kw foo_t static_foo () {return 0; }
-+$ac_kw foo_t foo () {return 0; }
-+#endif
-+
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_c_inline=$ac_kw
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  test "$ac_cv_c_inline" != no && break
-+done
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
-+$as_echo "$ac_cv_c_inline" >&6; }
-+
-+case $ac_cv_c_inline in
-+  inline | yes) ;;
-+  *)
-+    case $ac_cv_c_inline in
-+      no) ac_val=;;
-+      *) ac_val=$ac_cv_c_inline;;
-+    esac
-+    cat >>confdefs.h <<_ACEOF
-+#ifndef __cplusplus
-+#define inline $ac_val
-+#endif
-+_ACEOF
-+    ;;
-+esac
-+
-+
-+# VMS doesn't have unlink.
-+for ac_func in unlink remove
-+do :
-+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+@%:@define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+ break
-+fi
-+done
-+
-+
-+# Some systems don't have sbrk().
-+for ac_func in sbrk
-+do :
-+  ac_fn_c_check_func "$LINENO" "sbrk" "ac_cv_func_sbrk"
-+if test "x$ac_cv_func_sbrk" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+@%:@define HAVE_SBRK 1
-+_ACEOF
-+ 
-+fi
-+done
-+
-+
-+# do we need the math library?
-+case "${need_libm}" in
-+yes)
-+  LIBM=
-+case $host in
-+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
-+  # These system don't have libm, or don't need it
-+  ;;
-+*-ncr-sysv4.3*)
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _mwvalidcheckl in -lmw" >&5
-+$as_echo_n "checking for _mwvalidcheckl in -lmw... " >&6; }
-+if test "${ac_cv_lib_mw__mwvalidcheckl+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lmw  $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char _mwvalidcheckl ();
-+int
-+main ()
-+{
-+return _mwvalidcheckl ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_mw__mwvalidcheckl=yes
-+else
-+  ac_cv_lib_mw__mwvalidcheckl=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mw__mwvalidcheckl" >&5
-+$as_echo "$ac_cv_lib_mw__mwvalidcheckl" >&6; }
-+if test "x$ac_cv_lib_mw__mwvalidcheckl" = x""yes; then :
-+  LIBM="-lmw"
-+fi
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
-+$as_echo_n "checking for cos in -lm... " >&6; }
-+if test "${ac_cv_lib_m_cos+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lm  $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char cos ();
-+int
-+main ()
-+{
-+return cos ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_m_cos=yes
-+else
-+  ac_cv_lib_m_cos=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5
-+$as_echo "$ac_cv_lib_m_cos" >&6; }
-+if test "x$ac_cv_lib_m_cos" = x""yes; then :
-+  LIBM="$LIBM -lm"
-+fi
-+
-+  ;;
-+*)
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
-+$as_echo_n "checking for cos in -lm... " >&6; }
-+if test "${ac_cv_lib_m_cos+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lm  $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char cos ();
-+int
-+main ()
-+{
-+return cos ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_m_cos=yes
-+else
-+  ac_cv_lib_m_cos=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5
-+$as_echo "$ac_cv_lib_m_cos" >&6; }
-+if test "x$ac_cv_lib_m_cos" = x""yes; then :
-+  LIBM="-lm"
-+fi
-+
-+  ;;
-+esac
-+
-+
-+  
-+  ;;
-+esac
-+
-+# 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!
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working assert macro" >&5
-+$as_echo_n "checking for working assert macro... " >&6; }
-+if test "${gas_cv_assert_ok+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <assert.h>
-+#include <stdio.h>
-+int
-+main ()
-+{
-+
-+/* check for requoting problems */
-+static int a, b, c, d;
-+static char *s;
-+assert (!strcmp(s, "foo bar baz quux"));
-+/* check for newline handling */
-+assert (a == b
-+        || c == d);
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  gas_cv_assert_ok=yes
-+else
-+  gas_cv_assert_ok=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gas_cv_assert_ok" >&5
-+$as_echo "$gas_cv_assert_ok" >&6; }
-+test $gas_cv_assert_ok = yes || 
-+$as_echo "@%:@define BROKEN_ASSERT 1" >>confdefs.h
-+
-+
-+
-+# On some systems, the system header files may not declare malloc, realloc,
-+# and free.  There are places where gas needs these functions to have been
-+# declared -- such as when taking their addresses.
-+gas_test_headers="
-+#ifdef HAVE_MEMORY_H
-+#include <memory.h>
-+#endif
-+#ifdef HAVE_STRING_H
-+#include <string.h>
-+#else
-+#ifdef HAVE_STRINGS_H
-+#include <strings.h>
-+#endif
-+#endif
-+#ifdef HAVE_STDLIB_H
-+#include <stdlib.h>
-+#endif
-+#ifdef HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+"
-+
-+# Does errno.h declare errno, or do we have to add a separate declaration
-+# for it?
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether declaration is required for errno" >&5
-+$as_echo_n "checking whether declaration is required for errno... " >&6; }
-+if test "${gas_cv_decl_needed_errno+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+#ifdef HAVE_ERRNO_H
-+#include <errno.h>
-+#endif
-+
-+int
-+main ()
-+{
-+
-+typedef int f;
-+f x;
-+x = (f) errno;
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  gas_cv_decl_needed_errno=no
-+else
-+  gas_cv_decl_needed_errno=yes
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gas_cv_decl_needed_errno" >&5
-+$as_echo "$gas_cv_decl_needed_errno" >&6; }
-+if test $gas_cv_decl_needed_errno = yes; then
-+ 
-+$as_echo "@%:@define NEED_DECLARATION_ERRNO 1" >>confdefs.h
-+
-+fi
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a known getopt prototype in unistd.h" >&5
-+$as_echo_n "checking for a known getopt prototype in unistd.h... " >&6; }
-+if test "${gas_cv_decl_getopt_unistd_h+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <unistd.h>
-+int
-+main ()
-+{
-+extern int getopt (int, char *const*, const char *);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  gas_cv_decl_getopt_unistd_h=yes
-+else
-+  gas_cv_decl_getopt_unistd_h=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gas_cv_decl_getopt_unistd_h" >&5
-+$as_echo "$gas_cv_decl_getopt_unistd_h" >&6; }
-+if test $gas_cv_decl_getopt_unistd_h = yes; then
-+  
-+$as_echo "@%:@define HAVE_DECL_GETOPT 1" >>confdefs.h
-+
-+fi
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether declaration is required for environ" >&5
-+$as_echo_n "checking whether declaration is required for environ... " >&6; }
-+if test "${gas_cv_decl_needed_environ+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+$gas_test_headers
-+int
-+main ()
-+{
-+
-+typedef char **f;
-+f x;
-+x = (f) environ;
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  gas_cv_decl_needed_environ=no
-+else
-+  gas_cv_decl_needed_environ=yes
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gas_cv_decl_needed_environ" >&5
-+$as_echo "$gas_cv_decl_needed_environ" >&6; }
-+if test $gas_cv_decl_needed_environ = yes; then
-+ 
-+$as_echo "@%:@define NEED_DECLARATION_ENVIRON 1" >>confdefs.h
-+
-+fi
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether declaration is required for ffs" >&5
-+$as_echo_n "checking whether declaration is required for ffs... " >&6; }
-+if test "${gas_cv_decl_needed_ffs+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+$gas_test_headers
-+int
-+main ()
-+{
-+
-+typedef int (*f)(int);
-+f x;
-+x = (f) ffs;
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  gas_cv_decl_needed_ffs=no
-+else
-+  gas_cv_decl_needed_ffs=yes
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gas_cv_decl_needed_ffs" >&5
-+$as_echo "$gas_cv_decl_needed_ffs" >&6; }
-+if test $gas_cv_decl_needed_ffs = yes; then
-+ 
-+$as_echo "@%:@define NEED_DECLARATION_FFS 1" >>confdefs.h
-+
-+fi
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether declaration is required for free" >&5
-+$as_echo_n "checking whether declaration is required for free... " >&6; }
-+if test "${gas_cv_decl_needed_free+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+$gas_test_headers
-+int
-+main ()
-+{
-+
-+typedef void (*f)();
-+f x;
-+x = (f) free;
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  gas_cv_decl_needed_free=no
-+else
-+  gas_cv_decl_needed_free=yes
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gas_cv_decl_needed_free" >&5
-+$as_echo "$gas_cv_decl_needed_free" >&6; }
-+if test $gas_cv_decl_needed_free = yes; then
-+ 
-+$as_echo "@%:@define NEED_DECLARATION_FREE 1" >>confdefs.h
-+
-+fi
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether declaration is required for malloc" >&5
-+$as_echo_n "checking whether declaration is required for malloc... " >&6; }
-+if test "${gas_cv_decl_needed_malloc+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+$gas_test_headers
-+int
-+main ()
-+{
-+
-+typedef char *(*f)();
-+f x;
-+x = (f) malloc;
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  gas_cv_decl_needed_malloc=no
-+else
-+  gas_cv_decl_needed_malloc=yes
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gas_cv_decl_needed_malloc" >&5
-+$as_echo "$gas_cv_decl_needed_malloc" >&6; }
-+if test $gas_cv_decl_needed_malloc = yes; then
-+ 
-+$as_echo "@%:@define NEED_DECLARATION_MALLOC 1" >>confdefs.h
-+
-+fi
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether declaration is required for sbrk" >&5
-+$as_echo_n "checking whether declaration is required for sbrk... " >&6; }
-+if test "${gas_cv_decl_needed_sbrk+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+$gas_test_headers
-+int
-+main ()
-+{
-+
-+typedef char *(*f)();
-+f x;
-+x = (f) sbrk;
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  gas_cv_decl_needed_sbrk=no
-+else
-+  gas_cv_decl_needed_sbrk=yes
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gas_cv_decl_needed_sbrk" >&5
-+$as_echo "$gas_cv_decl_needed_sbrk" >&6; }
-+if test $gas_cv_decl_needed_sbrk = yes; then
-+ 
-+$as_echo "@%:@define NEED_DECLARATION_SBRK 1" >>confdefs.h
-+
-+fi
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether declaration is required for strstr" >&5
-+$as_echo_n "checking whether declaration is required for strstr... " >&6; }
-+if test "${gas_cv_decl_needed_strstr+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+$gas_test_headers
-+int
-+main ()
-+{
-+
-+typedef char *(*f)();
-+f x;
-+x = (f) strstr;
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  gas_cv_decl_needed_strstr=no
-+else
-+  gas_cv_decl_needed_strstr=yes
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gas_cv_decl_needed_strstr" >&5
-+$as_echo "$gas_cv_decl_needed_strstr" >&6; }
-+if test $gas_cv_decl_needed_strstr = yes; then
-+ 
-+$as_echo "@%:@define NEED_DECLARATION_STRSTR 1" >>confdefs.h
-+
-+fi
-+
-+
-+ac_fn_c_check_decl "$LINENO" "mempcpy" "ac_cv_have_decl_mempcpy" "$ac_includes_default"
-+if test "x$ac_cv_have_decl_mempcpy" = x""yes; then :
-+  ac_have_decl=1
-+else
-+  ac_have_decl=0
-+fi
-+
-+cat >>confdefs.h <<_ACEOF
-+@%:@define HAVE_DECL_MEMPCPY $ac_have_decl
-+_ACEOF
-+
-+ac_fn_c_check_decl "$LINENO" "vsnprintf" "ac_cv_have_decl_vsnprintf" "$ac_includes_default"
-+if test "x$ac_cv_have_decl_vsnprintf" = x""yes; then :
-+  ac_have_decl=1
-+else
-+  ac_have_decl=0
-+fi
-+
-+cat >>confdefs.h <<_ACEOF
-+@%:@define HAVE_DECL_VSNPRINTF $ac_have_decl
-+_ACEOF
-+
-+
-+
-+case "${host}" in
-+*-*-msdos* | *-*-go32* | *-*-mingw32* | *-*-cygwin* | *-*-windows*)
-+  
-+$as_echo "@%:@define USE_BINARY_FOPEN 1" >>confdefs.h
-+ ;;
-+esac
-+
-+# Link in zlib if we can.  This allows us to write compressed debug sections.
-+
-+  # See if the user specified whether he wants zlib support or not.
-+  
-+@%:@ Check whether --with-zlib was given.
-+if test "${with_zlib+set}" = set; then :
-+  withval=$with_zlib; 
-+else
-+  with_zlib=auto
-+fi
-+
-+
-+  if test "$with_zlib" != "no"; then
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing zlibVersion" >&5
-+$as_echo_n "checking for library containing zlibVersion... " >&6; }
-+if test "${ac_cv_search_zlibVersion+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_func_search_save_LIBS=$LIBS
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char zlibVersion ();
-+int
-+main ()
-+{
-+return zlibVersion ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+for ac_lib in '' z; do
-+  if test -z "$ac_lib"; then
-+    ac_res="none required"
-+  else
-+    ac_res=-l$ac_lib
-+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-+  fi
-+  if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_search_zlibVersion=$ac_res
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext
-+  if test "${ac_cv_search_zlibVersion+set}" = set; then :
-+  break
-+fi
-+done
-+if test "${ac_cv_search_zlibVersion+set}" = set; then :
-+  
-+else
-+  ac_cv_search_zlibVersion=no
-+fi
-+rm conftest.$ac_ext
-+LIBS=$ac_func_search_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_zlibVersion" >&5
-+$as_echo "$ac_cv_search_zlibVersion" >&6; }
-+ac_res=$ac_cv_search_zlibVersion
-+if test "$ac_res" != no; then :
-+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-+  for ac_header in zlib.h
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
-+if test "x$ac_cv_header_zlib_h" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+@%:@define HAVE_ZLIB_H 1
-+_ACEOF
-+ 
-+fi
-+
-+done
-+
-+fi
-+
-+    if test "$with_zlib" = "yes" -a "$ac_cv_header_zlib_h" != "yes"; then
-+      as_fn_error "zlib (libz) library was explicitly requested but not found" "$LINENO" 5
-+    fi
-+  fi
-+
-+
-+# Support for VMS timestamps via cross compile
-+
-+if test "$ac_cv_header_time_h" = yes; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct tm.tm_gmtoff in time.h" >&5
-+$as_echo_n "checking for struct tm.tm_gmtoff in time.h... " >&6; }
-+ if test "${gas_cv_have_time_type_member_tm_gmtoff+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+#define _BSD_SOURCE 1
-+#include <time.h>
-+int
-+main ()
-+{
-+struct tm avar; void* aref = (void*) &avar.tm_gmtoff
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  gas_cv_have_time_type_member_tm_gmtoff=yes
-+else
-+  gas_cv_have_time_type_member_tm_gmtoff=no
-+   
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+ if test $gas_cv_have_time_type_member_tm_gmtoff = yes; then
-+   
-+$as_echo "@%:@define HAVE_TM_GMTOFF 1" >>confdefs.h
-+
-+ fi
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gas_cv_have_time_type_member_tm_gmtoff" >&5
-+$as_echo "$gas_cv_have_time_type_member_tm_gmtoff" >&6; }
-+
-+fi
-+
-+if test "$ac_cv_header_sys_stat_h" = yes; then
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct stat.st_mtim.tv_sec in sys/stat.h" >&5
-+$as_echo_n "checking for struct stat.st_mtim.tv_sec in sys/stat.h... " >&6; }
-+ if test "${gas_cv_have_sys_stat_type_member_st_mtim_tv_sec+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+#define _BSD_SOURCE 1
-+#include <sys/stat.h>
-+int
-+main ()
-+{
-+struct stat avar; void* aref = (void*) &avar.st_mtim.tv_sec
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  gas_cv_have_sys_stat_type_member_st_mtim_tv_sec=yes
-+else
-+  gas_cv_have_sys_stat_type_member_st_mtim_tv_sec=no
-+   
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+ if test $gas_cv_have_sys_stat_type_member_st_mtim_tv_sec = yes; then
-+   
-+$as_echo "@%:@define HAVE_ST_MTIM_TV_SEC 1" >>confdefs.h
-+
-+ fi
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gas_cv_have_sys_stat_type_member_st_mtim_tv_sec" >&5
-+$as_echo "$gas_cv_have_sys_stat_type_member_st_mtim_tv_sec" >&6; }
-+
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct stat.st_mtim.tv_nsec in sys/stat.h" >&5
-+$as_echo_n "checking for struct stat.st_mtim.tv_nsec in sys/stat.h... " >&6; }
-+ if test "${gas_cv_have_sys_stat_type_member_st_mtim_tv_nsec+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+#define _BSD_SOURCE 1
-+#include <sys/stat.h>
-+int
-+main ()
-+{
-+struct stat avar; void* aref = (void*) &avar.st_mtim.tv_nsec
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  gas_cv_have_sys_stat_type_member_st_mtim_tv_nsec=yes
-+else
-+  gas_cv_have_sys_stat_type_member_st_mtim_tv_nsec=no
-+   
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+ if test $gas_cv_have_sys_stat_type_member_st_mtim_tv_nsec = yes; then
-+   
-+$as_echo "@%:@define HAVE_ST_MTIM_TV_NSEC 1" >>confdefs.h
-+
-+ fi
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gas_cv_have_sys_stat_type_member_st_mtim_tv_nsec" >&5
-+$as_echo "$gas_cv_have_sys_stat_type_member_st_mtim_tv_nsec" >&6; }
-+
-+fi
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+ac_config_files="$ac_config_files Makefile doc/Makefile po/Makefile.in:po/Make-in"
-+
-+ac_config_commands="$ac_config_commands default"
-+
-+
-+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
-+# scripts and configure runs, see configure's option --config-cache.
-+# It is not useful on other systems.  If it contains results you don't
-+# want to keep, you may remove or edit it.
-+#
-+# config.status only pays attention to the cache file if you give it
-+# the --recheck option to rerun configure.
-+#
-+# `ac_cv_env_foo' variables (set or unset) will be overridden when
-+# loading this file, other *unset* `ac_cv_foo' will be assigned the
-+# following values.
-+
-+_ACEOF
-+
-+# The following way of writing the cache mishandles newlines in values,
-+# but we know of no workaround that is simple, portable, and efficient.
-+# So, we kill variables containing newlines.
-+# Ultrix sh set writes to stderr and can't be redirected directly,
-+# and sets the high bit in the cache file unless we assign to the vars.
-+(
-+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-+    eval ac_val=\$$ac_var
-+    case $ac_val in #(
-+    *${as_nl}*)
-+      case $ac_var in #(
-+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-+      esac
-+      case $ac_var in #(
-+      _ | IFS | as_nl) ;; #(
-+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-+      *) { eval $ac_var=; unset $ac_var;} ;;
-+      esac ;;
-+    esac
-+  done
-+
-+  (set) 2>&1 |
-+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-+    *${as_nl}ac_space=\ *)
-+      # `set' does not quote correctly, so add quotes: double-quote
-+      # substitution turns \\\\ into \\, and sed turns \\ into \.
-+      sed -n \
-+	"s/'/'\\\\''/g;
-+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-+      ;; #(
-+    *)
-+      # `set' quotes correctly as required by POSIX, so do not add quotes.
-+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-+      ;;
-+    esac |
-+    sort
-+) |
-+  sed '
-+     /^ac_cv_env_/b end
-+     t clear
-+     :clear
-+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-+     t end
-+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-+     :end' >>confcache
-+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-+  if test -w "$cache_file"; then
-+    test "x$cache_file" != "x/dev/null" &&
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-+$as_echo "$as_me: updating cache $cache_file" >&6;}
-+    cat confcache >$cache_file
-+  else
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-+  fi
-+fi
-+rm -f confcache
-+
-+test "x$prefix" = xNONE && prefix=$ac_default_prefix
-+# Let make expand exec_prefix.
-+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-+
-+DEFS=-DHAVE_CONFIG_H
-+
-+ac_libobjs=
-+ac_ltlibobjs=
-+for ac_i in : $LIB@&t@OBJS; do test "x$ac_i" = x: && continue
-+  # 1. Remove the extension, and $U if already installed.
-+  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
-+  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
-+  #    will be set to the directory where LIBOBJS objects are built.
-+  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-+  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
-+done
-+LIB@&t@OBJS=$ac_libobjs
-+
-+LTLIBOBJS=$ac_ltlibobjs
-+
-+
-+if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-+  as_fn_error "conditional \"AMDEP\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
-+fi
-+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-+  as_fn_error "conditional \"am__fastdepCC\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
-+fi
-+ if test -n "$EXEEXT"; then
-+  am__EXEEXT_TRUE=
-+  am__EXEEXT_FALSE='#'
-+else
-+  am__EXEEXT_TRUE='#'
-+  am__EXEEXT_FALSE=
-+fi
-+
-+
-+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-+  as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
-+fi
-+if test -z "${GENINSRC_NEVER_TRUE}" && test -z "${GENINSRC_NEVER_FALSE}"; then
-+  as_fn_error "conditional \"GENINSRC_NEVER\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
-+fi
-+
-+: ${CONFIG_STATUS=./config.status}
-+ac_write_fail=0
-+ac_clean_files_save=$ac_clean_files
-+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-+as_write_fail=0
-+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
-+#! $SHELL
-+# Generated by $as_me.
-+# Run this file to recreate the current configuration.
-+# Compiler output produced by configure, useful for debugging
-+# configure, is in config.log if it exists.
-+
-+debug=false
-+ac_cs_recheck=false
-+ac_cs_silent=false
-+
-+SHELL=\${CONFIG_SHELL-$SHELL}
-+export SHELL
-+_ASEOF
-+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
-+## -------------------- ##
-+## M4sh Initialization. ##
-+## -------------------- ##
-+
-+# Be more Bourne compatible
-+DUALCASE=1; export DUALCASE # for MKS sh
-+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-+  emulate sh
-+  NULLCMD=:
-+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-+  # is contrary to our usage.  Disable this feature.
-+  alias -g '${1+"$@"}'='"$@"'
-+  setopt NO_GLOB_SUBST
-+else
-+  case `(set -o) 2>/dev/null` in @%:@(
-+  *posix*) :
-+    set -o posix ;; @%:@(
-+  *) :
-+     ;;
-+esac
-+fi
-+
-+
-+as_nl='
-+'
-+export as_nl
-+# Printing a long string crashes Solaris 7 /usr/bin/printf.
-+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-+# Prefer a ksh shell builtin over an external printf program on Solaris,
-+# but without wasting forks for bash or zsh.
-+if test -z "$BASH_VERSION$ZSH_VERSION" \
-+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-+  as_echo='print -r --'
-+  as_echo_n='print -rn --'
-+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-+  as_echo='printf %s\n'
-+  as_echo_n='printf %s'
-+else
-+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-+    as_echo_n='/usr/ucb/echo -n'
-+  else
-+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-+    as_echo_n_body='eval
-+      arg=$1;
-+      case $arg in @%:@(
-+      *"$as_nl"*)
-+	expr "X$arg" : "X\\(.*\\)$as_nl";
-+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-+      esac;
-+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-+    '
-+    export as_echo_n_body
-+    as_echo_n='sh -c $as_echo_n_body as_echo'
-+  fi
-+  export as_echo_body
-+  as_echo='sh -c $as_echo_body as_echo'
-+fi
-+
-+# The user is always right.
-+if test "${PATH_SEPARATOR+set}" != set; then
-+  PATH_SEPARATOR=:
-+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-+      PATH_SEPARATOR=';'
-+  }
-+fi
-+
-+
-+# IFS
-+# We need space, tab and new line, in precisely that order.  Quoting is
-+# there to prevent editors from complaining about space-tab.
-+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-+# splitting by setting IFS to empty value.)
-+IFS=" ""	$as_nl"
-+
-+# Find who we are.  Look in the path if we contain no directory separator.
-+case $0 in @%:@((
-+  *[\\/]* ) as_myself=$0 ;;
-+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-+  done
-+IFS=$as_save_IFS
-+
-+     ;;
-+esac
-+# We did not find ourselves, most probably we were run as `sh COMMAND'
-+# in which case we are not to be found in the path.
-+if test "x$as_myself" = x; then
-+  as_myself=$0
-+fi
-+if test ! -f "$as_myself"; then
-+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-+  exit 1
-+fi
-+
-+# Unset variables that we do not need and which cause bugs (e.g. in
-+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-+# suppresses any "Segmentation fault" message there.  '((' could
-+# trigger a bug in pdksh 5.2.14.
-+for as_var in BASH_ENV ENV MAIL MAILPATH
-+do eval test x\${$as_var+set} = xset \
-+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-+done
-+PS1='$ '
-+PS2='> '
-+PS4='+ '
-+
-+# NLS nuisances.
-+LC_ALL=C
-+export LC_ALL
-+LANGUAGE=C
-+export LANGUAGE
-+
-+# CDPATH.
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-+
-+
-+@%:@ as_fn_error ERROR [LINENO LOG_FD]
-+@%:@ ---------------------------------
-+@%:@ Output "`basename @S|@0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-+@%:@ provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-+@%:@ script with status $?, using 1 if that was 0.
-+as_fn_error ()
-+{
-+  as_status=$?; test $as_status -eq 0 && as_status=1
-+  if test "$3"; then
-+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
-+  fi
-+  $as_echo "$as_me: error: $1" >&2
-+  as_fn_exit $as_status
-+} @%:@ as_fn_error
-+
-+
-+@%:@ as_fn_set_status STATUS
-+@%:@ -----------------------
-+@%:@ Set $? to STATUS, without forking.
-+as_fn_set_status ()
-+{
-+  return $1
-+} @%:@ as_fn_set_status
-+
-+@%:@ as_fn_exit STATUS
-+@%:@ -----------------
-+@%:@ Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-+as_fn_exit ()
-+{
-+  set +e
-+  as_fn_set_status $1
-+  exit $1
-+} @%:@ as_fn_exit
-+
-+@%:@ as_fn_unset VAR
-+@%:@ ---------------
-+@%:@ Portably unset VAR.
-+as_fn_unset ()
-+{
-+  { eval $1=; unset $1;}
-+}
-+as_unset=as_fn_unset
-+@%:@ as_fn_append VAR VALUE
-+@%:@ ----------------------
-+@%:@ Append the text in VALUE to the end of the definition contained in VAR. Take
-+@%:@ advantage of any shell optimizations that allow amortized linear growth over
-+@%:@ repeated appends, instead of the typical quadratic growth present in naive
-+@%:@ implementations.
-+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-+  eval 'as_fn_append ()
-+  {
-+    eval $1+=\$2
-+  }'
-+else
-+  as_fn_append ()
-+  {
-+    eval $1=\$$1\$2
-+  }
-+fi # as_fn_append
-+
-+@%:@ as_fn_arith ARG...
-+@%:@ ------------------
-+@%:@ Perform arithmetic evaluation on the ARGs, and store the result in the
-+@%:@ global $as_val. Take advantage of shells that can avoid forks. The arguments
-+@%:@ must be portable across $(()) and expr.
-+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-+  eval 'as_fn_arith ()
-+  {
-+    as_val=$(( $* ))
-+  }'
-+else
-+  as_fn_arith ()
-+  {
-+    as_val=`expr "$@" || test $? -eq 1`
-+  }
-+fi # as_fn_arith
-+
-+
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-+  as_expr=expr
-+else
-+  as_expr=false
-+fi
-+
-+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-+  as_basename=basename
-+else
-+  as_basename=false
-+fi
-+
-+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-+  as_dirname=dirname
-+else
-+  as_dirname=false
-+fi
-+
-+as_me=`$as_basename -- "$0" ||
-+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-+	 X"$0" : 'X\(//\)$' \| \
-+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-+$as_echo X/"$0" |
-+    sed '/^.*\/\([^/][^/]*\)\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\/\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\/\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-+
-+# Avoid depending upon Character Ranges.
-+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-+as_cr_digits='0123456789'
-+as_cr_alnum=$as_cr_Letters$as_cr_digits
-+
-+ECHO_C= ECHO_N= ECHO_T=
-+case `echo -n x` in @%:@(((((
-+-n*)
-+  case `echo 'xy\c'` in
-+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-+  xy)  ECHO_C='\c';;
-+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-+       ECHO_T='	';;
-+  esac;;
-+*)
-+  ECHO_N='-n';;
-+esac
-+
-+rm -f conf$$ conf$$.exe conf$$.file
-+if test -d conf$$.dir; then
-+  rm -f conf$$.dir/conf$$.file
-+else
-+  rm -f conf$$.dir
-+  mkdir conf$$.dir 2>/dev/null
-+fi
-+if (echo >conf$$.file) 2>/dev/null; then
-+  if ln -s conf$$.file conf$$ 2>/dev/null; then
-+    as_ln_s='ln -s'
-+    # ... but there are two gotchas:
-+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-+    # In both cases, we have to default to `cp -p'.
-+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-+      as_ln_s='cp -p'
-+  elif ln conf$$.file conf$$ 2>/dev/null; then
-+    as_ln_s=ln
-+  else
-+    as_ln_s='cp -p'
-+  fi
-+else
-+  as_ln_s='cp -p'
-+fi
-+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-+rmdir conf$$.dir 2>/dev/null
-+
-+
-+@%:@ as_fn_mkdir_p
-+@%:@ -------------
-+@%:@ Create "$as_dir" as a directory, including parents if necessary.
-+as_fn_mkdir_p ()
-+{
-+
-+  case $as_dir in #(
-+  -*) as_dir=./$as_dir;;
-+  esac
-+  test -d "$as_dir" || eval $as_mkdir_p || {
-+    as_dirs=
-+    while :; do
-+      case $as_dir in #(
-+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-+      *) as_qdir=$as_dir;;
-+      esac
-+      as_dirs="'$as_qdir' $as_dirs"
-+      as_dir=`$as_dirname -- "$as_dir" ||
-+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$as_dir" : 'X\(//\)[^/]' \| \
-+	 X"$as_dir" : 'X\(//\)$' \| \
-+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-+$as_echo X"$as_dir" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-+      test -d "$as_dir" && break
-+    done
-+    test -z "$as_dirs" || eval "mkdir $as_dirs"
-+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
-+
-+
-+} @%:@ as_fn_mkdir_p
-+if mkdir -p . 2>/dev/null; then
-+  as_mkdir_p='mkdir -p "$as_dir"'
-+else
-+  test -d ./-p && rmdir ./-p
-+  as_mkdir_p=false
-+fi
-+
-+if test -x / >/dev/null 2>&1; then
-+  as_test_x='test -x'
-+else
-+  if ls -dL / >/dev/null 2>&1; then
-+    as_ls_L_option=L
-+  else
-+    as_ls_L_option=
-+  fi
-+  as_test_x='
-+    eval sh -c '\''
-+      if test -d "$1"; then
-+	test -d "$1/.";
-+      else
-+	case $1 in @%:@(
-+	-*)set "./$1";;
-+	esac;
-+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in @%:@((
-+	???[sx]*):;;*)false;;esac;fi
-+    '\'' sh
-+  '
-+fi
-+as_executable_p=$as_test_x
-+
-+# 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'"
-+
-+# Sed expression to map a string onto a valid variable name.
-+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-+
-+
-+exec 6>&1
-+## ----------------------------------- ##
-+## Main body of $CONFIG_STATUS script. ##
-+## ----------------------------------- ##
-+_ASEOF
-+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+# Save the log message, to keep $0 and so on meaningful, and to
-+# report actual input values of CONFIG_FILES etc. instead of their
-+# values after options handling.
-+ac_log="
-+This file was extended by $as_me, which was
-+generated by GNU Autoconf 2.64.  Invocation command line was
-+
-+  CONFIG_FILES    = $CONFIG_FILES
-+  CONFIG_HEADERS  = $CONFIG_HEADERS
-+  CONFIG_LINKS    = $CONFIG_LINKS
-+  CONFIG_COMMANDS = $CONFIG_COMMANDS
-+  $ $0 $@
-+
-+on `(hostname || uname -n) 2>/dev/null | sed 1q`
-+"
-+
-+_ACEOF
-+
-+case $ac_config_files in *"
-+"*) set x $ac_config_files; shift; ac_config_files=$*;;
-+esac
-+
-+case $ac_config_headers in *"
-+"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
-+esac
-+
-+
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+# Files that config.status was made for.
-+config_files="$ac_config_files"
-+config_headers="$ac_config_headers"
-+config_commands="$ac_config_commands"
-+
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+ac_cs_usage="\
-+\`$as_me' instantiates files and other configuration actions
-+from templates according to the current configuration.  Unless the files
-+and actions are specified as TAGs, all are instantiated by default.
-+
-+Usage: $0 [OPTION]... [TAG]...
-+
-+  -h, --help       print this help, then exit
-+  -V, --version    print version number and configuration settings, then exit
-+  -q, --quiet, --silent
-+                   do not print progress messages
-+  -d, --debug      don't remove temporary files
-+      --recheck    update $as_me by reconfiguring in the same conditions
-+      --file=FILE[:TEMPLATE] 
-+                   instantiate the configuration file FILE
-+      --header=FILE[:TEMPLATE] 
-+                   instantiate the configuration header FILE
-+
-+Configuration files:
-+$config_files
-+
-+Configuration headers:
-+$config_headers
-+
-+Configuration commands:
-+$config_commands
-+
-+Report bugs to the package provider."
-+
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+ac_cs_version="\\
-+config.status
-+configured by $0, generated by GNU Autoconf 2.64,
-+  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-+
-+Copyright (C) 2009 Free Software Foundation, Inc.
-+This config.status script is free software; the Free Software Foundation
-+gives unlimited permission to copy, distribute and modify it."
-+
-+ac_pwd='$ac_pwd'
-+srcdir='$srcdir'
-+INSTALL='$INSTALL'
-+MKDIR_P='$MKDIR_P'
-+AWK='$AWK'
-+test -n "\$AWK" || AWK=awk
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+# The default lists apply if the user does not specify any file.
-+ac_need_defaults=:
-+while test $# != 0
-+do
-+  case $1 in
-+  --*=*)
-+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-+    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-+    ac_shift=:
-+    ;;
-+  *)
-+    ac_option=$1
-+    ac_optarg=$2
-+    ac_shift=shift
-+    ;;
-+  esac
-+
-+  case $ac_option in
-+  # Handling of the options.
-+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-+    ac_cs_recheck=: ;;
-+  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-+    $as_echo "$ac_cs_version"; exit ;;
-+  --debug | --debu | --deb | --de | --d | -d )
-+    debug=: ;;
-+  --file | --fil | --fi | --f )
-+    $ac_shift
-+    case $ac_optarg in
-+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-+    esac
-+    as_fn_append CONFIG_FILES " '$ac_optarg'"
-+    ac_need_defaults=false;;
-+  --header | --heade | --head | --hea )
-+    $ac_shift
-+    case $ac_optarg in
-+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-+    esac
-+    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
-+    ac_need_defaults=false;;
-+  --he | --h)
-+    # Conflict between --help and --header
-+    as_fn_error "ambiguous option: \`$1'
-+Try \`$0 --help' for more information.";;
-+  --help | --hel | -h )
-+    $as_echo "$ac_cs_usage"; exit ;;
-+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-+  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-+    ac_cs_silent=: ;;
-+
-+  # This is an error.
-+  -*) as_fn_error "unrecognized option: \`$1'
-+Try \`$0 --help' for more information." ;;
-+
-+  *) as_fn_append ac_config_targets " $1"
-+     ac_need_defaults=false ;;
-+
-+  esac
-+  shift
-+done
-+
-+ac_configure_extra_args=
-+
-+if $ac_cs_silent; then
-+  exec 6>/dev/null
-+  ac_configure_extra_args="$ac_configure_extra_args --silent"
-+fi
-+
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+if \$ac_cs_recheck; then
-+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-+  shift
-+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
-+  CONFIG_SHELL='$SHELL'
-+  export CONFIG_SHELL
-+  exec "\$@"
-+fi
-+
-+_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+exec 5>>config.log
-+{
-+  echo
-+  sed 'h;s/./-/g;s/^.../@%:@@%:@ /;s/...$/ @%:@@%:@/;p;x;p;x' <<_ASBOX
-+@%:@@%:@ Running $as_me. @%:@@%:@
-+_ASBOX
-+  $as_echo "$ac_log"
-+} >&5
-+
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+#
-+# INIT-COMMANDS
-+#
-+AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
-+
-+
-+# The HP-UX ksh and POSIX shell print the target directory to stdout
-+# if CDPATH is set.
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-+
-+sed_quote_subst='$sed_quote_subst'
-+double_quote_subst='$double_quote_subst'
-+delay_variable_subst='$delay_variable_subst'
-+macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
-+macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
-+enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
-+enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
-+pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
-+enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
-+SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
-+ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
-+host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
-+host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
-+host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
-+build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
-+build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
-+build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
-+SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
-+Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
-+GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
-+EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
-+FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
-+LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
-+NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
-+LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
-+max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
-+ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
-+exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
-+lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
-+lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
-+lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
-+reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
-+reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
-+OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
-+deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
-+file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
-+AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
-+AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
-+STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
-+RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
-+old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
-+old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
-+old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
-+lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
-+CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
-+CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
-+compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
-+GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
-+lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
-+lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
-+lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
-+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
-+objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
-+MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
-+lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
-+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
-+lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
-+lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
-+lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
-+need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
-+DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
-+NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
-+LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
-+OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
-+OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
-+libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
-+shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
-+extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
-+archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
-+enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
-+export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
-+whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
-+compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
-+old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
-+old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
-+archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
-+archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
-+module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
-+module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
-+with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
-+allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
-+no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
-+hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
-+hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
-+hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
-+hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
-+hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
-+hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
-+hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
-+hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
-+inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
-+link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
-+fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
-+always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
-+export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
-+exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
-+include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
-+prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
-+file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
-+variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
-+need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
-+need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
-+version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
-+runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
-+shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
-+shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
-+libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
-+library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
-+soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
-+install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
-+postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
-+postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
-+finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
-+finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
-+hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
-+sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
-+sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
-+hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
-+enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
-+enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
-+enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
-+old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
-+striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
-+
-+LTCC='$LTCC'
-+LTCFLAGS='$LTCFLAGS'
-+compiler='$compiler_DEFAULT'
-+
-+# A function that is used when there is no print builtin or printf.
-+func_fallback_echo ()
-+{
-+  eval 'cat <<_LTECHO_EOF
-+\$1
-+_LTECHO_EOF'
-+}
-+
-+# Quote evaled strings.
-+for var in SHELL \
-+ECHO \
-+SED \
-+GREP \
-+EGREP \
-+FGREP \
-+LD \
-+NM \
-+LN_S \
-+lt_SP2NL \
-+lt_NL2SP \
-+reload_flag \
-+OBJDUMP \
-+deplibs_check_method \
-+file_magic_cmd \
-+AR \
-+AR_FLAGS \
-+STRIP \
-+RANLIB \
-+CC \
-+CFLAGS \
-+compiler \
-+lt_cv_sys_global_symbol_pipe \
-+lt_cv_sys_global_symbol_to_cdecl \
-+lt_cv_sys_global_symbol_to_c_name_address \
-+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
-+lt_prog_compiler_no_builtin_flag \
-+lt_prog_compiler_wl \
-+lt_prog_compiler_pic \
-+lt_prog_compiler_static \
-+lt_cv_prog_compiler_c_o \
-+need_locks \
-+DSYMUTIL \
-+NMEDIT \
-+LIPO \
-+OTOOL \
-+OTOOL64 \
-+shrext_cmds \
-+export_dynamic_flag_spec \
-+whole_archive_flag_spec \
-+compiler_needs_object \
-+with_gnu_ld \
-+allow_undefined_flag \
-+no_undefined_flag \
-+hardcode_libdir_flag_spec \
-+hardcode_libdir_flag_spec_ld \
-+hardcode_libdir_separator \
-+fix_srcfile_path \
-+exclude_expsyms \
-+include_expsyms \
-+file_list_spec \
-+variables_saved_for_relink \
-+libname_spec \
-+library_names_spec \
-+soname_spec \
-+install_override_mode \
-+finish_eval \
-+old_striplib \
-+striplib; do
-+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-+    *[\\\\\\\`\\"\\\$]*)
-+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
-+      ;;
-+    *)
-+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-+      ;;
-+    esac
-+done
-+
-+# Double-quote double-evaled strings.
-+for var in reload_cmds \
-+old_postinstall_cmds \
-+old_postuninstall_cmds \
-+old_archive_cmds \
-+extract_expsyms_cmds \
-+old_archive_from_new_cmds \
-+old_archive_from_expsyms_cmds \
-+archive_cmds \
-+archive_expsym_cmds \
-+module_cmds \
-+module_expsym_cmds \
-+export_symbols_cmds \
-+prelink_cmds \
-+postinstall_cmds \
-+postuninstall_cmds \
-+finish_cmds \
-+sys_lib_search_path_spec \
-+sys_lib_dlsearch_path_spec; do
-+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-+    *[\\\\\\\`\\"\\\$]*)
-+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
-+      ;;
-+    *)
-+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-+      ;;
-+    esac
-+done
-+
-+ac_aux_dir='$ac_aux_dir'
-+xsi_shell='$xsi_shell'
-+lt_shell_append='$lt_shell_append'
-+
-+# See if we are running on zsh, and set the options which allow our
-+# commands through without removal of \ escapes INIT.
-+if test -n "\${ZSH_VERSION+set}" ; then
-+   setopt NO_GLOB_SUBST
-+fi
-+
-+
-+    PACKAGE='$PACKAGE'
-+    VERSION='$VERSION'
-+    TIMESTAMP='$TIMESTAMP'
-+    RM='$RM'
-+    ofile='$ofile'
-+
-+
-+
-+# Capture the value of obsolete ALL_LINGUAS because we need it to compute
-+    # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it
-+    # from automake.
-+    eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
-+    # Capture the value of LINGUAS because we need it to compute CATALOGS.
-+    LINGUAS="${LINGUAS-%UNSET%}"
-+   
-+target_cpu_type=${target_cpu_type}
-+ cgen_cpu_prefix=${cgen_cpu_prefix}
-+ obj_format=${obj_format}
-+ te_file=${te_file}
-+
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+
-+# Handling of arguments.
-+for ac_config_target in $ac_config_targets
-+do
-+  case $ac_config_target in
-+    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-+    "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
-+    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.in" ;;
-+    "gdb.ini") CONFIG_FILES="$CONFIG_FILES gdb.ini:gdbinit.in" ;;
-+    ".gdbinit") CONFIG_FILES="$CONFIG_FILES .gdbinit:gdbinit.in" ;;
-+    "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
-+    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-+    "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
-+    "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in:po/Make-in" ;;
-+    "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
-+
-+  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
-+  esac
-+done
-+
-+
-+# 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
-+# bizarre bug on SunOS 4.1.3.
-+if $ac_need_defaults; then
-+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-+  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-+  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
-+fi
-+
-+# Have a temporary directory for convenience.  Make it in the build tree
-+# simply because there is no reason against having it here, and in addition,
-+# creating and moving files from /tmp can sometimes cause problems.
-+# Hook for its removal unless debugging.
-+# Note that there is a small window in which the directory will not be cleaned:
-+# after its creation but before its name has been assigned to `$tmp'.
-+$debug ||
-+{
-+  tmp=
-+  trap 'exit_status=$?
-+  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
-+' 0
-+  trap 'as_fn_exit 1' 1 2 13 15
-+}
-+# Create a (secure) tmp directory for tmp files.
-+
-+{
-+  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-+  test -n "$tmp" && test -d "$tmp"
-+}  ||
-+{
-+  tmp=./conf$$-$RANDOM
-+  (umask 077 && mkdir "$tmp")
-+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
-+
-+# Set up the scripts for CONFIG_FILES section.
-+# No need to generate them if there are no CONFIG_FILES.
-+# This happens for instance with `./config.status config.h'.
-+if test -n "$CONFIG_FILES"; then
-+
-+
-+ac_cr=`echo X | tr X '\015'`
-+# On cygwin, bash can eat \r inside `` if the user requested igncr.
-+# But we know of no other shell where ac_cr would be empty at this
-+# point, so we can use a bashism as a fallback.
-+if test "x$ac_cr" = x; then
-+  eval ac_cr=\$\'\\r\'
-+fi
-+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
-+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-+  ac_cs_awk_cr='\r'
-+else
-+  ac_cs_awk_cr=$ac_cr
-+fi
-+
-+echo 'BEGIN {' >"$tmp/subs1.awk" &&
-+_ACEOF
-+
-+
-+{
-+  echo "cat >conf$$subs.awk <<_ACEOF" &&
-+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
-+  echo "_ACEOF"
-+} >conf$$subs.sh ||
-+  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
-+ac_delim='%!_!# '
-+for ac_last_try in false false false false false :; do
-+  . ./conf$$subs.sh ||
-+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-+
-+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
-+  if test $ac_delim_n = $ac_delim_num; then
-+    break
-+  elif $ac_last_try; then
-+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-+  else
-+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-+  fi
-+done
-+rm -f conf$$subs.sh
-+
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
-+_ACEOF
-+sed -n '
-+h
-+s/^/S["/; s/!.*/"]=/
-+p
-+g
-+s/^[^!]*!//
-+:repl
-+t repl
-+s/'"$ac_delim"'$//
-+t delim
-+:nl
-+h
-+s/\(.\{148\}\).*/\1/
-+t more1
-+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
-+p
-+n
-+b repl
-+:more1
-+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-+p
-+g
-+s/.\{148\}//
-+t nl
-+:delim
-+h
-+s/\(.\{148\}\).*/\1/
-+t more2
-+s/["\\]/\\&/g; s/^/"/; s/$/"/
-+p
-+b
-+:more2
-+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-+p
-+g
-+s/.\{148\}//
-+t delim
-+' <conf$$subs.awk | sed '
-+/^[^""]/{
-+  N
-+  s/\n//
-+}
-+' >>$CONFIG_STATUS || ac_write_fail=1
-+rm -f conf$$subs.awk
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+_ACAWK
-+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
-+  for (key in S) S_is_set[key] = 1
-+  FS = ""
-+
-+}
-+{
-+  line = $ 0
-+  nfields = split(line, field, "@")
-+  substed = 0
-+  len = length(field[1])
-+  for (i = 2; i < nfields; i++) {
-+    key = field[i]
-+    keylen = length(key)
-+    if (S_is_set[key]) {
-+      value = S[key]
-+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
-+      len += length(value) + length(field[++i])
-+      substed = 1
-+    } else
-+      len += 1 + keylen
-+  }
-+
-+  print line
-+}
-+
-+_ACAWK
-+_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
-+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
-+else
-+  cat
-+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-+  || as_fn_error "could not setup config files machinery" "$LINENO" 5
-+_ACEOF
-+
-+# VPATH may cause trouble with some makes, so we remove $(srcdir),
-+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-+# trailing colons and then remove the whole line if VPATH becomes empty
-+# (actually we leave an empty line to preserve line numbers).
-+if test "x$srcdir" = x.; then
-+  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-+s/:*\$(srcdir):*/:/
-+s/:*\${srcdir}:*/:/
-+s/:*@srcdir@:*/:/
-+s/^\([^=]*=[	 ]*\):*/\1/
-+s/:*$//
-+s/^[^=]*=[	 ]*$//
-+}'
-+fi
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+fi # test -n "$CONFIG_FILES"
-+
-+# Set up the scripts for CONFIG_HEADERS section.
-+# No need to generate them if there are no CONFIG_HEADERS.
-+# This happens for instance with `./config.status Makefile'.
-+if test -n "$CONFIG_HEADERS"; then
-+cat >"$tmp/defines.awk" <<\_ACAWK ||
-+BEGIN {
-+_ACEOF
-+
-+# Transform confdefs.h into an awk script `defines.awk', embedded as
-+# here-document in config.status, that substitutes the proper values into
-+# config.h.in to produce config.h.
-+
-+# Create a delimiter string that does not exist in confdefs.h, to ease
-+# handling of long lines.
-+ac_delim='%!_!# '
-+for ac_last_try in false false :; do
-+  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
-+  if test -z "$ac_t"; then
-+    break
-+  elif $ac_last_try; then
-+    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
-+  else
-+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-+  fi
-+done
-+
-+# For the awk script, D is an array of macro values keyed by name,
-+# likewise P contains macro parameters if any.  Preserve backslash
-+# newline sequences.
-+
-+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-+sed -n '
-+s/.\{148\}/&'"$ac_delim"'/g
-+t rset
-+:rset
-+s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
-+t def
-+d
-+:def
-+s/\\$//
-+t bsnl
-+s/["\\]/\\&/g
-+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
-+D["\1"]=" \3"/p
-+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
-+d
-+:bsnl
-+s/["\\]/\\&/g
-+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
-+D["\1"]=" \3\\\\\\n"\\/p
-+t cont
-+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
-+t cont
-+d
-+:cont
-+n
-+s/.\{148\}/&'"$ac_delim"'/g
-+t clear
-+:clear
-+s/\\$//
-+t bsnlc
-+s/["\\]/\\&/g; s/^/"/; s/$/"/p
-+d
-+:bsnlc
-+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
-+b cont
-+' <confdefs.h | sed '
-+s/'"$ac_delim"'/"\\\
-+"/g' >>$CONFIG_STATUS || ac_write_fail=1
-+
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+  for (key in D) D_is_set[key] = 1
-+  FS = ""
-+}
-+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
-+  line = \$ 0
-+  split(line, arg, " ")
-+  if (arg[1] == "#") {
-+    defundef = arg[2]
-+    mac1 = arg[3]
-+  } else {
-+    defundef = substr(arg[1], 2)
-+    mac1 = arg[2]
-+  }
-+  split(mac1, mac2, "(") #)
-+  macro = mac2[1]
-+  prefix = substr(line, 1, index(line, defundef) - 1)
-+  if (D_is_set[macro]) {
-+    # Preserve the white space surrounding the "#".
-+    print prefix "define", macro P[macro] D[macro]
-+    next
-+  } else {
-+    # Replace #undef with comments.  This is necessary, for example,
-+    # in the case of _POSIX_SOURCE, which is predefined and required
-+    # on some systems where configure will not decide to define it.
-+    if (defundef == "undef") {
-+      print "/*", prefix defundef, macro, "*/"
-+      next
-+    }
-+  }
-+}
-+{ print }
-+_ACAWK
-+_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+  as_fn_error "could not setup config headers machinery" "$LINENO" 5
-+fi # test -n "$CONFIG_HEADERS"
-+
-+
-+eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
-+shift
-+for ac_tag
-+do
-+  case $ac_tag in
-+  :[FHLC]) ac_mode=$ac_tag; continue;;
-+  esac
-+  case $ac_mode$ac_tag in
-+  :[FHL]*:*);;
-+  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
-+  :[FH]-) ac_tag=-:-;;
-+  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-+  esac
-+  ac_save_IFS=$IFS
-+  IFS=:
-+  set x $ac_tag
-+  IFS=$ac_save_IFS
-+  shift
-+  ac_file=$1
-+  shift
-+
-+  case $ac_mode in
-+  :L) ac_source=$1;;
-+  :[FH])
-+    ac_file_inputs=
-+    for ac_f
-+    do
-+      case $ac_f in
-+      -) ac_f="$tmp/stdin";;
-+      *) # Look for the file first in the build tree, then in the source tree
-+	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
-+	 # because $ac_f cannot contain `:'.
-+	 test -f "$ac_f" ||
-+	   case $ac_f in
-+	   [\\/$]*) false;;
-+	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-+	   esac ||
-+	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
-+      esac
-+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-+      as_fn_append ac_file_inputs " '$ac_f'"
-+    done
-+
-+    # Let's still pretend it is `configure' which instantiates (i.e., don't
-+    # use $as_me), people would be surprised to read:
-+    #    /* config.h.  Generated by config.status.  */
-+    configure_input='Generated from '`
-+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
-+	`' by configure.'
-+    if test x"$ac_file" != x-; then
-+      configure_input="$ac_file.  $configure_input"
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-+$as_echo "$as_me: creating $ac_file" >&6;}
-+    fi
-+    # Neutralize special characters interpreted by sed in replacement strings.
-+    case $configure_input in #(
-+    *\&* | *\|* | *\\* )
-+       ac_sed_conf_input=`$as_echo "$configure_input" |
-+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
-+    *) ac_sed_conf_input=$configure_input;;
-+    esac
-+
-+    case $ac_tag in
-+    *:-:* | *:-) cat >"$tmp/stdin" \
-+      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
-+    esac
-+    ;;
-+  esac
-+
-+  ac_dir=`$as_dirname -- "$ac_file" ||
-+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$ac_file" : 'X\(//\)[^/]' \| \
-+	 X"$ac_file" : 'X\(//\)$' \| \
-+	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-+$as_echo X"$ac_file" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-+  as_dir="$ac_dir"; as_fn_mkdir_p
-+  ac_builddir=.
-+
-+case "$ac_dir" in
-+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+*)
-+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-+  # A ".." for each directory in $ac_dir_suffix.
-+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-+  case $ac_top_builddir_sub in
-+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-+  esac ;;
-+esac
-+ac_abs_top_builddir=$ac_pwd
-+ac_abs_builddir=$ac_pwd$ac_dir_suffix
-+# for backward compatibility:
-+ac_top_builddir=$ac_top_build_prefix
-+
-+case $srcdir in
-+  .)  # We are building in place.
-+    ac_srcdir=.
-+    ac_top_srcdir=$ac_top_builddir_sub
-+    ac_abs_top_srcdir=$ac_pwd ;;
-+  [\\/]* | ?:[\\/]* )  # Absolute name.
-+    ac_srcdir=$srcdir$ac_dir_suffix;
-+    ac_top_srcdir=$srcdir
-+    ac_abs_top_srcdir=$srcdir ;;
-+  *) # Relative name.
-+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-+    ac_top_srcdir=$ac_top_build_prefix$srcdir
-+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-+esac
-+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-+
-+
-+  case $ac_mode in
-+  :F)
-+  #
-+  # CONFIG_FILE
-+  #
-+
-+  case $INSTALL in
-+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-+  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
-+  esac
-+  ac_MKDIR_P=$MKDIR_P
-+  case $MKDIR_P in
-+  [\\/$]* | ?:[\\/]* ) ;;
-+  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
-+  esac
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+# If the template does not know about datarootdir, expand it.
-+# FIXME: This hack should be removed a few years after 2.60.
-+ac_datarootdir_hack=; ac_datarootdir_seen=
-+ac_sed_dataroot='
-+/datarootdir/ {
-+  p
-+  q
-+}
-+/@datadir@/p
-+/@docdir@/p
-+/@infodir@/p
-+/@localedir@/p
-+/@mandir@/p'
-+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
-+*datarootdir*) ac_datarootdir_seen=yes;;
-+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+  ac_datarootdir_hack='
-+  s&@datadir@&$datadir&g
-+  s&@docdir@&$docdir&g
-+  s&@infodir@&$infodir&g
-+  s&@localedir@&$localedir&g
-+  s&@mandir@&$mandir&g
-+  s&\\\${datarootdir}&$datarootdir&g' ;;
-+esac
-+_ACEOF
-+
-+# Neutralize VPATH when `$srcdir' = `.'.
-+# Shell code in configure.ac might set extrasub.
-+# FIXME: do we really want to maintain this feature?
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+ac_sed_extra="$ac_vpsub
-+$extrasub
-+_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+:t
-+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-+s|@configure_input@|$ac_sed_conf_input|;t t
-+s&@top_builddir@&$ac_top_builddir_sub&;t t
-+s&@top_build_prefix@&$ac_top_build_prefix&;t t
-+s&@srcdir@&$ac_srcdir&;t t
-+s&@abs_srcdir@&$ac_abs_srcdir&;t t
-+s&@top_srcdir@&$ac_top_srcdir&;t t
-+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-+s&@builddir@&$ac_builddir&;t t
-+s&@abs_builddir@&$ac_abs_builddir&;t t
-+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-+s&@INSTALL@&$ac_INSTALL&;t t
-+s&@MKDIR_P@&$ac_MKDIR_P&;t t
-+$ac_datarootdir_hack
-+"
-+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-+  || as_fn_error "could not create $ac_file" "$LINENO" 5
-+
-+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-+  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-+which seems to be undefined.  Please make sure it is defined." >&5
-+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-+which seems to be undefined.  Please make sure it is defined." >&2;}
-+
-+  rm -f "$tmp/stdin"
-+  case $ac_file in
-+  -) cat "$tmp/out" && rm -f "$tmp/out";;
-+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
-+  esac \
-+  || as_fn_error "could not create $ac_file" "$LINENO" 5
-+ ;;
-+  :H)
-+  #
-+  # CONFIG_HEADER
-+  #
-+  if test x"$ac_file" != x-; then
-+    {
-+      $as_echo "/* $configure_input  */" \
-+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
-+    } >"$tmp/config.h" \
-+      || as_fn_error "could not create $ac_file" "$LINENO" 5
-+    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
-+$as_echo "$as_me: $ac_file is unchanged" >&6;}
-+    else
-+      rm -f "$ac_file"
-+      mv "$tmp/config.h" "$ac_file" \
-+	|| as_fn_error "could not create $ac_file" "$LINENO" 5
-+    fi
-+  else
-+    $as_echo "/* $configure_input  */" \
-+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-+      || as_fn_error "could not create -" "$LINENO" 5
-+  fi
-+# Compute "$ac_file"'s index in $config_headers.
-+_am_arg="$ac_file"
-+_am_stamp_count=1
-+for _am_header in $config_headers :; do
-+  case $_am_header in
-+    $_am_arg | $_am_arg:* )
-+      break ;;
-+    * )
-+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-+  esac
-+done
-+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
-+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$_am_arg" : 'X\(//\)[^/]' \| \
-+	 X"$_am_arg" : 'X\(//\)$' \| \
-+	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
-+$as_echo X"$_am_arg" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`/stamp-h$_am_stamp_count
-+ ;;
-+  
-+  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
-+$as_echo "$as_me: executing $ac_file commands" >&6;}
-+ ;;
-+  esac
-+
-+
-+  case $ac_file$ac_mode in
-+    "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
-+  # Autoconf 2.62 quotes --file arguments for eval, but not when files
-+  # are listed without --file.  Let's play safe and only enable the eval
-+  # if we detect the quoting.
-+  case $CONFIG_FILES in
-+  *\'*) eval set x "$CONFIG_FILES" ;;
-+  *)   set x $CONFIG_FILES ;;
-+  esac
-+  shift
-+  for mf
-+  do
-+    # 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.
-+    # We used to match only the files named `Makefile.in', but
-+    # some people rename them; so instead we look at the file content.
-+    # Grep'ing the first line is not enough: some people post-process
-+    # each Makefile.in and add a new line on top of each file to say so.
-+    # Grep'ing the whole file is not good either: AIX grep has a line
-+    # limit of 2048, but all sed's we know have understand at least 4000.
-+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-+      dirpart=`$as_dirname -- "$mf" ||
-+$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$mf" : 'X\(//\)[^/]' \| \
-+	 X"$mf" : 'X\(//\)$' \| \
-+	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-+$as_echo X"$mf" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-+    else
-+      continue
-+    fi
-+    # Extract the definition of DEPDIR, am__include, and am__quote
-+    # from the Makefile without running `make'.
-+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-+    test -z "$DEPDIR" && continue
-+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
-+    test -z "am__include" && continue
-+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-+    # When using ansi2knr, U may be empty or an underscore; expand it
-+    U=`sed -n 's/^U = //p' < "$mf"`
-+    # Find all dependency output files, they are included files with
-+    # $(DEPDIR) in their names.  We invoke sed twice because it is the
-+    # simplest approach to changing $(DEPDIR) to its actual value in the
-+    # expansion.
-+    for file in `sed -n "
-+      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-+      # Make sure the directory exists.
-+      test -f "$dirpart/$file" && continue
-+      fdir=`$as_dirname -- "$file" ||
-+$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$file" : 'X\(//\)[^/]' \| \
-+	 X"$file" : 'X\(//\)$' \| \
-+	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-+$as_echo X"$file" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-+      as_dir=$dirpart/$fdir; as_fn_mkdir_p
-+      # echo "creating $dirpart/$file"
-+      echo '# dummy' > "$dirpart/$file"
-+    done
-+  done
-+}
-+ ;;
-+    "libtool":C) 
-+    
-+    # See if we are running on zsh, and set the options which allow our
-+    # commands through without removal of \ escapes.
-+    if test -n "${ZSH_VERSION+set}" ; then
-+      setopt NO_GLOB_SUBST
-+    fi
-+
-+    cfgfile="${ofile}T"
-+    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
-+    $RM "$cfgfile"
-+
-+    cat <<_LT_EOF >> "$cfgfile"
-+#! $SHELL
-+
-+# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-+# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
-+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-+#
-+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-+#                 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-+#   Written by Gordon Matzigkeit, 1996
-+#
-+#   This file is part of GNU Libtool.
-+#
-+# GNU Libtool is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU General Public License as
-+# published by the Free Software Foundation; either version 2 of
-+# the License, or (at your option) any later version.
-+#
-+# As a special exception to the GNU General Public License,
-+# if you distribute this file as part of a program or library that
-+# is built using GNU Libtool, you may include this file under the
-+# same distribution terms that you use for the rest of that program.
-+#
-+# GNU Libtool is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with GNU Libtool; see the file COPYING.  If not, a copy
-+# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-+# obtained by writing to the Free Software Foundation, Inc.,
-+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+
-+
-+# The names of the tagged configurations supported by this script.
-+available_tags=""
-+
-+# ### BEGIN LIBTOOL CONFIG
-+
-+# Which release of libtool.m4 was used?
-+macro_version=$macro_version
-+macro_revision=$macro_revision
-+
-+# Whether or not to build shared libraries.
-+build_libtool_libs=$enable_shared
-+
-+# Whether or not to build static libraries.
-+build_old_libs=$enable_static
-+
-+# What type of objects to build.
-+pic_mode=$pic_mode
-+
-+# Whether or not to optimize for fast installation.
-+fast_install=$enable_fast_install
-+
-+# Shell to use when invoking shell scripts.
-+SHELL=$lt_SHELL
-+
-+# An echo program that protects backslashes.
-+ECHO=$lt_ECHO
-+
-+# The host system.
-+host_alias=$host_alias
-+host=$host
-+host_os=$host_os
-+
-+# The build system.
-+build_alias=$build_alias
-+build=$build
-+build_os=$build_os
-+
-+# A sed program that does not truncate output.
-+SED=$lt_SED
-+
-+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-+Xsed="\$SED -e 1s/^X//"
-+
-+# A grep program that handles long lines.
-+GREP=$lt_GREP
-+
-+# An ERE matcher.
-+EGREP=$lt_EGREP
-+
-+# A literal string matcher.
-+FGREP=$lt_FGREP
-+
-+# A BSD- or MS-compatible name lister.
-+NM=$lt_NM
-+
-+# Whether we need soft or hard links.
-+LN_S=$lt_LN_S
-+
-+# What is the maximum length of a command?
-+max_cmd_len=$max_cmd_len
-+
-+# Object file suffix (normally "o").
-+objext=$ac_objext
-+
-+# Executable file suffix (normally "").
-+exeext=$exeext
-+
-+# whether the shell understands "unset".
-+lt_unset=$lt_unset
-+
-+# turn spaces into newlines.
-+SP2NL=$lt_lt_SP2NL
-+
-+# turn newlines into spaces.
-+NL2SP=$lt_lt_NL2SP
-+
-+# An object symbol dumper.
-+OBJDUMP=$lt_OBJDUMP
-+
-+# Method to check whether dependent libraries are shared objects.
-+deplibs_check_method=$lt_deplibs_check_method
-+
-+# Command to use when deplibs_check_method == "file_magic".
-+file_magic_cmd=$lt_file_magic_cmd
-+
-+# The archiver.
-+AR=$lt_AR
-+AR_FLAGS=$lt_AR_FLAGS
-+
-+# A symbol stripping program.
-+STRIP=$lt_STRIP
-+
-+# Commands used to install an old-style archive.
-+RANLIB=$lt_RANLIB
-+old_postinstall_cmds=$lt_old_postinstall_cmds
-+old_postuninstall_cmds=$lt_old_postuninstall_cmds
-+
-+# Whether to use a lock for old archive extraction.
-+lock_old_archive_extraction=$lock_old_archive_extraction
-+
-+# A C compiler.
-+LTCC=$lt_CC
-+
-+# LTCC compiler flags.
-+LTCFLAGS=$lt_CFLAGS
-+
-+# Take the output of nm and produce a listing of raw symbols and C names.
-+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-+
-+# Transform the output of nm in a proper C declaration.
-+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-+
-+# Transform the output of nm in a C name address pair.
-+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-+
-+# Transform the output of nm in a C name address pair when lib prefix is needed.
-+global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
-+
-+# The name of the directory that contains temporary libtool files.
-+objdir=$objdir
-+
-+# Used to examine libraries when file_magic_cmd begins with "file".
-+MAGIC_CMD=$MAGIC_CMD
-+
-+# Must we lock files when doing compilation?
-+need_locks=$lt_need_locks
-+
-+# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
-+DSYMUTIL=$lt_DSYMUTIL
-+
-+# Tool to change global to local symbols on Mac OS X.
-+NMEDIT=$lt_NMEDIT
-+
-+# Tool to manipulate fat objects and archives on Mac OS X.
-+LIPO=$lt_LIPO
-+
-+# ldd/readelf like tool for Mach-O binaries on Mac OS X.
-+OTOOL=$lt_OTOOL
-+
-+# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
-+OTOOL64=$lt_OTOOL64
-+
-+# Old archive suffix (normally "a").
-+libext=$libext
-+
-+# Shared library suffix (normally ".so").
-+shrext_cmds=$lt_shrext_cmds
-+
-+# The commands to extract the exported symbol list from a shared archive.
-+extract_expsyms_cmds=$lt_extract_expsyms_cmds
-+
-+# Variables whose values should be saved in libtool wrapper scripts and
-+# restored at link time.
-+variables_saved_for_relink=$lt_variables_saved_for_relink
-+
-+# Do we need the "lib" prefix for modules?
-+need_lib_prefix=$need_lib_prefix
-+
-+# Do we need a version for libraries?
-+need_version=$need_version
-+
-+# Library versioning type.
-+version_type=$version_type
-+
-+# Shared library runtime path variable.
-+runpath_var=$runpath_var
-+
-+# Shared library path variable.
-+shlibpath_var=$shlibpath_var
-+
-+# Is shlibpath searched before the hard-coded library search path?
-+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-+
-+# Format of library name prefix.
-+libname_spec=$lt_libname_spec
-+
-+# List of archive names.  First name is the real one, the rest are links.
-+# The last name is the one that the linker finds with -lNAME
-+library_names_spec=$lt_library_names_spec
-+
-+# The coded name of the library, if different from the real name.
-+soname_spec=$lt_soname_spec
-+
-+# Permission mode override for installation of shared libraries.
-+install_override_mode=$lt_install_override_mode
-+
-+# Command to use after installation of a shared archive.
-+postinstall_cmds=$lt_postinstall_cmds
-+
-+# Command to use after uninstallation of a shared archive.
-+postuninstall_cmds=$lt_postuninstall_cmds
-+
-+# Commands used to finish a libtool library installation in a directory.
-+finish_cmds=$lt_finish_cmds
-+
-+# As "finish_cmds", except a single script fragment to be evaled but
-+# not shown.
-+finish_eval=$lt_finish_eval
-+
-+# Whether we should hardcode library paths into libraries.
-+hardcode_into_libs=$hardcode_into_libs
-+
-+# Compile-time system search path for libraries.
-+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-+
-+# Run-time system search path for libraries.
-+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-+
-+# Whether dlopen is supported.
-+dlopen_support=$enable_dlopen
-+
-+# Whether dlopen of programs is supported.
-+dlopen_self=$enable_dlopen_self
-+
-+# Whether dlopen of statically linked programs is supported.
-+dlopen_self_static=$enable_dlopen_self_static
-+
-+# Commands to strip libraries.
-+old_striplib=$lt_old_striplib
-+striplib=$lt_striplib
-+
-+
-+# The linker used to build libraries.
-+LD=$lt_LD
-+
-+# How to create reloadable object files.
-+reload_flag=$lt_reload_flag
-+reload_cmds=$lt_reload_cmds
-+
-+# Commands used to build an old-style archive.
-+old_archive_cmds=$lt_old_archive_cmds
-+
-+# A language specific compiler.
-+CC=$lt_compiler
-+
-+# Is the compiler the GNU compiler?
-+with_gcc=$GCC
-+
-+# Compiler flag to turn off builtin functions.
-+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
-+
-+# How to pass a linker flag through the compiler.
-+wl=$lt_lt_prog_compiler_wl
-+
-+# Additional compiler flags for building library objects.
-+pic_flag=$lt_lt_prog_compiler_pic
-+
-+# Compiler flag to prevent dynamic linking.
-+link_static_flag=$lt_lt_prog_compiler_static
-+
-+# Does compiler simultaneously support -c and -o options?
-+compiler_c_o=$lt_lt_cv_prog_compiler_c_o
-+
-+# Whether or not to add -lc for building shared libraries.
-+build_libtool_need_lc=$archive_cmds_need_lc
-+
-+# Whether or not to disallow shared libs when runtime libs are static.
-+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
-+
-+# Compiler flag to allow reflexive dlopens.
-+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
-+
-+# Compiler flag to generate shared objects directly from archives.
-+whole_archive_flag_spec=$lt_whole_archive_flag_spec
-+
-+# Whether the compiler copes with passing no objects directly.
-+compiler_needs_object=$lt_compiler_needs_object
-+
-+# Create an old-style archive from a shared archive.
-+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
-+
-+# Create a temporary old-style archive to link instead of a shared archive.
-+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
-+
-+# Commands used to build a shared archive.
-+archive_cmds=$lt_archive_cmds
-+archive_expsym_cmds=$lt_archive_expsym_cmds
-+
-+# Commands used to build a loadable module if different from building
-+# a shared archive.
-+module_cmds=$lt_module_cmds
-+module_expsym_cmds=$lt_module_expsym_cmds
-+
-+# Whether we are building with GNU ld or not.
-+with_gnu_ld=$lt_with_gnu_ld
-+
-+# Flag that allows shared libraries with undefined symbols to be built.
-+allow_undefined_flag=$lt_allow_undefined_flag
-+
-+# Flag that enforces no undefined symbols.
-+no_undefined_flag=$lt_no_undefined_flag
-+
-+# Flag to hardcode \$libdir into a binary during linking.
-+# This must work even if \$libdir does not exist
-+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
-+
-+# If ld is used when linking, flag to hardcode \$libdir into a binary
-+# during linking.  This must work even if \$libdir does not exist.
-+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
-+
-+# Whether we need a single "-rpath" flag with a separated argument.
-+hardcode_libdir_separator=$lt_hardcode_libdir_separator
-+
-+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
-+# DIR into the resulting binary.
-+hardcode_direct=$hardcode_direct
-+
-+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
-+# DIR into the resulting binary and the resulting library dependency is
-+# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
-+# library is relocated.
-+hardcode_direct_absolute=$hardcode_direct_absolute
-+
-+# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-+# into the resulting binary.
-+hardcode_minus_L=$hardcode_minus_L
-+
-+# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-+# into the resulting binary.
-+hardcode_shlibpath_var=$hardcode_shlibpath_var
-+
-+# Set to "yes" if building a shared library automatically hardcodes DIR
-+# into the library and all subsequent libraries and executables linked
-+# against it.
-+hardcode_automatic=$hardcode_automatic
-+
-+# Set to yes if linker adds runtime paths of dependent libraries
-+# to runtime path list.
-+inherit_rpath=$inherit_rpath
-+
-+# Whether libtool must link a program against all its dependency libraries.
-+link_all_deplibs=$link_all_deplibs
-+
-+# Fix the shell variable \$srcfile for the compiler.
-+fix_srcfile_path=$lt_fix_srcfile_path
-+
-+# Set to "yes" if exported symbols are required.
-+always_export_symbols=$always_export_symbols
-+
-+# The commands to list exported symbols.
-+export_symbols_cmds=$lt_export_symbols_cmds
-+
-+# Symbols that should not be listed in the preloaded symbols.
-+exclude_expsyms=$lt_exclude_expsyms
-+
-+# Symbols that must always be exported.
-+include_expsyms=$lt_include_expsyms
-+
-+# Commands necessary for linking programs (against libraries) with templates.
-+prelink_cmds=$lt_prelink_cmds
-+
-+# Specify filename containing input files.
-+file_list_spec=$lt_file_list_spec
-+
-+# How to hardcode a shared library path into an executable.
-+hardcode_action=$hardcode_action
-+
-+# ### END LIBTOOL CONFIG
-+
-+_LT_EOF
-+
-+  case $host_os in
-+  aix3*)
-+    cat <<\_LT_EOF >> "$cfgfile"
-+# AIX sometimes has problems with the GCC collect2 program.  For some
-+# reason, if we set the COLLECT_NAMES environment variable, the problems
-+# vanish in a puff of smoke.
-+if test "X${COLLECT_NAMES+set}" != Xset; then
-+  COLLECT_NAMES=
-+  export COLLECT_NAMES
-+fi
-+_LT_EOF
-+    ;;
-+  esac
-+
-+  
-+ltmain="$ac_aux_dir/ltmain.sh"
-+
-+
-+  # We use sed instead of cat because bash on DJGPP gets confused if
-+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-+  # text mode, it properly converts lines to CR/LF.  This bash problem
-+  # is reportedly fixed, but why not run on old versions too?
-+  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
-+    || (rm -f "$cfgfile"; exit 1)
-+
-+  case $xsi_shell in
-+  yes)
-+    cat << \_LT_EOF >> "$cfgfile"
-+
-+# func_dirname file append nondir_replacement
-+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-+# otherwise set result to NONDIR_REPLACEMENT.
-+func_dirname ()
-+{
-+  case ${1} in
-+    */*) func_dirname_result="${1%/*}${2}" ;;
-+    *  ) func_dirname_result="${3}" ;;
-+  esac
-+}
-+
-+# func_basename file
-+func_basename ()
-+{
-+  func_basename_result="${1##*/}"
-+}
-+
-+# func_dirname_and_basename file append nondir_replacement
-+# perform func_basename and func_dirname in a single function
-+# call:
-+#   dirname:  Compute the dirname of FILE.  If nonempty,
-+#             add APPEND to the result, otherwise set result
-+#             to NONDIR_REPLACEMENT.
-+#             value returned in "$func_dirname_result"
-+#   basename: Compute filename of FILE.
-+#             value retuned in "$func_basename_result"
-+# Implementation must be kept synchronized with func_dirname
-+# and func_basename. For efficiency, we do not delegate to
-+# those functions but instead duplicate the functionality here.
-+func_dirname_and_basename ()
-+{
-+  case ${1} in
-+    */*) func_dirname_result="${1%/*}${2}" ;;
-+    *  ) func_dirname_result="${3}" ;;
-+  esac
-+  func_basename_result="${1##*/}"
-+}
-+
-+# func_stripname prefix suffix name
-+# strip PREFIX and SUFFIX off of NAME.
-+# PREFIX and SUFFIX must not contain globbing or regex special
-+# characters, hashes, percent signs, but SUFFIX may contain a leading
-+# dot (in which case that matches only a dot).
-+func_stripname ()
-+{
-+  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
-+  # positional parameters, so assign one to ordinary parameter first.
-+  func_stripname_result=${3}
-+  func_stripname_result=${func_stripname_result#"${1}"}
-+  func_stripname_result=${func_stripname_result%"${2}"}
-+}
-+
-+# func_opt_split
-+func_opt_split ()
-+{
-+  func_opt_split_opt=${1%%=*}
-+  func_opt_split_arg=${1#*=}
-+}
-+
-+# func_lo2o object
-+func_lo2o ()
-+{
-+  case ${1} in
-+    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
-+    *)    func_lo2o_result=${1} ;;
-+  esac
-+}
-+
-+# func_xform libobj-or-source
-+func_xform ()
-+{
-+  func_xform_result=${1%.*}.lo
-+}
-+
-+# func_arith arithmetic-term...
-+func_arith ()
-+{
-+  func_arith_result=$(( $* ))
-+}
-+
-+# func_len string
-+# STRING may not start with a hyphen.
-+func_len ()
-+{
-+  func_len_result=${#1}
-+}
-+
-+_LT_EOF
-+    ;;
-+  *) # Bourne compatible functions.
-+    cat << \_LT_EOF >> "$cfgfile"
-+
-+# func_dirname file append nondir_replacement
-+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-+# otherwise set result to NONDIR_REPLACEMENT.
-+func_dirname ()
-+{
-+  # Extract subdirectory from the argument.
-+  func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
-+  if test "X$func_dirname_result" = "X${1}"; then
-+    func_dirname_result="${3}"
-+  else
-+    func_dirname_result="$func_dirname_result${2}"
-+  fi
-+}
-+
-+# func_basename file
-+func_basename ()
-+{
-+  func_basename_result=`$ECHO "${1}" | $SED "$basename"`
-+}
-+
-+
-+# func_stripname prefix suffix name
-+# strip PREFIX and SUFFIX off of NAME.
-+# PREFIX and SUFFIX must not contain globbing or regex special
-+# characters, hashes, percent signs, but SUFFIX may contain a leading
-+# dot (in which case that matches only a dot).
-+# func_strip_suffix prefix name
-+func_stripname ()
-+{
-+  case ${2} in
-+    .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
-+    *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
-+  esac
-+}
-+
-+# sed scripts:
-+my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
-+my_sed_long_arg='1s/^-[^=]*=//'
-+
-+# func_opt_split
-+func_opt_split ()
-+{
-+  func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
-+  func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
-+}
-+
-+# func_lo2o object
-+func_lo2o ()
-+{
-+  func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
-+}
-+
-+# func_xform libobj-or-source
-+func_xform ()
-+{
-+  func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
-+}
-+
-+# func_arith arithmetic-term...
-+func_arith ()
-+{
-+  func_arith_result=`expr "$@"`
-+}
-+
-+# func_len string
-+# STRING may not start with a hyphen.
-+func_len ()
-+{
-+  func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
-+}
-+
-+_LT_EOF
-+esac
-+
-+case $lt_shell_append in
-+  yes)
-+    cat << \_LT_EOF >> "$cfgfile"
-+
-+# func_append var value
-+# Append VALUE to the end of shell variable VAR.
-+func_append ()
-+{
-+  eval "$1+=\$2"
-+}
-+_LT_EOF
-+    ;;
-+  *)
-+    cat << \_LT_EOF >> "$cfgfile"
-+
-+# func_append var value
-+# Append VALUE to the end of shell variable VAR.
-+func_append ()
-+{
-+  eval "$1=\$$1\$2"
-+}
-+
-+_LT_EOF
-+    ;;
-+  esac
-+
-+
-+  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
-+    || (rm -f "$cfgfile"; exit 1)
-+
-+  mv -f "$cfgfile" "$ofile" ||
-+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-+  chmod +x "$ofile"
-+
-+ ;;
-+    "default-1":C) 
-+    for ac_file in $CONFIG_FILES; do
-+      # Support "outfile[:infile[:infile...]]"
-+      case "$ac_file" in
-+        *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-+      esac
-+      # PO directories have a Makefile.in generated from Makefile.in.in.
-+      case "$ac_file" in */Makefile.in)
-+        # Adjust a relative srcdir.
-+        ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-+        ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
-+        ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
-+        # In autoconf-2.13 it is called $ac_given_srcdir.
-+        # In autoconf-2.50 it is called $srcdir.
-+        test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
-+        case "$ac_given_srcdir" in
-+          .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
-+          /*) top_srcdir="$ac_given_srcdir" ;;
-+          *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
-+        esac
-+        if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
-+          rm -f "$ac_dir/POTFILES"
-+          test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
-+          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
-+          POMAKEFILEDEPS="POTFILES.in"
-+          # ALL_LINGUAS, POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES depend
-+          # on $ac_dir but don't depend on user-specified configuration
-+          # parameters.
-+          if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
-+            # The LINGUAS file contains the set of available languages.
-+            if test -n "$OBSOLETE_ALL_LINGUAS"; then
-+              test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
-+            fi
-+            ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-+            # Hide the ALL_LINGUAS assigment from automake.
-+            eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
-+            POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
-+          else
-+            # The set of available languages was given in configure.in.
-+            eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
-+          fi
-+          case "$ac_given_srcdir" in
-+            .) srcdirpre= ;;
-+            *) srcdirpre='$(srcdir)/' ;;
-+          esac
-+          POFILES=
-+          GMOFILES=
-+          UPDATEPOFILES=
-+          DUMMYPOFILES=
-+          for lang in $ALL_LINGUAS; do
-+            POFILES="$POFILES $srcdirpre$lang.po"
-+            GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
-+            UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
-+            DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
-+          done
-+          # CATALOGS depends on both $ac_dir and the user's LINGUAS
-+          # environment variable.
-+          INST_LINGUAS=
-+          if test -n "$ALL_LINGUAS"; then
-+            for presentlang in $ALL_LINGUAS; do
-+              useit=no
-+              if test "%UNSET%" != "$LINGUAS"; then
-+                desiredlanguages="$LINGUAS"
-+              else
-+                desiredlanguages="$ALL_LINGUAS"
-+              fi
-+              for desiredlang in $desiredlanguages; do
-+                # Use the presentlang catalog if desiredlang is
-+                #   a. equal to presentlang, or
-+                #   b. a variant of presentlang (because in this case,
-+                #      presentlang can be used as a fallback for messages
-+                #      which are not translated in the desiredlang catalog).
-+                case "$desiredlang" in
-+                  "$presentlang"*) useit=yes;;
-+                esac
-+              done
-+              if test $useit = yes; then
-+                INST_LINGUAS="$INST_LINGUAS $presentlang"
-+              fi
-+            done
-+          fi
-+          CATALOGS=
-+          if test -n "$INST_LINGUAS"; then
-+            for lang in $INST_LINGUAS; do
-+              CATALOGS="$CATALOGS $lang.gmo"
-+            done
-+          fi
-+          test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
-+          sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
-+          for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
-+            if test -f "$f"; then
-+              case "$f" in
-+                *.orig | *.bak | *~) ;;
-+                *) cat "$f" >> "$ac_dir/Makefile" ;;
-+              esac
-+            fi
-+          done
-+        fi
-+        ;;
-+      esac
-+    done ;;
-+    "default":C) rm -f targ-cpu.c targ-cpu.h obj-format.h obj-format.c targ-env.h atof-targ.c itbl-cpu.h
-+ 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
-+ echo '#include "itbl-'"${target_cpu_type}"'.h"' > itbl-cpu.h
-+ if test "x$cgen_cpu_prefix" != x ; then
-+   echo '#include "opcodes/'"${cgen_cpu_prefix}"'-desc.h"' > cgen-desc.h
-+ fi ;;
-+
-+  esac
-+done # for ac_tag
-+
-+
-+as_fn_exit 0
-+_ACEOF
-+ac_clean_files=$ac_clean_files_save
-+
-+test $ac_write_fail = 0 ||
-+  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
-+
-+
-+# configure is writing to config.log, and then calls config.status.
-+# config.status does its own redirection, appending to config.log.
-+# Unfortunately, on DOS this fails, as config.log is still kept open
-+# by configure, so config.status won't be able to write to it; its
-+# output is simply discarded.  So we exec the FD to /dev/null,
-+# effectively closing config.log, so it can be properly (re)opened and
-+# appended to by config.status.  When coming back to configure, we
-+# need to make the FD available again.
-+if test "$no_create" != yes; then
-+  ac_cs_success=:
-+  ac_config_status_args=
-+  test "$silent" = yes &&
-+    ac_config_status_args="$ac_config_status_args --quiet"
-+  exec 5>/dev/null
-+  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-+  exec 5>>config.log
-+  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-+  # would make configure fail if this is the last instruction.
-+  $ac_cs_success || as_fn_exit $?
-+fi
-+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
-+fi
-+
-diff -Nur binutils-2.21.orig/gas/autom4te.cache/requests binutils-2.21/gas/autom4te.cache/requests
---- binutils-2.21.orig/gas/autom4te.cache/requests	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.21/gas/autom4te.cache/requests	2011-08-28 14:56:19.827984744 +0200
-@@ -0,0 +1,68 @@
-+# This file was generated.
-+# It contains the lists of macros which have been traced.
-+# It can be safely removed.
-+
-+@request = (
-+             bless( [
-+                      '0',
-+                      1,
-+                      [
-+                        '/usr/share/autoconf2.64'
-+                      ],
-+                      [
-+                        '/usr/share/autoconf2.64/autoconf/autoconf.m4f',
-+                        'aclocal.m4',
-+                        'configure.in'
-+                      ],
-+                      {
-+                        '_LT_AC_TAGCONFIG' => 1,
-+                        'AM_PROG_F77_C_O' => 1,
-+                        'AC_INIT' => 1,
-+                        'm4_pattern_forbid' => 1,
-+                        '_AM_COND_IF' => 1,
-+                        'AC_CANONICAL_TARGET' => 1,
-+                        'AC_SUBST' => 1,
-+                        'AC_CONFIG_LIBOBJ_DIR' => 1,
-+                        'AC_FC_SRCEXT' => 1,
-+                        'AC_CANONICAL_HOST' => 1,
-+                        'AC_PROG_LIBTOOL' => 1,
-+                        'AM_INIT_AUTOMAKE' => 1,
-+                        'AC_CONFIG_SUBDIRS' => 1,
-+                        'AM_AUTOMAKE_VERSION' => 1,
-+                        'LT_CONFIG_LTDL_DIR' => 1,
-+                        'AC_REQUIRE_AUX_FILE' => 1,
-+                        'AC_CONFIG_LINKS' => 1,
-+                        'm4_sinclude' => 1,
-+                        'LT_SUPPORTED_TAG' => 1,
-+                        'AM_MAINTAINER_MODE' => 1,
-+                        'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
-+                        '_m4_warn' => 1,
-+                        'AM_PROG_CXX_C_O' => 1,
-+                        '_AM_COND_ENDIF' => 1,
-+                        'AM_ENABLE_MULTILIB' => 1,
-+                        'AM_SILENT_RULES' => 1,
-+                        'AC_CONFIG_FILES' => 1,
-+                        'include' => 1,
-+                        'LT_INIT' => 1,
-+                        'AM_GNU_GETTEXT' => 1,
-+                        'AC_LIBSOURCE' => 1,
-+                        'AM_PROG_FC_C_O' => 1,
-+                        'AC_CANONICAL_BUILD' => 1,
-+                        'AC_FC_FREEFORM' => 1,
-+                        'AH_OUTPUT' => 1,
-+                        '_AM_SUBST_NOTMAKE' => 1,
-+                        'AC_CONFIG_AUX_DIR' => 1,
-+                        'sinclude' => 1,
-+                        'm4_pattern_allow' => 1,
-+                        'AM_PROG_CC_C_O' => 1,
-+                        'AC_CANONICAL_SYSTEM' => 1,
-+                        'AM_CONDITIONAL' => 1,
-+                        'AC_CONFIG_HEADERS' => 1,
-+                        'AC_DEFINE_TRACE_LITERAL' => 1,
-+                        'm4_include' => 1,
-+                        '_AM_COND_ELSE' => 1,
-+                        'AC_SUBST_TRACE' => 1
-+                      }
-+                    ], 'Autom4te::Request' )
-+           );
-+
-diff -Nur binutils-2.21.orig/gas/autom4te.cache/traces.0 binutils-2.21/gas/autom4te.cache/traces.0
---- binutils-2.21.orig/gas/autom4te.cache/traces.0	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.21/gas/autom4te.cache/traces.0	2011-08-28 14:56:19.847983140 +0200
-@@ -0,0 +1,1088 @@
-+m4trace:aclocal.m4:992: -1- m4_include([../bfd/acinclude.m4])
-+m4trace:../bfd/acinclude.m4:1: -1- sinclude([../config/zlib.m4])
-+m4trace:aclocal.m4:993: -1- m4_include([../bfd/warning.m4])
-+m4trace:aclocal.m4:994: -1- m4_include([../config/depstand.m4])
-+m4trace:aclocal.m4:995: -1- m4_include([../config/gettext-sister.m4])
-+m4trace:aclocal.m4:996: -1- m4_include([../config/largefile.m4])
-+m4trace:aclocal.m4:997: -1- m4_include([../config/lead-dot.m4])
-+m4trace:aclocal.m4:998: -1- m4_include([../config/nls.m4])
-+m4trace:aclocal.m4:999: -1- m4_include([../config/override.m4])
-+m4trace:aclocal.m4:1000: -1- m4_include([../config/plugins.m4])
-+m4trace:aclocal.m4:1001: -1- m4_include([../config/po.m4])
-+m4trace:aclocal.m4:1002: -1- m4_include([../config/progtest.m4])
-+m4trace:aclocal.m4:1003: -1- m4_include([../libtool.m4])
-+m4trace:aclocal.m4:1004: -1- m4_include([../ltoptions.m4])
-+m4trace:aclocal.m4:1005: -1- m4_include([../ltsugar.m4])
-+m4trace:aclocal.m4:1006: -1- m4_include([../ltversion.m4])
-+m4trace:aclocal.m4:1007: -1- m4_include([../lt~obsolete.m4])
-+m4trace:aclocal.m4:1008: -1- m4_include([acinclude.m4])
-+m4trace:configure.in:9: -1- AC_INIT
-+m4trace:configure.in:9: -1- m4_pattern_forbid([^_?A[CHUM]_])
-+m4trace:configure.in:9: -1- m4_pattern_forbid([_AC_])
-+m4trace:configure.in:9: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS'])
-+m4trace:configure.in:9: -1- m4_pattern_allow([^AS_FLAGS$])
-+m4trace:configure.in:9: -1- m4_pattern_forbid([^_?m4_])
-+m4trace:configure.in:9: -1- m4_pattern_forbid([^dnl$])
-+m4trace:configure.in:9: -1- m4_pattern_forbid([^_?AS_])
-+m4trace:configure.in:9: -1- AC_SUBST([SHELL])
-+m4trace:configure.in:9: -1- AC_SUBST_TRACE([SHELL])
-+m4trace:configure.in:9: -1- m4_pattern_allow([^SHELL$])
-+m4trace:configure.in:9: -1- AC_SUBST([PATH_SEPARATOR])
-+m4trace:configure.in:9: -1- AC_SUBST_TRACE([PATH_SEPARATOR])
-+m4trace:configure.in:9: -1- m4_pattern_allow([^PATH_SEPARATOR$])
-+m4trace:configure.in:9: -1- AC_SUBST([PACKAGE_NAME], [m4_ifdef([AC_PACKAGE_NAME],      ['AC_PACKAGE_NAME'])])
-+m4trace:configure.in:9: -1- AC_SUBST_TRACE([PACKAGE_NAME])
-+m4trace:configure.in:9: -1- m4_pattern_allow([^PACKAGE_NAME$])
-+m4trace:configure.in:9: -1- AC_SUBST([PACKAGE_TARNAME], [m4_ifdef([AC_PACKAGE_TARNAME],   ['AC_PACKAGE_TARNAME'])])
-+m4trace:configure.in:9: -1- AC_SUBST_TRACE([PACKAGE_TARNAME])
-+m4trace:configure.in:9: -1- m4_pattern_allow([^PACKAGE_TARNAME$])
-+m4trace:configure.in:9: -1- AC_SUBST([PACKAGE_VERSION], [m4_ifdef([AC_PACKAGE_VERSION],   ['AC_PACKAGE_VERSION'])])
-+m4trace:configure.in:9: -1- AC_SUBST_TRACE([PACKAGE_VERSION])
-+m4trace:configure.in:9: -1- m4_pattern_allow([^PACKAGE_VERSION$])
-+m4trace:configure.in:9: -1- AC_SUBST([PACKAGE_STRING], [m4_ifdef([AC_PACKAGE_STRING],    ['AC_PACKAGE_STRING'])])
-+m4trace:configure.in:9: -1- AC_SUBST_TRACE([PACKAGE_STRING])
-+m4trace:configure.in:9: -1- m4_pattern_allow([^PACKAGE_STRING$])
-+m4trace:configure.in:9: -1- AC_SUBST([PACKAGE_BUGREPORT], [m4_ifdef([AC_PACKAGE_BUGREPORT], ['AC_PACKAGE_BUGREPORT'])])
-+m4trace:configure.in:9: -1- AC_SUBST_TRACE([PACKAGE_BUGREPORT])
-+m4trace:configure.in:9: -1- m4_pattern_allow([^PACKAGE_BUGREPORT$])
-+m4trace:configure.in:9: -1- AC_SUBST([PACKAGE_URL], [m4_ifdef([AC_PACKAGE_URL],       ['AC_PACKAGE_URL'])])
-+m4trace:configure.in:9: -1- AC_SUBST_TRACE([PACKAGE_URL])
-+m4trace:configure.in:9: -1- m4_pattern_allow([^PACKAGE_URL$])
-+m4trace:configure.in:9: -1- AC_SUBST([exec_prefix], [NONE])
-+m4trace:configure.in:9: -1- AC_SUBST_TRACE([exec_prefix])
-+m4trace:configure.in:9: -1- m4_pattern_allow([^exec_prefix$])
-+m4trace:configure.in:9: -1- AC_SUBST([prefix], [NONE])
-+m4trace:configure.in:9: -1- AC_SUBST_TRACE([prefix])
-+m4trace:configure.in:9: -1- m4_pattern_allow([^prefix$])
-+m4trace:configure.in:9: -1- AC_SUBST([program_transform_name], [s,x,x,])
-+m4trace:configure.in:9: -1- AC_SUBST_TRACE([program_transform_name])
-+m4trace:configure.in:9: -1- m4_pattern_allow([^program_transform_name$])
-+m4trace:configure.in:9: -1- AC_SUBST([bindir], ['${exec_prefix}/bin'])
-+m4trace:configure.in:9: -1- AC_SUBST_TRACE([bindir])
-+m4trace:configure.in:9: -1- m4_pattern_allow([^bindir$])
-+m4trace:configure.in:9: -1- AC_SUBST([sbindir], ['${exec_prefix}/sbin'])
-+m4trace:configure.in:9: -1- AC_SUBST_TRACE([sbindir])
-+m4trace:configure.in:9: -1- m4_pattern_allow([^sbindir$])
-+m4trace:configure.in:9: -1- AC_SUBST([libexecdir], ['${exec_prefix}/libexec'])
-+m4trace:configure.in:9: -1- AC_SUBST_TRACE([libexecdir])
-+m4trace:configure.in:9: -1- m4_pattern_allow([^libexecdir$])
-+m4trace:configure.in:9: -1- AC_SUBST([datarootdir], ['${prefix}/share'])
-+m4trace:configure.in:9: -1- AC_SUBST_TRACE([datarootdir])
-+m4trace:configure.in:9: -1- m4_pattern_allow([^datarootdir$])
-+m4trace:configure.in:9: -1- AC_SUBST([datadir], ['${datarootdir}'])
-+m4trace:configure.in:9: -1- AC_SUBST_TRACE([datadir])
-+m4trace:configure.in:9: -1- m4_pattern_allow([^datadir$])
-+m4trace:configure.in:9: -1- AC_SUBST([sysconfdir], ['${prefix}/etc'])
-+m4trace:configure.in:9: -1- AC_SUBST_TRACE([sysconfdir])
-+m4trace:configure.in:9: -1- m4_pattern_allow([^sysconfdir$])
-+m4trace:configure.in:9: -1- AC_SUBST([sharedstatedir], ['${prefix}/com'])
-+m4trace:configure.in:9: -1- AC_SUBST_TRACE([sharedstatedir])
-+m4trace:configure.in:9: -1- m4_pattern_allow([^sharedstatedir$])
-+m4trace:configure.in:9: -1- AC_SUBST([localstatedir], ['${prefix}/var'])
-+m4trace:configure.in:9: -1- AC_SUBST_TRACE([localstatedir])
-+m4trace:configure.in:9: -1- m4_pattern_allow([^localstatedir$])
-+m4trace:configure.in:9: -1- AC_SUBST([includedir], ['${prefix}/include'])
-+m4trace:configure.in:9: -1- AC_SUBST_TRACE([includedir])
-+m4trace:configure.in:9: -1- m4_pattern_allow([^includedir$])
-+m4trace:configure.in:9: -1- AC_SUBST([oldincludedir], ['/usr/include'])
-+m4trace:configure.in:9: -1- AC_SUBST_TRACE([oldincludedir])
-+m4trace:configure.in:9: -1- m4_pattern_allow([^oldincludedir$])
-+m4trace:configure.in:9: -1- AC_SUBST([docdir], [m4_ifset([AC_PACKAGE_TARNAME],
-+				     ['${datarootdir}/doc/${PACKAGE_TARNAME}'],
-+				     ['${datarootdir}/doc/${PACKAGE}'])])
-+m4trace:configure.in:9: -1- AC_SUBST_TRACE([docdir])
-+m4trace:configure.in:9: -1- m4_pattern_allow([^docdir$])
-+m4trace:configure.in:9: -1- AC_SUBST([infodir], ['${datarootdir}/info'])
-+m4trace:configure.in:9: -1- AC_SUBST_TRACE([infodir])
-+m4trace:configure.in:9: -1- m4_pattern_allow([^infodir$])
-+m4trace:configure.in:9: -1- AC_SUBST([htmldir], ['${docdir}'])
-+m4trace:configure.in:9: -1- AC_SUBST_TRACE([htmldir])
-+m4trace:configure.in:9: -1- m4_pattern_allow([^htmldir$])
-+m4trace:configure.in:9: -1- AC_SUBST([dvidir], ['${docdir}'])
-+m4trace:configure.in:9: -1- AC_SUBST_TRACE([dvidir])
-+m4trace:configure.in:9: -1- m4_pattern_allow([^dvidir$])
-+m4trace:configure.in:9: -1- AC_SUBST([pdfdir], ['${docdir}'])
-+m4trace:configure.in:9: -1- AC_SUBST_TRACE([pdfdir])
-+m4trace:configure.in:9: -1- m4_pattern_allow([^pdfdir$])
-+m4trace:configure.in:9: -1- AC_SUBST([psdir], ['${docdir}'])
-+m4trace:configure.in:9: -1- AC_SUBST_TRACE([psdir])
-+m4trace:configure.in:9: -1- m4_pattern_allow([^psdir$])
-+m4trace:configure.in:9: -1- AC_SUBST([libdir], ['${exec_prefix}/lib'])
-+m4trace:configure.in:9: -1- AC_SUBST_TRACE([libdir])
-+m4trace:configure.in:9: -1- m4_pattern_allow([^libdir$])
-+m4trace:configure.in:9: -1- AC_SUBST([localedir], ['${datarootdir}/locale'])
-+m4trace:configure.in:9: -1- AC_SUBST_TRACE([localedir])
-+m4trace:configure.in:9: -1- m4_pattern_allow([^localedir$])
-+m4trace:configure.in:9: -1- AC_SUBST([mandir], ['${datarootdir}/man'])
-+m4trace:configure.in:9: -1- AC_SUBST_TRACE([mandir])
-+m4trace:configure.in:9: -1- m4_pattern_allow([^mandir$])
-+m4trace:configure.in:9: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_NAME])
-+m4trace:configure.in:9: -1- m4_pattern_allow([^PACKAGE_NAME$])
-+m4trace:configure.in:9: -1- AH_OUTPUT([PACKAGE_NAME], [/* Define to the full name of this package. */
-+@%:@undef PACKAGE_NAME])
-+m4trace:configure.in:9: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_TARNAME])
-+m4trace:configure.in:9: -1- m4_pattern_allow([^PACKAGE_TARNAME$])
-+m4trace:configure.in:9: -1- AH_OUTPUT([PACKAGE_TARNAME], [/* Define to the one symbol short name of this package. */
-+@%:@undef PACKAGE_TARNAME])
-+m4trace:configure.in:9: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_VERSION])
-+m4trace:configure.in:9: -1- m4_pattern_allow([^PACKAGE_VERSION$])
-+m4trace:configure.in:9: -1- AH_OUTPUT([PACKAGE_VERSION], [/* Define to the version of this package. */
-+@%:@undef PACKAGE_VERSION])
-+m4trace:configure.in:9: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_STRING])
-+m4trace:configure.in:9: -1- m4_pattern_allow([^PACKAGE_STRING$])
-+m4trace:configure.in:9: -1- AH_OUTPUT([PACKAGE_STRING], [/* Define to the full name and version of this package. */
-+@%:@undef PACKAGE_STRING])
-+m4trace:configure.in:9: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_BUGREPORT])
-+m4trace:configure.in:9: -1- m4_pattern_allow([^PACKAGE_BUGREPORT$])
-+m4trace:configure.in:9: -1- AH_OUTPUT([PACKAGE_BUGREPORT], [/* Define to the address where bug reports for this package should be sent. */
-+@%:@undef PACKAGE_BUGREPORT])
-+m4trace:configure.in:9: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_URL])
-+m4trace:configure.in:9: -1- m4_pattern_allow([^PACKAGE_URL$])
-+m4trace:configure.in:9: -1- AH_OUTPUT([PACKAGE_URL], [/* Define to the home page for this package. */
-+@%:@undef PACKAGE_URL])
-+m4trace:configure.in:9: -1- AC_SUBST([DEFS])
-+m4trace:configure.in:9: -1- AC_SUBST_TRACE([DEFS])
-+m4trace:configure.in:9: -1- m4_pattern_allow([^DEFS$])
-+m4trace:configure.in:9: -1- AC_SUBST([ECHO_C])
-+m4trace:configure.in:9: -1- AC_SUBST_TRACE([ECHO_C])
-+m4trace:configure.in:9: -1- m4_pattern_allow([^ECHO_C$])
-+m4trace:configure.in:9: -1- AC_SUBST([ECHO_N])
-+m4trace:configure.in:9: -1- AC_SUBST_TRACE([ECHO_N])
-+m4trace:configure.in:9: -1- m4_pattern_allow([^ECHO_N$])
-+m4trace:configure.in:9: -1- AC_SUBST([ECHO_T])
-+m4trace:configure.in:9: -1- AC_SUBST_TRACE([ECHO_T])
-+m4trace:configure.in:9: -1- m4_pattern_allow([^ECHO_T$])
-+m4trace:configure.in:9: -1- AC_SUBST([LIBS])
-+m4trace:configure.in:9: -1- AC_SUBST_TRACE([LIBS])
-+m4trace:configure.in:9: -1- m4_pattern_allow([^LIBS$])
-+m4trace:configure.in:9: -1- AC_SUBST([build_alias])
-+m4trace:configure.in:9: -1- AC_SUBST_TRACE([build_alias])
-+m4trace:configure.in:9: -1- m4_pattern_allow([^build_alias$])
-+m4trace:configure.in:9: -1- AC_SUBST([host_alias])
-+m4trace:configure.in:9: -1- AC_SUBST_TRACE([host_alias])
-+m4trace:configure.in:9: -1- m4_pattern_allow([^host_alias$])
-+m4trace:configure.in:9: -1- AC_SUBST([target_alias])
-+m4trace:configure.in:9: -1- AC_SUBST_TRACE([target_alias])
-+m4trace:configure.in:9: -1- m4_pattern_allow([^target_alias$])
-+m4trace:configure.in:15: -1- AC_CONFIG_AUX_DIR([..])
-+m4trace:configure.in:16: -1- AC_CANONICAL_TARGET
-+m4trace:configure.in:16: -1- AC_CANONICAL_HOST
-+m4trace:configure.in:16: -1- AC_CANONICAL_BUILD
-+m4trace:configure.in:16: -1- AC_REQUIRE_AUX_FILE([config.sub])
-+m4trace:configure.in:16: -1- AC_REQUIRE_AUX_FILE([config.guess])
-+m4trace:configure.in:16: -1- AC_SUBST([build], [$ac_cv_build])
-+m4trace:configure.in:16: -1- AC_SUBST_TRACE([build])
-+m4trace:configure.in:16: -1- m4_pattern_allow([^build$])
-+m4trace:configure.in:16: -1- AC_SUBST([build_cpu], [$[1]])
-+m4trace:configure.in:16: -1- AC_SUBST_TRACE([build_cpu])
-+m4trace:configure.in:16: -1- m4_pattern_allow([^build_cpu$])
-+m4trace:configure.in:16: -1- AC_SUBST([build_vendor], [$[2]])
-+m4trace:configure.in:16: -1- AC_SUBST_TRACE([build_vendor])
-+m4trace:configure.in:16: -1- m4_pattern_allow([^build_vendor$])
-+m4trace:configure.in:16: -1- AC_SUBST([build_os])
-+m4trace:configure.in:16: -1- AC_SUBST_TRACE([build_os])
-+m4trace:configure.in:16: -1- m4_pattern_allow([^build_os$])
-+m4trace:configure.in:16: -1- AC_SUBST([host], [$ac_cv_host])
-+m4trace:configure.in:16: -1- AC_SUBST_TRACE([host])
-+m4trace:configure.in:16: -1- m4_pattern_allow([^host$])
-+m4trace:configure.in:16: -1- AC_SUBST([host_cpu], [$[1]])
-+m4trace:configure.in:16: -1- AC_SUBST_TRACE([host_cpu])
-+m4trace:configure.in:16: -1- m4_pattern_allow([^host_cpu$])
-+m4trace:configure.in:16: -1- AC_SUBST([host_vendor], [$[2]])
-+m4trace:configure.in:16: -1- AC_SUBST_TRACE([host_vendor])
-+m4trace:configure.in:16: -1- m4_pattern_allow([^host_vendor$])
-+m4trace:configure.in:16: -1- AC_SUBST([host_os])
-+m4trace:configure.in:16: -1- AC_SUBST_TRACE([host_os])
-+m4trace:configure.in:16: -1- m4_pattern_allow([^host_os$])
-+m4trace:configure.in:16: -1- AC_SUBST([target], [$ac_cv_target])
-+m4trace:configure.in:16: -1- AC_SUBST_TRACE([target])
-+m4trace:configure.in:16: -1- m4_pattern_allow([^target$])
-+m4trace:configure.in:16: -1- AC_SUBST([target_cpu], [$[1]])
-+m4trace:configure.in:16: -1- AC_SUBST_TRACE([target_cpu])
-+m4trace:configure.in:16: -1- m4_pattern_allow([^target_cpu$])
-+m4trace:configure.in:16: -1- AC_SUBST([target_vendor], [$[2]])
-+m4trace:configure.in:16: -1- AC_SUBST_TRACE([target_vendor])
-+m4trace:configure.in:16: -1- m4_pattern_allow([^target_vendor$])
-+m4trace:configure.in:16: -1- AC_SUBST([target_os])
-+m4trace:configure.in:16: -1- AC_SUBST_TRACE([target_os])
-+m4trace:configure.in:16: -1- m4_pattern_allow([^target_os$])
-+m4trace:configure.in:17: -1- _m4_warn([obsolete], [The macro `AC_ISC_POSIX' is obsolete.
-+You should run autoupdate.], [../../lib/autoconf/specific.m4:464: AC_ISC_POSIX is expanded from...
-+configure.in:17: the top level])
-+m4trace:configure.in:17: -1- AC_SUBST([CC])
-+m4trace:configure.in:17: -1- AC_SUBST_TRACE([CC])
-+m4trace:configure.in:17: -1- m4_pattern_allow([^CC$])
-+m4trace:configure.in:17: -1- AC_SUBST([CFLAGS])
-+m4trace:configure.in:17: -1- AC_SUBST_TRACE([CFLAGS])
-+m4trace:configure.in:17: -1- m4_pattern_allow([^CFLAGS$])
-+m4trace:configure.in:17: -1- AC_SUBST([LDFLAGS])
-+m4trace:configure.in:17: -1- AC_SUBST_TRACE([LDFLAGS])
-+m4trace:configure.in:17: -1- m4_pattern_allow([^LDFLAGS$])
-+m4trace:configure.in:17: -1- AC_SUBST([LIBS])
-+m4trace:configure.in:17: -1- AC_SUBST_TRACE([LIBS])
-+m4trace:configure.in:17: -1- m4_pattern_allow([^LIBS$])
-+m4trace:configure.in:17: -1- AC_SUBST([CPPFLAGS])
-+m4trace:configure.in:17: -1- AC_SUBST_TRACE([CPPFLAGS])
-+m4trace:configure.in:17: -1- m4_pattern_allow([^CPPFLAGS$])
-+m4trace:configure.in:17: -1- AC_SUBST([CC])
-+m4trace:configure.in:17: -1- AC_SUBST_TRACE([CC])
-+m4trace:configure.in:17: -1- m4_pattern_allow([^CC$])
-+m4trace:configure.in:17: -1- AC_SUBST([CC])
-+m4trace:configure.in:17: -1- AC_SUBST_TRACE([CC])
-+m4trace:configure.in:17: -1- m4_pattern_allow([^CC$])
-+m4trace:configure.in:17: -1- AC_SUBST([CC])
-+m4trace:configure.in:17: -1- AC_SUBST_TRACE([CC])
-+m4trace:configure.in:17: -1- m4_pattern_allow([^CC$])
-+m4trace:configure.in:17: -1- AC_SUBST([CC])
-+m4trace:configure.in:17: -1- AC_SUBST_TRACE([CC])
-+m4trace:configure.in:17: -1- m4_pattern_allow([^CC$])
-+m4trace:configure.in:17: -1- AC_SUBST([ac_ct_CC])
-+m4trace:configure.in:17: -1- AC_SUBST_TRACE([ac_ct_CC])
-+m4trace:configure.in:17: -1- m4_pattern_allow([^ac_ct_CC$])
-+m4trace:configure.in:17: -1- AC_SUBST([EXEEXT], [$ac_cv_exeext])
-+m4trace:configure.in:17: -1- AC_SUBST_TRACE([EXEEXT])
-+m4trace:configure.in:17: -1- m4_pattern_allow([^EXEEXT$])
-+m4trace:configure.in:17: -1- AC_SUBST([OBJEXT], [$ac_cv_objext])
-+m4trace:configure.in:17: -1- AC_SUBST_TRACE([OBJEXT])
-+m4trace:configure.in:17: -1- m4_pattern_allow([^OBJEXT$])
-+m4trace:configure.in:22: -1- AM_INIT_AUTOMAKE([gas], [${BFD_VERSION}])
-+m4trace:configure.in:22: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$])
-+m4trace:configure.in:22: -1- AM_AUTOMAKE_VERSION([1.11.1])
-+m4trace:configure.in:22: -1- AC_REQUIRE_AUX_FILE([install-sh])
-+m4trace:configure.in:22: -1- AC_SUBST([INSTALL_PROGRAM])
-+m4trace:configure.in:22: -1- AC_SUBST_TRACE([INSTALL_PROGRAM])
-+m4trace:configure.in:22: -1- m4_pattern_allow([^INSTALL_PROGRAM$])
-+m4trace:configure.in:22: -1- AC_SUBST([INSTALL_SCRIPT])
-+m4trace:configure.in:22: -1- AC_SUBST_TRACE([INSTALL_SCRIPT])
-+m4trace:configure.in:22: -1- m4_pattern_allow([^INSTALL_SCRIPT$])
-+m4trace:configure.in:22: -1- AC_SUBST([INSTALL_DATA])
-+m4trace:configure.in:22: -1- AC_SUBST_TRACE([INSTALL_DATA])
-+m4trace:configure.in:22: -1- m4_pattern_allow([^INSTALL_DATA$])
-+m4trace:configure.in:22: -1- AC_SUBST([am__isrc], [' -I$(srcdir)'])
-+m4trace:configure.in:22: -1- AC_SUBST_TRACE([am__isrc])
-+m4trace:configure.in:22: -1- m4_pattern_allow([^am__isrc$])
-+m4trace:configure.in:22: -1- _AM_SUBST_NOTMAKE([am__isrc])
-+m4trace:configure.in:22: -1- AC_SUBST([CYGPATH_W])
-+m4trace:configure.in:22: -1- AC_SUBST_TRACE([CYGPATH_W])
-+m4trace:configure.in:22: -1- m4_pattern_allow([^CYGPATH_W$])
-+m4trace:configure.in:22: -1- AC_SUBST([PACKAGE], [gas])
-+m4trace:configure.in:22: -1- AC_SUBST_TRACE([PACKAGE])
-+m4trace:configure.in:22: -1- m4_pattern_allow([^PACKAGE$])
-+m4trace:configure.in:22: -1- AC_SUBST([VERSION], [${BFD_VERSION}])
-+m4trace:configure.in:22: -1- AC_SUBST_TRACE([VERSION])
-+m4trace:configure.in:22: -1- m4_pattern_allow([^VERSION$])
-+m4trace:configure.in:22: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE])
-+m4trace:configure.in:22: -1- m4_pattern_allow([^PACKAGE$])
-+m4trace:configure.in:22: -1- AH_OUTPUT([PACKAGE], [/* Name of package */
-+@%:@undef PACKAGE])
-+m4trace:configure.in:22: -1- AC_DEFINE_TRACE_LITERAL([VERSION])
-+m4trace:configure.in:22: -1- m4_pattern_allow([^VERSION$])
-+m4trace:configure.in:22: -1- AH_OUTPUT([VERSION], [/* Version number of package */
-+@%:@undef VERSION])
-+m4trace:configure.in:22: -1- AC_REQUIRE_AUX_FILE([missing])
-+m4trace:configure.in:22: -1- AC_SUBST([ACLOCAL])
-+m4trace:configure.in:22: -1- AC_SUBST_TRACE([ACLOCAL])
-+m4trace:configure.in:22: -1- m4_pattern_allow([^ACLOCAL$])
-+m4trace:configure.in:22: -1- AC_SUBST([AUTOCONF])
-+m4trace:configure.in:22: -1- AC_SUBST_TRACE([AUTOCONF])
-+m4trace:configure.in:22: -1- m4_pattern_allow([^AUTOCONF$])
-+m4trace:configure.in:22: -1- AC_SUBST([AUTOMAKE])
-+m4trace:configure.in:22: -1- AC_SUBST_TRACE([AUTOMAKE])
-+m4trace:configure.in:22: -1- m4_pattern_allow([^AUTOMAKE$])
-+m4trace:configure.in:22: -1- AC_SUBST([AUTOHEADER])
-+m4trace:configure.in:22: -1- AC_SUBST_TRACE([AUTOHEADER])
-+m4trace:configure.in:22: -1- m4_pattern_allow([^AUTOHEADER$])
-+m4trace:configure.in:22: -1- AC_SUBST([MAKEINFO])
-+m4trace:configure.in:22: -1- AC_SUBST_TRACE([MAKEINFO])
-+m4trace:configure.in:22: -1- m4_pattern_allow([^MAKEINFO$])
-+m4trace:configure.in:22: -1- AC_SUBST([install_sh])
-+m4trace:configure.in:22: -1- AC_SUBST_TRACE([install_sh])
-+m4trace:configure.in:22: -1- m4_pattern_allow([^install_sh$])
-+m4trace:configure.in:22: -1- AC_SUBST([STRIP])
-+m4trace:configure.in:22: -1- AC_SUBST_TRACE([STRIP])
-+m4trace:configure.in:22: -1- m4_pattern_allow([^STRIP$])
-+m4trace:configure.in:22: -1- AC_SUBST([INSTALL_STRIP_PROGRAM])
-+m4trace:configure.in:22: -1- AC_SUBST_TRACE([INSTALL_STRIP_PROGRAM])
-+m4trace:configure.in:22: -1- m4_pattern_allow([^INSTALL_STRIP_PROGRAM$])
-+m4trace:configure.in:22: -1- AC_REQUIRE_AUX_FILE([install-sh])
-+m4trace:configure.in:22: -1- AC_SUBST([MKDIR_P])
-+m4trace:configure.in:22: -1- AC_SUBST_TRACE([MKDIR_P])
-+m4trace:configure.in:22: -1- m4_pattern_allow([^MKDIR_P$])
-+m4trace:configure.in:22: -1- AC_SUBST([mkdir_p], ["$MKDIR_P"])
-+m4trace:configure.in:22: -1- AC_SUBST_TRACE([mkdir_p])
-+m4trace:configure.in:22: -1- m4_pattern_allow([^mkdir_p$])
-+m4trace:configure.in:22: -1- AC_SUBST([AWK])
-+m4trace:configure.in:22: -1- AC_SUBST_TRACE([AWK])
-+m4trace:configure.in:22: -1- m4_pattern_allow([^AWK$])
-+m4trace:configure.in:22: -1- AC_SUBST([SET_MAKE])
-+m4trace:configure.in:22: -1- AC_SUBST_TRACE([SET_MAKE])
-+m4trace:configure.in:22: -1- m4_pattern_allow([^SET_MAKE$])
-+m4trace:configure.in:22: -1- AC_SUBST([am__leading_dot])
-+m4trace:configure.in:22: -1- AC_SUBST_TRACE([am__leading_dot])
-+m4trace:configure.in:22: -1- m4_pattern_allow([^am__leading_dot$])
-+m4trace:configure.in:22: -1- AC_SUBST([AMTAR])
-+m4trace:configure.in:22: -1- AC_SUBST_TRACE([AMTAR])
-+m4trace:configure.in:22: -1- m4_pattern_allow([^AMTAR$])
-+m4trace:configure.in:22: -1- AC_SUBST([am__tar])
-+m4trace:configure.in:22: -1- AC_SUBST_TRACE([am__tar])
-+m4trace:configure.in:22: -1- m4_pattern_allow([^am__tar$])
-+m4trace:configure.in:22: -1- AC_SUBST([am__untar])
-+m4trace:configure.in:22: -1- AC_SUBST_TRACE([am__untar])
-+m4trace:configure.in:22: -1- m4_pattern_allow([^am__untar$])
-+m4trace:configure.in:22: -1- AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])
-+m4trace:configure.in:22: -1- AC_SUBST_TRACE([DEPDIR])
-+m4trace:configure.in:22: -1- m4_pattern_allow([^DEPDIR$])
-+m4trace:configure.in:22: -1- AC_SUBST([am__include])
-+m4trace:configure.in:22: -1- AC_SUBST_TRACE([am__include])
-+m4trace:configure.in:22: -1- m4_pattern_allow([^am__include$])
-+m4trace:configure.in:22: -1- AC_SUBST([am__quote])
-+m4trace:configure.in:22: -1- AC_SUBST_TRACE([am__quote])
-+m4trace:configure.in:22: -1- m4_pattern_allow([^am__quote$])
-+m4trace:configure.in:22: -1- AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-+m4trace:configure.in:22: -1- AC_SUBST([AMDEP_TRUE])
-+m4trace:configure.in:22: -1- AC_SUBST_TRACE([AMDEP_TRUE])
-+m4trace:configure.in:22: -1- m4_pattern_allow([^AMDEP_TRUE$])
-+m4trace:configure.in:22: -1- AC_SUBST([AMDEP_FALSE])
-+m4trace:configure.in:22: -1- AC_SUBST_TRACE([AMDEP_FALSE])
-+m4trace:configure.in:22: -1- m4_pattern_allow([^AMDEP_FALSE$])
-+m4trace:configure.in:22: -1- _AM_SUBST_NOTMAKE([AMDEP_TRUE])
-+m4trace:configure.in:22: -1- _AM_SUBST_NOTMAKE([AMDEP_FALSE])
-+m4trace:configure.in:22: -1- AC_SUBST([AMDEPBACKSLASH])
-+m4trace:configure.in:22: -1- AC_SUBST_TRACE([AMDEPBACKSLASH])
-+m4trace:configure.in:22: -1- m4_pattern_allow([^AMDEPBACKSLASH$])
-+m4trace:configure.in:22: -1- _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])
-+m4trace:configure.in:22: -1- AC_SUBST([CCDEPMODE], [depmode=$am_cv_CC_dependencies_compiler_type])
-+m4trace:configure.in:22: -1- AC_SUBST_TRACE([CCDEPMODE])
-+m4trace:configure.in:22: -1- m4_pattern_allow([^CCDEPMODE$])
-+m4trace:configure.in:22: -1- AM_CONDITIONAL([am__fastdepCC], [
-+  test "x$enable_dependency_tracking" != xno \
-+  && test "$am_cv_CC_dependencies_compiler_type" = gcc3])
-+m4trace:configure.in:22: -1- AC_SUBST([am__fastdepCC_TRUE])
-+m4trace:configure.in:22: -1- AC_SUBST_TRACE([am__fastdepCC_TRUE])
-+m4trace:configure.in:22: -1- m4_pattern_allow([^am__fastdepCC_TRUE$])
-+m4trace:configure.in:22: -1- AC_SUBST([am__fastdepCC_FALSE])
-+m4trace:configure.in:22: -1- AC_SUBST_TRACE([am__fastdepCC_FALSE])
-+m4trace:configure.in:22: -1- m4_pattern_allow([^am__fastdepCC_FALSE$])
-+m4trace:configure.in:22: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_TRUE])
-+m4trace:configure.in:22: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_FALSE])
-+m4trace:configure.in:24: -1- AC_SUBST([CC])
-+m4trace:configure.in:24: -1- AC_SUBST_TRACE([CC])
-+m4trace:configure.in:24: -1- m4_pattern_allow([^CC$])
-+m4trace:configure.in:24: -1- AC_SUBST([CFLAGS])
-+m4trace:configure.in:24: -1- AC_SUBST_TRACE([CFLAGS])
-+m4trace:configure.in:24: -1- m4_pattern_allow([^CFLAGS$])
-+m4trace:configure.in:24: -1- AC_SUBST([LDFLAGS])
-+m4trace:configure.in:24: -1- AC_SUBST_TRACE([LDFLAGS])
-+m4trace:configure.in:24: -1- m4_pattern_allow([^LDFLAGS$])
-+m4trace:configure.in:24: -1- AC_SUBST([LIBS])
-+m4trace:configure.in:24: -1- AC_SUBST_TRACE([LIBS])
-+m4trace:configure.in:24: -1- m4_pattern_allow([^LIBS$])
-+m4trace:configure.in:24: -1- AC_SUBST([CPPFLAGS])
-+m4trace:configure.in:24: -1- AC_SUBST_TRACE([CPPFLAGS])
-+m4trace:configure.in:24: -1- m4_pattern_allow([^CPPFLAGS$])
-+m4trace:configure.in:24: -1- AC_SUBST([CC])
-+m4trace:configure.in:24: -1- AC_SUBST_TRACE([CC])
-+m4trace:configure.in:24: -1- m4_pattern_allow([^CC$])
-+m4trace:configure.in:24: -1- AC_SUBST([CC])
-+m4trace:configure.in:24: -1- AC_SUBST_TRACE([CC])
-+m4trace:configure.in:24: -1- m4_pattern_allow([^CC$])
-+m4trace:configure.in:24: -1- AC_SUBST([CC])
-+m4trace:configure.in:24: -1- AC_SUBST_TRACE([CC])
-+m4trace:configure.in:24: -1- m4_pattern_allow([^CC$])
-+m4trace:configure.in:24: -1- AC_SUBST([CC])
-+m4trace:configure.in:24: -1- AC_SUBST_TRACE([CC])
-+m4trace:configure.in:24: -1- m4_pattern_allow([^CC$])
-+m4trace:configure.in:24: -1- AC_SUBST([ac_ct_CC])
-+m4trace:configure.in:24: -1- AC_SUBST_TRACE([ac_ct_CC])
-+m4trace:configure.in:24: -1- m4_pattern_allow([^ac_ct_CC$])
-+m4trace:configure.in:25: -1- _m4_warn([obsolete], [The macro `AC_GNU_SOURCE' is obsolete.
-+You should run autoupdate.], [../../lib/autoconf/specific.m4:332: AC_GNU_SOURCE is expanded from...
-+configure.in:25: the top level])
-+m4trace:configure.in:25: -1- AC_SUBST([CPP])
-+m4trace:configure.in:25: -1- AC_SUBST_TRACE([CPP])
-+m4trace:configure.in:25: -1- m4_pattern_allow([^CPP$])
-+m4trace:configure.in:25: -1- AC_SUBST([CPPFLAGS])
-+m4trace:configure.in:25: -1- AC_SUBST_TRACE([CPPFLAGS])
-+m4trace:configure.in:25: -1- m4_pattern_allow([^CPPFLAGS$])
-+m4trace:configure.in:25: -1- AC_SUBST([CPP])
-+m4trace:configure.in:25: -1- AC_SUBST_TRACE([CPP])
-+m4trace:configure.in:25: -1- m4_pattern_allow([^CPP$])
-+m4trace:configure.in:25: -1- AC_SUBST([GREP])
-+m4trace:configure.in:25: -1- AC_SUBST_TRACE([GREP])
-+m4trace:configure.in:25: -1- m4_pattern_allow([^GREP$])
-+m4trace:configure.in:25: -1- AC_SUBST([EGREP])
-+m4trace:configure.in:25: -1- AC_SUBST_TRACE([EGREP])
-+m4trace:configure.in:25: -1- m4_pattern_allow([^EGREP$])
-+m4trace:configure.in:25: -1- AC_DEFINE_TRACE_LITERAL([STDC_HEADERS])
-+m4trace:configure.in:25: -1- m4_pattern_allow([^STDC_HEADERS$])
-+m4trace:configure.in:25: -1- AH_OUTPUT([STDC_HEADERS], [/* Define to 1 if you have the ANSI C header files. */
-+@%:@undef STDC_HEADERS])
-+m4trace:configure.in:25: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define to 1 if you have the <sys/types.h> header file. */
-+@%:@undef HAVE_SYS_TYPES_H])
-+m4trace:configure.in:25: -1- AH_OUTPUT([HAVE_SYS_STAT_H], [/* Define to 1 if you have the <sys/stat.h> header file. */
-+@%:@undef HAVE_SYS_STAT_H])
-+m4trace:configure.in:25: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the <stdlib.h> header file. */
-+@%:@undef HAVE_STDLIB_H])
-+m4trace:configure.in:25: -1- AH_OUTPUT([HAVE_STRING_H], [/* Define to 1 if you have the <string.h> header file. */
-+@%:@undef HAVE_STRING_H])
-+m4trace:configure.in:25: -1- AH_OUTPUT([HAVE_MEMORY_H], [/* Define to 1 if you have the <memory.h> header file. */
-+@%:@undef HAVE_MEMORY_H])
-+m4trace:configure.in:25: -1- AH_OUTPUT([HAVE_STRINGS_H], [/* Define to 1 if you have the <strings.h> header file. */
-+@%:@undef HAVE_STRINGS_H])
-+m4trace:configure.in:25: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define to 1 if you have the <inttypes.h> header file. */
-+@%:@undef HAVE_INTTYPES_H])
-+m4trace:configure.in:25: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define to 1 if you have the <stdint.h> header file. */
-+@%:@undef HAVE_STDINT_H])
-+m4trace:configure.in:25: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
-+@%:@undef HAVE_UNISTD_H])
-+m4trace:configure.in:25: -1- AC_DEFINE_TRACE_LITERAL([_POSIX_SOURCE])
-+m4trace:configure.in:25: -1- m4_pattern_allow([^_POSIX_SOURCE$])
-+m4trace:configure.in:25: -1- AH_OUTPUT([_POSIX_SOURCE], [/* Define to 1 if you need to in order for `stat\' and other things to work. */
-+@%:@undef _POSIX_SOURCE])
-+m4trace:configure.in:25: -1- AC_DEFINE_TRACE_LITERAL([_POSIX_1_SOURCE])
-+m4trace:configure.in:25: -1- m4_pattern_allow([^_POSIX_1_SOURCE$])
-+m4trace:configure.in:25: -1- AH_OUTPUT([_POSIX_1_SOURCE], [/* Define to 2 if the system does not provide POSIX.1 features except with
-+   this defined. */
-+@%:@undef _POSIX_1_SOURCE])
-+m4trace:configure.in:25: -1- AC_DEFINE_TRACE_LITERAL([_MINIX])
-+m4trace:configure.in:25: -1- m4_pattern_allow([^_MINIX$])
-+m4trace:configure.in:25: -1- AH_OUTPUT([_MINIX], [/* Define to 1 if on MINIX. */
-+@%:@undef _MINIX])
-+m4trace:configure.in:25: -1- AH_OUTPUT([USE_SYSTEM_EXTENSIONS], [/* Enable extensions on AIX 3, Interix.  */
-+#ifndef _ALL_SOURCE
-+# undef _ALL_SOURCE
-+#endif
-+/* Enable GNU extensions on systems that have them.  */
-+#ifndef _GNU_SOURCE
-+# undef _GNU_SOURCE
-+#endif
-+/* Enable threading extensions on Solaris.  */
-+#ifndef _POSIX_PTHREAD_SEMANTICS
-+# undef _POSIX_PTHREAD_SEMANTICS
-+#endif
-+/* Enable extensions on HP NonStop.  */
-+#ifndef _TANDEM_SOURCE
-+# undef _TANDEM_SOURCE
-+#endif
-+/* Enable general extensions on Solaris.  */
-+#ifndef __EXTENSIONS__
-+# undef __EXTENSIONS__
-+#endif
-+])
-+m4trace:configure.in:25: -1- AC_DEFINE_TRACE_LITERAL([__EXTENSIONS__])
-+m4trace:configure.in:25: -1- m4_pattern_allow([^__EXTENSIONS__$])
-+m4trace:configure.in:25: -1- AC_DEFINE_TRACE_LITERAL([_ALL_SOURCE])
-+m4trace:configure.in:25: -1- m4_pattern_allow([^_ALL_SOURCE$])
-+m4trace:configure.in:25: -1- AC_DEFINE_TRACE_LITERAL([_GNU_SOURCE])
-+m4trace:configure.in:25: -1- m4_pattern_allow([^_GNU_SOURCE$])
-+m4trace:configure.in:25: -1- AC_DEFINE_TRACE_LITERAL([_POSIX_PTHREAD_SEMANTICS])
-+m4trace:configure.in:25: -1- m4_pattern_allow([^_POSIX_PTHREAD_SEMANTICS$])
-+m4trace:configure.in:25: -1- AC_DEFINE_TRACE_LITERAL([_TANDEM_SOURCE])
-+m4trace:configure.in:25: -1- m4_pattern_allow([^_TANDEM_SOURCE$])
-+m4trace:configure.in:27: -1- AC_DEFINE_TRACE_LITERAL([_FILE_OFFSET_BITS])
-+m4trace:configure.in:27: -1- m4_pattern_allow([^_FILE_OFFSET_BITS$])
-+m4trace:configure.in:27: -1- AH_OUTPUT([_FILE_OFFSET_BITS], [/* Number of bits in a file offset, on hosts where this is settable. */
-+@%:@undef _FILE_OFFSET_BITS])
-+m4trace:configure.in:27: -1- AC_DEFINE_TRACE_LITERAL([_LARGE_FILES])
-+m4trace:configure.in:27: -1- m4_pattern_allow([^_LARGE_FILES$])
-+m4trace:configure.in:27: -1- AH_OUTPUT([_LARGE_FILES], [/* Define for large files, on AIX-style hosts. */
-+@%:@undef _LARGE_FILES])
-+m4trace:configure.in:29: -1- LT_INIT
-+m4trace:configure.in:29: -1- m4_pattern_forbid([^_?LT_[A-Z_]+$])
-+m4trace:configure.in:29: -1- m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])
-+m4trace:configure.in:29: -1- AC_REQUIRE_AUX_FILE([ltmain.sh])
-+m4trace:configure.in:29: -1- AC_SUBST([LIBTOOL])
-+m4trace:configure.in:29: -1- AC_SUBST_TRACE([LIBTOOL])
-+m4trace:configure.in:29: -1- m4_pattern_allow([^LIBTOOL$])
-+m4trace:configure.in:29: -1- AC_SUBST([SED])
-+m4trace:configure.in:29: -1- AC_SUBST_TRACE([SED])
-+m4trace:configure.in:29: -1- m4_pattern_allow([^SED$])
-+m4trace:configure.in:29: -1- AC_SUBST([FGREP])
-+m4trace:configure.in:29: -1- AC_SUBST_TRACE([FGREP])
-+m4trace:configure.in:29: -1- m4_pattern_allow([^FGREP$])
-+m4trace:configure.in:29: -1- AC_SUBST([GREP])
-+m4trace:configure.in:29: -1- AC_SUBST_TRACE([GREP])
-+m4trace:configure.in:29: -1- m4_pattern_allow([^GREP$])
-+m4trace:configure.in:29: -1- AC_SUBST([LD])
-+m4trace:configure.in:29: -1- AC_SUBST_TRACE([LD])
-+m4trace:configure.in:29: -1- m4_pattern_allow([^LD$])
-+m4trace:configure.in:29: -1- AC_SUBST([DUMPBIN])
-+m4trace:configure.in:29: -1- AC_SUBST_TRACE([DUMPBIN])
-+m4trace:configure.in:29: -1- m4_pattern_allow([^DUMPBIN$])
-+m4trace:configure.in:29: -1- AC_SUBST([ac_ct_DUMPBIN])
-+m4trace:configure.in:29: -1- AC_SUBST_TRACE([ac_ct_DUMPBIN])
-+m4trace:configure.in:29: -1- m4_pattern_allow([^ac_ct_DUMPBIN$])
-+m4trace:configure.in:29: -1- AC_SUBST([DUMPBIN])
-+m4trace:configure.in:29: -1- AC_SUBST_TRACE([DUMPBIN])
-+m4trace:configure.in:29: -1- m4_pattern_allow([^DUMPBIN$])
-+m4trace:configure.in:29: -1- AC_SUBST([NM])
-+m4trace:configure.in:29: -1- AC_SUBST_TRACE([NM])
-+m4trace:configure.in:29: -1- m4_pattern_allow([^NM$])
-+m4trace:configure.in:29: -1- AC_SUBST([LN_S], [$as_ln_s])
-+m4trace:configure.in:29: -1- AC_SUBST_TRACE([LN_S])
-+m4trace:configure.in:29: -1- m4_pattern_allow([^LN_S$])
-+m4trace:configure.in:29: -1- AC_SUBST([OBJDUMP])
-+m4trace:configure.in:29: -1- AC_SUBST_TRACE([OBJDUMP])
-+m4trace:configure.in:29: -1- m4_pattern_allow([^OBJDUMP$])
-+m4trace:configure.in:29: -1- AC_SUBST([OBJDUMP])
-+m4trace:configure.in:29: -1- AC_SUBST_TRACE([OBJDUMP])
-+m4trace:configure.in:29: -1- m4_pattern_allow([^OBJDUMP$])
-+m4trace:configure.in:29: -1- AC_SUBST([AR])
-+m4trace:configure.in:29: -1- AC_SUBST_TRACE([AR])
-+m4trace:configure.in:29: -1- m4_pattern_allow([^AR$])
-+m4trace:configure.in:29: -1- AC_SUBST([STRIP])
-+m4trace:configure.in:29: -1- AC_SUBST_TRACE([STRIP])
-+m4trace:configure.in:29: -1- m4_pattern_allow([^STRIP$])
-+m4trace:configure.in:29: -1- AC_SUBST([RANLIB])
-+m4trace:configure.in:29: -1- AC_SUBST_TRACE([RANLIB])
-+m4trace:configure.in:29: -1- m4_pattern_allow([^RANLIB$])
-+m4trace:configure.in:29: -1- m4_pattern_allow([LT_OBJDIR])
-+m4trace:configure.in:29: -1- AC_DEFINE_TRACE_LITERAL([LT_OBJDIR])
-+m4trace:configure.in:29: -1- m4_pattern_allow([^LT_OBJDIR$])
-+m4trace:configure.in:29: -1- AH_OUTPUT([LT_OBJDIR], [/* Define to the sub-directory in which libtool stores uninstalled libraries.
-+   */
-+@%:@undef LT_OBJDIR])
-+m4trace:configure.in:29: -1- LT_SUPPORTED_TAG([CC])
-+m4trace:configure.in:29: -1- AC_SUBST([DSYMUTIL])
-+m4trace:configure.in:29: -1- AC_SUBST_TRACE([DSYMUTIL])
-+m4trace:configure.in:29: -1- m4_pattern_allow([^DSYMUTIL$])
-+m4trace:configure.in:29: -1- AC_SUBST([NMEDIT])
-+m4trace:configure.in:29: -1- AC_SUBST_TRACE([NMEDIT])
-+m4trace:configure.in:29: -1- m4_pattern_allow([^NMEDIT$])
-+m4trace:configure.in:29: -1- AC_SUBST([LIPO])
-+m4trace:configure.in:29: -1- AC_SUBST_TRACE([LIPO])
-+m4trace:configure.in:29: -1- m4_pattern_allow([^LIPO$])
-+m4trace:configure.in:29: -1- AC_SUBST([OTOOL])
-+m4trace:configure.in:29: -1- AC_SUBST_TRACE([OTOOL])
-+m4trace:configure.in:29: -1- m4_pattern_allow([^OTOOL$])
-+m4trace:configure.in:29: -1- AC_SUBST([OTOOL64])
-+m4trace:configure.in:29: -1- AC_SUBST_TRACE([OTOOL64])
-+m4trace:configure.in:29: -1- m4_pattern_allow([^OTOOL64$])
-+m4trace:configure.in:29: -1- AH_OUTPUT([HAVE_DLFCN_H], [/* Define to 1 if you have the <dlfcn.h> header file. */
-+@%:@undef HAVE_DLFCN_H])
-+m4trace:configure.in:29: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DLFCN_H])
-+m4trace:configure.in:29: -1- m4_pattern_allow([^HAVE_DLFCN_H$])
-+m4trace:configure.in:51: -1- AC_DEFINE_TRACE_LITERAL([ENABLE_CHECKING])
-+m4trace:configure.in:51: -1- m4_pattern_allow([^ENABLE_CHECKING$])
-+m4trace:configure.in:51: -1- AH_OUTPUT([ENABLE_CHECKING], [/* Define if you want run-time sanity checks. */
-+@%:@undef ENABLE_CHECKING])
-+m4trace:configure.in:56: -1- AC_SUBST([WARN_CFLAGS])
-+m4trace:configure.in:56: -1- AC_SUBST_TRACE([WARN_CFLAGS])
-+m4trace:configure.in:56: -1- m4_pattern_allow([^WARN_CFLAGS$])
-+m4trace:configure.in:56: -1- AC_SUBST([NO_WERROR])
-+m4trace:configure.in:56: -1- AC_SUBST_TRACE([NO_WERROR])
-+m4trace:configure.in:56: -1- m4_pattern_allow([^NO_WERROR$])
-+m4trace:configure.in:59: -1- AC_CONFIG_HEADERS([config.h:config.in])
-+m4trace:configure.in:66: -1- AC_CONFIG_FILES([gdb.ini:gdbinit.in])
-+m4trace:configure.in:70: -1- AC_CONFIG_FILES([.gdbinit:gdbinit.in])
-+m4trace:configure.in:73: -1- AC_SUBST([GDBINIT])
-+m4trace:configure.in:73: -1- AC_SUBST_TRACE([GDBINIT])
-+m4trace:configure.in:73: -1- m4_pattern_allow([^GDBINIT$])
-+m4trace:configure.in:76: -1- AH_OUTPUT([WORDS_BIGENDIAN], [/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
-+   significant byte first (like Motorola and SPARC, unlike Intel). */
-+#if defined AC_APPLE_UNIVERSAL_BUILD
-+# if defined __BIG_ENDIAN__
-+#  define WORDS_BIGENDIAN 1
-+# endif
-+#else
-+# ifndef WORDS_BIGENDIAN
-+#  undef WORDS_BIGENDIAN
-+# endif
-+#endif])
-+m4trace:configure.in:76: -1- AC_DEFINE_TRACE_LITERAL([WORDS_BIGENDIAN])
-+m4trace:configure.in:76: -1- m4_pattern_allow([^WORDS_BIGENDIAN$])
-+m4trace:configure.in:76: -1- AC_DEFINE_TRACE_LITERAL([AC_APPLE_UNIVERSAL_BUILD])
-+m4trace:configure.in:76: -1- m4_pattern_allow([^AC_APPLE_UNIVERSAL_BUILD$])
-+m4trace:configure.in:76: -1- AH_OUTPUT([AC_APPLE_UNIVERSAL_BUILD], [/* Define if building universal (internal helper macro) */
-+@%:@undef AC_APPLE_UNIVERSAL_BUILD])
-+m4trace:configure.in:111: -1- AC_DEFINE_TRACE_LITERAL([DEFAULT_CRIS_ARCH])
-+m4trace:configure.in:111: -1- m4_pattern_allow([^DEFAULT_CRIS_ARCH$])
-+m4trace:configure.in:111: -1- AH_OUTPUT([DEFAULT_CRIS_ARCH], [/* Default CRIS architecture. */
-+@%:@undef DEFAULT_CRIS_ARCH])
-+m4trace:configure.in:126: -1- AC_DEFINE_TRACE_LITERAL([SCO_ELF])
-+m4trace:configure.in:126: -1- m4_pattern_allow([^SCO_ELF$])
-+m4trace:configure.in:126: -1- AH_OUTPUT([SCO_ELF], [/* Define if defaulting to ELF on SCO 5. */
-+@%:@undef SCO_ELF])
-+m4trace:configure.in:133: -1- AC_DEFINE_TRACE_LITERAL([STRICTCOFF])
-+m4trace:configure.in:133: -1- m4_pattern_allow([^STRICTCOFF$])
-+m4trace:configure.in:133: -1- AH_OUTPUT([STRICTCOFF], [/* Using strict COFF? */
-+@%:@undef STRICTCOFF])
-+m4trace:configure.in:152: -1- AC_DEFINE_TRACE_LITERAL([AIX_WEAK_SUPPORT])
-+m4trace:configure.in:152: -1- m4_pattern_allow([^AIX_WEAK_SUPPORT$])
-+m4trace:configure.in:152: -1- AH_OUTPUT([AIX_WEAK_SUPPORT], [/* Define if using AIX 5.2 value for C_WEAKEXT. */
-+@%:@undef AIX_WEAK_SUPPORT])
-+m4trace:configure.in:163: -1- AC_DEFINE_TRACE_LITERAL([TARGET_SOLARIS_COMMENT])
-+m4trace:configure.in:163: -1- m4_pattern_allow([^TARGET_SOLARIS_COMMENT$])
-+m4trace:configure.in:163: -1- AH_OUTPUT([TARGET_SOLARIS_COMMENT], [/* Define if default target is PowerPC Solaris. */
-+@%:@undef TARGET_SOLARIS_COMMENT])
-+m4trace:configure.in:172: -1- AC_DEFINE_TRACE_LITERAL([TARGET_SYMBIAN])
-+m4trace:configure.in:172: -1- m4_pattern_allow([^TARGET_SYMBIAN$])
-+m4trace:configure.in:172: -1- AH_OUTPUT([TARGET_SYMBIAN], [/* Define if target is Symbian OS. */
-+@%:@undef TARGET_SYMBIAN])
-+m4trace:configure.in:184: -1- AC_DEFINE_TRACE_LITERAL([TARGET_BYTES_BIG_ENDIAN])
-+m4trace:configure.in:184: -1- m4_pattern_allow([^TARGET_BYTES_BIG_ENDIAN$])
-+m4trace:configure.in:184: -1- AH_OUTPUT([TARGET_BYTES_BIG_ENDIAN], [/* Define as 1 if big endian. */
-+@%:@undef TARGET_BYTES_BIG_ENDIAN])
-+m4trace:configure.in:266: -1- AC_DEFINE_TRACE_LITERAL([MIPS_CPU_STRING_DEFAULT])
-+m4trace:configure.in:266: -1- m4_pattern_allow([^MIPS_CPU_STRING_DEFAULT$])
-+m4trace:configure.in:266: -1- AH_OUTPUT([MIPS_CPU_STRING_DEFAULT], [/* Default CPU for MIPS targets. */
-+@%:@undef MIPS_CPU_STRING_DEFAULT])
-+m4trace:configure.in:268: -1- AC_DEFINE_TRACE_LITERAL([USE_E_MIPS_ABI_O32])
-+m4trace:configure.in:268: -1- m4_pattern_allow([^USE_E_MIPS_ABI_O32$])
-+m4trace:configure.in:268: -1- AH_OUTPUT([USE_E_MIPS_ABI_O32], [/* Allow use of E_MIPS_ABI_O32 on MIPS targets. */
-+@%:@undef USE_E_MIPS_ABI_O32])
-+m4trace:configure.in:270: -1- AC_DEFINE_TRACE_LITERAL([MIPS_DEFAULT_64BIT])
-+m4trace:configure.in:270: -1- m4_pattern_allow([^MIPS_DEFAULT_64BIT$])
-+m4trace:configure.in:270: -1- AH_OUTPUT([MIPS_DEFAULT_64BIT], [/* Generate 64-bit code by default on MIPS targets. */
-+@%:@undef MIPS_DEFAULT_64BIT])
-+m4trace:configure.in:272: -1- AC_DEFINE_TRACE_LITERAL([MIPS_DEFAULT_ABI])
-+m4trace:configure.in:272: -1- m4_pattern_allow([^MIPS_DEFAULT_ABI$])
-+m4trace:configure.in:272: -1- AH_OUTPUT([MIPS_DEFAULT_ABI], [/* Choose a default ABI for MIPS targets. */
-+@%:@undef MIPS_DEFAULT_ABI])
-+m4trace:configure.in:352: -1- AC_DEFINE_TRACE_LITERAL([DEFAULT_ARCH])
-+m4trace:configure.in:352: -1- m4_pattern_allow([^DEFAULT_ARCH$])
-+m4trace:configure.in:352: -1- AH_OUTPUT([DEFAULT_ARCH], [/* Default architecture. */
-+@%:@undef DEFAULT_ARCH])
-+m4trace:configure.in:487: -1- AC_SUBST([cgen_cpu_prefix])
-+m4trace:configure.in:487: -1- AC_SUBST_TRACE([cgen_cpu_prefix])
-+m4trace:configure.in:487: -1- m4_pattern_allow([^cgen_cpu_prefix$])
-+m4trace:configure.in:488: -1- AC_DEFINE_TRACE_LITERAL([USING_CGEN])
-+m4trace:configure.in:488: -1- m4_pattern_allow([^USING_CGEN$])
-+m4trace:configure.in:488: -1- AH_OUTPUT([USING_CGEN], [/* Using cgen code? */
-+@%:@undef USING_CGEN])
-+m4trace:configure.in:507: -1- AC_DEFINE_TRACE_LITERAL([I386COFF])
-+m4trace:configure.in:507: -1- m4_pattern_allow([^I386COFF$])
-+m4trace:configure.in:507: -1- AH_OUTPUT([I386COFF], [/* Using i386 COFF? */
-+@%:@undef I386COFF])
-+m4trace:configure.in:508: -1- AC_DEFINE_TRACE_LITERAL([M68KCOFF])
-+m4trace:configure.in:508: -1- m4_pattern_allow([^M68KCOFF$])
-+m4trace:configure.in:508: -1- AH_OUTPUT([M68KCOFF], [/* Using m68k COFF? */
-+@%:@undef M68KCOFF])
-+m4trace:configure.in:509: -1- AC_DEFINE_TRACE_LITERAL([M88KCOFF])
-+m4trace:configure.in:509: -1- m4_pattern_allow([^M88KCOFF$])
-+m4trace:configure.in:509: -1- AH_OUTPUT([M88KCOFF], [/* Using m88k COFF? */
-+@%:@undef M88KCOFF])
-+m4trace:configure.in:510: -1- AC_DEFINE_TRACE_LITERAL([I386COFF])
-+m4trace:configure.in:510: -1- m4_pattern_allow([^I386COFF$])
-+m4trace:configure.in:510: -1- AH_OUTPUT([I386COFF], [/* Using i386 COFF? */
-+@%:@undef I386COFF])
-+m4trace:configure.in:554: -1- AC_DEFINE_TRACE_LITERAL([OBJ_MAYBE_AOUT])
-+m4trace:configure.in:554: -1- m4_pattern_allow([^OBJ_MAYBE_AOUT$])
-+m4trace:configure.in:554: -1- AH_OUTPUT([OBJ_MAYBE_AOUT], [/* a.out support? */
-+@%:@undef OBJ_MAYBE_AOUT])
-+m4trace:configure.in:555: -1- AC_DEFINE_TRACE_LITERAL([OBJ_MAYBE_BOUT])
-+m4trace:configure.in:555: -1- m4_pattern_allow([^OBJ_MAYBE_BOUT$])
-+m4trace:configure.in:555: -1- AH_OUTPUT([OBJ_MAYBE_BOUT], [/* b.out support? */
-+@%:@undef OBJ_MAYBE_BOUT])
-+m4trace:configure.in:556: -1- AC_DEFINE_TRACE_LITERAL([OBJ_MAYBE_COFF])
-+m4trace:configure.in:556: -1- m4_pattern_allow([^OBJ_MAYBE_COFF$])
-+m4trace:configure.in:556: -1- AH_OUTPUT([OBJ_MAYBE_COFF], [/* COFF support? */
-+@%:@undef OBJ_MAYBE_COFF])
-+m4trace:configure.in:557: -1- AC_DEFINE_TRACE_LITERAL([OBJ_MAYBE_ECOFF])
-+m4trace:configure.in:557: -1- m4_pattern_allow([^OBJ_MAYBE_ECOFF$])
-+m4trace:configure.in:557: -1- AH_OUTPUT([OBJ_MAYBE_ECOFF], [/* ECOFF support? */
-+@%:@undef OBJ_MAYBE_ECOFF])
-+m4trace:configure.in:558: -1- AC_DEFINE_TRACE_LITERAL([OBJ_MAYBE_ELF])
-+m4trace:configure.in:558: -1- m4_pattern_allow([^OBJ_MAYBE_ELF$])
-+m4trace:configure.in:558: -1- AH_OUTPUT([OBJ_MAYBE_ELF], [/* ELF support? */
-+@%:@undef OBJ_MAYBE_ELF])
-+m4trace:configure.in:559: -1- AC_DEFINE_TRACE_LITERAL([OBJ_MAYBE_GENERIC])
-+m4trace:configure.in:559: -1- m4_pattern_allow([^OBJ_MAYBE_GENERIC$])
-+m4trace:configure.in:559: -1- AH_OUTPUT([OBJ_MAYBE_GENERIC], [/* generic support? */
-+@%:@undef OBJ_MAYBE_GENERIC])
-+m4trace:configure.in:560: -1- AC_DEFINE_TRACE_LITERAL([OBJ_MAYBE_SOM])
-+m4trace:configure.in:560: -1- m4_pattern_allow([^OBJ_MAYBE_SOM$])
-+m4trace:configure.in:560: -1- AH_OUTPUT([OBJ_MAYBE_SOM], [/* SOM support? */
-+@%:@undef OBJ_MAYBE_SOM])
-+m4trace:configure.in:574: -1- AC_DEFINE_TRACE_LITERAL([USE_EMULATIONS])
-+m4trace:configure.in:574: -1- m4_pattern_allow([^USE_EMULATIONS$])
-+m4trace:configure.in:574: -1- AH_OUTPUT([USE_EMULATIONS], [/* Use emulation support? */
-+@%:@undef USE_EMULATIONS])
-+m4trace:configure.in:577: -1- AC_SUBST([extra_objects])
-+m4trace:configure.in:577: -1- AC_SUBST_TRACE([extra_objects])
-+m4trace:configure.in:577: -1- m4_pattern_allow([^extra_objects$])
-+m4trace:configure.in:578: -1- AC_DEFINE_TRACE_LITERAL([EMULATIONS])
-+m4trace:configure.in:578: -1- m4_pattern_allow([^EMULATIONS$])
-+m4trace:configure.in:578: -1- AH_OUTPUT([EMULATIONS], [/* Supported emulations. */
-+@%:@undef EMULATIONS])
-+m4trace:configure.in:579: -1- AC_DEFINE_TRACE_LITERAL([DEFAULT_EMULATION])
-+m4trace:configure.in:579: -1- m4_pattern_allow([^DEFAULT_EMULATION$])
-+m4trace:configure.in:579: -1- AH_OUTPUT([DEFAULT_EMULATION], [/* Default emulation. */
-+@%:@undef DEFAULT_EMULATION])
-+m4trace:configure.in:590: -1- AC_SUBST([target_cpu_type])
-+m4trace:configure.in:590: -1- AC_SUBST_TRACE([target_cpu_type])
-+m4trace:configure.in:590: -1- m4_pattern_allow([^target_cpu_type$])
-+m4trace:configure.in:591: -1- AC_SUBST([obj_format])
-+m4trace:configure.in:591: -1- AC_SUBST_TRACE([obj_format])
-+m4trace:configure.in:591: -1- m4_pattern_allow([^obj_format$])
-+m4trace:configure.in:592: -1- AC_SUBST([te_file])
-+m4trace:configure.in:592: -1- AC_SUBST_TRACE([te_file])
-+m4trace:configure.in:592: -1- m4_pattern_allow([^te_file$])
-+m4trace:configure.in:593: -1- AC_SUBST([install_tooldir])
-+m4trace:configure.in:593: -1- AC_SUBST_TRACE([install_tooldir])
-+m4trace:configure.in:593: -1- m4_pattern_allow([^install_tooldir$])
-+m4trace:configure.in:594: -1- AC_SUBST([atof])
-+m4trace:configure.in:594: -1- AC_SUBST_TRACE([atof])
-+m4trace:configure.in:594: -1- m4_pattern_allow([^atof$])
-+m4trace:configure.in:604: -1- AC_SUBST([OPCODES_LIB])
-+m4trace:configure.in:604: -1- AC_SUBST_TRACE([OPCODES_LIB])
-+m4trace:configure.in:604: -1- m4_pattern_allow([^OPCODES_LIB$])
-+m4trace:configure.in:606: -1- AC_DEFINE_TRACE_LITERAL([TARGET_ALIAS])
-+m4trace:configure.in:606: -1- m4_pattern_allow([^TARGET_ALIAS$])
-+m4trace:configure.in:606: -1- AH_OUTPUT([TARGET_ALIAS], [/* Target alias. */
-+@%:@undef TARGET_ALIAS])
-+m4trace:configure.in:607: -1- AC_DEFINE_TRACE_LITERAL([TARGET_CANONICAL])
-+m4trace:configure.in:607: -1- m4_pattern_allow([^TARGET_CANONICAL$])
-+m4trace:configure.in:607: -1- AH_OUTPUT([TARGET_CANONICAL], [/* Canonical target. */
-+@%:@undef TARGET_CANONICAL])
-+m4trace:configure.in:608: -1- AC_DEFINE_TRACE_LITERAL([TARGET_CPU])
-+m4trace:configure.in:608: -1- m4_pattern_allow([^TARGET_CPU$])
-+m4trace:configure.in:608: -1- AH_OUTPUT([TARGET_CPU], [/* Target CPU. */
-+@%:@undef TARGET_CPU])
-+m4trace:configure.in:609: -1- AC_DEFINE_TRACE_LITERAL([TARGET_VENDOR])
-+m4trace:configure.in:609: -1- m4_pattern_allow([^TARGET_VENDOR$])
-+m4trace:configure.in:609: -1- AH_OUTPUT([TARGET_VENDOR], [/* Target vendor. */
-+@%:@undef TARGET_VENDOR])
-+m4trace:configure.in:610: -1- AC_DEFINE_TRACE_LITERAL([TARGET_OS])
-+m4trace:configure.in:610: -1- m4_pattern_allow([^TARGET_OS$])
-+m4trace:configure.in:610: -1- AH_OUTPUT([TARGET_OS], [/* Target OS. */
-+@%:@undef TARGET_OS])
-+m4trace:configure.in:612: -1- AC_SUBST([YACC])
-+m4trace:configure.in:612: -1- AC_SUBST_TRACE([YACC])
-+m4trace:configure.in:612: -1- m4_pattern_allow([^YACC$])
-+m4trace:configure.in:612: -1- AC_SUBST([YACC])
-+m4trace:configure.in:612: -1- AC_SUBST_TRACE([YACC])
-+m4trace:configure.in:612: -1- m4_pattern_allow([^YACC$])
-+m4trace:configure.in:612: -1- AC_SUBST([YFLAGS])
-+m4trace:configure.in:612: -1- AC_SUBST_TRACE([YFLAGS])
-+m4trace:configure.in:612: -1- m4_pattern_allow([^YFLAGS$])
-+m4trace:configure.in:613: -1- AC_SUBST([LEX])
-+m4trace:configure.in:613: -1- AC_SUBST_TRACE([LEX])
-+m4trace:configure.in:613: -1- m4_pattern_allow([^LEX$])
-+m4trace:configure.in:613: -1- AC_SUBST([LEX_OUTPUT_ROOT], [$ac_cv_prog_lex_root])
-+m4trace:configure.in:613: -1- AC_SUBST_TRACE([LEX_OUTPUT_ROOT])
-+m4trace:configure.in:613: -1- m4_pattern_allow([^LEX_OUTPUT_ROOT$])
-+m4trace:configure.in:613: -1- AC_SUBST([LEXLIB])
-+m4trace:configure.in:613: -1- AC_SUBST_TRACE([LEXLIB])
-+m4trace:configure.in:613: -1- m4_pattern_allow([^LEXLIB$])
-+m4trace:configure.in:613: -1- AC_DEFINE_TRACE_LITERAL([YYTEXT_POINTER])
-+m4trace:configure.in:613: -1- m4_pattern_allow([^YYTEXT_POINTER$])
-+m4trace:configure.in:613: -1- AH_OUTPUT([YYTEXT_POINTER], [/* Define to 1 if `lex\' declares `yytext\' as a `char *\' by default, not a
-+   `char[]\'. */
-+@%:@undef YYTEXT_POINTER])
-+m4trace:configure.in:616: -1- AC_SUBST([USE_NLS])
-+m4trace:configure.in:616: -1- AC_SUBST_TRACE([USE_NLS])
-+m4trace:configure.in:616: -1- m4_pattern_allow([^USE_NLS$])
-+m4trace:configure.in:616: -1- AC_SUBST([LIBINTL])
-+m4trace:configure.in:616: -1- AC_SUBST_TRACE([LIBINTL])
-+m4trace:configure.in:616: -1- m4_pattern_allow([^LIBINTL$])
-+m4trace:configure.in:616: -1- AC_SUBST([LIBINTL_DEP])
-+m4trace:configure.in:616: -1- AC_SUBST_TRACE([LIBINTL_DEP])
-+m4trace:configure.in:616: -1- m4_pattern_allow([^LIBINTL_DEP$])
-+m4trace:configure.in:616: -1- AC_SUBST([INCINTL])
-+m4trace:configure.in:616: -1- AC_SUBST_TRACE([INCINTL])
-+m4trace:configure.in:616: -1- m4_pattern_allow([^INCINTL$])
-+m4trace:configure.in:616: -1- AC_SUBST([XGETTEXT])
-+m4trace:configure.in:616: -1- AC_SUBST_TRACE([XGETTEXT])
-+m4trace:configure.in:616: -1- m4_pattern_allow([^XGETTEXT$])
-+m4trace:configure.in:616: -1- AC_SUBST([GMSGFMT])
-+m4trace:configure.in:616: -1- AC_SUBST_TRACE([GMSGFMT])
-+m4trace:configure.in:616: -1- m4_pattern_allow([^GMSGFMT$])
-+m4trace:configure.in:616: -1- AC_SUBST([POSUB])
-+m4trace:configure.in:616: -1- AC_SUBST_TRACE([POSUB])
-+m4trace:configure.in:616: -1- m4_pattern_allow([^POSUB$])
-+m4trace:configure.in:616: -1- AC_DEFINE_TRACE_LITERAL([ENABLE_NLS])
-+m4trace:configure.in:616: -1- m4_pattern_allow([^ENABLE_NLS$])
-+m4trace:configure.in:616: -1- AH_OUTPUT([ENABLE_NLS], [/* Define to 1 if translation of program messages to the user\'s native
-+   language is requested. */
-+@%:@undef ENABLE_NLS])
-+m4trace:configure.in:616: -1- AC_SUBST([CATALOGS])
-+m4trace:configure.in:616: -1- AC_SUBST_TRACE([CATALOGS])
-+m4trace:configure.in:616: -1- m4_pattern_allow([^CATALOGS$])
-+m4trace:configure.in:616: -1- AC_SUBST([DATADIRNAME])
-+m4trace:configure.in:616: -1- AC_SUBST_TRACE([DATADIRNAME])
-+m4trace:configure.in:616: -1- m4_pattern_allow([^DATADIRNAME$])
-+m4trace:configure.in:616: -1- AC_SUBST([INSTOBJEXT])
-+m4trace:configure.in:616: -1- AC_SUBST_TRACE([INSTOBJEXT])
-+m4trace:configure.in:616: -1- m4_pattern_allow([^INSTOBJEXT$])
-+m4trace:configure.in:616: -1- AC_SUBST([GENCAT])
-+m4trace:configure.in:616: -1- AC_SUBST_TRACE([GENCAT])
-+m4trace:configure.in:616: -1- m4_pattern_allow([^GENCAT$])
-+m4trace:configure.in:616: -1- AC_SUBST([CATOBJEXT])
-+m4trace:configure.in:616: -1- AC_SUBST_TRACE([CATOBJEXT])
-+m4trace:configure.in:616: -1- m4_pattern_allow([^CATOBJEXT$])
-+m4trace:configure.in:617: -1- AC_SUBST([MKINSTALLDIRS])
-+m4trace:configure.in:617: -1- AC_SUBST_TRACE([MKINSTALLDIRS])
-+m4trace:configure.in:617: -1- m4_pattern_allow([^MKINSTALLDIRS$])
-+m4trace:configure.in:617: -1- AC_SUBST([USE_NLS])
-+m4trace:configure.in:617: -1- AC_SUBST_TRACE([USE_NLS])
-+m4trace:configure.in:617: -1- m4_pattern_allow([^USE_NLS$])
-+m4trace:configure.in:617: -1- AC_SUBST([MSGFMT])
-+m4trace:configure.in:617: -1- AC_SUBST_TRACE([MSGFMT])
-+m4trace:configure.in:617: -1- m4_pattern_allow([^MSGFMT$])
-+m4trace:configure.in:617: -1- AC_SUBST([GMSGFMT])
-+m4trace:configure.in:617: -1- AC_SUBST_TRACE([GMSGFMT])
-+m4trace:configure.in:617: -1- m4_pattern_allow([^GMSGFMT$])
-+m4trace:configure.in:617: -1- AC_SUBST([XGETTEXT])
-+m4trace:configure.in:617: -1- AC_SUBST_TRACE([XGETTEXT])
-+m4trace:configure.in:617: -1- m4_pattern_allow([^XGETTEXT$])
-+m4trace:configure.in:617: -1- AC_SUBST([MSGMERGE])
-+m4trace:configure.in:617: -1- AC_SUBST_TRACE([MSGMERGE])
-+m4trace:configure.in:617: -1- m4_pattern_allow([^MSGMERGE$])
-+m4trace:configure.in:617: -1- _m4_warn([obsolete], [The macro `AC_OUTPUT_COMMANDS' is obsolete.
-+You should run autoupdate.], [../../lib/autoconf/status.m4:1040: AC_OUTPUT_COMMANDS is expanded from...
-+../config/po.m4:23: AM_PO_SUBDIRS is expanded from...
-+configure.in:617: the top level])
-+m4trace:configure.in:619: -1- AM_MAINTAINER_MODE
-+m4trace:configure.in:619: -1- AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
-+m4trace:configure.in:619: -1- AC_SUBST([MAINTAINER_MODE_TRUE])
-+m4trace:configure.in:619: -1- AC_SUBST_TRACE([MAINTAINER_MODE_TRUE])
-+m4trace:configure.in:619: -1- m4_pattern_allow([^MAINTAINER_MODE_TRUE$])
-+m4trace:configure.in:619: -1- AC_SUBST([MAINTAINER_MODE_FALSE])
-+m4trace:configure.in:619: -1- AC_SUBST_TRACE([MAINTAINER_MODE_FALSE])
-+m4trace:configure.in:619: -1- m4_pattern_allow([^MAINTAINER_MODE_FALSE$])
-+m4trace:configure.in:619: -1- _AM_SUBST_NOTMAKE([MAINTAINER_MODE_TRUE])
-+m4trace:configure.in:619: -1- _AM_SUBST_NOTMAKE([MAINTAINER_MODE_FALSE])
-+m4trace:configure.in:619: -1- AC_SUBST([MAINT])
-+m4trace:configure.in:619: -1- AC_SUBST_TRACE([MAINT])
-+m4trace:configure.in:619: -1- m4_pattern_allow([^MAINT$])
-+m4trace:configure.in:620: -1- AM_CONDITIONAL([GENINSRC_NEVER], [false])
-+m4trace:configure.in:620: -1- AC_SUBST([GENINSRC_NEVER_TRUE])
-+m4trace:configure.in:620: -1- AC_SUBST_TRACE([GENINSRC_NEVER_TRUE])
-+m4trace:configure.in:620: -1- m4_pattern_allow([^GENINSRC_NEVER_TRUE$])
-+m4trace:configure.in:620: -1- AC_SUBST([GENINSRC_NEVER_FALSE])
-+m4trace:configure.in:620: -1- AC_SUBST_TRACE([GENINSRC_NEVER_FALSE])
-+m4trace:configure.in:620: -1- m4_pattern_allow([^GENINSRC_NEVER_FALSE$])
-+m4trace:configure.in:620: -1- _AM_SUBST_NOTMAKE([GENINSRC_NEVER_TRUE])
-+m4trace:configure.in:620: -1- _AM_SUBST_NOTMAKE([GENINSRC_NEVER_FALSE])
-+m4trace:configure.in:623: -1- AH_OUTPUT([HAVE_STRING_H], [/* Define to 1 if you have the <string.h> header file. */
-+@%:@undef HAVE_STRING_H])
-+m4trace:configure.in:623: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the <stdlib.h> header file. */
-+@%:@undef HAVE_STDLIB_H])
-+m4trace:configure.in:623: -1- AH_OUTPUT([HAVE_MEMORY_H], [/* Define to 1 if you have the <memory.h> header file. */
-+@%:@undef HAVE_MEMORY_H])
-+m4trace:configure.in:623: -1- AH_OUTPUT([HAVE_STRINGS_H], [/* Define to 1 if you have the <strings.h> header file. */
-+@%:@undef HAVE_STRINGS_H])
-+m4trace:configure.in:623: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
-+@%:@undef HAVE_UNISTD_H])
-+m4trace:configure.in:623: -1- AH_OUTPUT([HAVE_ERRNO_H], [/* Define to 1 if you have the <errno.h> header file. */
-+@%:@undef HAVE_ERRNO_H])
-+m4trace:configure.in:623: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define to 1 if you have the <sys/types.h> header file. */
-+@%:@undef HAVE_SYS_TYPES_H])
-+m4trace:configure.in:623: -1- AH_OUTPUT([HAVE_LIMITS_H], [/* Define to 1 if you have the <limits.h> header file. */
-+@%:@undef HAVE_LIMITS_H])
-+m4trace:configure.in:623: -1- AH_OUTPUT([HAVE_TIME_H], [/* Define to 1 if you have the <time.h> header file. */
-+@%:@undef HAVE_TIME_H])
-+m4trace:configure.in:623: -1- AH_OUTPUT([HAVE_SYS_STAT_H], [/* Define to 1 if you have the <sys/stat.h> header file. */
-+@%:@undef HAVE_SYS_STAT_H])
-+m4trace:configure.in:632: -1- AC_DEFINE_TRACE_LITERAL([CROSS_COMPILE])
-+m4trace:configure.in:632: -1- m4_pattern_allow([^CROSS_COMPILE$])
-+m4trace:configure.in:632: -1- AH_OUTPUT([CROSS_COMPILE], [/* Compiling cross-assembler? */
-+@%:@undef CROSS_COMPILE])
-+m4trace:configure.in:638: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ALLOCA_H])
-+m4trace:configure.in:638: -1- m4_pattern_allow([^HAVE_ALLOCA_H$])
-+m4trace:configure.in:638: -1- AH_OUTPUT([HAVE_ALLOCA_H], [/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
-+   */
-+@%:@undef HAVE_ALLOCA_H])
-+m4trace:configure.in:638: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ALLOCA])
-+m4trace:configure.in:638: -1- m4_pattern_allow([^HAVE_ALLOCA$])
-+m4trace:configure.in:638: -1- AH_OUTPUT([HAVE_ALLOCA], [/* Define to 1 if you have `alloca\', as a function or macro. */
-+@%:@undef HAVE_ALLOCA])
-+m4trace:configure.in:638: -1- AC_LIBSOURCE([alloca.c])
-+m4trace:configure.in:638: -1- AC_SUBST([ALLOCA], [\${LIBOBJDIR}alloca.$ac_objext])
-+m4trace:configure.in:638: -1- AC_SUBST_TRACE([ALLOCA])
-+m4trace:configure.in:638: -1- m4_pattern_allow([^ALLOCA$])
-+m4trace:configure.in:638: -1- AC_DEFINE_TRACE_LITERAL([C_ALLOCA])
-+m4trace:configure.in:638: -1- m4_pattern_allow([^C_ALLOCA$])
-+m4trace:configure.in:638: -1- AH_OUTPUT([C_ALLOCA], [/* Define to 1 if using `alloca.c\'. */
-+@%:@undef C_ALLOCA])
-+m4trace:configure.in:638: -1- AC_DEFINE_TRACE_LITERAL([CRAY_STACKSEG_END])
-+m4trace:configure.in:638: -1- m4_pattern_allow([^CRAY_STACKSEG_END$])
-+m4trace:configure.in:638: -1- AH_OUTPUT([CRAY_STACKSEG_END], [/* Define to one of `_getb67\', `GETB67\', `getb67\' for Cray-2 and Cray-YMP
-+   systems. This function is required for `alloca.c\' support on those systems.
-+   */
-+@%:@undef CRAY_STACKSEG_END])
-+m4trace:configure.in:638: -1- AH_OUTPUT([STACK_DIRECTION], [/* If using the C implementation of alloca, define if you know the
-+   direction of stack growth for your system; otherwise it will be
-+   automatically deduced at runtime.
-+	STACK_DIRECTION > 0 => grows toward higher addresses
-+	STACK_DIRECTION < 0 => grows toward lower addresses
-+	STACK_DIRECTION = 0 => direction of growth unknown */
-+@%:@undef STACK_DIRECTION])
-+m4trace:configure.in:638: -1- AC_DEFINE_TRACE_LITERAL([STACK_DIRECTION])
-+m4trace:configure.in:638: -1- m4_pattern_allow([^STACK_DIRECTION$])
-+m4trace:configure.in:639: -1- AH_OUTPUT([inline], [/* Define to `__inline__\' or `__inline\' if that\'s what the C compiler
-+   calls it, or to nothing if \'inline\' is not supported under any name.  */
-+#ifndef __cplusplus
-+#undef inline
-+#endif])
-+m4trace:configure.in:642: -1- AH_OUTPUT([HAVE_UNLINK], [/* Define to 1 if you have the `unlink\' function. */
-+@%:@undef HAVE_UNLINK])
-+m4trace:configure.in:642: -1- AH_OUTPUT([HAVE_REMOVE], [/* Define to 1 if you have the `remove\' function. */
-+@%:@undef HAVE_REMOVE])
-+m4trace:configure.in:645: -1- AH_OUTPUT([HAVE_SBRK], [/* Define to 1 if you have the `sbrk\' function. */
-+@%:@undef HAVE_SBRK])
-+m4trace:configure.in:645: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SBRK])
-+m4trace:configure.in:645: -1- m4_pattern_allow([^HAVE_SBRK$])
-+m4trace:configure.in:650: -1- AC_SUBST([LIBM])
-+m4trace:configure.in:650: -1- AC_SUBST_TRACE([LIBM])
-+m4trace:configure.in:650: -1- m4_pattern_allow([^LIBM$])
-+m4trace:configure.in:651: -1- AC_SUBST([LIBM])
-+m4trace:configure.in:651: -1- AC_SUBST_TRACE([LIBM])
-+m4trace:configure.in:651: -1- m4_pattern_allow([^LIBM$])
-+m4trace:configure.in:658: -2- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
-+You should run autoupdate.], [../../lib/autoconf/general.m4:2674: AC_TRY_LINK is expanded from...
-+acinclude.m4:22: GAS_WORKING_ASSERT is expanded from...
-+configure.in:658: the top level])
-+m4trace:configure.in:658: -1- AC_DEFINE_TRACE_LITERAL([BROKEN_ASSERT])
-+m4trace:configure.in:658: -1- m4_pattern_allow([^BROKEN_ASSERT$])
-+m4trace:configure.in:658: -1- AH_OUTPUT([BROKEN_ASSERT], [/* assert broken? */
-+@%:@undef BROKEN_ASSERT])
-+m4trace:configure.in:684: -2- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
-+You should run autoupdate.], [../../lib/autoconf/general.m4:2674: AC_TRY_LINK is expanded from...
-+acinclude.m4:2: GAS_CHECK_DECL_NEEDED is expanded from...
-+configure.in:684: the top level])
-+m4trace:configure.in:684: -1- AC_DEFINE_TRACE_LITERAL([NEED_DECLARATION_ERRNO])
-+m4trace:configure.in:684: -1- m4_pattern_allow([^NEED_DECLARATION_ERRNO$])
-+m4trace:configure.in:684: -1- AH_OUTPUT([NEED_DECLARATION_ERRNO], [/* Define if errno is not declared in system header files. */
-+@%:@undef NEED_DECLARATION_ERRNO])
-+m4trace:configure.in:696: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DECL_GETOPT])
-+m4trace:configure.in:696: -1- m4_pattern_allow([^HAVE_DECL_GETOPT$])
-+m4trace:configure.in:696: -1- AH_OUTPUT([HAVE_DECL_GETOPT], [/* Is the prototype for getopt in <unistd.h> in the expected format? */
-+@%:@undef HAVE_DECL_GETOPT])
-+m4trace:configure.in:700: -2- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
-+You should run autoupdate.], [../../lib/autoconf/general.m4:2674: AC_TRY_LINK is expanded from...
-+acinclude.m4:2: GAS_CHECK_DECL_NEEDED is expanded from...
-+configure.in:700: the top level])
-+m4trace:configure.in:700: -1- AC_DEFINE_TRACE_LITERAL([NEED_DECLARATION_ENVIRON])
-+m4trace:configure.in:700: -1- m4_pattern_allow([^NEED_DECLARATION_ENVIRON$])
-+m4trace:configure.in:700: -1- AH_OUTPUT([NEED_DECLARATION_ENVIRON], [/* Define if environ is not declared in system header files. */
-+@%:@undef NEED_DECLARATION_ENVIRON])
-+m4trace:configure.in:701: -2- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
-+You should run autoupdate.], [../../lib/autoconf/general.m4:2674: AC_TRY_LINK is expanded from...
-+acinclude.m4:2: GAS_CHECK_DECL_NEEDED is expanded from...
-+configure.in:701: the top level])
-+m4trace:configure.in:701: -1- AC_DEFINE_TRACE_LITERAL([NEED_DECLARATION_FFS])
-+m4trace:configure.in:701: -1- m4_pattern_allow([^NEED_DECLARATION_FFS$])
-+m4trace:configure.in:701: -1- AH_OUTPUT([NEED_DECLARATION_FFS], [/* Define if ffs is not declared in system header files. */
-+@%:@undef NEED_DECLARATION_FFS])
-+m4trace:configure.in:702: -2- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
-+You should run autoupdate.], [../../lib/autoconf/general.m4:2674: AC_TRY_LINK is expanded from...
-+acinclude.m4:2: GAS_CHECK_DECL_NEEDED is expanded from...
-+configure.in:702: the top level])
-+m4trace:configure.in:702: -1- AC_DEFINE_TRACE_LITERAL([NEED_DECLARATION_FREE])
-+m4trace:configure.in:702: -1- m4_pattern_allow([^NEED_DECLARATION_FREE$])
-+m4trace:configure.in:702: -1- AH_OUTPUT([NEED_DECLARATION_FREE], [/* Define if free is not declared in system header files. */
-+@%:@undef NEED_DECLARATION_FREE])
-+m4trace:configure.in:703: -2- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
-+You should run autoupdate.], [../../lib/autoconf/general.m4:2674: AC_TRY_LINK is expanded from...
-+acinclude.m4:2: GAS_CHECK_DECL_NEEDED is expanded from...
-+configure.in:703: the top level])
-+m4trace:configure.in:703: -1- AC_DEFINE_TRACE_LITERAL([NEED_DECLARATION_MALLOC])
-+m4trace:configure.in:703: -1- m4_pattern_allow([^NEED_DECLARATION_MALLOC$])
-+m4trace:configure.in:703: -1- AH_OUTPUT([NEED_DECLARATION_MALLOC], [/* Define if malloc is not declared in system header files. */
-+@%:@undef NEED_DECLARATION_MALLOC])
-+m4trace:configure.in:704: -2- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
-+You should run autoupdate.], [../../lib/autoconf/general.m4:2674: AC_TRY_LINK is expanded from...
-+acinclude.m4:2: GAS_CHECK_DECL_NEEDED is expanded from...
-+configure.in:704: the top level])
-+m4trace:configure.in:704: -1- AC_DEFINE_TRACE_LITERAL([NEED_DECLARATION_SBRK])
-+m4trace:configure.in:704: -1- m4_pattern_allow([^NEED_DECLARATION_SBRK$])
-+m4trace:configure.in:704: -1- AH_OUTPUT([NEED_DECLARATION_SBRK], [/* Define if sbrk is not declared in system header files. */
-+@%:@undef NEED_DECLARATION_SBRK])
-+m4trace:configure.in:705: -2- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
-+You should run autoupdate.], [../../lib/autoconf/general.m4:2674: AC_TRY_LINK is expanded from...
-+acinclude.m4:2: GAS_CHECK_DECL_NEEDED is expanded from...
-+configure.in:705: the top level])
-+m4trace:configure.in:705: -1- AC_DEFINE_TRACE_LITERAL([NEED_DECLARATION_STRSTR])
-+m4trace:configure.in:705: -1- m4_pattern_allow([^NEED_DECLARATION_STRSTR$])
-+m4trace:configure.in:705: -1- AH_OUTPUT([NEED_DECLARATION_STRSTR], [/* Define if strstr is not declared in system header files. */
-+@%:@undef NEED_DECLARATION_STRSTR])
-+m4trace:configure.in:707: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DECL_MEMPCPY])
-+m4trace:configure.in:707: -1- m4_pattern_allow([^HAVE_DECL_MEMPCPY$])
-+m4trace:configure.in:707: -1- AH_OUTPUT([HAVE_DECL_MEMPCPY], [/* Define to 1 if you have the declaration of `mempcpy\', and to 0 if you
-+   don\'t. */
-+@%:@undef HAVE_DECL_MEMPCPY])
-+m4trace:configure.in:708: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DECL_VSNPRINTF])
-+m4trace:configure.in:708: -1- m4_pattern_allow([^HAVE_DECL_VSNPRINTF$])
-+m4trace:configure.in:708: -1- AH_OUTPUT([HAVE_DECL_VSNPRINTF], [/* Define to 1 if you have the declaration of `vsnprintf\', and to 0 if you
-+   don\'t. */
-+@%:@undef HAVE_DECL_VSNPRINTF])
-+m4trace:configure.in:710: -1- AC_DEFINE_TRACE_LITERAL([USE_BINARY_FOPEN])
-+m4trace:configure.in:710: -1- m4_pattern_allow([^USE_BINARY_FOPEN$])
-+m4trace:configure.in:710: -1- AH_OUTPUT([USE_BINARY_FOPEN], [/* Use b modifier when opening binary files? */
-+@%:@undef USE_BINARY_FOPEN])
-+m4trace:configure.in:713: -1- AH_OUTPUT([HAVE_ZLIB_H], [/* Define to 1 if you have the <zlib.h> header file. */
-+@%:@undef HAVE_ZLIB_H])
-+m4trace:configure.in:713: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ZLIB_H])
-+m4trace:configure.in:713: -1- m4_pattern_allow([^HAVE_ZLIB_H$])
-+m4trace:configure.in:718: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
-+You should run autoupdate.], [../../lib/autoconf/general.m4:2601: AC_TRY_COMPILE is expanded from...
-+../../lib/m4sugar/m4sh.m4:620: AS_IF is expanded from...
-+../../lib/autoconf/general.m4:2018: AC_CACHE_VAL is expanded from...
-+acinclude.m4:60: GAS_HAVE_TIME_TYPE_MEMBER is expanded from...
-+configure.in:718: the top level])
-+m4trace:configure.in:718: -1- AC_DEFINE_TRACE_LITERAL([HAVE_TM_GMTOFF])
-+m4trace:configure.in:718: -1- m4_pattern_allow([^HAVE_TM_GMTOFF$])
-+m4trace:configure.in:718: -1- AH_OUTPUT([HAVE_TM_GMTOFF], [/* Define if <time.h> has struct tm.tm_gmtoff. */
-+@%:@undef HAVE_TM_GMTOFF])
-+m4trace:configure.in:722: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
-+You should run autoupdate.], [../../lib/autoconf/general.m4:2601: AC_TRY_COMPILE is expanded from...
-+../../lib/m4sugar/m4sh.m4:620: AS_IF is expanded from...
-+../../lib/autoconf/general.m4:2018: AC_CACHE_VAL is expanded from...
-+acinclude.m4:79: GAS_HAVE_SYS_STAT_TYPE_MEMBER is expanded from...
-+configure.in:722: the top level])
-+m4trace:configure.in:722: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ST_MTIM_TV_SEC])
-+m4trace:configure.in:722: -1- m4_pattern_allow([^HAVE_ST_MTIM_TV_SEC$])
-+m4trace:configure.in:722: -1- AH_OUTPUT([HAVE_ST_MTIM_TV_SEC], [/* Define if <sys/stat.h> has struct stat.st_mtim.tv_sec */
-+@%:@undef HAVE_ST_MTIM_TV_SEC])
-+m4trace:configure.in:723: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
-+You should run autoupdate.], [../../lib/autoconf/general.m4:2601: AC_TRY_COMPILE is expanded from...
-+../../lib/m4sugar/m4sh.m4:620: AS_IF is expanded from...
-+../../lib/autoconf/general.m4:2018: AC_CACHE_VAL is expanded from...
-+acinclude.m4:79: GAS_HAVE_SYS_STAT_TYPE_MEMBER is expanded from...
-+configure.in:723: the top level])
-+m4trace:configure.in:723: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ST_MTIM_TV_NSEC])
-+m4trace:configure.in:723: -1- m4_pattern_allow([^HAVE_ST_MTIM_TV_NSEC$])
-+m4trace:configure.in:723: -1- AH_OUTPUT([HAVE_ST_MTIM_TV_NSEC], [/* Define if <sys/stat.h> has struct stat.st_mtim.tv_nsec */
-+@%:@undef HAVE_ST_MTIM_TV_NSEC])
-+m4trace:configure.in:728: -1- AC_SUBST([datarootdir])
-+m4trace:configure.in:728: -1- AC_SUBST_TRACE([datarootdir])
-+m4trace:configure.in:728: -1- m4_pattern_allow([^datarootdir$])
-+m4trace:configure.in:729: -1- AC_SUBST([docdir])
-+m4trace:configure.in:729: -1- AC_SUBST_TRACE([docdir])
-+m4trace:configure.in:729: -1- m4_pattern_allow([^docdir$])
-+m4trace:configure.in:730: -1- AC_SUBST([htmldir])
-+m4trace:configure.in:730: -1- AC_SUBST_TRACE([htmldir])
-+m4trace:configure.in:730: -1- m4_pattern_allow([^htmldir$])
-+m4trace:configure.in:731: -1- AC_SUBST([pdfdir])
-+m4trace:configure.in:731: -1- AC_SUBST_TRACE([pdfdir])
-+m4trace:configure.in:731: -1- m4_pattern_allow([^pdfdir$])
-+m4trace:configure.in:741: -1- AC_CONFIG_FILES([Makefile doc/Makefile po/Makefile.in:po/Make-in])
-+m4trace:configure.in:756: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
-+m4trace:configure.in:756: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
-+m4trace:configure.in:756: -1- m4_pattern_allow([^LIB@&t@OBJS$])
-+m4trace:configure.in:756: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
-+m4trace:configure.in:756: -1- AC_SUBST_TRACE([LTLIBOBJS])
-+m4trace:configure.in:756: -1- m4_pattern_allow([^LTLIBOBJS$])
-+m4trace:configure.in:756: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
-+m4trace:configure.in:756: -1- AC_SUBST([am__EXEEXT_TRUE])
-+m4trace:configure.in:756: -1- AC_SUBST_TRACE([am__EXEEXT_TRUE])
-+m4trace:configure.in:756: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
-+m4trace:configure.in:756: -1- AC_SUBST([am__EXEEXT_FALSE])
-+m4trace:configure.in:756: -1- AC_SUBST_TRACE([am__EXEEXT_FALSE])
-+m4trace:configure.in:756: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
-+m4trace:configure.in:756: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
-+m4trace:configure.in:756: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
-+m4trace:configure.in:756: -1- AC_SUBST_TRACE([top_builddir])
-+m4trace:configure.in:756: -1- AC_SUBST_TRACE([top_build_prefix])
-+m4trace:configure.in:756: -1- AC_SUBST_TRACE([srcdir])
-+m4trace:configure.in:756: -1- AC_SUBST_TRACE([abs_srcdir])
-+m4trace:configure.in:756: -1- AC_SUBST_TRACE([top_srcdir])
-+m4trace:configure.in:756: -1- AC_SUBST_TRACE([abs_top_srcdir])
-+m4trace:configure.in:756: -1- AC_SUBST_TRACE([builddir])
-+m4trace:configure.in:756: -1- AC_SUBST_TRACE([abs_builddir])
-+m4trace:configure.in:756: -1- AC_SUBST_TRACE([abs_top_builddir])
-+m4trace:configure.in:756: -1- AC_SUBST_TRACE([INSTALL])
-+m4trace:configure.in:756: -1- AC_SUBST_TRACE([MKDIR_P])
-+m4trace:configure.in:756: -1- AC_REQUIRE_AUX_FILE([ltmain.sh])
-diff -Nur binutils-2.21.orig/gas/config/atof-vax.c binutils-2.21/gas/config/atof-vax.c
---- binutils-2.21.orig/gas/config/atof-vax.c	2007-10-17 18:45:54.000000000 +0200
-+++ binutils-2.21/gas/config/atof-vax.c	2011-08-28 14:56:19.917984145 +0200
-@@ -268,9 +268,27 @@
- 	  int exponent_skippage;
- 	  LITTLENUM_TYPE word1;
- 
--	  /* JF: Deal with new Nan, +Inf and -Inf codes.  */
-+    	  /* JF: Deal with new +/-(q/Q/s/S)Nan, +Inf and -Inf codes.  */
- 	  if (f->sign != '-' && f->sign != '+')
- 	    {
-+          if (f->sign == 0)
-+            {
-+              /* All NaNs are 0.  */
-+              memset (words, 0x00, sizeof (LITTLENUM_TYPE) * precision);
-+            }
-+          else if (f->sign == 'P')
-+            {
-+              /* Positive Infinity.  */
-+              memset (words, 0xff, sizeof (LITTLENUM_TYPE) * precision);
-+              words[0] &= 0x7fff;
-+            }
-+          else if (f->sign == 'N')
-+            {
-+              /* Negative Infinity.  */
-+              memset (words, 0x00, sizeof (LITTLENUM_TYPE) * precision);
-+              words[0] = 0x0080;
-+            }
-+          else
- 	      make_invalid_floating_point_number (words);
- 	      return return_value;
- 	    }
-diff -Nur binutils-2.21.orig/gas/config/tc-avr32.c binutils-2.21/gas/config/tc-avr32.c
---- binutils-2.21.orig/gas/config/tc-avr32.c	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.21/gas/config/tc-avr32.c	2011-08-28 14:56:19.937979852 +0200
-@@ -0,0 +1,4839 @@
-+/* Assembler implementation for AVR32.
-+   Copyright 2003,2004,2005,2006,2007,2008,2009,2010 Atmel Corporation.
-+
-+   Written by Haavard Skinnemoen, Atmel Norway, <hskinnemoen@atmel.com>
-+
-+   This file is part of GAS, the GNU Assembler.
-+
-+   GAS is free software; you can redistribute it and/or modify it
-+   under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; either version 2, or (at your option)
-+   any later version.
-+
-+   GAS is distributed in the hope that it will be useful, but WITHOUT
-+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-+   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
-+   License for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with GAS; see the file COPYING.  If not, write to the Free
-+   Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-+   02111-1307, USA.  */
-+
-+#include <stdio.h>
-+#include "as.h"
-+#include "safe-ctype.h"
-+#include "subsegs.h"
-+#include "symcat.h"
-+#include "opcodes/avr32-opc.h"
-+#include "opcodes/avr32-asm.h"
-+#include "elf/avr32.h"
-+#include "dwarf2dbg.h"
-+
-+#define xDEBUG
-+#define xOPC_CONSISTENCY_CHECK
-+
-+#ifdef DEBUG
-+# define pr_debug(fmt, args...) fprintf(stderr, fmt, ##args)
-+#else
-+# define pr_debug(fmt, args...)
-+#endif
-+
-+/* 3 MSB of instruction word indicate group. Group 7 -> extended */
-+#define AVR32_COMPACT_P(opcode) ((opcode[0] & 0xe0) != 0xe0)
-+
-+#define streq(a, b)		(strcmp(a, b) == 0)
-+#define skip_whitespace(str)	do { while(*(str) == ' ') ++(str); } while(0)
-+
-+/* Flags given on the command line */
-+static int avr32_pic	= FALSE;
-+int linkrelax	= FALSE;
-+int avr32_iarcompat	= FALSE;
-+
-+/* This array holds the chars that always start a comment. */
-+const char comment_chars[]		= "#";
-+
-+/* This array holds the chars that only start a comment at the
-+   beginning of a line.  We must include '#' here because the compiler
-+   may produce #APP and #NO_APP in its output.  */
-+const char line_comment_chars[]		= "#";
-+
-+/* These may be used instead of newline (same as ';' in C).  */
-+const char line_separator_chars[]	= ";";
-+
-+/* Chars that can be used to separate mantissa from exponent in
-+   floating point numbers.  */
-+const char EXP_CHARS[]			= "eE";
-+
-+/* Chars that mean this number is a floating point constant.  */
-+const char FLT_CHARS[]			= "dD";
-+
-+/* Pre-defined "_GLOBAL_OFFSET_TABLE_"  */
-+symbolS *GOT_symbol;
-+
-+static struct hash_control *avr32_mnemonic_htab;
-+
-+struct avr32_ifield_data
-+{
-+  bfd_vma value;
-+  /* FIXME: Get rid of align_order and complain. complain is never
-+     used, align_order is used in one place.  Try to use the relax
-+     table instead.  */
-+  unsigned int align_order;
-+};
-+
-+struct avr32_insn
-+{
-+  const struct avr32_syntax *syntax;
-+  expressionS immediate;
-+  int pcrel;
-+  int force_extended;
-+  unsigned int next_slot;
-+  bfd_reloc_code_real_type r_type;
-+  struct avr32_ifield_data field_value[AVR32_MAX_FIELDS];
-+};
-+
-+static struct avr32_insn current_insn;
-+
-+/* The target specific pseudo-ops we support. */
-+static void s_rseg (int);
-+static void s_cpool(int);
-+
-+const pseudo_typeS md_pseudo_table[] =
-+{
-+  /* Make sure that .word is 32 bits */
-+  { "word", cons, 4 },
-+  { "file", (void (*) PARAMS ((int))) dwarf2_directive_file, 0 },
-+  { "loc", dwarf2_directive_loc, 0 },
-+
-+  /* .lcomm requires an explicit alignment parameter */
-+  { "lcomm", s_lcomm, 1 },
-+
-+  /* AVR32-specific pseudo-ops */
-+  { "cpool", s_cpool, 0},
-+
-+  /* IAR compatible pseudo-ops */
-+  { "program", s_ignore, 0 },
-+  { "public", s_globl, 0 },
-+  { "extern", s_ignore, 0 },
-+  { "module", s_ignore, 0 },
-+  { "rseg", s_rseg, 0 },
-+  { "dc8", cons, 1 },
-+  { "dc16", cons, 2 },
-+  { "dc32", cons, 4 },
-+
-+  { NULL, NULL, 0 }
-+};
-+
-+/* Questionable stuff starts here */
-+
-+enum avr32_opinfo {
-+  AVR32_OPINFO_NONE = BFD_RELOC_NONE,
-+  AVR32_OPINFO_GOT,
-+  AVR32_OPINFO_TLSGD,
-+  AVR32_OPINFO_HI,
-+  AVR32_OPINFO_LO,
-+};
-+
-+enum avr32_arch {
-+  ARCH_TYPE_AP,
-+  ARCH_TYPE_UCR1,
-+  ARCH_TYPE_UCR2,
-+  ARCH_TYPE_UCR3,
-+  ARCH_TYPE_UCR3FP
-+};
-+
-+struct arch_type_s
-+{
-+  /* Architecture name */
-+  char *name;
-+  /* Instruction Set Architecture Flags */
-+  unsigned long isa_flags;
-+};
-+
-+struct part_type_s
-+{
-+  /* Part name */
-+  char *name;
-+  /* Architecture type */
-+  unsigned int arch;
-+};
-+
-+static struct arch_type_s arch_types[] =
-+{
-+    {"ap", AVR32_V1 | AVR32_SIMD | AVR32_DSP | AVR32_PICO},
-+    {"ucr1", AVR32_V1 | AVR32_DSP | AVR32_RMW},
-+    {"ucr2", AVR32_V1 | AVR32_V2 | AVR32_DSP | AVR32_RMW},
-+    {"ucr3", AVR32_V1 | AVR32_V2 | AVR32_V3 | AVR32_DSP | AVR32_RMW},
-+    {"ucr3fp", AVR32_V1 | AVR32_V2 | AVR32_V3 | AVR32_DSP | AVR32_RMW | AVR32_V3FP},
-+    {"all-insn", AVR32_V1 | AVR32_V2 | AVR32_V3 | AVR32_SIMD | AVR32_DSP | AVR32_RMW | AVR32_V3FP | AVR32_PICO},
-+    {NULL, 0}
-+};
-+
-+static struct part_type_s part_types[] =
-+{
-+    {"ap7000",        ARCH_TYPE_AP},
-+    {"ap7001",        ARCH_TYPE_AP},
-+    {"ap7002",        ARCH_TYPE_AP},
-+    {"ap7200",        ARCH_TYPE_AP},
-+    {"uc3a0128",      ARCH_TYPE_UCR2},
-+    {"uc3a0256",      ARCH_TYPE_UCR2},
-+    {"uc3a0512es",    ARCH_TYPE_UCR1},
-+    {"uc3a0512",      ARCH_TYPE_UCR2},
-+    {"uc3a1128",      ARCH_TYPE_UCR2},
-+    {"uc3a1256es",    ARCH_TYPE_UCR1},
-+    {"uc3a1256",      ARCH_TYPE_UCR2},
-+    {"uc3a1512es",    ARCH_TYPE_UCR1},
-+    {"uc3a1512",      ARCH_TYPE_UCR2},
-+    {"uc3a364",       ARCH_TYPE_UCR2},
-+    {"uc3a364s",      ARCH_TYPE_UCR2},
-+    {"uc3a3128",      ARCH_TYPE_UCR2},
-+    {"uc3a3128s",     ARCH_TYPE_UCR2},
-+    {"uc3a3256",      ARCH_TYPE_UCR2},
-+    {"uc3a3256s",     ARCH_TYPE_UCR2},
-+    {"uc3b064",       ARCH_TYPE_UCR1},
-+    {"uc3b0128",      ARCH_TYPE_UCR1},
-+    {"uc3b0256es",    ARCH_TYPE_UCR1},
-+    {"uc3b0256",      ARCH_TYPE_UCR1},
-+    {"uc3b0512",      ARCH_TYPE_UCR2},
-+    {"uc3b0512revc",  ARCH_TYPE_UCR2},
-+    {"uc3b164",       ARCH_TYPE_UCR1},
-+    {"uc3b1128",      ARCH_TYPE_UCR1},
-+    {"uc3b1256",      ARCH_TYPE_UCR1},
-+    {"uc3b1256es",    ARCH_TYPE_UCR1},
-+    {"uc3b1512",      ARCH_TYPE_UCR2},
-+    {"uc3b1512revc",  ARCH_TYPE_UCR2},
-+    {"uc3c0512crevc", ARCH_TYPE_UCR3},
-+    {"uc3c1512crevc", ARCH_TYPE_UCR3},
-+    {"uc3c2512crevc", ARCH_TYPE_UCR3},
-+    {"atuc3l0256",    ARCH_TYPE_UCR3},
-+    {"mxt768e",       ARCH_TYPE_UCR3},
-+    {"uc3l064",       ARCH_TYPE_UCR3},
-+    {"uc3l032",       ARCH_TYPE_UCR3},
-+    {"uc3l016",       ARCH_TYPE_UCR3},
-+    {"uc3l064revb",   ARCH_TYPE_UCR3},
-+    {"uc3c064c",  ARCH_TYPE_UCR3FP},
-+    {"uc3c0128c",   ARCH_TYPE_UCR3FP},
-+    {"uc3c0256c",   ARCH_TYPE_UCR3FP},
-+    {"uc3c0512c",   ARCH_TYPE_UCR3FP},
-+    {"uc3c164c",  ARCH_TYPE_UCR3FP},
-+    {"uc3c1128c",   ARCH_TYPE_UCR3FP},
-+    {"uc3c1256c",   ARCH_TYPE_UCR3FP},
-+    {"uc3c1512c",   ARCH_TYPE_UCR3FP},
-+    {"uc3c264c",  ARCH_TYPE_UCR3FP},
-+    {"uc3c2128c",   ARCH_TYPE_UCR3FP},
-+    {"uc3c2256c",   ARCH_TYPE_UCR3FP},
-+    {"uc3c2512c",   ARCH_TYPE_UCR3FP},
-+    {NULL, 0}
-+};
-+
-+/* Current architecture type.  */
-+static struct arch_type_s default_arch = {"all-insn", AVR32_V1 | AVR32_V2 | AVR32_V3 | AVR32_SIMD | AVR32_DSP | AVR32_RMW | AVR32_V3FP | AVR32_PICO };
-+static struct arch_type_s *avr32_arch = &default_arch;
-+
-+/* Display nicely formatted list of known part- and architecture names.  */
-+
-+static void
-+show_arch_list (FILE *stream)
-+{
-+  int i, x;
-+
-+  fprintf (stream, _("Architectures supported by the assembler:"));
-+  x = 1000;
-+
-+  for (i = 0; arch_types[i].name; i++)
-+    {
-+      int len = strlen (arch_types[i].name);
-+
-+      x += len + 1;
-+
-+      if (x < 75)
-+	fprintf (stream, " %s", arch_types[i].name);
-+      else
-+	{
-+	  fprintf (stream, "\n  %s", arch_types[i].name);
-+	  x = len + 2;
-+	}
-+    }
-+
-+  fprintf (stream, "\n");
-+}
-+
-+static void
-+show_part_list (FILE *stream)
-+{
-+  int i, x;
-+
-+  fprintf (stream, _("Known part names:"));
-+  x = 1000;
-+
-+  for (i = 0; part_types[i].name; i++)
-+    {
-+      int len = strlen(part_types[i].name);
-+
-+      x += len + 1;
-+
-+      if (x < 75)
-+	fprintf (stream, " %s", part_types[i].name);
-+      else
-+	{
-+	  fprintf(stream, "\n  %s", part_types[i].name);
-+	  x = len + 2;
-+	}
-+    }
-+
-+  fprintf (stream, "\n");
-+}
-+
-+const char *md_shortopts = "";
-+struct option md_longopts[] =
-+{
-+#define OPTION_ARCH		(OPTION_MD_BASE)
-+#define OPTION_PART		(OPTION_ARCH + 1)
-+#define OPTION_IAR		(OPTION_PART + 1)
-+#define OPTION_PIC		(OPTION_IAR + 1)
-+#define OPTION_NOPIC		(OPTION_PIC + 1)
-+#define OPTION_LINKRELAX	(OPTION_NOPIC + 1)
-+#define OPTION_NOLINKRELAX	(OPTION_LINKRELAX + 1)
-+#define OPTION_DIRECT_DATA_REFS (OPTION_NOLINKRELAX + 1)
-+  {"march",		required_argument, NULL, OPTION_ARCH},
-+  {"mpart",		required_argument, NULL, OPTION_PART},
-+  {"iar",		no_argument, NULL, OPTION_IAR},
-+  {"pic",		no_argument, NULL, OPTION_PIC},
-+  {"no-pic",		no_argument, NULL, OPTION_NOPIC},
-+  {"linkrelax",		no_argument, NULL, OPTION_LINKRELAX},
-+  {"no-linkrelax",	no_argument, NULL, OPTION_NOLINKRELAX},
-+  /* deprecated alias for -mpart=xxx */
-+  {"mcpu",		required_argument, NULL, OPTION_PART},
-+  {NULL,		no_argument, NULL, 0}
-+};
-+
-+size_t md_longopts_size = sizeof (md_longopts);
-+
-+void
-+md_show_usage (FILE *stream)
-+{
-+  fprintf (stream, _("\
-+AVR32 options:\n\
-+  -march=[arch-name]      Select cpu architecture. [Default `all-insn']\n\
-+  -mpart=[part-name]      Select specific part. [Default `none']\n\
-+  --pic                   Produce Position-Independent Code\n\
-+  --no-pic                Don't produce Position-Independent Code\n\
-+  --linkrelax             Produce output suitable for linker relaxing\n\
-+  --no-linkrelax          Don't produce output suitable for linker relaxing\n"));
-+  show_arch_list(stream);
-+}
-+
-+int
-+md_parse_option (int c, char *arg ATTRIBUTE_UNUSED)
-+{
-+  switch (c)
-+    {
-+    case OPTION_ARCH:
-+      {
-+	int i;
-+	char *s = alloca (strlen (arg) + 1);
-+
-+	{
-+	  char *t = s;
-+	  char *arg1 = arg;
-+
-+	  do
-+	    *t = TOLOWER (*arg1++);
-+	  while (*t++);
-+	}
-+
-+        /* Add backward compability */
-+        if (strcmp ("uc", s)== 0)
-+          {
-+            as_warn("Deprecated arch `%s' specified. "
-+                    "Please use '-march=ucr1' instead. "
-+                    "Using to arch 'ucr1'\n",
-+                     s);
-+            s="ucr1";
-+          }
-+
-+	for (i = 0; arch_types[i].name; ++i)
-+	  if (strcmp (arch_types[i].name, s) == 0)
-+	    break;
-+
-+	if (!arch_types[i].name)
-+	  {
-+	    show_arch_list (stderr);
-+	    as_fatal (_("unknown architecture: %s\n"), arg);
-+	  }
-+
-+        avr32_arch = &arch_types[i];
-+	break;
-+      }
-+    case OPTION_PART:
-+      {
-+	int i;
-+	char *s = alloca (strlen (arg) + 1);
-+	char *t = s;
-+	char *p = arg;
-+
-+	/* If arch type has already been set, don't bother.
-+	   -march= always overrides -mpart=  */
-+	if (avr32_arch != &default_arch)
-+	  break;
-+
-+	do
-+	  *t = TOLOWER (*p++);
-+	while (*t++);
-+
-+	for (i = 0; part_types[i].name; ++i)
-+	  if (strcmp (part_types[i].name, s) == 0)
-+	    break;
-+
-+	if (!part_types[i].name)
-+	  {
-+	    show_part_list (stderr);
-+	    as_fatal (_("unknown part: %s\n"), arg);
-+	  }
-+
-+	avr32_arch = &arch_types[part_types[i].arch];
-+	break;
-+      }
-+    case OPTION_IAR:
-+      avr32_iarcompat = 1;
-+      break;
-+    case OPTION_PIC:
-+      avr32_pic = 1;
-+      break;
-+    case OPTION_NOPIC:
-+      avr32_pic = 0;
-+      break;
-+    case OPTION_LINKRELAX:
-+      linkrelax = 1;
-+      break;
-+    case OPTION_NOLINKRELAX:
-+      linkrelax = 0;
-+      break;
-+    default:
-+      return 0;
-+    }
-+  return 1;
-+}
-+
-+/* Can't use symbol_new here, so have to create a symbol and then at
-+   a later date assign it a value. Thats what these functions do.
-+
-+   Shamelessly stolen from ARM.  */
-+
-+static void
-+symbol_locate (symbolS *    symbolP,
-+	       const char * name,	/* It is copied, the caller can modify.  */
-+	       segT         segment,	/* Segment identifier (SEG_<something>).  */
-+	       valueT       valu,	/* Symbol value.  */
-+	       fragS *      frag)	/* Associated fragment.  */
-+{
-+  unsigned int name_length;
-+  char * preserved_copy_of_name;
-+
-+  name_length = strlen (name) + 1;   /* +1 for \0.  */
-+  obstack_grow (&notes, name, name_length);
-+  preserved_copy_of_name = obstack_finish (&notes);
-+#ifdef STRIP_UNDERSCORE
-+  if (preserved_copy_of_name[0] == '_')
-+    preserved_copy_of_name++;
-+#endif
-+
-+#ifdef tc_canonicalize_symbol_name
-+  preserved_copy_of_name =
-+    tc_canonicalize_symbol_name (preserved_copy_of_name);
-+#endif
-+
-+  S_SET_NAME (symbolP, preserved_copy_of_name);
-+
-+  S_SET_SEGMENT (symbolP, segment);
-+  S_SET_VALUE (symbolP, valu);
-+  symbol_clear_list_pointers (symbolP);
-+
-+  symbol_set_frag (symbolP, frag);
-+
-+  /* Link to end of symbol chain.  */
-+  {
-+    extern int symbol_table_frozen;
-+
-+    if (symbol_table_frozen)
-+      abort ();
-+  }
-+
-+  symbol_append (symbolP, symbol_lastP, & symbol_rootP, & symbol_lastP);
-+
-+  obj_symbol_new_hook (symbolP);
-+
-+#ifdef tc_symbol_new_hook
-+  tc_symbol_new_hook (symbolP);
-+#endif
-+
-+#ifdef DEBUG_SYMS
-+  verify_symbol_chain (symbol_rootP, symbol_lastP);
-+#endif /* DEBUG_SYMS  */
-+}
-+
-+struct cpool_entry
-+{
-+  int			refcount;
-+  offsetT		offset;
-+  expressionS		exp;
-+};
-+
-+struct cpool
-+{
-+  struct cpool		*next;
-+  int			used;
-+  struct cpool_entry	*literals;
-+  unsigned int		padding;
-+  unsigned int		next_free_entry;
-+  unsigned int		id;
-+  symbolS		*symbol;
-+  segT			section;
-+  subsegT		sub_section;
-+};
-+
-+struct cpool *cpool_list = NULL;
-+
-+static struct cpool *
-+find_cpool(segT section, subsegT sub_section)
-+{
-+  struct cpool *pool;
-+
-+  for (pool = cpool_list; pool != NULL; pool = pool->next)
-+    {
-+      if (!pool->used
-+	  && pool->section == section
-+	  && pool->sub_section == sub_section)
-+	break;
-+    }
-+
-+  return pool;
-+}
-+
-+static struct cpool *
-+find_or_make_cpool(segT section, subsegT sub_section)
-+{
-+  static unsigned int next_cpool_id = 0;
-+  struct cpool *pool;
-+
-+  pool = find_cpool(section, sub_section);
-+
-+  if (!pool)
-+    {
-+      pool = xmalloc(sizeof(*pool));
-+      if (!pool)
-+	return NULL;
-+
-+      pool->used = 0;
-+      pool->literals = NULL;
-+      pool->padding = 0;
-+      pool->next_free_entry = 0;
-+      pool->section = section;
-+      pool->sub_section = sub_section;
-+      pool->next = cpool_list;
-+      pool->symbol = NULL;
-+
-+      cpool_list = pool;
-+    }
-+
-+  /* NULL symbol means that the pool is new or has just been emptied.  */
-+  if (!pool->symbol)
-+    {
-+      pool->symbol = symbol_create(FAKE_LABEL_NAME, undefined_section,
-+				   0, &zero_address_frag);
-+      pool->id = next_cpool_id++;
-+    }
-+
-+  return pool;
-+}
-+
-+static struct cpool *
-+add_to_cpool(expressionS *exp, unsigned int *index, int ref)
-+{
-+  struct cpool *pool;
-+  unsigned int entry;
-+
-+  pool = find_or_make_cpool(now_seg, now_subseg);
-+
-+  /* Check if this constant is already in the pool.  */
-+  for (entry = 0; entry < pool->next_free_entry; entry++)
-+    {
-+      if ((pool->literals[entry].exp.X_op == exp->X_op)
-+	  && (exp->X_op == O_constant)
-+	  && (pool->literals[entry].exp.X_add_number
-+	      == exp->X_add_number)
-+	  && (pool->literals[entry].exp.X_unsigned
-+	      == exp->X_unsigned))
-+	break;
-+
-+      if ((pool->literals[entry].exp.X_op == exp->X_op)
-+	  && (exp->X_op == O_symbol)
-+	  && (pool->literals[entry].exp.X_add_number
-+	      == exp->X_add_number)
-+	  && (pool->literals[entry].exp.X_add_symbol
-+	      == exp->X_add_symbol)
-+	  && (pool->literals[entry].exp.X_op_symbol
-+	      == exp->X_op_symbol))
-+	break;
-+    }
-+
-+  /* Create an entry if we didn't find a match */
-+  if (entry == pool->next_free_entry)
-+    {
-+      pool->literals = xrealloc(pool->literals,
-+				sizeof(struct cpool_entry) * (entry + 1));
-+      pool->literals[entry].exp = *exp;
-+      pool->literals[entry].refcount = 0;
-+      pool->next_free_entry++;
-+    }
-+
-+  if (index)
-+    *index = entry;
-+  if (ref)
-+    pool->literals[entry].refcount++;
-+
-+  return pool;
-+}
-+
-+struct avr32_operand
-+{
-+  int id;
-+  int is_signed;
-+  int is_pcrel;
-+  int align_order;
-+  int (*match)(char *str);
-+  void (*parse)(const struct avr32_operand *op, char *str, int opindex);
-+};
-+
-+static int
-+match_anything(char *str ATTRIBUTE_UNUSED)
-+{
-+  return 1;
-+}
-+
-+static int
-+match_intreg(char *str)
-+{
-+  int regid, ret = 1;
-+
-+  regid = avr32_parse_intreg(str);
-+  if (regid < 0)
-+    ret = 0;
-+
-+  pr_debug("match_intreg: `%s': %d\n", str, ret);
-+
-+  return ret;
-+}
-+
-+static int
-+match_intreg_predec(char *str)
-+{
-+  int regid;
-+
-+  if (str[0] != '-' || str[1] != '-')
-+    return 0;
-+
-+  regid = avr32_parse_intreg(str + 2);
-+  if (regid < 0)
-+    return 0;
-+
-+  return 1;
-+}
-+
-+static int
-+match_intreg_postinc(char *str)
-+{
-+  int regid, ret = 1;
-+  char *p, c;
-+
-+  for (p = str; *p; p++)
-+    if (*p == '+')
-+      break;
-+
-+  if (p[0] != '+' || p[1] != '+')
-+    return 0;
-+
-+  c = *p, *p = 0;
-+  regid = avr32_parse_intreg(str);
-+  if (regid < 0)
-+    ret = 0;
-+
-+  *p = c;
-+  return ret;
-+}
-+
-+static int
-+match_intreg_lsl(char *str)
-+{
-+  int regid, ret = 1;
-+  char *p, c;
-+
-+  for (p = str; *p; p++)
-+    if (*p == '<')
-+      break;
-+
-+  if (p[0] && p[1] != '<')
-+    return 0;
-+
-+  c = *p, *p = 0;
-+  regid = avr32_parse_intreg(str);
-+  if (regid < 0)
-+    ret = 0;
-+
-+  *p = c;
-+  return ret;
-+}
-+
-+static int
-+match_intreg_lsr(char *str)
-+{
-+  int regid, ret = 1;
-+  char *p, c;
-+
-+  for (p = str; *p; p++)
-+    if (*p == '>')
-+      break;
-+
-+  if (p[0] && p[1] != '>')
-+    return 0;
-+
-+  c = *p, *p = 0;
-+
-+  regid = avr32_parse_intreg(str);
-+  if (regid < 0)
-+    ret = 0;
-+
-+  *p = c;
-+  return ret;
-+}
-+
-+static int
-+match_intreg_part(char *str)
-+{
-+  int regid, ret = 1;
-+  char *p, c;
-+
-+  for (p = str; *p; p++)
-+    if (*p == ':')
-+      break;
-+
-+  if (p[0] != ':' || !ISPRINT(p[1]) || p[2] != '\0')
-+    return 0;
-+
-+  c = *p, *p = 0;
-+  regid = avr32_parse_intreg(str);
-+  if (regid < 0)
-+    ret = 0;
-+
-+  *p = c;
-+
-+  return ret;
-+}
-+
-+#define match_intreg_disp match_anything
-+
-+static int
-+match_intreg_index(char *str)
-+{
-+  int regid, ret = 1;
-+  char *p, *end, c;
-+
-+  for (p = str; *p; p++)
-+    if (*p == '[')
-+      break;
-+
-+  /* don't allow empty displacement here (it makes no sense) */
-+  if (p[0] != '[')
-+    return 0;
-+
-+  for (end = p + 1; *end; end++) ;
-+  if (*(--end) != ']')
-+    return 0;
-+
-+  c = *end, *end = 0;
-+  if (!match_intreg_lsl(p + 1))
-+    ret = 0;
-+  *end = c;
-+
-+  if (ret)
-+    {
-+      c = *p, *p = 0;
-+      regid = avr32_parse_intreg(str);
-+      if (regid < 0)
-+	ret = 0;
-+      *p = c;
-+    }
-+
-+  return ret;
-+}
-+
-+static int
-+match_intreg_xindex(char *str)
-+{
-+  int regid, ret = 1;
-+  char *p, *end, c;
-+
-+  for (p = str; *p; p++)
-+    if (*p == '[')
-+      break;
-+
-+  /* empty displacement makes no sense here either */
-+  if (p[0] != '[')
-+    return 0;
-+
-+  for (end = p + 1; *end; end++)
-+    if (*end == '<')
-+      break;
-+
-+  if (!streq(end, "<<2]"))
-+    return 0;
-+
-+  c = *end, *end = 0;
-+  if (!match_intreg_part(p + 1))
-+    ret = 0;
-+  *end = c;
-+
-+  if (ret)
-+    {
-+      c = *p, *p = 0;
-+      regid = avr32_parse_intreg(str);
-+      if (regid < 0)
-+	ret = 0;
-+      *p = c;
-+    }
-+
-+  return ret;
-+}
-+
-+/* The PC_UDISP_W operator may show up as a label or as a pc[disp]
-+   expression.  So there's no point in attempting to match this...  */
-+#define match_pc_disp	match_anything
-+
-+static int
-+match_sp(char *str)
-+{
-+  /* SP in any form will do */
-+  return avr32_parse_intreg(str) == AVR32_REG_SP;
-+}
-+
-+static int
-+match_sp_disp(char *str)
-+{
-+  int regid, ret = 1;
-+  char *p, c;
-+
-+  for (p = str; *p; p++)
-+    if (*p == '[')
-+      break;
-+
-+  /* allow empty displacement, meaning zero */
-+  if (p[0] == '[')
-+    {
-+      char *end;
-+      for (end = p + 1; *end; end++) ;
-+      if (end[-1] != ']')
-+	return 0;
-+    }
-+
-+  c = *p, *p = 0;
-+  regid = avr32_parse_intreg(str);
-+  if (regid != AVR32_REG_SP)
-+    ret = 0;
-+
-+  *p = c;
-+  return ret;
-+}
-+
-+static int
-+match_cpno(char *str)
-+{
-+  if (strncasecmp(str, "cp", 2) != 0)
-+    return 0;
-+  return 1;
-+}
-+
-+static int
-+match_cpreg(char *str)
-+{
-+  if (strncasecmp(str, "cr", 2) != 0)
-+    return 0;
-+  return 1;
-+}
-+
-+/* We allow complex expressions, and register names may show up as
-+   symbols.  Just make sure immediate expressions are always matched
-+   last.  */
-+#define match_const		match_anything
-+#define match_jmplabel		match_anything
-+#define match_number		match_anything
-+
-+/* Mnemonics that take reglists never accept anything else */
-+#define match_reglist8		match_anything
-+#define match_reglist9		match_anything
-+#define match_reglist16		match_anything
-+#define match_reglist_ldm	match_anything
-+#define match_reglist_cp8	match_anything
-+#define match_reglist_cpd8	match_anything
-+
-+/* Ditto for retval, jospinc and mcall */
-+#define match_retval		match_anything
-+#define match_jospinc		match_anything
-+#define match_mcall		match_anything
-+
-+/* COH is used to select between two different syntaxes */
-+static int
-+match_coh(char *str)
-+{
-+  return strcasecmp(str, "coh") == 0;
-+}
-+#if 0
-+static int
-+match_fpreg(char *str)
-+{
-+  unsigned long regid;
-+  char *endptr;
-+
-+  if ((str[0] != 'f' && str[0] != 'F')
-+      || (str[1] != 'r' && str[1] != 'R'))
-+    return 0;
-+
-+  str += 2;
-+  regid = strtoul(str, &endptr, 10);
-+  if (!*str || *endptr)
-+    return 0;
-+
-+  return 1;
-+}
-+#endif
-+
-+static int
-+match_picoreg(char *str)
-+{
-+  int regid;
-+
-+  regid = avr32_parse_picoreg(str);
-+  if (regid < 0)
-+    return 0;
-+  return 1;
-+}
-+
-+#define match_pico_reglist_w	match_anything
-+#define match_pico_reglist_d	match_anything
-+
-+static int
-+match_pico_in(char *str)
-+{
-+  unsigned long regid;
-+  char *end;
-+
-+  if (strncasecmp(str, "in", 2) != 0)
-+    return 0;
-+
-+  str += 2;
-+  regid = strtoul(str, &end, 10);
-+  if (!*str || *end)
-+    return 0;
-+
-+  return 1;
-+}
-+
-+static int
-+match_pico_out0(char *str)
-+{
-+  if (strcasecmp(str, "out0") != 0)
-+    return 0;
-+  return 1;
-+}
-+
-+static int
-+match_pico_out1(char *str)
-+{
-+  if (strcasecmp(str, "out1") != 0)
-+    return 0;
-+  return 1;
-+}
-+
-+static int
-+match_pico_out2(char *str)
-+{
-+  if (strcasecmp(str, "out2") != 0)
-+    return 0;
-+  return 1;
-+}
-+
-+static int
-+match_pico_out3(char *str)
-+{
-+  if (strcasecmp(str, "out3") != 0)
-+    return 0;
-+  return 1;
-+}
-+
-+static void parse_nothing(const struct avr32_operand *op ATTRIBUTE_UNUSED,
-+			  char *str ATTRIBUTE_UNUSED,
-+			  int opindex ATTRIBUTE_UNUSED)
-+{
-+  /* Do nothing (this is used for "match-only" operands like COH) */
-+}
-+
-+static void
-+parse_const(const struct avr32_operand *op, char *str,
-+	    int opindex ATTRIBUTE_UNUSED)
-+{
-+  expressionS *exp = &current_insn.immediate;
-+  expressionS *sym_exp;
-+  int slot;
-+  char *save;
-+
-+  pr_debug("parse_const: `%s' (signed: %d, pcrel: %d, align: %d)\n",
-+	   str, op->is_signed, op->is_pcrel, op->align_order);
-+
-+  save = input_line_pointer;
-+  input_line_pointer = str;
-+
-+  expression(exp);
-+
-+  slot = current_insn.next_slot++;
-+  current_insn.field_value[slot].align_order = op->align_order;
-+  current_insn.pcrel = op->is_pcrel;
-+
-+  switch (exp->X_op)
-+    {
-+    case O_illegal:
-+      as_bad(_("illegal operand"));
-+      break;
-+    case O_absent:
-+      as_bad(_("missing operand"));
-+      break;
-+    case O_constant:
-+      pr_debug("  -> constant: %ld\n", (long)exp->X_add_number);
-+      current_insn.field_value[slot].value = exp->X_add_number;
-+      break;
-+    case O_uminus:
-+      pr_debug("  -> uminus\n");
-+      sym_exp = symbol_get_value_expression(exp->X_add_symbol);
-+      switch (sym_exp->X_op) {
-+      case O_subtract:
-+	pr_debug("     -> subtract: switching operands\n");
-+	exp->X_op_symbol = sym_exp->X_add_symbol;
-+	exp->X_add_symbol = sym_exp->X_op_symbol;
-+	exp->X_op = O_subtract;
-+	/* TODO: Remove the old X_add_symbol */
-+	break;
-+      default:
-+	as_bad(_("Expression too complex\n"));
-+	break;
-+      }
-+      break;
-+#if 0
-+    case O_subtract:
-+      /* Any expression subtracting a symbol from the current section
-+	 can be made PC-relative by adding the right offset.  */
-+      if (S_GET_SEGMENT(exp->X_op_symbol) == now_seg)
-+	current_insn.pcrel = TRUE;
-+      pr_debug("  -> subtract: pcrel? %s\n",
-+	       current_insn.pcrel ? "yes" : "no");
-+      /* fall through */
-+#endif
-+    default:
-+      pr_debug("  -> (%p <%d> %p + %d)\n",
-+	       exp->X_add_symbol, exp->X_op, exp->X_op_symbol,
-+	       exp->X_add_number);
-+      current_insn.field_value[slot].value = 0;
-+      break;
-+    }
-+
-+  input_line_pointer = save;
-+}
-+
-+static void
-+parse_jmplabel(const struct avr32_operand *op, char *str,
-+	       int opindex ATTRIBUTE_UNUSED)
-+{
-+  expressionS *exp = &current_insn.immediate;
-+  int slot;
-+  char *save;
-+
-+  pr_debug("parse_jmplabel: `%s' (signed: %d, pcrel: %d, align: %d)\n",
-+	   str, op->is_signed, op->is_pcrel, op->align_order);
-+
-+  save = input_line_pointer;
-+  input_line_pointer = str;
-+
-+  expression(exp);
-+
-+  slot = current_insn.next_slot++;
-+  current_insn.field_value[slot].align_order = op->align_order;
-+  current_insn.pcrel = TRUE;
-+
-+  switch (exp->X_op)
-+    {
-+    case O_illegal:
-+      as_bad(_("illegal operand"));
-+      break;
-+    case O_absent:
-+      as_bad(_("missing operand"));
-+      break;
-+    case O_constant:
-+      pr_debug("  -> constant: %ld\n", (long)exp->X_add_number);
-+      current_insn.field_value[slot].value = exp->X_add_number;
-+      current_insn.pcrel = 0;
-+      break;
-+    default:
-+      pr_debug("  -> (%p <%d> %p + %d)\n",
-+	       exp->X_add_symbol, exp->X_op, exp->X_op_symbol,
-+	       exp->X_add_number);
-+      current_insn.field_value[slot].value = 0;
-+      break;
-+    }
-+
-+  input_line_pointer = save;
-+}
-+
-+static void
-+parse_intreg(const struct avr32_operand *op ATTRIBUTE_UNUSED,
-+	     char *str, int opindex ATTRIBUTE_UNUSED)
-+{
-+  int regid, slot;
-+
-+  pr_debug("parse_intreg: `%s'\n", str);
-+
-+  regid = avr32_parse_intreg(str);
-+  assert(regid >= 0);
-+
-+  slot = current_insn.next_slot++;
-+  current_insn.field_value[slot].value = regid;
-+  current_insn.field_value[slot].align_order = op->align_order;
-+}
-+
-+static void
-+parse_intreg_predec(const struct avr32_operand *op, char *str, int opindex)
-+{
-+  parse_intreg(op, str + 2, opindex);
-+}
-+
-+static void
-+parse_intreg_postinc(const struct avr32_operand *op, char *str, int opindex)
-+{
-+  char *p, c;
-+
-+  pr_debug("parse_intreg_postinc: `%s'\n", str);
-+
-+  for (p = str; *p != '+'; p++) ;
-+
-+  c = *p, *p = 0;
-+  parse_intreg(op, str, opindex);
-+  *p = c;
-+}
-+
-+static void
-+parse_intreg_shift(const struct avr32_operand *op ATTRIBUTE_UNUSED,
-+		   char *str, int opindex ATTRIBUTE_UNUSED)
-+{
-+  int regid, slot, shift = 0;
-+  char *p, c;
-+  char shiftop;
-+
-+  pr_debug("parse Ry<<sa: `%s'\n", str);
-+
-+  for (p = str; *p; p++)
-+    if (*p == '<' || *p == '>')
-+      break;
-+
-+  shiftop = *p;
-+
-+  c = *p, *p = 0;
-+  regid = avr32_parse_intreg(str);
-+  assert(regid >= 0);
-+  *p = c;
-+
-+  if (c)
-+    {
-+      if (p[0] != shiftop || p[1] != shiftop)
-+	as_bad(_("expected shift operator in `%s'"), p);
-+      else
-+	{
-+	  expressionS exp;
-+	  char *saved;
-+
-+	  saved = input_line_pointer;
-+	  input_line_pointer = p + 2;
-+	  expression(&exp);
-+	  input_line_pointer = saved;
-+
-+	  if (exp.X_op != O_constant)
-+	    as_bad(_("shift amount must be a numeric constant"));
-+	  else
-+	    shift = exp.X_add_number;
-+	}
-+    }
-+
-+  slot = current_insn.next_slot++;
-+  current_insn.field_value[slot].value = regid;
-+  slot = current_insn.next_slot++;
-+  current_insn.field_value[slot].value = shift;
-+}
-+
-+/* The match() function selected the right opcode, so it doesn't
-+   matter which way we shift any more.  */
-+#define parse_intreg_lsl	parse_intreg_shift
-+#define parse_intreg_lsr	parse_intreg_shift
-+
-+static void
-+parse_intreg_part(const struct avr32_operand *op, char *str,
-+		  int opindex ATTRIBUTE_UNUSED)
-+{
-+  static const char bparts[] = { 'b', 'l', 'u', 't' };
-+  static const char hparts[] = { 'b', 't' };
-+  unsigned int slot, sel;
-+  int regid;
-+  char *p, c;
-+
-+  pr_debug("parse reg:part `%s'\n", str);
-+
-+  for (p = str; *p; p++)
-+    if (*p == ':')
-+      break;
-+
-+  c = *p, *p = 0;
-+  regid = avr32_parse_intreg(str);
-+  assert(regid >= 0);
-+  *p = c;
-+
-+  assert(c == ':');
-+
-+  if (op->align_order)
-+    {
-+      for (sel = 0; sel < sizeof(hparts); sel++)
-+	if (TOLOWER(p[1]) == hparts[sel])
-+	  break;
-+
-+      if (sel >= sizeof(hparts))
-+	{
-+	  as_bad(_("invalid halfword selector `%c' (must be either b or t)"),
-+		 p[1]);
-+	  sel = 0;
-+	}
-+    }
-+  else
-+    {
-+      for (sel = 0; sel < sizeof(bparts); sel++)
-+	if (TOLOWER(p[1]) == bparts[sel])
-+	  break;
-+
-+      if (sel >= sizeof(bparts))
-+	{
-+	  as_bad(_("invalid byte selector `%c' (must be one of b,l,u,t)"),
-+		 p[1]);
-+	  sel = 0;
-+	}
-+    }
-+
-+  slot = current_insn.next_slot++;
-+  current_insn.field_value[slot].value = regid;
-+  slot = current_insn.next_slot++;
-+  current_insn.field_value[slot].value = sel;
-+}
-+
-+/* This is the parser for "Rp[displacement]" expressions.  In addition
-+   to the "official" syntax, we accept a label as a replacement for
-+   the register expression.  This syntax implies Rp=PC and the
-+   displacement is the pc-relative distance to the label.  */
-+static void
-+parse_intreg_disp(const struct avr32_operand *op, char *str, int opindex)
-+{
-+  expressionS *exp = &current_insn.immediate;
-+  int slot, regid;
-+  char *save, *p, c;
-+
-+  pr_debug("parse_intreg_disp: `%s' (signed: %d, pcrel: %d, align: %d)\n",
-+	   str, op->is_signed, op->is_pcrel, op->align_order);
-+
-+  for (p = str; *p; p++)
-+    if (*p == '[')
-+      break;
-+
-+  slot = current_insn.next_slot++;
-+
-+  /* First, check if we have a valid register either before '[' or as
-+     the sole expression.  If so, we use the Rp[disp] syntax.  */
-+  c = *p, *p = 0;
-+  regid = avr32_parse_intreg(str);
-+  *p = c;
-+
-+  if (regid >= 0)
-+    {
-+      current_insn.field_value[slot].value = regid;
-+
-+      slot = current_insn.next_slot++;
-+      current_insn.field_value[slot].align_order = op->align_order;
-+
-+      if (c == '[')
-+	{
-+	  save = input_line_pointer;
-+	  input_line_pointer = p + 1;
-+
-+	  expression(exp);
-+
-+	  if (*input_line_pointer != ']')
-+	    as_bad(_("junk after displacement expression"));
-+
-+	  input_line_pointer = save;
-+
-+	  switch (exp->X_op)
-+	    {
-+	    case O_illegal:
-+	      as_bad(_("illegal displacement expression"));
-+	      break;
-+	    case O_absent:
-+	      as_bad(_("missing displacement expression"));
-+	      break;
-+	    case O_constant:
-+	      pr_debug("  -> constant: %ld\n", exp->X_add_number);
-+	      current_insn.field_value[slot].value = exp->X_add_number;
-+	      break;
-+#if 0
-+	    case O_subtract:
-+	      if (S_GET_SEGMENT(exp->X_op_symbol) == now_seg)
-+		current_insn.pcrel = TRUE;
-+	      pr_debug("  -> subtract: pcrel? %s\n",
-+		       current_insn.pcrel ? "yes" : "no");
-+	      /* fall through */
-+#endif
-+	    default:
-+	      pr_debug("  -> (%p <%d> %p + %d)\n",
-+		       exp->X_add_symbol, exp->X_op, exp->X_op_symbol,
-+		       exp->X_add_number);
-+	      current_insn.field_value[slot].value = 0;
-+	    }
-+	}
-+      else
-+	{
-+	  exp->X_op = O_constant;
-+	  exp->X_add_number = 0;
-+	  current_insn.field_value[slot].value = 0;
-+	}
-+    }
-+  else
-+    {
-+      /* Didn't find a valid register.  Try parsing it as a label.  */
-+      current_insn.field_value[slot].value = AVR32_REG_PC;
-+      parse_jmplabel(op, str, opindex);
-+    }
-+}
-+
-+static void
-+parse_intreg_index(const struct avr32_operand *op ATTRIBUTE_UNUSED,
-+		   char *str, int opindex ATTRIBUTE_UNUSED)
-+{
-+  int slot, regid;
-+  char *p, *end, c;
-+
-+  for (p = str; *p; p++)
-+    if (*p == '[')
-+      break;
-+
-+  assert(*p);
-+
-+  c = *p, *p = 0;
-+  regid = avr32_parse_intreg(str);
-+  assert(regid >= 0);
-+  *p = c;
-+
-+  slot = current_insn.next_slot++;
-+  current_insn.field_value[slot].value = regid;
-+
-+  p++;
-+  for (end = p; *end; end++)
-+    if (*end == ']' || *end == '<')
-+      break;
-+
-+  assert(*end);
-+
-+  c = *end, *end = 0;
-+  regid = avr32_parse_intreg(p);
-+  assert(regid >= 0);
-+  *end = c;
-+
-+  slot = current_insn.next_slot++;
-+  current_insn.field_value[slot].value = regid;
-+
-+  slot = current_insn.next_slot++;
-+  current_insn.field_value[slot].value = 0;
-+
-+  if (*end == '<')
-+    {
-+      expressionS exp;
-+      char *save;
-+
-+      p = end + 2;
-+      for (end = p; *end; end++)
-+	if (*end == ']')
-+	  break;
-+
-+      assert(*end == ']');
-+
-+      c = *end, *end = 0;
-+      save = input_line_pointer;
-+      input_line_pointer = p;
-+      expression(&exp);
-+
-+      if (*input_line_pointer)
-+	as_bad(_("junk after shift expression"));
-+
-+      *end = c;
-+      input_line_pointer = save;
-+
-+      if (exp.X_op == O_constant)
-+	current_insn.field_value[slot].value = exp.X_add_number;
-+      else
-+	as_bad(_("shift expression too complex"));
-+    }
-+}
-+
-+static void
-+parse_intreg_xindex(const struct avr32_operand *op, char *str, int opindex)
-+{
-+  int slot, regid;
-+  char *p, *end, c;
-+
-+  for (p = str; *p; p++)
-+    if (*p == '[')
-+      break;
-+
-+  assert(*p);
-+
-+  c = *p, *p = 0;
-+  regid = avr32_parse_intreg(str);
-+  assert(regid >= 0);
-+  *p = c;
-+
-+  slot = current_insn.next_slot++;
-+  current_insn.field_value[slot].value = regid;
-+
-+  p++;
-+  for (end = p; *end; end++)
-+    if (*end == '<')
-+      break;
-+
-+  assert(*end);
-+
-+  c = *end, *end = 0;
-+  parse_intreg_part(op, p, opindex);
-+  *end = c;
-+}
-+
-+static void
-+parse_pc_disp(const struct avr32_operand *op, char *str, int opindex)
-+{
-+  char *p, c;
-+
-+  for (p = str; *p; p++)
-+    if (*p == '[')
-+      break;
-+
-+  /* The lddpc instruction comes in two different syntax variants:
-+       lddpc reg, expression
-+       lddpc reg, pc[disp]
-+     If the operand contains a '[', we use the second form.  */
-+  if (*p)
-+    {
-+      int regid;
-+
-+      c = *p, *p = 0;
-+      regid = avr32_parse_intreg(str);
-+      *p = c;
-+      if (regid == AVR32_REG_PC)
-+	{
-+	  char *end;
-+
-+	  for (end = ++p; *end; end++) ;
-+	  if (*(--end) != ']')
-+	    as_bad(_("unrecognized form of instruction: `%s'"), str);
-+	  else
-+	    {
-+	      c = *end, *end = 0;
-+	      parse_const(op, p, opindex);
-+	      *end = c;
-+	      current_insn.pcrel = 0;
-+	    }
-+	}
-+      else
-+	as_bad(_("unrecognized form of instruction: `%s'"), str);
-+    }
-+  else
-+    {
-+      parse_jmplabel(op, str, opindex);
-+    }
-+}
-+
-+static void parse_sp(const struct avr32_operand *op ATTRIBUTE_UNUSED,
-+		     char *str ATTRIBUTE_UNUSED,
-+		     int opindex ATTRIBUTE_UNUSED)
-+{
-+  int slot;
-+
-+  slot = current_insn.next_slot++;
-+  current_insn.field_value[slot].value = AVR32_REG_SP;
-+}
-+
-+static void
-+parse_sp_disp(const struct avr32_operand *op, char *str, int opindex)
-+{
-+  char *p, c;
-+
-+  for (; *str; str++)
-+    if (*str == '[')
-+      break;
-+
-+  assert(*str);
-+
-+  for (p = ++str; *p; p++)
-+    if (*p == ']')
-+      break;
-+
-+  c = *p, *p = 0;
-+  parse_const(op, str, opindex);
-+  *p = c;
-+}
-+
-+static void
-+parse_cpno(const struct avr32_operand *op ATTRIBUTE_UNUSED, char *str,
-+	   int opindex ATTRIBUTE_UNUSED)
-+{
-+  int slot;
-+
-+  str += 2;
-+  if (*str == '#')
-+    str++;
-+  if (*str < '0' || *str > '7' || str[1])
-+    as_bad(_("invalid coprocessor `%s'"), str);
-+
-+  slot = current_insn.next_slot++;
-+  current_insn.field_value[slot].value = *str - '0';
-+}
-+
-+static void
-+parse_cpreg(const struct avr32_operand *op, char *str,
-+	    int opindex ATTRIBUTE_UNUSED)
-+{
-+  unsigned int crid;
-+  int slot;
-+  char *endptr;
-+
-+  str += 2;
-+  crid = strtoul(str, &endptr, 10);
-+  if (*endptr || crid > 15 || crid & ((1 << op->align_order) - 1))
-+    as_bad(_("invalid coprocessor register `%s'"), str);
-+
-+  crid >>= op->align_order;
-+
-+  slot = current_insn.next_slot++;
-+  current_insn.field_value[slot].value = crid;
-+}
-+
-+static void
-+parse_number(const struct avr32_operand *op, char *str,
-+	     int opindex ATTRIBUTE_UNUSED)
-+{
-+  expressionS exp;
-+  int slot;
-+  char *save;
-+
-+  save = input_line_pointer;
-+  input_line_pointer = str;
-+  expression(&exp);
-+  input_line_pointer = save;
-+
-+  slot = current_insn.next_slot++;
-+  current_insn.field_value[slot].align_order = op->align_order;
-+
-+  if (exp.X_op == O_constant)
-+      current_insn.field_value[slot].value = exp.X_add_number;
-+  else
-+      as_bad(_("invalid numeric expression `%s'"), str);
-+}
-+
-+static void
-+parse_reglist8(const struct avr32_operand *op ATTRIBUTE_UNUSED,
-+	       char *str, int opindex ATTRIBUTE_UNUSED)
-+{
-+  unsigned long regmask;
-+  unsigned long value = 0;
-+  int slot;
-+  char *tail;
-+
-+  regmask = avr32_parse_reglist(str, &tail);
-+  if (*tail)
-+    as_bad(_("invalid register list `%s'"), str);
-+  else
-+    {
-+      if (avr32_make_regmask8(regmask, &value))
-+	as_bad(_("register list `%s' doesn't fit"), str);
-+    }
-+
-+  slot = current_insn.next_slot++;
-+  current_insn.field_value[slot].value = value;
-+}
-+
-+static int
-+parse_reglist_tail(char *str, unsigned long regmask)
-+{
-+  expressionS exp;
-+  char *save, *p, c;
-+  int regid;
-+
-+  for (p = str + 1; *p; p++)
-+    if (*p == '=')
-+      break;
-+
-+  if (!*p)
-+    {
-+      as_bad(_("invalid register list `%s'"), str);
-+      return -2;
-+    }
-+
-+  c = *p, *p = 0;
-+  regid = avr32_parse_intreg(str);
-+  *p = c;
-+
-+  if (regid != 12)
-+    {
-+      as_bad(_("invalid register list `%s'"), str);
-+      return -2;
-+    }
-+
-+  /* If we have an assignment, we must pop PC and we must _not_
-+     pop LR or R12 */
-+  if (!(regmask & (1 << AVR32_REG_PC)))
-+    {
-+      as_bad(_("return value specified for non-return instruction"));
-+      return -2;
-+    }
-+  else if (regmask & ((1 << AVR32_REG_R12) | (1 << AVR32_REG_LR)))
-+    {
-+      as_bad(_("can't pop LR or R12 when specifying return value"));
-+      return -2;
-+    }
-+
-+  save = input_line_pointer;
-+  input_line_pointer = p + 1;
-+  expression(&exp);
-+  input_line_pointer = save;
-+
-+  if (exp.X_op != O_constant
-+      || exp.X_add_number < -1
-+      || exp.X_add_number > 1)
-+    {
-+      as_bad(_("invalid return value `%s'"), str);
-+      return -2;
-+    }
-+
-+  return exp.X_add_number;
-+}
-+
-+static void
-+parse_reglist9(const struct avr32_operand *op ATTRIBUTE_UNUSED,
-+	       char *str, int opindex ATTRIBUTE_UNUSED)
-+{
-+  unsigned long regmask;
-+  unsigned long value = 0, kbit = 0;
-+  int slot;
-+  char *tail;
-+
-+  regmask = avr32_parse_reglist(str, &tail);
-+  /* printf("parsed reglist16: %04lx, tail: `%s'\n", regmask, tail); */
-+  if (*tail)
-+    {
-+      int retval;
-+
-+      retval = parse_reglist_tail(tail, regmask);
-+
-+      switch (retval)
-+	{
-+	case -1:
-+	  regmask |= 1 << AVR32_REG_LR;
-+	  break;
-+	case 0:
-+	  break;
-+	case 1:
-+	  regmask |= 1 << AVR32_REG_R12;
-+	  break;
-+	default:
-+	  break;
-+	}
-+
-+      kbit = 1;
-+    }
-+
-+  if (avr32_make_regmask8(regmask, &value))
-+    as_bad(_("register list `%s' doesn't fit"), str);
-+
-+
-+  slot = current_insn.next_slot++;
-+  current_insn.field_value[slot].value = (value << 1) | kbit;
-+}
-+
-+static void
-+parse_reglist16(const struct avr32_operand *op ATTRIBUTE_UNUSED,
-+		char *str, int opindex ATTRIBUTE_UNUSED)
-+{
-+  unsigned long regmask;
-+  int slot;
-+  char *tail;
-+
-+  regmask = avr32_parse_reglist(str, &tail);
-+  if (*tail)
-+    as_bad(_("invalid register list `%s'"), str);
-+
-+  slot = current_insn.next_slot++;
-+  current_insn.field_value[slot].value = regmask;
-+}
-+
-+static void
-+parse_reglist_ldm(const struct avr32_operand *op ATTRIBUTE_UNUSED,
-+		  char *str, int opindex ATTRIBUTE_UNUSED)
-+{
-+  unsigned long regmask;
-+  int slot, rp, w_bit = 0;
-+  char *tail, *p, c;
-+
-+  for (p = str; *p && *p != ','; p++)
-+    if (*p == '+')
-+      break;
-+
-+  c = *p, *p = 0;
-+  rp = avr32_parse_intreg(str);
-+  *p = c;
-+  if (rp < 0)
-+    {
-+      as_bad(_("invalid destination register in `%s'"), str);
-+      return;
-+    }
-+
-+  if (p[0] == '+' && p[1] == '+')
-+    {
-+      w_bit = 1;
-+      p += 2;
-+    }
-+
-+  if (*p != ',')
-+    {
-+      as_bad(_("expected `,' after destination register in `%s'"), str);
-+      return;
-+    }
-+
-+  str = p + 1;
-+  regmask = avr32_parse_reglist(str, &tail);
-+  if (*tail)
-+    {
-+      int retval;
-+
-+      if (rp != AVR32_REG_SP)
-+	{
-+	  as_bad(_("junk at end of line: `%s'"), tail);
-+	  return;
-+	}
-+
-+      rp = AVR32_REG_PC;
-+
-+      retval = parse_reglist_tail(tail, regmask);
-+
-+      switch (retval)
-+	{
-+	case -1:
-+	  regmask |= 1 << AVR32_REG_LR;
-+	  break;
-+	case 0:
-+	  break;
-+	case 1:
-+	  regmask |= 1 << AVR32_REG_R12;
-+	  break;
-+	default:
-+	  return;
-+	}
-+    }
-+
-+  slot = current_insn.next_slot++;
-+  current_insn.field_value[slot].value = rp;
-+  slot = current_insn.next_slot++;
-+  current_insn.field_value[slot].value = w_bit;
-+  slot = current_insn.next_slot++;
-+  current_insn.field_value[slot].value = regmask;
-+}
-+
-+static void
-+parse_reglist_cp8(const struct avr32_operand *op ATTRIBUTE_UNUSED,
-+		  char *str, int opindex ATTRIBUTE_UNUSED)
-+{
-+  unsigned long regmask;
-+  int slot, h_bit = 0;
-+  char *tail;
-+
-+  regmask = avr32_parse_cpreglist(str, &tail);
-+  if (*tail)
-+    as_bad(_("junk at end of line: `%s'"), tail);
-+  else if (regmask & 0xffUL)
-+    {
-+      if (regmask & 0xff00UL)
-+	as_bad(_("register list `%s' doesn't fit"), str);
-+      regmask &= 0xff;
-+    }
-+  else if (regmask & 0xff00UL)
-+    {
-+      regmask >>= 8;
-+      h_bit = 1;
-+    }
-+  else
-+    as_warn(_("register list is empty"));
-+
-+  slot = current_insn.next_slot++;
-+  current_insn.field_value[slot].value = regmask;
-+  slot = current_insn.next_slot++;
-+  current_insn.field_value[slot].value = h_bit;
-+}
-+
-+static void
-+parse_reglist_cpd8(const struct avr32_operand *op ATTRIBUTE_UNUSED,
-+		   char *str, int opindex ATTRIBUTE_UNUSED)
-+{
-+  unsigned long regmask, regmask_d = 0;
-+  int slot, i;
-+  char *tail;
-+
-+  regmask = avr32_parse_cpreglist(str, &tail);
-+  if (*tail)
-+    as_bad(_("junk at end of line: `%s'"), tail);
-+
-+  for (i = 0; i < 8; i++)
-+    {
-+      if (regmask & 1)
-+	{
-+	  if (!(regmask & 2))
-+	    {
-+	      as_bad(_("register list `%s' doesn't fit"), str);
-+	      break;
-+	    }
-+	  regmask_d |= 1 << i;
-+	}
-+      else if (regmask & 2)
-+	{
-+	  as_bad(_("register list `%s' doesn't fit"), str);
-+	  break;
-+	}
-+
-+      regmask >>= 2;
-+    }
-+
-+  slot = current_insn.next_slot++;
-+  current_insn.field_value[slot].value = regmask_d;
-+}
-+
-+static void
-+parse_retval(const struct avr32_operand *op ATTRIBUTE_UNUSED,
-+	     char *str, int opindex ATTRIBUTE_UNUSED)
-+{
-+  int regid, slot;
-+
-+  regid = avr32_parse_intreg(str);
-+  if (regid < 0)
-+    {
-+      expressionS exp;
-+      char *save;
-+
-+      regid = 0;
-+
-+      save = input_line_pointer;
-+      input_line_pointer = str;
-+      expression(&exp);
-+      input_line_pointer = save;
-+
-+      if (exp.X_op != O_constant)
-+	as_bad(_("invalid return value `%s'"), str);
-+      else
-+	switch (exp.X_add_number)
-+	  {
-+	  case -1:
-+	    regid = AVR32_REG_LR;
-+	    break;
-+	  case 0:
-+	    regid = AVR32_REG_SP;
-+	    break;
-+	  case 1:
-+	    regid = AVR32_REG_PC;
-+	    break;
-+	  default:
-+	    as_bad(_("invalid return value `%s'"), str);
-+	    break;
-+	  }
-+    }
-+
-+  slot = current_insn.next_slot++;
-+  current_insn.field_value[slot].value = regid;
-+}
-+
-+#define parse_mcall parse_intreg_disp
-+
-+static void
-+parse_jospinc(const struct avr32_operand *op ATTRIBUTE_UNUSED,
-+	      char *str, int opindex ATTRIBUTE_UNUSED)
-+{
-+  expressionS exp;
-+  int slot;
-+  char *save;
-+
-+  save = input_line_pointer;
-+  input_line_pointer = str;
-+  expression(&exp);
-+  input_line_pointer = save;
-+
-+  slot = current_insn.next_slot++;
-+
-+  if (exp.X_op == O_constant)
-+    {
-+      if (exp.X_add_number > 0)
-+	exp.X_add_number--;
-+      current_insn.field_value[slot].value = exp.X_add_number;
-+    }
-+  else
-+    as_bad(_("invalid numeric expression `%s'"), str);
-+}
-+
-+#define parse_coh		parse_nothing
-+#if 0
-+static void
-+parse_fpreg(const struct avr32_operand *op,
-+	    char *str, int opindex ATTRIBUTE_UNUSED)
-+{
-+  unsigned long regid;
-+  int slot;
-+
-+  regid = strtoul(str + 2, NULL, 10);
-+
-+  if ((regid >= 16) || (regid & ((1 << op->align_order) - 1)))
-+    as_bad(_("invalid floating-point register `%s'"), str);
-+
-+  slot = current_insn.next_slot++;
-+  current_insn.field_value[slot].value = regid;
-+  current_insn.field_value[slot].align_order = op->align_order;
-+}
-+#endif
-+
-+static void
-+parse_picoreg(const struct avr32_operand *op,
-+	      char *str, int opindex ATTRIBUTE_UNUSED)
-+{
-+  unsigned long regid;
-+  int slot;
-+
-+  regid = avr32_parse_picoreg(str);
-+  if (regid & ((1 << op->align_order) - 1))
-+    as_bad(_("invalid double-word PiCo register `%s'"), str);
-+
-+  slot = current_insn.next_slot++;
-+  current_insn.field_value[slot].value = regid;
-+  current_insn.field_value[slot].align_order = op->align_order;
-+}
-+
-+static void
-+parse_pico_reglist_w(const struct avr32_operand *op ATTRIBUTE_UNUSED,
-+		     char *str, int opindex ATTRIBUTE_UNUSED)
-+{
-+  unsigned long regmask;
-+  int slot, h_bit = 0;
-+  char *tail;
-+
-+  regmask = avr32_parse_pico_reglist(str, &tail);
-+  if (*tail)
-+    as_bad(_("junk at end of line: `%s'"), tail);
-+
-+  if (regmask & 0x00ffUL)
-+    {
-+      if (regmask & 0xff00UL)
-+	as_bad(_("register list `%s' doesn't fit"), str);
-+      regmask &= 0x00ffUL;
-+    }
-+  else if (regmask & 0xff00UL)
-+    {
-+      regmask >>= 8;
-+      h_bit = 1;
-+    }
-+  else
-+    as_warn(_("register list is empty"));
-+
-+  slot = current_insn.next_slot++;
-+  current_insn.field_value[slot].value = regmask;
-+  slot = current_insn.next_slot++;
-+  current_insn.field_value[slot].value = h_bit;
-+}
-+
-+static void
-+parse_pico_reglist_d(const struct avr32_operand *op ATTRIBUTE_UNUSED,
-+		     char *str, int opindex ATTRIBUTE_UNUSED)
-+{
-+  unsigned long regmask, regmask_d = 0;
-+  int slot, i;
-+  char *tail;
-+
-+  regmask = avr32_parse_pico_reglist(str, &tail);
-+  if (*tail)
-+    as_bad(_("junk at end of line: `%s'"), tail);
-+
-+  for (i = 0; i < 8; i++)
-+    {
-+      if (regmask & 1)
-+	{
-+	  if (!(regmask & 2))
-+	    {
-+	      as_bad(_("register list `%s' doesn't fit"), str);
-+	      break;
-+	    }
-+	  regmask_d |= 1 << i;
-+	}
-+      else if (regmask & 2)
-+	{
-+	  as_bad(_("register list `%s' doesn't fit"), str);
-+	  break;
-+	}
-+
-+      regmask >>= 2;
-+    }
-+
-+  slot = current_insn.next_slot++;
-+  current_insn.field_value[slot].value = regmask_d;
-+}
-+
-+static void
-+parse_pico_in(const struct avr32_operand *op ATTRIBUTE_UNUSED,
-+	      char *str, int opindex ATTRIBUTE_UNUSED)
-+{
-+  unsigned long regid;
-+  int slot;
-+
-+  regid = strtoul(str + 2, NULL, 10);
-+
-+  if (regid >= 12)
-+    as_bad(_("invalid PiCo IN register `%s'"), str);
-+
-+  slot = current_insn.next_slot++;
-+  current_insn.field_value[slot].value = regid;
-+  current_insn.field_value[slot].align_order = 0;
-+}
-+
-+#define parse_pico_out0		parse_nothing
-+#define parse_pico_out1		parse_nothing
-+#define parse_pico_out2		parse_nothing
-+#define parse_pico_out3		parse_nothing
-+
-+#define OP(name, sgn, pcrel, align, func) \
-+  { AVR32_OPERAND_##name, sgn, pcrel, align, match_##func, parse_##func }
-+
-+struct avr32_operand avr32_operand_table[] = {
-+  OP(INTREG, 0, 0, 0, intreg),
-+  OP(INTREG_PREDEC, 0, 0, 0, intreg_predec),
-+  OP(INTREG_POSTINC, 0, 0, 0, intreg_postinc),
-+  OP(INTREG_LSL, 0, 0, 0, intreg_lsl),
-+  OP(INTREG_LSR, 0, 0, 0, intreg_lsr),
-+  OP(INTREG_BSEL, 0, 0, 0, intreg_part),
-+  OP(INTREG_HSEL, 0, 0, 1, intreg_part),
-+  OP(INTREG_SDISP, 1, 0, 0, intreg_disp),
-+  OP(INTREG_SDISP_H, 1, 0, 1, intreg_disp),
-+  OP(INTREG_SDISP_W, 1, 0, 2, intreg_disp),
-+  OP(INTREG_UDISP, 0, 0, 0, intreg_disp),
-+  OP(INTREG_UDISP_H, 0, 0, 1, intreg_disp),
-+  OP(INTREG_UDISP_W, 0, 0, 2, intreg_disp),
-+  OP(INTREG_INDEX, 0, 0, 0, intreg_index),
-+  OP(INTREG_XINDEX, 0, 0, 0, intreg_xindex),
-+  OP(DWREG, 0, 0, 1, intreg),
-+  OP(PC_UDISP_W, 0, 1, 2, pc_disp),
-+  OP(SP, 0, 0, 0, sp),
-+  OP(SP_UDISP_W, 0, 0, 2, sp_disp),
-+  OP(CPNO, 0, 0, 0, cpno),
-+  OP(CPREG, 0, 0, 0, cpreg),
-+  OP(CPREG_D, 0, 0, 1, cpreg),
-+  OP(UNSIGNED_CONST, 0, 0, 0, const),
-+  OP(UNSIGNED_CONST_W, 0, 0, 2, const),
-+  OP(SIGNED_CONST, 1, 0, 0, const),
-+  OP(SIGNED_CONST_W, 1, 0, 2, const),
-+  OP(JMPLABEL, 1, 1, 1, jmplabel),
-+  OP(UNSIGNED_NUMBER, 0, 0, 0, number),
-+  OP(UNSIGNED_NUMBER_W, 0, 0, 2, number),
-+  OP(REGLIST8, 0, 0, 0, reglist8),
-+  OP(REGLIST9, 0, 0, 0, reglist9),
-+  OP(REGLIST16, 0, 0, 0, reglist16),
-+  OP(REGLIST_LDM, 0, 0, 0, reglist_ldm),
-+  OP(REGLIST_CP8, 0, 0, 0, reglist_cp8),
-+  OP(REGLIST_CPD8, 0, 0, 0, reglist_cpd8),
-+  OP(RETVAL, 0, 0, 0, retval),
-+  OP(MCALL, 1, 0, 2, mcall),
-+  OP(JOSPINC, 0, 0, 0, jospinc),
-+  OP(COH, 0, 0, 0, coh),
-+  OP(PICO_REG_W, 0, 0, 0, picoreg),
-+  OP(PICO_REG_D, 0, 0, 1, picoreg),
-+  OP(PICO_REGLIST_W, 0, 0, 0, pico_reglist_w),
-+  OP(PICO_REGLIST_D, 0, 0, 0, pico_reglist_d),
-+  OP(PICO_IN, 0, 0, 0, pico_in),
-+  OP(PICO_OUT0, 0, 0, 0, pico_out0),
-+  OP(PICO_OUT1, 0, 0, 0, pico_out1),
-+  OP(PICO_OUT2, 0, 0, 0, pico_out2),
-+  OP(PICO_OUT3, 0, 0, 0, pico_out3),
-+};
-+
-+symbolS *
-+md_undefined_symbol (char *name ATTRIBUTE_UNUSED)
-+{
-+  pr_debug("md_undefined_symbol: %s\n", name);
-+  return 0;
-+}
-+
-+struct avr32_relax_type
-+{
-+  long lower_bound;
-+  long upper_bound;
-+  unsigned char align;
-+  unsigned char length;
-+  signed short next;
-+};
-+
-+#define EMPTY { 0, 0, 0, 0, -1 }
-+#define C(lower, upper, align, next)			\
-+  { (lower), (upper), (align), 2, AVR32_OPC_##next }
-+#define E(lower, upper, align)				\
-+  { (lower), (upper), (align), 4, -1 }
-+
-+static const struct avr32_relax_type avr32_relax_table[] =
-+  {
-+    /* 0 */
-+    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
-+    EMPTY, EMPTY, EMPTY,
-+    E(0, 65535, 0), E(0, 65535, 0), E(0, 65535, 0), E(0, 65535, 0),
-+    EMPTY,
-+    /* 16 */
-+    EMPTY, EMPTY, EMPTY, EMPTY,
-+
-+    C(-256, 254, 1, BREQ2), C(-256, 254, 1, BRNE2),
-+    C(-256, 254, 1, BRCC2), C(-256, 254, 1, BRCS2),
-+    C(-256, 254, 1, BRGE2), C(-256, 254, 1, BRLT2),
-+    C(-256, 254, 1, BRMI2), C(-256, 254, 1, BRPL2),
-+    E(-2097152, 2097150, 1), E(-2097152, 2097150, 1),
-+    E(-2097152, 2097150, 1), E(-2097152, 2097150, 1),
-+    /* 32 */
-+    E(-2097152, 2097150, 1), E(-2097152, 2097150, 1),
-+    E(-2097152, 2097150, 1), E(-2097152, 2097150, 1),
-+    E(-2097152, 2097150, 1), E(-2097152, 2097150, 1),
-+    E(-2097152, 2097150, 1), E(-2097152, 2097150, 1),
-+    E(-2097152, 2097150, 1), E(-2097152, 2097150, 1),
-+    E(-2097152, 2097150, 1), E(-2097152, 2097150, 1),
-+
-+    EMPTY, EMPTY, EMPTY, EMPTY,
-+    /* 48 */
-+    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
-+    EMPTY, EMPTY, EMPTY,
-+
-+    C(-32, 31, 0, CP_W3), E(-1048576, 1048575, 0),
-+
-+    EMPTY, EMPTY, EMPTY,
-+    /* 64: csrfcz */
-+    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
-+    E(0, 65535, 0), E(0, 65535, 0),
-+    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
-+    E(-32768, 32767, 0),
-+    /* 80: LD_SB2 */
-+    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
-+
-+    C(0, 7, 0, LD_UB4), E(-32768, 32767, 0),
-+
-+    EMPTY,
-+    EMPTY, EMPTY,
-+
-+    C(0, 14, 1, LD_SH4), E(-32768, 32767, 0),
-+
-+    EMPTY, EMPTY, EMPTY,
-+
-+    C(0, 14, 1, LD_UH4),
-+
-+    /* 96: LD_UH4 */
-+    E(-32768, 32767, 0),
-+
-+    EMPTY, EMPTY, EMPTY, EMPTY,
-+
-+    C(0, 124, 2, LD_W4), E(-32768, 32767, 0),
-+
-+    E(0, 1020, 2),	/* LDC_D1 */
-+    EMPTY, EMPTY,
-+    E(0, 1020, 2),	/* LDC_W1 */
-+    EMPTY, EMPTY,
-+    E(0, 16380, 2),	/* LDC0_D */
-+    E(0, 16380, 2),	/* LDC0_W */
-+    EMPTY,
-+
-+    /* 112: LDCM_D_PU */
-+    EMPTY, EMPTY, EMPTY,
-+
-+    C(0, 508, 2, LDDPC_EXT), E(-32768, 32767, 0),
-+
-+    EMPTY,EMPTY, EMPTY,
-+    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
-+
-+    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
-+    /* 134: MACHH_W */
-+    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
-+    E(-131072, 131068, 2),	/* MCALL */
-+    E(0, 1020, 2),		/* MFDR */
-+    E(0, 1020, 2),		/* MFSR */
-+    EMPTY, EMPTY,
-+
-+    C(-128, 127, 0, MOV2), E(-1048576, 1048575, 0),
-+
-+    EMPTY, EMPTY, EMPTY,
-+    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
-+    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
-+
-+    E(-128, 127, 0),		/* MOVEQ2 */
-+    E(-128, 127, 0),		/* MOVNE2 */
-+    E(-128, 127, 0),		/* MOVCC2 */
-+    E(-128, 127, 0),		/* 166: MOVCS2 */
-+    E(-128, 127, 0),		/* MOVGE2 */
-+    E(-128, 127, 0),		/* MOVLT2 */
-+    E(-128, 127, 0),		/* MOVMI2 */
-+    E(-128, 127, 0),		/* MOVPL2 */
-+    E(-128, 127, 0),		/* MOVLS2 */
-+    E(-128, 127, 0),		/* MOVGT2 */
-+    E(-128, 127, 0),		/* MOVLE2 */
-+    E(-128, 127, 0),		/* MOVHI2 */
-+    E(-128, 127, 0),		/* MOVVS2 */
-+    E(-128, 127, 0),		/* MOVVC2 */
-+    E(-128, 127, 0),		/* MOVQS2 */
-+    E(-128, 127, 0),		/* MOVAL2 */
-+
-+    E(0, 1020, 2),		/* MTDR */
-+    E(0, 1020, 2),		/* MTSR */
-+    EMPTY,
-+    EMPTY,
-+    E(-128, 127, 0),		/* MUL3 */
-+    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
-+    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
-+    /* 198: MVCR_W */
-+    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
-+    E(0, 65535, 0), E(0, 65535, 0),
-+    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
-+    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
-+    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
-+    /* 230: PASR_H */
-+    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
-+    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
-+    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
-+    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
-+    /* 262: PUNPCKSB_H */
-+    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
-+
-+    C(-1024, 1022, 1, RCALL2), E(-2097152, 2097150, 1),
-+
-+    EMPTY,
-+    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
-+    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
-+    EMPTY, EMPTY, EMPTY,
-+
-+    C(-1024, 1022, 1, BRAL),
-+
-+    EMPTY, EMPTY, EMPTY,
-+    E(-128, 127, 0),		/* RSUB2 */
-+    /* 294: SATADD_H */
-+    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
-+    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
-+    E(0, 255, 0),		/* SLEEP */
-+    EMPTY, EMPTY,
-+    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
-+    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
-+    /* 326: ST_B2 */
-+    EMPTY, EMPTY,
-+    C(0, 7, 0, ST_B4), E(-32768, 32767, 0),
-+    EMPTY, EMPTY, EMPTY, EMPTY,
-+    E(-32768, 32767, 0),
-+    EMPTY, EMPTY, EMPTY,
-+    C(0, 14, 1, ST_H4), E(-32768, 32767, 0),
-+    EMPTY, EMPTY,
-+    EMPTY,
-+    C(0, 60, 2, ST_W4), E(-32768, 32767, 0),
-+    E(0, 1020, 2),	/* STC_D1 */
-+    EMPTY, EMPTY,
-+    E(0, 1020, 2),	/* STC_W1 */
-+    EMPTY, EMPTY,
-+    E(0, 16380, 2),	/* STC0_D */
-+    E(0, 16380, 2),	/* STC0_W */
-+
-+    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
-+    /* 358: STDSP */
-+    EMPTY, EMPTY,
-+    E(0, 1020, 2),	/* STHH_W1 */
-+    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
-+    EMPTY, EMPTY, EMPTY,
-+    E(-32768, 32767, 0),
-+    C(-512, 508, 2, SUB4),
-+    C(-128, 127, 0, SUB4), E(-1048576, 1048576, 0),
-+    /* SUB{cond} */
-+    E(-128, 127, 0), E(-128, 127, 0), E(-128, 127, 0), E(-128, 127, 0),
-+    E(-128, 127, 0), E(-128, 127, 0), E(-128, 127, 0), E(-128, 127, 0),
-+    E(-128, 127, 0), E(-128, 127, 0), E(-128, 127, 0), E(-128, 127, 0),
-+    E(-128, 127, 0), E(-128, 127, 0), E(-128, 127, 0), E(-128, 127, 0),
-+    /* SUBF{cond} */
-+    E(-128, 127, 0), E(-128, 127, 0), E(-128, 127, 0), E(-128, 127, 0),
-+    E(-128, 127, 0), E(-128, 127, 0), E(-128, 127, 0), E(-128, 127, 0),
-+    E(-128, 127, 0), E(-128, 127, 0), E(-128, 127, 0), E(-128, 127, 0),
-+    E(-128, 127, 0), E(-128, 127, 0), E(-128, 127, 0), E(-128, 127, 0),
-+    EMPTY,
-+
-+    /* 406: SWAP_B */
-+    EMPTY, EMPTY, EMPTY,
-+    E(0, 255, 0),	/* SYNC */
-+    EMPTY, EMPTY, EMPTY, EMPTY,
-+    /* 414: TST */
-+    EMPTY, EMPTY, E(-65536, 65535, 2), E(-65536, 65535, 2), E(-65536, 65535, 2), EMPTY, EMPTY, EMPTY,
-+    /* 422: RSUB{cond} */
-+    E(-128, 127, 0), E(-128, 127, 0), E(-128, 127, 0), E(-128, 127, 0),
-+    E(-128, 127, 0), E(-128, 127, 0), E(-128, 127, 0), E(-128, 127, 0),
-+    E(-128, 127, 0), E(-128, 127, 0), E(-128, 127, 0), E(-128, 127, 0),
-+    E(-128, 127, 0), E(-128, 127, 0), E(-128, 127, 0), E(-128, 127, 0),
-+    /* 436: ADD{cond} */
-+    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
-+    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
-+    /* 454: SUB{cond} */
-+    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
-+    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
-+    /* 472: AND{cond} */
-+    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
-+    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
-+    /* 486: OR{cond} */
-+    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
-+    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
-+    /* 502: EOR{cond} */
-+    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
-+    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
-+    /* 518: LD.w{cond} */
-+    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
-+    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
-+    /* 534: LD.sh{cond} */
-+    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
-+    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
-+    /* 550: LD.uh{cond} */
-+    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
-+    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
-+    /* 566: LD.sb{cond} */
-+    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
-+    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
-+    /* 582: LD.ub{cond} */
-+    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
-+    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
-+    /* 596: ST.w{cond} */
-+    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
-+    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
-+    /* 614: ST.h{cond} */
-+    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
-+    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
-+    /* 630: ST.b{cond} */
-+    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
-+    EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
-+    /* 646: movh */
-+    E(0, 65535, 0), EMPTY, EMPTY,
-+  /* 649: fmac.s */
-+  EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
-+  EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
-+  };
-+
-+#undef E
-+#undef C
-+#undef EMPTY
-+
-+#define AVR32_RS_NONE (-1)
-+
-+#define avr32_rs_size(state) (avr32_relax_table[(state)].length)
-+#define avr32_rs_align(state) (avr32_relax_table[(state)].align)
-+#define relax_more(state) (avr32_relax_table[(state)].next)
-+
-+#define opc_initial_substate(opc) ((opc)->id)
-+
-+static int need_relax(int subtype, offsetT distance)
-+{
-+  offsetT upper_bound, lower_bound;
-+
-+  upper_bound = avr32_relax_table[subtype].upper_bound;
-+  lower_bound = avr32_relax_table[subtype].lower_bound;
-+
-+  if (distance & ((1 << avr32_rs_align(subtype)) - 1))
-+    return 1;
-+  if ((distance > upper_bound) || (distance < lower_bound))
-+    return 1;
-+
-+  return 0;
-+}
-+
-+enum {
-+  LDA_SUBTYPE_MOV1,
-+  LDA_SUBTYPE_MOV2,
-+  LDA_SUBTYPE_SUB,
-+  LDA_SUBTYPE_LDDPC,
-+  LDA_SUBTYPE_LDW,
-+  LDA_SUBTYPE_GOTLOAD,
-+  LDA_SUBTYPE_GOTLOAD_LARGE,
-+};
-+
-+enum {
-+  CALL_SUBTYPE_RCALL1,
-+  CALL_SUBTYPE_RCALL2,
-+  CALL_SUBTYPE_MCALL_CP,
-+  CALL_SUBTYPE_MCALL_GOT,
-+  CALL_SUBTYPE_MCALL_LARGE,
-+};
-+
-+#define LDA_INITIAL_SIZE	(avr32_pic ? 4 : 2)
-+#define CALL_INITIAL_SIZE	2
-+
-+#define need_reloc(sym, seg, pcrel)					\
-+  (!(S_IS_DEFINED(sym)							\
-+     && ((pcrel && S_GET_SEGMENT(sym) == seg)				\
-+	 || (!pcrel && S_GET_SEGMENT(sym) == absolute_section)))	\
-+   || S_FORCE_RELOC(sym, 1))
-+
-+/* Return an initial guess of the length by which a fragment must grow to
-+   hold a branch to reach its destination.
-+   Also updates fr_type/fr_subtype as necessary.
-+
-+   Called just before doing relaxation.
-+   Any symbol that is now undefined will not become defined.
-+   The guess for fr_var is ACTUALLY the growth beyond fr_fix.
-+   Whatever we do to grow fr_fix or fr_var contributes to our returned value.
-+   Although it may not be explicit in the frag, pretend fr_var starts with a
-+   0 value.  */
-+
-+static int
-+avr32_default_estimate_size_before_relax (fragS *fragP, segT segment)
-+{
-+  int growth = 0;
-+
-+  assert(fragP);
-+  assert(fragP->fr_symbol);
-+
-+  if (fragP->tc_frag_data.force_extended
-+      || need_reloc(fragP->fr_symbol, segment, fragP->tc_frag_data.pcrel))
-+    {
-+      int largest_state = fragP->fr_subtype;
-+      while (relax_more(largest_state) != AVR32_RS_NONE)
-+	largest_state = relax_more(largest_state);
-+      growth = avr32_rs_size(largest_state) - fragP->fr_var;
-+    }
-+  else
-+    {
-+      growth = avr32_rs_size(fragP->fr_subtype) - fragP->fr_var;
-+    }
-+
-+  pr_debug("%s:%d: md_estimate_size_before_relax: %d\n",
-+	   fragP->fr_file, fragP->fr_line, growth);
-+
-+  return growth;
-+}
-+
-+static int
-+avr32_lda_estimate_size_before_relax(fragS *fragP, segT segment ATTRIBUTE_UNUSED)
-+{
-+  return fragP->fr_var - LDA_INITIAL_SIZE;
-+}
-+
-+static int
-+avr32_call_estimate_size_before_relax(fragS *fragP, segT segment ATTRIBUTE_UNUSED)
-+{
-+  return fragP->fr_var - CALL_INITIAL_SIZE;
-+}
-+
-+static int
-+avr32_cpool_estimate_size_before_relax(fragS *fragP,
-+				       segT segment ATTRIBUTE_UNUSED)
-+{
-+  return fragP->fr_var;
-+}
-+
-+/* This macro may be defined to relax a frag. GAS will call this with the
-+ * segment, the frag, and the change in size of all previous frags;
-+ * md_relax_frag should return the change in size of the frag. */
-+static long
-+avr32_default_relax_frag (segT segment, fragS *fragP, long stretch)
-+{
-+  int state, next_state;
-+  symbolS *symbolP;	/* The target symbol */
-+  long growth = 0;
-+
-+  state = next_state = fragP->fr_subtype;
-+
-+  symbolP = fragP->fr_symbol;
-+
-+  if (fragP->tc_frag_data.force_extended
-+      || need_reloc(symbolP, segment, fragP->tc_frag_data.pcrel))
-+    {
-+      /* Symbol must be resolved by the linker. Emit the largest
-+	 possible opcode. */
-+      while (relax_more(next_state) != AVR32_RS_NONE)
-+	next_state = relax_more(next_state);
-+    }
-+  else
-+    {
-+      addressT address;	/* The address of fragP */
-+      addressT target;	/* The address of the target symbol */
-+      offsetT distance;	/* The distance between the insn and the symbol */
-+      fragS *sym_frag;
-+
-+      address = fragP->fr_address;
-+      target = fragP->fr_offset;
-+      symbolP = fragP->fr_symbol;
-+      sym_frag = symbol_get_frag(symbolP);
-+
-+      address += fragP->fr_fix - fragP->fr_var;
-+      target += S_GET_VALUE(symbolP);
-+
-+      if (stretch != 0
-+	  && sym_frag->relax_marker != fragP->relax_marker
-+	  && S_GET_SEGMENT(symbolP) == segment)
-+	/* if it was correctly aligned before, make sure it stays aligned */
-+	target += stretch & (~0UL << avr32_rs_align(state));
-+
-+      if (fragP->tc_frag_data.pcrel)
-+	distance = target - (address & (~0UL << avr32_rs_align(state)));
-+      else
-+	distance = target;
-+
-+      pr_debug("%s:%d: relax more? 0x%x - 0x%x = 0x%x (%d), align %d\n",
-+	       fragP->fr_file, fragP->fr_line, target, address,
-+	       distance, distance, avr32_rs_align(state));
-+
-+      if (need_relax(state, distance))
-+	{
-+	  if (relax_more(state) != AVR32_RS_NONE)
-+	    next_state = relax_more(state);
-+	  pr_debug("%s:%d: relax more %d -> %d (%d - %d, align %d)\n",
-+		   fragP->fr_file, fragP->fr_line, state, next_state,
-+		   target, address, avr32_rs_align(state));
-+	}
-+    }
-+
-+  growth = avr32_rs_size(next_state) - avr32_rs_size(state);
-+  fragP->fr_subtype = next_state;
-+
-+  pr_debug("%s:%d: md_relax_frag: growth=%d, subtype=%d, opc=0x%08lx\n",
-+	   fragP->fr_file, fragP->fr_line, growth, fragP->fr_subtype,
-+	   avr32_opc_table[next_state].value);
-+
-+  return growth;
-+}
-+
-+static long
-+avr32_lda_relax_frag(segT segment, fragS *fragP, long stretch)
-+{
-+  struct cpool *pool= NULL;
-+  unsigned int entry = 0;
-+  addressT address, target;
-+  offsetT distance;
-+  symbolS *symbolP;
-+  fragS *sym_frag;
-+  long old_size, new_size;
-+
-+  symbolP = fragP->fr_symbol;
-+  old_size = fragP->fr_var;
-+  if (!avr32_pic)
-+    {
-+      pool = fragP->tc_frag_data.pool;
-+      entry = fragP->tc_frag_data.pool_entry;
-+    }
-+
-+  address = fragP->fr_address;
-+  address += fragP->fr_fix - LDA_INITIAL_SIZE;
-+
-+  if (!S_IS_DEFINED(symbolP) || S_FORCE_RELOC(symbolP, 1))
-+    goto relax_max;
-+
-+  target = fragP->fr_offset;
-+  sym_frag = symbol_get_frag(symbolP);
-+  target += S_GET_VALUE(symbolP);
-+
-+  if (sym_frag->relax_marker != fragP->relax_marker
-+      && S_GET_SEGMENT(symbolP) == segment)
-+    target += stretch;
-+
-+  distance = target - address;
-+
-+  pr_debug("lda_relax_frag: target: %d, address: %d, var: %d\n",
-+	   target, address, fragP->fr_var);
-+
-+  if (!avr32_pic && S_GET_SEGMENT(symbolP) == absolute_section
-+      && target <= 127 && (offsetT)target >= -128)
-+    {
-+      if (fragP->fr_subtype == LDA_SUBTYPE_LDDPC
-+	  || fragP->fr_subtype == LDA_SUBTYPE_LDW)
-+	pool->literals[entry].refcount--;
-+      new_size = 2;
-+      fragP->fr_subtype = LDA_SUBTYPE_MOV1;
-+    }
-+  else if (!avr32_pic && S_GET_SEGMENT(symbolP) == absolute_section
-+	   && target <= 1048575 && (offsetT)target >= -1048576)
-+    {
-+      if (fragP->fr_subtype == LDA_SUBTYPE_LDDPC
-+	  || fragP->fr_subtype == LDA_SUBTYPE_LDW)
-+	pool->literals[entry].refcount--;
-+      new_size = 4;
-+      fragP->fr_subtype = LDA_SUBTYPE_MOV2;
-+    }
-+  else if (!linkrelax && S_GET_SEGMENT(symbolP) == segment
-+	   /* the field will be negated, so this is really -(-32768)
-+	      and -(32767) */
-+	   && distance <= 32768 && distance >= -32767)
-+    {
-+      if (!avr32_pic
-+	  && (fragP->fr_subtype == LDA_SUBTYPE_LDDPC
-+	      || fragP->fr_subtype == LDA_SUBTYPE_LDW))
-+	pool->literals[entry].refcount--;
-+      new_size = 4;
-+      fragP->fr_subtype = LDA_SUBTYPE_SUB;
-+    }
-+  else
-+    {
-+    relax_max:
-+      if (avr32_pic)
-+	{
-+	  if (linkrelax)
-+	    {
-+	      new_size = 8;
-+	      fragP->fr_subtype = LDA_SUBTYPE_GOTLOAD_LARGE;
-+	    }
-+	  else
-+	    {
-+	      new_size = 4;
-+	      fragP->fr_subtype = LDA_SUBTYPE_GOTLOAD;
-+	    }
-+	}
-+      else
-+	{
-+	  if (fragP->fr_subtype != LDA_SUBTYPE_LDDPC
-+	      && fragP->fr_subtype != LDA_SUBTYPE_LDW)
-+	    pool->literals[entry].refcount++;
-+
-+	  sym_frag = symbol_get_frag(pool->symbol);
-+	  target = (sym_frag->fr_address + sym_frag->fr_fix
-+		    + pool->padding + pool->literals[entry].offset);
-+
-+	  pr_debug("cpool sym address: 0x%lx\n",
-+		   sym_frag->fr_address + sym_frag->fr_fix);
-+
-+	  know(pool->section == segment);
-+
-+	  if (sym_frag->relax_marker != fragP->relax_marker)
-+	    target += stretch;
-+
-+	  distance = target - address;
-+	  if (distance <= 508 && distance >= 0)
-+	    {
-+	      new_size = 2;
-+	      fragP->fr_subtype = LDA_SUBTYPE_LDDPC;
-+	    }
-+	  else
-+	    {
-+	      new_size = 4;
-+	      fragP->fr_subtype = LDA_SUBTYPE_LDW;
-+	    }
-+
-+	  pr_debug("lda_relax_frag (cpool): target=0x%lx, address=0x%lx, refcount=%d\n",
-+		   target, address, pool->literals[entry].refcount);
-+	}
-+    }
-+
-+  fragP->fr_var = new_size;
-+
-+  pr_debug("%s:%d: lda: relax pass done. subtype: %d, growth: %ld\n",
-+	   fragP->fr_file, fragP->fr_line,
-+	   fragP->fr_subtype, new_size - old_size);
-+
-+  return new_size - old_size;
-+}
-+
-+static long
-+avr32_call_relax_frag(segT segment, fragS *fragP, long stretch)
-+{
-+  struct cpool *pool = NULL;
-+  unsigned int entry = 0;
-+  addressT address, target;
-+  offsetT distance;
-+  symbolS *symbolP;
-+  fragS *sym_frag;
-+  long old_size, new_size;
-+
-+  symbolP = fragP->fr_symbol;
-+  old_size = fragP->fr_var;
-+  if (!avr32_pic)
-+    {
-+      pool = fragP->tc_frag_data.pool;
-+      entry = fragP->tc_frag_data.pool_entry;
-+    }
-+
-+  address = fragP->fr_address;
-+  address += fragP->fr_fix - CALL_INITIAL_SIZE;
-+
-+  if (need_reloc(symbolP, segment, 1))
-+    {
-+      pr_debug("call: must emit reloc\n");
-+      goto relax_max;
-+    }
-+
-+  target = fragP->fr_offset;
-+  sym_frag = symbol_get_frag(symbolP);
-+  target += S_GET_VALUE(symbolP);
-+
-+  if (sym_frag->relax_marker != fragP->relax_marker
-+      && S_GET_SEGMENT(symbolP) == segment)
-+    target += stretch;
-+
-+  distance = target - address;
-+
-+  if (distance <= 1022 && distance >= -1024)
-+    {
-+      pr_debug("call: distance is %d, emitting short rcall\n", distance);
-+      if (!avr32_pic && fragP->fr_subtype == CALL_SUBTYPE_MCALL_CP)
-+	pool->literals[entry].refcount--;
-+      new_size = 2;
-+      fragP->fr_subtype = CALL_SUBTYPE_RCALL1;
-+    }
-+  else if (distance <= 2097150 && distance >= -2097152)
-+    {
-+      pr_debug("call: distance is %d, emitting long rcall\n", distance);
-+      if (!avr32_pic && fragP->fr_subtype == CALL_SUBTYPE_MCALL_CP)
-+	pool->literals[entry].refcount--;
-+      new_size = 4;
-+      fragP->fr_subtype = CALL_SUBTYPE_RCALL2;
-+    }
-+  else
-+    {
-+      pr_debug("call: distance %d too far, emitting something big\n", distance);
-+
-+    relax_max:
-+      if (avr32_pic)
-+	{
-+	  if (linkrelax)
-+	    {
-+	      new_size = 10;
-+	      fragP->fr_subtype = CALL_SUBTYPE_MCALL_LARGE;
-+	    }
-+	  else
-+	    {
-+	      new_size = 4;
-+	      fragP->fr_subtype = CALL_SUBTYPE_MCALL_GOT;
-+	    }
-+	}
-+      else
-+	{
-+	  if (fragP->fr_subtype != CALL_SUBTYPE_MCALL_CP)
-+	    pool->literals[entry].refcount++;
-+
-+	  new_size = 4;
-+	  fragP->fr_subtype = CALL_SUBTYPE_MCALL_CP;
-+	}
-+    }
-+
-+  fragP->fr_var = new_size;
-+
-+  pr_debug("%s:%d: call: relax pass done, growth: %d, fr_var: %d\n",
-+	   fragP->fr_file, fragP->fr_line,
-+	   new_size - old_size, fragP->fr_var);
-+
-+  return new_size - old_size;
-+}
-+
-+static long
-+avr32_cpool_relax_frag(segT segment ATTRIBUTE_UNUSED,
-+		       fragS *fragP,
-+		       long stretch ATTRIBUTE_UNUSED)
-+{
-+  struct cpool *pool;
-+  addressT address;
-+  long old_size, new_size;
-+  unsigned int entry;
-+
-+  pool = fragP->tc_frag_data.pool;
-+  address = fragP->fr_address + fragP->fr_fix;
-+  old_size = fragP->fr_var;
-+  new_size = 0;
-+
-+  for (entry = 0; entry < pool->next_free_entry; entry++)
-+    {
-+      if (pool->literals[entry].refcount > 0)
-+	{
-+	  pool->literals[entry].offset = new_size;
-+	  new_size += 4;
-+	}
-+    }
-+
-+  fragP->fr_var = new_size;
-+
-+  return new_size - old_size;
-+}
-+
-+/* *fragP has been relaxed to its final size, and now needs to have
-+   the bytes inside it modified to conform to the new size.
-+
-+   Called after relaxation is finished.
-+   fragP->fr_type == rs_machine_dependent.
-+   fragP->fr_subtype is the subtype of what the address relaxed to.  */
-+
-+static void
-+avr32_default_convert_frag (bfd *abfd ATTRIBUTE_UNUSED,
-+			    segT segment ATTRIBUTE_UNUSED,
-+			    fragS *fragP)
-+{
-+  const struct avr32_opcode *opc;
-+  const struct avr32_ifield *ifield;
-+  bfd_reloc_code_real_type r_type;
-+  symbolS *symbolP;
-+  fixS *fixP;
-+  bfd_vma value;
-+  int subtype;
-+
-+  opc = &avr32_opc_table[fragP->fr_subtype];
-+  ifield = opc->fields[opc->var_field];
-+  symbolP = fragP->fr_symbol;
-+  subtype = fragP->fr_subtype;
-+  r_type = opc->reloc_type;
-+
-+  /* Clear the opcode bits and the bits belonging to the relaxed
-+     field.  We assume all other fields stay the same.  */
-+  value = bfd_getb32(fragP->fr_opcode);
-+  value &= ~(opc->mask | ifield->mask);
-+
-+  /* Insert the new opcode */
-+  value |= opc->value;
-+  bfd_putb32(value, fragP->fr_opcode);
-+
-+  fragP->fr_fix += opc->size - fragP->fr_var;
-+
-+  if (fragP->tc_frag_data.reloc_info != AVR32_OPINFO_NONE)
-+    {
-+      switch (fragP->tc_frag_data.reloc_info)
-+	{
-+	case AVR32_OPINFO_HI:
-+	  r_type = BFD_RELOC_HI16;
-+	  break;
-+	case AVR32_OPINFO_LO:
-+	  r_type = BFD_RELOC_LO16;
-+	  break;
-+	case AVR32_OPINFO_GOT:
-+	  switch (r_type)
-+	    {
-+	    case BFD_RELOC_AVR32_18W_PCREL:
-+	      r_type = BFD_RELOC_AVR32_GOT18SW;
-+	      break;
-+	    case BFD_RELOC_AVR32_16S:
-+	      r_type = BFD_RELOC_AVR32_GOT16S;
-+	      break;
-+	    default:
-+	      BAD_CASE(r_type);
-+	      break;
-+	    }
-+	  break;
-+	default:
-+	  BAD_CASE(fragP->tc_frag_data.reloc_info);
-+	  break;
-+	}
-+    }
-+
-+  pr_debug("%s:%d: convert_frag: new %s fixup\n",
-+	   fragP->fr_file, fragP->fr_line,
-+	   bfd_get_reloc_code_name(r_type));
-+
-+#if 1
-+  fixP = fix_new_exp(fragP, fragP->fr_fix - opc->size, opc->size,
-+		     &fragP->tc_frag_data.exp,
-+		     fragP->tc_frag_data.pcrel, r_type);
-+#else
-+  fixP = fix_new(fragP, fragP->fr_fix - opc->size, opc->size, symbolP,
-+		 fragP->fr_offset, fragP->tc_frag_data.pcrel, r_type);
-+#endif
-+
-+  /* Revert fix_new brain damage. "dot_value" is the value of PC at
-+     the point of the fixup, relative to the frag address.  fix_new()
-+     and friends think they are only being called during the assembly
-+     pass, not during relaxation or similar, so fx_dot_value, fx_file
-+     and fx_line are all initialized to the wrong value.  But we don't
-+     know the size of the fixup until now, so we really can't live up
-+     to the assumptions these functions make about the target.  What
-+     do these functions think the "where" and "frag" argument mean
-+     anyway?  */
-+  fixP->fx_dot_value = fragP->fr_fix - opc->size;
-+  fixP->fx_file = fragP->fr_file;
-+  fixP->fx_line = fragP->fr_line;
-+
-+  fixP->tc_fix_data.ifield = ifield;
-+  fixP->tc_fix_data.align = avr32_rs_align(subtype);
-+  fixP->tc_fix_data.min = avr32_relax_table[subtype].lower_bound;
-+  fixP->tc_fix_data.max = avr32_relax_table[subtype].upper_bound;
-+}
-+
-+static void
-+avr32_lda_convert_frag(bfd *abfd ATTRIBUTE_UNUSED,
-+		       segT segment ATTRIBUTE_UNUSED,
-+		       fragS *fragP)
-+{
-+  const struct avr32_opcode *opc;
-+  const struct avr32_ifield *ifield;
-+  bfd_reloc_code_real_type r_type;
-+  expressionS exp;
-+  struct cpool *pool;
-+  fixS *fixP;
-+  bfd_vma value;
-+  int regid, pcrel = 0, align = 0;
-+  char *p;
-+
-+  r_type = BFD_RELOC_NONE;
-+  regid = fragP->tc_frag_data.reloc_info;
-+  p = fragP->fr_opcode;
-+  exp.X_add_symbol = fragP->fr_symbol;
-+  exp.X_add_number = fragP->fr_offset;
-+  exp.X_op = O_symbol;
-+
-+  pr_debug("%s:%d: lda_convert_frag, subtype: %d, fix: %d, var: %d, regid: %d\n",
-+	   fragP->fr_file, fragP->fr_line,
-+	   fragP->fr_subtype, fragP->fr_fix, fragP->fr_var, regid);
-+
-+  switch (fragP->fr_subtype)
-+    {
-+    case LDA_SUBTYPE_MOV1:
-+      opc = &avr32_opc_table[AVR32_OPC_MOV1];
-+      opc->fields[0]->insert(opc->fields[0], p, regid);
-+      ifield = opc->fields[1];
-+      r_type = opc->reloc_type;
-+      break;
-+    case LDA_SUBTYPE_MOV2:
-+      opc = &avr32_opc_table[AVR32_OPC_MOV2];
-+      opc->fields[0]->insert(opc->fields[0], p, regid);
-+      ifield = opc->fields[1];
-+      r_type = opc->reloc_type;
-+      break;
-+    case LDA_SUBTYPE_SUB:
-+      opc = &avr32_opc_table[AVR32_OPC_SUB5];
-+      opc->fields[0]->insert(opc->fields[0], p, regid);
-+      opc->fields[1]->insert(opc->fields[1], p, AVR32_REG_PC);
-+      ifield = opc->fields[2];
-+      r_type = BFD_RELOC_AVR32_16N_PCREL;
-+
-+      /* Pretend that SUB5 isn't a "negated" pcrel expression for now.
-+	 We'll have to fix it up later when we know whether to
-+	 generate a reloc for it (in which case the linker will negate
-+	 it, so we shouldn't). */
-+      pcrel = 1;
-+      break;
-+    case LDA_SUBTYPE_LDDPC:
-+      opc = &avr32_opc_table[AVR32_OPC_LDDPC];
-+      align = 2;
-+      r_type = BFD_RELOC_AVR32_9W_CP;
-+      goto cpool_common;
-+    case LDA_SUBTYPE_LDW:
-+      opc = &avr32_opc_table[AVR32_OPC_LDDPC_EXT];
-+      r_type = BFD_RELOC_AVR32_16_CP;
-+    cpool_common:
-+      opc->fields[0]->insert(opc->fields[0], p, regid);
-+      ifield = opc->fields[1];
-+      pool = fragP->tc_frag_data.pool;
-+      exp.X_add_symbol = pool->symbol;
-+      exp.X_add_number = pool->literals[fragP->tc_frag_data.pool_entry].offset;
-+      pcrel = 1;
-+      break;
-+    case LDA_SUBTYPE_GOTLOAD_LARGE:
-+      /* ld.w Rd, r6[Rd << 2] (last) */
-+      opc = &avr32_opc_table[AVR32_OPC_LD_W5];
-+      bfd_putb32(opc->value, p + 4);
-+      opc->fields[0]->insert(opc->fields[0], p + 4, regid);
-+      opc->fields[1]->insert(opc->fields[1], p + 4, 6);
-+      opc->fields[2]->insert(opc->fields[2], p + 4, regid);
-+      opc->fields[3]->insert(opc->fields[3], p + 4, 2);
-+
-+      /* mov Rd, (got_offset / 4) */
-+      opc = &avr32_opc_table[AVR32_OPC_MOV2];
-+      opc->fields[0]->insert(opc->fields[0], p, regid);
-+      ifield = opc->fields[1];
-+      r_type = BFD_RELOC_AVR32_LDA_GOT;
-+      break;
-+    case LDA_SUBTYPE_GOTLOAD:
-+      opc = &avr32_opc_table[AVR32_OPC_LD_W4];
-+      opc->fields[0]->insert(opc->fields[0], p, regid);
-+      opc->fields[1]->insert(opc->fields[1], p, 6);
-+      ifield = opc->fields[2];
-+      if (r_type == BFD_RELOC_NONE)
-+	r_type = BFD_RELOC_AVR32_GOT16S;
-+      break;
-+    default:
-+      BAD_CASE(fragP->fr_subtype);
-+    }
-+
-+  value = bfd_getb32(p);
-+  value &= ~(opc->mask | ifield->mask);
-+  value |= opc->value;
-+  bfd_putb32(value, p);
-+
-+  fragP->fr_fix += fragP->fr_var - LDA_INITIAL_SIZE;
-+
-+  if (fragP->fr_next
-+      && ((offsetT)(fragP->fr_next->fr_address - fragP->fr_address)
-+	  != fragP->fr_fix))
-+    {
-+      fprintf(stderr, "LDA frag: fr_fix is wrong! fragP->fr_var = %ld, r_type = %s\n",
-+	      fragP->fr_var, bfd_get_reloc_code_name(r_type));
-+      abort();
-+    }
-+
-+  fixP = fix_new_exp(fragP, fragP->fr_fix - fragP->fr_var, fragP->fr_var,
-+		     &exp, pcrel, r_type);
-+
-+  /* Revert fix_new brain damage. "dot_value" is the value of PC at
-+     the point of the fixup, relative to the frag address.  fix_new()
-+     and friends think they are only being called during the assembly
-+     pass, not during relaxation or similar, so fx_dot_value, fx_file
-+     and fx_line are all initialized to the wrong value.  But we don't
-+     know the size of the fixup until now, so we really can't live up
-+     to the assumptions these functions make about the target.  What
-+     do these functions think the "where" and "frag" argument mean
-+     anyway?  */
-+  fixP->fx_dot_value = fragP->fr_fix - opc->size;
-+  fixP->fx_file = fragP->fr_file;
-+  fixP->fx_line = fragP->fr_line;
-+
-+  fixP->tc_fix_data.ifield = ifield;
-+  fixP->tc_fix_data.align = align;
-+  /* these are only used if the fixup can actually be resolved */
-+  fixP->tc_fix_data.min = -32768;
-+  fixP->tc_fix_data.max = 32767;
-+}
-+
-+static void
-+avr32_call_convert_frag(bfd *abfd ATTRIBUTE_UNUSED,
-+		       segT segment ATTRIBUTE_UNUSED,
-+		       fragS *fragP)
-+{
-+  const struct avr32_opcode *opc = NULL;
-+  const struct avr32_ifield *ifield;
-+  bfd_reloc_code_real_type r_type;
-+  symbolS *symbol;
-+  offsetT offset;
-+  fixS *fixP;
-+  bfd_vma value;
-+  int pcrel = 0, align = 0;
-+  char *p;
-+
-+  symbol = fragP->fr_symbol;
-+  offset = fragP->fr_offset;
-+  r_type = BFD_RELOC_NONE;
-+  p = fragP->fr_opcode;
-+
-+  pr_debug("%s:%d: call_convert_frag, subtype: %d, fix: %d, var: %d\n",
-+	   fragP->fr_file, fragP->fr_line,
-+	   fragP->fr_subtype, fragP->fr_fix, fragP->fr_var);
-+
-+  switch (fragP->fr_subtype)
-+    {
-+    case CALL_SUBTYPE_RCALL1:
-+      opc = &avr32_opc_table[AVR32_OPC_RCALL1];
-+      /* fall through */
-+    case CALL_SUBTYPE_RCALL2:
-+      if (!opc)
-+	opc = &avr32_opc_table[AVR32_OPC_RCALL2];
-+      ifield = opc->fields[0];
-+      r_type = opc->reloc_type;
-+      pcrel = 1;
-+      align = 1;
-+      break;
-+    case CALL_SUBTYPE_MCALL_CP:
-+      opc = &avr32_opc_table[AVR32_OPC_MCALL];
-+      opc->fields[0]->insert(opc->fields[0], p, AVR32_REG_PC);
-+      ifield = opc->fields[1];
-+      r_type = BFD_RELOC_AVR32_CPCALL;
-+      symbol = fragP->tc_frag_data.pool->symbol;
-+      offset = fragP->tc_frag_data.pool->literals[fragP->tc_frag_data.pool_entry].offset;
-+      assert(fragP->tc_frag_data.pool->literals[fragP->tc_frag_data.pool_entry].refcount > 0);
-+      pcrel = 1;
-+      align = 2;
-+      break;
-+    case CALL_SUBTYPE_MCALL_GOT:
-+      opc = &avr32_opc_table[AVR32_OPC_MCALL];
-+      opc->fields[0]->insert(opc->fields[0], p, 6);
-+      ifield = opc->fields[1];
-+      r_type = BFD_RELOC_AVR32_GOT18SW;
-+      break;
-+    case CALL_SUBTYPE_MCALL_LARGE:
-+      assert(fragP->fr_var == 10);
-+      /* ld.w lr, r6[lr << 2] */
-+      opc = &avr32_opc_table[AVR32_OPC_LD_W5];
-+      bfd_putb32(opc->value, p + 4);
-+      opc->fields[0]->insert(opc->fields[0], p + 4, AVR32_REG_LR);
-+      opc->fields[1]->insert(opc->fields[1], p + 4, 6);
-+      opc->fields[2]->insert(opc->fields[2], p + 4, AVR32_REG_LR);
-+      opc->fields[3]->insert(opc->fields[3], p + 4, 2);
-+
-+      /* icall lr */
-+      opc = &avr32_opc_table[AVR32_OPC_ICALL];
-+      bfd_putb16(opc->value >> 16, p + 8);
-+      opc->fields[0]->insert(opc->fields[0], p + 8, AVR32_REG_LR);
-+
-+      /* mov lr, (got_offset / 4) */
-+      opc = &avr32_opc_table[AVR32_OPC_MOV2];
-+      opc->fields[0]->insert(opc->fields[0], p, AVR32_REG_LR);
-+      ifield = opc->fields[1];
-+      r_type = BFD_RELOC_AVR32_GOTCALL;
-+      break;
-+    default:
-+      BAD_CASE(fragP->fr_subtype);
-+    }
-+
-+  /* Insert the opcode and clear the variable ifield */
-+  value = bfd_getb32(p);
-+  value &= ~(opc->mask | ifield->mask);
-+  value |= opc->value;
-+  bfd_putb32(value, p);
-+
-+  fragP->fr_fix += fragP->fr_var - CALL_INITIAL_SIZE;
-+
-+  if (fragP->fr_next
-+      && ((offsetT)(fragP->fr_next->fr_address - fragP->fr_address)
-+	  != fragP->fr_fix))
-+    {
-+      fprintf(stderr, "%s:%d: fr_fix %lu is wrong! fr_var=%lu, r_type=%s\n",
-+	      fragP->fr_file, fragP->fr_line,
-+	      fragP->fr_fix, fragP->fr_var, bfd_get_reloc_code_name(r_type));
-+      fprintf(stderr, "fr_fix should be %ld. next frag is %s:%d\n",
-+	      (offsetT)(fragP->fr_next->fr_address - fragP->fr_address),
-+	      fragP->fr_next->fr_file, fragP->fr_next->fr_line);
-+    }
-+
-+  fixP = fix_new(fragP, fragP->fr_fix - fragP->fr_var, fragP->fr_var,
-+		 symbol, offset, pcrel, r_type);
-+
-+  /* Revert fix_new brain damage. "dot_value" is the value of PC at
-+     the point of the fixup, relative to the frag address.  fix_new()
-+     and friends think they are only being called during the assembly
-+     pass, not during relaxation or similar, so fx_dot_value, fx_file
-+     and fx_line are all initialized to the wrong value.  But we don't
-+     know the size of the fixup until now, so we really can't live up
-+     to the assumptions these functions make about the target.  What
-+     do these functions think the "where" and "frag" argument mean
-+     anyway?  */
-+  fixP->fx_dot_value = fragP->fr_fix - opc->size;
-+  fixP->fx_file = fragP->fr_file;
-+  fixP->fx_line = fragP->fr_line;
-+
-+  fixP->tc_fix_data.ifield = ifield;
-+  fixP->tc_fix_data.align = align;
-+  /* these are only used if the fixup can actually be resolved */
-+  fixP->tc_fix_data.min = -2097152;
-+  fixP->tc_fix_data.max = 2097150;
-+}
-+
-+static void
-+avr32_cpool_convert_frag(bfd *abfd ATTRIBUTE_UNUSED,
-+			 segT segment ATTRIBUTE_UNUSED,
-+			 fragS *fragP)
-+{
-+  struct cpool *pool;
-+  addressT address;
-+  unsigned int entry;
-+  char *p;
-+  char sym_name[20];
-+
-+  /* Did we get rid of the frag altogether? */
-+  if (!fragP->fr_var)
-+    return;
-+
-+  pool = fragP->tc_frag_data.pool;
-+  address = fragP->fr_address + fragP->fr_fix;
-+  p = fragP->fr_literal + fragP->fr_fix;
-+
-+  sprintf(sym_name, "$$cp_\002%x", pool->id);
-+  symbol_locate(pool->symbol, sym_name, pool->section, fragP->fr_fix, fragP);
-+  symbol_table_insert(pool->symbol);
-+
-+  for (entry = 0; entry < pool->next_free_entry; entry++)
-+    {
-+      if (pool->literals[entry].refcount > 0)
-+	{
-+	  fix_new_exp(fragP, fragP->fr_fix, 4, &pool->literals[entry].exp,
-+		      FALSE, BFD_RELOC_AVR32_32_CPENT);
-+	  fragP->fr_fix += 4;
-+	}
-+    }
-+}
-+
-+static struct avr32_relaxer avr32_default_relaxer = {
-+  .estimate_size	= avr32_default_estimate_size_before_relax,
-+  .relax_frag		= avr32_default_relax_frag,
-+  .convert_frag		= avr32_default_convert_frag,
-+};
-+static struct avr32_relaxer avr32_lda_relaxer = {
-+  .estimate_size	= avr32_lda_estimate_size_before_relax,
-+  .relax_frag		= avr32_lda_relax_frag,
-+  .convert_frag		= avr32_lda_convert_frag,
-+};
-+static struct avr32_relaxer avr32_call_relaxer = {
-+  .estimate_size	= avr32_call_estimate_size_before_relax,
-+  .relax_frag		= avr32_call_relax_frag,
-+  .convert_frag		= avr32_call_convert_frag,
-+};
-+static struct avr32_relaxer avr32_cpool_relaxer = {
-+  .estimate_size	= avr32_cpool_estimate_size_before_relax,
-+  .relax_frag		= avr32_cpool_relax_frag,
-+  .convert_frag		= avr32_cpool_convert_frag,
-+};
-+
-+static void s_cpool(int arg ATTRIBUTE_UNUSED)
-+{
-+  struct cpool *pool;
-+  unsigned int max_size;
-+  char *buf;
-+
-+  pool = find_cpool(now_seg, now_subseg);
-+  if (!pool || !pool->symbol || pool->next_free_entry == 0)
-+    return;
-+
-+  /* Make sure the constant pool is properly aligned */
-+  frag_align_code(2, 0);
-+  if (bfd_get_section_alignment(stdoutput, pool->section) < 2)
-+    bfd_set_section_alignment(stdoutput, pool->section, 2);
-+
-+  /* Assume none of the entries are discarded, and that we need the
-+     maximum amount of alignment.  But we're not going to allocate
-+     anything up front. */
-+  max_size = pool->next_free_entry * 4 + 2;
-+  frag_grow(max_size);
-+  buf = frag_more(0);
-+
-+  frag_now->tc_frag_data.relaxer = &avr32_cpool_relaxer;
-+  frag_now->tc_frag_data.pool = pool;
-+
-+  symbol_set_frag(pool->symbol, frag_now);
-+
-+  /* Assume zero initial size, allowing other relaxers to be
-+     optimistic about things.  */
-+  frag_var(rs_machine_dependent, max_size, 0,
-+	   0, pool->symbol, 0, NULL);
-+
-+  /* Mark the pool as empty.  */
-+  pool->used = 1;
-+}
-+
-+/* The location from which a PC relative jump should be calculated,
-+   given a PC relative reloc.  */
-+
-+long
-+md_pcrel_from_section (fixS *fixP, segT sec)
-+{
-+  pr_debug("pcrel_from_section, fx_offset = %d\n", fixP->fx_offset);
-+
-+  if (fixP->fx_addsy != NULL
-+      && (! S_IS_DEFINED (fixP->fx_addsy)
-+          || S_GET_SEGMENT (fixP->fx_addsy) != sec
-+	  || S_FORCE_RELOC(fixP->fx_addsy, 1)))
-+    {
-+      pr_debug("Unknown pcrel symbol: %s\n", S_GET_NAME(fixP->fx_addsy));
-+
-+      /* The symbol is undefined (or is defined but not in this section).
-+	 Let the linker figure it out.  */
-+      return 0;
-+    }
-+
-+  pr_debug("pcrel from %x + %x, symbol: %s (%x)\n",
-+	   fixP->fx_frag->fr_address, fixP->fx_where,
-+	   fixP->fx_addsy?S_GET_NAME(fixP->fx_addsy):"(null)",
-+	   fixP->fx_addsy?S_GET_VALUE(fixP->fx_addsy):0);
-+
-+  return ((fixP->fx_frag->fr_address + fixP->fx_where)
-+	  & (~0UL << fixP->tc_fix_data.align));
-+}
-+
-+valueT
-+md_section_align (segT segment, valueT size)
-+{
-+  int align = bfd_get_section_alignment (stdoutput, segment);
-+  return ((size + (1 << align) - 1) & (-1 << align));
-+}
-+
-+static int syntax_matches(const struct avr32_syntax *syntax,
-+			  char *str)
-+{
-+  int i;
-+
-+  pr_debug("syntax %d matches `%s'?\n", syntax->id, str);
-+
-+  if (syntax->nr_operands < 0)
-+    {
-+      struct avr32_operand *op;
-+      int optype;
-+
-+      for (i = 0; i < (-syntax->nr_operands - 1); i++)
-+	{
-+	  char *p;
-+	  char c;
-+
-+	  optype = syntax->operand[i];
-+	  assert(optype < AVR32_NR_OPERANDS);
-+	  op = &avr32_operand_table[optype];
-+
-+	  for (p = str; *p; p++)
-+	    if (*p == ',')
-+	      break;
-+
-+	  if (p == str)
-+	    return 0;
-+
-+	  c = *p;
-+	  *p = 0;
-+
-+	  if (!op->match(str))
-+	    {
-+	      *p = c;
-+	      return 0;
-+	    }
-+
-+	  str = p;
-+	  *p = c;
-+	  if (c)
-+	    str++;
-+	}
-+
-+      optype = syntax->operand[i];
-+      assert(optype < AVR32_NR_OPERANDS);
-+      op = &avr32_operand_table[optype];
-+
-+      if (!op->match(str))
-+	return 0;
-+      return 1;
-+    }
-+
-+  for (i = 0; i < syntax->nr_operands; i++)
-+    {
-+      struct avr32_operand *op;
-+      int optype = syntax->operand[i];
-+      char *p;
-+      char c;
-+
-+      assert(optype < AVR32_NR_OPERANDS);
-+      op = &avr32_operand_table[optype];
-+
-+      for (p = str; *p; p++)
-+	if (*p == ',')
-+	  break;
-+
-+      if (p == str)
-+	return 0;
-+
-+      c = *p;
-+      *p = 0;
-+
-+      if (!op->match(str))
-+	{
-+	  *p = c;
-+	  return 0;
-+	}
-+
-+      str = p;
-+      *p = c;
-+      if (c)
-+	str++;
-+    }
-+
-+  if (*str == '\0')
-+    return 1;
-+
-+  if ((*str == 'e' || *str == 'E') && !str[1])
-+    return 1;
-+
-+  return 0;
-+}
-+
-+static int parse_operands(char *str)
-+{
-+  int i;
-+
-+  if (current_insn.syntax->nr_operands < 0)
-+    {
-+      int optype;
-+      struct avr32_operand *op;
-+
-+      for (i = 0; i < (-current_insn.syntax->nr_operands - 1); i++)
-+	{
-+	  char *p;
-+	  char c;
-+
-+	  optype = current_insn.syntax->operand[i];
-+	  op = &avr32_operand_table[optype];
-+
-+	  for (p = str; *p; p++)
-+	    if (*p == ',')
-+	      break;
-+
-+	  assert(p != str);
-+
-+	  c = *p, *p = 0;
-+	  op->parse(op, str, i);
-+	  *p = c;
-+
-+	  str = p;
-+	  if (c) str++;
-+	}
-+
-+      /* give the rest of the line to the last operand */
-+      optype = current_insn.syntax->operand[i];
-+      op = &avr32_operand_table[optype];
-+      op->parse(op, str, i);
-+    }
-+  else
-+    {
-+      for (i = 0; i < current_insn.syntax->nr_operands; i++)
-+	{
-+	  int optype = current_insn.syntax->operand[i];
-+	  struct avr32_operand *op = &avr32_operand_table[optype];
-+	  char *p;
-+	  char c;
-+
-+	  skip_whitespace(str);
-+
-+	  for (p = str; *p; p++)
-+	    if (*p == ',')
-+	      break;
-+
-+	  assert(p != str);
-+
-+	  c = *p, *p = 0;
-+	  op->parse(op, str, i);
-+	  *p = c;
-+
-+	  str = p;
-+	  if (c) str++;
-+	}
-+
-+      if (*str == 'E' || *str == 'e')
-+	current_insn.force_extended = 1;
-+    }
-+
-+  return 0;
-+}
-+
-+static const char *
-+finish_insn(const struct avr32_opcode *opc)
-+{
-+  expressionS *exp = &current_insn.immediate;
-+  unsigned int i;
-+  int will_relax = 0;
-+  char *buf;
-+
-+  assert(current_insn.next_slot == opc->nr_fields);
-+
-+  pr_debug("%s:%d: finish_insn: trying opcode %d\n",
-+	   frag_now->fr_file, frag_now->fr_line, opc->id);
-+
-+  /* Go through the relaxation stage for all instructions that can
-+     possibly take a symbolic immediate.  The relax code will take
-+     care of range checking and alignment.  */
-+  if (opc->var_field != -1)
-+    {
-+      int substate, largest_substate;
-+      symbolS *sym;
-+      offsetT off;
-+
-+      will_relax = 1;
-+      substate = largest_substate = opc_initial_substate(opc);
-+
-+      while (relax_more(largest_substate) != AVR32_RS_NONE)
-+	largest_substate = relax_more(largest_substate);
-+
-+      pr_debug("will relax. initial substate: %d (size %d), largest substate: %d (size %d)\n",
-+	       substate, avr32_rs_size(substate),
-+	       largest_substate, avr32_rs_size(largest_substate));
-+
-+      /* make sure we have enough room for the largest possible opcode */
-+      frag_grow(avr32_rs_size(largest_substate));
-+      buf = frag_more(opc->size);
-+
-+      dwarf2_emit_insn(opc->size);
-+
-+      frag_now->tc_frag_data.reloc_info = AVR32_OPINFO_NONE;
-+      frag_now->tc_frag_data.pcrel = current_insn.pcrel;
-+      frag_now->tc_frag_data.force_extended = current_insn.force_extended;
-+      frag_now->tc_frag_data.relaxer = &avr32_default_relaxer;
-+
-+      if (exp->X_op == O_hi)
-+	{
-+	  frag_now->tc_frag_data.reloc_info = AVR32_OPINFO_HI;
-+	  exp->X_op = exp->X_md;
-+	}
-+      else if (exp->X_op == O_lo)
-+	{
-+	  frag_now->tc_frag_data.reloc_info = AVR32_OPINFO_LO;
-+	  exp->X_op = exp->X_md;
-+	}
-+      else if (exp->X_op == O_got)
-+	{
-+	  frag_now->tc_frag_data.reloc_info = AVR32_OPINFO_GOT;
-+	  exp->X_op = O_symbol;
-+	}
-+
-+#if 0
-+      if ((opc->reloc_type == BFD_RELOC_AVR32_SUB5)
-+	  && exp->X_op == O_subtract)
-+	{
-+	  symbolS *tmp;
-+	  tmp = exp->X_add_symbol;
-+	  exp->X_add_symbol = exp->X_op_symbol;
-+	  exp->X_op_symbol = tmp;
-+	}
-+#endif
-+
-+      frag_now->tc_frag_data.exp = current_insn.immediate;
-+
-+      sym = exp->X_add_symbol;
-+      off = exp->X_add_number;
-+      if (exp->X_op != O_symbol)
-+	{
-+	  sym = make_expr_symbol(exp);
-+	  off = 0;
-+	}
-+
-+      frag_var(rs_machine_dependent,
-+	       avr32_rs_size(largest_substate) - opc->size,
-+	       opc->size,
-+	       substate, sym, off, buf);
-+    }
-+  else
-+    {
-+      assert(avr32_rs_size(opc_initial_substate(opc)) == 0);
-+
-+      /* Make sure we always have room for another whole word, as the ifield
-+	 inserters can only write words. */
-+      frag_grow(4);
-+      buf = frag_more(opc->size);
-+      dwarf2_emit_insn(opc->size);
-+    }
-+
-+  assert(!(opc->value & ~opc->mask));
-+
-+  pr_debug("inserting opcode: 0x%lx\n", opc->value);
-+  bfd_putb32(opc->value, buf);
-+
-+  for (i = 0; i < opc->nr_fields; i++)
-+    {
-+      const struct avr32_ifield *f = opc->fields[i];
-+      const struct avr32_ifield_data *fd = &current_insn.field_value[i];
-+
-+      pr_debug("inserting field: 0x%lx & 0x%lx\n",
-+	       fd->value >> fd->align_order, f->mask);
-+
-+      f->insert(f, buf, fd->value >> fd->align_order);
-+    }
-+
-+  assert(will_relax || !current_insn.immediate.X_add_symbol);
-+  return NULL;
-+}
-+
-+static const char *
-+finish_alias(const struct avr32_alias *alias)
-+{
-+  const struct avr32_opcode *opc;
-+  struct {
-+    unsigned long value;
-+    unsigned long align;
-+  } mapped_operand[AVR32_MAX_OPERANDS];
-+  unsigned int i;
-+
-+  opc = alias->opc;
-+
-+  /* Remap the operands from the alias to the real opcode */
-+  for (i = 0; i < opc->nr_fields; i++)
-+    {
-+      if (alias->operand_map[i].is_opindex)
-+	{
-+	  struct avr32_ifield_data *fd;
-+	  fd = &current_insn.field_value[alias->operand_map[i].value];
-+	  mapped_operand[i].value = fd->value;
-+	  mapped_operand[i].align = fd->align_order;
-+	}
-+      else
-+	{
-+	  mapped_operand[i].value = alias->operand_map[i].value;
-+	  mapped_operand[i].align = 0;
-+	}
-+    }
-+
-+  for (i = 0; i < opc->nr_fields; i++)
-+    {
-+      current_insn.field_value[i].value = mapped_operand[i].value;
-+      if (opc->id == AVR32_OPC_COP)
-+	current_insn.field_value[i].align_order = 0;
-+      else
-+	current_insn.field_value[i].align_order
-+	  = mapped_operand[i].align;
-+    }
-+
-+  current_insn.next_slot = opc->nr_fields;
-+
-+  return finish_insn(opc);
-+}
-+
-+static const char *
-+finish_lda(const struct avr32_syntax *syntax ATTRIBUTE_UNUSED)
-+{
-+  expressionS *exp = &current_insn.immediate;
-+  relax_substateT initial_subtype;
-+  symbolS *sym;
-+  offsetT off;
-+  int initial_size, max_size;
-+  char *buf;
-+
-+  initial_size = LDA_INITIAL_SIZE;
-+
-+  if (avr32_pic)
-+    {
-+      initial_subtype = LDA_SUBTYPE_SUB;
-+      if (linkrelax)
-+	max_size = 8;
-+      else
-+	max_size = 4;
-+    }
-+  else
-+    {
-+      initial_subtype = LDA_SUBTYPE_MOV1;
-+      max_size = 4;
-+    }
-+
-+  frag_grow(max_size);
-+  buf = frag_more(initial_size);
-+  dwarf2_emit_insn(initial_size);
-+
-+  if (exp->X_op == O_symbol)
-+    {
-+      sym = exp->X_add_symbol;
-+      off = exp->X_add_number;
-+    }
-+  else
-+    {
-+      sym = make_expr_symbol(exp);
-+      off = 0;
-+    }
-+
-+  frag_now->tc_frag_data.reloc_info = current_insn.field_value[0].value;
-+  frag_now->tc_frag_data.relaxer = &avr32_lda_relaxer;
-+
-+  if (!avr32_pic)
-+    {
-+      /* The relaxer will bump the refcount if necessary */
-+      frag_now->tc_frag_data.pool
-+	= add_to_cpool(exp, &frag_now->tc_frag_data.pool_entry, 0);
-+    }
-+
-+  frag_var(rs_machine_dependent, max_size - initial_size,
-+	   initial_size, initial_subtype, sym, off, buf);
-+
-+  return NULL;
-+}
-+
-+static const char *
-+finish_call(const struct avr32_syntax *syntax ATTRIBUTE_UNUSED)
-+{
-+  expressionS *exp = &current_insn.immediate;
-+  symbolS *sym;
-+  offsetT off;
-+  int initial_size, max_size;
-+  char *buf;
-+
-+  initial_size = CALL_INITIAL_SIZE;
-+
-+  if (avr32_pic)
-+    {
-+      if (linkrelax)
-+	max_size = 10;
-+      else
-+	max_size = 4;
-+    }
-+  else
-+    max_size = 4;
-+
-+  frag_grow(max_size);
-+  buf = frag_more(initial_size);
-+  dwarf2_emit_insn(initial_size);
-+
-+  frag_now->tc_frag_data.relaxer = &avr32_call_relaxer;
-+
-+  if (exp->X_op == O_symbol)
-+    {
-+      sym = exp->X_add_symbol;
-+      off = exp->X_add_number;
-+    }
-+  else
-+    {
-+      sym = make_expr_symbol(exp);
-+      off = 0;
-+    }
-+
-+  if (!avr32_pic)
-+    {
-+      /* The relaxer will bump the refcount if necessary */
-+      frag_now->tc_frag_data.pool
-+	= add_to_cpool(exp, &frag_now->tc_frag_data.pool_entry, 0);
-+    }
-+
-+  frag_var(rs_machine_dependent, max_size - initial_size,
-+	   initial_size, CALL_SUBTYPE_RCALL1, sym, off, buf);
-+
-+  return NULL;
-+}
-+
-+void
-+md_begin (void)
-+{
-+  unsigned long flags = 0;
-+  int i;
-+
-+  avr32_mnemonic_htab = hash_new();
-+
-+  if (!avr32_mnemonic_htab)
-+    as_fatal(_("virtual memory exhausted"));
-+
-+  for (i = 0; i < AVR32_NR_MNEMONICS; i++)
-+    {
-+      hash_insert(avr32_mnemonic_htab, avr32_mnemonic_table[i].name,
-+		  (void *)&avr32_mnemonic_table[i]);
-+    }
-+
-+  if (linkrelax)
-+    flags |= EF_AVR32_LINKRELAX;
-+  if (avr32_pic)
-+    flags |= EF_AVR32_PIC;
-+
-+  bfd_set_private_flags(stdoutput, flags);
-+
-+#ifdef OPC_CONSISTENCY_CHECK
-+  if (sizeof(avr32_operand_table)/sizeof(avr32_operand_table[0])
-+      < AVR32_NR_OPERANDS)
-+    as_fatal(_("operand table is incomplete"));
-+
-+  for (i = 0; i < AVR32_NR_OPERANDS; i++)
-+    if (avr32_operand_table[i].id != i)
-+      as_fatal(_("operand table inconsistency found at index %d\n"), i);
-+  pr_debug("%d operands verified\n", AVR32_NR_OPERANDS);
-+
-+  for (i = 0; i < AVR32_NR_IFIELDS; i++)
-+    if (avr32_ifield_table[i].id != i)
-+      as_fatal(_("ifield table inconsistency found at index %d\n"), i);
-+  pr_debug("%d instruction fields verified\n", AVR32_NR_IFIELDS);
-+
-+  for (i = 0; i < AVR32_NR_OPCODES; i++)
-+    {
-+      if (avr32_opc_table[i].id != i)
-+	as_fatal(_("opcode table inconsistency found at index %d\n"), i);
-+      if ((avr32_opc_table[i].var_field == -1
-+	   && avr32_relax_table[i].length != 0)
-+	  || (avr32_opc_table[i].var_field != -1
-+	      && avr32_relax_table[i].length == 0))
-+	as_fatal(_("relax table inconsistency found at index %d\n"), i);
-+    }
-+  pr_debug("%d opcodes verified\n", AVR32_NR_OPCODES);
-+
-+  for (i = 0; i < AVR32_NR_SYNTAX; i++)
-+    if (avr32_syntax_table[i].id != i)
-+      as_fatal(_("syntax table inconsistency found at index %d\n"), i);
-+  pr_debug("%d syntax variants verified\n", AVR32_NR_SYNTAX);
-+
-+  for (i = 0; i < AVR32_NR_ALIAS; i++)
-+    if (avr32_alias_table[i].id != i)
-+      as_fatal(_("alias table inconsistency found at index %d\n"), i);
-+  pr_debug("%d aliases verified\n", AVR32_NR_ALIAS);
-+
-+  for (i = 0; i < AVR32_NR_MNEMONICS; i++)
-+    if (avr32_mnemonic_table[i].id != i)
-+      as_fatal(_("mnemonic table inconsistency found at index %d\n"), i);
-+  pr_debug("%d mnemonics verified\n", AVR32_NR_MNEMONICS);
-+#endif
-+}
-+
-+void
-+md_assemble (char *str)
-+{
-+  struct avr32_mnemonic *mnemonic;
-+  char *p, c;
-+
-+  memset(&current_insn, 0, sizeof(current_insn));
-+  current_insn.immediate.X_op = O_constant;
-+
-+  skip_whitespace(str);
-+  for (p = str; *p; p++)
-+    if (*p == ' ')
-+      break;
-+  c = *p;
-+  *p = 0;
-+
-+  mnemonic = hash_find(avr32_mnemonic_htab, str);
-+  *p = c;
-+  if (c) p++;
-+
-+  if (mnemonic)
-+    {
-+      const struct avr32_syntax *syntax;
-+
-+      for (syntax = mnemonic->syntax; syntax; syntax = syntax->next)
-+	{
-+	  const char *errmsg = NULL;
-+
-+	  if (syntax_matches(syntax, p))
-+	    {
-+	      if (!(syntax->isa_flags & avr32_arch->isa_flags))
-+		{
-+		  as_bad(_("Selected architecture `%s'  does not support `%s'"),
-+			 avr32_arch->name, str);
-+		  return;
-+		}
-+
-+	      current_insn.syntax = syntax;
-+	      parse_operands(p);
-+
-+	      switch (syntax->type)
-+		{
-+		case AVR32_PARSER_NORMAL:
-+		  errmsg = finish_insn(syntax->u.opc);
-+		  break;
-+		case AVR32_PARSER_ALIAS:
-+		  errmsg = finish_alias(syntax->u.alias);
-+		  break;
-+		case AVR32_PARSER_LDA:
-+		  errmsg = finish_lda(syntax);
-+		  break;
-+		case AVR32_PARSER_CALL:
-+		  errmsg = finish_call(syntax);
-+		  break;
-+		default:
-+		  BAD_CASE(syntax->type);
-+		  break;
-+		}
-+
-+	      if (errmsg)
-+		as_bad("%s in `%s'", errmsg, str);
-+
-+	      return;
-+	    }
-+	}
-+
-+      as_bad(_("unrecognized form of instruction: `%s'"), str);
-+    }
-+  else
-+    as_bad(_("unrecognized instruction `%s'"), str);
-+}
-+
-+void avr32_cleanup(void)
-+{
-+  struct cpool *pool;
-+
-+  /* Emit any constant pools that haven't been explicitly flushed with
-+     a .cpool directive. */
-+  for (pool = cpool_list; pool; pool = pool->next)
-+    {
-+      subseg_set(pool->section, pool->sub_section);
-+      s_cpool(0);
-+    }
-+}
-+
-+/* Handle any PIC-related operands in data allocation pseudo-ops */
-+void
-+avr32_cons_fix_new (fragS *frag, int off, int size, expressionS *exp)
-+{
-+  bfd_reloc_code_real_type r_type = BFD_RELOC_UNUSED;
-+  int pcrel = 0;
-+
-+  pr_debug("%s:%u: cons_fix_new, add_sym: %s, op_sym: %s, op: %d, add_num: %d\n",
-+	   frag->fr_file, frag->fr_line,
-+	   exp->X_add_symbol?S_GET_NAME(exp->X_add_symbol):"(none)",
-+	   exp->X_op_symbol?S_GET_NAME(exp->X_op_symbol):"(none)",
-+	   exp->X_op, exp->X_add_number);
-+
-+  if (exp->X_op == O_subtract && exp->X_op_symbol)
-+    {
-+      if (exp->X_op_symbol == GOT_symbol)
-+	{
-+	  if (size != 4)
-+	    goto bad_size;
-+	  r_type = BFD_RELOC_AVR32_GOTPC;
-+	  exp->X_op = O_symbol;
-+	  exp->X_op_symbol = NULL;
-+	}
-+    }
-+  else if (exp->X_op == O_got)
-+    {
-+      switch (size)
-+	{
-+	case 1:
-+	  r_type = BFD_RELOC_AVR32_GOT8;
-+	  break;
-+	case 2:
-+	  r_type = BFD_RELOC_AVR32_GOT16;
-+	  break;
-+	case 4:
-+	  r_type = BFD_RELOC_AVR32_GOT32;
-+	  break;
-+	default:
-+	  goto bad_size;
-+	}
-+
-+      exp->X_op = O_symbol;
-+    }
-+
-+  if (r_type == BFD_RELOC_UNUSED)
-+    switch (size)
-+      {
-+      case 1:
-+	r_type = BFD_RELOC_8;
-+	break;
-+      case 2:
-+	r_type = BFD_RELOC_16;
-+	break;
-+      case 4:
-+	r_type = BFD_RELOC_32;
-+	break;
-+      default:
-+	goto bad_size;
-+      }
-+  else if (size != 4)
-+    {
-+    bad_size:
-+      as_bad(_("unsupported BFD relocation size %u"), size);
-+      r_type = BFD_RELOC_UNUSED;
-+    }
-+
-+  fix_new_exp (frag, off, size, exp, pcrel, r_type);
-+}
-+
-+static void
-+avr32_frob_section(bfd *abfd ATTRIBUTE_UNUSED, segT sec,
-+		   void *ignore ATTRIBUTE_UNUSED)
-+{
-+  segment_info_type *seginfo;
-+  fixS *fix;
-+
-+  seginfo = seg_info(sec);
-+  if (!seginfo)
-+    return;
-+
-+  for (fix = seginfo->fix_root; fix; fix = fix->fx_next)
-+    {
-+      if (fix->fx_done)
-+	continue;
-+
-+      if (fix->fx_r_type == BFD_RELOC_AVR32_SUB5
-+	  && fix->fx_addsy && fix->fx_subsy)
-+	{
-+	  if (S_GET_SEGMENT(fix->fx_addsy) != S_GET_SEGMENT(fix->fx_subsy)
-+	      || linkrelax)
-+	    {
-+	      symbolS *tmp;
-+#ifdef DEBUG
-+	      fprintf(stderr, "Swapping symbols in fixup:\n");
-+	      print_fixup(fix);
-+#endif
-+	      tmp = fix->fx_addsy;
-+	      fix->fx_addsy = fix->fx_subsy;
-+	      fix->fx_subsy = tmp;
-+	      fix->fx_offset = -fix->fx_offset;
-+	    }
-+	}
-+    }
-+}
-+
-+/* We need to look for SUB5 instructions with expressions that will be
-+   made PC-relative and switch fx_addsy with fx_subsy.  This has to be
-+   done before adjustment or the wrong symbol might be adjusted.
-+
-+   This applies to fixups that are a result of expressions like -(sym
-+   - .) and that will make it all the way to md_apply_fix3().  LDA
-+   does the right thing in convert_frag, so we must not convert
-+   those. */
-+void
-+avr32_frob_file(void)
-+{
-+  /* if (1 || !linkrelax)
-+     return; */
-+
-+  bfd_map_over_sections(stdoutput, avr32_frob_section, NULL);
-+}
-+
-+static bfd_boolean
-+convert_to_diff_reloc(fixS *fixP)
-+{
-+  switch (fixP->fx_r_type)
-+    {
-+    case BFD_RELOC_32:
-+      fixP->fx_r_type = BFD_RELOC_AVR32_DIFF32;
-+      break;
-+    case BFD_RELOC_16:
-+      fixP->fx_r_type = BFD_RELOC_AVR32_DIFF16;
-+      break;
-+    case BFD_RELOC_8:
-+      fixP->fx_r_type = BFD_RELOC_AVR32_DIFF8;
-+      break;
-+    default:
-+      return FALSE;
-+    }
-+
-+  return TRUE;
-+}
-+
-+/* Simplify a fixup.  If possible, the fixup is reduced to a single
-+   constant which is written to the output file.  Otherwise, a
-+   relocation is generated so that the linker can take care of the
-+   rest.
-+
-+   ELF relocations have certain constraints: They can only take a
-+   single symbol and a single addend.  This means that for difference
-+   expressions, we _must_ get rid of the fx_subsy symbol somehow.
-+
-+   The difference between two labels in the same section can be
-+   calculated directly unless 'linkrelax' is set, or a relocation is
-+   forced.  If so, we must emit a R_AVR32_DIFFxx relocation.  If there
-+   are addends involved at this point, we must be especially careful
-+   as the relocation must point exactly to the symbol being
-+   subtracted.
-+
-+   When subtracting a symbol defined in the same section as the fixup,
-+   we might be able to convert it to a PC-relative expression, unless
-+   linkrelax is set. If this is the case, there's no way we can make
-+   sure that the difference between the fixup and fx_subsy stays
-+   constant.  So for now, we're just going to disallow that.
-+   */
-+void
-+avr32_process_fixup(fixS *fixP, segT this_segment)
-+{
-+  segT add_symbol_segment = absolute_section;
-+  segT sub_symbol_segment = absolute_section;
-+  symbolS *fx_addsy, *fx_subsy;
-+  offsetT value = 0, fx_offset;
-+  bfd_boolean apply = FALSE;
-+
-+  assert(this_segment != absolute_section);
-+
-+  if (fixP->fx_r_type >= BFD_RELOC_UNUSED)
-+    {
-+      as_bad_where(fixP->fx_file, fixP->fx_line,
-+		   _("Bad relocation type %d\n"), fixP->fx_r_type);
-+      return;
-+    }
-+
-+  /* BFD_RELOC_AVR32_SUB5 fixups have been swapped by avr32_frob_section() */
-+  fx_addsy = fixP->fx_addsy;
-+  fx_subsy = fixP->fx_subsy;
-+  fx_offset = fixP->fx_offset;
-+
-+  if (fx_addsy)
-+    add_symbol_segment = S_GET_SEGMENT(fx_addsy);
-+
-+  if (fx_subsy)
-+    {
-+      resolve_symbol_value(fx_subsy);
-+      sub_symbol_segment = S_GET_SEGMENT(fx_subsy);
-+
-+      if (sub_symbol_segment == this_segment
-+	  && (!linkrelax
-+	      || S_GET_VALUE(fx_subsy) == (fixP->fx_frag->fr_address
-+					   + fixP->fx_where)))
-+	{
-+	  fixP->fx_pcrel = TRUE;
-+	  fx_offset += (fixP->fx_frag->fr_address + fixP->fx_where
-+			- S_GET_VALUE(fx_subsy));
-+	  fx_subsy = NULL;
-+	}
-+      else if (sub_symbol_segment == absolute_section)
-+	{
-+	  /* The symbol is really a constant.  */
-+	  fx_offset -= S_GET_VALUE(fx_subsy);
-+	  fx_subsy = NULL;
-+	}
-+      else if (SEG_NORMAL(add_symbol_segment)
-+	       && sub_symbol_segment == add_symbol_segment
-+	       && (!linkrelax || convert_to_diff_reloc(fixP)))
-+	{
-+	  /* Difference between two labels in the same section.  */
-+	  if (linkrelax)
-+	    {
-+	      /* convert_to_diff() has ensured that the reloc type is
-+		 either DIFF32, DIFF16 or DIFF8.  */
-+	      value = (S_GET_VALUE(fx_addsy) + fixP->fx_offset
-+		       - S_GET_VALUE(fx_subsy));
-+
-+	      /* Try to convert it to a section symbol if possible  */
-+	      if (!S_FORCE_RELOC(fx_addsy, 1)
-+		  && !(sub_symbol_segment->flags & SEC_THREAD_LOCAL))
-+		{
-+		  fx_offset = S_GET_VALUE(fx_subsy);
-+		  fx_addsy = section_symbol(sub_symbol_segment);
-+		}
-+	      else
-+		{
-+		  fx_addsy = fx_subsy;
-+		  fx_offset = 0;
-+		}
-+
-+	      fx_subsy = NULL;
-+	      apply = TRUE;
-+	    }
-+	  else
-+	    {
-+	      fx_offset += S_GET_VALUE(fx_addsy);
-+	      fx_offset -= S_GET_VALUE(fx_subsy);
-+	      fx_addsy = NULL;
-+	      fx_subsy = NULL;
-+	    }
-+	}
-+      else
-+	{
-+	  as_bad_where(fixP->fx_file, fixP->fx_line,
-+		       _("can't resolve `%s' {%s section} - `%s' {%s section}"),
-+		       fx_addsy ? S_GET_NAME (fx_addsy) : "0",
-+		       segment_name (add_symbol_segment),
-+		       S_GET_NAME (fx_subsy),
-+		       segment_name (sub_symbol_segment));
-+	  return;
-+	}
-+    }
-+
-+  if (fx_addsy && !TC_FORCE_RELOCATION(fixP))
-+    {
-+      if (add_symbol_segment == this_segment
-+	  && fixP->fx_pcrel)
-+	{
-+	  value += S_GET_VALUE(fx_addsy);
-+	  value -= md_pcrel_from_section(fixP, this_segment);
-+	  fx_addsy = NULL;
-+	  fixP->fx_pcrel = FALSE;
-+	}
-+      else if (add_symbol_segment == absolute_section)
-+	{
-+	  fx_offset += S_GET_VALUE(fixP->fx_addsy);
-+	  fx_addsy = NULL;
-+	}
-+    }
-+
-+  if (!fx_addsy)
-+    fixP->fx_done = TRUE;
-+
-+  if (fixP->fx_pcrel)
-+    {
-+      if (fx_addsy != NULL
-+	  && S_IS_DEFINED(fx_addsy)
-+	  && S_GET_SEGMENT(fx_addsy) != this_segment)
-+	value += md_pcrel_from_section(fixP, this_segment);
-+
-+      switch (fixP->fx_r_type)
-+	{
-+	case BFD_RELOC_32:
-+	  fixP->fx_r_type = BFD_RELOC_32_PCREL;
-+	  break;
-+	case BFD_RELOC_16:
-+	  fixP->fx_r_type = BFD_RELOC_16_PCREL;
-+	  break;
-+	case BFD_RELOC_8:
-+	  fixP->fx_r_type = BFD_RELOC_8_PCREL;
-+	  break;
-+	case BFD_RELOC_AVR32_SUB5:
-+	  fixP->fx_r_type = BFD_RELOC_AVR32_16N_PCREL;
-+	  break;
-+	case BFD_RELOC_AVR32_16S:
-+	  fixP->fx_r_type = BFD_RELOC_AVR32_16B_PCREL;
-+	  break;
-+	case BFD_RELOC_AVR32_14UW:
-+	  fixP->fx_r_type = BFD_RELOC_AVR32_14UW_PCREL;
-+	  break;
-+	case BFD_RELOC_AVR32_10UW:
-+	  fixP->fx_r_type = BFD_RELOC_AVR32_10UW_PCREL;
-+	  break;
-+	default:
-+	  /* Should have been taken care of already */
-+	  break;
-+	}
-+    }
-+
-+  if (fixP->fx_done || apply)
-+    {
-+      const struct avr32_ifield *ifield;
-+      char *buf = fixP->fx_where + fixP->fx_frag->fr_literal;
-+
-+      if (fixP->fx_done)
-+	value += fx_offset;
-+
-+      /* For hosts with longs bigger than 32-bits make sure that the top
-+         bits of a 32-bit negative value read in by the parser are set,
-+         so that the correct comparisons are made.  */
-+      if (value & 0x80000000)
-+        value |= (-1L << 31);
-+
-+      switch (fixP->fx_r_type)
-+	{
-+	case BFD_RELOC_32:
-+	case BFD_RELOC_16:
-+	case BFD_RELOC_8:
-+	case BFD_RELOC_AVR32_DIFF32:
-+	case BFD_RELOC_AVR32_DIFF16:
-+	case BFD_RELOC_AVR32_DIFF8:
-+	  md_number_to_chars(buf, value, fixP->fx_size);
-+	  break;
-+	case BFD_RELOC_HI16:
-+	  value >>= 16;
-+	case BFD_RELOC_LO16:
-+	  value &= 0xffff;
-+	  md_number_to_chars(buf + 2, value, 2);
-+	  break;
-+	case BFD_RELOC_AVR32_16N_PCREL:
-+	  value = -value;
-+	  /* fall through */
-+	case BFD_RELOC_AVR32_22H_PCREL:
-+	case BFD_RELOC_AVR32_18W_PCREL:
-+	case BFD_RELOC_AVR32_16B_PCREL:
-+	case BFD_RELOC_AVR32_11H_PCREL:
-+	case BFD_RELOC_AVR32_9H_PCREL:
-+	case BFD_RELOC_AVR32_9UW_PCREL:
-+	case BFD_RELOC_AVR32_3U:
-+	case BFD_RELOC_AVR32_4UH:
-+	case BFD_RELOC_AVR32_6UW:
-+	case BFD_RELOC_AVR32_6S:
-+	case BFD_RELOC_AVR32_7UW:
-+	case BFD_RELOC_AVR32_8S_EXT:
-+	case BFD_RELOC_AVR32_8S:
-+	case BFD_RELOC_AVR32_10UW:
-+	case BFD_RELOC_AVR32_10SW:
-+	case BFD_RELOC_AVR32_STHH_W:
-+	case BFD_RELOC_AVR32_14UW:
-+	case BFD_RELOC_AVR32_16S:
-+	case BFD_RELOC_AVR32_16U:
-+	case BFD_RELOC_AVR32_21S:
-+	case BFD_RELOC_AVR32_SUB5:
-+	case BFD_RELOC_AVR32_CPCALL:
-+	case BFD_RELOC_AVR32_16_CP:
-+	case BFD_RELOC_AVR32_9W_CP:
-+	case BFD_RELOC_AVR32_15S:
-+	  ifield = fixP->tc_fix_data.ifield;
-+	  pr_debug("insert field: %ld <= %ld <= %ld (align %u)\n",
-+		   fixP->tc_fix_data.min, value, fixP->tc_fix_data.max,
-+		   fixP->tc_fix_data.align);
-+	  if (value < fixP->tc_fix_data.min || value > fixP->tc_fix_data.max)
-+	    as_bad_where(fixP->fx_file, fixP->fx_line,
-+			 _("operand out of range (%ld not between %ld and %ld)"),
-+			 value, fixP->tc_fix_data.min, fixP->tc_fix_data.max);
-+	  if (value & ((1 << fixP->tc_fix_data.align) - 1))
-+	    as_bad_where(fixP->fx_file, fixP->fx_line,
-+			 _("misaligned operand (required alignment: %d)"),
-+			 1 << fixP->tc_fix_data.align);
-+	  ifield->insert(ifield, buf, value >> fixP->tc_fix_data.align);
-+	  break;
-+	case BFD_RELOC_AVR32_ALIGN:
-+	  /* Nothing to do */
-+	  fixP->fx_done = FALSE;
-+	  break;
-+	default:
-+	  as_fatal("reloc type %s not handled\n",
-+		   bfd_get_reloc_code_name(fixP->fx_r_type));
-+	}
-+    }
-+
-+  fixP->fx_addsy = fx_addsy;
-+  fixP->fx_subsy = fx_subsy;
-+  fixP->fx_offset = fx_offset;
-+
-+  if (!fixP->fx_done)
-+    {
-+      if (!fixP->fx_addsy)
-+	fixP->fx_addsy = abs_section_sym;
-+
-+      symbol_mark_used_in_reloc(fixP->fx_addsy);
-+      if (fixP->fx_subsy)
-+	abort();
-+    }
-+}
-+
-+#if 0
-+void
-+md_apply_fix3 (fixS *fixP, valueT *valP, segT seg)
-+{
-+  const struct avr32_ifield *ifield;
-+  offsetT	value = *valP;
-+  char		*buf = fixP->fx_where + fixP->fx_frag->fr_literal;
-+  bfd_boolean	apply;
-+
-+  pr_debug("%s:%u: apply_fix3: r_type=%d value=%lx offset=%lx\n",
-+	   fixP->fx_file, fixP->fx_line, fixP->fx_r_type, *valP,
-+	   fixP->fx_offset);
-+
-+  if (fixP->fx_r_type >= BFD_RELOC_UNUSED)
-+    {
-+      as_bad_where(fixP->fx_file, fixP->fx_line,
-+		   _("Bad relocation type %d\n"), fixP->fx_r_type);
-+      return;
-+    }
-+
-+  if (!fixP->fx_addsy && !fixP->fx_subsy)
-+    fixP->fx_done = 1;
-+
-+  if (fixP->fx_pcrel)
-+    {
-+      if (fixP->fx_addsy != NULL
-+	  && S_IS_DEFINED(fixP->fx_addsy)
-+	  && S_GET_SEGMENT(fixP->fx_addsy) != seg)
-+	value += md_pcrel_from_section(fixP, seg);
-+
-+      switch (fixP->fx_r_type)
-+	{
-+	case BFD_RELOC_32:
-+	  fixP->fx_r_type = BFD_RELOC_32_PCREL;
-+	  break;
-+	case BFD_RELOC_16:
-+	case BFD_RELOC_8:
-+	  as_bad_where (fixP->fx_file, fixP->fx_line,
-+			_("8- and 16-bit PC-relative relocations not supported"));
-+	  break;
-+	case BFD_RELOC_AVR32_SUB5:
-+	  fixP->fx_r_type = BFD_RELOC_AVR32_PCREL_SUB5;
-+	  break;
-+	case BFD_RELOC_AVR32_16S:
-+	  fixP->fx_r_type = BFD_RELOC_AVR32_16_PCREL;
-+	  break;
-+	default:
-+	  /* Should have been taken care of already */
-+	  break;
-+	}
-+    }
-+
-+  if (fixP->fx_r_type == BFD_RELOC_32
-+      && fixP->fx_subsy)
-+    {
-+      fixP->fx_r_type = BFD_RELOC_AVR32_DIFF32;
-+
-+      /* Offsets are only allowed if it's a result of adjusting a
-+	 local symbol into a section-relative offset.
-+	 tc_fix_adjustable() should prevent any adjustment if there
-+	 was an offset involved before.  */
-+      if (fixP->fx_offset && !symbol_section_p(fixP->fx_addsy))
-+	as_bad_where(fixP->fx_file, fixP->fx_line,
-+		     _("cannot represent symbol difference with an offset"));
-+
-+      value = (S_GET_VALUE(fixP->fx_addsy) + fixP->fx_offset
-+	       - S_GET_VALUE(fixP->fx_subsy));
-+
-+      /* The difference before any relaxing takes place is written
-+	 out, and the DIFF32 reloc identifies the address of the first
-+	 symbol (i.e. the on that's subtracted.)  */
-+      *valP = value;
-+      fixP->fx_offset -= value;
-+      fixP->fx_subsy = NULL;
-+
-+      md_number_to_chars(buf, value, fixP->fx_size);
-+    }
-+
-+  if (fixP->fx_done)
-+    {
-+      switch (fixP->fx_r_type)
-+	{
-+	case BFD_RELOC_8:
-+	case BFD_RELOC_16:
-+	case BFD_RELOC_32:
-+	  md_number_to_chars(buf, value, fixP->fx_size);
-+	  break;
-+	case BFD_RELOC_HI16:
-+	  value >>= 16;
-+	case BFD_RELOC_LO16:
-+	  value &= 0xffff;
-+	  *valP = value;
-+	  md_number_to_chars(buf + 2, value, 2);
-+	  break;
-+	case BFD_RELOC_AVR32_PCREL_SUB5:
-+	  value = -value;
-+	  /* fall through */
-+	case BFD_RELOC_AVR32_9_PCREL:
-+	case BFD_RELOC_AVR32_11_PCREL:
-+	case BFD_RELOC_AVR32_16_PCREL:
-+	case BFD_RELOC_AVR32_18_PCREL:
-+	case BFD_RELOC_AVR32_22_PCREL:
-+	case BFD_RELOC_AVR32_3U:
-+	case BFD_RELOC_AVR32_4UH:
-+	case BFD_RELOC_AVR32_6UW:
-+	case BFD_RELOC_AVR32_6S:
-+	case BFD_RELOC_AVR32_7UW:
-+	case BFD_RELOC_AVR32_8S:
-+	case BFD_RELOC_AVR32_10UW:
-+	case BFD_RELOC_AVR32_10SW:
-+	case BFD_RELOC_AVR32_14UW:
-+	case BFD_RELOC_AVR32_16S:
-+	case BFD_RELOC_AVR32_16U:
-+	case BFD_RELOC_AVR32_21S:
-+	case BFD_RELOC_AVR32_BRC1:
-+	case BFD_RELOC_AVR32_SUB5:
-+	case BFD_RELOC_AVR32_CPCALL:
-+	case BFD_RELOC_AVR32_16_CP:
-+	case BFD_RELOC_AVR32_9_CP:
-+	case BFD_RELOC_AVR32_15S:
-+	  ifield = fixP->tc_fix_data.ifield;
-+	  pr_debug("insert field: %ld <= %ld <= %ld (align %u)\n",
-+		   fixP->tc_fix_data.min, value, fixP->tc_fix_data.max,
-+		   fixP->tc_fix_data.align);
-+	  if (value < fixP->tc_fix_data.min || value > fixP->tc_fix_data.max)
-+	    as_bad_where(fixP->fx_file, fixP->fx_line,
-+			 _("operand out of range (%ld not between %ld and %ld)"),
-+			 value, fixP->tc_fix_data.min, fixP->tc_fix_data.max);
-+	  if (value & ((1 << fixP->tc_fix_data.align) - 1))
-+	    as_bad_where(fixP->fx_file, fixP->fx_line,
-+			 _("misaligned operand (required alignment: %d)"),
-+			 1 << fixP->tc_fix_data.align);
-+	  ifield->insert(ifield, buf, value >> fixP->tc_fix_data.align);
-+	  break;
-+	case BFD_RELOC_AVR32_ALIGN:
-+	  /* Nothing to do */
-+	  fixP->fx_done = FALSE;
-+	  break;
-+	default:
-+	  as_fatal("reloc type %s not handled\n",
-+		   bfd_get_reloc_code_name(fixP->fx_r_type));
-+	}
-+    }
-+}
-+#endif
-+
-+arelent *
-+tc_gen_reloc (asection *section ATTRIBUTE_UNUSED,
-+	      fixS *fixp)
-+{
-+  arelent *reloc;
-+  bfd_reloc_code_real_type code;
-+
-+  reloc = xmalloc (sizeof (arelent));
-+
-+  reloc->sym_ptr_ptr = xmalloc (sizeof (asymbol *));
-+  *reloc->sym_ptr_ptr = symbol_get_bfdsym (fixp->fx_addsy);
-+  reloc->address = fixp->fx_frag->fr_address + fixp->fx_where;
-+  reloc->addend = fixp->fx_offset;
-+  code = fixp->fx_r_type;
-+
-+  reloc->howto = bfd_reloc_type_lookup (stdoutput, code);
-+
-+  if (reloc->howto == NULL)
-+    {
-+      as_bad_where (fixp->fx_file, fixp->fx_line,
-+		    _("cannot represent relocation %s in this object file format"),
-+		    bfd_get_reloc_code_name (code));
-+      return NULL;
-+    }
-+
-+  return reloc;
-+}
-+
-+bfd_boolean
-+avr32_force_reloc(fixS *fixP)
-+{
-+  if (linkrelax && fixP->fx_addsy
-+      && !(S_GET_SEGMENT(fixP->fx_addsy)->flags & SEC_DEBUGGING)
-+      && S_GET_SEGMENT(fixP->fx_addsy) != absolute_section)
-+    {
-+      pr_debug(stderr, "force reloc: addsy=%p, r_type=%d, sec=%s\n",
-+	       fixP->fx_addsy, fixP->fx_r_type, S_GET_SEGMENT(fixP->fx_addsy)->name);
-+      return 1;
-+    }
-+
-+  return generic_force_reloc(fixP);
-+}
-+
-+bfd_boolean
-+avr32_fix_adjustable(fixS *fixP)
-+{
-+  switch (fixP->fx_r_type)
-+    {
-+      /* GOT relocations can't have addends since BFD treats all
-+	 references to a given symbol the same. This means that we
-+	 must avoid section-relative references to local symbols when
-+	 dealing with these kinds of relocs */
-+    case BFD_RELOC_AVR32_GOT32:
-+    case BFD_RELOC_AVR32_GOT16:
-+    case BFD_RELOC_AVR32_GOT8:
-+    case BFD_RELOC_AVR32_GOT21S:
-+    case BFD_RELOC_AVR32_GOT18SW:
-+    case BFD_RELOC_AVR32_GOT16S:
-+    case BFD_RELOC_AVR32_LDA_GOT:
-+    case BFD_RELOC_AVR32_GOTCALL:
-+      pr_debug("fix not adjustable\n");
-+      return 0;
-+
-+    default:
-+      break;
-+    }
-+
-+  return 1;
-+}
-+
-+/* When we want the linker to be able to relax the code, we need to
-+   output a reloc for every .align directive requesting an alignment
-+   to a four byte boundary or larger.  If we don't do this, the linker
-+   can't guarantee that the alignment is actually maintained in the
-+   linker output.
-+
-+   TODO: Might as well insert proper NOPs while we're at it... */
-+void
-+avr32_handle_align(fragS *frag)
-+{
-+  if (linkrelax
-+      && frag->fr_type == rs_align_code
-+      && frag->fr_address + frag->fr_fix > 0
-+      && frag->fr_offset > 0)
-+    {
-+      /* The alignment order (fr_offset) is stored in the addend. */
-+      fix_new(frag, frag->fr_fix, 2, &abs_symbol, frag->fr_offset,
-+	      FALSE, BFD_RELOC_AVR32_ALIGN);
-+    }
-+}
-+
-+/* Relax_align. Advance location counter to next address that has 'alignment'
-+   lowest order bits all 0s, return size of adjustment made.  */
-+relax_addressT
-+avr32_relax_align(segT segment ATTRIBUTE_UNUSED,
-+		  fragS *fragP,
-+		  relax_addressT address)
-+{
-+  relax_addressT mask;
-+  relax_addressT new_address;
-+  int alignment;
-+
-+  alignment = fragP->fr_offset;
-+  mask = ~((~0) << alignment);
-+  new_address = (address + mask) & (~mask);
-+
-+  return new_address - address;
-+}
-+
-+/* Turn a string in input_line_pointer into a floating point constant
-+   of type type, and store the appropriate bytes in *litP.  The number
-+   of LITTLENUMS emitted is stored in *sizeP .  An error message is
-+   returned, or NULL on OK. */
-+
-+/* Equal to MAX_PRECISION in atof-ieee.c */
-+#define MAX_LITTLENUMS 6
-+
-+char *
-+md_atof (type, litP, sizeP)
-+char   type;
-+char * litP;
-+int *  sizeP;
-+{
-+  int              i;
-+  int              prec;
-+  LITTLENUM_TYPE   words [MAX_LITTLENUMS];
-+  char *           t;
-+
-+  switch (type)
-+  {
-+    case 'f':
-+    case 'F':
-+    case 's':
-+    case 'S':
-+      prec = 2;
-+      break;
-+
-+    case 'd':
-+    case 'D':
-+    case 'r':
-+    case 'R':
-+      prec = 4;
-+      break;
-+
-+      /* FIXME: Some targets allow other format chars for bigger sizes here.  */
-+
-+    default:
-+      * sizeP = 0;
-+      return _("Bad call to md_atof()");
-+  }
-+
-+  t = atof_ieee (input_line_pointer, type, words);
-+  if (t)
-+    input_line_pointer = t;
-+  * sizeP = prec * sizeof (LITTLENUM_TYPE);
-+
-+  for (i = 0; i < prec; i++)
-+  {
-+    md_number_to_chars (litP, (valueT) words[i],
-+                        sizeof (LITTLENUM_TYPE));
-+    litP += sizeof (LITTLENUM_TYPE);
-+  }
-+
-+  return 0;
-+}
-+
-+static char *avr32_end_of_match(char *cont, char *what)
-+{
-+  int len = strlen (what);
-+
-+  if (! is_part_of_name (cont[len])
-+      && strncasecmp (cont, what, len) == 0)
-+    return cont + len;
-+
-+  return NULL;
-+}
-+
-+int
-+avr32_parse_name (char const *name, expressionS *exp, char *nextchar)
-+{
-+  char *next = input_line_pointer;
-+  char *next_end;
-+
-+  pr_debug("parse_name: %s, nextchar=%c (%02x)\n", name, *nextchar, *nextchar);
-+
-+  if (*nextchar == '(')
-+    {
-+      if (strcasecmp(name, "hi") == 0)
-+	{
-+	  *next = *nextchar;
-+
-+	  expression(exp);
-+
-+	  if (exp->X_op == O_constant)
-+	    {
-+	      pr_debug("  -> constant hi(0x%08lx) -> 0x%04lx\n",
-+		       exp->X_add_number, exp->X_add_number >> 16);
-+	      exp->X_add_number = (exp->X_add_number >> 16) & 0xffff;
-+	    }
-+	  else
-+	    {
-+	      exp->X_md = exp->X_op;
-+	      exp->X_op = O_hi;
-+	    }
-+
-+	  return 1;
-+	}
-+      else if (strcasecmp(name, "lo") == 0)
-+	{
-+	  *next = *nextchar;
-+
-+	  expression(exp);
-+
-+	  if (exp->X_op == O_constant)
-+	    exp->X_add_number &= 0xffff;
-+	  else
-+	    {
-+	      exp->X_md = exp->X_op;
-+	      exp->X_op = O_lo;
-+	    }
-+
-+	  return 1;
-+	}
-+    }
-+  else if (*nextchar == '@')
-+    {
-+      exp->X_md = exp->X_op;
-+
-+      if ((next_end = avr32_end_of_match (next + 1, "got")))
-+	exp->X_op = O_got;
-+      else if ((next_end = avr32_end_of_match (next + 1, "tlsgd")))
-+	exp->X_op = O_tlsgd;
-+      /* Add more as needed */
-+      else
-+	{
-+	  char c;
-+	  input_line_pointer++;
-+	  c = get_symbol_end();
-+	  as_bad (_("unknown relocation override `%s'"), next + 1);
-+	  *input_line_pointer = c;
-+	  input_line_pointer = next;
-+	  return 0;
-+	}
-+
-+      exp->X_op_symbol = NULL;
-+      exp->X_add_symbol = symbol_find_or_make (name);
-+      exp->X_add_number = 0;
-+
-+      *input_line_pointer = *nextchar;
-+      input_line_pointer = next_end;
-+      *nextchar = *input_line_pointer;
-+      *input_line_pointer = '\0';
-+      return 1;
-+    }
-+  else if (strcmp (name, "_GLOBAL_OFFSET_TABLE_") == 0)
-+    {
-+      if (!GOT_symbol)
-+	GOT_symbol = symbol_find_or_make(name);
-+
-+      exp->X_add_symbol = GOT_symbol;
-+      exp->X_op = O_symbol;
-+      exp->X_add_number = 0;
-+      return 1;
-+    }
-+
-+  return 0;
-+}
-+
-+static void
-+s_rseg (int value ATTRIBUTE_UNUSED)
-+{
-+  /* Syntax: RSEG segment_name [:type] [NOROOT|ROOT] [(align)]
-+   * Defaults:
-+   *  - type: undocumented ("typically CODE or DATA")
-+   *  - ROOT
-+   *  - align: 1 for code, 0 for others
-+   *
-+   * TODO: NOROOT is ignored. If gas supports discardable segments, it should
-+   * be implemented.
-+   */
-+  char *name, *end;
-+  int length, type, attr;
-+  int align = 0;
-+
-+  SKIP_WHITESPACE();
-+
-+  end = input_line_pointer;
-+  while (0 == strchr ("\n\t;:( ", *end))
-+    end++;
-+  if (end == input_line_pointer)
-+    {
-+      as_warn (_("missing name"));
-+      ignore_rest_of_line();
-+      return;
-+    }
-+
-+  name = xmalloc (end - input_line_pointer + 1);
-+  memcpy (name, input_line_pointer, end - input_line_pointer);
-+  name[end - input_line_pointer] = '\0';
-+  input_line_pointer = end;
-+
-+  SKIP_WHITESPACE();
-+
-+  type = SHT_NULL;
-+  attr = 0;
-+
-+  if (*input_line_pointer == ':')
-+    {
-+      /* Skip the colon */
-+      ++input_line_pointer;
-+      SKIP_WHITESPACE();
-+
-+      /* Possible options at this point:
-+       *   - flag (ROOT or NOROOT)
-+       *   - a segment type
-+       */
-+      end = input_line_pointer;
-+      while (0 == strchr ("\n\t;:( ", *end))
-+	end++;
-+      length = end - input_line_pointer;
-+      if (((length == 4) && (0 == strncasecmp( input_line_pointer, "ROOT", 4))) ||
-+	  ((length == 6) && (0 == strncasecmp( input_line_pointer, "NOROOT", 6))))
-+	{
-+	  /* Ignore ROOT/NOROOT */
-+	  input_line_pointer = end;
-+	}
-+      else
-+	{
-+	  /* Must be a segment type */
-+	  switch (*input_line_pointer)
-+	    {
-+	    case 'C':
-+	    case 'c':
-+	      if ((length == 4) &&
-+		  (0 == strncasecmp (input_line_pointer, "CODE", 4)))
-+		{
-+		  attr |= SHF_ALLOC | SHF_EXECINSTR;
-+		  type = SHT_PROGBITS;
-+		  align = 1;
-+		  break;
-+		}
-+	      if ((length == 5) &&
-+		  (0 == strncasecmp (input_line_pointer, "CONST", 5)))
-+		{
-+		  attr |= SHF_ALLOC;
-+		  type = SHT_PROGBITS;
-+		  break;
-+		}
-+	      goto de_fault;
-+
-+	    case 'D':
-+	    case 'd':
-+	      if ((length == 4) &&
-+		  (0 == strncasecmp (input_line_pointer, "DATA", 4)))
-+		{
-+		  attr |= SHF_ALLOC | SHF_WRITE;
-+		  type = SHT_PROGBITS;
-+		  break;
-+		}
-+	      goto de_fault;
-+
-+	      /* TODO: Add FAR*, HUGE*, IDATA and NEAR* if necessary */
-+
-+	    case 'U':
-+	    case 'u':
-+	      if ((length == 7) &&
-+		  (0 == strncasecmp (input_line_pointer, "UNTYPED", 7)))
-+		break;
-+	      goto de_fault;
-+
-+	      /* TODO: Add XDATA and ZPAGE if necessary */
-+
-+	    de_fault:
-+	    default:
-+	      as_warn (_("unrecognized segment type"));
-+	    }
-+
-+	  input_line_pointer = end;
-+	  SKIP_WHITESPACE();
-+
-+	  if (*input_line_pointer == ':')
-+	    {
-+	      /*  ROOT/NOROOT */
-+	      ++input_line_pointer;
-+	      SKIP_WHITESPACE();
-+
-+	      end = input_line_pointer;
-+	      while (0 == strchr ("\n\t;:( ", *end))
-+		end++;
-+	      length = end - input_line_pointer;
-+	      if (! ((length == 4) &&
-+		     (0 == strncasecmp( input_line_pointer, "ROOT", 4))) &&
-+		  ! ((length == 6) &&
-+		     (0 == strncasecmp( input_line_pointer, "NOROOT", 6))))
-+		{
-+		  as_warn (_("unrecognized segment flag"));
-+		}
-+
-+	      input_line_pointer = end;
-+	      SKIP_WHITESPACE();
-+	    }
-+	}
-+    }
-+
-+  if (*input_line_pointer == '(')
-+    {
-+      align = get_absolute_expression ();
-+    }
-+
-+  demand_empty_rest_of_line();
-+
-+  obj_elf_change_section (name, type, attr, 0, NULL, 0, 0);
-+#ifdef AVR32_DEBUG
-+  fprintf( stderr, "RSEG: Changed section to %s, type: 0x%x, attr: 0x%x\n",
-+      name, type, attr );
-+  fprintf( stderr, "RSEG: Aligning to 2**%d\n", align );
-+#endif
-+
-+  if (align > 15)
-+    {
-+      align = 15;
-+      as_warn (_("alignment too large: %u assumed"), align);
-+    }
-+
-+  /* Hope not, that is */
-+  assert (now_seg != absolute_section);
-+
-+  /* Only make a frag if we HAVE to... */
-+  if (align != 0 && !need_pass_2)
-+    {
-+      if (subseg_text_p (now_seg))
-+	frag_align_code (align, 0);
-+      else
-+	frag_align (align, 0, 0);
-+    }
-+
-+  record_alignment (now_seg, align - OCTETS_PER_BYTE_POWER);
-+}
-+
-+/* vim: syntax=c sw=2
-+ */
-diff -Nur binutils-2.21.orig/gas/config/tc-avr32.h binutils-2.21/gas/config/tc-avr32.h
---- binutils-2.21.orig/gas/config/tc-avr32.h	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.21/gas/config/tc-avr32.h	2011-08-28 14:56:19.987978545 +0200
-@@ -0,0 +1,325 @@
-+/* Assembler definitions for AVR32.
-+   Copyright 2003,2004,2005,2006,2007,2008,2009 Atmel Corporation.
-+
-+   Written by Haavard Skinnemoen, Atmel Norway, <hskinnemoen@atmel.com>
-+
-+   This file is part of GAS, the GNU Assembler.
-+
-+   GAS is free software; you can redistribute it and/or modify it
-+   under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; either version 2, or (at your option)
-+   any later version.
-+
-+   GAS is distributed in the hope that it will be useful, but WITHOUT
-+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-+   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
-+   License for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with GAS; see the file COPYING.  If not, write to the Free
-+   Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-+   02111-1307, USA.  */
-+
-+#if 0
-+#define DEBUG
-+#define DEBUG1
-+#define DEBUG2
-+#define DEBUG3
-+#define DEBUG4
-+#define DEBUG5
-+#endif
-+
-+/* Are we trying to be compatible with the IAR assembler? (--iar) */
-+extern int avr32_iarcompat;
-+
-+/* By convention, you should define this macro in the `.h' file.  For
-+   example, `tc-m68k.h' defines `TC_M68K'.  You might have to use this
-+   if it is necessary to add CPU specific code to the object format
-+   file.  */
-+#define TC_AVR32
-+
-+/* This macro is the BFD target name to use when creating the output
-+   file.  This will normally depend upon the `OBJ_FMT' macro.  */
-+#define TARGET_FORMAT "elf32-avr32"
-+
-+/* This macro is the BFD architecture to pass to `bfd_set_arch_mach'.  */
-+#define TARGET_ARCH bfd_arch_avr32
-+
-+/* This macro is the BFD machine number to pass to
-+   `bfd_set_arch_mach'.  If it is not defined, GAS will use 0.  */
-+#define TARGET_MACH 0
-+
-+/* UNDOCUMENTED: Allow //-style comments */
-+#define DOUBLESLASH_LINE_COMMENTS
-+
-+/* You should define this macro to be non-zero if the target is big
-+   endian, and zero if the target is little endian.  */
-+#define TARGET_BYTES_BIG_ENDIAN 1
-+
-+/* FIXME: It seems that GAS only expects a one-byte opcode...
-+   #define NOP_OPCODE 0xd703 */
-+
-+/* If you define this macro, GAS will warn about the use of
-+   nonstandard escape sequences in a string.  */
-+#undef ONLY_STANDARD_ESCAPES
-+
-+#define DWARF2_FORMAT(SEC) dwarf2_format_32bit
-+
-+/* Instructions are either 2 or 4 bytes long */
-+/* #define DWARF2_LINE_MIN_INSN_LENGTH 2 */
-+
-+/* GAS will call this function for any expression that can not be
-+   recognized.  When the function is called, `input_line_pointer'
-+   will point to the start of the expression.  */
-+#define md_operand(x)
-+
-+#define md_parse_name(name, expr, mode, c) avr32_parse_name(name, expr, c)
-+extern int avr32_parse_name(const char *, struct expressionS *, char *);
-+
-+/* You may define this macro to generate a fixup for a data
-+   allocation pseudo-op.  */
-+#define TC_CONS_FIX_NEW(FRAG, OFF, LEN, EXP)	\
-+  avr32_cons_fix_new(FRAG, OFF, LEN, EXP)
-+void avr32_cons_fix_new (fragS *, int, int, expressionS *);
-+
-+/* `extsym - .' expressions can be emitted using PC-relative relocs */
-+#define DIFF_EXPR_OK
-+
-+/* This is used to construct expressions out of @gotoff, etc. The
-+   relocation type is stored in X_md */
-+#define O_got		O_md1
-+#define O_hi		O_md2
-+#define O_lo		O_md3
-+#define O_tlsgd		O_md4
-+
-+/* You may define this macro to parse an expression used in a data
-+   allocation pseudo-op such as `.word'.  You can use this to
-+   recognize relocation directives that may appear in such directives.  */
-+/* #define TC_PARSE_CONS_EXPRESSION(EXPR,N) avr_parse_cons_expression (EXPR,N)
-+   void avr_parse_cons_expression (expressionS *exp, int nbytes); */
-+
-+/* This should just call either `number_to_chars_bigendian' or
-+   `number_to_chars_littleendian', whichever is appropriate.  On
-+   targets like the MIPS which support options to change the
-+   endianness, which function to call is a runtime decision.  On
-+   other targets, `md_number_to_chars' can be a simple macro.  */
-+#define md_number_to_chars number_to_chars_bigendian
-+
-+/* `md_short_jump_size'
-+   `md_long_jump_size'
-+   `md_create_short_jump'
-+   `md_create_long_jump'
-+   If `WORKING_DOT_WORD' is defined, GAS will not do broken word
-+   processing (*note Broken words::.).  Otherwise, you should set
-+   `md_short_jump_size' to the size of a short jump (a jump that is
-+   just long enough to jump around a long jmp) and
-+   `md_long_jump_size' to the size of a long jump (a jump that can go
-+   anywhere in the function), You should define
-+   `md_create_short_jump' to create a short jump around a long jump,
-+   and define `md_create_long_jump' to create a long jump.  */
-+#define WORKING_DOT_WORD
-+
-+/* If you define this macro, it means that `tc_gen_reloc' may return
-+   multiple relocation entries for a single fixup.  In this case, the
-+   return value of `tc_gen_reloc' is a pointer to a null terminated
-+   array.  */
-+#undef RELOC_EXPANSION_POSSIBLE
-+
-+/* If you define this macro, GAS will not require pseudo-ops to start with a .
-+   character. */
-+#define NO_PSEUDO_DOT (avr32_iarcompat)
-+
-+/* The IAR assembler uses $ as the location counter. Unfortunately, we
-+   can't make this dependent on avr32_iarcompat... */
-+#define DOLLAR_DOT
-+
-+/* Values passed to md_apply_fix3 don't include the symbol value.  */
-+#define MD_APPLY_SYM_VALUE(FIX) 0
-+
-+/* The number of bytes to put into a word in a listing.  This affects
-+   the way the bytes are clumped together in the listing.  For
-+   example, a value of 2 might print `1234 5678' where a value of 1
-+   would print `12 34 56 78'.  The default value is 4.  */
-+#define LISTING_WORD_SIZE 4
-+
-+/* extern const struct relax_type md_relax_table[];
-+#define TC_GENERIC_RELAX_TABLE md_relax_table */
-+
-+/*
-+  An `.lcomm' directive with no explicit alignment parameter will use
-+  this macro to set P2VAR to the alignment that a request for SIZE
-+  bytes will have.  The alignment is expressed as a power of two.  If
-+  no alignment should take place, the macro definition should do
-+  nothing.  Some targets define a `.bss' directive that is also
-+  affected by this macro.  The default definition will set P2VAR to
-+  the truncated power of two of sizes up to eight bytes.
-+
-+  We want doublewords to be word-aligned, so we're going to modify the
-+  default definition a tiny bit.
-+*/
-+#define TC_IMPLICIT_LCOMM_ALIGNMENT(SIZE, P2VAR)	\
-+  do							\
-+    {							\
-+      if ((SIZE) >= 4)					\
-+	(P2VAR) = 2;					\
-+      else if ((SIZE) >= 2)				\
-+	(P2VAR) = 1;					\
-+      else						\
-+	(P2VAR) = 0;					\
-+    }							\
-+  while (0)
-+
-+/* When relaxing, we need to generate relocations for alignment
-+   directives.  */
-+#define HANDLE_ALIGN(frag) avr32_handle_align(frag)
-+extern void avr32_handle_align(fragS *);
-+
-+/* See internals doc for explanation. Oh wait...
-+   Now, can you guess where "alignment" comes from? ;-) */
-+#define MAX_MEM_FOR_RS_ALIGN_CODE ((1 << alignment) - 1)
-+
-+/* We need to stop gas from reducing certain expressions (e.g. GOT
-+   references) */
-+#define tc_fix_adjustable(fix) avr32_fix_adjustable(fix)
-+extern bfd_boolean avr32_fix_adjustable(struct fix *);
-+
-+/* The linker needs to be passed a little more information when relaxing. */
-+#define TC_FORCE_RELOCATION(fix) avr32_force_reloc(fix)
-+extern bfd_boolean avr32_force_reloc(struct fix *);
-+
-+/* I'm tired of working around all the madness in fixup_segment().
-+   This hook will do basically the same things as the generic code,
-+   and then it will "goto" right past it.  */
-+#define TC_VALIDATE_FIX(FIX, SEG, SKIP)		\
-+  do						\
-+    {						\
-+      avr32_process_fixup(FIX, SEG);		\
-+      if (!(FIX)->fx_done)			\
-+	++seg_reloc_count;			\
-+      goto SKIP;				\
-+    }						\
-+  while (0)
-+extern void avr32_process_fixup(struct fix *fixP, segT this_segment);
-+
-+/* Positive values of TC_FX_SIZE_SLACK allow a target to define
-+   fixups that far past the end of a frag.  Having such fixups
-+   is of course most most likely a bug in setting fx_size correctly.
-+   A negative value disables the fixup check entirely, which is
-+   appropriate for something like the Renesas / SuperH SH_COUNT
-+   reloc.  */
-+/* This target is buggy, and sets fix size too large.  */
-+#define TC_FX_SIZE_SLACK(FIX) -1
-+
-+/* We don't want the gas core to make any assumptions about our way of
-+   doing linkrelaxing.  */
-+#define TC_LINKRELAX_FIXUP(SEG)			0
-+
-+/* ... but we do want it to insert lots of padding. */
-+#define LINKER_RELAXING_SHRINKS_ONLY
-+
-+/* Better do it ourselves, really... */
-+#define TC_RELAX_ALIGN(SEG, FRAG, ADDR)	avr32_relax_align(SEG, FRAG, ADDR)
-+extern relax_addressT
-+avr32_relax_align(segT segment, fragS *fragP, relax_addressT address);
-+
-+/* Use line number format that is amenable to linker relaxation.  */
-+#define DWARF2_USE_FIXED_ADVANCE_PC (linkrelax != 0)
-+
-+/* This is called by write_object_file() just before symbols are
-+   attempted converted into section symbols.  */
-+#define tc_frob_file_before_adjust()	avr32_frob_file()
-+extern void avr32_frob_file(void);
-+
-+/* If you define this macro, GAS will call it at the end of each input
-+   file.  */
-+#define md_cleanup() avr32_cleanup()
-+extern void avr32_cleanup(void);
-+
-+/* There's an AVR32-specific hack in operand() which creates O_md
-+   expressions when encountering HWRD or LWRD. We need to generate
-+   proper relocs for them */
-+/* #define md_cgen_record_fixup_exp avr32_cgen_record_fixup_exp */
-+
-+/* I needed to add an extra hook in gas_cgen_finish_insn() for
-+   conversion of O_md* operands because md_cgen_record_fixup_exp()
-+   isn't called for relaxable insns */
-+/* #define md_cgen_convert_expr(exp, opinfo) avr32_cgen_convert_expr(exp, opinfo)
-+   int avr32_cgen_convert_expr(expressionS *, int); */
-+
-+/* #define tc_gen_reloc gas_cgen_tc_gen_reloc */
-+
-+/* If you define this macro, it should return the position from which
-+   the PC relative adjustment for a PC relative fixup should be
-+   made. On many processors, the base of a PC relative instruction is
-+   the next instruction, so this macro would return the length of an
-+   instruction, plus the address of the PC relative fixup. The latter
-+   can be calculated as fixp->fx_where + fixp->fx_frag->fr_address. */
-+extern long md_pcrel_from_section (struct fix *, segT);
-+#define MD_PCREL_FROM_SECTION(FIX, SEC) md_pcrel_from_section (FIX, SEC)
-+
-+#define LOCAL_LABEL(name) (name[0] == '.' && (name[1] == 'L'))
-+#define LOCAL_LABELS_FB		1
-+
-+struct avr32_relaxer
-+{
-+  int (*estimate_size)(fragS *, segT);
-+  long (*relax_frag)(segT, fragS *, long);
-+  void (*convert_frag)(bfd *, segT, fragS *);
-+};
-+
-+/* AVR32 has quite complex instruction coding, which means we need
-+ * lots of information in order to do the right thing during relaxing
-+ * (basically, we need to be able to reconstruct a whole new opcode if
-+ * necessary) */
-+#define TC_FRAG_TYPE struct avr32_frag_data
-+
-+struct cpool;
-+
-+struct avr32_frag_data
-+{
-+  /* TODO: Maybe add an expression object here so that we can use
-+     fix_new_exp() in md_convert_frag?  We may have to decide
-+     pcrel-ness in md_estimate_size_before_relax() as well...or we
-+     might do it when parsing.  Doing it while parsing may fail
-+     because the sub_symbol is undefined then... */
-+  int pcrel;
-+  int force_extended;
-+  int reloc_info;
-+  struct avr32_relaxer *relaxer;
-+  expressionS exp;
-+
-+  /* Points to associated constant pool, for use by LDA and CALL in
-+     non-pic mode, and when relaxing the .cpool directive */
-+  struct cpool *pool;
-+  unsigned int pool_entry;
-+};
-+
-+/* We will have to initialize the fields explicitly when needed */
-+#define TC_FRAG_INIT(fragP)
-+
-+#define md_estimate_size_before_relax(fragP, segT)			\
-+  ((fragP)->tc_frag_data.relaxer->estimate_size(fragP, segT))
-+#define md_relax_frag(segment, fragP, stretch)				\
-+  ((fragP)->tc_frag_data.relaxer->relax_frag(segment, fragP, stretch))
-+#define md_convert_frag(abfd, segment, fragP)				\
-+  ((fragP)->tc_frag_data.relaxer->convert_frag(abfd, segment, fragP))
-+
-+#define TC_FIX_TYPE struct avr32_fix_data
-+
-+struct avr32_fix_data
-+{
-+  const struct avr32_ifield *ifield;
-+  unsigned int align;
-+  long min;
-+  long max;
-+};
-+
-+#define TC_INIT_FIX_DATA(fixP)			\
-+  do						\
-+    {						\
-+      (fixP)->tc_fix_data.ifield = NULL;	\
-+      (fixP)->tc_fix_data.align = 0;		\
-+      (fixP)->tc_fix_data.min = 0;		\
-+      (fixP)->tc_fix_data.max = 0;		\
-+    }						\
-+  while (0)
-diff -Nur binutils-2.21.orig/gas/configure.tgt binutils-2.21/gas/configure.tgt
---- binutils-2.21.orig/gas/configure.tgt	2010-12-01 12:03:20.000000000 +0100
-+++ binutils-2.21/gas/configure.tgt	2011-08-28 14:56:20.077980239 +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 ;;
-+  avr32*)		cpu_type=avr32 endian=big ;;
-   bfin*)		cpu_type=bfin endian=little ;;
-   c4x*)			cpu_type=tic4x ;;
-   cr16*)		cpu_type=cr16 endian=little ;;
-@@ -136,6 +137,9 @@
- 
-   cr16-*-elf*)				fmt=elf ;;
- 
-+  avr32-*-linux*)			fmt=elf  em=linux bfd_gas=yes ;;
-+  avr32*)				fmt=elf  bfd_gas=yes ;;
-+
-   cris-*-linux-* | crisv32-*-linux-*)
- 					fmt=multi em=linux ;;
-   cris-*-* | crisv32-*-*)		fmt=multi ;;
-diff -Nur binutils-2.21.orig/gas/doc/all.texi binutils-2.21/gas/doc/all.texi
---- binutils-2.21.orig/gas/doc/all.texi	2010-03-25 22:12:28.000000000 +0100
-+++ binutils-2.21/gas/doc/all.texi	2011-08-28 14:56:20.127986906 +0200
-@@ -30,6 +30,7 @@
- @set ARC
- @set ARM
- @set AVR
-+@set AVR32
- @set Blackfin
- @set CR16
- @set CRIS
-diff -Nur binutils-2.21.orig/gas/doc/asconfig.texi binutils-2.21/gas/doc/asconfig.texi
---- binutils-2.21.orig/gas/doc/asconfig.texi	2010-12-08 09:39:08.000000000 +0100
-+++ binutils-2.21/gas/doc/asconfig.texi	2011-08-28 14:56:20.197982215 +0200
-@@ -30,6 +30,7 @@
- @set ARC
- @set ARM
- @set AVR
-+@set AVR32
- @set Blackfin
- @set CR16
- @set CRIS
-diff -Nur binutils-2.21.orig/gas/doc/as.texinfo binutils-2.21/gas/doc/as.texinfo
---- binutils-2.21.orig/gas/doc/as.texinfo	2010-11-02 15:36:36.000000000 +0100
-+++ binutils-2.21/gas/doc/as.texinfo	2011-08-28 14:56:20.217984394 +0200
-@@ -6865,6 +6865,9 @@
- @ifset AVR
- * AVR-Dependent::               AVR Dependent Features
- @end ifset
-+@ifset AVR32
-+* AVR32-Dependent::               AVR32 Dependent Features
-+@end ifset
- @ifset Blackfin
- * Blackfin-Dependent::		Blackfin Dependent Features
- @end ifset
-@@ -7006,6 +7009,10 @@
- @include c-avr.texi
- @end ifset
- 
-+@ifset AVR32
-+@include c-avr32.texi
-+@end ifset
-+
- @ifset Blackfin
- @include c-bfin.texi
- @end ifset
-diff -Nur binutils-2.21.orig/gas/doc/c-avr32.texi binutils-2.21/gas/doc/c-avr32.texi
---- binutils-2.21.orig/gas/doc/c-avr32.texi	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.21/gas/doc/c-avr32.texi	2011-08-28 14:56:20.277986487 +0200
-@@ -0,0 +1,244 @@
-+@c Copyright 2005, 2006, 2007, 2008, 2009
-+@c Atmel Corporation
-+@c This is part of the GAS manual.
-+@c For copying conditions, see the file as.texinfo.
-+
-+@ifset GENERIC
-+@page
-+@node AVR32-Dependent
-+@chapter AVR32 Dependent Features
-+@end ifset
-+
-+@ifclear GENERIC
-+@node Machine Dependencies
-+@chapter AVR32 Dependent Features
-+@end ifclear
-+
-+@cindex AVR32 support
-+@menu
-+* AVR32 Options::               Options
-+* AVR32 Syntax::                Syntax
-+* AVR32 Directives::            Directives
-+* AVR32 Opcodes::               Opcodes
-+@end menu
-+
-+@node AVR32 Options
-+@section Options
-+@cindex AVR32 options
-+@cindex options for AVR32
-+
-+@table @code
-+
-+@cindex @code{--pic} command line option, AVR32
-+@cindex PIC code generation for AVR32
-+@item --pic
-+This option specifies that the output of the assembler should be marked
-+as position-independent code (PIC).  It will also ensure that
-+pseudo-instructions that deal with address calculation are output as
-+PIC, and that all absolute address references in the code are marked as
-+such.
-+
-+@cindex @code{--linkrelax} command line option, AVR32
-+@item --linkrelax
-+This option specifies that the output of the assembler should be marked
-+as linker-relaxable.  It will also ensure that all PC-relative operands
-+that may change during linker relaxation get appropriate relocations.
-+
-+@end table
-+
-+
-+@node AVR32 Syntax
-+@section Syntax
-+@menu
-+* AVR32-Chars::              Special Characters
-+* AVR32-Symrefs::            Symbol references
-+@end menu
-+
-+@node AVR32-Chars
-+@subsection Special Characters
-+
-+@cindex line comment character, AVR32
-+@cindex AVR32 line comment character
-+The presence of a @samp{//} on a line indicates the start of a comment
-+that extends to the end of the current line.  If a @samp{#} appears as
-+the first character of a line, the whole line is treated as a comment.
-+
-+@cindex line separator, AVR32
-+@cindex statement separator, AVR32
-+@cindex AVR32 line separator
-+The @samp{;} character can be used instead of a newline to separate
-+statements.
-+
-+@node AVR32-Symrefs
-+@subsection Symbol references
-+
-+The absolute value of a symbol can be obtained by simply naming the
-+symbol.  However, as AVR32 symbols have 32-bit values, most symbols have
-+values that are outside the range of any instructions.
-+
-+Instructions that take a PC-relative offset, e.g. @code{lddpc} or
-+@code{rcall}, can also reference a symbol by simply naming the symbol
-+(no explicit calculations necessary).  In this case, the assembler or
-+linker subtracts the address of the instruction from the symbol's value
-+and inserts the result into the instruction.  Note that even though an
-+overflow is less likely to happen for a relative reference than for an
-+absolute reference, the assembler or linker will generate an error if
-+the referenced symbol is too far away from the current location.
-+
-+Relative references can be used for data as well.  For example:
-+
-+@smallexample
-+        lddpc   r0, 2f
-+1:      add     r0, pc
-+        ...
-+        .align  2
-+2:      .int    @var{some_symbol} - 1b
-+@end smallexample
-+
-+Here, r0 will end up with the run-time address of @var{some_symbol} even
-+if the program was loaded at a different address than it was linked
-+(position-independent code).
-+
-+@subsubsection Symbol modifiers
-+
-+@table @code
-+
-+@item @code{hi(@var{symbol})}
-+Evaluates to the value of the symbol shifted right 16 bits.  This will
-+work even if @var{symbol} is defined in a different module.
-+
-+@item @code{lo(@var{symbol})}
-+Evaluates to the low 16 bits of the symbol's value.  This will work even
-+if @var{symbol} is defined in a different module.
-+
-+@item @code{@var{symbol}@@got}
-+Create a GOT entry for @var{symbol} and return the offset of that entry
-+relative to the GOT base.
-+
-+@end table
-+
-+
-+@node AVR32 Directives
-+@section Directives
-+@cindex machine directives, AVR32
-+@cindex AVR32 directives
-+
-+@table @code
-+
-+@cindex @code{.cpool} directive, AVR32
-+@item .cpool
-+This directive causes the current contents of the constant pool to be
-+dumped into the current section at the current location (aligned to a
-+word boundary).  @code{GAS} maintains a separate constant pool for each
-+section and each sub-section.  The @code{.cpool} directive will only
-+affect the constant pool of the current section and sub-section.  At the
-+end of assembly, all remaining, non-empty constant pools will
-+automatically be dumped.
-+
-+@end table
-+
-+
-+@node AVR32 Opcodes
-+@section Opcodes
-+@cindex AVR32 opcodes
-+@cindex opcodes for AVR32
-+
-+@code{@value{AS}} implements all the standard AVR32 opcodes.  It also
-+implements several pseudo-opcodes, which are recommended to use wherever
-+possible because they give the tool chain better freedom to generate
-+optimal code.
-+
-+@table @code
-+
-+@cindex @code{LDA.W reg, symbol} pseudo op, AVR32
-+@item LDA.W
-+@smallexample
-+        lda.w   @var{reg}, @var{symbol}
-+@end smallexample
-+
-+This instruction will load the address of @var{symbol} into
-+@var{reg}. The instruction will evaluate to one of the following,
-+depending on the relative distance to the symbol, the relative distance
-+to the constant pool and whether the @code{--pic} option has been
-+specified. If the @code{--pic} option has not been specified, the
-+alternatives are as follows:
-+@smallexample
-+        /* @var{symbol} evaluates to a small enough value */
-+        mov     @var{reg}, @var{symbol}
-+
-+        /* (. - @var{symbol}) evaluates to a small enough value */
-+        sub     @var{reg}, pc, . - @var{symbol}
-+
-+        /* Constant pool is close enough */
-+        lddpc   @var{reg}, @var{cpent}
-+        ...
-+@var{cpent}:
-+        .long   @var{symbol}
-+
-+        /* Otherwise (not implemented yet, probably not necessary) */
-+        mov     @var{reg}, lo(@var{symbol})
-+        orh     @var{reg}, hi(@var{symbol})
-+@end smallexample
-+
-+If the @code{--pic} option has been specified, the alternatives are as
-+follows:
-+@smallexample
-+        /* (. - @var{symbol}) evaluates to a small enough value */
-+        sub     @var{reg}, pc, . - @var{symbol}
-+
-+        /* If @code{--linkrelax} not specified */
-+        ld.w    @var{reg}, r6[@var{symbol}@@got]
-+
-+        /* Otherwise */
-+        mov     @var{reg}, @var{symbol}@@got / 4
-+        ld.w    @var{reg}, r6[@var{reg} << 2]
-+@end smallexample
-+
-+If @var{symbol} is not defined in the same file and section as the
-+@code{LDA.W} instruction, the most pessimistic alternative of the
-+above is selected. The linker may convert it back into the most
-+optimal alternative when the final value of all symbols is known.
-+
-+@cindex @code{CALL symbol} pseudo op, AVR32
-+@item CALL
-+@smallexample
-+        call    @var{symbol}
-+@end smallexample
-+
-+This instruction will insert code to call the subroutine identified by
-+@var{symbol}. It will evaluate to one of the following, depending on
-+the relative distance to the symbol as well as the @code{--linkrelax}
-+and @code{--pic} command-line options.
-+
-+If @var{symbol} is defined in the same section and input file, and the
-+distance is small enough, an @code{rcall} instruction is inserted:
-+@smallexample
-+        rcall   @var{symbol}
-+@end smallexample
-+
-+Otherwise, if the @code{--pic} option has not been specified:
-+@smallexample
-+        mcall   @var{cpent}
-+        ...
-+@var{cpent}:
-+        .long   @var{symbol}
-+@end smallexample
-+
-+Finally, if nothing else fits and the @code{--pic} option has been
-+specified, the assembler will indirect the call through the Global
-+Offset Table:
-+@smallexample
-+        /* If @code{--linkrelax} not specified */
-+        mcall   r6[@var{symbol}@@got]
-+
-+        /* If @code{--linkrelax} specified */
-+        mov     lr, @var{symbol}@@got / 4
-+        ld.w    lr, r6[lr << 2]
-+        icall   lr
-+@end smallexample
-+
-+The linker, after determining the final value of @var{symbol}, may
-+convert any of these into more optimal alternatives. This includes
-+deleting any superfluous constant pool- and GOT-entries.
-+
-+@end table
-diff -Nur binutils-2.21.orig/gas/doc/Makefile.am binutils-2.21/gas/doc/Makefile.am
---- binutils-2.21.orig/gas/doc/Makefile.am	2010-03-25 22:12:28.000000000 +0100
-+++ binutils-2.21/gas/doc/Makefile.am	2011-08-28 14:56:20.317983310 +0200
-@@ -33,6 +33,7 @@
- 	c-arc.texi \
- 	c-arm.texi \
- 	c-avr.texi \
-+	c-avr32.texi \
- 	c-bfin.texi \
- 	c-cr16.texi \
- 	c-d10v.texi \
-diff -Nur binutils-2.21.orig/gas/Makefile.am binutils-2.21/gas/Makefile.am
---- binutils-2.21.orig/gas/Makefile.am	2010-07-04 16:35:53.000000000 +0200
-+++ binutils-2.21/gas/Makefile.am	2011-08-28 14:56:20.377984006 +0200
-@@ -111,6 +111,7 @@
- 	config/tc-arc.c \
- 	config/tc-arm.c \
- 	config/tc-avr.c \
-+	config/tc-avr32.c \
- 	config/tc-bfin.c \
- 	config/tc-cr16.c \
- 	config/tc-cris.c \
-@@ -175,6 +176,7 @@
- 	config/tc-arc.h \
- 	config/tc-arm.h \
- 	config/tc-avr.h \
-+	config/tc-avr32.h \
- 	config/tc-bfin.h \
- 	config/tc-cr16.h \
- 	config/tc-cris.h \
-diff -Nur binutils-2.21.orig/gas/Makefile.in binutils-2.21/gas/Makefile.in
---- binutils-2.21.orig/gas/Makefile.in	2010-11-05 11:33:35.000000000 +0100
-+++ binutils-2.21/gas/Makefile.in	2011-08-28 14:56:20.387980574 +0200
-@@ -378,6 +378,7 @@
- 	config/tc-arc.c \
- 	config/tc-arm.c \
- 	config/tc-avr.c \
-+	config/tc-avr32.c \
- 	config/tc-bfin.c \
- 	config/tc-cr16.c \
- 	config/tc-cris.c \
-@@ -442,6 +443,7 @@
- 	config/tc-arc.h \
- 	config/tc-arm.h \
- 	config/tc-avr.h \
-+	config/tc-avr32.h \
- 	config/tc-bfin.h \
- 	config/tc-cr16.h \
- 	config/tc-cris.h \
-@@ -785,6 +787,7 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-arc.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-arm.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-avr.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-avr32.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-bfin.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-cr16.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-cris.Po@am__quote@
-@@ -923,6 +926,20 @@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tc-avr.obj `if test -f 'config/tc-avr.c'; then $(CYGPATH_W) 'config/tc-avr.c'; else $(CYGPATH_W) '$(srcdir)/config/tc-avr.c'; fi`
- 
-+tc-avr32.o: config/tc-avr32.c
-+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tc-avr32.o -MD -MP -MF $(DEPDIR)/tc-avr32.Tpo -c -o tc-avr32.o `test -f 'config/tc-avr32.c' || echo '$(srcdir)/'`config/tc-avr32.c
-+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/tc-avr32.Tpo $(DEPDIR)/tc-avr32.Po
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='config/tc-avr32.c' object='tc-avr32.o' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tc-avr32.o `test -f 'config/tc-avr32.c' || echo '$(srcdir)/'`config/tc-avr32.c
-+
-+tc-avr32.obj: config/tc-avr32.c
-+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tc-avr32.obj -MD -MP -MF $(DEPDIR)/tc-avr32.Tpo -c -o tc-avr32.obj `if test -f 'config/tc-avr32.c'; then $(CYGPATH_W) 'config/tc-avr32.c'; else $(CYGPATH_W) '$(srcdir)/config/tc-avr32.c'; fi`
-+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/tc-avr32.Tpo $(DEPDIR)/tc-avr32.Po
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='config/tc-avr32.c' object='tc-avr32.obj' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tc-avr32.obj `if test -f 'config/tc-avr32.c'; then $(CYGPATH_W) 'config/tc-avr32.c'; else $(CYGPATH_W) '$(srcdir)/config/tc-avr32.c'; fi`
-+
- tc-bfin.o: config/tc-bfin.c
- @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tc-bfin.o -MD -MP -MF $(DEPDIR)/tc-bfin.Tpo -c -o tc-bfin.o `test -f 'config/tc-bfin.c' || echo '$(srcdir)/'`config/tc-bfin.c
- @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/tc-bfin.Tpo $(DEPDIR)/tc-bfin.Po
-diff -Nur binutils-2.21.orig/gas/testsuite/gas/avr32/aliases.d binutils-2.21/gas/testsuite/gas/avr32/aliases.d
---- binutils-2.21.orig/gas/testsuite/gas/avr32/aliases.d	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.21/gas/testsuite/gas/avr32/aliases.d	2011-08-28 14:56:20.457986372 +0200
-@@ -0,0 +1,19 @@
-+#as:
-+#objdump: -dr
-+#name: aliases
-+
-+.*: +file format .*
-+
-+Disassembly of section \.text:
-+
-+00000000 <ld_nodisp>:
-+   0:	19 80      [ \t]+ld\.ub r0,r12\[0x0\]
-+   2:	f9 20 00 00[ \t]+ld\.sb r0,r12\[0\]
-+   6:	98 80      [ \t]+ld\.uh r0,r12\[0x0\]
-+   8:	98 00      [ \t]+ld\.sh r0,r12\[0x0\]
-+   a:	78 00      [ \t]+ld\.w r0,r12\[0x0\]
-+
-+0000000c <st_nodisp>:
-+   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 -Nur binutils-2.21.orig/gas/testsuite/gas/avr32/aliases.s binutils-2.21/gas/testsuite/gas/avr32/aliases.s
---- binutils-2.21.orig/gas/testsuite/gas/avr32/aliases.s	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.21/gas/testsuite/gas/avr32/aliases.s	2011-08-28 14:56:20.537983220 +0200
-@@ -0,0 +1,14 @@
-+	.text
-+	.global	ld_nodisp
-+ld_nodisp:
-+	ld.ub	r0, r12
-+	ld.sb	r0, r12
-+	ld.uh	r0, r12
-+	ld.sh	r0, r12
-+	ld.w	r0, r12
-+
-+	.global st_nodisp
-+st_nodisp:
-+	st.b	r12, r0
-+	st.h	r12, r0
-+	st.w	r12, r0
-diff -Nur binutils-2.21.orig/gas/testsuite/gas/avr32/allinsn.d binutils-2.21/gas/testsuite/gas/avr32/allinsn.d
---- binutils-2.21.orig/gas/testsuite/gas/avr32/allinsn.d	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.21/gas/testsuite/gas/avr32/allinsn.d	2011-08-28 14:56:20.557986366 +0200
-@@ -0,0 +1,2987 @@
-+#as:
-+#objdump: -dr
-+#name: allinsn
-+
-+.*: +file format .*
-+
-+Disassembly of section \.text:
-+
-+[0-9a-f]* <ld_d5>:
-+ *[0-9a-f]*:	fe 0f 02 3e 	ld\.d lr,pc\[pc<<0x3\]
-+ *[0-9a-f]*:	e0 00 02 00 	ld\.d r0,r0\[r0\]
-+ *[0-9a-f]*:	ea 05 02 26 	ld\.d r6,r5\[r5<<0x2\]
-+ *[0-9a-f]*:	e8 04 02 14 	ld\.d r4,r4\[r4<<0x1\]
-+ *[0-9a-f]*:	fc 0e 02 1e 	ld\.d lr,lr\[lr<<0x1\]
-+ *[0-9a-f]*:	e6 0d 02 2a 	ld\.d r10,r3\[sp<<0x2\]
-+ *[0-9a-f]*:	f4 06 02 28 	ld\.d r8,r10\[r6<<0x2\]
-+ *[0-9a-f]*:	ee 09 02 02 	ld\.d r2,r7\[r9\]
-+
-+[0-9a-f]* <ld_w5>:
-+ *[0-9a-f]*:	fe 0f 03 0f 	ld\.w pc,pc\[pc\]
-+ *[0-9a-f]*:	f8 0c 03 3c 	ld\.w r12,r12\[r12<<0x3\]
-+ *[0-9a-f]*:	ea 05 03 25 	ld\.w r5,r5\[r5<<0x2\]
-+ *[0-9a-f]*:	e8 04 03 14 	ld\.w r4,r4\[r4<<0x1\]
-+ *[0-9a-f]*:	fc 0e 03 1e 	ld\.w lr,lr\[lr<<0x1\]
-+ *[0-9a-f]*:	f2 09 03 02 	ld\.w r2,r9\[r9\]
-+ *[0-9a-f]*:	e4 06 03 0b 	ld\.w r11,r2\[r6\]
-+ *[0-9a-f]*:	e4 0d 03 30 	ld\.w r0,r2\[sp<<0x3\]
-+
-+[0-9a-f]* <ld_sh5>:
-+ *[0-9a-f]*:	fe 0f 04 0f 	ld\.sh pc,pc\[pc\]
-+ *[0-9a-f]*:	f8 0c 04 3c 	ld\.sh r12,r12\[r12<<0x3\]
-+ *[0-9a-f]*:	ea 05 04 25 	ld\.sh r5,r5\[r5<<0x2\]
-+ *[0-9a-f]*:	e8 04 04 14 	ld\.sh r4,r4\[r4<<0x1\]
-+ *[0-9a-f]*:	fc 0e 04 1e 	ld\.sh lr,lr\[lr<<0x1\]
-+ *[0-9a-f]*:	e0 0f 04 2b 	ld\.sh r11,r0\[pc<<0x2\]
-+ *[0-9a-f]*:	fa 06 04 2a 	ld\.sh r10,sp\[r6<<0x2\]
-+ *[0-9a-f]*:	e4 02 04 0c 	ld\.sh r12,r2\[r2\]
-+
-+[0-9a-f]* <ld_uh5>:
-+ *[0-9a-f]*:	fe 0f 05 0f 	ld\.uh pc,pc\[pc\]
-+ *[0-9a-f]*:	f8 0c 05 3c 	ld\.uh r12,r12\[r12<<0x3\]
-+ *[0-9a-f]*:	ea 05 05 25 	ld\.uh r5,r5\[r5<<0x2\]
-+ *[0-9a-f]*:	e8 04 05 14 	ld\.uh r4,r4\[r4<<0x1\]
-+ *[0-9a-f]*:	fc 0e 05 1e 	ld\.uh lr,lr\[lr<<0x1\]
-+ *[0-9a-f]*:	fe 0e 05 38 	ld\.uh r8,pc\[lr<<0x3\]
-+ *[0-9a-f]*:	e2 0f 05 16 	ld\.uh r6,r1\[pc<<0x1\]
-+ *[0-9a-f]*:	fc 0d 05 16 	ld\.uh r6,lr\[sp<<0x1\]
-+
-+[0-9a-f]* <ld_sb2>:
-+ *[0-9a-f]*:	fe 0f 06 0f 	ld\.sb pc,pc\[pc\]
-+ *[0-9a-f]*:	f8 0c 06 3c 	ld\.sb r12,r12\[r12<<0x3\]
-+ *[0-9a-f]*:	ea 05 06 25 	ld\.sb r5,r5\[r5<<0x2\]
-+ *[0-9a-f]*:	e8 04 06 14 	ld\.sb r4,r4\[r4<<0x1\]
-+ *[0-9a-f]*:	fc 0e 06 1e 	ld\.sb lr,lr\[lr<<0x1\]
-+ *[0-9a-f]*:	e2 0f 06 39 	ld\.sb r9,r1\[pc<<0x3\]
-+ *[0-9a-f]*:	e6 0b 06 10 	ld\.sb r0,r3\[r11<<0x1\]
-+ *[0-9a-f]*:	ea 05 06 1a 	ld\.sb r10,r5\[r5<<0x1\]
-+
-+[0-9a-f]* <ld_ub5>:
-+ *[0-9a-f]*:	fe 0f 07 0f 	ld\.ub pc,pc\[pc\]
-+ *[0-9a-f]*:	f8 0c 07 3c 	ld\.ub r12,r12\[r12<<0x3\]
-+ *[0-9a-f]*:	ea 05 07 25 	ld\.ub r5,r5\[r5<<0x2\]
-+ *[0-9a-f]*:	e8 04 07 14 	ld\.ub r4,r4\[r4<<0x1\]
-+ *[0-9a-f]*:	fc 0e 07 1e 	ld\.ub lr,lr\[lr<<0x1\]
-+ *[0-9a-f]*:	f8 07 07 36 	ld\.ub r6,r12\[r7<<0x3\]
-+ *[0-9a-f]*:	ec 0c 07 02 	ld\.ub r2,r6\[r12\]
-+ *[0-9a-f]*:	ee 0b 07 10 	ld\.ub r0,r7\[r11<<0x1\]
-+
-+[0-9a-f]* <st_d5>:
-+ *[0-9a-f]*:	fe 0f 08 0e 	st\.d pc\[pc\],lr
-+ *[0-9a-f]*:	f8 0c 08 3c 	st\.d r12\[r12<<0x3\],r12
-+ *[0-9a-f]*:	ea 05 08 26 	st\.d r5\[r5<<0x2\],r6
-+ *[0-9a-f]*:	e8 04 08 14 	st\.d r4\[r4<<0x1\],r4
-+ *[0-9a-f]*:	fc 0e 08 1e 	st\.d lr\[lr<<0x1\],lr
-+ *[0-9a-f]*:	e2 09 08 14 	st\.d r1\[r9<<0x1\],r4
-+ *[0-9a-f]*:	f4 02 08 14 	st\.d r10\[r2<<0x1\],r4
-+ *[0-9a-f]*:	f8 06 08 0e 	st\.d r12\[r6\],lr
-+
-+[0-9a-f]* <st_w5>:
-+ *[0-9a-f]*:	fe 0f 09 0f 	st\.w pc\[pc\],pc
-+ *[0-9a-f]*:	f8 0c 09 3c 	st\.w r12\[r12<<0x3\],r12
-+ *[0-9a-f]*:	ea 05 09 25 	st\.w r5\[r5<<0x2\],r5
-+ *[0-9a-f]*:	e8 04 09 14 	st\.w r4\[r4<<0x1\],r4
-+ *[0-9a-f]*:	fc 0e 09 1e 	st\.w lr\[lr<<0x1\],lr
-+ *[0-9a-f]*:	e2 0a 09 03 	st\.w r1\[r10\],r3
-+ *[0-9a-f]*:	e0 0a 09 19 	st\.w r0\[r10<<0x1\],r9
-+ *[0-9a-f]*:	e8 05 09 3f 	st\.w r4\[r5<<0x3\],pc
-+
-+[0-9a-f]* <st_h5>:
-+ *[0-9a-f]*:	fe 0f 0a 0f 	st\.h pc\[pc\],pc
-+ *[0-9a-f]*:	f8 0c 0a 3c 	st\.h r12\[r12<<0x3\],r12
-+ *[0-9a-f]*:	ea 05 0a 25 	st\.h r5\[r5<<0x2\],r5
-+ *[0-9a-f]*:	e8 04 0a 14 	st\.h r4\[r4<<0x1\],r4
-+ *[0-9a-f]*:	fc 0e 0a 1e 	st\.h lr\[lr<<0x1\],lr
-+ *[0-9a-f]*:	e4 09 0a 0b 	st\.h r2\[r9\],r11
-+ *[0-9a-f]*:	ea 01 0a 2c 	st\.h r5\[r1<<0x2\],r12
-+ *[0-9a-f]*:	fe 08 0a 23 	st\.h pc\[r8<<0x2\],r3
-+
-+[0-9a-f]* <st_b5>:
-+ *[0-9a-f]*:	fe 0f 0b 0f 	st\.b pc\[pc\],pc
-+ *[0-9a-f]*:	f8 0c 0b 3c 	st\.b r12\[r12<<0x3\],r12
-+ *[0-9a-f]*:	ea 05 0b 25 	st\.b r5\[r5<<0x2\],r5
-+ *[0-9a-f]*:	e8 04 0b 14 	st\.b r4\[r4<<0x1\],r4
-+ *[0-9a-f]*:	fc 0e 0b 1e 	st\.b lr\[lr<<0x1\],lr
-+ *[0-9a-f]*:	e2 08 0b 16 	st\.b r1\[r8<<0x1\],r6
-+ *[0-9a-f]*:	fc 0e 0b 31 	st\.b lr\[lr<<0x3\],r1
-+ *[0-9a-f]*:	ea 00 0b 2f 	st\.b r5\[r0<<0x2\],pc
-+
-+[0-9a-f]* <divs>:
-+ *[0-9a-f]*:	fe 0f 0c 0f 	divs pc,pc,pc
-+ *[0-9a-f]*:	f8 0c 0c 0c 	divs r12,r12,r12
-+ *[0-9a-f]*:	ea 05 0c 05 	divs r5,r5,r5
-+ *[0-9a-f]*:	e8 04 0c 04 	divs r4,r4,r4
-+ *[0-9a-f]*:	fc 0e 0c 0e 	divs lr,lr,lr
-+ *[0-9a-f]*:	fe 0f 0c 03 	divs r3,pc,pc
-+ *[0-9a-f]*:	f8 02 0c 09 	divs r9,r12,r2
-+ *[0-9a-f]*:	e8 01 0c 07 	divs r7,r4,r1
-+
-+[0-9a-f]* <add1>:
-+ *[0-9a-f]*:	1e 0f       	add pc,pc
-+ *[0-9a-f]*:	18 0c       	add r12,r12
-+ *[0-9a-f]*:	0a 05       	add r5,r5
-+ *[0-9a-f]*:	08 04       	add r4,r4
-+ *[0-9a-f]*:	1c 0e       	add lr,lr
-+ *[0-9a-f]*:	12 0c       	add r12,r9
-+ *[0-9a-f]*:	06 06       	add r6,r3
-+ *[0-9a-f]*:	18 0a       	add r10,r12
-+
-+[0-9a-f]* <sub1>:
-+ *[0-9a-f]*:	1e 1f       	sub pc,pc
-+ *[0-9a-f]*:	18 1c       	sub r12,r12
-+ *[0-9a-f]*:	0a 15       	sub r5,r5
-+ *[0-9a-f]*:	08 14       	sub r4,r4
-+ *[0-9a-f]*:	1c 1e       	sub lr,lr
-+ *[0-9a-f]*:	0c 1e       	sub lr,r6
-+ *[0-9a-f]*:	1a 10       	sub r0,sp
-+ *[0-9a-f]*:	18 16       	sub r6,r12
-+
-+[0-9a-f]* <rsub1>:
-+ *[0-9a-f]*:	1e 2f       	rsub pc,pc
-+ *[0-9a-f]*:	18 2c       	rsub r12,r12
-+ *[0-9a-f]*:	0a 25       	rsub r5,r5
-+ *[0-9a-f]*:	08 24       	rsub r4,r4
-+ *[0-9a-f]*:	1c 2e       	rsub lr,lr
-+ *[0-9a-f]*:	1a 2b       	rsub r11,sp
-+ *[0-9a-f]*:	08 27       	rsub r7,r4
-+ *[0-9a-f]*:	02 29       	rsub r9,r1
-+
-+[0-9a-f]* <cp1>:
-+ *[0-9a-f]*:	1e 3f       	cp\.w pc,pc
-+ *[0-9a-f]*:	18 3c       	cp\.w r12,r12
-+ *[0-9a-f]*:	0a 35       	cp\.w r5,r5
-+ *[0-9a-f]*:	08 34       	cp\.w r4,r4
-+ *[0-9a-f]*:	1c 3e       	cp\.w lr,lr
-+ *[0-9a-f]*:	04 36       	cp\.w r6,r2
-+ *[0-9a-f]*:	12 30       	cp\.w r0,r9
-+ *[0-9a-f]*:	1a 33       	cp\.w r3,sp
-+
-+[0-9a-f]* <or1>:
-+ *[0-9a-f]*:	1e 4f       	or pc,pc
-+ *[0-9a-f]*:	18 4c       	or r12,r12
-+ *[0-9a-f]*:	0a 45       	or r5,r5
-+ *[0-9a-f]*:	08 44       	or r4,r4
-+ *[0-9a-f]*:	1c 4e       	or lr,lr
-+ *[0-9a-f]*:	12 44       	or r4,r9
-+ *[0-9a-f]*:	08 4b       	or r11,r4
-+ *[0-9a-f]*:	00 44       	or r4,r0
-+
-+[0-9a-f]* <eor1>:
-+ *[0-9a-f]*:	1e 5f       	eor pc,pc
-+ *[0-9a-f]*:	18 5c       	eor r12,r12
-+ *[0-9a-f]*:	0a 55       	eor r5,r5
-+ *[0-9a-f]*:	08 54       	eor r4,r4
-+ *[0-9a-f]*:	1c 5e       	eor lr,lr
-+ *[0-9a-f]*:	16 5c       	eor r12,r11
-+ *[0-9a-f]*:	02 50       	eor r0,r1
-+ *[0-9a-f]*:	1e 55       	eor r5,pc
-+
-+[0-9a-f]* <and1>:
-+ *[0-9a-f]*:	1e 6f       	and pc,pc
-+ *[0-9a-f]*:	18 6c       	and r12,r12
-+ *[0-9a-f]*:	0a 65       	and r5,r5
-+ *[0-9a-f]*:	08 64       	and r4,r4
-+ *[0-9a-f]*:	1c 6e       	and lr,lr
-+ *[0-9a-f]*:	02 68       	and r8,r1
-+ *[0-9a-f]*:	1a 60       	and r0,sp
-+ *[0-9a-f]*:	0a 6a       	and r10,r5
-+
-+[0-9a-f]* <tst>:
-+ *[0-9a-f]*:	1e 7f       	tst pc,pc
-+ *[0-9a-f]*:	18 7c       	tst r12,r12
-+ *[0-9a-f]*:	0a 75       	tst r5,r5
-+ *[0-9a-f]*:	08 74       	tst r4,r4
-+ *[0-9a-f]*:	1c 7e       	tst lr,lr
-+ *[0-9a-f]*:	18 70       	tst r0,r12
-+ *[0-9a-f]*:	0c 7a       	tst r10,r6
-+ *[0-9a-f]*:	08 7d       	tst sp,r4
-+
-+[0-9a-f]* <andn>:
-+ *[0-9a-f]*:	1e 8f       	andn pc,pc
-+ *[0-9a-f]*:	18 8c       	andn r12,r12
-+ *[0-9a-f]*:	0a 85       	andn r5,r5
-+ *[0-9a-f]*:	08 84       	andn r4,r4
-+ *[0-9a-f]*:	1c 8e       	andn lr,lr
-+ *[0-9a-f]*:	18 89       	andn r9,r12
-+ *[0-9a-f]*:	1a 8b       	andn r11,sp
-+ *[0-9a-f]*:	0a 8c       	andn r12,r5
-+
-+[0-9a-f]* <mov3>:
-+ *[0-9a-f]*:	1e 9f       	mov pc,pc
-+ *[0-9a-f]*:	18 9c       	mov r12,r12
-+ *[0-9a-f]*:	0a 95       	mov r5,r5
-+ *[0-9a-f]*:	08 94       	mov r4,r4
-+ *[0-9a-f]*:	1c 9e       	mov lr,lr
-+ *[0-9a-f]*:	12 95       	mov r5,r9
-+ *[0-9a-f]*:	16 9b       	mov r11,r11
-+ *[0-9a-f]*:	1c 92       	mov r2,lr
-+
-+[0-9a-f]* <st_w1>:
-+ *[0-9a-f]*:	1e af       	st\.w pc\+\+,pc
-+ *[0-9a-f]*:	18 ac       	st\.w r12\+\+,r12
-+ *[0-9a-f]*:	0a a5       	st\.w r5\+\+,r5
-+ *[0-9a-f]*:	08 a4       	st\.w r4\+\+,r4
-+ *[0-9a-f]*:	1c ae       	st\.w lr\+\+,lr
-+ *[0-9a-f]*:	02 ab       	st\.w r1\+\+,r11
-+ *[0-9a-f]*:	1a a0       	st\.w sp\+\+,r0
-+ *[0-9a-f]*:	1a a1       	st\.w sp\+\+,r1
-+
-+[0-9a-f]* <st_h1>:
-+ *[0-9a-f]*:	1e bf       	st\.h pc\+\+,pc
-+ *[0-9a-f]*:	18 bc       	st\.h r12\+\+,r12
-+ *[0-9a-f]*:	0a b5       	st\.h r5\+\+,r5
-+ *[0-9a-f]*:	08 b4       	st\.h r4\+\+,r4
-+ *[0-9a-f]*:	1c be       	st\.h lr\+\+,lr
-+ *[0-9a-f]*:	18 bd       	st\.h r12\+\+,sp
-+ *[0-9a-f]*:	0e be       	st\.h r7\+\+,lr
-+ *[0-9a-f]*:	0e b4       	st\.h r7\+\+,r4
-+
-+[0-9a-f]* <st_b1>:
-+ *[0-9a-f]*:	1e cf       	st\.b pc\+\+,pc
-+ *[0-9a-f]*:	18 cc       	st\.b r12\+\+,r12
-+ *[0-9a-f]*:	0a c5       	st\.b r5\+\+,r5
-+ *[0-9a-f]*:	08 c4       	st\.b r4\+\+,r4
-+ *[0-9a-f]*:	1c ce       	st\.b lr\+\+,lr
-+ *[0-9a-f]*:	12 cd       	st\.b r9\+\+,sp
-+ *[0-9a-f]*:	02 cd       	st\.b r1\+\+,sp
-+ *[0-9a-f]*:	00 c4       	st\.b r0\+\+,r4
-+
-+[0-9a-f]* <st_w2>:
-+ *[0-9a-f]*:	1e df       	st\.w --pc,pc
-+ *[0-9a-f]*:	18 dc       	st\.w --r12,r12
-+ *[0-9a-f]*:	0a d5       	st\.w --r5,r5
-+ *[0-9a-f]*:	08 d4       	st\.w --r4,r4
-+ *[0-9a-f]*:	1c de       	st\.w --lr,lr
-+ *[0-9a-f]*:	02 d7       	st\.w --r1,r7
-+ *[0-9a-f]*:	06 d9       	st\.w --r3,r9
-+ *[0-9a-f]*:	0a d5       	st\.w --r5,r5
-+
-+[0-9a-f]* <st_h2>:
-+ *[0-9a-f]*:	1e ef       	st\.h --pc,pc
-+ *[0-9a-f]*:	18 ec       	st\.h --r12,r12
-+ *[0-9a-f]*:	0a e5       	st\.h --r5,r5
-+ *[0-9a-f]*:	08 e4       	st\.h --r4,r4
-+ *[0-9a-f]*:	1c ee       	st\.h --lr,lr
-+ *[0-9a-f]*:	0a e7       	st\.h --r5,r7
-+ *[0-9a-f]*:	10 e8       	st\.h --r8,r8
-+ *[0-9a-f]*:	0e e2       	st\.h --r7,r2
-+
-+[0-9a-f]* <st_b2>:
-+ *[0-9a-f]*:	1e ff       	st\.b --pc,pc
-+ *[0-9a-f]*:	18 fc       	st\.b --r12,r12
-+ *[0-9a-f]*:	0a f5       	st\.b --r5,r5
-+ *[0-9a-f]*:	08 f4       	st\.b --r4,r4
-+ *[0-9a-f]*:	1c fe       	st\.b --lr,lr
-+ *[0-9a-f]*:	1a fd       	st\.b --sp,sp
-+ *[0-9a-f]*:	1a fb       	st\.b --sp,r11
-+ *[0-9a-f]*:	08 f5       	st\.b --r4,r5
-+
-+[0-9a-f]* <ld_w1>:
-+ *[0-9a-f]*:	1f 0f       	ld\.w pc,pc\+\+
-+ *[0-9a-f]*:	19 0c       	ld\.w r12,r12\+\+
-+ *[0-9a-f]*:	0b 05       	ld\.w r5,r5\+\+
-+ *[0-9a-f]*:	09 04       	ld\.w r4,r4\+\+
-+ *[0-9a-f]*:	1d 0e       	ld\.w lr,lr\+\+
-+ *[0-9a-f]*:	0f 03       	ld\.w r3,r7\+\+
-+ *[0-9a-f]*:	1d 03       	ld\.w r3,lr\+\+
-+ *[0-9a-f]*:	0b 0c       	ld\.w r12,r5\+\+
-+
-+[0-9a-f]* <ld_sh1>:
-+ *[0-9a-f]*:	1f 1f       	ld\.sh pc,pc\+\+
-+ *[0-9a-f]*:	19 1c       	ld\.sh r12,r12\+\+
-+ *[0-9a-f]*:	0b 15       	ld\.sh r5,r5\+\+
-+ *[0-9a-f]*:	09 14       	ld\.sh r4,r4\+\+
-+ *[0-9a-f]*:	1d 1e       	ld\.sh lr,lr\+\+
-+ *[0-9a-f]*:	05 1b       	ld\.sh r11,r2\+\+
-+ *[0-9a-f]*:	11 12       	ld\.sh r2,r8\+\+
-+ *[0-9a-f]*:	0d 17       	ld\.sh r7,r6\+\+
-+
-+[0-9a-f]* <ld_uh1>:
-+ *[0-9a-f]*:	1f 2f       	ld\.uh pc,pc\+\+
-+ *[0-9a-f]*:	19 2c       	ld\.uh r12,r12\+\+
-+ *[0-9a-f]*:	0b 25       	ld\.uh r5,r5\+\+
-+ *[0-9a-f]*:	09 24       	ld\.uh r4,r4\+\+
-+ *[0-9a-f]*:	1d 2e       	ld\.uh lr,lr\+\+
-+ *[0-9a-f]*:	0f 26       	ld\.uh r6,r7\+\+
-+ *[0-9a-f]*:	17 2a       	ld\.uh r10,r11\+\+
-+ *[0-9a-f]*:	09 2e       	ld\.uh lr,r4\+\+
-+
-+[0-9a-f]* <ld_ub1>:
-+ *[0-9a-f]*:	1f 3f       	ld\.ub pc,pc\+\+
-+ *[0-9a-f]*:	19 3c       	ld\.ub r12,r12\+\+
-+ *[0-9a-f]*:	0b 35       	ld\.ub r5,r5\+\+
-+ *[0-9a-f]*:	09 34       	ld\.ub r4,r4\+\+
-+ *[0-9a-f]*:	1d 3e       	ld\.ub lr,lr\+\+
-+ *[0-9a-f]*:	1d 38       	ld\.ub r8,lr\+\+
-+ *[0-9a-f]*:	19 3c       	ld\.ub r12,r12\+\+
-+ *[0-9a-f]*:	15 3b       	ld\.ub r11,r10\+\+
-+
-+[0-9a-f]* <ld_w2>:
-+ *[0-9a-f]*:	1f 4f       	ld\.w pc,--pc
-+ *[0-9a-f]*:	19 4c       	ld\.w r12,--r12
-+ *[0-9a-f]*:	0b 45       	ld\.w r5,--r5
-+ *[0-9a-f]*:	09 44       	ld\.w r4,--r4
-+ *[0-9a-f]*:	1d 4e       	ld\.w lr,--lr
-+ *[0-9a-f]*:	1d 4a       	ld\.w r10,--lr
-+ *[0-9a-f]*:	13 4c       	ld\.w r12,--r9
-+ *[0-9a-f]*:	0b 46       	ld\.w r6,--r5
-+
-+[0-9a-f]* <ld_sh2>:
-+ *[0-9a-f]*:	1f 5f       	ld\.sh pc,--pc
-+ *[0-9a-f]*:	19 5c       	ld\.sh r12,--r12
-+ *[0-9a-f]*:	0b 55       	ld\.sh r5,--r5
-+ *[0-9a-f]*:	09 54       	ld\.sh r4,--r4
-+ *[0-9a-f]*:	1d 5e       	ld\.sh lr,--lr
-+ *[0-9a-f]*:	15 5f       	ld\.sh pc,--r10
-+ *[0-9a-f]*:	07 56       	ld\.sh r6,--r3
-+ *[0-9a-f]*:	0d 54       	ld\.sh r4,--r6
-+
-+[0-9a-f]* <ld_uh2>:
-+ *[0-9a-f]*:	1f 6f       	ld\.uh pc,--pc
-+ *[0-9a-f]*:	19 6c       	ld\.uh r12,--r12
-+ *[0-9a-f]*:	0b 65       	ld\.uh r5,--r5
-+ *[0-9a-f]*:	09 64       	ld\.uh r4,--r4
-+ *[0-9a-f]*:	1d 6e       	ld\.uh lr,--lr
-+ *[0-9a-f]*:	05 63       	ld\.uh r3,--r2
-+ *[0-9a-f]*:	01 61       	ld\.uh r1,--r0
-+ *[0-9a-f]*:	13 62       	ld\.uh r2,--r9
-+
-+[0-9a-f]* <ld_ub2>:
-+ *[0-9a-f]*:	1f 7f       	ld\.ub pc,--pc
-+ *[0-9a-f]*:	19 7c       	ld\.ub r12,--r12
-+ *[0-9a-f]*:	0b 75       	ld\.ub r5,--r5
-+ *[0-9a-f]*:	09 74       	ld\.ub r4,--r4
-+ *[0-9a-f]*:	1d 7e       	ld\.ub lr,--lr
-+ *[0-9a-f]*:	03 71       	ld\.ub r1,--r1
-+ *[0-9a-f]*:	0d 70       	ld\.ub r0,--r6
-+ *[0-9a-f]*:	0f 72       	ld\.ub r2,--r7
-+
-+[0-9a-f]* <ld_ub3>:
-+ *[0-9a-f]*:	1f 8f       	ld\.ub pc,pc\[0x0\]
-+ *[0-9a-f]*:	19 fc       	ld\.ub r12,r12\[0x7\]
-+ *[0-9a-f]*:	0b c5       	ld\.ub r5,r5\[0x4\]
-+ *[0-9a-f]*:	09 b4       	ld\.ub r4,r4\[0x3\]
-+ *[0-9a-f]*:	1d 9e       	ld\.ub lr,lr\[0x1\]
-+ *[0-9a-f]*:	13 e6       	ld\.ub r6,r9\[0x6\]
-+ *[0-9a-f]*:	1d c2       	ld\.ub r2,lr\[0x4\]
-+ *[0-9a-f]*:	11 81       	ld\.ub r1,r8\[0x0\]
-+
-+[0-9a-f]* <sub3_sp>:
-+ *[0-9a-f]*:	20 0d       	sub sp,0
-+ *[0-9a-f]*:	2f fd       	sub sp,-4
-+ *[0-9a-f]*:	28 0d       	sub sp,-512
-+ *[0-9a-f]*:	27 fd       	sub sp,508
-+ *[0-9a-f]*:	20 1d       	sub sp,4
-+ *[0-9a-f]*:	20 bd       	sub sp,44
-+ *[0-9a-f]*:	20 2d       	sub sp,8
-+ *[0-9a-f]*:	25 7d       	sub sp,348
-+
-+[0-9a-f]* <sub3>:
-+ *[0-9a-f]*:	20 0f       	sub pc,0
-+ *[0-9a-f]*:	2f fc       	sub r12,-1
-+ *[0-9a-f]*:	28 05       	sub r5,-128
-+ *[0-9a-f]*:	27 f4       	sub r4,127
-+ *[0-9a-f]*:	20 1e       	sub lr,1
-+ *[0-9a-f]*:	2d 76       	sub r6,-41
-+ *[0-9a-f]*:	22 54       	sub r4,37
-+ *[0-9a-f]*:	23 8c       	sub r12,56
-+
-+[0-9a-f]* <mov1>:
-+ *[0-9a-f]*:	30 0f       	mov pc,0
-+ *[0-9a-f]*:	3f fc       	mov r12,-1
-+ *[0-9a-f]*:	38 05       	mov r5,-128
-+ *[0-9a-f]*:	37 f4       	mov r4,127
-+ *[0-9a-f]*:	30 1e       	mov lr,1
-+ *[0-9a-f]*:	30 ef       	mov pc,14
-+ *[0-9a-f]*:	39 c6       	mov r6,-100
-+ *[0-9a-f]*:	38 6e       	mov lr,-122
-+
-+[0-9a-f]* <lddsp>:
-+ *[0-9a-f]*:	40 0f       	lddsp pc,sp\[0x0\]
-+ *[0-9a-f]*:	47 fc       	lddsp r12,sp\[0x1fc\]
-+ *[0-9a-f]*:	44 05       	lddsp r5,sp\[0x100\]
-+ *[0-9a-f]*:	43 f4       	lddsp r4,sp\[0xfc\]
-+ *[0-9a-f]*:	40 1e       	lddsp lr,sp\[0x4\]
-+ *[0-9a-f]*:	44 0e       	lddsp lr,sp\[0x100\]
-+ *[0-9a-f]*:	40 5c       	lddsp r12,sp\[0x14\]
-+ *[0-9a-f]*:	47 69       	lddsp r9,sp\[0x1d8\]
-+
-+[0-9a-f]* <lddpc>:
-+ *[0-9a-f]*:	48 0f       	lddpc pc,[0-9a-f]* <.*>
-+ *[0-9a-f]*:	4f f0       	lddpc r0,[0-9a-f]* <.*>
-+ *[0-9a-f]*:	4c 08       	lddpc r8,[0-9a-f]* <.*>
-+ *[0-9a-f]*:	4b f7       	lddpc r7,[0-9a-f]* <.*>
-+ *[0-9a-f]*:	48 1e       	lddpc lr,[0-9a-f]* <.*>
-+ *[0-9a-f]*:	4f 6d       	lddpc sp,[0-9a-f]* <.*>
-+ *[0-9a-f]*:	49 e6       	lddpc r6,[0-9a-f]* <.*>
-+ *[0-9a-f]*:	48 7b       	lddpc r11,[0-9a-f]* <.*>
-+
-+[0-9a-f]* <stdsp>:
-+ *[0-9a-f]*:	50 0f       	stdsp sp\[0x0\],pc
-+ *[0-9a-f]*:	57 fc       	stdsp sp\[0x1fc\],r12
-+ *[0-9a-f]*:	54 05       	stdsp sp\[0x100\],r5
-+ *[0-9a-f]*:	53 f4       	stdsp sp\[0xfc\],r4
-+ *[0-9a-f]*:	50 1e       	stdsp sp\[0x4\],lr
-+ *[0-9a-f]*:	54 cf       	stdsp sp\[0x130\],pc
-+ *[0-9a-f]*:	54 00       	stdsp sp\[0x100\],r0
-+ *[0-9a-f]*:	55 45       	stdsp sp\[0x150\],r5
-+
-+[0-9a-f]* <cp2>:
-+ *[0-9a-f]*:	58 0f       	cp.w pc,0
-+ *[0-9a-f]*:	5b fc       	cp.w r12,-1
-+ *[0-9a-f]*:	5a 05       	cp.w r5,-32
-+ *[0-9a-f]*:	59 f4       	cp.w r4,31
-+ *[0-9a-f]*:	58 1e       	cp.w lr,1
-+ *[0-9a-f]*:	58 38       	cp.w r8,3
-+ *[0-9a-f]*:	59 0e       	cp.w lr,16
-+ *[0-9a-f]*:	5a 67       	cp.w r7,-26
-+
-+[0-9a-f]* <acr>:
-+ *[0-9a-f]*:	5c 0f       	acr pc
-+ *[0-9a-f]*:	5c 0c       	acr r12
-+ *[0-9a-f]*:	5c 05       	acr r5
-+ *[0-9a-f]*:	5c 04       	acr r4
-+ *[0-9a-f]*:	5c 0e       	acr lr
-+ *[0-9a-f]*:	5c 02       	acr r2
-+ *[0-9a-f]*:	5c 0c       	acr r12
-+ *[0-9a-f]*:	5c 0f       	acr pc
-+
-+[0-9a-f]* <scr>:
-+ *[0-9a-f]*:	5c 1f       	scr pc
-+ *[0-9a-f]*:	5c 1c       	scr r12
-+ *[0-9a-f]*:	5c 15       	scr r5
-+ *[0-9a-f]*:	5c 14       	scr r4
-+ *[0-9a-f]*:	5c 1e       	scr lr
-+ *[0-9a-f]*:	5c 1f       	scr pc
-+ *[0-9a-f]*:	5c 16       	scr r6
-+ *[0-9a-f]*:	5c 11       	scr r1
-+
-+[0-9a-f]* <cpc0>:
-+ *[0-9a-f]*:	5c 2f       	cpc pc
-+ *[0-9a-f]*:	5c 2c       	cpc r12
-+ *[0-9a-f]*:	5c 25       	cpc r5
-+ *[0-9a-f]*:	5c 24       	cpc r4
-+ *[0-9a-f]*:	5c 2e       	cpc lr
-+ *[0-9a-f]*:	5c 2f       	cpc pc
-+ *[0-9a-f]*:	5c 24       	cpc r4
-+ *[0-9a-f]*:	5c 29       	cpc r9
-+
-+[0-9a-f]* <neg>:
-+ *[0-9a-f]*:	5c 3f       	neg pc
-+ *[0-9a-f]*:	5c 3c       	neg r12
-+ *[0-9a-f]*:	5c 35       	neg r5
-+ *[0-9a-f]*:	5c 34       	neg r4
-+ *[0-9a-f]*:	5c 3e       	neg lr
-+ *[0-9a-f]*:	5c 37       	neg r7
-+ *[0-9a-f]*:	5c 31       	neg r1
-+ *[0-9a-f]*:	5c 39       	neg r9
-+
-+[0-9a-f]* <abs>:
-+ *[0-9a-f]*:	5c 4f       	abs pc
-+ *[0-9a-f]*:	5c 4c       	abs r12
-+ *[0-9a-f]*:	5c 45       	abs r5
-+ *[0-9a-f]*:	5c 44       	abs r4
-+ *[0-9a-f]*:	5c 4e       	abs lr
-+ *[0-9a-f]*:	5c 46       	abs r6
-+ *[0-9a-f]*:	5c 46       	abs r6
-+ *[0-9a-f]*:	5c 44       	abs r4
-+
-+[0-9a-f]* <castu_b>:
-+ *[0-9a-f]*:	5c 5f       	castu\.b pc
-+ *[0-9a-f]*:	5c 5c       	castu\.b r12
-+ *[0-9a-f]*:	5c 55       	castu\.b r5
-+ *[0-9a-f]*:	5c 54       	castu\.b r4
-+ *[0-9a-f]*:	5c 5e       	castu\.b lr
-+ *[0-9a-f]*:	5c 57       	castu\.b r7
-+ *[0-9a-f]*:	5c 5d       	castu\.b sp
-+ *[0-9a-f]*:	5c 59       	castu\.b r9
-+
-+[0-9a-f]* <casts_b>:
-+ *[0-9a-f]*:	5c 6f       	casts\.b pc
-+ *[0-9a-f]*:	5c 6c       	casts\.b r12
-+ *[0-9a-f]*:	5c 65       	casts\.b r5
-+ *[0-9a-f]*:	5c 64       	casts\.b r4
-+ *[0-9a-f]*:	5c 6e       	casts\.b lr
-+ *[0-9a-f]*:	5c 6b       	casts\.b r11
-+ *[0-9a-f]*:	5c 61       	casts\.b r1
-+ *[0-9a-f]*:	5c 6a       	casts\.b r10
-+
-+[0-9a-f]* <castu_h>:
-+ *[0-9a-f]*:	5c 7f       	castu\.h pc
-+ *[0-9a-f]*:	5c 7c       	castu\.h r12
-+ *[0-9a-f]*:	5c 75       	castu\.h r5
-+ *[0-9a-f]*:	5c 74       	castu\.h r4
-+ *[0-9a-f]*:	5c 7e       	castu\.h lr
-+ *[0-9a-f]*:	5c 7a       	castu\.h r10
-+ *[0-9a-f]*:	5c 7b       	castu\.h r11
-+ *[0-9a-f]*:	5c 71       	castu\.h r1
-+
-+[0-9a-f]* <casts_h>:
-+ *[0-9a-f]*:	5c 8f       	casts\.h pc
-+ *[0-9a-f]*:	5c 8c       	casts\.h r12
-+ *[0-9a-f]*:	5c 85       	casts\.h r5
-+ *[0-9a-f]*:	5c 84       	casts\.h r4
-+ *[0-9a-f]*:	5c 8e       	casts\.h lr
-+ *[0-9a-f]*:	5c 80       	casts\.h r0
-+ *[0-9a-f]*:	5c 85       	casts\.h r5
-+ *[0-9a-f]*:	5c 89       	casts\.h r9
-+
-+[0-9a-f]* <brev>:
-+ *[0-9a-f]*:	5c 9f       	brev pc
-+ *[0-9a-f]*:	5c 9c       	brev r12
-+ *[0-9a-f]*:	5c 95       	brev r5
-+ *[0-9a-f]*:	5c 94       	brev r4
-+ *[0-9a-f]*:	5c 9e       	brev lr
-+ *[0-9a-f]*:	5c 95       	brev r5
-+ *[0-9a-f]*:	5c 9a       	brev r10
-+ *[0-9a-f]*:	5c 98       	brev r8
-+
-+[0-9a-f]* <swap_h>:
-+ *[0-9a-f]*:	5c af       	swap\.h pc
-+ *[0-9a-f]*:	5c ac       	swap\.h r12
-+ *[0-9a-f]*:	5c a5       	swap\.h r5
-+ *[0-9a-f]*:	5c a4       	swap\.h r4
-+ *[0-9a-f]*:	5c ae       	swap\.h lr
-+ *[0-9a-f]*:	5c a7       	swap\.h r7
-+ *[0-9a-f]*:	5c a0       	swap\.h r0
-+ *[0-9a-f]*:	5c a8       	swap\.h r8
-+
-+[0-9a-f]* <swap_b>:
-+ *[0-9a-f]*:	5c bf       	swap\.b pc
-+ *[0-9a-f]*:	5c bc       	swap\.b r12
-+ *[0-9a-f]*:	5c b5       	swap\.b r5
-+ *[0-9a-f]*:	5c b4       	swap\.b r4
-+ *[0-9a-f]*:	5c be       	swap\.b lr
-+ *[0-9a-f]*:	5c ba       	swap\.b r10
-+ *[0-9a-f]*:	5c bc       	swap\.b r12
-+ *[0-9a-f]*:	5c b1       	swap\.b r1
-+
-+[0-9a-f]* <swap_bh>:
-+ *[0-9a-f]*:	5c cf       	swap\.bh pc
-+ *[0-9a-f]*:	5c cc       	swap\.bh r12
-+ *[0-9a-f]*:	5c c5       	swap\.bh r5
-+ *[0-9a-f]*:	5c c4       	swap\.bh r4
-+ *[0-9a-f]*:	5c ce       	swap\.bh lr
-+ *[0-9a-f]*:	5c c9       	swap\.bh r9
-+ *[0-9a-f]*:	5c c4       	swap\.bh r4
-+ *[0-9a-f]*:	5c c1       	swap\.bh r1
-+
-+[0-9a-f]* <One_s_compliment>:
-+ *[0-9a-f]*:	5c df       	com pc
-+ *[0-9a-f]*:	5c dc       	com r12
-+ *[0-9a-f]*:	5c d5       	com r5
-+ *[0-9a-f]*:	5c d4       	com r4
-+ *[0-9a-f]*:	5c de       	com lr
-+ *[0-9a-f]*:	5c d2       	com r2
-+ *[0-9a-f]*:	5c d2       	com r2
-+ *[0-9a-f]*:	5c d7       	com r7
-+
-+[0-9a-f]* <tnbz>:
-+ *[0-9a-f]*:	5c ef       	tnbz pc
-+ *[0-9a-f]*:	5c ec       	tnbz r12
-+ *[0-9a-f]*:	5c e5       	tnbz r5
-+ *[0-9a-f]*:	5c e4       	tnbz r4
-+ *[0-9a-f]*:	5c ee       	tnbz lr
-+ *[0-9a-f]*:	5c e8       	tnbz r8
-+ *[0-9a-f]*:	5c ec       	tnbz r12
-+ *[0-9a-f]*:	5c ef       	tnbz pc
-+
-+[0-9a-f]* <rol>:
-+ *[0-9a-f]*:	5c ff       	rol pc
-+ *[0-9a-f]*:	5c fc       	rol r12
-+ *[0-9a-f]*:	5c f5       	rol r5
-+ *[0-9a-f]*:	5c f4       	rol r4
-+ *[0-9a-f]*:	5c fe       	rol lr
-+ *[0-9a-f]*:	5c fa       	rol r10
-+ *[0-9a-f]*:	5c f9       	rol r9
-+ *[0-9a-f]*:	5c f5       	rol r5
-+
-+[0-9a-f]* <ror>:
-+ *[0-9a-f]*:	5d 0f       	ror pc
-+ *[0-9a-f]*:	5d 0c       	ror r12
-+ *[0-9a-f]*:	5d 05       	ror r5
-+ *[0-9a-f]*:	5d 04       	ror r4
-+ *[0-9a-f]*:	5d 0e       	ror lr
-+ *[0-9a-f]*:	5d 08       	ror r8
-+ *[0-9a-f]*:	5d 04       	ror r4
-+ *[0-9a-f]*:	5d 07       	ror r7
-+
-+[0-9a-f]* <icall>:
-+ *[0-9a-f]*:	5d 1f       	icall pc
-+ *[0-9a-f]*:	5d 1c       	icall r12
-+ *[0-9a-f]*:	5d 15       	icall r5
-+ *[0-9a-f]*:	5d 14       	icall r4
-+ *[0-9a-f]*:	5d 1e       	icall lr
-+ *[0-9a-f]*:	5d 13       	icall r3
-+ *[0-9a-f]*:	5d 11       	icall r1
-+ *[0-9a-f]*:	5d 13       	icall r3
-+
-+[0-9a-f]* <mustr>:
-+ *[0-9a-f]*:	5d 2f       	mustr pc
-+ *[0-9a-f]*:	5d 2c       	mustr r12
-+ *[0-9a-f]*:	5d 25       	mustr r5
-+ *[0-9a-f]*:	5d 24       	mustr r4
-+ *[0-9a-f]*:	5d 2e       	mustr lr
-+ *[0-9a-f]*:	5d 21       	mustr r1
-+ *[0-9a-f]*:	5d 24       	mustr r4
-+ *[0-9a-f]*:	5d 2c       	mustr r12
-+
-+[0-9a-f]* <musfr>:
-+ *[0-9a-f]*:	5d 3f       	musfr pc
-+ *[0-9a-f]*:	5d 3c       	musfr r12
-+ *[0-9a-f]*:	5d 35       	musfr r5
-+ *[0-9a-f]*:	5d 34       	musfr r4
-+ *[0-9a-f]*:	5d 3e       	musfr lr
-+ *[0-9a-f]*:	5d 3b       	musfr r11
-+ *[0-9a-f]*:	5d 3c       	musfr r12
-+ *[0-9a-f]*:	5d 32       	musfr r2
-+
-+[0-9a-f]* <ret_cond>:
-+ *[0-9a-f]*:	5e 0f       	reteq 1
-+ *[0-9a-f]*:	5e fc       	retal r12
-+ *[0-9a-f]*:	5e 85       	retls r5
-+ *[0-9a-f]*:	5e 74       	retpl r4
-+ *[0-9a-f]*:	5e 1e       	retne -1
-+ *[0-9a-f]*:	5e 90       	retgt r0
-+ *[0-9a-f]*:	5e 9c       	retgt r12
-+ *[0-9a-f]*:	5e 4a       	retge r10
-+
-+[0-9a-f]* <sr_cond>:
-+ *[0-9a-f]*:	5f 0f       	sreq pc
-+ *[0-9a-f]*:	5f fc       	sral r12
-+ *[0-9a-f]*:	5f 85       	srls r5
-+ *[0-9a-f]*:	5f 74       	srpl r4
-+ *[0-9a-f]*:	5f 1e       	srne lr
-+ *[0-9a-f]*:	5f 50       	srlt r0
-+ *[0-9a-f]*:	5f fd       	sral sp
-+ *[0-9a-f]*:	5f 49       	srge r9
-+
-+[0-9a-f]* <ld_w3>:
-+ *[0-9a-f]*:	7e 0f       	ld\.w pc,pc\[0x0\]
-+ *[0-9a-f]*:	79 fc       	ld\.w r12,r12\[0x7c\]
-+ *[0-9a-f]*:	6b 05       	ld\.w r5,r5\[0x40\]
-+ *[0-9a-f]*:	68 f4       	ld\.w r4,r4\[0x3c\]
-+ *[0-9a-f]*:	7c 1e       	ld\.w lr,lr\[0x4\]
-+ *[0-9a-f]*:	64 dd       	ld\.w sp,r2\[0x34\]
-+ *[0-9a-f]*:	62 29       	ld\.w r9,r1\[0x8\]
-+ *[0-9a-f]*:	7a f5       	ld\.w r5,sp\[0x3c\]
-+
-+[0-9a-f]* <ld_sh3>:
-+ *[0-9a-f]*:	9e 0f       	ld\.sh pc,pc\[0x0\]
-+ *[0-9a-f]*:	98 7c       	ld\.sh r12,r12\[0xe\]
-+ *[0-9a-f]*:	8a 45       	ld\.sh r5,r5\[0x8\]
-+ *[0-9a-f]*:	88 34       	ld\.sh r4,r4\[0x6\]
-+ *[0-9a-f]*:	9c 1e       	ld\.sh lr,lr\[0x2\]
-+ *[0-9a-f]*:	84 44       	ld\.sh r4,r2\[0x8\]
-+ *[0-9a-f]*:	9c 5d       	ld\.sh sp,lr\[0xa\]
-+ *[0-9a-f]*:	96 12       	ld\.sh r2,r11\[0x2\]
-+
-+[0-9a-f]* <ld_uh3>:
-+ *[0-9a-f]*:	9e 8f       	ld\.uh pc,pc\[0x0\]
-+ *[0-9a-f]*:	98 fc       	ld\.uh r12,r12\[0xe\]
-+ *[0-9a-f]*:	8a c5       	ld\.uh r5,r5\[0x8\]
-+ *[0-9a-f]*:	88 b4       	ld\.uh r4,r4\[0x6\]
-+ *[0-9a-f]*:	9c 9e       	ld\.uh lr,lr\[0x2\]
-+ *[0-9a-f]*:	80 da       	ld\.uh r10,r0\[0xa\]
-+ *[0-9a-f]*:	96 c8       	ld\.uh r8,r11\[0x8\]
-+ *[0-9a-f]*:	84 ea       	ld\.uh r10,r2\[0xc\]
-+
-+[0-9a-f]* <st_w3>:
-+ *[0-9a-f]*:	9f 0f       	st\.w pc\[0x0\],pc
-+ *[0-9a-f]*:	99 fc       	st\.w r12\[0x3c\],r12
-+ *[0-9a-f]*:	8b 85       	st\.w r5\[0x20\],r5
-+ *[0-9a-f]*:	89 74       	st\.w r4\[0x1c\],r4
-+ *[0-9a-f]*:	9d 1e       	st\.w lr\[0x4\],lr
-+ *[0-9a-f]*:	8f bb       	st\.w r7\[0x2c\],r11
-+ *[0-9a-f]*:	85 66       	st\.w r2\[0x18\],r6
-+ *[0-9a-f]*:	89 39       	st\.w r4\[0xc\],r9
-+
-+[0-9a-f]* <st_h3>:
-+ *[0-9a-f]*:	be 0f       	st\.h pc\[0x0\],pc
-+ *[0-9a-f]*:	b8 7c       	st\.h r12\[0xe\],r12
-+ *[0-9a-f]*:	aa 45       	st\.h r5\[0x8\],r5
-+ *[0-9a-f]*:	a8 34       	st\.h r4\[0x6\],r4
-+ *[0-9a-f]*:	bc 1e       	st\.h lr\[0x2\],lr
-+ *[0-9a-f]*:	bc 5c       	st\.h lr\[0xa\],r12
-+ *[0-9a-f]*:	ac 20       	st\.h r6\[0x4\],r0
-+ *[0-9a-f]*:	aa 6d       	st\.h r5\[0xc\],sp
-+
-+[0-9a-f]* <st_b3>:
-+ *[0-9a-f]*:	be 8f       	st\.b pc\[0x0\],pc
-+ *[0-9a-f]*:	b8 fc       	st\.b r12\[0x7\],r12
-+ *[0-9a-f]*:	aa c5       	st\.b r5\[0x4\],r5
-+ *[0-9a-f]*:	a8 b4       	st\.b r4\[0x3\],r4
-+ *[0-9a-f]*:	bc 9e       	st\.b lr\[0x1\],lr
-+ *[0-9a-f]*:	b8 e9       	st\.b r12\[0x6\],r9
-+ *[0-9a-f]*:	a4 be       	st\.b r2\[0x3\],lr
-+ *[0-9a-f]*:	a2 bb       	st\.b r1\[0x3\],r11
-+
-+[0-9a-f]* <ldd>:
-+ *[0-9a-f]*:	bf 00       	ld\.d r0,pc
-+ *[0-9a-f]*:	b9 0e       	ld\.d lr,r12
-+ *[0-9a-f]*:	ab 08       	ld\.d r8,r5
-+ *[0-9a-f]*:	a9 06       	ld\.d r6,r4
-+ *[0-9a-f]*:	bd 02       	ld\.d r2,lr
-+ *[0-9a-f]*:	af 0e       	ld\.d lr,r7
-+ *[0-9a-f]*:	a9 04       	ld\.d r4,r4
-+ *[0-9a-f]*:	bf 0e       	ld\.d lr,pc
-+
-+[0-9a-f]* <ldd_postinc>:
-+ *[0-9a-f]*:	bf 01       	ld\.d r0,pc\+\+
-+ *[0-9a-f]*:	b9 0f       	ld\.d lr,r12\+\+
-+ *[0-9a-f]*:	ab 09       	ld\.d r8,r5\+\+
-+ *[0-9a-f]*:	a9 07       	ld\.d r6,r4\+\+
-+ *[0-9a-f]*:	bd 03       	ld\.d r2,lr\+\+
-+ *[0-9a-f]*:	ab 0f       	ld\.d lr,r5\+\+
-+ *[0-9a-f]*:	b7 0d       	ld\.d r12,r11\+\+
-+ *[0-9a-f]*:	b9 03       	ld\.d r2,r12\+\+
-+
-+[0-9a-f]* <ldd_predec>:
-+ *[0-9a-f]*:	bf 10       	ld\.d r0,--pc
-+ *[0-9a-f]*:	b9 1e       	ld\.d lr,--r12
-+ *[0-9a-f]*:	ab 18       	ld\.d r8,--r5
-+ *[0-9a-f]*:	a9 16       	ld\.d r6,--r4
-+ *[0-9a-f]*:	bd 12       	ld\.d r2,--lr
-+ *[0-9a-f]*:	a1 18       	ld\.d r8,--r0
-+ *[0-9a-f]*:	bf 1a       	ld\.d r10,--pc
-+ *[0-9a-f]*:	a9 12       	ld\.d r2,--r4
-+
-+[0-9a-f]* <std>:
-+ *[0-9a-f]*:	bf 11       	st\.d pc,r0
-+ *[0-9a-f]*:	b9 1f       	st\.d r12,lr
-+ *[0-9a-f]*:	ab 19       	st\.d r5,r8
-+ *[0-9a-f]*:	a9 17       	st\.d r4,r6
-+ *[0-9a-f]*:	bd 13       	st\.d lr,r2
-+ *[0-9a-f]*:	a1 1d       	st\.d r0,r12
-+ *[0-9a-f]*:	bb 15       	st\.d sp,r4
-+ *[0-9a-f]*:	b9 1d       	st\.d r12,r12
-+
-+[0-9a-f]* <std_postinc>:
-+ *[0-9a-f]*:	bf 20       	st\.d pc\+\+,r0
-+ *[0-9a-f]*:	b9 2e       	st\.d r12\+\+,lr
-+ *[0-9a-f]*:	ab 28       	st\.d r5\+\+,r8
-+ *[0-9a-f]*:	a9 26       	st\.d r4\+\+,r6
-+ *[0-9a-f]*:	bd 22       	st\.d lr\+\+,r2
-+ *[0-9a-f]*:	bb 26       	st\.d sp\+\+,r6
-+ *[0-9a-f]*:	b5 26       	st\.d r10\+\+,r6
-+ *[0-9a-f]*:	af 22       	st\.d r7\+\+,r2
-+
-+[0-9a-f]* <std_predec>:
-+ *[0-9a-f]*:	bf 21       	st\.d --pc,r0
-+ *[0-9a-f]*:	b9 2f       	st\.d --r12,lr
-+ *[0-9a-f]*:	ab 29       	st\.d --r5,r8
-+ *[0-9a-f]*:	a9 27       	st\.d --r4,r6
-+ *[0-9a-f]*:	bd 23       	st\.d --lr,r2
-+ *[0-9a-f]*:	a7 27       	st\.d --r3,r6
-+ *[0-9a-f]*:	bd 23       	st\.d --lr,r2
-+ *[0-9a-f]*:	a1 25       	st\.d --r0,r4
-+
-+[0-9a-f]* <mul>:
-+ *[0-9a-f]*:	bf 3f       	mul pc,pc
-+ *[0-9a-f]*:	b9 3c       	mul r12,r12
-+ *[0-9a-f]*:	ab 35       	mul r5,r5
-+ *[0-9a-f]*:	a9 34       	mul r4,r4
-+ *[0-9a-f]*:	bd 3e       	mul lr,lr
-+ *[0-9a-f]*:	bd 3a       	mul r10,lr
-+ *[0-9a-f]*:	b1 30       	mul r0,r8
-+ *[0-9a-f]*:	ab 38       	mul r8,r5
-+
-+[0-9a-f]* <asr_imm5>:
-+ *[0-9a-f]*:	a1 4f       	asr pc,0x0
-+ *[0-9a-f]*:	bf 5c       	asr r12,0x1f
-+ *[0-9a-f]*:	b1 45       	asr r5,0x10
-+ *[0-9a-f]*:	af 54       	asr r4,0xf
-+ *[0-9a-f]*:	a1 5e       	asr lr,0x1
-+ *[0-9a-f]*:	b7 56       	asr r6,0x17
-+ *[0-9a-f]*:	b3 46       	asr r6,0x12
-+ *[0-9a-f]*:	a9 45       	asr r5,0x8
-+
-+[0-9a-f]* <lsl_imm5>:
-+ *[0-9a-f]*:	a1 6f       	lsl pc,0x0
-+ *[0-9a-f]*:	bf 7c       	lsl r12,0x1f
-+ *[0-9a-f]*:	b1 65       	lsl r5,0x10
-+ *[0-9a-f]*:	af 74       	lsl r4,0xf
-+ *[0-9a-f]*:	a1 7e       	lsl lr,0x1
-+ *[0-9a-f]*:	ad 7c       	lsl r12,0xd
-+ *[0-9a-f]*:	b1 66       	lsl r6,0x10
-+ *[0-9a-f]*:	b9 71       	lsl r1,0x19
-+
-+[0-9a-f]* <lsr_imm5>:
-+ *[0-9a-f]*:	a1 8f       	lsr pc,0x0
-+ *[0-9a-f]*:	bf 9c       	lsr r12,0x1f
-+ *[0-9a-f]*:	b1 85       	lsr r5,0x10
-+ *[0-9a-f]*:	af 94       	lsr r4,0xf
-+ *[0-9a-f]*:	a1 9e       	lsr lr,0x1
-+ *[0-9a-f]*:	a1 90       	lsr r0,0x1
-+ *[0-9a-f]*:	ab 88       	lsr r8,0xa
-+ *[0-9a-f]*:	bb 87       	lsr r7,0x1a
-+
-+[0-9a-f]* <sbr>:
-+ *[0-9a-f]*:	a1 af       	sbr pc,0x0
-+ *[0-9a-f]*:	bf bc       	sbr r12,0x1f
-+ *[0-9a-f]*:	b1 a5       	sbr r5,0x10
-+ *[0-9a-f]*:	af b4       	sbr r4,0xf
-+ *[0-9a-f]*:	a1 be       	sbr lr,0x1
-+ *[0-9a-f]*:	bf b8       	sbr r8,0x1f
-+ *[0-9a-f]*:	b7 a6       	sbr r6,0x16
-+ *[0-9a-f]*:	b7 b1       	sbr r1,0x17
-+
-+[0-9a-f]* <cbr>:
-+ *[0-9a-f]*:	a1 cf       	cbr pc,0x0
-+ *[0-9a-f]*:	bf dc       	cbr r12,0x1f
-+ *[0-9a-f]*:	b1 c5       	cbr r5,0x10
-+ *[0-9a-f]*:	af d4       	cbr r4,0xf
-+ *[0-9a-f]*:	a1 de       	cbr lr,0x1
-+ *[0-9a-f]*:	ab cc       	cbr r12,0xa
-+ *[0-9a-f]*:	b7 c7       	cbr r7,0x16
-+ *[0-9a-f]*:	a9 d8       	cbr r8,0x9
-+
-+[0-9a-f]* <brc1>:
-+ *[0-9a-f]*:	c0 00       	breq [0-9a-f]* <.*>
-+ *[0-9a-f]*:	cf f7       	brpl [0-9a-f]* <.*>
-+ *[0-9a-f]*:	c8 04       	brge [0-9a-f]* <.*>
-+ *[0-9a-f]*:	c7 f3       	brcs [0-9a-f]* <.*>
-+ *[0-9a-f]*:	c0 11       	brne [0-9a-f]* <.*>
-+ *[0-9a-f]*:	c7 33       	brcs [0-9a-f]* <.*>
-+ *[0-9a-f]*:	cf 70       	breq [0-9a-f]* <.*>
-+ *[0-9a-f]*:	c0 60       	breq [0-9a-f]* <.*>
-+
-+[0-9a-f]* <rjmp>:
-+ *[0-9a-f]*:	c0 08       	rjmp [0-9a-f]* <.*>
-+ *[0-9a-f]*:	cf fb       	rjmp [0-9a-f]* <.*>
-+ *[0-9a-f]*:	c0 0a       	rjmp [0-9a-f]* <.*>
-+ *[0-9a-f]*:	cf f9       	rjmp [0-9a-f]* <.*>
-+ *[0-9a-f]*:	c0 18       	rjmp [0-9a-f]* <.*>
-+ *[0-9a-f]*:	c1 fa       	rjmp [0-9a-f]* <.*>
-+ *[0-9a-f]*:	c0 78       	rjmp [0-9a-f]* <.*>
-+ *[0-9a-f]*:	cf ea       	rjmp [0-9a-f]* <.*>
-+
-+[0-9a-f]* <rcall1>:
-+ *[0-9a-f]*:	c0 0c       	rcall [0-9a-f]* <.*>
-+ *[0-9a-f]*:	cf ff       	rcall [0-9a-f]* <.*>
-+ *[0-9a-f]*:	c0 0e       	rcall [0-9a-f]* <.*>
-+ *[0-9a-f]*:	cf fd       	rcall [0-9a-f]* <.*>
-+ *[0-9a-f]*:	c0 1c       	rcall [0-9a-f]* <.*>
-+ *[0-9a-f]*:	c6 cc       	rcall [0-9a-f]* <.*>
-+ *[0-9a-f]*:	cf 7e       	rcall [0-9a-f]* <.*>
-+ *[0-9a-f]*:	c1 ae       	rcall [0-9a-f]* <.*>
-+
-+[0-9a-f]* <acall>:
-+ *[0-9a-f]*:	d0 00       	acall 0x0
-+ *[0-9a-f]*:	df f0       	acall 0x3fc
-+ *[0-9a-f]*:	d8 00       	acall 0x200
-+ *[0-9a-f]*:	d7 f0       	acall 0x1fc
-+ *[0-9a-f]*:	d0 10       	acall 0x4
-+ *[0-9a-f]*:	d5 90       	acall 0x164
-+ *[0-9a-f]*:	d4 c0       	acall 0x130
-+ *[0-9a-f]*:	d2 b0       	acall 0xac
-+
-+[0-9a-f]* <scall>:
-+ *[0-9a-f]*:	d7 33       	scall
-+ *[0-9a-f]*:	d7 33       	scall
-+ *[0-9a-f]*:	d7 33       	scall
-+ *[0-9a-f]*:	d7 33       	scall
-+ *[0-9a-f]*:	d7 33       	scall
-+ *[0-9a-f]*:	d7 33       	scall
-+ *[0-9a-f]*:	d7 33       	scall
-+ *[0-9a-f]*:	d7 33       	scall
-+
-+[0-9a-f]* <popm>:
-+ *[0-9a-f]*:	d8 02       	popm pc
-+ *[0-9a-f]*:	dd fa       	popm r0-r11,pc,r12=-1
-+ *[0-9a-f]*:	d4 02       	popm lr
-+ *[0-9a-f]*:	db fa       	popm r0-r11,pc,r12=1
-+ *[0-9a-f]*:	d0 12       	popm r0-r3
-+ *[0-9a-f]*:	d8 e2       	popm r4-r10,pc
-+ *[0-9a-f]*:	d9 1a       	popm r0-r3,r11,pc,r12=0
-+ *[0-9a-f]*:	d7 b2       	popm r0-r7,r10-r12,lr
-+
-+[0-9a-f]* <pushm>:
-+ *[0-9a-f]*:	d8 01       	pushm pc
-+ *[0-9a-f]*:	df f1       	pushm r0-r12,lr-pc
-+ *[0-9a-f]*:	d8 01       	pushm pc
-+ *[0-9a-f]*:	d7 f1       	pushm r0-r12,lr
-+ *[0-9a-f]*:	d0 11       	pushm r0-r3
-+ *[0-9a-f]*:	dc c1       	pushm r8-r10,lr-pc
-+ *[0-9a-f]*:	d0 91       	pushm r0-r3,r10
-+ *[0-9a-f]*:	d2 41       	pushm r8-r9,r12
-+
-+[0-9a-f]* <popm_n>:
-+.*
-+.*
-+.*
-+.*
-+.*
-+.*
-+.*
-+.*
-+
-+[0-9a-f]* <pushm_n>:
-+.*
-+.*
-+.*
-+.*
-+.*
-+.*
-+.*
-+.*
-+
-+[0-9a-f]* <csrfcz>:
-+ *[0-9a-f]*:	d0 03       	csrfcz 0x0
-+ *[0-9a-f]*:	d1 f3       	csrfcz 0x1f
-+ *[0-9a-f]*:	d1 03       	csrfcz 0x10
-+ *[0-9a-f]*:	d0 f3       	csrfcz 0xf
-+ *[0-9a-f]*:	d0 13       	csrfcz 0x1
-+ *[0-9a-f]*:	d0 53       	csrfcz 0x5
-+ *[0-9a-f]*:	d0 d3       	csrfcz 0xd
-+ *[0-9a-f]*:	d1 73       	csrfcz 0x17
-+
-+[0-9a-f]* <ssrf>:
-+ *[0-9a-f]*:	d2 03       	ssrf 0x0
-+ *[0-9a-f]*:	d3 f3       	ssrf 0x1f
-+ *[0-9a-f]*:	d3 03       	ssrf 0x10
-+ *[0-9a-f]*:	d2 f3       	ssrf 0xf
-+ *[0-9a-f]*:	d2 13       	ssrf 0x1
-+ *[0-9a-f]*:	d3 d3       	ssrf 0x1d
-+ *[0-9a-f]*:	d2 d3       	ssrf 0xd
-+ *[0-9a-f]*:	d2 d3       	ssrf 0xd
-+
-+[0-9a-f]* <csrf>:
-+ *[0-9a-f]*:	d4 03       	csrf 0x0
-+ *[0-9a-f]*:	d5 f3       	csrf 0x1f
-+ *[0-9a-f]*:	d5 03       	csrf 0x10
-+ *[0-9a-f]*:	d4 f3       	csrf 0xf
-+ *[0-9a-f]*:	d4 13       	csrf 0x1
-+ *[0-9a-f]*:	d4 a3       	csrf 0xa
-+ *[0-9a-f]*:	d4 f3       	csrf 0xf
-+ *[0-9a-f]*:	d4 b3       	csrf 0xb
-+
-+[0-9a-f]* <rete>:
-+ *[0-9a-f]*:	d6 03       	rete
-+
-+[0-9a-f]* <rets>:
-+ *[0-9a-f]*:	d6 13       	rets
-+
-+[0-9a-f]* <retd>:
-+ *[0-9a-f]*:	d6 23       	retd
-+
-+[0-9a-f]* <retj>:
-+ *[0-9a-f]*:	d6 33       	retj
-+
-+[0-9a-f]* <tlbr>:
-+ *[0-9a-f]*:	d6 43       	tlbr
-+
-+[0-9a-f]* <tlbs>:
-+ *[0-9a-f]*:	d6 53       	tlbs
-+
-+[0-9a-f]* <tlbw>:
-+ *[0-9a-f]*:	d6 63       	tlbw
-+
-+[0-9a-f]* <breakpoint>:
-+ *[0-9a-f]*:	d6 73       	breakpoint
-+
-+[0-9a-f]* <incjosp>:
-+ *[0-9a-f]*:	d6 83       	incjosp 1
-+ *[0-9a-f]*:	d6 93       	incjosp 2
-+ *[0-9a-f]*:	d6 a3       	incjosp 3
-+ *[0-9a-f]*:	d6 b3       	incjosp 4
-+ *[0-9a-f]*:	d6 c3       	incjosp -4
-+ *[0-9a-f]*:	d6 d3       	incjosp -3
-+ *[0-9a-f]*:	d6 e3       	incjosp -2
-+ *[0-9a-f]*:	d6 f3       	incjosp -1
-+
-+[0-9a-f]* <nop>:
-+ *[0-9a-f]*:	d7 03       	nop
-+
-+[0-9a-f]* <popjc>:
-+ *[0-9a-f]*:	d7 13       	popjc
-+
-+[0-9a-f]* <pushjc>:
-+ *[0-9a-f]*:	d7 23       	pushjc
-+
-+[0-9a-f]* <add2>:
-+ *[0-9a-f]*:	fe 0f 00 0f 	add pc,pc,pc
-+ *[0-9a-f]*:	f8 0c 00 3c 	add r12,r12,r12<<0x3
-+ *[0-9a-f]*:	ea 05 00 25 	add r5,r5,r5<<0x2
-+ *[0-9a-f]*:	e8 04 00 14 	add r4,r4,r4<<0x1
-+ *[0-9a-f]*:	fc 0e 00 1e 	add lr,lr,lr<<0x1
-+ *[0-9a-f]*:	f8 00 00 10 	add r0,r12,r0<<0x1
-+ *[0-9a-f]*:	f8 04 00 09 	add r9,r12,r4
-+ *[0-9a-f]*:	f8 07 00 2c 	add r12,r12,r7<<0x2
-+
-+[0-9a-f]* <sub2>:
-+ *[0-9a-f]*:	fe 0f 01 0f 	sub pc,pc,pc
-+ *[0-9a-f]*:	f8 0c 01 3c 	sub r12,r12,r12<<0x3
-+ *[0-9a-f]*:	ea 05 01 25 	sub r5,r5,r5<<0x2
-+ *[0-9a-f]*:	e8 04 01 14 	sub r4,r4,r4<<0x1
-+ *[0-9a-f]*:	fc 0e 01 1e 	sub lr,lr,lr<<0x1
-+ *[0-9a-f]*:	e6 04 01 0d 	sub sp,r3,r4
-+ *[0-9a-f]*:	ee 03 01 03 	sub r3,r7,r3
-+ *[0-9a-f]*:	f4 0d 01 1d 	sub sp,r10,sp<<0x1
-+
-+[0-9a-f]* <divu>:
-+ *[0-9a-f]*:	fe 0f 0d 0f 	divu pc,pc,pc
-+ *[0-9a-f]*:	f8 0c 0d 0c 	divu r12,r12,r12
-+ *[0-9a-f]*:	ea 05 0d 05 	divu r5,r5,r5
-+ *[0-9a-f]*:	e8 04 0d 04 	divu r4,r4,r4
-+ *[0-9a-f]*:	fc 0e 0d 0e 	divu lr,lr,lr
-+ *[0-9a-f]*:	e8 0f 0d 0d 	divu sp,r4,pc
-+ *[0-9a-f]*:	ea 0d 0d 05 	divu r5,r5,sp
-+ *[0-9a-f]*:	fa 00 0d 0a 	divu r10,sp,r0
-+
-+[0-9a-f]* <addhh_w>:
-+ *[0-9a-f]*:	fe 0f 0e 0f 	addhh\.w pc,pc:b,pc:b
-+ *[0-9a-f]*:	f8 0c 0e 3c 	addhh\.w r12,r12:t,r12:t
-+ *[0-9a-f]*:	ea 05 0e 35 	addhh\.w r5,r5:t,r5:t
-+ *[0-9a-f]*:	e8 04 0e 04 	addhh\.w r4,r4:b,r4:b
-+ *[0-9a-f]*:	fc 0e 0e 3e 	addhh\.w lr,lr:t,lr:t
-+ *[0-9a-f]*:	e0 03 0e 00 	addhh\.w r0,r0:b,r3:b
-+ *[0-9a-f]*:	f8 07 0e 2e 	addhh\.w lr,r12:t,r7:b
-+ *[0-9a-f]*:	f4 02 0e 23 	addhh\.w r3,r10:t,r2:b
-+
-+[0-9a-f]* <subhh_w>:
-+ *[0-9a-f]*:	fe 0f 0f 0f 	subhh\.w pc,pc:b,pc:b
-+ *[0-9a-f]*:	f8 0c 0f 3c 	subhh\.w r12,r12:t,r12:t
-+ *[0-9a-f]*:	ea 05 0f 35 	subhh\.w r5,r5:t,r5:t
-+ *[0-9a-f]*:	e8 04 0f 04 	subhh\.w r4,r4:b,r4:b
-+ *[0-9a-f]*:	fc 0e 0f 3e 	subhh\.w lr,lr:t,lr:t
-+ *[0-9a-f]*:	e2 07 0f 2a 	subhh\.w r10,r1:t,r7:b
-+ *[0-9a-f]*:	f4 0e 0f 3f 	subhh\.w pc,r10:t,lr:t
-+ *[0-9a-f]*:	e0 0c 0f 23 	subhh\.w r3,r0:t,r12:b
-+
-+[0-9a-f]* <adc>:
-+ *[0-9a-f]*:	fe 0f 00 4f 	adc pc,pc,pc
-+ *[0-9a-f]*:	f8 0c 00 4c 	adc r12,r12,r12
-+ *[0-9a-f]*:	ea 05 00 45 	adc r5,r5,r5
-+ *[0-9a-f]*:	e8 04 00 44 	adc r4,r4,r4
-+ *[0-9a-f]*:	fc 0e 00 4e 	adc lr,lr,lr
-+ *[0-9a-f]*:	e0 07 00 44 	adc r4,r0,r7
-+ *[0-9a-f]*:	e8 03 00 4d 	adc sp,r4,r3
-+ *[0-9a-f]*:	f8 00 00 42 	adc r2,r12,r0
-+
-+[0-9a-f]* <sbc>:
-+ *[0-9a-f]*:	fe 0f 01 4f 	sbc pc,pc,pc
-+ *[0-9a-f]*:	f8 0c 01 4c 	sbc r12,r12,r12
-+ *[0-9a-f]*:	ea 05 01 45 	sbc r5,r5,r5
-+ *[0-9a-f]*:	e8 04 01 44 	sbc r4,r4,r4
-+ *[0-9a-f]*:	fc 0e 01 4e 	sbc lr,lr,lr
-+ *[0-9a-f]*:	ee 09 01 46 	sbc r6,r7,r9
-+ *[0-9a-f]*:	f0 05 01 40 	sbc r0,r8,r5
-+ *[0-9a-f]*:	e0 04 01 41 	sbc r1,r0,r4
-+
-+[0-9a-f]* <mul_2>:
-+ *[0-9a-f]*:	fe 0f 02 4f 	mul pc,pc,pc
-+ *[0-9a-f]*:	f8 0c 02 4c 	mul r12,r12,r12
-+ *[0-9a-f]*:	ea 05 02 45 	mul r5,r5,r5
-+ *[0-9a-f]*:	e8 04 02 44 	mul r4,r4,r4
-+ *[0-9a-f]*:	fc 0e 02 4e 	mul lr,lr,lr
-+ *[0-9a-f]*:	e0 00 02 4f 	mul pc,r0,r0
-+ *[0-9a-f]*:	fe 0e 02 48 	mul r8,pc,lr
-+ *[0-9a-f]*:	f8 0f 02 44 	mul r4,r12,pc
-+
-+[0-9a-f]* <mac>:
-+ *[0-9a-f]*:	fe 0f 03 4f 	mac pc,pc,pc
-+ *[0-9a-f]*:	f8 0c 03 4c 	mac r12,r12,r12
-+ *[0-9a-f]*:	ea 05 03 45 	mac r5,r5,r5
-+ *[0-9a-f]*:	e8 04 03 44 	mac r4,r4,r4
-+ *[0-9a-f]*:	fc 0e 03 4e 	mac lr,lr,lr
-+ *[0-9a-f]*:	e8 00 03 4a 	mac r10,r4,r0
-+ *[0-9a-f]*:	fc 00 03 47 	mac r7,lr,r0
-+ *[0-9a-f]*:	f2 0c 03 42 	mac r2,r9,r12
-+
-+[0-9a-f]* <mulsd>:
-+ *[0-9a-f]*:	fe 0f 04 4f 	muls\.d pc,pc,pc
-+ *[0-9a-f]*:	f8 0c 04 4c 	muls\.d r12,r12,r12
-+ *[0-9a-f]*:	ea 05 04 45 	muls\.d r5,r5,r5
-+ *[0-9a-f]*:	e8 04 04 44 	muls\.d r4,r4,r4
-+ *[0-9a-f]*:	fc 0e 04 4e 	muls\.d lr,lr,lr
-+ *[0-9a-f]*:	f0 0e 04 42 	muls\.d r2,r8,lr
-+ *[0-9a-f]*:	e0 0b 04 44 	muls\.d r4,r0,r11
-+ *[0-9a-f]*:	fc 06 04 45 	muls\.d r5,lr,r6
-+
-+[0-9a-f]* <macsd>:
-+ *[0-9a-f]*:	fe 0f 05 40 	macs\.d r0,pc,pc
-+ *[0-9a-f]*:	f8 0c 05 4e 	macs\.d lr,r12,r12
-+ *[0-9a-f]*:	ea 05 05 48 	macs\.d r8,r5,r5
-+ *[0-9a-f]*:	e8 04 05 46 	macs\.d r6,r4,r4
-+ *[0-9a-f]*:	fc 0e 05 42 	macs\.d r2,lr,lr
-+ *[0-9a-f]*:	e2 09 05 48 	macs\.d r8,r1,r9
-+ *[0-9a-f]*:	f0 08 05 4e 	macs\.d lr,r8,r8
-+ *[0-9a-f]*:	e6 0c 05 44 	macs\.d r4,r3,r12
-+
-+[0-9a-f]* <mulud>:
-+ *[0-9a-f]*:	fe 0f 06 40 	mulu\.d r0,pc,pc
-+ *[0-9a-f]*:	f8 0c 06 4e 	mulu\.d lr,r12,r12
-+ *[0-9a-f]*:	ea 05 06 48 	mulu\.d r8,r5,r5
-+ *[0-9a-f]*:	e8 04 06 46 	mulu\.d r6,r4,r4
-+ *[0-9a-f]*:	fc 0e 06 42 	mulu\.d r2,lr,lr
-+ *[0-9a-f]*:	ea 00 06 46 	mulu\.d r6,r5,r0
-+ *[0-9a-f]*:	ec 01 06 44 	mulu\.d r4,r6,r1
-+ *[0-9a-f]*:	f0 02 06 48 	mulu\.d r8,r8,r2
-+
-+[0-9a-f]* <macud>:
-+ *[0-9a-f]*:	fe 0f 07 40 	macu\.d r0,pc,pc
-+ *[0-9a-f]*:	f8 0c 07 4e 	macu\.d lr,r12,r12
-+ *[0-9a-f]*:	ea 05 07 48 	macu\.d r8,r5,r5
-+ *[0-9a-f]*:	e8 04 07 46 	macu\.d r6,r4,r4
-+ *[0-9a-f]*:	fc 0e 07 42 	macu\.d r2,lr,lr
-+ *[0-9a-f]*:	fa 0b 07 46 	macu\.d r6,sp,r11
-+ *[0-9a-f]*:	e8 08 07 42 	macu\.d r2,r4,r8
-+ *[0-9a-f]*:	f4 09 07 46 	macu\.d r6,r10,r9
-+
-+[0-9a-f]* <asr_1>:
-+ *[0-9a-f]*:	fe 0f 08 4f 	asr pc,pc,pc
-+ *[0-9a-f]*:	f8 0c 08 4c 	asr r12,r12,r12
-+ *[0-9a-f]*:	ea 05 08 45 	asr r5,r5,r5
-+ *[0-9a-f]*:	e8 04 08 44 	asr r4,r4,r4
-+ *[0-9a-f]*:	fc 0e 08 4e 	asr lr,lr,lr
-+ *[0-9a-f]*:	ec 0f 08 4f 	asr pc,r6,pc
-+ *[0-9a-f]*:	ec 0c 08 40 	asr r0,r6,r12
-+ *[0-9a-f]*:	fa 00 08 44 	asr r4,sp,r0
-+
-+[0-9a-f]* <lsl_1>:
-+ *[0-9a-f]*:	fe 0f 09 4f 	lsl pc,pc,pc
-+ *[0-9a-f]*:	f8 0c 09 4c 	lsl r12,r12,r12
-+ *[0-9a-f]*:	ea 05 09 45 	lsl r5,r5,r5
-+ *[0-9a-f]*:	e8 04 09 44 	lsl r4,r4,r4
-+ *[0-9a-f]*:	fc 0e 09 4e 	lsl lr,lr,lr
-+ *[0-9a-f]*:	ea 0e 09 4e 	lsl lr,r5,lr
-+ *[0-9a-f]*:	fe 03 09 45 	lsl r5,pc,r3
-+ *[0-9a-f]*:	fe 09 09 41 	lsl r1,pc,r9
-+
-+[0-9a-f]* <lsr_1>:
-+ *[0-9a-f]*:	fe 0f 0a 4f 	lsr pc,pc,pc
-+ *[0-9a-f]*:	f8 0c 0a 4c 	lsr r12,r12,r12
-+ *[0-9a-f]*:	ea 05 0a 45 	lsr r5,r5,r5
-+ *[0-9a-f]*:	e8 04 0a 44 	lsr r4,r4,r4
-+ *[0-9a-f]*:	fc 0e 0a 4e 	lsr lr,lr,lr
-+ *[0-9a-f]*:	e8 01 0a 42 	lsr r2,r4,r1
-+ *[0-9a-f]*:	e2 06 0a 45 	lsr r5,r1,r6
-+ *[0-9a-f]*:	ec 07 0a 4d 	lsr sp,r6,r7
-+
-+[0-9a-f]* <xchg>:
-+ *[0-9a-f]*:	fe 0f 0b 4f 	xchg pc,pc,pc
-+ *[0-9a-f]*:	f8 0c 0b 4c 	xchg r12,r12,r12
-+ *[0-9a-f]*:	ea 05 0b 45 	xchg r5,r5,r5
-+ *[0-9a-f]*:	e8 04 0b 44 	xchg r4,r4,r4
-+ *[0-9a-f]*:	fc 0e 0b 4e 	xchg lr,lr,lr
-+ *[0-9a-f]*:	e8 0d 0b 4e 	xchg lr,r4,sp
-+ *[0-9a-f]*:	ea 0c 0b 41 	xchg r1,r5,r12
-+ *[0-9a-f]*:	f8 00 0b 4e 	xchg lr,r12,r0
-+
-+[0-9a-f]* <max>:
-+ *[0-9a-f]*:	fe 0f 0c 4f 	max pc,pc,pc
-+ *[0-9a-f]*:	f8 0c 0c 4c 	max r12,r12,r12
-+ *[0-9a-f]*:	ea 05 0c 45 	max r5,r5,r5
-+ *[0-9a-f]*:	e8 04 0c 44 	max r4,r4,r4
-+ *[0-9a-f]*:	fc 0e 0c 4e 	max lr,lr,lr
-+ *[0-9a-f]*:	e4 0d 0c 4e 	max lr,r2,sp
-+ *[0-9a-f]*:	f4 09 0c 44 	max r4,r10,r9
-+ *[0-9a-f]*:	f2 0e 0c 4e 	max lr,r9,lr
-+
-+[0-9a-f]* <min>:
-+ *[0-9a-f]*:	fe 0f 0d 4f 	min pc,pc,pc
-+ *[0-9a-f]*:	f8 0c 0d 4c 	min r12,r12,r12
-+ *[0-9a-f]*:	ea 05 0d 45 	min r5,r5,r5
-+ *[0-9a-f]*:	e8 04 0d 44 	min r4,r4,r4
-+ *[0-9a-f]*:	fc 0e 0d 4e 	min lr,lr,lr
-+ *[0-9a-f]*:	ee 08 0d 49 	min r9,r7,r8
-+ *[0-9a-f]*:	ea 05 0d 4d 	min sp,r5,r5
-+ *[0-9a-f]*:	e2 04 0d 44 	min r4,r1,r4
-+
-+[0-9a-f]* <addabs>:
-+ *[0-9a-f]*:	fe 0f 0e 4f 	addabs pc,pc,pc
-+ *[0-9a-f]*:	f8 0c 0e 4c 	addabs r12,r12,r12
-+ *[0-9a-f]*:	ea 05 0e 45 	addabs r5,r5,r5
-+ *[0-9a-f]*:	e8 04 0e 44 	addabs r4,r4,r4
-+ *[0-9a-f]*:	fc 0e 0e 4e 	addabs lr,lr,lr
-+ *[0-9a-f]*:	f4 00 0e 47 	addabs r7,r10,r0
-+ *[0-9a-f]*:	f2 07 0e 49 	addabs r9,r9,r7
-+ *[0-9a-f]*:	f0 0c 0e 42 	addabs r2,r8,r12
-+
-+[0-9a-f]* <mulnhh_w>:
-+ *[0-9a-f]*:	fe 0f 01 8f 	mulnhh\.w pc,pc:b,pc:b
-+ *[0-9a-f]*:	f8 0c 01 bc 	mulnhh\.w r12,r12:t,r12:t
-+ *[0-9a-f]*:	ea 05 01 b5 	mulnhh\.w r5,r5:t,r5:t
-+ *[0-9a-f]*:	e8 04 01 84 	mulnhh\.w r4,r4:b,r4:b
-+ *[0-9a-f]*:	fc 0e 01 be 	mulnhh\.w lr,lr:t,lr:t
-+ *[0-9a-f]*:	fa 09 01 ab 	mulnhh\.w r11,sp:t,r9:b
-+ *[0-9a-f]*:	e8 0e 01 9d 	mulnhh\.w sp,r4:b,lr:t
-+ *[0-9a-f]*:	e4 0b 01 ac 	mulnhh\.w r12,r2:t,r11:b
-+
-+[0-9a-f]* <mulnwh_d>:
-+ *[0-9a-f]*:	fe 0f 02 80 	mulnwh\.d r0,pc,pc:b
-+ *[0-9a-f]*:	f8 0c 02 9e 	mulnwh\.d lr,r12,r12:t
-+ *[0-9a-f]*:	ea 05 02 98 	mulnwh\.d r8,r5,r5:t
-+ *[0-9a-f]*:	e8 04 02 86 	mulnwh\.d r6,r4,r4:b
-+ *[0-9a-f]*:	fc 0e 02 92 	mulnwh\.d r2,lr,lr:t
-+ *[0-9a-f]*:	e6 02 02 9e 	mulnwh\.d lr,r3,r2:t
-+ *[0-9a-f]*:	ea 09 02 84 	mulnwh\.d r4,r5,r9:b
-+ *[0-9a-f]*:	e8 04 02 9c 	mulnwh\.d r12,r4,r4:t
-+
-+[0-9a-f]* <machh_w>:
-+ *[0-9a-f]*:	fe 0f 04 8f 	machh\.w pc,pc:b,pc:b
-+ *[0-9a-f]*:	f8 0c 04 bc 	machh\.w r12,r12:t,r12:t
-+ *[0-9a-f]*:	ea 05 04 b5 	machh\.w r5,r5:t,r5:t
-+ *[0-9a-f]*:	e8 04 04 84 	machh\.w r4,r4:b,r4:b
-+ *[0-9a-f]*:	fc 0e 04 be 	machh\.w lr,lr:t,lr:t
-+ *[0-9a-f]*:	ea 01 04 9e 	machh\.w lr,r5:b,r1:t
-+ *[0-9a-f]*:	ec 07 04 89 	machh\.w r9,r6:b,r7:b
-+ *[0-9a-f]*:	fc 0c 04 a5 	machh\.w r5,lr:t,r12:b
-+
-+[0-9a-f]* <machh_d>:
-+ *[0-9a-f]*:	fe 0f 05 80 	machh\.d r0,pc:b,pc:b
-+ *[0-9a-f]*:	f8 0c 05 be 	machh\.d lr,r12:t,r12:t
-+ *[0-9a-f]*:	ea 05 05 b8 	machh\.d r8,r5:t,r5:t
-+ *[0-9a-f]*:	e8 04 05 86 	machh\.d r6,r4:b,r4:b
-+ *[0-9a-f]*:	fc 0e 05 b2 	machh\.d r2,lr:t,lr:t
-+ *[0-9a-f]*:	e0 08 05 8a 	machh\.d r10,r0:b,r8:b
-+ *[0-9a-f]*:	e8 05 05 9e 	machh\.d lr,r4:b,r5:t
-+ *[0-9a-f]*:	e0 04 05 98 	machh\.d r8,r0:b,r4:t
-+
-+[0-9a-f]* <macsathh_w>:
-+ *[0-9a-f]*:	fe 0f 06 8f 	macsathh\.w pc,pc:b,pc:b
-+ *[0-9a-f]*:	f8 0c 06 bc 	macsathh\.w r12,r12:t,r12:t
-+ *[0-9a-f]*:	ea 05 06 b5 	macsathh\.w r5,r5:t,r5:t
-+ *[0-9a-f]*:	e8 04 06 84 	macsathh\.w r4,r4:b,r4:b
-+ *[0-9a-f]*:	fc 0e 06 be 	macsathh\.w lr,lr:t,lr:t
-+ *[0-9a-f]*:	ee 0f 06 b7 	macsathh\.w r7,r7:t,pc:t
-+ *[0-9a-f]*:	e4 04 06 a4 	macsathh\.w r4,r2:t,r4:b
-+ *[0-9a-f]*:	f0 03 06 b4 	macsathh\.w r4,r8:t,r3:t
-+
-+[0-9a-f]* <mulhh_w>:
-+ *[0-9a-f]*:	fe 0f 07 8f 	mulhh\.w pc,pc:b,pc:b
-+ *[0-9a-f]*:	f8 0c 07 bc 	mulhh\.w r12,r12:t,r12:t
-+ *[0-9a-f]*:	ea 05 07 b5 	mulhh\.w r5,r5:t,r5:t
-+ *[0-9a-f]*:	e8 04 07 84 	mulhh\.w r4,r4:b,r4:b
-+ *[0-9a-f]*:	fc 0e 07 be 	mulhh\.w lr,lr:t,lr:t
-+ *[0-9a-f]*:	e8 09 07 a7 	mulhh\.w r7,r4:t,r9:b
-+ *[0-9a-f]*:	e6 07 07 bf 	mulhh\.w pc,r3:t,r7:t
-+ *[0-9a-f]*:	e8 09 07 9f 	mulhh\.w pc,r4:b,r9:t
-+
-+[0-9a-f]* <mulsathh_h>:
-+ *[0-9a-f]*:	fe 0f 08 8f 	mulsathh\.h pc,pc:b,pc:b
-+ *[0-9a-f]*:	f8 0c 08 bc 	mulsathh\.h r12,r12:t,r12:t
-+ *[0-9a-f]*:	ea 05 08 b5 	mulsathh\.h r5,r5:t,r5:t
-+ *[0-9a-f]*:	e8 04 08 84 	mulsathh\.h r4,r4:b,r4:b
-+ *[0-9a-f]*:	fc 0e 08 be 	mulsathh\.h lr,lr:t,lr:t
-+ *[0-9a-f]*:	e2 0d 08 83 	mulsathh\.h r3,r1:b,sp:b
-+ *[0-9a-f]*:	fc 0b 08 ab 	mulsathh\.h r11,lr:t,r11:b
-+ *[0-9a-f]*:	f0 0b 08 98 	mulsathh\.h r8,r8:b,r11:t
-+
-+[0-9a-f]* <mulsathh_w>:
-+ *[0-9a-f]*:	fe 0f 09 8f 	mulsathh\.w pc,pc:b,pc:b
-+ *[0-9a-f]*:	f8 0c 09 bc 	mulsathh\.w r12,r12:t,r12:t
-+ *[0-9a-f]*:	ea 05 09 b5 	mulsathh\.w r5,r5:t,r5:t
-+ *[0-9a-f]*:	e8 04 09 84 	mulsathh\.w r4,r4:b,r4:b
-+ *[0-9a-f]*:	fc 0e 09 be 	mulsathh\.w lr,lr:t,lr:t
-+ *[0-9a-f]*:	f6 06 09 ae 	mulsathh\.w lr,r11:t,r6:b
-+ *[0-9a-f]*:	ec 07 09 96 	mulsathh\.w r6,r6:b,r7:t
-+ *[0-9a-f]*:	e4 03 09 8a 	mulsathh\.w r10,r2:b,r3:b
-+
-+[0-9a-f]* <mulsatrndhh_h>:
-+ *[0-9a-f]*:	fe 0f 0a 8f 	mulsatrndhh\.h pc,pc:b,pc:b
-+ *[0-9a-f]*:	f8 0c 0a bc 	mulsatrndhh\.h r12,r12:t,r12:t
-+ *[0-9a-f]*:	ea 05 0a b5 	mulsatrndhh\.h r5,r5:t,r5:t
-+ *[0-9a-f]*:	e8 04 0a 84 	mulsatrndhh\.h r4,r4:b,r4:b
-+ *[0-9a-f]*:	fc 0e 0a be 	mulsatrndhh\.h lr,lr:t,lr:t
-+ *[0-9a-f]*:	ec 09 0a 8b 	mulsatrndhh\.h r11,r6:b,r9:b
-+ *[0-9a-f]*:	e6 08 0a 9b 	mulsatrndhh\.h r11,r3:b,r8:t
-+ *[0-9a-f]*:	fa 07 0a b5 	mulsatrndhh\.h r5,sp:t,r7:t
-+
-+[0-9a-f]* <mulsatrndwh_w>:
-+ *[0-9a-f]*:	fe 0f 0b 8f 	mulsatrndwh\.w pc,pc,pc:b
-+ *[0-9a-f]*:	f8 0c 0b 9c 	mulsatrndwh\.w r12,r12,r12:t
-+ *[0-9a-f]*:	ea 05 0b 95 	mulsatrndwh\.w r5,r5,r5:t
-+ *[0-9a-f]*:	e8 04 0b 84 	mulsatrndwh\.w r4,r4,r4:b
-+ *[0-9a-f]*:	fc 0e 0b 9e 	mulsatrndwh\.w lr,lr,lr:t
-+ *[0-9a-f]*:	f8 00 0b 85 	mulsatrndwh\.w r5,r12,r0:b
-+ *[0-9a-f]*:	f4 0f 0b 87 	mulsatrndwh\.w r7,r10,pc:b
-+ *[0-9a-f]*:	f0 05 0b 9a 	mulsatrndwh\.w r10,r8,r5:t
-+
-+[0-9a-f]* <macwh_d>:
-+ *[0-9a-f]*:	fe 0f 0c 80 	macwh\.d r0,pc,pc:b
-+ *[0-9a-f]*:	f8 0c 0c 9e 	macwh\.d lr,r12,r12:t
-+ *[0-9a-f]*:	ea 05 0c 98 	macwh\.d r8,r5,r5:t
-+ *[0-9a-f]*:	e8 04 0c 86 	macwh\.d r6,r4,r4:b
-+ *[0-9a-f]*:	fc 0e 0c 92 	macwh\.d r2,lr,lr:t
-+ *[0-9a-f]*:	f4 0c 0c 94 	macwh\.d r4,r10,r12:t
-+ *[0-9a-f]*:	ee 0d 0c 84 	macwh\.d r4,r7,sp:b
-+ *[0-9a-f]*:	f2 0b 0c 8e 	macwh\.d lr,r9,r11:b
-+
-+[0-9a-f]* <mulwh_d>:
-+ *[0-9a-f]*:	fe 0f 0d 80 	mulwh\.d r0,pc,pc:b
-+ *[0-9a-f]*:	f8 0c 0d 9e 	mulwh\.d lr,r12,r12:t
-+ *[0-9a-f]*:	ea 05 0d 98 	mulwh\.d r8,r5,r5:t
-+ *[0-9a-f]*:	e8 04 0d 86 	mulwh\.d r6,r4,r4:b
-+ *[0-9a-f]*:	fc 0e 0d 92 	mulwh\.d r2,lr,lr:t
-+ *[0-9a-f]*:	ea 01 0d 8c 	mulwh\.d r12,r5,r1:b
-+ *[0-9a-f]*:	e2 03 0d 90 	mulwh\.d r0,r1,r3:t
-+ *[0-9a-f]*:	f2 02 0d 80 	mulwh\.d r0,r9,r2:b
-+
-+[0-9a-f]* <mulsatwh_w>:
-+ *[0-9a-f]*:	fe 0f 0e 8f 	mulsatwh\.w pc,pc,pc:b
-+ *[0-9a-f]*:	f8 0c 0e 9c 	mulsatwh\.w r12,r12,r12:t
-+ *[0-9a-f]*:	ea 05 0e 95 	mulsatwh\.w r5,r5,r5:t
-+ *[0-9a-f]*:	e8 04 0e 84 	mulsatwh\.w r4,r4,r4:b
-+ *[0-9a-f]*:	fc 0e 0e 9e 	mulsatwh\.w lr,lr,lr:t
-+ *[0-9a-f]*:	fe 0a 0e 9b 	mulsatwh\.w r11,pc,r10:t
-+ *[0-9a-f]*:	f8 09 0e 9d 	mulsatwh\.w sp,r12,r9:t
-+ *[0-9a-f]*:	e6 02 0e 90 	mulsatwh\.w r0,r3,r2:t
-+
-+[0-9a-f]* <ldw7>:
-+ *[0-9a-f]*:	fe 0f 0f 8f 	ld\.w pc,pc\[pc:b<<2\]
-+ *[0-9a-f]*:	f8 0c 0f bc 	ld\.w r12,r12\[r12:t<<2\]
-+ *[0-9a-f]*:	ea 05 0f a5 	ld\.w r5,r5\[r5:u<<2\]
-+ *[0-9a-f]*:	e8 04 0f 94 	ld\.w r4,r4\[r4:l<<2\]
-+ *[0-9a-f]*:	fc 0e 0f 9e 	ld\.w lr,lr\[lr:l<<2\]
-+ *[0-9a-f]*:	f4 06 0f 99 	ld\.w r9,r10\[r6:l<<2\]
-+ *[0-9a-f]*:	f4 0a 0f 82 	ld\.w r2,r10\[r10:b<<2\]
-+ *[0-9a-f]*:	ea 0f 0f 8b 	ld\.w r11,r5\[pc:b<<2\]
-+
-+[0-9a-f]* <satadd_w>:
-+ *[0-9a-f]*:	fe 0f 00 cf 	satadd\.w pc,pc,pc
-+ *[0-9a-f]*:	f8 0c 00 cc 	satadd\.w r12,r12,r12
-+ *[0-9a-f]*:	ea 05 00 c5 	satadd\.w r5,r5,r5
-+ *[0-9a-f]*:	e8 04 00 c4 	satadd\.w r4,r4,r4
-+ *[0-9a-f]*:	fc 0e 00 ce 	satadd\.w lr,lr,lr
-+ *[0-9a-f]*:	f0 0b 00 c4 	satadd\.w r4,r8,r11
-+ *[0-9a-f]*:	f8 06 00 c3 	satadd\.w r3,r12,r6
-+ *[0-9a-f]*:	fc 09 00 c3 	satadd\.w r3,lr,r9
-+
-+[0-9a-f]* <satsub_w1>:
-+ *[0-9a-f]*:	fe 0f 01 cf 	satsub\.w pc,pc,pc
-+ *[0-9a-f]*:	f8 0c 01 cc 	satsub\.w r12,r12,r12
-+ *[0-9a-f]*:	ea 05 01 c5 	satsub\.w r5,r5,r5
-+ *[0-9a-f]*:	e8 04 01 c4 	satsub\.w r4,r4,r4
-+ *[0-9a-f]*:	fc 0e 01 ce 	satsub\.w lr,lr,lr
-+ *[0-9a-f]*:	fa 00 01 c8 	satsub\.w r8,sp,r0
-+ *[0-9a-f]*:	f0 04 01 c9 	satsub\.w r9,r8,r4
-+ *[0-9a-f]*:	fc 02 01 cf 	satsub\.w pc,lr,r2
-+
-+[0-9a-f]* <satadd_h>:
-+ *[0-9a-f]*:	fe 0f 02 cf 	satadd\.h pc,pc,pc
-+ *[0-9a-f]*:	f8 0c 02 cc 	satadd\.h r12,r12,r12
-+ *[0-9a-f]*:	ea 05 02 c5 	satadd\.h r5,r5,r5
-+ *[0-9a-f]*:	e8 04 02 c4 	satadd\.h r4,r4,r4
-+ *[0-9a-f]*:	fc 0e 02 ce 	satadd\.h lr,lr,lr
-+ *[0-9a-f]*:	e6 09 02 c7 	satadd\.h r7,r3,r9
-+ *[0-9a-f]*:	e0 02 02 c1 	satadd\.h r1,r0,r2
-+ *[0-9a-f]*:	e8 0e 02 c1 	satadd\.h r1,r4,lr
-+
-+[0-9a-f]* <satsub_h>:
-+ *[0-9a-f]*:	fe 0f 03 cf 	satsub\.h pc,pc,pc
-+ *[0-9a-f]*:	f8 0c 03 cc 	satsub\.h r12,r12,r12
-+ *[0-9a-f]*:	ea 05 03 c5 	satsub\.h r5,r5,r5
-+ *[0-9a-f]*:	e8 04 03 c4 	satsub\.h r4,r4,r4
-+ *[0-9a-f]*:	fc 0e 03 ce 	satsub\.h lr,lr,lr
-+ *[0-9a-f]*:	fc 03 03 ce 	satsub\.h lr,lr,r3
-+ *[0-9a-f]*:	ec 05 03 cb 	satsub\.h r11,r6,r5
-+ *[0-9a-f]*:	fa 00 03 c3 	satsub\.h r3,sp,r0
-+
-+[0-9a-f]* <mul3>:
-+ *[0-9a-f]*:	fe 0f 10 00 	mul pc,pc,0
-+ *[0-9a-f]*:	f8 0c 10 ff 	mul r12,r12,-1
-+ *[0-9a-f]*:	ea 05 10 80 	mul r5,r5,-128
-+ *[0-9a-f]*:	e8 04 10 7f 	mul r4,r4,127
-+ *[0-9a-f]*:	fc 0e 10 01 	mul lr,lr,1
-+ *[0-9a-f]*:	e4 0c 10 f9 	mul r12,r2,-7
-+ *[0-9a-f]*:	fe 01 10 5f 	mul r1,pc,95
-+ *[0-9a-f]*:	ec 04 10 13 	mul r4,r6,19
-+
-+[0-9a-f]* <rsub2>:
-+ *[0-9a-f]*:	fe 0f 11 00 	rsub pc,pc,0
-+ *[0-9a-f]*:	f8 0c 11 ff 	rsub r12,r12,-1
-+ *[0-9a-f]*:	ea 05 11 80 	rsub r5,r5,-128
-+ *[0-9a-f]*:	e8 04 11 7f 	rsub r4,r4,127
-+ *[0-9a-f]*:	fc 0e 11 01 	rsub lr,lr,1
-+ *[0-9a-f]*:	fc 09 11 60 	rsub r9,lr,96
-+ *[0-9a-f]*:	e2 0b 11 38 	rsub r11,r1,56
-+ *[0-9a-f]*:	ee 00 11 a9 	rsub r0,r7,-87
-+
-+[0-9a-f]* <clz>:
-+ *[0-9a-f]*:	fe 0f 12 00 	clz pc,pc
-+ *[0-9a-f]*:	f8 0c 12 00 	clz r12,r12
-+ *[0-9a-f]*:	ea 05 12 00 	clz r5,r5
-+ *[0-9a-f]*:	e8 04 12 00 	clz r4,r4
-+ *[0-9a-f]*:	fc 0e 12 00 	clz lr,lr
-+ *[0-9a-f]*:	e6 02 12 00 	clz r2,r3
-+ *[0-9a-f]*:	f6 05 12 00 	clz r5,r11
-+ *[0-9a-f]*:	e6 0f 12 00 	clz pc,r3
-+
-+[0-9a-f]* <cpc1>:
-+ *[0-9a-f]*:	fe 0f 13 00 	cpc pc,pc
-+ *[0-9a-f]*:	f8 0c 13 00 	cpc r12,r12
-+ *[0-9a-f]*:	ea 05 13 00 	cpc r5,r5
-+ *[0-9a-f]*:	e8 04 13 00 	cpc r4,r4
-+ *[0-9a-f]*:	fc 0e 13 00 	cpc lr,lr
-+ *[0-9a-f]*:	e8 0f 13 00 	cpc pc,r4
-+ *[0-9a-f]*:	f2 05 13 00 	cpc r5,r9
-+ *[0-9a-f]*:	ee 06 13 00 	cpc r6,r7
-+
-+[0-9a-f]* <asr3>:
-+ *[0-9a-f]*:	fe 0f 14 00 	asr pc,pc,0x0
-+ *[0-9a-f]*:	f8 0c 14 1f 	asr r12,r12,0x1f
-+ *[0-9a-f]*:	ea 05 14 10 	asr r5,r5,0x10
-+ *[0-9a-f]*:	e8 04 14 0f 	asr r4,r4,0xf
-+ *[0-9a-f]*:	fc 0e 14 01 	asr lr,lr,0x1
-+ *[0-9a-f]*:	f6 04 14 13 	asr r4,r11,0x13
-+ *[0-9a-f]*:	fe 0d 14 1a 	asr sp,pc,0x1a
-+ *[0-9a-f]*:	fa 0b 14 08 	asr r11,sp,0x8
-+
-+[0-9a-f]* <lsl3>:
-+ *[0-9a-f]*:	fe 0f 15 00 	lsl pc,pc,0x0
-+ *[0-9a-f]*:	f8 0c 15 1f 	lsl r12,r12,0x1f
-+ *[0-9a-f]*:	ea 05 15 10 	lsl r5,r5,0x10
-+ *[0-9a-f]*:	e8 04 15 0f 	lsl r4,r4,0xf
-+ *[0-9a-f]*:	fc 0e 15 01 	lsl lr,lr,0x1
-+ *[0-9a-f]*:	f4 08 15 11 	lsl r8,r10,0x11
-+ *[0-9a-f]*:	fc 02 15 03 	lsl r2,lr,0x3
-+ *[0-9a-f]*:	f6 0e 15 0e 	lsl lr,r11,0xe
-+
-+[0-9a-f]* <lsr3>:
-+ *[0-9a-f]*:	fe 0f 16 00 	lsr pc,pc,0x0
-+ *[0-9a-f]*:	f8 0c 16 1f 	lsr r12,r12,0x1f
-+ *[0-9a-f]*:	ea 05 16 10 	lsr r5,r5,0x10
-+ *[0-9a-f]*:	e8 04 16 0f 	lsr r4,r4,0xf
-+ *[0-9a-f]*:	fc 0e 16 01 	lsr lr,lr,0x1
-+ *[0-9a-f]*:	e6 04 16 1f 	lsr r4,r3,0x1f
-+ *[0-9a-f]*:	f2 0f 16 0e 	lsr pc,r9,0xe
-+ *[0-9a-f]*:	e0 03 16 06 	lsr r3,r0,0x6
-+
-+[0-9a-f]* <movc1>:
-+ *[0-9a-f]*:	fe 0f 17 00 	moveq pc,pc
-+ *[0-9a-f]*:	f8 0c 17 f0 	moval r12,r12
-+ *[0-9a-f]*:	ea 05 17 80 	movls r5,r5
-+ *[0-9a-f]*:	e8 04 17 70 	movpl r4,r4
-+ *[0-9a-f]*:	fc 0e 17 10 	movne lr,lr
-+ *[0-9a-f]*:	f6 0f 17 10 	movne pc,r11
-+ *[0-9a-f]*:	e4 0a 17 60 	movmi r10,r2
-+ *[0-9a-f]*:	f8 08 17 80 	movls r8,r12
-+
-+[0-9a-f]* <padd_h>:
-+ *[0-9a-f]*:	fe 0f 20 0f 	padd\.h pc,pc,pc
-+ *[0-9a-f]*:	f8 0c 20 0c 	padd\.h r12,r12,r12
-+ *[0-9a-f]*:	ea 05 20 05 	padd\.h r5,r5,r5
-+ *[0-9a-f]*:	e8 04 20 04 	padd\.h r4,r4,r4
-+ *[0-9a-f]*:	fc 0e 20 0e 	padd\.h lr,lr,lr
-+ *[0-9a-f]*:	e4 07 20 08 	padd\.h r8,r2,r7
-+ *[0-9a-f]*:	e0 03 20 00 	padd\.h r0,r0,r3
-+ *[0-9a-f]*:	f6 06 20 0d 	padd\.h sp,r11,r6
-+
-+[0-9a-f]* <psub_h>:
-+ *[0-9a-f]*:	fe 0f 20 1f 	psub\.h pc,pc,pc
-+ *[0-9a-f]*:	f8 0c 20 1c 	psub\.h r12,r12,r12
-+ *[0-9a-f]*:	ea 05 20 15 	psub\.h r5,r5,r5
-+ *[0-9a-f]*:	e8 04 20 14 	psub\.h r4,r4,r4
-+ *[0-9a-f]*:	fc 0e 20 1e 	psub\.h lr,lr,lr
-+ *[0-9a-f]*:	ec 08 20 1e 	psub\.h lr,r6,r8
-+ *[0-9a-f]*:	e2 0d 20 10 	psub\.h r0,r1,sp
-+ *[0-9a-f]*:	fe 0d 20 1f 	psub\.h pc,pc,sp
-+
-+[0-9a-f]* <paddx_h>:
-+ *[0-9a-f]*:	fe 0f 20 2f 	paddx\.h pc,pc,pc
-+ *[0-9a-f]*:	f8 0c 20 2c 	paddx\.h r12,r12,r12
-+ *[0-9a-f]*:	ea 05 20 25 	paddx\.h r5,r5,r5
-+ *[0-9a-f]*:	e8 04 20 24 	paddx\.h r4,r4,r4
-+ *[0-9a-f]*:	fc 0e 20 2e 	paddx\.h lr,lr,lr
-+ *[0-9a-f]*:	fe 01 20 2f 	paddx\.h pc,pc,r1
-+ *[0-9a-f]*:	e8 05 20 2a 	paddx\.h r10,r4,r5
-+ *[0-9a-f]*:	fe 02 20 25 	paddx\.h r5,pc,r2
-+
-+[0-9a-f]* <psubx_h>:
-+ *[0-9a-f]*:	fe 0f 20 3f 	psubx\.h pc,pc,pc
-+ *[0-9a-f]*:	f8 0c 20 3c 	psubx\.h r12,r12,r12
-+ *[0-9a-f]*:	ea 05 20 35 	psubx\.h r5,r5,r5
-+ *[0-9a-f]*:	e8 04 20 34 	psubx\.h r4,r4,r4
-+ *[0-9a-f]*:	fc 0e 20 3e 	psubx\.h lr,lr,lr
-+ *[0-9a-f]*:	f8 05 20 35 	psubx\.h r5,r12,r5
-+ *[0-9a-f]*:	f0 03 20 33 	psubx\.h r3,r8,r3
-+ *[0-9a-f]*:	e4 03 20 35 	psubx\.h r5,r2,r3
-+
-+[0-9a-f]* <padds_sh>:
-+ *[0-9a-f]*:	fe 0f 20 4f 	padds\.sh pc,pc,pc
-+ *[0-9a-f]*:	f8 0c 20 4c 	padds\.sh r12,r12,r12
-+ *[0-9a-f]*:	ea 05 20 45 	padds\.sh r5,r5,r5
-+ *[0-9a-f]*:	e8 04 20 44 	padds\.sh r4,r4,r4
-+ *[0-9a-f]*:	fc 0e 20 4e 	padds\.sh lr,lr,lr
-+ *[0-9a-f]*:	fc 02 20 49 	padds\.sh r9,lr,r2
-+ *[0-9a-f]*:	f0 01 20 46 	padds\.sh r6,r8,r1
-+ *[0-9a-f]*:	e8 0a 20 46 	padds\.sh r6,r4,r10
-+
-+[0-9a-f]* <psubs_sh>:
-+ *[0-9a-f]*:	fe 0f 20 5f 	psubs\.sh pc,pc,pc
-+ *[0-9a-f]*:	f8 0c 20 5c 	psubs\.sh r12,r12,r12
-+ *[0-9a-f]*:	ea 05 20 55 	psubs\.sh r5,r5,r5
-+ *[0-9a-f]*:	e8 04 20 54 	psubs\.sh r4,r4,r4
-+ *[0-9a-f]*:	fc 0e 20 5e 	psubs\.sh lr,lr,lr
-+ *[0-9a-f]*:	fc 0b 20 56 	psubs\.sh r6,lr,r11
-+ *[0-9a-f]*:	f8 04 20 52 	psubs\.sh r2,r12,r4
-+ *[0-9a-f]*:	f2 00 20 50 	psubs\.sh r0,r9,r0
-+
-+[0-9a-f]* <paddxs_sh>:
-+ *[0-9a-f]*:	fe 0f 20 6f 	paddxs\.sh pc,pc,pc
-+ *[0-9a-f]*:	f8 0c 20 6c 	paddxs\.sh r12,r12,r12
-+ *[0-9a-f]*:	ea 05 20 65 	paddxs\.sh r5,r5,r5
-+ *[0-9a-f]*:	e8 04 20 64 	paddxs\.sh r4,r4,r4
-+ *[0-9a-f]*:	fc 0e 20 6e 	paddxs\.sh lr,lr,lr
-+ *[0-9a-f]*:	e6 09 20 60 	paddxs\.sh r0,r3,r9
-+ *[0-9a-f]*:	f4 0b 20 6f 	paddxs\.sh pc,r10,r11
-+ *[0-9a-f]*:	f4 0f 20 6f 	paddxs\.sh pc,r10,pc
-+
-+[0-9a-f]* <psubxs_sh>:
-+ *[0-9a-f]*:	fe 0f 20 7f 	psubxs\.sh pc,pc,pc
-+ *[0-9a-f]*:	f8 0c 20 7c 	psubxs\.sh r12,r12,r12
-+ *[0-9a-f]*:	ea 05 20 75 	psubxs\.sh r5,r5,r5
-+ *[0-9a-f]*:	e8 04 20 74 	psubxs\.sh r4,r4,r4
-+ *[0-9a-f]*:	fc 0e 20 7e 	psubxs\.sh lr,lr,lr
-+ *[0-9a-f]*:	e8 04 20 77 	psubxs\.sh r7,r4,r4
-+ *[0-9a-f]*:	f0 03 20 77 	psubxs\.sh r7,r8,r3
-+ *[0-9a-f]*:	ec 05 20 7f 	psubxs\.sh pc,r6,r5
-+
-+[0-9a-f]* <padds_uh>:
-+ *[0-9a-f]*:	fe 0f 20 8f 	padds\.uh pc,pc,pc
-+ *[0-9a-f]*:	f8 0c 20 8c 	padds\.uh r12,r12,r12
-+ *[0-9a-f]*:	ea 05 20 85 	padds\.uh r5,r5,r5
-+ *[0-9a-f]*:	e8 04 20 84 	padds\.uh r4,r4,r4
-+ *[0-9a-f]*:	fc 0e 20 8e 	padds\.uh lr,lr,lr
-+ *[0-9a-f]*:	f6 07 20 8c 	padds\.uh r12,r11,r7
-+ *[0-9a-f]*:	f0 0e 20 87 	padds\.uh r7,r8,lr
-+ *[0-9a-f]*:	f2 07 20 86 	padds\.uh r6,r9,r7
-+
-+[0-9a-f]* <psubs_uh>:
-+ *[0-9a-f]*:	fe 0f 20 9f 	psubs\.uh pc,pc,pc
-+ *[0-9a-f]*:	f8 0c 20 9c 	psubs\.uh r12,r12,r12
-+ *[0-9a-f]*:	ea 05 20 95 	psubs\.uh r5,r5,r5
-+ *[0-9a-f]*:	e8 04 20 94 	psubs\.uh r4,r4,r4
-+ *[0-9a-f]*:	fc 0e 20 9e 	psubs\.uh lr,lr,lr
-+ *[0-9a-f]*:	f4 06 20 9e 	psubs\.uh lr,r10,r6
-+ *[0-9a-f]*:	e4 0f 20 9d 	psubs\.uh sp,r2,pc
-+ *[0-9a-f]*:	f2 02 20 92 	psubs\.uh r2,r9,r2
-+
-+[0-9a-f]* <paddxs_uh>:
-+ *[0-9a-f]*:	fe 0f 20 af 	paddxs\.uh pc,pc,pc
-+ *[0-9a-f]*:	f8 0c 20 ac 	paddxs\.uh r12,r12,r12
-+ *[0-9a-f]*:	ea 05 20 a5 	paddxs\.uh r5,r5,r5
-+ *[0-9a-f]*:	e8 04 20 a4 	paddxs\.uh r4,r4,r4
-+ *[0-9a-f]*:	fc 0e 20 ae 	paddxs\.uh lr,lr,lr
-+ *[0-9a-f]*:	f2 05 20 a7 	paddxs\.uh r7,r9,r5
-+ *[0-9a-f]*:	e2 04 20 a9 	paddxs\.uh r9,r1,r4
-+ *[0-9a-f]*:	e4 03 20 a5 	paddxs\.uh r5,r2,r3
-+
-+[0-9a-f]* <psubxs_uh>:
-+ *[0-9a-f]*:	fe 0f 20 bf 	psubxs\.uh pc,pc,pc
-+ *[0-9a-f]*:	f8 0c 20 bc 	psubxs\.uh r12,r12,r12
-+ *[0-9a-f]*:	ea 05 20 b5 	psubxs\.uh r5,r5,r5
-+ *[0-9a-f]*:	e8 04 20 b4 	psubxs\.uh r4,r4,r4
-+ *[0-9a-f]*:	fc 0e 20 be 	psubxs\.uh lr,lr,lr
-+ *[0-9a-f]*:	ea 0d 20 bd 	psubxs\.uh sp,r5,sp
-+ *[0-9a-f]*:	ec 06 20 bd 	psubxs\.uh sp,r6,r6
-+ *[0-9a-f]*:	f6 08 20 b3 	psubxs\.uh r3,r11,r8
-+
-+[0-9a-f]* <paddh_sh>:
-+ *[0-9a-f]*:	fe 0f 20 cf 	paddh\.sh pc,pc,pc
-+ *[0-9a-f]*:	f8 0c 20 cc 	paddh\.sh r12,r12,r12
-+ *[0-9a-f]*:	ea 05 20 c5 	paddh\.sh r5,r5,r5
-+ *[0-9a-f]*:	e8 04 20 c4 	paddh\.sh r4,r4,r4
-+ *[0-9a-f]*:	fc 0e 20 ce 	paddh\.sh lr,lr,lr
-+ *[0-9a-f]*:	fa 03 20 cc 	paddh\.sh r12,sp,r3
-+ *[0-9a-f]*:	ea 03 20 cf 	paddh\.sh pc,r5,r3
-+ *[0-9a-f]*:	f0 0d 20 c8 	paddh\.sh r8,r8,sp
-+
-+[0-9a-f]* <psubh_sh>:
-+ *[0-9a-f]*:	fe 0f 20 df 	psubh\.sh pc,pc,pc
-+ *[0-9a-f]*:	f8 0c 20 dc 	psubh\.sh r12,r12,r12
-+ *[0-9a-f]*:	ea 05 20 d5 	psubh\.sh r5,r5,r5
-+ *[0-9a-f]*:	e8 04 20 d4 	psubh\.sh r4,r4,r4
-+ *[0-9a-f]*:	fc 0e 20 de 	psubh\.sh lr,lr,lr
-+ *[0-9a-f]*:	ea 08 20 d1 	psubh\.sh r1,r5,r8
-+ *[0-9a-f]*:	e6 06 20 d7 	psubh\.sh r7,r3,r6
-+ *[0-9a-f]*:	e6 03 20 d4 	psubh\.sh r4,r3,r3
-+
-+[0-9a-f]* <paddxh_sh>:
-+ *[0-9a-f]*:	fe 0f 20 ef 	paddxh\.sh pc,pc,pc
-+ *[0-9a-f]*:	f8 0c 20 ec 	paddxh\.sh r12,r12,r12
-+ *[0-9a-f]*:	ea 05 20 e5 	paddxh\.sh r5,r5,r5
-+ *[0-9a-f]*:	e8 04 20 e4 	paddxh\.sh r4,r4,r4
-+ *[0-9a-f]*:	fc 0e 20 ee 	paddxh\.sh lr,lr,lr
-+ *[0-9a-f]*:	e0 04 20 e6 	paddxh\.sh r6,r0,r4
-+ *[0-9a-f]*:	f0 09 20 e9 	paddxh\.sh r9,r8,r9
-+ *[0-9a-f]*:	e0 0d 20 e3 	paddxh\.sh r3,r0,sp
-+
-+[0-9a-f]* <psubxh_sh>:
-+ *[0-9a-f]*:	fe 0f 20 ff 	psubxh\.sh pc,pc,pc
-+ *[0-9a-f]*:	f8 0c 20 fc 	psubxh\.sh r12,r12,r12
-+ *[0-9a-f]*:	ea 05 20 f5 	psubxh\.sh r5,r5,r5
-+ *[0-9a-f]*:	e8 04 20 f4 	psubxh\.sh r4,r4,r4
-+ *[0-9a-f]*:	fc 0e 20 fe 	psubxh\.sh lr,lr,lr
-+ *[0-9a-f]*:	fe 0c 20 f4 	psubxh\.sh r4,pc,r12
-+ *[0-9a-f]*:	e8 06 20 f8 	psubxh\.sh r8,r4,r6
-+ *[0-9a-f]*:	f2 04 20 fc 	psubxh\.sh r12,r9,r4
-+
-+[0-9a-f]* <paddsub_h>:
-+ *[0-9a-f]*:	fe 0f 21 0f 	paddsub\.h pc,pc:b,pc:b
-+ *[0-9a-f]*:	f8 0c 21 3c 	paddsub\.h r12,r12:t,r12:t
-+ *[0-9a-f]*:	ea 05 21 35 	paddsub\.h r5,r5:t,r5:t
-+ *[0-9a-f]*:	e8 04 21 04 	paddsub\.h r4,r4:b,r4:b
-+ *[0-9a-f]*:	fc 0e 21 3e 	paddsub\.h lr,lr:t,lr:t
-+ *[0-9a-f]*:	e4 0e 21 25 	paddsub\.h r5,r2:t,lr:b
-+ *[0-9a-f]*:	e2 08 21 07 	paddsub\.h r7,r1:b,r8:b
-+ *[0-9a-f]*:	f4 05 21 36 	paddsub\.h r6,r10:t,r5:t
-+
-+[0-9a-f]* <psubadd_h>:
-+ *[0-9a-f]*:	fe 0f 21 4f 	psubadd\.h pc,pc:b,pc:b
-+ *[0-9a-f]*:	f8 0c 21 7c 	psubadd\.h r12,r12:t,r12:t
-+ *[0-9a-f]*:	ea 05 21 75 	psubadd\.h r5,r5:t,r5:t
-+ *[0-9a-f]*:	e8 04 21 44 	psubadd\.h r4,r4:b,r4:b
-+ *[0-9a-f]*:	fc 0e 21 7e 	psubadd\.h lr,lr:t,lr:t
-+ *[0-9a-f]*:	f6 08 21 79 	psubadd\.h r9,r11:t,r8:t
-+ *[0-9a-f]*:	ee 0e 21 7a 	psubadd\.h r10,r7:t,lr:t
-+ *[0-9a-f]*:	fe 0f 21 66 	psubadd\.h r6,pc:t,pc:b
-+
-+[0-9a-f]* <paddsubs_sh>:
-+ *[0-9a-f]*:	fe 0f 21 8f 	paddsubs\.sh pc,pc:b,pc:b
-+ *[0-9a-f]*:	f8 0c 21 bc 	paddsubs\.sh r12,r12:t,r12:t
-+ *[0-9a-f]*:	ea 05 21 b5 	paddsubs\.sh r5,r5:t,r5:t
-+ *[0-9a-f]*:	e8 04 21 84 	paddsubs\.sh r4,r4:b,r4:b
-+ *[0-9a-f]*:	fc 0e 21 be 	paddsubs\.sh lr,lr:t,lr:t
-+ *[0-9a-f]*:	fc 00 21 a0 	paddsubs\.sh r0,lr:t,r0:b
-+ *[0-9a-f]*:	e4 04 21 b9 	paddsubs\.sh r9,r2:t,r4:t
-+ *[0-9a-f]*:	f2 0d 21 bc 	paddsubs\.sh r12,r9:t,sp:t
-+
-+[0-9a-f]* <psubadds_sh>:
-+ *[0-9a-f]*:	fe 0f 21 cf 	psubadds\.sh pc,pc:b,pc:b
-+ *[0-9a-f]*:	f8 0c 21 fc 	psubadds\.sh r12,r12:t,r12:t
-+ *[0-9a-f]*:	ea 05 21 f5 	psubadds\.sh r5,r5:t,r5:t
-+ *[0-9a-f]*:	e8 04 21 c4 	psubadds\.sh r4,r4:b,r4:b
-+ *[0-9a-f]*:	fc 0e 21 fe 	psubadds\.sh lr,lr:t,lr:t
-+ *[0-9a-f]*:	fc 01 21 df 	psubadds\.sh pc,lr:b,r1:t
-+ *[0-9a-f]*:	e6 0c 21 cb 	psubadds\.sh r11,r3:b,r12:b
-+ *[0-9a-f]*:	e4 08 21 fa 	psubadds\.sh r10,r2:t,r8:t
-+
-+[0-9a-f]* <paddsubs_uh>:
-+ *[0-9a-f]*:	fe 0f 22 0f 	paddsubs\.uh pc,pc:b,pc:b
-+ *[0-9a-f]*:	f8 0c 22 3c 	paddsubs\.uh r12,r12:t,r12:t
-+ *[0-9a-f]*:	ea 05 22 35 	paddsubs\.uh r5,r5:t,r5:t
-+ *[0-9a-f]*:	e8 04 22 04 	paddsubs\.uh r4,r4:b,r4:b
-+ *[0-9a-f]*:	fc 0e 22 3e 	paddsubs\.uh lr,lr:t,lr:t
-+ *[0-9a-f]*:	e4 03 22 09 	paddsubs\.uh r9,r2:b,r3:b
-+ *[0-9a-f]*:	fa 07 22 1d 	paddsubs\.uh sp,sp:b,r7:t
-+ *[0-9a-f]*:	e0 0a 22 1e 	paddsubs\.uh lr,r0:b,r10:t
-+
-+[0-9a-f]* <psubadds_uh>:
-+ *[0-9a-f]*:	fe 0f 22 4f 	psubadds\.uh pc,pc:b,pc:b
-+ *[0-9a-f]*:	f8 0c 22 7c 	psubadds\.uh r12,r12:t,r12:t
-+ *[0-9a-f]*:	ea 05 22 75 	psubadds\.uh r5,r5:t,r5:t
-+ *[0-9a-f]*:	e8 04 22 44 	psubadds\.uh r4,r4:b,r4:b
-+ *[0-9a-f]*:	fc 0e 22 7e 	psubadds\.uh lr,lr:t,lr:t
-+ *[0-9a-f]*:	f2 0f 22 7c 	psubadds\.uh r12,r9:t,pc:t
-+ *[0-9a-f]*:	ec 08 22 48 	psubadds\.uh r8,r6:b,r8:b
-+ *[0-9a-f]*:	f0 04 22 48 	psubadds\.uh r8,r8:b,r4:b
-+
-+[0-9a-f]* <paddsubh_sh>:
-+ *[0-9a-f]*:	fe 0f 22 8f 	paddsubh\.sh pc,pc:b,pc:b
-+ *[0-9a-f]*:	f8 0c 22 bc 	paddsubh\.sh r12,r12:t,r12:t
-+ *[0-9a-f]*:	ea 05 22 b5 	paddsubh\.sh r5,r5:t,r5:t
-+ *[0-9a-f]*:	e8 04 22 84 	paddsubh\.sh r4,r4:b,r4:b
-+ *[0-9a-f]*:	fc 0e 22 be 	paddsubh\.sh lr,lr:t,lr:t
-+ *[0-9a-f]*:	f2 09 22 a8 	paddsubh\.sh r8,r9:t,r9:b
-+ *[0-9a-f]*:	fa 01 22 b0 	paddsubh\.sh r0,sp:t,r1:t
-+ *[0-9a-f]*:	e2 00 22 93 	paddsubh\.sh r3,r1:b,r0:t
-+
-+[0-9a-f]* <psubaddh_sh>:
-+ *[0-9a-f]*:	fe 0f 22 cf 	psubaddh\.sh pc,pc:b,pc:b
-+ *[0-9a-f]*:	f8 0c 22 fc 	psubaddh\.sh r12,r12:t,r12:t
-+ *[0-9a-f]*:	ea 05 22 f5 	psubaddh\.sh r5,r5:t,r5:t
-+ *[0-9a-f]*:	e8 04 22 c4 	psubaddh\.sh r4,r4:b,r4:b
-+ *[0-9a-f]*:	fc 0e 22 fe 	psubaddh\.sh lr,lr:t,lr:t
-+ *[0-9a-f]*:	e6 0a 22 e7 	psubaddh\.sh r7,r3:t,r10:b
-+ *[0-9a-f]*:	e4 01 22 f7 	psubaddh\.sh r7,r2:t,r1:t
-+ *[0-9a-f]*:	e6 06 22 cb 	psubaddh\.sh r11,r3:b,r6:b
-+
-+[0-9a-f]* <padd_b>:
-+ *[0-9a-f]*:	fe 0f 23 0f 	padd\.b pc,pc,pc
-+ *[0-9a-f]*:	f8 0c 23 0c 	padd\.b r12,r12,r12
-+ *[0-9a-f]*:	ea 05 23 05 	padd\.b r5,r5,r5
-+ *[0-9a-f]*:	e8 04 23 04 	padd\.b r4,r4,r4
-+ *[0-9a-f]*:	fc 0e 23 0e 	padd\.b lr,lr,lr
-+ *[0-9a-f]*:	ec 0f 23 02 	padd\.b r2,r6,pc
-+ *[0-9a-f]*:	f2 0c 23 08 	padd\.b r8,r9,r12
-+ *[0-9a-f]*:	f8 03 23 05 	padd\.b r5,r12,r3
-+
-+[0-9a-f]* <psub_b>:
-+ *[0-9a-f]*:	fe 0f 23 1f 	psub\.b pc,pc,pc
-+ *[0-9a-f]*:	f8 0c 23 1c 	psub\.b r12,r12,r12
-+ *[0-9a-f]*:	ea 05 23 15 	psub\.b r5,r5,r5
-+ *[0-9a-f]*:	e8 04 23 14 	psub\.b r4,r4,r4
-+ *[0-9a-f]*:	fc 0e 23 1e 	psub\.b lr,lr,lr
-+ *[0-9a-f]*:	f8 0f 23 10 	psub\.b r0,r12,pc
-+ *[0-9a-f]*:	fa 0a 23 17 	psub\.b r7,sp,r10
-+ *[0-9a-f]*:	fa 0c 23 15 	psub\.b r5,sp,r12
-+
-+[0-9a-f]* <padds_sb>:
-+ *[0-9a-f]*:	fe 0f 23 2f 	padds\.sb pc,pc,pc
-+ *[0-9a-f]*:	f8 0c 23 2c 	padds\.sb r12,r12,r12
-+ *[0-9a-f]*:	ea 05 23 25 	padds\.sb r5,r5,r5
-+ *[0-9a-f]*:	e8 04 23 24 	padds\.sb r4,r4,r4
-+ *[0-9a-f]*:	fc 0e 23 2e 	padds\.sb lr,lr,lr
-+ *[0-9a-f]*:	f6 04 23 2d 	padds\.sb sp,r11,r4
-+ *[0-9a-f]*:	f4 0b 23 2b 	padds\.sb r11,r10,r11
-+ *[0-9a-f]*:	f8 06 23 25 	padds\.sb r5,r12,r6
-+
-+[0-9a-f]* <psubs_sb>:
-+ *[0-9a-f]*:	fe 0f 23 3f 	psubs\.sb pc,pc,pc
-+ *[0-9a-f]*:	f8 0c 23 3c 	psubs\.sb r12,r12,r12
-+ *[0-9a-f]*:	ea 05 23 35 	psubs\.sb r5,r5,r5
-+ *[0-9a-f]*:	e8 04 23 34 	psubs\.sb r4,r4,r4
-+ *[0-9a-f]*:	fc 0e 23 3e 	psubs\.sb lr,lr,lr
-+ *[0-9a-f]*:	ec 08 23 37 	psubs\.sb r7,r6,r8
-+ *[0-9a-f]*:	f4 09 23 3c 	psubs\.sb r12,r10,r9
-+ *[0-9a-f]*:	f6 00 23 3f 	psubs\.sb pc,r11,r0
-+
-+[0-9a-f]* <padds_ub>:
-+ *[0-9a-f]*:	fe 0f 23 4f 	padds\.ub pc,pc,pc
-+ *[0-9a-f]*:	f8 0c 23 4c 	padds\.ub r12,r12,r12
-+ *[0-9a-f]*:	ea 05 23 45 	padds\.ub r5,r5,r5
-+ *[0-9a-f]*:	e8 04 23 44 	padds\.ub r4,r4,r4
-+ *[0-9a-f]*:	fc 0e 23 4e 	padds\.ub lr,lr,lr
-+ *[0-9a-f]*:	e4 0b 23 43 	padds\.ub r3,r2,r11
-+ *[0-9a-f]*:	f0 01 23 4a 	padds\.ub r10,r8,r1
-+ *[0-9a-f]*:	f0 0a 23 4b 	padds\.ub r11,r8,r10
-+
-+[0-9a-f]* <psubs_ub>:
-+ *[0-9a-f]*:	fe 0f 23 5f 	psubs\.ub pc,pc,pc
-+ *[0-9a-f]*:	f8 0c 23 5c 	psubs\.ub r12,r12,r12
-+ *[0-9a-f]*:	ea 05 23 55 	psubs\.ub r5,r5,r5
-+ *[0-9a-f]*:	e8 04 23 54 	psubs\.ub r4,r4,r4
-+ *[0-9a-f]*:	fc 0e 23 5e 	psubs\.ub lr,lr,lr
-+ *[0-9a-f]*:	e4 07 23 50 	psubs\.ub r0,r2,r7
-+ *[0-9a-f]*:	ea 03 23 5e 	psubs\.ub lr,r5,r3
-+ *[0-9a-f]*:	ee 09 23 56 	psubs\.ub r6,r7,r9
-+
-+[0-9a-f]* <paddh_ub>:
-+ *[0-9a-f]*:	fe 0f 23 6f 	paddh\.ub pc,pc,pc
-+ *[0-9a-f]*:	f8 0c 23 6c 	paddh\.ub r12,r12,r12
-+ *[0-9a-f]*:	ea 05 23 65 	paddh\.ub r5,r5,r5
-+ *[0-9a-f]*:	e8 04 23 64 	paddh\.ub r4,r4,r4
-+ *[0-9a-f]*:	fc 0e 23 6e 	paddh\.ub lr,lr,lr
-+ *[0-9a-f]*:	e2 00 23 6e 	paddh\.ub lr,r1,r0
-+ *[0-9a-f]*:	ee 07 23 62 	paddh\.ub r2,r7,r7
-+ *[0-9a-f]*:	e2 02 23 62 	paddh\.ub r2,r1,r2
-+
-+[0-9a-f]* <psubh_ub>:
-+ *[0-9a-f]*:	fe 0f 23 7f 	psubh\.ub pc,pc,pc
-+ *[0-9a-f]*:	f8 0c 23 7c 	psubh\.ub r12,r12,r12
-+ *[0-9a-f]*:	ea 05 23 75 	psubh\.ub r5,r5,r5
-+ *[0-9a-f]*:	e8 04 23 74 	psubh\.ub r4,r4,r4
-+ *[0-9a-f]*:	fc 0e 23 7e 	psubh\.ub lr,lr,lr
-+ *[0-9a-f]*:	e2 06 23 70 	psubh\.ub r0,r1,r6
-+ *[0-9a-f]*:	fc 0a 23 74 	psubh\.ub r4,lr,r10
-+ *[0-9a-f]*:	f0 01 23 79 	psubh\.ub r9,r8,r1
-+
-+[0-9a-f]* <pmax_ub>:
-+ *[0-9a-f]*:	fe 0f 23 8f 	pmax\.ub pc,pc,pc
-+ *[0-9a-f]*:	f8 0c 23 8c 	pmax\.ub r12,r12,r12
-+ *[0-9a-f]*:	ea 05 23 85 	pmax\.ub r5,r5,r5
-+ *[0-9a-f]*:	e8 04 23 84 	pmax\.ub r4,r4,r4
-+ *[0-9a-f]*:	fc 0e 23 8e 	pmax\.ub lr,lr,lr
-+ *[0-9a-f]*:	e4 0b 23 8f 	pmax\.ub pc,r2,r11
-+ *[0-9a-f]*:	e2 01 23 8c 	pmax\.ub r12,r1,r1
-+ *[0-9a-f]*:	e4 00 23 85 	pmax\.ub r5,r2,r0
-+
-+[0-9a-f]* <pmax_sh>:
-+ *[0-9a-f]*:	fe 0f 23 9f 	pmax\.sh pc,pc,pc
-+ *[0-9a-f]*:	f8 0c 23 9c 	pmax\.sh r12,r12,r12
-+ *[0-9a-f]*:	ea 05 23 95 	pmax\.sh r5,r5,r5
-+ *[0-9a-f]*:	e8 04 23 94 	pmax\.sh r4,r4,r4
-+ *[0-9a-f]*:	fc 0e 23 9e 	pmax\.sh lr,lr,lr
-+ *[0-9a-f]*:	ec 0c 23 9e 	pmax\.sh lr,r6,r12
-+ *[0-9a-f]*:	fe 05 23 92 	pmax\.sh r2,pc,r5
-+ *[0-9a-f]*:	e4 07 23 9f 	pmax\.sh pc,r2,r7
-+
-+[0-9a-f]* <pmin_ub>:
-+ *[0-9a-f]*:	fe 0f 23 af 	pmin\.ub pc,pc,pc
-+ *[0-9a-f]*:	f8 0c 23 ac 	pmin\.ub r12,r12,r12
-+ *[0-9a-f]*:	ea 05 23 a5 	pmin\.ub r5,r5,r5
-+ *[0-9a-f]*:	e8 04 23 a4 	pmin\.ub r4,r4,r4
-+ *[0-9a-f]*:	fc 0e 23 ae 	pmin\.ub lr,lr,lr
-+ *[0-9a-f]*:	e2 05 23 a8 	pmin\.ub r8,r1,r5
-+ *[0-9a-f]*:	f0 03 23 a1 	pmin\.ub r1,r8,r3
-+ *[0-9a-f]*:	e4 07 23 a0 	pmin\.ub r0,r2,r7
-+
-+[0-9a-f]* <pmin_sh>:
-+ *[0-9a-f]*:	fe 0f 23 bf 	pmin\.sh pc,pc,pc
-+ *[0-9a-f]*:	f8 0c 23 bc 	pmin\.sh r12,r12,r12
-+ *[0-9a-f]*:	ea 05 23 b5 	pmin\.sh r5,r5,r5
-+ *[0-9a-f]*:	e8 04 23 b4 	pmin\.sh r4,r4,r4
-+ *[0-9a-f]*:	fc 0e 23 be 	pmin\.sh lr,lr,lr
-+ *[0-9a-f]*:	e8 0a 23 b8 	pmin\.sh r8,r4,r10
-+ *[0-9a-f]*:	f4 0c 23 be 	pmin\.sh lr,r10,r12
-+ *[0-9a-f]*:	ec 02 23 b2 	pmin\.sh r2,r6,r2
-+
-+[0-9a-f]* <pavg_ub>:
-+ *[0-9a-f]*:	fe 0f 23 cf 	pavg\.ub pc,pc,pc
-+ *[0-9a-f]*:	f8 0c 23 cc 	pavg\.ub r12,r12,r12
-+ *[0-9a-f]*:	ea 05 23 c5 	pavg\.ub r5,r5,r5
-+ *[0-9a-f]*:	e8 04 23 c4 	pavg\.ub r4,r4,r4
-+ *[0-9a-f]*:	fc 0e 23 ce 	pavg\.ub lr,lr,lr
-+ *[0-9a-f]*:	e2 06 23 c0 	pavg\.ub r0,r1,r6
-+ *[0-9a-f]*:	e6 06 23 c8 	pavg\.ub r8,r3,r6
-+ *[0-9a-f]*:	f8 0a 23 cf 	pavg\.ub pc,r12,r10
-+
-+[0-9a-f]* <pavg_sh>:
-+ *[0-9a-f]*:	fe 0f 23 df 	pavg\.sh pc,pc,pc
-+ *[0-9a-f]*:	f8 0c 23 dc 	pavg\.sh r12,r12,r12
-+ *[0-9a-f]*:	ea 05 23 d5 	pavg\.sh r5,r5,r5
-+ *[0-9a-f]*:	e8 04 23 d4 	pavg\.sh r4,r4,r4
-+ *[0-9a-f]*:	fc 0e 23 de 	pavg\.sh lr,lr,lr
-+ *[0-9a-f]*:	fe 0d 23 d9 	pavg\.sh r9,pc,sp
-+ *[0-9a-f]*:	fa 03 23 df 	pavg\.sh pc,sp,r3
-+ *[0-9a-f]*:	e2 09 23 d6 	pavg\.sh r6,r1,r9
-+
-+[0-9a-f]* <pabs_sb>:
-+ *[0-9a-f]*:	e0 0f 23 ef 	pabs\.sb pc,pc
-+ *[0-9a-f]*:	e0 0c 23 ec 	pabs\.sb r12,r12
-+ *[0-9a-f]*:	e0 05 23 e5 	pabs\.sb r5,r5
-+ *[0-9a-f]*:	e0 04 23 e4 	pabs\.sb r4,r4
-+ *[0-9a-f]*:	e0 0e 23 ee 	pabs\.sb lr,lr
-+ *[0-9a-f]*:	e0 06 23 eb 	pabs\.sb r11,r6
-+ *[0-9a-f]*:	e0 09 23 ee 	pabs\.sb lr,r9
-+ *[0-9a-f]*:	e0 07 23 ed 	pabs\.sb sp,r7
-+
-+[0-9a-f]* <pabs_sh>:
-+ *[0-9a-f]*:	e0 0f 23 ff 	pabs\.sh pc,pc
-+ *[0-9a-f]*:	e0 0c 23 fc 	pabs\.sh r12,r12
-+ *[0-9a-f]*:	e0 05 23 f5 	pabs\.sh r5,r5
-+ *[0-9a-f]*:	e0 04 23 f4 	pabs\.sh r4,r4
-+ *[0-9a-f]*:	e0 0e 23 fe 	pabs\.sh lr,lr
-+ *[0-9a-f]*:	e0 03 23 ff 	pabs\.sh pc,r3
-+ *[0-9a-f]*:	e0 07 23 f5 	pabs\.sh r5,r7
-+ *[0-9a-f]*:	e0 00 23 f4 	pabs\.sh r4,r0
-+
-+[0-9a-f]* <psad>:
-+ *[0-9a-f]*:	fe 0f 24 0f 	psad pc,pc,pc
-+ *[0-9a-f]*:	f8 0c 24 0c 	psad r12,r12,r12
-+ *[0-9a-f]*:	ea 05 24 05 	psad r5,r5,r5
-+ *[0-9a-f]*:	e8 04 24 04 	psad r4,r4,r4
-+ *[0-9a-f]*:	fc 0e 24 0e 	psad lr,lr,lr
-+ *[0-9a-f]*:	f6 0b 24 09 	psad r9,r11,r11
-+ *[0-9a-f]*:	e8 0d 24 0e 	psad lr,r4,sp
-+ *[0-9a-f]*:	e8 05 24 0e 	psad lr,r4,r5
-+
-+[0-9a-f]* <pasr_b>:
-+ *[0-9a-f]*:	fe 00 24 1f 	pasr\.b pc,pc,0x0
-+ *[0-9a-f]*:	f8 07 24 1c 	pasr\.b r12,r12,0x7
-+ *[0-9a-f]*:	ea 04 24 15 	pasr\.b r5,r5,0x4
-+ *[0-9a-f]*:	e8 03 24 14 	pasr\.b r4,r4,0x3
-+ *[0-9a-f]*:	fc 01 24 1e 	pasr\.b lr,lr,0x1
-+ *[0-9a-f]*:	ee 01 24 1f 	pasr\.b pc,r7,0x1
-+ *[0-9a-f]*:	fc 06 24 1d 	pasr\.b sp,lr,0x6
-+ *[0-9a-f]*:	e6 02 24 1d 	pasr\.b sp,r3,0x2
-+
-+[0-9a-f]* <plsl_b>:
-+ *[0-9a-f]*:	fe 00 24 2f 	plsl\.b pc,pc,0x0
-+ *[0-9a-f]*:	f8 07 24 2c 	plsl\.b r12,r12,0x7
-+ *[0-9a-f]*:	ea 04 24 25 	plsl\.b r5,r5,0x4
-+ *[0-9a-f]*:	e8 03 24 24 	plsl\.b r4,r4,0x3
-+ *[0-9a-f]*:	fc 01 24 2e 	plsl\.b lr,lr,0x1
-+ *[0-9a-f]*:	f6 04 24 22 	plsl\.b r2,r11,0x4
-+ *[0-9a-f]*:	ea 07 24 28 	plsl\.b r8,r5,0x7
-+ *[0-9a-f]*:	e0 02 24 2f 	plsl\.b pc,r0,0x2
-+
-+[0-9a-f]* <plsr_b>:
-+ *[0-9a-f]*:	fe 00 24 3f 	plsr\.b pc,pc,0x0
-+ *[0-9a-f]*:	f8 07 24 3c 	plsr\.b r12,r12,0x7
-+ *[0-9a-f]*:	ea 04 24 35 	plsr\.b r5,r5,0x4
-+ *[0-9a-f]*:	e8 03 24 34 	plsr\.b r4,r4,0x3
-+ *[0-9a-f]*:	fc 01 24 3e 	plsr\.b lr,lr,0x1
-+ *[0-9a-f]*:	e2 02 24 3c 	plsr\.b r12,r1,0x2
-+ *[0-9a-f]*:	fe 07 24 36 	plsr\.b r6,pc,0x7
-+ *[0-9a-f]*:	f6 02 24 3c 	plsr\.b r12,r11,0x2
-+
-+[0-9a-f]* <pasr_h>:
-+ *[0-9a-f]*:	fe 00 24 4f 	pasr\.h pc,pc,0x0
-+ *[0-9a-f]*:	f8 0f 24 4c 	pasr\.h r12,r12,0xf
-+ *[0-9a-f]*:	ea 08 24 45 	pasr\.h r5,r5,0x8
-+ *[0-9a-f]*:	e8 07 24 44 	pasr\.h r4,r4,0x7
-+ *[0-9a-f]*:	fc 01 24 4e 	pasr\.h lr,lr,0x1
-+ *[0-9a-f]*:	f6 0a 24 40 	pasr\.h r0,r11,0xa
-+ *[0-9a-f]*:	ec 08 24 44 	pasr\.h r4,r6,0x8
-+ *[0-9a-f]*:	e4 04 24 46 	pasr\.h r6,r2,0x4
-+
-+[0-9a-f]* <plsl_h>:
-+ *[0-9a-f]*:	fe 00 24 5f 	plsl\.h pc,pc,0x0
-+ *[0-9a-f]*:	f8 0f 24 5c 	plsl\.h r12,r12,0xf
-+ *[0-9a-f]*:	ea 08 24 55 	plsl\.h r5,r5,0x8
-+ *[0-9a-f]*:	e8 07 24 54 	plsl\.h r4,r4,0x7
-+ *[0-9a-f]*:	fc 01 24 5e 	plsl\.h lr,lr,0x1
-+ *[0-9a-f]*:	f4 09 24 55 	plsl\.h r5,r10,0x9
-+ *[0-9a-f]*:	fc 08 24 5d 	plsl\.h sp,lr,0x8
-+ *[0-9a-f]*:	fc 07 24 50 	plsl\.h r0,lr,0x7
-+
-+[0-9a-f]* <plsr_h>:
-+ *[0-9a-f]*:	fe 00 24 6f 	plsr\.h pc,pc,0x0
-+ *[0-9a-f]*:	f8 0f 24 6c 	plsr\.h r12,r12,0xf
-+ *[0-9a-f]*:	ea 08 24 65 	plsr\.h r5,r5,0x8
-+ *[0-9a-f]*:	e8 07 24 64 	plsr\.h r4,r4,0x7
-+ *[0-9a-f]*:	fc 01 24 6e 	plsr\.h lr,lr,0x1
-+ *[0-9a-f]*:	e0 0f 24 6b 	plsr\.h r11,r0,0xf
-+ *[0-9a-f]*:	e6 03 24 6e 	plsr\.h lr,r3,0x3
-+ *[0-9a-f]*:	fc 0a 24 68 	plsr\.h r8,lr,0xa
-+
-+[0-9a-f]* <packw_sh>:
-+ *[0-9a-f]*:	fe 0f 24 7f 	packw\.sh pc,pc,pc
-+ *[0-9a-f]*:	f8 0c 24 7c 	packw\.sh r12,r12,r12
-+ *[0-9a-f]*:	ea 05 24 75 	packw\.sh r5,r5,r5
-+ *[0-9a-f]*:	e8 04 24 74 	packw\.sh r4,r4,r4
-+ *[0-9a-f]*:	fc 0e 24 7e 	packw\.sh lr,lr,lr
-+ *[0-9a-f]*:	f6 0a 24 7d 	packw\.sh sp,r11,r10
-+ *[0-9a-f]*:	e4 0c 24 78 	packw\.sh r8,r2,r12
-+ *[0-9a-f]*:	e2 05 24 78 	packw\.sh r8,r1,r5
-+
-+[0-9a-f]* <punpckub_h>:
-+ *[0-9a-f]*:	fe 00 24 8f 	punpckub\.h pc,pc:b
-+ *[0-9a-f]*:	f8 00 24 9c 	punpckub\.h r12,r12:t
-+ *[0-9a-f]*:	ea 00 24 95 	punpckub\.h r5,r5:t
-+ *[0-9a-f]*:	e8 00 24 84 	punpckub\.h r4,r4:b
-+ *[0-9a-f]*:	fc 00 24 9e 	punpckub\.h lr,lr:t
-+ *[0-9a-f]*:	e2 00 24 96 	punpckub\.h r6,r1:t
-+ *[0-9a-f]*:	ea 00 24 8e 	punpckub\.h lr,r5:b
-+ *[0-9a-f]*:	e4 00 24 9e 	punpckub\.h lr,r2:t
-+
-+[0-9a-f]* <punpcksb_h>:
-+ *[0-9a-f]*:	fe 00 24 af 	punpcksb\.h pc,pc:b
-+ *[0-9a-f]*:	f8 00 24 bc 	punpcksb\.h r12,r12:t
-+ *[0-9a-f]*:	ea 00 24 b5 	punpcksb\.h r5,r5:t
-+ *[0-9a-f]*:	e8 00 24 a4 	punpcksb\.h r4,r4:b
-+ *[0-9a-f]*:	fc 00 24 be 	punpcksb\.h lr,lr:t
-+ *[0-9a-f]*:	ee 00 24 b4 	punpcksb\.h r4,r7:t
-+ *[0-9a-f]*:	fc 00 24 a6 	punpcksb\.h r6,lr:b
-+ *[0-9a-f]*:	f8 00 24 bc 	punpcksb\.h r12,r12:t
-+
-+[0-9a-f]* <packsh_ub>:
-+ *[0-9a-f]*:	fe 0f 24 cf 	packsh\.ub pc,pc,pc
-+ *[0-9a-f]*:	f8 0c 24 cc 	packsh\.ub r12,r12,r12
-+ *[0-9a-f]*:	ea 05 24 c5 	packsh\.ub r5,r5,r5
-+ *[0-9a-f]*:	e8 04 24 c4 	packsh\.ub r4,r4,r4
-+ *[0-9a-f]*:	fc 0e 24 ce 	packsh\.ub lr,lr,lr
-+ *[0-9a-f]*:	ec 03 24 c3 	packsh\.ub r3,r6,r3
-+ *[0-9a-f]*:	e0 03 24 c8 	packsh\.ub r8,r0,r3
-+ *[0-9a-f]*:	e6 0e 24 c9 	packsh\.ub r9,r3,lr
-+
-+[0-9a-f]* <packsh_sb>:
-+ *[0-9a-f]*:	fe 0f 24 df 	packsh\.sb pc,pc,pc
-+ *[0-9a-f]*:	f8 0c 24 dc 	packsh\.sb r12,r12,r12
-+ *[0-9a-f]*:	ea 05 24 d5 	packsh\.sb r5,r5,r5
-+ *[0-9a-f]*:	e8 04 24 d4 	packsh\.sb r4,r4,r4
-+ *[0-9a-f]*:	fc 0e 24 de 	packsh\.sb lr,lr,lr
-+ *[0-9a-f]*:	f0 01 24 d6 	packsh\.sb r6,r8,r1
-+ *[0-9a-f]*:	f2 08 24 de 	packsh\.sb lr,r9,r8
-+ *[0-9a-f]*:	ec 06 24 dd 	packsh\.sb sp,r6,r6
-+
-+[0-9a-f]* <andl>:
-+ *[0-9a-f]*:	e0 1f 00 00 	andl pc,0x0
-+ *[0-9a-f]*:	e0 1c ff ff 	andl r12,0xffff
-+ *[0-9a-f]*:	e0 15 80 00 	andl r5,0x8000
-+ *[0-9a-f]*:	e0 14 7f ff 	andl r4,0x7fff
-+ *[0-9a-f]*:	e0 1e 00 01 	andl lr,0x1
-+ *[0-9a-f]*:	e0 1f 5a 58 	andl pc,0x5a58
-+ *[0-9a-f]*:	e0 18 b8 9e 	andl r8,0xb89e
-+ *[0-9a-f]*:	e0 17 35 97 	andl r7,0x3597
-+
-+[0-9a-f]* <andl_coh>:
-+ *[0-9a-f]*:	e2 1f 00 00 	andl pc,0x0,COH
-+ *[0-9a-f]*:	e2 1c ff ff 	andl r12,0xffff,COH
-+ *[0-9a-f]*:	e2 15 80 00 	andl r5,0x8000,COH
-+ *[0-9a-f]*:	e2 14 7f ff 	andl r4,0x7fff,COH
-+ *[0-9a-f]*:	e2 1e 00 01 	andl lr,0x1,COH
-+ *[0-9a-f]*:	e2 16 58 e1 	andl r6,0x58e1,COH
-+ *[0-9a-f]*:	e2 10 9e cd 	andl r0,0x9ecd,COH
-+ *[0-9a-f]*:	e2 14 bd c4 	andl r4,0xbdc4,COH
-+
-+[0-9a-f]* <andh>:
-+ *[0-9a-f]*:	e4 1f 00 00 	andh pc,0x0
-+ *[0-9a-f]*:	e4 1c ff ff 	andh r12,0xffff
-+ *[0-9a-f]*:	e4 15 80 00 	andh r5,0x8000
-+ *[0-9a-f]*:	e4 14 7f ff 	andh r4,0x7fff
-+ *[0-9a-f]*:	e4 1e 00 01 	andh lr,0x1
-+ *[0-9a-f]*:	e4 1c cc 58 	andh r12,0xcc58
-+ *[0-9a-f]*:	e4 13 21 e3 	andh r3,0x21e3
-+ *[0-9a-f]*:	e4 12 a7 eb 	andh r2,0xa7eb
-+
-+[0-9a-f]* <andh_coh>:
-+ *[0-9a-f]*:	e6 1f 00 00 	andh pc,0x0,COH
-+ *[0-9a-f]*:	e6 1c ff ff 	andh r12,0xffff,COH
-+ *[0-9a-f]*:	e6 15 80 00 	andh r5,0x8000,COH
-+ *[0-9a-f]*:	e6 14 7f ff 	andh r4,0x7fff,COH
-+ *[0-9a-f]*:	e6 1e 00 01 	andh lr,0x1,COH
-+ *[0-9a-f]*:	e6 1b 86 0d 	andh r11,0x860d,COH
-+ *[0-9a-f]*:	e6 18 ce f6 	andh r8,0xcef6,COH
-+ *[0-9a-f]*:	e6 1a 5c 83 	andh r10,0x5c83,COH
-+
-+[0-9a-f]* <orl>:
-+ *[0-9a-f]*:	e8 1f 00 00 	orl pc,0x0
-+ *[0-9a-f]*:	e8 1c ff ff 	orl r12,0xffff
-+ *[0-9a-f]*:	e8 15 80 00 	orl r5,0x8000
-+ *[0-9a-f]*:	e8 14 7f ff 	orl r4,0x7fff
-+ *[0-9a-f]*:	e8 1e 00 01 	orl lr,0x1
-+ *[0-9a-f]*:	e8 1d 41 7e 	orl sp,0x417e
-+ *[0-9a-f]*:	e8 10 52 bd 	orl r0,0x52bd
-+ *[0-9a-f]*:	e8 1f ac 47 	orl pc,0xac47
-+
-+[0-9a-f]* <orh>:
-+ *[0-9a-f]*:	ea 1f 00 00 	orh pc,0x0
-+ *[0-9a-f]*:	ea 1c ff ff 	orh r12,0xffff
-+ *[0-9a-f]*:	ea 15 80 00 	orh r5,0x8000
-+ *[0-9a-f]*:	ea 14 7f ff 	orh r4,0x7fff
-+ *[0-9a-f]*:	ea 1e 00 01 	orh lr,0x1
-+ *[0-9a-f]*:	ea 18 6e 7d 	orh r8,0x6e7d
-+ *[0-9a-f]*:	ea 1c 77 1c 	orh r12,0x771c
-+ *[0-9a-f]*:	ea 11 ea 1a 	orh r1,0xea1a
-+
-+[0-9a-f]* <eorl>:
-+ *[0-9a-f]*:	ec 1f 00 00 	eorl pc,0x0
-+ *[0-9a-f]*:	ec 1c ff ff 	eorl r12,0xffff
-+ *[0-9a-f]*:	ec 15 80 00 	eorl r5,0x8000
-+ *[0-9a-f]*:	ec 14 7f ff 	eorl r4,0x7fff
-+ *[0-9a-f]*:	ec 1e 00 01 	eorl lr,0x1
-+ *[0-9a-f]*:	ec 14 c7 b9 	eorl r4,0xc7b9
-+ *[0-9a-f]*:	ec 16 fb dd 	eorl r6,0xfbdd
-+ *[0-9a-f]*:	ec 11 51 b1 	eorl r1,0x51b1
-+
-+[0-9a-f]* <eorh>:
-+ *[0-9a-f]*:	ee 1f 00 00 	eorh pc,0x0
-+ *[0-9a-f]*:	ee 1c ff ff 	eorh r12,0xffff
-+ *[0-9a-f]*:	ee 15 80 00 	eorh r5,0x8000
-+ *[0-9a-f]*:	ee 14 7f ff 	eorh r4,0x7fff
-+ *[0-9a-f]*:	ee 1e 00 01 	eorh lr,0x1
-+ *[0-9a-f]*:	ee 10 2d d4 	eorh r0,0x2dd4
-+ *[0-9a-f]*:	ee 1a 94 b5 	eorh r10,0x94b5
-+ *[0-9a-f]*:	ee 19 df 2a 	eorh r9,0xdf2a
-+
-+[0-9a-f]* <mcall>:
-+ *[0-9a-f]*:	f0 1f 00 00 	mcall [0-9a-f]* <.*>
-+ *[0-9a-f]*:	f0 1c ff ff 	mcall r12\[-4\]
-+ *[0-9a-f]*:	f0 15 80 00 	mcall r5\[-131072\]
-+ *[0-9a-f]*:	f0 14 7f ff 	mcall r4\[131068\]
-+ *[0-9a-f]*:	f0 1e 00 01 	mcall lr\[4\]
-+ *[0-9a-f]*:	f0 1d 3b bf 	mcall sp\[61180\]
-+ *[0-9a-f]*:	f0 14 dd d2 	mcall r4\[-35000\]
-+ *[0-9a-f]*:	f0 10 09 b1 	mcall r0\[9924\]
-+
-+[0-9a-f]* <pref>:
-+ *[0-9a-f]*:	f2 1f 00 00 	pref pc\[0\]
-+ *[0-9a-f]*:	f2 1c ff ff 	pref r12\[-1\]
-+ *[0-9a-f]*:	f2 15 80 00 	pref r5\[-32768\]
-+ *[0-9a-f]*:	f2 14 7f ff 	pref r4\[32767\]
-+ *[0-9a-f]*:	f2 1e 00 01 	pref lr\[1\]
-+ *[0-9a-f]*:	f2 17 1e 44 	pref r7\[7748\]
-+ *[0-9a-f]*:	f2 17 e1 ed 	pref r7\[-7699\]
-+ *[0-9a-f]*:	f2 12 9a dc 	pref r2\[-25892\]
-+
-+[0-9a-f]* <cache>:
-+ *[0-9a-f]*:	f4 1f 00 00 	cache pc\[0\],0x0
-+ *[0-9a-f]*:	f4 1c ff ff 	cache r12\[-1\],0x1f
-+ *[0-9a-f]*:	f4 15 84 00 	cache r5\[-1024\],0x10
-+ *[0-9a-f]*:	f4 14 7b ff 	cache r4\[1023\],0xf
-+ *[0-9a-f]*:	f4 1e 08 01 	cache lr\[1\],0x1
-+ *[0-9a-f]*:	f4 13 8c 3c 	cache r3\[-964\],0x11
-+ *[0-9a-f]*:	f4 14 b6 89 	cache r4\[-375\],0x16
-+ *[0-9a-f]*:	f4 13 8c 88 	cache r3\[-888\],0x11
-+
-+[0-9a-f]* <sub4>:
-+ *[0-9a-f]*:	20 0f       	sub pc,0
-+ *[0-9a-f]*:	2f fc       	sub r12,-1
-+ *[0-9a-f]*:	f0 25 00 00 	sub r5,-1048576
-+ *[0-9a-f]*:	ee 34 ff ff 	sub r4,1048575
-+ *[0-9a-f]*:	20 1e       	sub lr,1
-+ *[0-9a-f]*:	f6 22 8d 6c 	sub r2,-619156
-+ *[0-9a-f]*:	e6 3e 0a cd 	sub lr,461517
-+ *[0-9a-f]*:	fc 38 2d 25 	sub r8,-185051
-+
-+[0-9a-f]* <cp3>:
-+ *[0-9a-f]*:	58 0f       	cp.w pc,0
-+ *[0-9a-f]*:	5b fc       	cp.w r12,-1
-+ *[0-9a-f]*:	f0 45 00 00 	cp.w r5,-1048576
-+ *[0-9a-f]*:	ee 54 ff ff 	cp.w r4,1048575
-+ *[0-9a-f]*:	58 1e       	cp.w lr,1
-+ *[0-9a-f]*:	e0 51 e4 ae 	cp.w r1,124078
-+ *[0-9a-f]*:	fa 40 37 e3 	cp.w r0,-378909
-+ *[0-9a-f]*:	fc 44 4a 14 	cp.w r4,-243180
-+
-+[0-9a-f]* <mov2>:
-+ *[0-9a-f]*:	30 0f       	mov pc,0
-+ *[0-9a-f]*:	3f fc       	mov r12,-1
-+ *[0-9a-f]*:	f0 65 00 00 	mov r5,-1048576
-+ *[0-9a-f]*:	ee 74 ff ff 	mov r4,1048575
-+ *[0-9a-f]*:	30 1e       	mov lr,1
-+ *[0-9a-f]*:	fa 75 29 a3 	mov r5,-317021
-+ *[0-9a-f]*:	f4 6d 91 94 	mov sp,-749164
-+ *[0-9a-f]*:	ee 65 58 93 	mov r5,940179
-+
-+[0-9a-f]* <brc2>:
-+ *[0-9a-f]*:	c0 00       	breq [0-9a-f]* <.*>
-+ *[0-9a-f]*:	fe 9f ff ff 	bral [0-9a-f]* <.*>
-+ *[0-9a-f]*:	f0 88 00 00 	brls [0-9a-f]* <.*>
-+ *[0-9a-f]*:	ee 97 ff ff 	brpl [0-9a-f]* <.*>
-+ *[0-9a-f]*:	c0 11       	brne [0-9a-f]* <.*>
-+ *[0-9a-f]*:	f2 8b 4a 4d 	brhi [0-9a-f]* <.*>
-+ *[0-9a-f]*:	ea 8e 14 cc 	brqs [0-9a-f]* <.*>
-+ *[0-9a-f]*:	fa 98 98 33 	brls [0-9a-f]* <.*>
-+
-+[0-9a-f]* <rcall2>:
-+ *[0-9a-f]*:	c0 0c       	rcall [0-9a-f]* <.*>
-+ *[0-9a-f]*:	cf ff       	rcall [0-9a-f]* <.*>
-+ *[0-9a-f]*:	f0 a0 00 00 	rcall [0-9a-f]* <.*>
-+ *[0-9a-f]*:	ee b0 ff ff 	rcall [0-9a-f]* <.*>
-+ *[0-9a-f]*:	c0 1c       	rcall [0-9a-f]* <.*>
-+ *[0-9a-f]*:	e2 b0 ca 5a 	rcall [0-9a-f]* <.*>
-+ *[0-9a-f]*:	e8 a0 47 52 	rcall [0-9a-f]* <.*>
-+ *[0-9a-f]*:	fe b0 fd ef 	rcall [0-9a-f]* <.*>
-+
-+[0-9a-f]* <sub5>:
-+ *[0-9a-f]*:	fe cf 00 00 	sub pc,pc,0
-+ *[0-9a-f]*:	f8 cc ff ff 	sub r12,r12,-1
-+ *[0-9a-f]*:	ea c5 80 00 	sub r5,r5,-32768
-+ *[0-9a-f]*:	e8 c4 7f ff 	sub r4,r4,32767
-+ *[0-9a-f]*:	fc ce 00 01 	sub lr,lr,1
-+ *[0-9a-f]*:	fe cf ce 38 	sub pc,pc,-12744
-+ *[0-9a-f]*:	ee c7 95 1b 	sub r7,r7,-27365
-+ *[0-9a-f]*:	f2 c2 bc 32 	sub r2,r9,-17358
-+
-+[0-9a-f]* <satsub_w2>:
-+ *[0-9a-f]*:	fe df 00 00 	satsub\.w pc,pc,0
-+ *[0-9a-f]*:	f8 dc ff ff 	satsub\.w r12,r12,-1
-+ *[0-9a-f]*:	ea d5 80 00 	satsub\.w r5,r5,-32768
-+ *[0-9a-f]*:	e8 d4 7f ff 	satsub\.w r4,r4,32767
-+ *[0-9a-f]*:	fc de 00 01 	satsub\.w lr,lr,1
-+ *[0-9a-f]*:	fc d2 f8 29 	satsub\.w r2,lr,-2007
-+ *[0-9a-f]*:	f8 d7 fc f0 	satsub\.w r7,r12,-784
-+ *[0-9a-f]*:	ee d4 5a 8c 	satsub\.w r4,r7,23180
-+
-+[0-9a-f]* <ld_d4>:
-+ *[0-9a-f]*:	fe e0 00 00 	ld\.d r0,pc\[0\]
-+ *[0-9a-f]*:	f8 ee ff ff 	ld\.d lr,r12\[-1\]
-+ *[0-9a-f]*:	ea e8 80 00 	ld\.d r8,r5\[-32768\]
-+ *[0-9a-f]*:	e8 e6 7f ff 	ld\.d r6,r4\[32767\]
-+ *[0-9a-f]*:	fc e2 00 01 	ld\.d r2,lr\[1\]
-+ *[0-9a-f]*:	f6 ee 39 c0 	ld\.d lr,r11\[14784\]
-+ *[0-9a-f]*:	f2 e6 b6 27 	ld\.d r6,r9\[-18905\]
-+ *[0-9a-f]*:	e6 e2 e7 2d 	ld\.d r2,r3\[-6355\]
-+
-+[0-9a-f]* <ld_w4>:
-+ *[0-9a-f]*:	7e 0f       	ld\.w pc,pc\[0x0\]
-+ *[0-9a-f]*:	f8 fc ff ff 	ld\.w r12,r12\[-1\]
-+ *[0-9a-f]*:	ea f5 80 00 	ld\.w r5,r5\[-32768\]
-+ *[0-9a-f]*:	e8 f4 7f ff 	ld\.w r4,r4\[32767\]
-+ *[0-9a-f]*:	fc fe 00 01 	ld\.w lr,lr\[1\]
-+ *[0-9a-f]*:	f8 f0 a9 8b 	ld\.w r0,r12\[-22133\]
-+ *[0-9a-f]*:	fe fd af d7 	ld\.w sp,pc\[-20521\]
-+ *[0-9a-f]*:	d7 03       	nop
-+
-+[0-9a-f]* <ld_sh4>:
-+ *[0-9a-f]*:	9e 0f       	ld\.sh pc,pc\[0x0\]
-+ *[0-9a-f]*:	f9 0c ff ff 	ld\.sh r12,r12\[-1\]
-+ *[0-9a-f]*:	eb 05 80 00 	ld\.sh r5,r5\[-32768\]
-+ *[0-9a-f]*:	e9 04 7f ff 	ld\.sh r4,r4\[32767\]
-+ *[0-9a-f]*:	fd 0e 00 01 	ld\.sh lr,lr\[1\]
-+ *[0-9a-f]*:	f5 06 78 d2 	ld\.sh r6,r10\[30930\]
-+ *[0-9a-f]*:	f5 06 55 d5 	ld\.sh r6,r10\[21973\]
-+ *[0-9a-f]*:	d7 03       	nop
-+
-+[0-9a-f]* <ld_uh4>:
-+ *[0-9a-f]*:	9e 8f       	ld\.uh pc,pc\[0x0\]
-+ *[0-9a-f]*:	f9 1c ff ff 	ld\.uh r12,r12\[-1\]
-+ *[0-9a-f]*:	eb 15 80 00 	ld\.uh r5,r5\[-32768\]
-+ *[0-9a-f]*:	e9 14 7f ff 	ld\.uh r4,r4\[32767\]
-+ *[0-9a-f]*:	fd 1e 00 01 	ld\.uh lr,lr\[1\]
-+ *[0-9a-f]*:	f3 11 cb d6 	ld\.uh r1,r9\[-13354\]
-+ *[0-9a-f]*:	f7 1e 53 59 	ld\.uh lr,r11\[21337\]
-+ *[0-9a-f]*:	d7 03       	nop
-+
-+[0-9a-f]* <ld_sb1>:
-+ *[0-9a-f]*:	ff 2f 00 00 	ld\.sb pc,pc\[0\]
-+ *[0-9a-f]*:	f9 2c ff ff 	ld\.sb r12,r12\[-1\]
-+ *[0-9a-f]*:	eb 25 80 00 	ld\.sb r5,r5\[-32768\]
-+ *[0-9a-f]*:	e9 24 7f ff 	ld\.sb r4,r4\[32767\]
-+ *[0-9a-f]*:	fd 2e 00 01 	ld\.sb lr,lr\[1\]
-+ *[0-9a-f]*:	fb 27 90 09 	ld\.sb r7,sp\[-28663\]
-+ *[0-9a-f]*:	e3 22 e9 09 	ld\.sb r2,r1\[-5879\]
-+ *[0-9a-f]*:	e7 2c 49 2e 	ld\.sb r12,r3\[18734\]
-+
-+[0-9a-f]* <ld_ub4>:
-+ *[0-9a-f]*:	1f 8f       	ld\.ub pc,pc\[0x0\]
-+ *[0-9a-f]*:	f9 3c ff ff 	ld\.ub r12,r12\[-1\]
-+ *[0-9a-f]*:	eb 35 80 00 	ld\.ub r5,r5\[-32768\]
-+ *[0-9a-f]*:	e9 34 7f ff 	ld\.ub r4,r4\[32767\]
-+ *[0-9a-f]*:	1d 9e       	ld\.ub lr,lr\[0x1\]
-+ *[0-9a-f]*:	e9 3f 20 55 	ld\.ub pc,r4\[8277\]
-+ *[0-9a-f]*:	f9 35 4a e4 	ld\.ub r5,r12\[19172\]
-+ *[0-9a-f]*:	fd 3a 66 eb 	ld\.ub r10,lr\[26347\]
-+
-+[0-9a-f]* <st_d4>:
-+ *[0-9a-f]*:	fe e1 00 00 	st\.d pc\[0\],r0
-+ *[0-9a-f]*:	f8 ef ff ff 	st\.d r12\[-1\],lr
-+ *[0-9a-f]*:	ea e9 80 00 	st\.d r5\[-32768\],r8
-+ *[0-9a-f]*:	e8 e7 7f ff 	st\.d r4\[32767\],r6
-+ *[0-9a-f]*:	fc e3 00 01 	st\.d lr\[1\],r2
-+ *[0-9a-f]*:	ea eb 33 90 	st\.d r5\[13200\],r10
-+ *[0-9a-f]*:	ea eb 24 88 	st\.d r5\[9352\],r10
-+ *[0-9a-f]*:	ea e5 7e 75 	st\.d r5\[32373\],r4
-+
-+[0-9a-f]* <st_w4>:
-+ *[0-9a-f]*:	9f 0f       	st\.w pc\[0x0\],pc
-+ *[0-9a-f]*:	f9 4c ff ff 	st\.w r12\[-1\],r12
-+ *[0-9a-f]*:	eb 45 80 00 	st\.w r5\[-32768\],r5
-+ *[0-9a-f]*:	e9 44 7f ff 	st\.w r4\[32767\],r4
-+ *[0-9a-f]*:	fd 4e 00 01 	st\.w lr\[1\],lr
-+ *[0-9a-f]*:	fb 47 17 f8 	st\.w sp\[6136\],r7
-+ *[0-9a-f]*:	ed 4c 69 cf 	st\.w r6\[27087\],r12
-+ *[0-9a-f]*:	d7 03       	nop
-+
-+[0-9a-f]* <st_h4>:
-+ *[0-9a-f]*:	be 0f       	st\.h pc\[0x0\],pc
-+ *[0-9a-f]*:	f9 5c ff ff 	st\.h r12\[-1\],r12
-+ *[0-9a-f]*:	eb 55 80 00 	st\.h r5\[-32768\],r5
-+ *[0-9a-f]*:	e9 54 7f ff 	st\.h r4\[32767\],r4
-+ *[0-9a-f]*:	fd 5e 00 01 	st\.h lr\[1\],lr
-+ *[0-9a-f]*:	e9 57 d9 16 	st\.h r4\[-9962\],r7
-+ *[0-9a-f]*:	f3 53 c0 86 	st\.h r9\[-16250\],r3
-+ *[0-9a-f]*:	d7 03       	nop
-+
-+[0-9a-f]* <st_b4>:
-+ *[0-9a-f]*:	be 8f       	st\.b pc\[0x0\],pc
-+ *[0-9a-f]*:	f9 6c ff ff 	st\.b r12\[-1\],r12
-+ *[0-9a-f]*:	eb 65 80 00 	st\.b r5\[-32768\],r5
-+ *[0-9a-f]*:	e9 64 7f ff 	st\.b r4\[32767\],r4
-+ *[0-9a-f]*:	bc 9e       	st\.b lr\[0x1\],lr
-+ *[0-9a-f]*:	f9 66 75 96 	st\.b r12\[30102\],r6
-+ *[0-9a-f]*:	eb 61 71 31 	st\.b r5\[28977\],r1
-+ *[0-9a-f]*:	e1 61 15 5e 	st\.b r0\[5470\],r1
-+
-+[0-9a-f]* <mfsr>:
-+ *[0-9a-f]*:	e1 bf 00 00 	mfsr pc,0x0
-+ *[0-9a-f]*:	e1 bc 00 ff 	mfsr r12,0x3fc
-+ *[0-9a-f]*:	e1 b5 00 80 	mfsr r5,0x200
-+ *[0-9a-f]*:	e1 b4 00 7f 	mfsr r4,0x1fc
-+ *[0-9a-f]*:	e1 be 00 01 	mfsr lr,0x4
-+ *[0-9a-f]*:	e1 b2 00 ae 	mfsr r2,0x2b8
-+ *[0-9a-f]*:	e1 b4 00 41 	mfsr r4,0x104
-+ *[0-9a-f]*:	e1 ba 00 fe 	mfsr r10,0x3f8
-+
-+[0-9a-f]* <mtsr>:
-+ *[0-9a-f]*:	e3 bf 00 00 	mtsr 0x0,pc
-+ *[0-9a-f]*:	e3 bc 00 ff 	mtsr 0x3fc,r12
-+ *[0-9a-f]*:	e3 b5 00 80 	mtsr 0x200,r5
-+ *[0-9a-f]*:	e3 b4 00 7f 	mtsr 0x1fc,r4
-+ *[0-9a-f]*:	e3 be 00 01 	mtsr 0x4,lr
-+ *[0-9a-f]*:	e3 ba 00 38 	mtsr 0xe0,r10
-+ *[0-9a-f]*:	e3 bc 00 d1 	mtsr 0x344,r12
-+ *[0-9a-f]*:	e3 b9 00 4c 	mtsr 0x130,r9
-+
-+[0-9a-f]* <mfdr>:
-+ *[0-9a-f]*:	e5 bf 00 00 	mfdr pc,0x0
-+ *[0-9a-f]*:	e5 bc 00 ff 	mfdr r12,0x3fc
-+ *[0-9a-f]*:	e5 b5 00 80 	mfdr r5,0x200
-+ *[0-9a-f]*:	e5 b4 00 7f 	mfdr r4,0x1fc
-+ *[0-9a-f]*:	e5 be 00 01 	mfdr lr,0x4
-+ *[0-9a-f]*:	e5 b6 00 e9 	mfdr r6,0x3a4
-+ *[0-9a-f]*:	e5 b5 00 09 	mfdr r5,0x24
-+ *[0-9a-f]*:	e5 b9 00 4b 	mfdr r9,0x12c
-+
-+[0-9a-f]* <mtdr>:
-+ *[0-9a-f]*:	e7 bf 00 00 	mtdr 0x0,pc
-+ *[0-9a-f]*:	e7 bc 00 ff 	mtdr 0x3fc,r12
-+ *[0-9a-f]*:	e7 b5 00 80 	mtdr 0x200,r5
-+ *[0-9a-f]*:	e7 b4 00 7f 	mtdr 0x1fc,r4
-+ *[0-9a-f]*:	e7 be 00 01 	mtdr 0x4,lr
-+ *[0-9a-f]*:	e7 b8 00 2d 	mtdr 0xb4,r8
-+ *[0-9a-f]*:	e7 ba 00 b4 	mtdr 0x2d0,r10
-+ *[0-9a-f]*:	e7 be 00 66 	mtdr 0x198,lr
-+
-+[0-9a-f]* <sleep>:
-+ *[0-9a-f]*:	e9 b0 00 00 	sleep 0x0
-+ *[0-9a-f]*:	e9 b0 00 ff 	sleep 0xff
-+ *[0-9a-f]*:	e9 b0 00 80 	sleep 0x80
-+ *[0-9a-f]*:	e9 b0 00 7f 	sleep 0x7f
-+ *[0-9a-f]*:	e9 b0 00 01 	sleep 0x1
-+ *[0-9a-f]*:	e9 b0 00 fe 	sleep 0xfe
-+ *[0-9a-f]*:	e9 b0 00 0f 	sleep 0xf
-+ *[0-9a-f]*:	e9 b0 00 2b 	sleep 0x2b
-+
-+[0-9a-f]* <sync>:
-+ *[0-9a-f]*:	eb b0 00 00 	sync 0x0
-+ *[0-9a-f]*:	eb b0 00 ff 	sync 0xff
-+ *[0-9a-f]*:	eb b0 00 80 	sync 0x80
-+ *[0-9a-f]*:	eb b0 00 7f 	sync 0x7f
-+ *[0-9a-f]*:	eb b0 00 01 	sync 0x1
-+ *[0-9a-f]*:	eb b0 00 a6 	sync 0xa6
-+ *[0-9a-f]*:	eb b0 00 e6 	sync 0xe6
-+ *[0-9a-f]*:	eb b0 00 b4 	sync 0xb4
-+
-+[0-9a-f]* <bld>:
-+ *[0-9a-f]*:	ed bf 00 00 	bld pc,0x0
-+ *[0-9a-f]*:	ed bc 00 1f 	bld r12,0x1f
-+ *[0-9a-f]*:	ed b5 00 10 	bld r5,0x10
-+ *[0-9a-f]*:	ed b4 00 0f 	bld r4,0xf
-+ *[0-9a-f]*:	ed be 00 01 	bld lr,0x1
-+ *[0-9a-f]*:	ed b9 00 0f 	bld r9,0xf
-+ *[0-9a-f]*:	ed b0 00 04 	bld r0,0x4
-+ *[0-9a-f]*:	ed be 00 1a 	bld lr,0x1a
-+
-+[0-9a-f]* <bst>:
-+ *[0-9a-f]*:	ef bf 00 00 	bst pc,0x0
-+ *[0-9a-f]*:	ef bc 00 1f 	bst r12,0x1f
-+ *[0-9a-f]*:	ef b5 00 10 	bst r5,0x10
-+ *[0-9a-f]*:	ef b4 00 0f 	bst r4,0xf
-+ *[0-9a-f]*:	ef be 00 01 	bst lr,0x1
-+ *[0-9a-f]*:	ef ba 00 1c 	bst r10,0x1c
-+ *[0-9a-f]*:	ef b0 00 03 	bst r0,0x3
-+ *[0-9a-f]*:	ef bd 00 02 	bst sp,0x2
-+
-+[0-9a-f]* <sats>:
-+ *[0-9a-f]*:	f1 bf 00 00 	sats pc,0x0
-+ *[0-9a-f]*:	f1 bc 03 ff 	sats r12>>0x1f,0x1f
-+ *[0-9a-f]*:	f1 b5 02 10 	sats r5>>0x10,0x10
-+ *[0-9a-f]*:	f1 b4 01 ef 	sats r4>>0xf,0xf
-+ *[0-9a-f]*:	f1 be 00 21 	sats lr>>0x1,0x1
-+ *[0-9a-f]*:	f1 ba 02 63 	sats r10>>0x3,0x13
-+ *[0-9a-f]*:	f1 ba 03 42 	sats r10>>0x2,0x1a
-+ *[0-9a-f]*:	f1 b1 00 34 	sats r1>>0x14,0x1
-+
-+[0-9a-f]* <satu>:
-+ *[0-9a-f]*:	f1 bf 04 00 	satu pc,0x0
-+ *[0-9a-f]*:	f1 bc 07 ff 	satu r12>>0x1f,0x1f
-+ *[0-9a-f]*:	f1 b5 06 10 	satu r5>>0x10,0x10
-+ *[0-9a-f]*:	f1 b4 05 ef 	satu r4>>0xf,0xf
-+ *[0-9a-f]*:	f1 be 04 21 	satu lr>>0x1,0x1
-+ *[0-9a-f]*:	f1 bf 04 e5 	satu pc>>0x5,0x7
-+ *[0-9a-f]*:	f1 b7 04 a5 	satu r7>>0x5,0x5
-+ *[0-9a-f]*:	f1 b2 06 7a 	satu r2>>0x1a,0x13
-+
-+[0-9a-f]* <satrnds>:
-+ *[0-9a-f]*:	f3 bf 00 00 	satrnds pc,0x0
-+ *[0-9a-f]*:	f3 bc 03 ff 	satrnds r12>>0x1f,0x1f
-+ *[0-9a-f]*:	f3 b5 02 10 	satrnds r5>>0x10,0x10
-+ *[0-9a-f]*:	f3 b4 01 ef 	satrnds r4>>0xf,0xf
-+ *[0-9a-f]*:	f3 be 00 21 	satrnds lr>>0x1,0x1
-+ *[0-9a-f]*:	f3 b0 02 75 	satrnds r0>>0x15,0x13
-+ *[0-9a-f]*:	f3 bd 00 40 	satrnds sp,0x2
-+ *[0-9a-f]*:	f3 b7 03 a6 	satrnds r7>>0x6,0x1d
-+
-+[0-9a-f]* <satrndu>:
-+ *[0-9a-f]*:	f3 bf 04 00 	satrndu pc,0x0
-+ *[0-9a-f]*:	f3 bc 07 ff 	satrndu r12>>0x1f,0x1f
-+ *[0-9a-f]*:	f3 b5 06 10 	satrndu r5>>0x10,0x10
-+ *[0-9a-f]*:	f3 b4 05 ef 	satrndu r4>>0xf,0xf
-+ *[0-9a-f]*:	f3 be 04 21 	satrndu lr>>0x1,0x1
-+ *[0-9a-f]*:	f3 bc 07 40 	satrndu r12,0x1a
-+ *[0-9a-f]*:	f3 b4 04 75 	satrndu r4>>0x15,0x3
-+ *[0-9a-f]*:	f3 ba 06 03 	satrndu r10>>0x3,0x10
-+
-+[0-9a-f]* <subfc>:
-+ *[0-9a-f]*:	f5 bf 00 00 	subfeq pc,0
-+ *[0-9a-f]*:	f5 bc 0f ff 	subfal r12,-1
-+ *[0-9a-f]*:	f5 b5 08 80 	subfls r5,-128
-+ *[0-9a-f]*:	f5 b4 07 7f 	subfpl r4,127
-+ *[0-9a-f]*:	f5 be 01 01 	subfne lr,1
-+ *[0-9a-f]*:	f5 ba 08 08 	subfls r10,8
-+ *[0-9a-f]*:	f5 bb 0d 63 	subfvc r11,99
-+ *[0-9a-f]*:	f5 b2 0c 49 	subfvs r2,73
-+
-+[0-9a-f]* <subc>:
-+ *[0-9a-f]*:	f7 bf 00 00 	subeq pc,0
-+ *[0-9a-f]*:	f7 bc 0f ff 	subal r12,-1
-+ *[0-9a-f]*:	f7 b5 08 80 	subls r5,-128
-+ *[0-9a-f]*:	f7 b4 07 7f 	subpl r4,127
-+ *[0-9a-f]*:	f7 be 01 01 	subne lr,1
-+ *[0-9a-f]*:	f7 bc 08 76 	subls r12,118
-+ *[0-9a-f]*:	f7 be 0d f4 	subvc lr,-12
-+ *[0-9a-f]*:	f7 b4 06 f3 	submi r4,-13
-+
-+[0-9a-f]* <movc2>:
-+ *[0-9a-f]*:	f9 bf 00 00 	moveq pc,0
-+ *[0-9a-f]*:	f9 bc 0f ff 	moval r12,-1
-+ *[0-9a-f]*:	f9 b5 08 80 	movls r5,-128
-+ *[0-9a-f]*:	f9 b4 07 7f 	movpl r4,127
-+ *[0-9a-f]*:	f9 be 01 01 	movne lr,1
-+ *[0-9a-f]*:	f9 b3 05 86 	movlt r3,-122
-+ *[0-9a-f]*:	f9 b8 0d 02 	movvc r8,2
-+ *[0-9a-f]*:	f9 b7 01 91 	movne r7,-111
-+
-+[0-9a-f]* <cp_b>:
-+ *[0-9a-f]*:	e0 0f 18 00 	cp\.b pc,r0
-+ *[0-9a-f]*:	fe 00 18 00 	cp\.b r0,pc
-+ *[0-9a-f]*:	f0 07 18 00 	cp\.b r7,r8
-+ *[0-9a-f]*:	ee 08 18 00 	cp\.b r8,r7
-+
-+[0-9a-f]* <cp_h>:
-+ *[0-9a-f]*:	e0 0f 19 00 	cp\.h pc,r0
-+ *[0-9a-f]*:	fe 00 19 00 	cp\.h r0,pc
-+ *[0-9a-f]*:	f0 07 19 00 	cp\.h r7,r8
-+ *[0-9a-f]*:	ee 08 19 00 	cp\.h r8,r7
-+
-+[0-9a-f]* <ldm>:
-+ *[0-9a-f]*:	e1 cf 00 7e 	ldm pc,r1-r6
-+ *[0-9a-f]*:	e1 cc ff ff 	ldm r12,r0-pc
-+ *[0-9a-f]*:	e1 c5 80 00 	ldm r5,pc
-+ *[0-9a-f]*:	e1 c4 7f ff 	ldm r4,r0-lr
-+ *[0-9a-f]*:	e1 ce 00 01 	ldm lr,r0
-+ *[0-9a-f]*:	e1 c9 40 22 	ldm r9,r1,r5,lr
-+ *[0-9a-f]*:	e1 cb 81 ec 	ldm r11,r2-r3,r5-r8,pc
-+ *[0-9a-f]*:	e1 c6 a2 09 	ldm r6,r0,r3,r9,sp,pc
-+
-+[0-9a-f]* <ldm_pu>:
-+ *[0-9a-f]*:	e3 cf 03 c0 	ldm pc\+\+,r6-r9
-+ *[0-9a-f]*:	e3 cc ff ff 	ldm r12\+\+,r0-pc
-+ *[0-9a-f]*:	e3 c5 80 00 	ldm r5\+\+,pc
-+ *[0-9a-f]*:	e3 c4 7f ff 	ldm r4\+\+,r0-lr
-+ *[0-9a-f]*:	e3 ce 00 01 	ldm lr\+\+,r0
-+ *[0-9a-f]*:	e3 cc d5 38 	ldm r12\+\+,r3-r5,r8,r10,r12,lr-pc
-+ *[0-9a-f]*:	e3 ca c0 74 	ldm r10\+\+,r2,r4-r6,lr-pc
-+ *[0-9a-f]*:	e3 c6 7e 1a 	ldm r6\+\+,r1,r3-r4,r9-lr
-+
-+[0-9a-f]* <ldmts>:
-+ *[0-9a-f]*:	e5 cf 01 80 	ldmts pc,r7-r8
-+ *[0-9a-f]*:	e5 cc ff ff 	ldmts r12,r0-pc
-+ *[0-9a-f]*:	e5 c5 80 00 	ldmts r5,pc
-+ *[0-9a-f]*:	e5 c4 7f ff 	ldmts r4,r0-lr
-+ *[0-9a-f]*:	e5 ce 00 01 	ldmts lr,r0
-+ *[0-9a-f]*:	e5 c0 18 06 	ldmts r0,r1-r2,r11-r12
-+ *[0-9a-f]*:	e5 ce 61 97 	ldmts lr,r0-r2,r4,r7-r8,sp-lr
-+ *[0-9a-f]*:	e5 cc c2 3b 	ldmts r12,r0-r1,r3-r5,r9,lr-pc
-+
-+[0-9a-f]* <ldmts_pu>:
-+ *[0-9a-f]*:	e7 cf 02 00 	ldmts pc\+\+,r9
-+ *[0-9a-f]*:	e7 cc ff ff 	ldmts r12\+\+,r0-pc
-+ *[0-9a-f]*:	e7 c5 80 00 	ldmts r5\+\+,pc
-+ *[0-9a-f]*:	e7 c4 7f ff 	ldmts r4\+\+,r0-lr
-+ *[0-9a-f]*:	e7 ce 00 01 	ldmts lr\+\+,r0
-+ *[0-9a-f]*:	e7 cd 0a bd 	ldmts sp\+\+,r0,r2-r5,r7,r9,r11
-+ *[0-9a-f]*:	e7 c5 0c 8e 	ldmts r5\+\+,r1-r3,r7,r10-r11
-+ *[0-9a-f]*:	e7 c8 a1 9c 	ldmts r8\+\+,r2-r4,r7-r8,sp,pc
-+
-+[0-9a-f]* <stm>:
-+ *[0-9a-f]*:	e9 cf 00 80 	stm pc,r7
-+ *[0-9a-f]*:	e9 cc ff ff 	stm r12,r0-pc
-+ *[0-9a-f]*:	e9 c5 80 00 	stm r5,pc
-+ *[0-9a-f]*:	e9 c4 7f ff 	stm r4,r0-lr
-+ *[0-9a-f]*:	e9 ce 00 01 	stm lr,r0
-+ *[0-9a-f]*:	e9 cd 49 2c 	stm sp,r2-r3,r5,r8,r11,lr
-+ *[0-9a-f]*:	e9 c4 4c 5f 	stm r4,r0-r4,r6,r10-r11,lr
-+ *[0-9a-f]*:	e9 c9 f2 22 	stm r9,r1,r5,r9,r12-pc
-+
-+[0-9a-f]* <stm_pu>:
-+ *[0-9a-f]*:	eb cf 00 70 	stm --pc,r4-r6
-+ *[0-9a-f]*:	eb cc ff ff 	stm --r12,r0-pc
-+ *[0-9a-f]*:	eb c5 80 00 	stm --r5,pc
-+ *[0-9a-f]*:	eb c4 7f ff 	stm --r4,r0-lr
-+ *[0-9a-f]*:	eb ce 00 01 	stm --lr,r0
-+ *[0-9a-f]*:	eb cb fb f1 	stm --r11,r0,r4-r9,r11-pc
-+ *[0-9a-f]*:	eb cb 56 09 	stm --r11,r0,r3,r9-r10,r12,lr
-+ *[0-9a-f]*:	eb c6 63 04 	stm --r6,r2,r8-r9,sp-lr
-+
-+[0-9a-f]* <stmts>:
-+ *[0-9a-f]*:	ed cf 01 00 	stmts pc,r8
-+ *[0-9a-f]*:	ed cc ff ff 	stmts r12,r0-pc
-+ *[0-9a-f]*:	ed c5 80 00 	stmts r5,pc
-+ *[0-9a-f]*:	ed c4 7f ff 	stmts r4,r0-lr
-+ *[0-9a-f]*:	ed ce 00 01 	stmts lr,r0
-+ *[0-9a-f]*:	ed c1 c6 5b 	stmts r1,r0-r1,r3-r4,r6,r9-r10,lr-pc
-+ *[0-9a-f]*:	ed c3 1d c1 	stmts r3,r0,r6-r8,r10-r12
-+ *[0-9a-f]*:	ed cb d6 d1 	stmts r11,r0,r4,r6-r7,r9-r10,r12,lr-pc
-+
-+[0-9a-f]* <stmts_pu>:
-+ *[0-9a-f]*:	ef cf 01 c0 	stmts --pc,r6-r8
-+ *[0-9a-f]*:	ef cc ff ff 	stmts --r12,r0-pc
-+ *[0-9a-f]*:	ef c5 80 00 	stmts --r5,pc
-+ *[0-9a-f]*:	ef c4 7f ff 	stmts --r4,r0-lr
-+ *[0-9a-f]*:	ef ce 00 01 	stmts --lr,r0
-+ *[0-9a-f]*:	ef c2 36 19 	stmts --r2,r0,r3-r4,r9-r10,r12-sp
-+ *[0-9a-f]*:	ef c3 c0 03 	stmts --r3,r0-r1,lr-pc
-+ *[0-9a-f]*:	ef c0 44 7d 	stmts --r0,r0,r2-r6,r10,lr
-+
-+[0-9a-f]* <ldins_h>:
-+ *[0-9a-f]*:	ff df 00 00 	ldins\.h pc:b,pc\[0\]
-+ *[0-9a-f]*:	f9 dc 1f ff 	ldins\.h r12:t,r12\[-2\]
-+ *[0-9a-f]*:	eb d5 18 00 	ldins\.h r5:t,r5\[-4096\]
-+ *[0-9a-f]*:	e9 d4 07 ff 	ldins\.h r4:b,r4\[4094\]
-+ *[0-9a-f]*:	fd de 10 01 	ldins\.h lr:t,lr\[2\]
-+ *[0-9a-f]*:	fd d0 13 c5 	ldins\.h r0:t,lr\[1930\]
-+ *[0-9a-f]*:	ef d3 0e f5 	ldins\.h r3:b,r7\[-534\]
-+ *[0-9a-f]*:	f9 d2 0b 9a 	ldins\.h r2:b,r12\[-2252\]
-+
-+[0-9a-f]* <ldins_b>:
-+ *[0-9a-f]*:	ff df 40 00 	ldins\.b pc:b,pc\[0\]
-+ *[0-9a-f]*:	f9 dc 7f ff 	ldins\.b r12:t,r12\[-1\]
-+ *[0-9a-f]*:	eb d5 68 00 	ldins\.b r5:u,r5\[-2048\]
-+ *[0-9a-f]*:	e9 d4 57 ff 	ldins\.b r4:l,r4\[2047\]
-+ *[0-9a-f]*:	fd de 50 01 	ldins\.b lr:l,lr\[1\]
-+ *[0-9a-f]*:	e9 d6 7d 6a 	ldins\.b r6:t,r4\[-662\]
-+ *[0-9a-f]*:	e3 d5 4f 69 	ldins\.b r5:b,r1\[-151\]
-+ *[0-9a-f]*:	f7 da 78 7d 	ldins\.b r10:t,r11\[-1923\]
-+
-+[0-9a-f]* <ldswp_sh>:
-+ *[0-9a-f]*:	ff df 20 00 	ldswp\.sh pc,pc\[0\]
-+ *[0-9a-f]*:	f9 dc 2f ff 	ldswp\.sh r12,r12\[-2\]
-+ *[0-9a-f]*:	eb d5 28 00 	ldswp\.sh r5,r5\[-4096\]
-+ *[0-9a-f]*:	e9 d4 27 ff 	ldswp\.sh r4,r4\[4094\]
-+ *[0-9a-f]*:	fd de 20 01 	ldswp\.sh lr,lr\[2\]
-+ *[0-9a-f]*:	f5 d9 27 84 	ldswp\.sh r9,r10\[3848\]
-+ *[0-9a-f]*:	f9 d4 2c 04 	ldswp\.sh r4,r12\[-2040\]
-+ *[0-9a-f]*:	e5 da 26 08 	ldswp\.sh r10,r2\[3088\]
-+
-+[0-9a-f]* <ldswp_uh>:
-+ *[0-9a-f]*:	ff df 30 00 	ldswp\.uh pc,pc\[0\]
-+ *[0-9a-f]*:	f9 dc 3f ff 	ldswp\.uh r12,r12\[-2\]
-+ *[0-9a-f]*:	eb d5 38 00 	ldswp\.uh r5,r5\[-4096\]
-+ *[0-9a-f]*:	e9 d4 37 ff 	ldswp\.uh r4,r4\[4094\]
-+ *[0-9a-f]*:	fd de 30 01 	ldswp\.uh lr,lr\[2\]
-+ *[0-9a-f]*:	f3 d4 37 46 	ldswp\.uh r4,r9\[3724\]
-+ *[0-9a-f]*:	fb de 3c bc 	ldswp\.uh lr,sp\[-1672\]
-+ *[0-9a-f]*:	f9 d8 38 7d 	ldswp\.uh r8,r12\[-3846\]
-+
-+[0-9a-f]* <ldswp_w>:
-+ *[0-9a-f]*:	ff df 80 00 	ldswp\.w pc,pc\[0\]
-+ *[0-9a-f]*:	f9 dc 8f ff 	ldswp\.w r12,r12\[-4\]
-+ *[0-9a-f]*:	eb d5 88 00 	ldswp\.w r5,r5\[-8192\]
-+ *[0-9a-f]*:	e9 d4 87 ff 	ldswp\.w r4,r4\[8188\]
-+ *[0-9a-f]*:	fd de 80 01 	ldswp\.w lr,lr\[4\]
-+ *[0-9a-f]*:	ef dd 81 d1 	ldswp\.w sp,r7\[1860\]
-+ *[0-9a-f]*:	eb df 8c c1 	ldswp\.w pc,r5\[-3324\]
-+ *[0-9a-f]*:	f5 dc 8c c8 	ldswp\.w r12,r10\[-3296\]
-+
-+[0-9a-f]* <stswp_h>:
-+ *[0-9a-f]*:	ff df 90 00 	stswp\.h pc\[0\],pc
-+ *[0-9a-f]*:	f9 dc 9f ff 	stswp\.h r12\[-2\],r12
-+ *[0-9a-f]*:	eb d5 98 00 	stswp\.h r5\[-4096\],r5
-+ *[0-9a-f]*:	e9 d4 97 ff 	stswp\.h r4\[4094\],r4
-+ *[0-9a-f]*:	fd de 90 01 	stswp\.h lr\[2\],lr
-+ *[0-9a-f]*:	ef da 90 20 	stswp\.h r7\[64\],r10
-+ *[0-9a-f]*:	f5 d2 95 e8 	stswp\.h r10\[3024\],r2
-+ *[0-9a-f]*:	e1 da 9b 74 	stswp\.h r0\[-2328\],r10
-+
-+[0-9a-f]* <stswp_w>:
-+ *[0-9a-f]*:	ff df a0 00 	stswp\.w pc\[0\],pc
-+ *[0-9a-f]*:	f9 dc af ff 	stswp\.w r12\[-4\],r12
-+ *[0-9a-f]*:	eb d5 a8 00 	stswp\.w r5\[-8192\],r5
-+ *[0-9a-f]*:	e9 d4 a7 ff 	stswp\.w r4\[8188\],r4
-+ *[0-9a-f]*:	fd de a0 01 	stswp\.w lr\[4\],lr
-+ *[0-9a-f]*:	ff d8 a1 21 	stswp\.w pc\[1156\],r8
-+ *[0-9a-f]*:	fb da a7 ce 	stswp\.w sp\[7992\],r10
-+ *[0-9a-f]*:	f1 d5 ae db 	stswp\.w r8\[-1172\],r5
-+
-+[0-9a-f]* <and2>:
-+ *[0-9a-f]*:	ff ef 00 0f 	and pc,pc,pc
-+ *[0-9a-f]*:	f9 ec 01 fc 	and r12,r12,r12<<0x1f
-+ *[0-9a-f]*:	eb e5 01 05 	and r5,r5,r5<<0x10
-+ *[0-9a-f]*:	e9 e4 00 f4 	and r4,r4,r4<<0xf
-+ *[0-9a-f]*:	fd ee 00 1e 	and lr,lr,lr<<0x1
-+ *[0-9a-f]*:	e5 e1 00 1a 	and r10,r2,r1<<0x1
-+ *[0-9a-f]*:	f1 eb 01 bc 	and r12,r8,r11<<0x1b
-+ *[0-9a-f]*:	ef e0 00 3a 	and r10,r7,r0<<0x3
-+
-+[0-9a-f]* <and3>:
-+ *[0-9a-f]*:	ff ef 02 0f 	and pc,pc,pc
-+ *[0-9a-f]*:	f9 ec 03 fc 	and r12,r12,r12>>0x1f
-+ *[0-9a-f]*:	eb e5 03 05 	and r5,r5,r5>>0x10
-+ *[0-9a-f]*:	e9 e4 02 f4 	and r4,r4,r4>>0xf
-+ *[0-9a-f]*:	fd ee 02 1e 	and lr,lr,lr>>0x1
-+ *[0-9a-f]*:	f1 e7 03 1c 	and r12,r8,r7>>0x11
-+ *[0-9a-f]*:	e9 e9 03 4f 	and pc,r4,r9>>0x14
-+ *[0-9a-f]*:	f3 ea 02 ca 	and r10,r9,r10>>0xc
-+
-+[0-9a-f]* <or2>:
-+ *[0-9a-f]*:	ff ef 10 0f 	or pc,pc,pc
-+ *[0-9a-f]*:	f9 ec 11 fc 	or r12,r12,r12<<0x1f
-+ *[0-9a-f]*:	eb e5 11 05 	or r5,r5,r5<<0x10
-+ *[0-9a-f]*:	e9 e4 10 f4 	or r4,r4,r4<<0xf
-+ *[0-9a-f]*:	fd ee 10 1e 	or lr,lr,lr<<0x1
-+ *[0-9a-f]*:	fb eb 11 d8 	or r8,sp,r11<<0x1d
-+ *[0-9a-f]*:	f3 e2 11 cf 	or pc,r9,r2<<0x1c
-+ *[0-9a-f]*:	e3 e2 10 35 	or r5,r1,r2<<0x3
-+
-+[0-9a-f]* <or3>:
-+ *[0-9a-f]*:	ff ef 12 0f 	or pc,pc,pc
-+ *[0-9a-f]*:	f9 ec 13 fc 	or r12,r12,r12>>0x1f
-+ *[0-9a-f]*:	eb e5 13 05 	or r5,r5,r5>>0x10
-+ *[0-9a-f]*:	e9 e4 12 f4 	or r4,r4,r4>>0xf
-+ *[0-9a-f]*:	fd ee 12 1e 	or lr,lr,lr>>0x1
-+ *[0-9a-f]*:	fb ed 12 21 	or r1,sp,sp>>0x2
-+ *[0-9a-f]*:	e3 e1 13 d0 	or r0,r1,r1>>0x1d
-+ *[0-9a-f]*:	f9 e8 12 84 	or r4,r12,r8>>0x8
-+
-+[0-9a-f]* <eor2>:
-+ *[0-9a-f]*:	ff ef 20 0f 	eor pc,pc,pc
-+ *[0-9a-f]*:	f9 ec 21 fc 	eor r12,r12,r12<<0x1f
-+ *[0-9a-f]*:	eb e5 21 05 	eor r5,r5,r5<<0x10
-+ *[0-9a-f]*:	e9 e4 20 f4 	eor r4,r4,r4<<0xf
-+ *[0-9a-f]*:	fd ee 20 1e 	eor lr,lr,lr<<0x1
-+ *[0-9a-f]*:	f3 e4 20 ba 	eor r10,r9,r4<<0xb
-+ *[0-9a-f]*:	e1 e1 21 f4 	eor r4,r0,r1<<0x1f
-+ *[0-9a-f]*:	e5 ec 20 d6 	eor r6,r2,r12<<0xd
-+
-+[0-9a-f]* <eor3>:
-+ *[0-9a-f]*:	ff ef 22 0f 	eor pc,pc,pc
-+ *[0-9a-f]*:	f9 ec 23 fc 	eor r12,r12,r12>>0x1f
-+ *[0-9a-f]*:	eb e5 23 05 	eor r5,r5,r5>>0x10
-+ *[0-9a-f]*:	e9 e4 22 f4 	eor r4,r4,r4>>0xf
-+ *[0-9a-f]*:	fd ee 22 1e 	eor lr,lr,lr>>0x1
-+ *[0-9a-f]*:	eb e5 23 65 	eor r5,r5,r5>>0x16
-+ *[0-9a-f]*:	e3 ee 22 3a 	eor r10,r1,lr>>0x3
-+ *[0-9a-f]*:	fd ed 23 a7 	eor r7,lr,sp>>0x1a
-+
-+[0-9a-f]* <sthh_w2>:
-+ *[0-9a-f]*:	ff ef 8f 0f 	sthh\.w pc\[pc\],pc:b,pc:b
-+ *[0-9a-f]*:	f9 ec bc 3c 	sthh\.w r12\[r12<<0x3\],r12:t,r12:t
-+ *[0-9a-f]*:	eb e5 b5 25 	sthh\.w r5\[r5<<0x2\],r5:t,r5:t
-+ *[0-9a-f]*:	e9 e4 84 14 	sthh\.w r4\[r4<<0x1\],r4:b,r4:b
-+ *[0-9a-f]*:	fd ee be 1e 	sthh\.w lr\[lr<<0x1\],lr:t,lr:t
-+ *[0-9a-f]*:	e3 ec b6 3d 	sthh\.w sp\[r6<<0x3\],r1:t,r12:t
-+ *[0-9a-f]*:	f3 e9 b6 06 	sthh\.w r6\[r6\],r9:t,r9:t
-+ *[0-9a-f]*:	e1 eb 93 0a 	sthh\.w r10\[r3\],r0:b,r11:t
-+
-+[0-9a-f]* <sthh_w1>:
-+ *[0-9a-f]*:	ff ef c0 0f 	sthh\.w pc\[0x0\],pc:b,pc:b
-+ *[0-9a-f]*:	f9 ec ff fc 	sthh\.w r12\[0x3fc\],r12:t,r12:t
-+ *[0-9a-f]*:	eb e5 f8 05 	sthh\.w r5\[0x200\],r5:t,r5:t
-+ *[0-9a-f]*:	e9 e4 c7 f4 	sthh\.w r4\[0x1fc\],r4:b,r4:b
-+ *[0-9a-f]*:	fd ee f0 1e 	sthh\.w lr\[0x4\],lr:t,lr:t
-+ *[0-9a-f]*:	f3 e0 e6 54 	sthh\.w r4\[0x194\],r9:t,r0:b
-+ *[0-9a-f]*:	e5 ea e5 78 	sthh\.w r8\[0x15c\],r2:t,r10:b
-+ *[0-9a-f]*:	f3 e2 c2 bd 	sthh\.w sp\[0xac\],r9:b,r2:b
-+
-+[0-9a-f]* <cop>:
-+ *[0-9a-f]*:	e1 a0 00 00 	cop cp0,cr0,cr0,cr0,0x0
-+ *[0-9a-f]*:	e7 af ff ff 	cop cp7,cr15,cr15,cr15,0x7f
-+ *[0-9a-f]*:	e3 a8 75 55 	cop cp3,cr5,cr5,cr5,0x31
-+ *[0-9a-f]*:	e3 a8 44 44 	cop cp2,cr4,cr4,cr4,0x30
-+ *[0-9a-f]*:	e5 ad a8 37 	cop cp5,cr8,cr3,cr7,0x5a
-+
-+[0-9a-f]* <ldc_w1>:
-+ *[0-9a-f]*:	e9 a0 00 00 	ldc\.w cp0,cr0,r0\[0x0\]
-+ *[0-9a-f]*:	e9 af ef ff 	ldc\.w cp7,cr15,pc\[0x3fc\]
-+ *[0-9a-f]*:	e9 a5 65 80 	ldc\.w cp3,cr5,r5\[0x200\]
-+ *[0-9a-f]*:	e9 a4 44 7f 	ldc\.w cp2,cr4,r4\[0x1fc\]
-+ *[0-9a-f]*:	e9 ad 89 24 	ldc\.w cp4,cr9,sp\[0x90\]
-+
-+[0-9a-f]* <ldc_w2>:
-+ *[0-9a-f]*:	ef a0 00 40 	ldc\.w cp0,cr0,--r0
-+ *[0-9a-f]*:	ef af ef 40 	ldc\.w cp7,cr15,--pc
-+ *[0-9a-f]*:	ef a5 65 40 	ldc\.w cp3,cr5,--r5
-+ *[0-9a-f]*:	ef a4 44 40 	ldc\.w cp2,cr4,--r4
-+ *[0-9a-f]*:	ef ad 89 40 	ldc\.w cp4,cr9,--sp
-+
-+[0-9a-f]* <ldc_w3>:
-+ *[0-9a-f]*:	ef a0 10 00 	ldc\.w cp0,cr0,r0\[r0\]
-+ *[0-9a-f]*:	ef af ff 3f 	ldc\.w cp7,cr15,pc\[pc<<0x3\]
-+ *[0-9a-f]*:	ef a5 75 24 	ldc\.w cp3,cr5,r5\[r4<<0x2\]
-+ *[0-9a-f]*:	ef a4 54 13 	ldc\.w cp2,cr4,r4\[r3<<0x1\]
-+ *[0-9a-f]*:	ef ad 99 0c 	ldc\.w cp4,cr9,sp\[r12\]
-+
-+[0-9a-f]* <ldc_d1>:
-+ *[0-9a-f]*:	e9 a0 10 00 	ldc\.d cp0,cr0,r0\[0x0\]
-+ *[0-9a-f]*:	e9 af fe ff 	ldc\.d cp7,cr14,pc\[0x3fc\]
-+ *[0-9a-f]*:	e9 a5 76 80 	ldc\.d cp3,cr6,r5\[0x200\]
-+ *[0-9a-f]*:	e9 a4 54 7f 	ldc\.d cp2,cr4,r4\[0x1fc\]
-+ *[0-9a-f]*:	e9 ad 98 24 	ldc\.d cp4,cr8,sp\[0x90\]
-+
-+[0-9a-f]* <ldc_d2>:
-+ *[0-9a-f]*:	ef a0 00 50 	ldc\.d cp0,cr0,--r0
-+ *[0-9a-f]*:	ef af ee 50 	ldc\.d cp7,cr14,--pc
-+ *[0-9a-f]*:	ef a5 66 50 	ldc\.d cp3,cr6,--r5
-+ *[0-9a-f]*:	ef a4 44 50 	ldc\.d cp2,cr4,--r4
-+ *[0-9a-f]*:	ef ad 88 50 	ldc\.d cp4,cr8,--sp
-+
-+[0-9a-f]* <ldc_d3>:
-+ *[0-9a-f]*:	ef a0 10 40 	ldc\.d cp0,cr0,r0\[r0\]
-+ *[0-9a-f]*:	ef af fe 7f 	ldc\.d cp7,cr14,pc\[pc<<0x3\]
-+ *[0-9a-f]*:	ef a5 76 64 	ldc\.d cp3,cr6,r5\[r4<<0x2\]
-+ *[0-9a-f]*:	ef a4 54 53 	ldc\.d cp2,cr4,r4\[r3<<0x1\]
-+ *[0-9a-f]*:	ef ad 98 4c 	ldc\.d cp4,cr8,sp\[r12\]
-+
-+[0-9a-f]* <stc_w1>:
-+ *[0-9a-f]*:	eb a0 00 00 	stc\.w cp0,r0\[0x0\],cr0
-+ *[0-9a-f]*:	eb af ef ff 	stc\.w cp7,pc\[0x3fc\],cr15
-+ *[0-9a-f]*:	eb a5 65 80 	stc\.w cp3,r5\[0x200\],cr5
-+ *[0-9a-f]*:	eb a4 44 7f 	stc\.w cp2,r4\[0x1fc\],cr4
-+ *[0-9a-f]*:	eb ad 89 24 	stc\.w cp4,sp\[0x90\],cr9
-+
-+[0-9a-f]* <stc_w2>:
-+ *[0-9a-f]*:	ef a0 00 60 	stc\.w cp0,r0\+\+,cr0
-+ *[0-9a-f]*:	ef af ef 60 	stc\.w cp7,pc\+\+,cr15
-+ *[0-9a-f]*:	ef a5 65 60 	stc\.w cp3,r5\+\+,cr5
-+ *[0-9a-f]*:	ef a4 44 60 	stc\.w cp2,r4\+\+,cr4
-+ *[0-9a-f]*:	ef ad 89 60 	stc\.w cp4,sp\+\+,cr9
-+
-+[0-9a-f]* <stc_w3>:
-+ *[0-9a-f]*:	ef a0 10 80 	stc\.w cp0,r0\[r0\],cr0
-+ *[0-9a-f]*:	ef af ff bf 	stc\.w cp7,pc\[pc<<0x3\],cr15
-+ *[0-9a-f]*:	ef a5 75 a4 	stc\.w cp3,r5\[r4<<0x2\],cr5
-+ *[0-9a-f]*:	ef a4 54 93 	stc\.w cp2,r4\[r3<<0x1\],cr4
-+ *[0-9a-f]*:	ef ad 99 8c 	stc\.w cp4,sp\[r12\],cr9
-+
-+[0-9a-f]* <stc_d1>:
-+ *[0-9a-f]*:	eb a0 10 00 	stc\.d cp0,r0\[0x0\],cr0
-+ *[0-9a-f]*:	eb af fe ff 	stc\.d cp7,pc\[0x3fc\],cr14
-+ *[0-9a-f]*:	eb a5 76 80 	stc\.d cp3,r5\[0x200\],cr6
-+ *[0-9a-f]*:	eb a4 54 7f 	stc\.d cp2,r4\[0x1fc\],cr4
-+ *[0-9a-f]*:	eb ad 98 24 	stc\.d cp4,sp\[0x90\],cr8
-+
-+[0-9a-f]* <stc_d2>:
-+ *[0-9a-f]*:	ef a0 00 70 	stc\.d cp0,r0\+\+,cr0
-+ *[0-9a-f]*:	ef af ee 70 	stc\.d cp7,pc\+\+,cr14
-+ *[0-9a-f]*:	ef a5 66 70 	stc\.d cp3,r5\+\+,cr6
-+ *[0-9a-f]*:	ef a4 44 70 	stc\.d cp2,r4\+\+,cr4
-+ *[0-9a-f]*:	ef ad 88 70 	stc\.d cp4,sp\+\+,cr8
-+
-+[0-9a-f]* <stc_d3>:
-+ *[0-9a-f]*:	ef a0 10 c0 	stc\.d cp0,r0\[r0\],cr0
-+ *[0-9a-f]*:	ef af fe ff 	stc\.d cp7,pc\[pc<<0x3\],cr14
-+ *[0-9a-f]*:	ef a5 76 e4 	stc\.d cp3,r5\[r4<<0x2\],cr6
-+ *[0-9a-f]*:	ef a4 54 d3 	stc\.d cp2,r4\[r3<<0x1\],cr4
-+ *[0-9a-f]*:	ef ad 98 cc 	stc\.d cp4,sp\[r12\],cr8
-+
-+[0-9a-f]* <ldc0_w>:
-+ *[0-9a-f]*:	f1 a0 00 00 	ldc0\.w cr0,r0\[0x0\]
-+ *[0-9a-f]*:	f1 af ff ff 	ldc0\.w cr15,pc\[0x3ffc\]
-+ *[0-9a-f]*:	f1 a5 85 00 	ldc0\.w cr5,r5\[0x2000\]
-+ *[0-9a-f]*:	f1 a4 74 ff 	ldc0\.w cr4,r4\[0x1ffc\]
-+ *[0-9a-f]*:	f1 ad 09 93 	ldc0\.w cr9,sp\[0x24c\]
-+
-+[0-9a-f]* <ldc0_d>:
-+ *[0-9a-f]*:	f3 a0 00 00 	ldc0\.d cr0,r0\[0x0\]
-+ *[0-9a-f]*:	f3 af fe ff 	ldc0\.d cr14,pc\[0x3ffc\]
-+ *[0-9a-f]*:	f3 a5 86 00 	ldc0\.d cr6,r5\[0x2000\]
-+ *[0-9a-f]*:	f3 a4 74 ff 	ldc0\.d cr4,r4\[0x1ffc\]
-+ *[0-9a-f]*:	f3 ad 08 93 	ldc0\.d cr8,sp\[0x24c\]
-+
-+[0-9a-f]* <stc0_w>:
-+ *[0-9a-f]*:	f5 a0 00 00 	stc0\.w r0\[0x0\],cr0
-+ *[0-9a-f]*:	f5 af ff ff 	stc0\.w pc\[0x3ffc\],cr15
-+ *[0-9a-f]*:	f5 a5 85 00 	stc0\.w r5\[0x2000\],cr5
-+ *[0-9a-f]*:	f5 a4 74 ff 	stc0\.w r4\[0x1ffc\],cr4
-+ *[0-9a-f]*:	f5 ad 09 93 	stc0\.w sp\[0x24c\],cr9
-+
-+[0-9a-f]* <stc0_d>:
-+ *[0-9a-f]*:	f7 a0 00 00 	stc0\.d r0\[0x0\],cr0
-+ *[0-9a-f]*:	f7 af fe ff 	stc0\.d pc\[0x3ffc\],cr14
-+ *[0-9a-f]*:	f7 a5 86 00 	stc0\.d r5\[0x2000\],cr6
-+ *[0-9a-f]*:	f7 a4 74 ff 	stc0\.d r4\[0x1ffc\],cr4
-+ *[0-9a-f]*:	f7 ad 08 93 	stc0\.d sp\[0x24c\],cr8
-+
-+[0-9a-f]* <memc>:
-+ *[0-9a-f]*:	f6 10 00 00 	memc 0,0x0
-+ *[0-9a-f]*:	f6 1f ff ff 	memc -4,0x1f
-+ *[0-9a-f]*:	f6 18 40 00 	memc -65536,0x10
-+ *[0-9a-f]*:	f6 17 bf ff 	memc 65532,0xf
-+
-+[0-9a-f]* <mems>:
-+ *[0-9a-f]*:	f8 10 00 00 	mems 0,0x0
-+ *[0-9a-f]*:	f8 1f ff ff 	mems -4,0x1f
-+ *[0-9a-f]*:	f8 18 40 00 	mems -65536,0x10
-+ *[0-9a-f]*:	f8 17 bf ff 	mems 65532,0xf
-+
-+[0-9a-f]* <memt>:
-+ *[0-9a-f]*:	fa 10 00 00 	memt 0,0x0
-+ *[0-9a-f]*:	fa 1f ff ff 	memt -4,0x1f
-+ *[0-9a-f]*:	fa 18 40 00 	memt -65536,0x10
-+ *[0-9a-f]*:	fa 17 bf ff 	memt 65532,0xf
-+
-+[0-9a-f]* <stcond>:
-+ *[0-9a-f]*:	e1 70 00 00 	stcond r0\[0\],r0
-+ *[0-9a-f]*:	ff 7f ff ff 	stcond pc\[-1\],pc
-+ *[0-9a-f]*:	f1 77 80 00 	stcond r8\[-32768\],r7
-+ *[0-9a-f]*:	ef 78 7f ff 	stcond r7\[32767\],r8
-+ *[0-9a-f]*:	eb 7a 12 34 	stcond r5\[4660\],r10
-+
-+[0-9a-f]* <ldcm_w>:
-+ *[0-9a-f]*:	ed af 00 ff 	ldcm\.w cp0,pc,cr0-cr7
-+ *[0-9a-f]*:	ed a0 e0 01 	ldcm\.w cp7,r0,cr0
-+ *[0-9a-f]*:	ed a4 90 7f 	ldcm\.w cp4,r4\+\+,cr0-cr6
-+ *[0-9a-f]*:	ed a7 60 80 	ldcm\.w cp3,r7,cr7
-+ *[0-9a-f]*:	ed ac 30 72 	ldcm\.w cp1,r12\+\+,cr1,cr4-cr6
-+ *[0-9a-f]*:	ed af 01 ff 	ldcm\.w cp0,pc,cr8-cr15
-+ *[0-9a-f]*:	ed a0 e1 01 	ldcm\.w cp7,r0,cr8
-+ *[0-9a-f]*:	ed a4 91 7f 	ldcm\.w cp4,r4\+\+,cr8-cr14
-+ *[0-9a-f]*:	ed a7 61 80 	ldcm\.w cp3,r7,cr15
-+ *[0-9a-f]*:	ed ac 31 72 	ldcm\.w cp1,r12\+\+,cr9,cr12-cr14
-+
-+[0-9a-f]* <ldcm_d>:
-+ *[0-9a-f]*:	ed af 04 ff 	ldcm\.d cp0,pc,cr0-cr15
-+ *[0-9a-f]*:	ed a0 e4 01 	ldcm\.d cp7,r0,cr0-cr1
-+ *[0-9a-f]*:	ed a4 94 7f 	ldcm\.d cp4,r4\+\+,cr0-cr13
-+ *[0-9a-f]*:	ed a7 64 80 	ldcm\.d cp3,r7,cr14-cr15
-+ *[0-9a-f]*:	ed ac 54 93 	ldcm\.d cp2,r12\+\+,cr0-cr3,cr8-cr9,cr14-cr15
-+
-+[0-9a-f]* <stcm_w>:
-+ *[0-9a-f]*:	ed af 02 ff 	stcm\.w cp0,pc,cr0-cr7
-+ *[0-9a-f]*:	ed a0 e2 01 	stcm\.w cp7,r0,cr0
-+ *[0-9a-f]*:	ed a4 92 7f 	stcm\.w cp4,--r4,cr0-cr6
-+ *[0-9a-f]*:	ed a7 62 80 	stcm\.w cp3,r7,cr7
-+ *[0-9a-f]*:	ed ac 32 72 	stcm\.w cp1,--r12,cr1,cr4-cr6
-+ *[0-9a-f]*:	ed af 03 ff 	stcm\.w cp0,pc,cr8-cr15
-+ *[0-9a-f]*:	ed a0 e3 01 	stcm\.w cp7,r0,cr8
-+ *[0-9a-f]*:	ed a4 93 7f 	stcm\.w cp4,--r4,cr8-cr14
-+ *[0-9a-f]*:	ed a7 63 80 	stcm\.w cp3,r7,cr15
-+ *[0-9a-f]*:	ed ac 33 72 	stcm\.w cp1,--r12,cr9,cr12-cr14
-+
-+[0-9a-f]* <stcm_d>:
-+ *[0-9a-f]*:	ed af 05 ff 	stcm\.d cp0,pc,cr0-cr15
-+ *[0-9a-f]*:	ed a0 e5 01 	stcm\.d cp7,r0,cr0-cr1
-+ *[0-9a-f]*:	ed a4 95 7f 	stcm\.d cp4,--r4,cr0-cr13
-+ *[0-9a-f]*:	ed a7 65 80 	stcm\.d cp3,r7,cr14-cr15
-+ *[0-9a-f]*:	ed ac 55 93 	stcm\.d cp2,--r12,cr0-cr3,cr8-cr9,cr14-cr15
-+
-+[0-9a-f]* <mvcr_w>:
-+ *[0-9a-f]*:	ef af ef 00 	mvcr\.w cp7,pc,cr15
-+ *[0-9a-f]*:	ef a0 00 00 	mvcr\.w cp0,r0,cr0
-+ *[0-9a-f]*:	ef af 0f 00 	mvcr\.w cp0,pc,cr15
-+ *[0-9a-f]*:	ef a0 ef 00 	mvcr\.w cp7,r0,cr15
-+ *[0-9a-f]*:	ef af e0 00 	mvcr\.w cp7,pc,cr0
-+ *[0-9a-f]*:	ef a7 88 00 	mvcr\.w cp4,r7,cr8
-+ *[0-9a-f]*:	ef a8 67 00 	mvcr\.w cp3,r8,cr7
-+
-+[0-9a-f]* <mvcr_d>:
-+ *[0-9a-f]*:	ef ae ee 10 	mvcr\.d cp7,lr,cr14
-+ *[0-9a-f]*:	ef a0 00 10 	mvcr\.d cp0,r0,cr0
-+ *[0-9a-f]*:	ef ae 0e 10 	mvcr\.d cp0,lr,cr14
-+ *[0-9a-f]*:	ef a0 ee 10 	mvcr\.d cp7,r0,cr14
-+ *[0-9a-f]*:	ef ae e0 10 	mvcr\.d cp7,lr,cr0
-+ *[0-9a-f]*:	ef a6 88 10 	mvcr\.d cp4,r6,cr8
-+ *[0-9a-f]*:	ef a8 66 10 	mvcr\.d cp3,r8,cr6
-+
-+[0-9a-f]* <mvrc_w>:
-+ *[0-9a-f]*:	ef af ef 20 	mvrc\.w cp7,cr15,pc
-+ *[0-9a-f]*:	ef a0 00 20 	mvrc\.w cp0,cr0,r0
-+ *[0-9a-f]*:	ef af 0f 20 	mvrc\.w cp0,cr15,pc
-+ *[0-9a-f]*:	ef a0 ef 20 	mvrc\.w cp7,cr15,r0
-+ *[0-9a-f]*:	ef af e0 20 	mvrc\.w cp7,cr0,pc
-+ *[0-9a-f]*:	ef a7 88 20 	mvrc\.w cp4,cr8,r7
-+ *[0-9a-f]*:	ef a8 67 20 	mvrc\.w cp3,cr7,r8
-+
-+[0-9a-f]* <mvrc_d>:
-+ *[0-9a-f]*:	ef ae ee 30 	mvrc\.d cp7,cr14,lr
-+ *[0-9a-f]*:	ef a0 00 30 	mvrc\.d cp0,cr0,r0
-+ *[0-9a-f]*:	ef ae 0e 30 	mvrc\.d cp0,cr14,lr
-+ *[0-9a-f]*:	ef a0 ee 30 	mvrc\.d cp7,cr14,r0
-+ *[0-9a-f]*:	ef ae e0 30 	mvrc\.d cp7,cr0,lr
-+ *[0-9a-f]*:	ef a6 88 30 	mvrc\.d cp4,cr8,r6
-+ *[0-9a-f]*:	ef a8 66 30 	mvrc\.d cp3,cr6,r8
-+
-+[0-9a-f]* <bfexts>:
-+ *[0-9a-f]*:	ff df b3 ff 	bfexts pc,pc,0x1f,0x1f
-+ *[0-9a-f]*:	e1 d0 b0 00 	bfexts r0,r0,0x0,0x0
-+ *[0-9a-f]*:	e1 df b3 ff 	bfexts r0,pc,0x1f,0x1f
-+ *[0-9a-f]*:	ff d0 b3 ff 	bfexts pc,r0,0x1f,0x1f
-+ *[0-9a-f]*:	ff df b0 1f 	bfexts pc,pc,0x0,0x1f
-+ *[0-9a-f]*:	ff df b3 e0 	bfexts pc,pc,0x1f,0x0
-+ *[0-9a-f]*:	ef d8 b1 f0 	bfexts r7,r8,0xf,0x10
-+ *[0-9a-f]*:	f1 d7 b2 0f 	bfexts r8,r7,0x10,0xf
-+
-+[0-9a-f]* <bfextu>:
-+ *[0-9a-f]*:	ff df c3 ff 	bfextu pc,pc,0x1f,0x1f
-+ *[0-9a-f]*:	e1 d0 c0 00 	bfextu r0,r0,0x0,0x0
-+ *[0-9a-f]*:	e1 df c3 ff 	bfextu r0,pc,0x1f,0x1f
-+ *[0-9a-f]*:	ff d0 c3 ff 	bfextu pc,r0,0x1f,0x1f
-+ *[0-9a-f]*:	ff df c0 1f 	bfextu pc,pc,0x0,0x1f
-+ *[0-9a-f]*:	ff df c3 e0 	bfextu pc,pc,0x1f,0x0
-+ *[0-9a-f]*:	ef d8 c1 f0 	bfextu r7,r8,0xf,0x10
-+ *[0-9a-f]*:	f1 d7 c2 0f 	bfextu r8,r7,0x10,0xf
-+
-+[0-9a-f]* <bfins>:
-+ *[0-9a-f]*:	ff df d3 ff 	bfins pc,pc,0x1f,0x1f
-+ *[0-9a-f]*:	e1 d0 d0 00 	bfins r0,r0,0x0,0x0
-+ *[0-9a-f]*:	e1 df d3 ff 	bfins r0,pc,0x1f,0x1f
-+ *[0-9a-f]*:	ff d0 d3 ff 	bfins pc,r0,0x1f,0x1f
-+ *[0-9a-f]*:	ff df d0 1f 	bfins pc,pc,0x0,0x1f
-+ *[0-9a-f]*:	ff df d3 e0 	bfins pc,pc,0x1f,0x0
-+ *[0-9a-f]*:	ef d8 d1 f0 	bfins r7,r8,0xf,0x10
-+ *[0-9a-f]*:	f1 d7 d2 0f 	bfins r8,r7,0x10,0xf
-+
-+[0-9a-f]* <rsubc>:
-+ *[0-9a-f]*:	fb bf 00 00 	rsubeq pc,0
-+ *[0-9a-f]*:	fb bc 0f ff 	rsubal r12,-1
-+ *[0-9a-f]*:	fb b5 08 80 	rsubls r5,-128
-+ *[0-9a-f]*:	fb b4 07 7f 	rsubpl r4,127
-+ *[0-9a-f]*:	fb be 01 01 	rsubne lr,1
-+ *[0-9a-f]*:	fb bc 08 76 	rsubls r12,118
-+ *[0-9a-f]*:	fb be 0d f4 	rsubvc lr,-12
-+ *[0-9a-f]*:	fb b4 06 f3 	rsubmi r4,-13
-+
-+[0-9a-f]* <addc>:
-+ *[0-9a-f]*:	ff df e0 0f 	addeq pc,pc,pc
-+ *[0-9a-f]*:	f9 dc ef 0c 	addal r12,r12,r12
-+ *[0-9a-f]*:	eb d5 e8 05 	addls r5,r5,r5
-+ *[0-9a-f]*:	e9 d4 e7 04 	addpl r4,r4,r4   
-+ *[0-9a-f]*:	fd de e1 0e 	addne lr,lr,lr
-+ *[0-9a-f]*:	e5 d1 e8 0a 	addls r10,r2,r1
-+ *[0-9a-f]*:	f1 db ed 0c 	addvc r12,r8,r11
-+ *[0-9a-f]*:	ef d0 e6 0a 	addmi r10,r7,r0
-+
-+[0-9a-f]* <subc2>:
-+ *[0-9a-f]*:	ff df e0 1f 	subeq pc,pc,pc
-+ *[0-9a-f]*:	f9 dc ef 1c 	subal r12,r12,r12
-+ *[0-9a-f]*:	eb d5 e8 15 	subls r5,r5,r5
-+ *[0-9a-f]*:	e9 d4 e7 14 	subpl r4,r4,r4   
-+ *[0-9a-f]*:	fd de e1 1e 	subne lr,lr,lr
-+ *[0-9a-f]*:	e5 d1 e8 1a 	subls r10,r2,r1
-+ *[0-9a-f]*:	f1 db ed 1c 	subvc r12,r8,r11
-+ *[0-9a-f]*:	ef d0 e6 1a 	submi r10,r7,r0
-+
-+[0-9a-f]* <andc>:
-+ *[0-9a-f]*:	ff df e0 2f 	andeq pc,pc,pc
-+ *[0-9a-f]*:	f9 dc ef 2c 	andal r12,r12,r12
-+ *[0-9a-f]*:	eb d5 e8 25 	andls r5,r5,r5
-+ *[0-9a-f]*:	e9 d4 e7 24 	andpl r4,r4,r4   
-+ *[0-9a-f]*:	fd de e1 2e 	andne lr,lr,lr
-+ *[0-9a-f]*:	e5 d1 e8 2a 	andls r10,r2,r1
-+ *[0-9a-f]*:	f1 db ed 2c 	andvc r12,r8,r11
-+ *[0-9a-f]*:	ef d0 e6 2a 	andmi r10,r7,r0
-+
-+[0-9a-f]* <orc>:
-+ *[0-9a-f]*:	ff df e0 3f 	oreq pc,pc,pc
-+ *[0-9a-f]*:	f9 dc ef 3c 	oral r12,r12,r12
-+ *[0-9a-f]*:	eb d5 e8 35 	orls r5,r5,r5
-+ *[0-9a-f]*:	e9 d4 e7 34 	orpl r4,r4,r4   
-+ *[0-9a-f]*:	fd de e1 3e 	orne lr,lr,lr
-+ *[0-9a-f]*:	e5 d1 e8 3a 	orls r10,r2,r1
-+ *[0-9a-f]*:	f1 db ed 3c 	orvc r12,r8,r11
-+ *[0-9a-f]*:	ef d0 e6 3a 	ormi r10,r7,r0
-+
-+[0-9a-f]* <eorc>:
-+ *[0-9a-f]*:	ff df e0 4f 	eoreq pc,pc,pc
-+ *[0-9a-f]*:	f9 dc ef 4c 	eoral r12,r12,r12
-+ *[0-9a-f]*:	eb d5 e8 45 	eorls r5,r5,r5
-+ *[0-9a-f]*:	e9 d4 e7 44 	eorpl r4,r4,r4   
-+ *[0-9a-f]*:	fd de e1 4e 	eorne lr,lr,lr
-+ *[0-9a-f]*:	e5 d1 e8 4a 	eorls r10,r2,r1
-+ *[0-9a-f]*:	f1 db ed 4c 	eorvc r12,r8,r11
-+ *[0-9a-f]*:	ef d0 e6 4a 	eormi r10,r7,r0
-+
-+[0-9a-f]* <ldcond>:
-+ *[0-9a-f]*:	ff ff 01 ff     ld.weq  pc,pc[0x7fc]
-+ *[0-9a-f]*:	f9 fc f3 ff     ld.shal r12,r12[0x3fe]
-+ *[0-9a-f]*:	eb f5 84 00     ld.shls r5,r5[0x0]
-+ *[0-9a-f]*:	e9 f4 79 ff     ld.ubpl r4,r4[0x1ff]
-+ *[0-9a-f]*:	fd fe 16 00     ld.sbne lr,lr[0x0]
-+ *[0-9a-f]*:	e5 fa 80 00     ld.wls  r10,r2[0x0]
-+ *[0-9a-f]*:	f1 fc d3 ff     ld.shvc r12,r8[0x3fe]
-+ *[0-9a-f]*:	ef fa 68 01     ld.ubmi r10,r7[0x1]
-+
-+[0-9a-f]* <stcond2>:
-+ *[0-9a-f]*:	ff ff 0b ff     st.weq pc[0x7fc],pc
-+ *[0-9a-f]*:	f9 fc fd ff     st.hal r12[0x3fe],r12
-+ *[0-9a-f]*:	eb f5 8c 00     st.hls r5[0x0],r5
-+ *[0-9a-f]*:	e9 f4 7f ff     st.bpl r4[0x1ff],r4
-+ *[0-9a-f]*:	fd fe 1e 00     st.bne lr[0x0],lr
-+ *[0-9a-f]*:	e5 fa 8a 00     st.wls r2[0x0],r10
-+ *[0-9a-f]*:	f1 fc dd ff     st.hvc r8[0x3fe],r12
-+ *[0-9a-f]*:	ef fa 6e 01     st.bmi r7[0x1],r10
-+
-+[0-9a-f]* <movh>:
-+ *[0-9a-f]*:	fc 1f ff ff     movh pc,0xffff
-+ *[0-9a-f]*:	fc 10 00 00     movh r0,0x0
-+ *[0-9a-f]*:	fc 15 00 01     movh r5,0x1
-+ *[0-9a-f]*:	fc 1c 7f ff     movh r12,0x7fff
-+
-diff -Nur binutils-2.21.orig/gas/testsuite/gas/avr32/allinsn.exp binutils-2.21/gas/testsuite/gas/avr32/allinsn.exp
---- binutils-2.21.orig/gas/testsuite/gas/avr32/allinsn.exp	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.21/gas/testsuite/gas/avr32/allinsn.exp	2011-08-28 14:56:20.627990721 +0200
-@@ -0,0 +1,5 @@
-+# AVR32 assembler testsuite. -*- Tcl -*-
-+
-+if [istarget avr32-*-*] {
-+    run_dump_test "allinsn"
-+}
-diff -Nur binutils-2.21.orig/gas/testsuite/gas/avr32/allinsn.s binutils-2.21/gas/testsuite/gas/avr32/allinsn.s
---- binutils-2.21.orig/gas/testsuite/gas/avr32/allinsn.s	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.21/gas/testsuite/gas/avr32/allinsn.s	2011-08-28 14:56:20.687982602 +0200
-@@ -0,0 +1,3330 @@
-+ .data
-+foodata: .word 42
-+ .text
-+footext:
-+	.text
-+	.global ld_d5
-+ld_d5:
-+	ld.d lr,pc[pc<<3]
-+	ld.d r0,r0[r0<<0]
-+	ld.d r6,r5[r5<<2]
-+	ld.d r4,r4[r4<<1]
-+	ld.d lr,lr[lr<<1]
-+	ld.d r10,r3[sp<<2]
-+	ld.d r8,r10[r6<<2]
-+	ld.d r2,r7[r9<<0]
-+	.text
-+	.global ld_w5
-+ld_w5:
-+	ld.w pc,pc[pc<<0]
-+	ld.w r12,r12[r12<<3]
-+	ld.w r5,r5[r5<<2]
-+	ld.w r4,r4[r4<<1]
-+	ld.w lr,lr[lr<<1]
-+	ld.w r2,r9[r9<<0]
-+	ld.w r11,r2[r6<<0]
-+	ld.w r0,r2[sp<<3]
-+	.text
-+	.global ld_sh5
-+ld_sh5:
-+	ld.sh pc,pc[pc<<0]
-+	ld.sh r12,r12[r12<<3]
-+	ld.sh r5,r5[r5<<2]
-+	ld.sh r4,r4[r4<<1]
-+	ld.sh lr,lr[lr<<1]
-+	ld.sh r11,r0[pc<<2]
-+	ld.sh r10,sp[r6<<2]
-+	ld.sh r12,r2[r2<<0]
-+	.text
-+	.global ld_uh5
-+ld_uh5:
-+	ld.uh pc,pc[pc<<0]
-+	ld.uh r12,r12[r12<<3]
-+	ld.uh r5,r5[r5<<2]
-+	ld.uh r4,r4[r4<<1]
-+	ld.uh lr,lr[lr<<1]
-+	ld.uh r8,pc[lr<<3]
-+	ld.uh r6,r1[pc<<1]
-+	ld.uh r6,lr[sp<<1]
-+	.text
-+	.global ld_sb2
-+ld_sb2:
-+	ld.sb pc,pc[pc<<0]
-+	ld.sb r12,r12[r12<<3]
-+	ld.sb r5,r5[r5<<2]
-+	ld.sb r4,r4[r4<<1]
-+	ld.sb lr,lr[lr<<1]
-+	ld.sb r9,r1[pc<<3]
-+	ld.sb r0,r3[r11<<1]
-+	ld.sb r10,r5[r5<<1]
-+	.text
-+	.global ld_ub5
-+ld_ub5:
-+	ld.ub pc,pc[pc<<0]
-+	ld.ub r12,r12[r12<<3]
-+	ld.ub r5,r5[r5<<2]
-+	ld.ub r4,r4[r4<<1]
-+	ld.ub lr,lr[lr<<1]
-+	ld.ub r6,r12[r7<<3]
-+	ld.ub r2,r6[r12<<0]
-+	ld.ub r0,r7[r11<<1]
-+	.text
-+	.global st_d5
-+st_d5:
-+	st.d pc[pc<<0],r14
-+	st.d r12[r12<<3],r12
-+	st.d r5[r5<<2],r6
-+	st.d r4[r4<<1],r4
-+	st.d lr[lr<<1],lr
-+	st.d r1[r9<<1],r4
-+	st.d r10[r2<<1],r4
-+	st.d r12[r6<<0],lr
-+	.text
-+	.global st_w5
-+st_w5:
-+	st.w pc[pc<<0],pc
-+	st.w r12[r12<<3],r12
-+	st.w r5[r5<<2],r5
-+	st.w r4[r4<<1],r4
-+	st.w lr[lr<<1],lr
-+	st.w r1[r10<<0],r3
-+	st.w r0[r10<<1],r9
-+	st.w r4[r5<<3],pc
-+	.text
-+	.global st_h5
-+st_h5:
-+	st.h pc[pc<<0],pc
-+	st.h r12[r12<<3],r12
-+	st.h r5[r5<<2],r5
-+	st.h r4[r4<<1],r4
-+	st.h lr[lr<<1],lr
-+	st.h r2[r9<<0],r11
-+	st.h r5[r1<<2],r12
-+	st.h pc[r8<<2],r3
-+	.text
-+	.global st_b5
-+st_b5:
-+	st.b pc[pc<<0],pc
-+	st.b r12[r12<<3],r12
-+	st.b r5[r5<<2],r5
-+	st.b r4[r4<<1],r4
-+	st.b lr[lr<<1],lr
-+	st.b r1[r8<<1],r6
-+	st.b lr[lr<<3],r1
-+	st.b r5[r0<<2],pc
-+	.text
-+	.global divs
-+divs:
-+	divs pc,pc,pc
-+	divs r12,r12,r12
-+	divs r5,r5,r5
-+	divs r4,r4,r4
-+	divs lr,lr,lr
-+	divs r3,pc,pc
-+	divs r9,r12,r2
-+	divs r7,r4,r1
-+	.text
-+	.global add1
-+add1:
-+	add pc,pc
-+	add r12,r12
-+	add r5,r5
-+	add r4,r4
-+	add lr,lr
-+	add r12,r9
-+	add r6,r3
-+	add r10,r12
-+	.text
-+	.global sub1
-+sub1:
-+	sub pc,pc
-+	sub r12,r12
-+	sub r5,r5
-+	sub r4,r4
-+	sub lr,lr
-+	sub lr,r6
-+	sub r0,sp
-+	sub r6,r12
-+	.text
-+	.global rsub1
-+rsub1:
-+	rsub pc,pc
-+	rsub r12,r12
-+	rsub r5,r5
-+	rsub r4,r4
-+	rsub lr,lr
-+	rsub r11,sp
-+	rsub r7,r4
-+	rsub r9,r1
-+	.text
-+	.global cp1
-+cp1:
-+	cp pc,pc
-+	cp r12,r12
-+	cp r5,r5
-+	cp r4,r4
-+	cp lr,lr
-+	cp r6,r2
-+	cp r0,r9
-+	cp r3,sp
-+	.text
-+	.global or1
-+or1:
-+	or pc,pc
-+	or r12,r12
-+	or r5,r5
-+	or r4,r4
-+	or lr,lr
-+	or r4,r9
-+	or r11,r4
-+	or r4,r0
-+	.text
-+	.global eor1
-+eor1:
-+	eor pc,pc
-+	eor r12,r12
-+	eor r5,r5
-+	eor r4,r4
-+	eor lr,lr
-+	eor r12,r11
-+	eor r0,r1
-+	eor r5,pc
-+	.text
-+	.global and1
-+and1:
-+	and pc,pc
-+	and r12,r12
-+	and r5,r5
-+	and r4,r4
-+	and lr,lr
-+	and r8,r1
-+	and r0,sp
-+	and r10,r5
-+	.text
-+	.global tst
-+tst:
-+	tst pc,pc
-+	tst r12,r12
-+	tst r5,r5
-+	tst r4,r4
-+	tst lr,lr
-+	tst r0,r12
-+	tst r10,r6
-+	tst sp,r4
-+	.text
-+	.global andn
-+andn:
-+	andn pc,pc
-+	andn r12,r12
-+	andn r5,r5
-+	andn r4,r4
-+	andn lr,lr
-+	andn r9,r12
-+	andn r11,sp
-+	andn r12,r5
-+	.text
-+	.global mov3
-+mov3:
-+	mov pc,pc
-+	mov r12,r12
-+	mov r5,r5
-+	mov r4,r4
-+	mov lr,lr
-+	mov r5,r9
-+	mov r11,r11
-+	mov r2,lr
-+	.text
-+	.global st_w1
-+st_w1:
-+	st.w pc++,pc
-+	st.w r12++,r12
-+	st.w r5++,r5
-+	st.w r4++,r4
-+	st.w lr++,lr
-+	st.w r1++,r11
-+	st.w sp++,r0
-+	st.w sp++,r1
-+	.text
-+	.global st_h1
-+st_h1:
-+	st.h pc++,pc
-+	st.h r12++,r12
-+	st.h r5++,r5
-+	st.h r4++,r4
-+	st.h lr++,lr
-+	st.h r12++,sp
-+	st.h r7++,lr
-+	st.h r7++,r4
-+	.text
-+	.global st_b1
-+st_b1:
-+	st.b pc++,pc
-+	st.b r12++,r12
-+	st.b r5++,r5
-+	st.b r4++,r4
-+	st.b lr++,lr
-+	st.b r9++,sp
-+	st.b r1++,sp
-+	st.b r0++,r4
-+	.text
-+	.global st_w2
-+st_w2:
-+	st.w --pc,pc
-+	st.w --r12,r12
-+	st.w --r5,r5
-+	st.w --r4,r4
-+	st.w --lr,lr
-+	st.w --r1,r7
-+	st.w --r3,r9
-+	st.w --r5,r5
-+	.text
-+	.global st_h2
-+st_h2:
-+	st.h --pc,pc
-+	st.h --r12,r12
-+	st.h --r5,r5
-+	st.h --r4,r4
-+	st.h --lr,lr
-+	st.h --r5,r7
-+	st.h --r8,r8
-+	st.h --r7,r2
-+	.text
-+	.global st_b2
-+st_b2:
-+	st.b --pc,pc
-+	st.b --r12,r12
-+	st.b --r5,r5
-+	st.b --r4,r4
-+	st.b --lr,lr
-+	st.b --sp,sp
-+	st.b --sp,r11
-+	st.b --r4,r5
-+	.text
-+	.global ld_w1
-+ld_w1:
-+	ld.w pc,pc++
-+	ld.w r12,r12++
-+	ld.w r5,r5++
-+	ld.w r4,r4++
-+	ld.w lr,lr++
-+	ld.w r3,r7++
-+	ld.w r3,lr++
-+	ld.w r12,r5++
-+	.text
-+	.global ld_sh1
-+ld_sh1:
-+	ld.sh pc,pc++
-+	ld.sh r12,r12++
-+	ld.sh r5,r5++
-+	ld.sh r4,r4++
-+	ld.sh lr,lr++
-+	ld.sh r11,r2++
-+	ld.sh r2,r8++
-+	ld.sh r7,r6++
-+	.text
-+	.global ld_uh1
-+ld_uh1:
-+	ld.uh pc,pc++
-+	ld.uh r12,r12++
-+	ld.uh r5,r5++
-+	ld.uh r4,r4++
-+	ld.uh lr,lr++
-+	ld.uh r6,r7++
-+	ld.uh r10,r11++
-+	ld.uh lr,r4++
-+	.text
-+	.global ld_ub1
-+ld_ub1:
-+	ld.ub pc,pc++
-+	ld.ub r12,r12++
-+	ld.ub r5,r5++
-+	ld.ub r4,r4++
-+	ld.ub lr,lr++
-+	ld.ub r8,lr++
-+	ld.ub r12,r12++
-+	ld.ub r11,r10++
-+	.text
-+	.global ld_w2
-+ld_w2:
-+	ld.w pc,--pc
-+	ld.w r12,--r12
-+	ld.w r5,--r5
-+	ld.w r4,--r4
-+	ld.w lr,--lr
-+	ld.w r10,--lr
-+	ld.w r12,--r9
-+	ld.w r6,--r5
-+	.text
-+	.global ld_sh2
-+ld_sh2:
-+	ld.sh pc,--pc
-+	ld.sh r12,--r12
-+	ld.sh r5,--r5
-+	ld.sh r4,--r4
-+	ld.sh lr,--lr
-+	ld.sh pc,--r10
-+	ld.sh r6,--r3
-+	ld.sh r4,--r6
-+	.text
-+	.global ld_uh2
-+ld_uh2:
-+	ld.uh pc,--pc
-+	ld.uh r12,--r12
-+	ld.uh r5,--r5
-+	ld.uh r4,--r4
-+	ld.uh lr,--lr
-+	ld.uh r3,--r2
-+	ld.uh r1,--r0
-+	ld.uh r2,--r9
-+	.text
-+	.global ld_ub2
-+ld_ub2:
-+	ld.ub pc,--pc
-+	ld.ub r12,--r12
-+	ld.ub r5,--r5
-+	ld.ub r4,--r4
-+	ld.ub lr,--lr
-+	ld.ub r1,--r1
-+	ld.ub r0,--r6
-+	ld.ub r2,--r7
-+	.text
-+	.global ld_ub3
-+ld_ub3:
-+	ld.ub pc,pc[0]
-+	ld.ub r12,r12[7]
-+	ld.ub r5,r5[4]
-+	ld.ub r4,r4[3]
-+	ld.ub lr,lr[1]
-+	ld.ub r6,r9[6]
-+	ld.ub r2,lr[4]
-+	ld.ub r1,r8[0]
-+	.text
-+	.global sub3_sp
-+sub3_sp:
-+	sub sp,0
-+	sub sp,-4
-+	sub sp,-512
-+	sub sp,508
-+	sub sp,4
-+	sub sp,44
-+	sub sp,8
-+	sub sp,348
-+	.text
-+	.global sub3
-+sub3:
-+	sub pc,0
-+	sub r12,-1
-+	sub r5,-128
-+	sub r4,127
-+	sub lr,1
-+	sub r6,-41
-+	sub r4,37
-+	sub r12,56
-+	.text
-+	.global mov1
-+mov1:
-+	mov pc,0
-+	mov r12,-1
-+	mov r5,-128
-+	mov r4,127
-+	mov lr,1
-+	mov pc,14
-+	mov r6,-100
-+	mov lr,-122
-+	.text
-+	.global lddsp
-+lddsp:
-+	lddsp pc,sp[0]
-+	lddsp r12,sp[508]
-+	lddsp r5,sp[256]
-+	lddsp r4,sp[252]
-+	lddsp lr,sp[4]
-+	lddsp lr,sp[256]
-+	lddsp r12,sp[20]
-+	lddsp r9,sp[472]
-+	.text
-+	.global lddpc
-+lddpc:
-+	lddpc pc,pc[0]
-+	lddpc r0,pc[508]
-+	lddpc r8,pc[256]
-+	lddpc r7,pc[252]
-+	lddpc lr,pc[4]
-+	lddpc sp,pc[472]
-+	lddpc r6,pc[120]
-+	lddpc r11,pc[28]
-+	.text
-+	.global stdsp
-+stdsp:
-+	stdsp sp[0],pc
-+	stdsp sp[508],r12
-+	stdsp sp[256],r5
-+	stdsp sp[252],r4
-+	stdsp sp[4],lr
-+	stdsp sp[304],pc
-+	stdsp sp[256],r0
-+	stdsp sp[336],r5
-+	.text
-+	.global cp2
-+cp2:
-+	cp pc,0
-+	cp r12,-1
-+	cp r5,-32
-+	cp r4,31
-+	cp lr,1
-+	cp r8,3
-+	cp lr,16
-+	cp r7,-26
-+	.text
-+	.global acr
-+acr:
-+	acr pc
-+	acr r12
-+	acr r5
-+	acr r4
-+	acr lr
-+	acr r2
-+	acr r12
-+	acr pc
-+	.text
-+	.global scr
-+scr:
-+	scr pc
-+	scr r12
-+	scr r5
-+	scr r4
-+	scr lr
-+	scr pc
-+	scr r6
-+	scr r1
-+	.text
-+	.global cpc0
-+cpc0:
-+	cpc pc
-+	cpc r12
-+	cpc r5
-+	cpc r4
-+	cpc lr
-+	cpc pc
-+	cpc r4
-+	cpc r9
-+	.text
-+	.global neg
-+neg:
-+	neg pc
-+	neg r12
-+	neg r5
-+	neg r4
-+	neg lr
-+	neg r7
-+	neg r1
-+	neg r9
-+	.text
-+	.global abs
-+abs:
-+	abs pc
-+	abs r12
-+	abs r5
-+	abs r4
-+	abs lr
-+	abs r6
-+	abs r6
-+	abs r4
-+	.text
-+	.global castu_b
-+castu_b:
-+	castu.b pc
-+	castu.b r12
-+	castu.b r5
-+	castu.b r4
-+	castu.b lr
-+	castu.b r7
-+	castu.b sp
-+	castu.b r9
-+	.text
-+	.global casts_b
-+casts_b:
-+	casts.b pc
-+	casts.b r12
-+	casts.b r5
-+	casts.b r4
-+	casts.b lr
-+	casts.b r11
-+	casts.b r1
-+	casts.b r10
-+	.text
-+	.global castu_h
-+castu_h:
-+	castu.h pc
-+	castu.h r12
-+	castu.h r5
-+	castu.h r4
-+	castu.h lr
-+	castu.h r10
-+	castu.h r11
-+	castu.h r1
-+	.text
-+	.global casts_h
-+casts_h:
-+	casts.h pc
-+	casts.h r12
-+	casts.h r5
-+	casts.h r4
-+	casts.h lr
-+	casts.h r0
-+	casts.h r5
-+	casts.h r9
-+	.text
-+	.global brev
-+brev:
-+	brev pc
-+	brev r12
-+	brev r5
-+	brev r4
-+	brev lr
-+	brev r5
-+	brev r10
-+	brev r8
-+	.text
-+	.global swap_h
-+swap_h:
-+	swap.h pc
-+	swap.h r12
-+	swap.h r5
-+	swap.h r4
-+	swap.h lr
-+	swap.h r7
-+	swap.h r0
-+	swap.h r8
-+	.text
-+	.global swap_b
-+swap_b:
-+	swap.b pc
-+	swap.b r12
-+	swap.b r5
-+	swap.b r4
-+	swap.b lr
-+	swap.b r10
-+	swap.b r12
-+	swap.b r1
-+	.text
-+	.global swap_bh
-+swap_bh:
-+	swap.bh pc
-+	swap.bh r12
-+	swap.bh r5
-+	swap.bh r4
-+	swap.bh lr
-+	swap.bh r9
-+	swap.bh r4
-+	swap.bh r1
-+	.text
-+	.global One_s_compliment
-+One_s_compliment:
-+	com pc
-+	com r12
-+	com r5
-+	com r4
-+	com lr
-+	com r2
-+	com r2
-+	com r7
-+	.text
-+	.global tnbz
-+tnbz:
-+	tnbz pc
-+	tnbz r12
-+	tnbz r5
-+	tnbz r4
-+	tnbz lr
-+	tnbz r8
-+	tnbz r12
-+	tnbz pc
-+	.text
-+	.global rol
-+rol:
-+	rol pc
-+	rol r12
-+	rol r5
-+	rol r4
-+	rol lr
-+	rol r10
-+	rol r9
-+	rol r5
-+	.text
-+	.global ror
-+ror:
-+	ror pc
-+	ror r12
-+	ror r5
-+	ror r4
-+	ror lr
-+	ror r8
-+	ror r4
-+	ror r7
-+	.text
-+	.global icall
-+icall:
-+	icall pc
-+	icall r12
-+	icall r5
-+	icall r4
-+	icall lr
-+	icall r3
-+	icall r1
-+	icall r3
-+	.text
-+	.global mustr
-+mustr:
-+	mustr pc
-+	mustr r12
-+	mustr r5
-+	mustr r4
-+	mustr lr
-+	mustr r1
-+	mustr r4
-+	mustr r12
-+	.text
-+	.global musfr
-+musfr:
-+	musfr pc
-+	musfr r12
-+	musfr r5
-+	musfr r4
-+	musfr lr
-+	musfr r11
-+	musfr r12
-+	musfr r2
-+	.text
-+	.global ret_cond
-+ret_cond:
-+	reteq pc
-+	retal r12
-+	retls r5
-+	retpl r4
-+	retne lr
-+	retgt r0
-+	retgt r12
-+	retge r10
-+	.text
-+	.global sr_cond
-+sr_cond:
-+	sreq pc
-+	sral r12
-+	srls r5
-+	srpl r4
-+	srne lr
-+	srlt r0
-+	sral sp
-+	srge r9
-+	.text
-+	.global ld_w3
-+ld_w3:
-+	ld.w pc,pc[0]
-+	ld.w r12,r12[124]
-+	ld.w r5,r5[64]
-+	ld.w r4,r4[60]
-+	ld.w lr,lr[4]
-+	ld.w sp,r2[52]
-+	ld.w r9,r1[8]
-+	ld.w r5,sp[60]
-+	.text
-+	.global ld_sh3
-+ld_sh3:
-+	ld.sh pc,pc[0]
-+	ld.sh r12,r12[14]
-+	ld.sh r5,r5[8]
-+	ld.sh r4,r4[6]
-+	ld.sh lr,lr[2]
-+	ld.sh r4,r2[8]
-+	ld.sh sp,lr[10]
-+	ld.sh r2,r11[2]
-+	.text
-+	.global ld_uh3
-+ld_uh3:
-+	ld.uh pc,pc[0]
-+	ld.uh r12,r12[14]
-+	ld.uh r5,r5[8]
-+	ld.uh r4,r4[6]
-+	ld.uh lr,lr[2]
-+	ld.uh r10,r0[10]
-+	ld.uh r8,r11[8]
-+	ld.uh r10,r2[12]
-+	.text
-+	.global st_w3
-+st_w3:
-+	st.w pc[0],pc
-+	st.w r12[60],r12
-+	st.w r5[32],r5
-+	st.w r4[28],r4
-+	st.w lr[4],lr
-+	st.w r7[44],r11
-+	st.w r2[24],r6
-+	st.w r4[12],r9
-+	.text
-+	.global st_h3
-+st_h3:
-+	st.h pc[0],pc
-+	st.h r12[14],r12
-+	st.h r5[8],r5
-+	st.h r4[6],r4
-+	st.h lr[2],lr
-+	st.h lr[10],r12
-+	st.h r6[4],r0
-+	st.h r5[12],sp
-+	.text
-+	.global st_b3
-+st_b3:
-+	st.b pc[0],pc
-+	st.b r12[7],r12
-+	st.b r5[4],r5
-+	st.b r4[3],r4
-+	st.b lr[1],lr
-+	st.b r12[6],r9
-+	st.b r2[3],lr
-+	st.b r1[3],r11
-+	.text
-+	.global ldd
-+ldd:
-+	ld.d r0,pc
-+	ld.d r14,r12
-+	ld.d r8,r5
-+	ld.d r6,r4
-+	ld.d r2,lr
-+	ld.d r14,r7
-+	ld.d r4,r4
-+	ld.d r14,pc
-+	.text
-+	.global ldd_postinc
-+ldd_postinc:
-+	ld.d r0,pc++
-+	ld.d r14,r12++
-+	ld.d r8,r5++
-+	ld.d r6,r4++
-+	ld.d r2,lr++
-+	ld.d r14,r5++
-+	ld.d r12,r11++
-+	ld.d r2,r12++
-+	.text
-+	.global ldd_predec
-+ldd_predec:
-+	ld.d r0,--pc
-+	ld.d r14,--r12
-+	ld.d r8,--r5
-+	ld.d r6,--r4
-+	ld.d r2,--lr
-+	ld.d r8,--r0
-+	ld.d r10,--pc
-+	ld.d r2,--r4
-+	.text
-+	.global std
-+std:
-+	st.d pc,r0
-+	st.d r12,r14
-+	st.d r5,r8
-+	st.d r4,r6
-+	st.d lr,r2
-+	st.d r0,r12
-+	st.d sp,r4
-+	st.d r12,r12
-+	.text
-+	.global std_postinc
-+std_postinc:
-+	st.d pc++,r0
-+	st.d r12++,r14
-+	st.d r5++,r8
-+	st.d r4++,r6
-+	st.d lr++,r2
-+	st.d sp++,r6
-+	st.d r10++,r6
-+	st.d r7++,r2
-+	.text
-+	.global std_predec
-+std_predec:
-+	st.d --pc,r0
-+	st.d --r12,r14
-+	st.d --r5,r8
-+	st.d --r4,r6
-+	st.d --lr,r2
-+	st.d --r3,r6
-+	st.d --lr,r2
-+	st.d --r0,r4
-+	.text
-+	.global mul
-+mul:
-+	mul pc,pc
-+	mul r12,r12
-+	mul r5,r5
-+	mul r4,r4
-+	mul lr,lr
-+	mul r10,lr
-+	mul r0,r8
-+	mul r8,r5
-+	.text
-+	.global asr_imm5
-+asr_imm5:
-+	asr pc,0
-+	asr r12,31
-+	asr r5,16
-+	asr r4,15
-+	asr lr,1
-+	asr r6,23
-+	asr r6,18
-+	asr r5,8
-+	.text
-+	.global lsl_imm5
-+lsl_imm5:
-+	lsl pc,0
-+	lsl r12,31
-+	lsl r5,16
-+	lsl r4,15
-+	lsl lr,1
-+	lsl r12,13
-+	lsl r6,16
-+	lsl r1,25
-+	.text
-+	.global lsr_imm5
-+lsr_imm5:
-+	lsr pc,0
-+	lsr r12,31
-+	lsr r5,16
-+	lsr r4,15
-+	lsr lr,1
-+	lsr r0,1
-+	lsr r8,10
-+	lsr r7,26
-+	.text
-+	.global sbr
-+sbr:
-+	sbr pc,0
-+	sbr r12,31
-+	sbr r5,16
-+	sbr r4,15
-+	sbr lr,1
-+	sbr r8,31
-+	sbr r6,22
-+	sbr r1,23
-+	.text
-+	.global cbr
-+cbr:
-+	cbr pc,0
-+	cbr r12,31
-+	cbr r5,16
-+	cbr r4,15
-+	cbr lr,1
-+	cbr r12,10
-+	cbr r7,22
-+	cbr r8,9
-+	.text
-+	.global brc1
-+brc1:
-+	breq 0
-+	brpl -2
-+	brge -256
-+	brcs 254
-+	brne 2
-+	brcs 230
-+	breq -18
-+	breq 12
-+	.text
-+	.global rjmp
-+rjmp:
-+	rjmp 0
-+	rjmp -2
-+	rjmp -1024
-+	rjmp 1022
-+	rjmp 2
-+	rjmp -962
-+	rjmp 14
-+	rjmp -516
-+	.text
-+	.global rcall1
-+rcall1:
-+	rcall 0
-+	rcall -2
-+	rcall -1024
-+	rcall 1022
-+	rcall 2
-+	rcall 216
-+	rcall -530
-+	rcall -972
-+	.text
-+	.global acall
-+acall:
-+	acall 0
-+	acall 1020
-+	acall 512
-+	acall 508
-+	acall 4
-+	acall 356
-+	acall 304
-+	acall 172
-+	.text
-+	.global scall
-+scall:
-+	scall
-+	scall
-+	scall
-+	scall
-+	scall
-+	scall
-+	scall
-+	scall
-+	.text
-+	.global popm
-+popm:
-+	/* popm with no argument fails currently */
-+	popm pc
-+	popm r0-r11,pc,r12=-1
-+	popm lr
-+	popm r0-r11,pc,r12=1
-+	popm r0-r3
-+	popm r4-r10,pc
-+	popm r0-r3,r11,pc,r12=0
-+	popm r0-r7,r10-r12,lr
-+	.text
-+	.global pushm
-+pushm:
-+	pushm pc
-+	pushm r0-r12,lr,pc
-+	pushm pc
-+	pushm r0-r12,lr
-+	pushm r0-r3
-+	pushm r8-r10,lr,pc
-+	pushm r0-r3,r10
-+	pushm r8-r9,r12
-+	.text
-+	.global popm_n
-+popm_n:
-+	popm pc
-+	popm r0-r11,pc,r12=-1
-+	popm lr
-+	popm r0-r11,pc,r12=1
-+	popm r0-r3
-+	popm r4-r10,pc
-+	popm r0-r3,r11,pc,r12=0
-+	popm r0-r7,r10-r12,lr
-+	.text
-+	.global pushm_n
-+pushm_n:
-+	pushm pc
-+	pushm r0-r12,lr,pc
-+	pushm pc
-+	pushm r0-r12,lr
-+	pushm r0-r3
-+	pushm r8-r10,lr,pc
-+	pushm r0-r3,r10
-+	pushm r8-r9,r12
-+	.text
-+	.global csrfcz
-+csrfcz:
-+	csrfcz 0
-+	csrfcz 31
-+	csrfcz 16
-+	csrfcz 15
-+	csrfcz 1
-+	csrfcz 5
-+	csrfcz 13
-+	csrfcz 23
-+	.text
-+	.global ssrf
-+ssrf:
-+	ssrf 0
-+	ssrf 31
-+	ssrf 16
-+	ssrf 15
-+	ssrf 1
-+	ssrf 29
-+	ssrf 13
-+	ssrf 13
-+	.text
-+	.global csrf
-+csrf:
-+	csrf 0
-+	csrf 31
-+	csrf 16
-+	csrf 15
-+	csrf 1
-+	csrf 10
-+	csrf 15
-+	csrf 11
-+	.text
-+	.global rete
-+rete:
-+	rete
-+	.text
-+	.global rets
-+rets:
-+	rets
-+	.text
-+	.global retd
-+retd:
-+	retd
-+	.text
-+	.global retj
-+retj:
-+	retj
-+	.text
-+	.global tlbr
-+tlbr:
-+	tlbr
-+	.text
-+	.global tlbs
-+tlbs:
-+	tlbs
-+	.text
-+	.global tlbw
-+tlbw:
-+	tlbw
-+	.text
-+	.global breakpoint
-+breakpoint:
-+	breakpoint
-+	.text
-+	.global incjosp
-+incjosp:
-+	incjosp 1
-+	incjosp 2
-+	incjosp 3
-+	incjosp 4
-+	incjosp -4
-+	incjosp -3
-+	incjosp -2
-+	incjosp -1
-+	.text
-+	.global nop
-+nop:
-+	nop
-+	.text
-+	.global popjc
-+popjc:
-+	popjc
-+	.text
-+	.global pushjc
-+pushjc:
-+	pushjc
-+	.text
-+	.global add2
-+add2:
-+	add pc,pc,pc<<0
-+	add r12,r12,r12<<3
-+	add r5,r5,r5<<2
-+	add r4,r4,r4<<1
-+	add lr,lr,lr<<1
-+	add r0,r12,r0<<1
-+	add r9,r12,r4<<0
-+	add r12,r12,r7<<2
-+	.text
-+	.global sub2
-+sub2:
-+	sub pc,pc,pc<<0
-+	sub r12,r12,r12<<3
-+	sub r5,r5,r5<<2
-+	sub r4,r4,r4<<1
-+	sub lr,lr,lr<<1
-+	sub sp,r3,r4<<0
-+	sub r3,r7,r3<<0
-+	sub sp,r10,sp<<1
-+	.text
-+	.global divu
-+divu:
-+	divu pc,pc,pc
-+	divu r12,r12,r12
-+	divu r5,r5,r5
-+	divu r4,r4,r4
-+	divu lr,lr,lr
-+	divu sp,r4,pc
-+	divu r5,r5,sp
-+	divu r10,sp,r0
-+	.text
-+	.global addhh_w
-+addhh_w:
-+	addhh.w pc,pc:b,pc:b
-+	addhh.w r12,r12:t,r12:t
-+	addhh.w r5,r5:t,r5:t
-+	addhh.w r4,r4:b,r4:b
-+	addhh.w lr,lr:t,lr:t
-+	addhh.w r0,r0:b,r3:b
-+	addhh.w lr,r12:t,r7:b
-+	addhh.w r3,r10:t,r2:b
-+	.text
-+	.global subhh_w
-+subhh_w:
-+	subhh.w pc,pc:b,pc:b
-+	subhh.w r12,r12:t,r12:t
-+	subhh.w r5,r5:t,r5:t
-+	subhh.w r4,r4:b,r4:b
-+	subhh.w lr,lr:t,lr:t
-+	subhh.w r10,r1:t,r7:b
-+	subhh.w pc,r10:t,lr:t
-+	subhh.w r3,r0:t,r12:b
-+	.text
-+	.global adc
-+adc:
-+	adc pc,pc,pc
-+	adc r12,r12,r12
-+	adc r5,r5,r5
-+	adc r4,r4,r4
-+	adc lr,lr,lr
-+	adc r4,r0,r7
-+	adc sp,r4,r3
-+	adc r2,r12,r0
-+	.text
-+	.global sbc
-+sbc:
-+	sbc pc,pc,pc
-+	sbc r12,r12,r12
-+	sbc r5,r5,r5
-+	sbc r4,r4,r4
-+	sbc lr,lr,lr
-+	sbc r6,r7,r9
-+	sbc r0,r8,r5
-+	sbc r1,r0,r4
-+	.text
-+	.global mul_2
-+mul_2:
-+	mul pc,pc,pc
-+	mul r12,r12,r12
-+	mul r5,r5,r5
-+	mul r4,r4,r4
-+	mul lr,lr,lr
-+	mul pc,r0,r0
-+	mul r8,pc,lr
-+	mul r4,r12,pc
-+	.text
-+	.global mac
-+mac:
-+	mac pc,pc,pc
-+	mac r12,r12,r12
-+	mac r5,r5,r5
-+	mac r4,r4,r4
-+	mac lr,lr,lr
-+	mac r10,r4,r0
-+	mac r7,lr,r0
-+	mac r2,r9,r12
-+	.text
-+	.global mulsd
-+mulsd:
-+	muls.d pc,pc,pc
-+	muls.d r12,r12,r12
-+	muls.d r5,r5,r5
-+	muls.d r4,r4,r4
-+	muls.d lr,lr,lr
-+	muls.d r2,r8,lr
-+	muls.d r4,r0,r11
-+	muls.d r5,lr,r6
-+	.text
-+	.global macsd
-+macsd:
-+	macs.d r0,pc,pc
-+	macs.d r14,r12,r12
-+	macs.d r8,r5,r5
-+	macs.d r6,r4,r4
-+	macs.d r2,lr,lr
-+	macs.d r8,r1,r9
-+	macs.d r14,r8,r8
-+	macs.d r4,r3,r12
-+	.text
-+	.global mulud
-+mulud:
-+	mulu.d r0,pc,pc
-+	mulu.d r14,r12,r12
-+	mulu.d r8,r5,r5
-+	mulu.d r6,r4,r4
-+	mulu.d r2,lr,lr
-+	mulu.d r6,r5,r0
-+	mulu.d r4,r6,r1
-+	mulu.d r8,r8,r2
-+	.text
-+	.global macud
-+macud:
-+	macu.d r0,pc,pc
-+	macu.d r14,r12,r12
-+	macu.d r8,r5,r5
-+	macu.d r6,r4,r4
-+	macu.d r2,lr,lr
-+	macu.d r6,sp,r11
-+	macu.d r2,r4,r8
-+	macu.d r6,r10,r9
-+	.text
-+	.global asr_1
-+asr_1:
-+	asr pc,pc,pc
-+	asr r12,r12,r12
-+	asr r5,r5,r5
-+	asr r4,r4,r4
-+	asr lr,lr,lr
-+	asr pc,r6,pc
-+	asr r0,r6,r12
-+	asr r4,sp,r0
-+	.text
-+	.global lsl_1
-+lsl_1:
-+	lsl pc,pc,pc
-+	lsl r12,r12,r12
-+	lsl r5,r5,r5
-+	lsl r4,r4,r4
-+	lsl lr,lr,lr
-+	lsl lr,r5,lr
-+	lsl r5,pc,r3
-+	lsl r1,pc,r9
-+	.text
-+	.global lsr_1
-+lsr_1:
-+	lsr pc,pc,pc
-+	lsr r12,r12,r12
-+	lsr r5,r5,r5
-+	lsr r4,r4,r4
-+	lsr lr,lr,lr
-+	lsr r2,r4,r1
-+	lsr r5,r1,r6
-+	lsr sp,r6,r7
-+	.text
-+	.global xchg
-+xchg:
-+	xchg pc,pc,pc
-+	xchg r12,r12,r12
-+	xchg r5,r5,r5
-+	xchg r4,r4,r4
-+	xchg lr,lr,lr
-+	xchg lr,r4,sp
-+	xchg r1,r5,r12
-+	xchg lr,r12,r0
-+	.text
-+	.global max
-+max:
-+	max pc,pc,pc
-+	max r12,r12,r12
-+	max r5,r5,r5
-+	max r4,r4,r4
-+	max lr,lr,lr
-+	max lr,r2,sp
-+	max r4,r10,r9
-+	max lr,r9,lr
-+	.text
-+	.global min
-+min:
-+	min pc,pc,pc
-+	min r12,r12,r12
-+	min r5,r5,r5
-+	min r4,r4,r4
-+	min lr,lr,lr
-+	min r9,r7,r8
-+	min sp,r5,r5
-+	min r4,r1,r4
-+	.text
-+	.global addabs
-+addabs:
-+	addabs pc,pc,pc
-+	addabs r12,r12,r12
-+	addabs r5,r5,r5
-+	addabs r4,r4,r4
-+	addabs lr,lr,lr
-+	addabs r7,r10,r0
-+	addabs r9,r9,r7
-+	addabs r2,r8,r12
-+	.text
-+	.global mulnhh_w
-+mulnhh_w:
-+	mulnhh.w pc,pc:b,pc:b
-+	mulnhh.w r12,r12:t,r12:t
-+	mulnhh.w r5,r5:t,r5:t
-+	mulnhh.w r4,r4:b,r4:b
-+	mulnhh.w lr,lr:t,lr:t
-+	mulnhh.w r11,sp:t,r9:b
-+	mulnhh.w sp,r4:b,lr:t
-+	mulnhh.w r12,r2:t,r11:b
-+	.text
-+	.global mulnwh_d
-+mulnwh_d:
-+	mulnwh.d r0,pc,pc:b
-+	mulnwh.d r14,r12,r12:t
-+	mulnwh.d r8,r5,r5:t
-+	mulnwh.d r6,r4,r4:b
-+	mulnwh.d r2,lr,lr:t
-+	mulnwh.d r14,r3,r2:t
-+	mulnwh.d r4,r5,r9:b
-+	mulnwh.d r12,r4,r4:t
-+	.text
-+	.global machh_w
-+machh_w:
-+	machh.w pc,pc:b,pc:b
-+	machh.w r12,r12:t,r12:t
-+	machh.w r5,r5:t,r5:t
-+	machh.w r4,r4:b,r4:b
-+	machh.w lr,lr:t,lr:t
-+	machh.w lr,r5:b,r1:t
-+	machh.w r9,r6:b,r7:b
-+	machh.w r5,lr:t,r12:b
-+	.text
-+	.global machh_d
-+machh_d:
-+	machh.d r0,pc:b,pc:b
-+	machh.d r14,r12:t,r12:t
-+	machh.d r8,r5:t,r5:t
-+	machh.d r6,r4:b,r4:b
-+	machh.d r2,lr:t,lr:t
-+	machh.d r10,r0:b,r8:b
-+	machh.d r14,r4:b,r5:t
-+	machh.d r8,r0:b,r4:t
-+	.text
-+	.global macsathh_w
-+macsathh_w:
-+	macsathh.w pc,pc:b,pc:b
-+	macsathh.w r12,r12:t,r12:t
-+	macsathh.w r5,r5:t,r5:t
-+	macsathh.w r4,r4:b,r4:b
-+	macsathh.w lr,lr:t,lr:t
-+	macsathh.w r7,r7:t,pc:t
-+	macsathh.w r4,r2:t,r4:b
-+	macsathh.w r4,r8:t,r3:t
-+	.text
-+	.global mulhh_w
-+mulhh_w:
-+	mulhh.w pc,pc:b,pc:b
-+	mulhh.w r12,r12:t,r12:t
-+	mulhh.w r5,r5:t,r5:t
-+	mulhh.w r4,r4:b,r4:b
-+	mulhh.w lr,lr:t,lr:t
-+	mulhh.w r7,r4:t,r9:b
-+	mulhh.w pc,r3:t,r7:t
-+	mulhh.w pc,r4:b,r9:t
-+	.text
-+	.global mulsathh_h
-+mulsathh_h:
-+	mulsathh.h pc,pc:b,pc:b
-+	mulsathh.h r12,r12:t,r12:t
-+	mulsathh.h r5,r5:t,r5:t
-+	mulsathh.h r4,r4:b,r4:b
-+	mulsathh.h lr,lr:t,lr:t
-+	mulsathh.h r3,r1:b,sp:b
-+	mulsathh.h r11,lr:t,r11:b
-+	mulsathh.h r8,r8:b,r11:t
-+	.text
-+	.global mulsathh_w
-+mulsathh_w:
-+	mulsathh.w pc,pc:b,pc:b
-+	mulsathh.w r12,r12:t,r12:t
-+	mulsathh.w r5,r5:t,r5:t
-+	mulsathh.w r4,r4:b,r4:b
-+	mulsathh.w lr,lr:t,lr:t
-+	mulsathh.w lr,r11:t,r6:b
-+	mulsathh.w r6,r6:b,r7:t
-+	mulsathh.w r10,r2:b,r3:b
-+	.text
-+	.global mulsatrndhh_h
-+mulsatrndhh_h:
-+	mulsatrndhh.h pc,pc:b,pc:b
-+	mulsatrndhh.h r12,r12:t,r12:t
-+	mulsatrndhh.h r5,r5:t,r5:t
-+	mulsatrndhh.h r4,r4:b,r4:b
-+	mulsatrndhh.h lr,lr:t,lr:t
-+	mulsatrndhh.h r11,r6:b,r9:b
-+	mulsatrndhh.h r11,r3:b,r8:t
-+	mulsatrndhh.h r5,sp:t,r7:t
-+	.text
-+	.global mulsatrndwh_w
-+mulsatrndwh_w:
-+	mulsatrndwh.w pc,pc,pc:b
-+	mulsatrndwh.w r12,r12,r12:t
-+	mulsatrndwh.w r5,r5,r5:t
-+	mulsatrndwh.w r4,r4,r4:b
-+	mulsatrndwh.w lr,lr,lr:t
-+	mulsatrndwh.w r5,r12,r0:b
-+	mulsatrndwh.w r7,r10,pc:b
-+	mulsatrndwh.w r10,r8,r5:t
-+	.text
-+	.global macwh_d
-+macwh_d:
-+	macwh.d r0,pc,pc:b
-+	macwh.d r14,r12,r12:t
-+	macwh.d r8,r5,r5:t
-+	macwh.d r6,r4,r4:b
-+	macwh.d r2,lr,lr:t
-+	macwh.d r4,r10,r12:t
-+	macwh.d r4,r7,sp:b
-+	macwh.d r14,r9,r11:b
-+	.text
-+	.global mulwh_d
-+mulwh_d:
-+	mulwh.d r0,pc,pc:b
-+	mulwh.d r14,r12,r12:t
-+	mulwh.d r8,r5,r5:t
-+	mulwh.d r6,r4,r4:b
-+	mulwh.d r2,lr,lr:t
-+	mulwh.d r12,r5,r1:b
-+	mulwh.d r0,r1,r3:t
-+	mulwh.d r0,r9,r2:b
-+	.text
-+	.global mulsatwh_w
-+mulsatwh_w:
-+	mulsatwh.w pc,pc,pc:b
-+	mulsatwh.w r12,r12,r12:t
-+	mulsatwh.w r5,r5,r5:t
-+	mulsatwh.w r4,r4,r4:b
-+	mulsatwh.w lr,lr,lr:t
-+	mulsatwh.w r11,pc,r10:t
-+	mulsatwh.w sp,r12,r9:t
-+	mulsatwh.w r0,r3,r2:t
-+	.text
-+	.global ldw7
-+ldw7:
-+	ld.w pc,pc[pc:b<<2]
-+	ld.w r12,r12[r12:t<<2]
-+	ld.w r5,r5[r5:u<<2]
-+	ld.w r4,r4[r4:l<<2]
-+	ld.w lr,lr[lr:l<<2]
-+	ld.w r9,r10[r6:l<<2]
-+	ld.w r2,r10[r10:b<<2]
-+	ld.w r11,r5[pc:b<<2]
-+	.text
-+	.global satadd_w
-+satadd_w:
-+	satadd.w pc,pc,pc
-+	satadd.w r12,r12,r12
-+	satadd.w r5,r5,r5
-+	satadd.w r4,r4,r4
-+	satadd.w lr,lr,lr
-+	satadd.w r4,r8,r11
-+	satadd.w r3,r12,r6
-+	satadd.w r3,lr,r9
-+	.text
-+	.global satsub_w1
-+satsub_w1:
-+	satsub.w pc,pc,pc
-+	satsub.w r12,r12,r12
-+	satsub.w r5,r5,r5
-+	satsub.w r4,r4,r4
-+	satsub.w lr,lr,lr
-+	satsub.w r8,sp,r0
-+	satsub.w r9,r8,r4
-+	satsub.w pc,lr,r2
-+	.text
-+	.global satadd_h
-+satadd_h:
-+	satadd.h pc,pc,pc
-+	satadd.h r12,r12,r12
-+	satadd.h r5,r5,r5
-+	satadd.h r4,r4,r4
-+	satadd.h lr,lr,lr
-+	satadd.h r7,r3,r9
-+	satadd.h r1,r0,r2
-+	satadd.h r1,r4,lr
-+	.text
-+	.global satsub_h
-+satsub_h:
-+	satsub.h pc,pc,pc
-+	satsub.h r12,r12,r12
-+	satsub.h r5,r5,r5
-+	satsub.h r4,r4,r4
-+	satsub.h lr,lr,lr
-+	satsub.h lr,lr,r3
-+	satsub.h r11,r6,r5
-+	satsub.h r3,sp,r0
-+	.text
-+	.global mul3
-+mul3:
-+	mul pc,pc,0
-+	mul r12,r12,-1
-+	mul r5,r5,-128
-+	mul r4,r4,127
-+	mul lr,lr,1
-+	mul r12,r2,-7
-+	mul r1,pc,95
-+	mul r4,r6,19
-+	.text
-+	.global rsub2
-+rsub2:
-+	rsub pc,pc,0
-+	rsub r12,r12,-1
-+	rsub r5,r5,-128
-+	rsub r4,r4,127
-+	rsub lr,lr,1
-+	rsub r9,lr,96
-+	rsub r11,r1,56
-+	rsub r0,r7,-87
-+	.text
-+	.global clz
-+clz:
-+	clz pc,pc
-+	clz r12,r12
-+	clz r5,r5
-+	clz r4,r4
-+	clz lr,lr
-+	clz r2,r3
-+	clz r5,r11
-+	clz pc,r3
-+	.text
-+	.global cpc1
-+cpc1:
-+	cpc pc,pc
-+	cpc r12,r12
-+	cpc r5,r5
-+	cpc r4,r4
-+	cpc lr,lr
-+	cpc pc,r4
-+	cpc r5,r9
-+	cpc r6,r7
-+	.text
-+	.global asr3
-+asr3:
-+	asr pc,pc,0
-+	asr r12,r12,31
-+	asr r5,r5,16
-+	asr r4,r4,15
-+	asr lr,lr,1
-+	asr r4,r11,19
-+	asr sp,pc,26
-+	asr r11,sp,8
-+	.text
-+	.global lsl3
-+lsl3:
-+	lsl pc,pc,0
-+	lsl r12,r12,31
-+	lsl r5,r5,16
-+	lsl r4,r4,15
-+	lsl lr,lr,1
-+	lsl r8,r10,17
-+	lsl r2,lr,3
-+	lsl lr,r11,14
-+	.text
-+	.global lsr3
-+lsr3:
-+	lsr pc,pc,0
-+	lsr r12,r12,31
-+	lsr r5,r5,16
-+	lsr r4,r4,15
-+	lsr lr,lr,1
-+	lsr r4,r3,31
-+	lsr pc,r9,14
-+	lsr r3,r0,6
-+/*	.text
-+	.global extract_b
-+extract_b:
-+	extract.b pc,pc:b
-+	extract.b r12,r12:t
-+	extract.b r5,r5:u
-+	extract.b r4,r4:l
-+	extract.b lr,lr:l
-+	extract.b r2,r5:l
-+	extract.b r12,r3:l
-+	extract.b sp,r3:l
-+	.text
-+	.global insert_b
-+insert_b:
-+	insert.b pc:b,pc
-+	insert.b r12:t,r12
-+	insert.b r5:u,r5
-+	insert.b r4:l,r4
-+	insert.b lr:l,lr
-+	insert.b r12:u,r3
-+	insert.b r10:l,lr
-+	insert.b r11:l,r12
-+	.text
-+	.global extract_h
-+extract_h:
-+	extract.h pc,pc:b
-+	extract.h r12,r12:t
-+	extract.h r5,r5:t
-+	extract.h r4,r4:b
-+	extract.h lr,lr:t
-+	extract.h r11,lr:b
-+	extract.h r10,r0:b
-+	extract.h r11,r12:b
-+	.text
-+	.global insert_h
-+insert_h:
-+	insert.h pc:b,pc
-+	insert.h r12:t,r12
-+	insert.h r5:t,r5
-+	insert.h r4:b,r4
-+	insert.h lr:t,lr
-+	insert.h r12:t,r11
-+	insert.h r7:b,r6
-+	insert.h r1:t,r11 */
-+	.text
-+	.global movc1
-+movc1:
-+	moveq pc,pc
-+	moval r12,r12
-+	movls r5,r5
-+	movpl r4,r4
-+	movne lr,lr
-+	movne pc,r11
-+	movmi r10,r2
-+	movls r8,r12
-+	.text
-+	.global padd_h
-+padd_h:
-+	padd.h pc,pc,pc
-+	padd.h r12,r12,r12
-+	padd.h r5,r5,r5
-+	padd.h r4,r4,r4
-+	padd.h lr,lr,lr
-+	padd.h r8,r2,r7
-+	padd.h r0,r0,r3
-+	padd.h sp,r11,r6
-+	.text
-+	.global psub_h
-+psub_h:
-+	psub.h pc,pc,pc
-+	psub.h r12,r12,r12
-+	psub.h r5,r5,r5
-+	psub.h r4,r4,r4
-+	psub.h lr,lr,lr
-+	psub.h lr,r6,r8
-+	psub.h r0,r1,sp
-+	psub.h pc,pc,sp
-+	.text
-+	.global paddx_h
-+paddx_h:
-+	paddx.h pc,pc,pc
-+	paddx.h r12,r12,r12
-+	paddx.h r5,r5,r5
-+	paddx.h r4,r4,r4
-+	paddx.h lr,lr,lr
-+	paddx.h pc,pc,r1
-+	paddx.h r10,r4,r5
-+	paddx.h r5,pc,r2
-+	.text
-+	.global psubx_h
-+psubx_h:
-+	psubx.h pc,pc,pc
-+	psubx.h r12,r12,r12
-+	psubx.h r5,r5,r5
-+	psubx.h r4,r4,r4
-+	psubx.h lr,lr,lr
-+	psubx.h r5,r12,r5
-+	psubx.h r3,r8,r3
-+	psubx.h r5,r2,r3
-+	.text
-+	.global padds_sh
-+padds_sh:
-+	padds.sh pc,pc,pc
-+	padds.sh r12,r12,r12
-+	padds.sh r5,r5,r5
-+	padds.sh r4,r4,r4
-+	padds.sh lr,lr,lr
-+	padds.sh r9,lr,r2
-+	padds.sh r6,r8,r1
-+	padds.sh r6,r4,r10
-+	.text
-+	.global psubs_sh
-+psubs_sh:
-+	psubs.sh pc,pc,pc
-+	psubs.sh r12,r12,r12
-+	psubs.sh r5,r5,r5
-+	psubs.sh r4,r4,r4
-+	psubs.sh lr,lr,lr
-+	psubs.sh r6,lr,r11
-+	psubs.sh r2,r12,r4
-+	psubs.sh r0,r9,r0
-+	.text
-+	.global paddxs_sh
-+paddxs_sh:
-+	paddxs.sh pc,pc,pc
-+	paddxs.sh r12,r12,r12
-+	paddxs.sh r5,r5,r5
-+	paddxs.sh r4,r4,r4
-+	paddxs.sh lr,lr,lr
-+	paddxs.sh r0,r3,r9
-+	paddxs.sh pc,r10,r11
-+	paddxs.sh pc,r10,pc
-+	.text
-+	.global psubxs_sh
-+psubxs_sh:
-+	psubxs.sh pc,pc,pc
-+	psubxs.sh r12,r12,r12
-+	psubxs.sh r5,r5,r5
-+	psubxs.sh r4,r4,r4
-+	psubxs.sh lr,lr,lr
-+	psubxs.sh r7,r4,r4
-+	psubxs.sh r7,r8,r3
-+	psubxs.sh pc,r6,r5
-+	.text
-+	.global padds_uh
-+padds_uh:
-+	padds.uh pc,pc,pc
-+	padds.uh r12,r12,r12
-+	padds.uh r5,r5,r5
-+	padds.uh r4,r4,r4
-+	padds.uh lr,lr,lr
-+	padds.uh r12,r11,r7
-+	padds.uh r7,r8,lr
-+	padds.uh r6,r9,r7
-+	.text
-+	.global psubs_uh
-+psubs_uh:
-+	psubs.uh pc,pc,pc
-+	psubs.uh r12,r12,r12
-+	psubs.uh r5,r5,r5
-+	psubs.uh r4,r4,r4
-+	psubs.uh lr,lr,lr
-+	psubs.uh lr,r10,r6
-+	psubs.uh sp,r2,pc
-+	psubs.uh r2,r9,r2
-+	.text
-+	.global paddxs_uh
-+paddxs_uh:
-+	paddxs.uh pc,pc,pc
-+	paddxs.uh r12,r12,r12
-+	paddxs.uh r5,r5,r5
-+	paddxs.uh r4,r4,r4
-+	paddxs.uh lr,lr,lr
-+	paddxs.uh r7,r9,r5
-+	paddxs.uh r9,r1,r4
-+	paddxs.uh r5,r2,r3
-+	.text
-+	.global psubxs_uh
-+psubxs_uh:
-+	psubxs.uh pc,pc,pc
-+	psubxs.uh r12,r12,r12
-+	psubxs.uh r5,r5,r5
-+	psubxs.uh r4,r4,r4
-+	psubxs.uh lr,lr,lr
-+	psubxs.uh sp,r5,sp
-+	psubxs.uh sp,r6,r6
-+	psubxs.uh r3,r11,r8
-+	.text
-+	.global paddh_sh
-+paddh_sh:
-+	paddh.sh pc,pc,pc
-+	paddh.sh r12,r12,r12
-+	paddh.sh r5,r5,r5
-+	paddh.sh r4,r4,r4
-+	paddh.sh lr,lr,lr
-+	paddh.sh r12,sp,r3
-+	paddh.sh pc,r5,r3
-+	paddh.sh r8,r8,sp
-+	.text
-+	.global psubh_sh
-+psubh_sh:
-+	psubh.sh pc,pc,pc
-+	psubh.sh r12,r12,r12
-+	psubh.sh r5,r5,r5
-+	psubh.sh r4,r4,r4
-+	psubh.sh lr,lr,lr
-+	psubh.sh r1,r5,r8
-+	psubh.sh r7,r3,r6
-+	psubh.sh r4,r3,r3
-+	.text
-+	.global paddxh_sh
-+paddxh_sh:
-+	paddxh.sh pc,pc,pc
-+	paddxh.sh r12,r12,r12
-+	paddxh.sh r5,r5,r5
-+	paddxh.sh r4,r4,r4
-+	paddxh.sh lr,lr,lr
-+	paddxh.sh r6,r0,r4
-+	paddxh.sh r9,r8,r9
-+	paddxh.sh r3,r0,sp
-+	.text
-+	.global psubxh_sh
-+psubxh_sh:
-+	psubxh.sh pc,pc,pc
-+	psubxh.sh r12,r12,r12
-+	psubxh.sh r5,r5,r5
-+	psubxh.sh r4,r4,r4
-+	psubxh.sh lr,lr,lr
-+	psubxh.sh r4,pc,r12
-+	psubxh.sh r8,r4,r6
-+	psubxh.sh r12,r9,r4
-+	.text
-+	.global paddsub_h
-+paddsub_h:
-+	paddsub.h pc,pc:b,pc:b
-+	paddsub.h r12,r12:t,r12:t
-+	paddsub.h r5,r5:t,r5:t
-+	paddsub.h r4,r4:b,r4:b
-+	paddsub.h lr,lr:t,lr:t
-+	paddsub.h r5,r2:t,lr:b
-+	paddsub.h r7,r1:b,r8:b
-+	paddsub.h r6,r10:t,r5:t
-+	.text
-+	.global psubadd_h
-+psubadd_h:
-+	psubadd.h pc,pc:b,pc:b
-+	psubadd.h r12,r12:t,r12:t
-+	psubadd.h r5,r5:t,r5:t
-+	psubadd.h r4,r4:b,r4:b
-+	psubadd.h lr,lr:t,lr:t
-+	psubadd.h r9,r11:t,r8:t
-+	psubadd.h r10,r7:t,lr:t
-+	psubadd.h r6,pc:t,pc:b
-+	.text
-+	.global paddsubs_sh
-+paddsubs_sh:
-+	paddsubs.sh pc,pc:b,pc:b
-+	paddsubs.sh r12,r12:t,r12:t
-+	paddsubs.sh r5,r5:t,r5:t
-+	paddsubs.sh r4,r4:b,r4:b
-+	paddsubs.sh lr,lr:t,lr:t
-+	paddsubs.sh r0,lr:t,r0:b
-+	paddsubs.sh r9,r2:t,r4:t
-+	paddsubs.sh r12,r9:t,sp:t
-+	.text
-+	.global psubadds_sh
-+psubadds_sh:
-+	psubadds.sh pc,pc:b,pc:b
-+	psubadds.sh r12,r12:t,r12:t
-+	psubadds.sh r5,r5:t,r5:t
-+	psubadds.sh r4,r4:b,r4:b
-+	psubadds.sh lr,lr:t,lr:t
-+	psubadds.sh pc,lr:b,r1:t
-+	psubadds.sh r11,r3:b,r12:b
-+	psubadds.sh r10,r2:t,r8:t
-+	.text
-+	.global paddsubs_uh
-+paddsubs_uh:
-+	paddsubs.uh pc,pc:b,pc:b
-+	paddsubs.uh r12,r12:t,r12:t
-+	paddsubs.uh r5,r5:t,r5:t
-+	paddsubs.uh r4,r4:b,r4:b
-+	paddsubs.uh lr,lr:t,lr:t
-+	paddsubs.uh r9,r2:b,r3:b
-+	paddsubs.uh sp,sp:b,r7:t
-+	paddsubs.uh lr,r0:b,r10:t
-+	.text
-+	.global psubadds_uh
-+psubadds_uh:
-+	psubadds.uh pc,pc:b,pc:b
-+	psubadds.uh r12,r12:t,r12:t
-+	psubadds.uh r5,r5:t,r5:t
-+	psubadds.uh r4,r4:b,r4:b
-+	psubadds.uh lr,lr:t,lr:t
-+	psubadds.uh r12,r9:t,pc:t
-+	psubadds.uh r8,r6:b,r8:b
-+	psubadds.uh r8,r8:b,r4:b
-+	.text
-+	.global paddsubh_sh
-+paddsubh_sh:
-+	paddsubh.sh pc,pc:b,pc:b
-+	paddsubh.sh r12,r12:t,r12:t
-+	paddsubh.sh r5,r5:t,r5:t
-+	paddsubh.sh r4,r4:b,r4:b
-+	paddsubh.sh lr,lr:t,lr:t
-+	paddsubh.sh r8,r9:t,r9:b
-+	paddsubh.sh r0,sp:t,r1:t
-+	paddsubh.sh r3,r1:b,r0:t
-+	.text
-+	.global psubaddh_sh
-+psubaddh_sh:
-+	psubaddh.sh pc,pc:b,pc:b
-+	psubaddh.sh r12,r12:t,r12:t
-+	psubaddh.sh r5,r5:t,r5:t
-+	psubaddh.sh r4,r4:b,r4:b
-+	psubaddh.sh lr,lr:t,lr:t
-+	psubaddh.sh r7,r3:t,r10:b
-+	psubaddh.sh r7,r2:t,r1:t
-+	psubaddh.sh r11,r3:b,r6:b
-+	.text
-+	.global padd_b
-+padd_b:
-+	padd.b pc,pc,pc
-+	padd.b r12,r12,r12
-+	padd.b r5,r5,r5
-+	padd.b r4,r4,r4
-+	padd.b lr,lr,lr
-+	padd.b r2,r6,pc
-+	padd.b r8,r9,r12
-+	padd.b r5,r12,r3
-+	.text
-+	.global psub_b
-+psub_b:
-+	psub.b pc,pc,pc
-+	psub.b r12,r12,r12
-+	psub.b r5,r5,r5
-+	psub.b r4,r4,r4
-+	psub.b lr,lr,lr
-+	psub.b r0,r12,pc
-+	psub.b r7,sp,r10
-+	psub.b r5,sp,r12
-+	.text
-+	.global padds_sb
-+padds_sb:
-+	padds.sb pc,pc,pc
-+	padds.sb r12,r12,r12
-+	padds.sb r5,r5,r5
-+	padds.sb r4,r4,r4
-+	padds.sb lr,lr,lr
-+	padds.sb sp,r11,r4
-+	padds.sb r11,r10,r11
-+	padds.sb r5,r12,r6
-+	.text
-+	.global psubs_sb
-+psubs_sb:
-+	psubs.sb pc,pc,pc
-+	psubs.sb r12,r12,r12
-+	psubs.sb r5,r5,r5
-+	psubs.sb r4,r4,r4
-+	psubs.sb lr,lr,lr
-+	psubs.sb r7,r6,r8
-+	psubs.sb r12,r10,r9
-+	psubs.sb pc,r11,r0
-+	.text
-+	.global padds_ub
-+padds_ub:
-+	padds.ub pc,pc,pc
-+	padds.ub r12,r12,r12
-+	padds.ub r5,r5,r5
-+	padds.ub r4,r4,r4
-+	padds.ub lr,lr,lr
-+	padds.ub r3,r2,r11
-+	padds.ub r10,r8,r1
-+	padds.ub r11,r8,r10
-+	.text
-+	.global psubs_ub
-+psubs_ub:
-+	psubs.ub pc,pc,pc
-+	psubs.ub r12,r12,r12
-+	psubs.ub r5,r5,r5
-+	psubs.ub r4,r4,r4
-+	psubs.ub lr,lr,lr
-+	psubs.ub r0,r2,r7
-+	psubs.ub lr,r5,r3
-+	psubs.ub r6,r7,r9
-+	.text
-+	.global paddh_ub
-+paddh_ub:
-+	paddh.ub pc,pc,pc
-+	paddh.ub r12,r12,r12
-+	paddh.ub r5,r5,r5
-+	paddh.ub r4,r4,r4
-+	paddh.ub lr,lr,lr
-+	paddh.ub lr,r1,r0
-+	paddh.ub r2,r7,r7
-+	paddh.ub r2,r1,r2
-+	.text
-+	.global psubh_ub
-+psubh_ub:
-+	psubh.ub pc,pc,pc
-+	psubh.ub r12,r12,r12
-+	psubh.ub r5,r5,r5
-+	psubh.ub r4,r4,r4
-+	psubh.ub lr,lr,lr
-+	psubh.ub r0,r1,r6
-+	psubh.ub r4,lr,r10
-+	psubh.ub r9,r8,r1
-+	.text
-+	.global pmax_ub
-+pmax_ub:
-+	pmax.ub pc,pc,pc
-+	pmax.ub r12,r12,r12
-+	pmax.ub r5,r5,r5
-+	pmax.ub r4,r4,r4
-+	pmax.ub lr,lr,lr
-+	pmax.ub pc,r2,r11
-+	pmax.ub r12,r1,r1
-+	pmax.ub r5,r2,r0
-+	.text
-+	.global pmax_sh
-+pmax_sh:
-+	pmax.sh pc,pc,pc
-+	pmax.sh r12,r12,r12
-+	pmax.sh r5,r5,r5
-+	pmax.sh r4,r4,r4
-+	pmax.sh lr,lr,lr
-+	pmax.sh lr,r6,r12
-+	pmax.sh r2,pc,r5
-+	pmax.sh pc,r2,r7
-+	.text
-+	.global pmin_ub
-+pmin_ub:
-+	pmin.ub pc,pc,pc
-+	pmin.ub r12,r12,r12
-+	pmin.ub r5,r5,r5
-+	pmin.ub r4,r4,r4
-+	pmin.ub lr,lr,lr
-+	pmin.ub r8,r1,r5
-+	pmin.ub r1,r8,r3
-+	pmin.ub r0,r2,r7
-+	.text
-+	.global pmin_sh
-+pmin_sh:
-+	pmin.sh pc,pc,pc
-+	pmin.sh r12,r12,r12
-+	pmin.sh r5,r5,r5
-+	pmin.sh r4,r4,r4
-+	pmin.sh lr,lr,lr
-+	pmin.sh r8,r4,r10
-+	pmin.sh lr,r10,r12
-+	pmin.sh r2,r6,r2
-+	.text
-+	.global pavg_ub
-+pavg_ub:
-+	pavg.ub pc,pc,pc
-+	pavg.ub r12,r12,r12
-+	pavg.ub r5,r5,r5
-+	pavg.ub r4,r4,r4
-+	pavg.ub lr,lr,lr
-+	pavg.ub r0,r1,r6
-+	pavg.ub r8,r3,r6
-+	pavg.ub pc,r12,r10
-+	.text
-+	.global pavg_sh
-+pavg_sh:
-+	pavg.sh pc,pc,pc
-+	pavg.sh r12,r12,r12
-+	pavg.sh r5,r5,r5
-+	pavg.sh r4,r4,r4
-+	pavg.sh lr,lr,lr
-+	pavg.sh r9,pc,sp
-+	pavg.sh pc,sp,r3
-+	pavg.sh r6,r1,r9
-+	.text
-+	.global pabs_sb
-+pabs_sb:
-+	pabs.sb pc,pc
-+	pabs.sb r12,r12
-+	pabs.sb r5,r5
-+	pabs.sb r4,r4
-+	pabs.sb lr,lr
-+	pabs.sb r11,r6
-+	pabs.sb lr,r9
-+	pabs.sb sp,r7
-+	.text
-+	.global pabs_sh
-+pabs_sh:
-+	pabs.sh pc,pc
-+	pabs.sh r12,r12
-+	pabs.sh r5,r5
-+	pabs.sh r4,r4
-+	pabs.sh lr,lr
-+	pabs.sh pc,r3
-+	pabs.sh r5,r7
-+	pabs.sh r4,r0
-+	.text
-+	.global psad
-+psad:
-+	psad pc,pc,pc
-+	psad r12,r12,r12
-+	psad r5,r5,r5
-+	psad r4,r4,r4
-+	psad lr,lr,lr
-+	psad r9,r11,r11
-+	psad lr,r4,sp
-+	psad lr,r4,r5
-+	.text
-+	.global pasr_b
-+pasr_b:
-+	pasr.b pc,pc,0
-+	pasr.b r12,r12,7
-+	pasr.b r5,r5,4
-+	pasr.b r4,r4,3
-+	pasr.b lr,lr,1
-+	pasr.b pc,r7,1
-+	pasr.b sp,lr,6
-+	pasr.b sp,r3,2
-+	.text
-+	.global plsl_b
-+plsl_b:
-+	plsl.b pc,pc,0
-+	plsl.b r12,r12,7
-+	plsl.b r5,r5,4
-+	plsl.b r4,r4,3
-+	plsl.b lr,lr,1
-+	plsl.b r2,r11,4
-+	plsl.b r8,r5,7
-+	plsl.b pc,r0,2
-+	.text
-+	.global plsr_b
-+plsr_b:
-+	plsr.b pc,pc,0
-+	plsr.b r12,r12,7
-+	plsr.b r5,r5,4
-+	plsr.b r4,r4,3
-+	plsr.b lr,lr,1
-+	plsr.b r12,r1,2
-+	plsr.b r6,pc,7
-+	plsr.b r12,r11,2
-+	.text
-+	.global pasr_h
-+pasr_h:
-+	pasr.h pc,pc,0
-+	pasr.h r12,r12,15
-+	pasr.h r5,r5,8
-+	pasr.h r4,r4,7
-+	pasr.h lr,lr,1
-+	pasr.h r0,r11,10
-+	pasr.h r4,r6,8
-+	pasr.h r6,r2,4
-+	.text
-+	.global plsl_h
-+plsl_h:
-+	plsl.h pc,pc,0
-+	plsl.h r12,r12,15
-+	plsl.h r5,r5,8
-+	plsl.h r4,r4,7
-+	plsl.h lr,lr,1
-+	plsl.h r5,r10,9
-+	plsl.h sp,lr,8
-+	plsl.h r0,lr,7
-+	.text
-+	.global plsr_h
-+plsr_h:
-+	plsr.h pc,pc,0
-+	plsr.h r12,r12,15
-+	plsr.h r5,r5,8
-+	plsr.h r4,r4,7
-+	plsr.h lr,lr,1
-+	plsr.h r11,r0,15
-+	plsr.h lr,r3,3
-+	plsr.h r8,lr,10
-+	.text
-+	.global packw_sh
-+packw_sh:
-+	packw.sh pc,pc,pc
-+	packw.sh r12,r12,r12
-+	packw.sh r5,r5,r5
-+	packw.sh r4,r4,r4
-+	packw.sh lr,lr,lr
-+	packw.sh sp,r11,r10
-+	packw.sh r8,r2,r12
-+	packw.sh r8,r1,r5
-+	.text
-+	.global punpckub_h
-+punpckub_h:
-+	punpckub.h pc,pc:b
-+	punpckub.h r12,r12:t
-+	punpckub.h r5,r5:t
-+	punpckub.h r4,r4:b
-+	punpckub.h lr,lr:t
-+	punpckub.h r6,r1:t
-+	punpckub.h lr,r5:b
-+	punpckub.h lr,r2:t
-+	.text
-+	.global punpcksb_h
-+punpcksb_h:
-+	punpcksb.h pc,pc:b
-+	punpcksb.h r12,r12:t
-+	punpcksb.h r5,r5:t
-+	punpcksb.h r4,r4:b
-+	punpcksb.h lr,lr:t
-+	punpcksb.h r4,r7:t
-+	punpcksb.h r6,lr:b
-+	punpcksb.h r12,r12:t
-+	.text
-+	.global packsh_ub
-+packsh_ub:
-+	packsh.ub pc,pc,pc
-+	packsh.ub r12,r12,r12
-+	packsh.ub r5,r5,r5
-+	packsh.ub r4,r4,r4
-+	packsh.ub lr,lr,lr
-+	packsh.ub r3,r6,r3
-+	packsh.ub r8,r0,r3
-+	packsh.ub r9,r3,lr
-+	.text
-+	.global packsh_sb
-+packsh_sb:
-+	packsh.sb pc,pc,pc
-+	packsh.sb r12,r12,r12
-+	packsh.sb r5,r5,r5
-+	packsh.sb r4,r4,r4
-+	packsh.sb lr,lr,lr
-+	packsh.sb r6,r8,r1
-+	packsh.sb lr,r9,r8
-+	packsh.sb sp,r6,r6
-+	.text
-+	.global andl
-+andl:
-+	andl pc,0
-+	andl r12,65535
-+	andl r5,32768
-+	andl r4,32767
-+	andl lr,1
-+	andl pc,23128
-+	andl r8,47262
-+	andl r7,13719
-+	.text
-+	.global andl_coh
-+andl_coh:
-+	andl pc,0,COH
-+	andl r12,65535,COH
-+	andl r5,32768,COH
-+	andl r4,32767,COH
-+	andl lr,1,COH
-+	andl r6,22753,COH
-+	andl r0,40653,COH
-+	andl r4,48580,COH
-+	.text
-+	.global andh
-+andh:
-+	andh pc,0
-+	andh r12,65535
-+	andh r5,32768
-+	andh r4,32767
-+	andh lr,1
-+	andh r12,52312
-+	andh r3,8675
-+	andh r2,42987
-+	.text
-+	.global andh_coh
-+andh_coh:
-+	andh pc,0,COH
-+	andh r12,65535,COH
-+	andh r5,32768,COH
-+	andh r4,32767,COH
-+	andh lr,1,COH
-+	andh r11,34317,COH
-+	andh r8,52982,COH
-+	andh r10,23683,COH
-+	.text
-+	.global orl
-+orl:
-+	orl pc,0
-+	orl r12,65535
-+	orl r5,32768
-+	orl r4,32767
-+	orl lr,1
-+	orl sp,16766
-+	orl r0,21181
-+	orl pc,44103
-+	.text
-+	.global orh
-+orh:
-+	orh pc,0
-+	orh r12,65535
-+	orh r5,32768
-+	orh r4,32767
-+	orh lr,1
-+	orh r8,28285
-+	orh r12,30492
-+	orh r1,59930
-+	.text
-+	.global eorl
-+eorl:
-+	eorl pc,0
-+	eorl r12,65535
-+	eorl r5,32768
-+	eorl r4,32767
-+	eorl lr,1
-+	eorl r4,51129
-+	eorl r6,64477
-+	eorl r1,20913
-+	.text
-+	.global eorh
-+eorh:
-+	eorh pc,0
-+	eorh r12,65535
-+	eorh r5,32768
-+	eorh r4,32767
-+	eorh lr,1
-+	eorh r0,11732
-+	eorh r10,38069
-+	eorh r9,57130
-+	.text
-+	.global mcall
-+mcall:
-+	mcall pc[0]
-+	mcall r12[-4]
-+	mcall r5[-131072]
-+	mcall r4[131068]
-+	mcall lr[4]
-+	mcall sp[61180]
-+	mcall r4[-35000]
-+	mcall r0[9924]
-+	.text
-+	.global pref
-+pref:
-+	pref pc[0]
-+	pref r12[-1]
-+	pref r5[-32768]
-+	pref r4[32767]
-+	pref lr[1]
-+	pref r7[7748]
-+	pref r7[-7699]
-+	pref r2[-25892]
-+	.text
-+	.global cache
-+cache:
-+	cache pc[0],0
-+	cache r12[-1],31
-+	cache r5[-1024],16
-+	cache r4[1023],15
-+	cache lr[1],1
-+	cache r3[-964],17
-+	cache r4[-375],22
-+	cache r3[-888],17
-+	.text
-+	.global sub4
-+sub4:
-+	sub pc,0
-+	sub r12,-1
-+	sub r5,-1048576
-+	sub r4,1048575
-+	sub lr,1
-+	sub r2,-619156
-+	sub lr,461517
-+	sub r8,-185051
-+	.text
-+	.global cp3
-+cp3:
-+	cp pc,0
-+	cp r12,-1
-+	cp r5,-1048576
-+	cp r4,1048575
-+	cp lr,1
-+	cp r1,124078
-+	cp r0,-378909
-+	cp r4,-243180
-+	.text
-+	.global mov2
-+mov2:
-+	mov pc,0
-+	mov r12,-1
-+	mov r5,-1048576
-+	mov r4,1048575
-+	mov lr,1
-+	mov r5,-317021
-+	mov sp,-749164
-+	mov r5,940179
-+	.text
-+	.global brc2
-+brc2:
-+	breq 0
-+	bral -2
-+	brls -2097152
-+	brpl 2097150
-+	brne 2
-+	brhi -1796966
-+	brqs 1321368
-+	brls -577434
-+	.text
-+	.global rcall2
-+rcall2:
-+	rcall 0
-+	rcall -2
-+	rcall -2097152
-+	rcall 2097150
-+	rcall 2
-+	rcall 496820
-+	rcall 1085092
-+	rcall -1058
-+	.text
-+	.global sub5
-+sub5:
-+	sub pc,pc,0
-+	sub r12,r12,-1
-+	sub r5,r5,-32768
-+	sub r4,r4,32767
-+	sub lr,lr,1
-+	sub pc,pc,-12744
-+	sub r7,r7,-27365
-+	sub r2,r9,-17358
-+	.text
-+	.global satsub_w2
-+satsub_w2:
-+	satsub.w pc,pc,0
-+	satsub.w r12,r12,-1
-+	satsub.w r5,r5,-32768
-+	satsub.w r4,r4,32767
-+	satsub.w lr,lr,1
-+	satsub.w r2,lr,-2007
-+	satsub.w r7,r12,-784
-+	satsub.w r4,r7,23180
-+	.text
-+	.global ld_d4
-+ld_d4:
-+	ld.d r0,pc[0]
-+	ld.d r14,r12[-1]
-+	ld.d r8,r5[-32768]
-+	ld.d r6,r4[32767]
-+	ld.d r2,lr[1]
-+	ld.d r14,r11[14784]
-+	ld.d r6,r9[-18905]
-+	ld.d r2,r3[-6355]
-+	.text
-+	.global ld_w4
-+ld_w4:
-+	ld.w pc,pc[0]
-+	ld.w r12,r12[-1]
-+	ld.w r5,r5[-32768]
-+	ld.w r4,r4[32767]
-+	ld.w lr,lr[1]
-+	ld.w r0,r12[-22133]
-+	ld.w sp,pc[-20521]
-+	/* ld.w r3,r5[29035] */
-+	nop
-+	.text
-+	.global ld_sh4
-+ld_sh4:
-+	ld.sh pc,pc[0]
-+	ld.sh r12,r12[-1]
-+	ld.sh r5,r5[-32768]
-+	ld.sh r4,r4[32767]
-+	ld.sh lr,lr[1]
-+	ld.sh r6,r10[30930]
-+	ld.sh r6,r10[21973]
-+	/* ld.sh r11,r10[-2058] */
-+	nop
-+	.text
-+	.global ld_uh4
-+ld_uh4:
-+	ld.uh pc,pc[0]
-+	ld.uh r12,r12[-1]
-+	ld.uh r5,r5[-32768]
-+	ld.uh r4,r4[32767]
-+	ld.uh lr,lr[1]
-+	ld.uh r1,r9[-13354]
-+	ld.uh lr,r11[21337]
-+	/* ld.uh r2,lr[-25370] */
-+	nop
-+	.text
-+	.global ld_sb1
-+ld_sb1:
-+	ld.sb pc,pc[0]
-+	ld.sb r12,r12[-1]
-+	ld.sb r5,r5[-32768]
-+	ld.sb r4,r4[32767]
-+	ld.sb lr,lr[1]
-+	ld.sb r7,sp[-28663]
-+	ld.sb r2,r1[-5879]
-+	ld.sb r12,r3[18734]
-+	.text
-+	.global ld_ub4
-+ld_ub4:
-+	ld.ub pc,pc[0]
-+	ld.ub r12,r12[-1]
-+	ld.ub r5,r5[-32768]
-+	ld.ub r4,r4[32767]
-+	ld.ub lr,lr[1]
-+	ld.ub pc,r4[8277]
-+	ld.ub r5,r12[19172]
-+	ld.ub r10,lr[26347]
-+	.text
-+	.global st_d4
-+st_d4:
-+	st.d pc[0],r0
-+	st.d r12[-1],r14
-+	st.d r5[-32768],r8
-+	st.d r4[32767],r6
-+	st.d lr[1],r2
-+	st.d r5[13200],r10
-+	st.d r5[9352],r10
-+	st.d r5[32373],r4
-+	.text
-+	.global st_w4
-+st_w4:
-+	st.w pc[0],pc
-+	st.w r12[-1],r12
-+	st.w r5[-32768],r5
-+	st.w r4[32767],r4
-+	st.w lr[1],lr
-+	st.w sp[6136],r7
-+	st.w r6[27087],r12
-+	/* st.w r3[20143],r7 */
-+	nop
-+	.text
-+	.global st_h4
-+st_h4:
-+	st.h pc[0],pc
-+	st.h r12[-1],r12
-+	st.h r5[-32768],r5
-+	st.h r4[32767],r4
-+	st.h lr[1],lr
-+	st.h r4[-9962],r7
-+	st.h r9[-16250],r3
-+	/* st.h r8[-28810],r7 */
-+	nop
-+	.text
-+	.global st_b4
-+st_b4:
-+	st.b pc[0],pc
-+	st.b r12[-1],r12
-+	st.b r5[-32768],r5
-+	st.b r4[32767],r4
-+	st.b lr[1],lr
-+	st.b r12[30102],r6
-+	st.b r5[28977],r1
-+	st.b r0[5470],r1
-+	.text
-+	.global mfsr
-+mfsr:
-+	mfsr pc,0
-+	mfsr r12,1020
-+	mfsr r5,512
-+	mfsr r4,508
-+	mfsr lr,4
-+	mfsr r2,696
-+	mfsr r4,260
-+	mfsr r10,1016
-+	.text
-+	.global mtsr
-+mtsr:
-+	mtsr 0,pc
-+	mtsr 1020,r12
-+	mtsr 512,r5
-+	mtsr 508,r4
-+	mtsr 4,lr
-+	mtsr 224,r10
-+	mtsr 836,r12
-+	mtsr 304,r9
-+	.text
-+	.global mfdr
-+mfdr:
-+	mfdr pc,0
-+	mfdr r12,1020
-+	mfdr r5,512
-+	mfdr r4,508
-+	mfdr lr,4
-+	mfdr r6,932
-+	mfdr r5,36
-+	mfdr r9,300
-+	.text
-+	.global mtdr
-+mtdr:
-+	mtdr 0,pc
-+	mtdr 1020,r12
-+	mtdr 512,r5
-+	mtdr 508,r4
-+	mtdr 4,lr
-+	mtdr 180,r8
-+	mtdr 720,r10
-+	mtdr 408,lr
-+	.text
-+	.global sleep
-+sleep:
-+	sleep 0
-+	sleep 255
-+	sleep 128
-+	sleep 127
-+	sleep 1
-+	sleep 254
-+	sleep 15
-+	sleep 43
-+	.text
-+	.global sync
-+sync:
-+	sync 0
-+	sync 255
-+	sync 128
-+	sync 127
-+	sync 1
-+	sync 166
-+	sync 230
-+	sync 180
-+	.text
-+	.global bld
-+bld:
-+	bld pc,0
-+	bld r12,31
-+	bld r5,16
-+	bld r4,15
-+	bld lr,1
-+	bld r9,15
-+	bld r0,4
-+	bld lr,26
-+	.text
-+	.global bst
-+bst:
-+	bst pc,0
-+	bst r12,31
-+	bst r5,16
-+	bst r4,15
-+	bst lr,1
-+	bst r10,28
-+	bst r0,3
-+	bst sp,2
-+	.text
-+	.global sats
-+sats:
-+	sats pc>>0,0
-+	sats r12>>31,31
-+	sats r5>>16,16
-+	sats r4>>15,15
-+	sats lr>>1,1
-+	sats r10>>3,19
-+	sats r10>>2,26
-+	sats r1>>20,1
-+	.text
-+	.global satu
-+satu:
-+	satu pc>>0,0
-+	satu r12>>31,31
-+	satu r5>>16,16
-+	satu r4>>15,15
-+	satu lr>>1,1
-+	satu pc>>5,7
-+	satu r7>>5,5
-+	satu r2>>26,19
-+	.text
-+	.global satrnds
-+satrnds:
-+	satrnds pc>>0,0
-+	satrnds r12>>31,31
-+	satrnds r5>>16,16
-+	satrnds r4>>15,15
-+	satrnds lr>>1,1
-+	satrnds r0>>21,19
-+	satrnds sp>>0,2
-+	satrnds r7>>6,29
-+	.text
-+	.global satrndu
-+satrndu:
-+	satrndu pc>>0,0
-+	satrndu r12>>31,31
-+	satrndu r5>>16,16
-+	satrndu r4>>15,15
-+	satrndu lr>>1,1
-+	satrndu r12>>0,26
-+	satrndu r4>>21,3
-+	satrndu r10>>3,16
-+	.text
-+	.global subfc
-+subfc:
-+	subfeq pc,0
-+	subfal r12,-1
-+	subfls r5,-128
-+	subfpl r4,127
-+	subfne lr,1
-+	subfls r10,8
-+	subfvc r11,99
-+	subfvs r2,73
-+	.text
-+	.global subc
-+subc:
-+	subeq pc,0
-+	subal r12,-1
-+	subls r5,-128
-+	subpl r4,127
-+	subne lr,1
-+	subls r12,118
-+	subvc lr,-12
-+	submi r4,-13
-+	.text
-+	.global movc2
-+movc2:
-+	moveq pc,0
-+	moval r12,-1
-+	movls r5,-128
-+	movpl r4,127
-+	movne lr,1
-+	movlt r3,-122
-+	movvc r8,2
-+	movne r7,-111
-+	.text
-+	.global cp_b
-+cp_b:
-+	cp.b pc,r0
-+	cp.b r0,pc
-+	cp.b r7,r8
-+	cp.b r8,r7
-+	.text
-+	.global cp_h
-+cp_h:
-+	cp.h pc,r0
-+	cp.h r0,pc
-+	cp.h r7,r8
-+	cp.h r8,r7
-+	.text
-+	.global ldm
-+ldm:
-+	ldm pc,r1-r6
-+	ldm r12,r0-r15
-+	ldm r5,r15
-+	ldm r4,r0-r14
-+	ldm lr,r0
-+	ldm r9,r1,r5,r14
-+	ldm r11,r2-r3,r5-r8,r15
-+	ldm r6,r0,r3,r9,r13,r15
-+	.text
-+	.global ldm_pu
-+ldm_pu:
-+	ldm pc++,r6-r9
-+	ldm r12++,r0-r15
-+	ldm r5++,r15
-+	ldm r4++,r0-r14
-+	ldm lr++,r0
-+	ldm r12++,r3-r5,r8,r10,r12,r14-r15
-+	ldm r10++,r2,r4-r6,r14-r15
-+	ldm r6++,r1,r3-r4,r9-r14
-+	.text
-+	.global ldmts
-+ldmts:
-+	ldmts pc,r7-r8
-+	ldmts r12,r0-r15
-+	ldmts r5,r15
-+	ldmts r4,r0-r14
-+	ldmts lr,r0
-+	ldmts r0,r1-r2,r11-r12
-+	ldmts lr,r0-r2,r4,r7-r8,r13-r14
-+	ldmts r12,r0-r1,r3-r5,r9,r14-r15
-+	.text
-+	.global ldmts_pu
-+ldmts_pu:
-+	ldmts pc++,r9
-+	ldmts r12++,r0-r15
-+	ldmts r5++,r15
-+	ldmts r4++,r0-r14
-+	ldmts lr++,r0
-+	ldmts sp++,r0,r2-r5,r7,r9,r11
-+	ldmts r5++,r1-r3,r7,r10-r11
-+	ldmts r8++,r2-r4,r7-r8,r13,r15
-+	.text
-+	.global stm
-+stm:
-+	stm pc,r7
-+	stm r12,r0-r15
-+	stm r5,r15
-+	stm r4,r0-r14
-+	stm lr,r0
-+	stm sp,r2-r3,r5,r8,r11,r14
-+	stm r4,r0-r4,r6,r10-r11,r14
-+	stm r9,r1,r5,r9,r12-r15
-+	.text
-+	.global stm_pu
-+stm_pu:
-+	stm --pc,r4-r6
-+	stm --r12,r0-r15
-+	stm --r5,r15
-+	stm --r4,r0-r14
-+	stm --lr,r0
-+	stm --r11,r0,r4-r9,r11-r15
-+	stm --r11,r0,r3,r9-r10,r12,r14
-+	stm --r6,r2,r8-r9,r13-r14
-+	.text
-+	.global stmts
-+stmts:
-+	stmts pc,r8
-+	stmts r12,r0-r15
-+	stmts r5,r15
-+	stmts r4,r0-r14
-+	stmts lr,r0
-+	stmts r1,r0-r1,r3-r4,r6,r9-r10,r14-r15
-+	stmts r3,r0,r6-r8,r10-r12
-+	stmts r11,r0,r4,r6-r7,r9-r10,r12,r14-r15
-+	.text
-+	.global stmts_pu
-+stmts_pu:
-+	stmts --pc,r6-r8
-+	stmts --r12,r0-r15
-+	stmts --r5,r15
-+	stmts --r4,r0-r14
-+	stmts --lr,r0
-+	stmts --r2,r0,r3-r4,r9-r10,r12-r13
-+	stmts --r3,r0-r1,r14-r15
-+	stmts --r0,r0,r2-r6,r10,r14
-+	.text
-+	.global ldins_h
-+ldins_h:
-+	ldins.h pc:b,pc[0]
-+	ldins.h r12:t,r12[-2]
-+	ldins.h r5:t,r5[-4096]
-+	ldins.h r4:b,r4[4094]
-+	ldins.h lr:t,lr[2]
-+	ldins.h r0:t,lr[1930]
-+	ldins.h r3:b,r7[-534]
-+	ldins.h r2:b,r12[-2252]
-+	.text
-+	.global ldins_b
-+ldins_b:
-+	ldins.b pc:b,pc[0]
-+	ldins.b r12:t,r12[-1]
-+	ldins.b r5:u,r5[-2048]
-+	ldins.b r4:l,r4[2047]
-+	ldins.b lr:l,lr[1]
-+	ldins.b r6:t,r4[-662]
-+	ldins.b r5:b,r1[-151]
-+	ldins.b r10:t,r11[-1923]
-+	.text
-+	.global ldswp_sh
-+ldswp_sh:
-+	ldswp.sh pc,pc[0]
-+	ldswp.sh r12,r12[-2]
-+	ldswp.sh r5,r5[-4096]
-+	ldswp.sh r4,r4[4094]
-+	ldswp.sh lr,lr[2]
-+	ldswp.sh r9,r10[3848]
-+	ldswp.sh r4,r12[-2040]
-+	ldswp.sh r10,r2[3088]
-+	.text
-+	.global ldswp_uh
-+ldswp_uh:
-+	ldswp.uh pc,pc[0]
-+	ldswp.uh r12,r12[-2]
-+	ldswp.uh r5,r5[-4096]
-+	ldswp.uh r4,r4[4094]
-+	ldswp.uh lr,lr[2]
-+	ldswp.uh r4,r9[3724]
-+	ldswp.uh lr,sp[-1672]
-+	ldswp.uh r8,r12[-3846]
-+	.text
-+	.global ldswp_w
-+ldswp_w:
-+	ldswp.w pc,pc[0]
-+	ldswp.w r12,r12[-4]
-+	ldswp.w r5,r5[-8192]
-+	ldswp.w r4,r4[8188]
-+	ldswp.w lr,lr[4]
-+	ldswp.w sp,r7[1860]
-+	ldswp.w pc,r5[-3324]
-+	ldswp.w r12,r10[-3296]
-+	.text
-+	.global stswp_h
-+stswp_h:
-+	stswp.h pc[0],pc
-+	stswp.h r12[-2],r12
-+	stswp.h r5[-4096],r5
-+	stswp.h r4[4094],r4
-+	stswp.h lr[2],lr
-+	stswp.h r7[64],r10
-+	stswp.h r10[3024],r2
-+	stswp.h r0[-2328],r10
-+	.text
-+	.global stswp_w
-+stswp_w:
-+	stswp.w pc[0],pc
-+	stswp.w r12[-4],r12
-+	stswp.w r5[-8192],r5
-+	stswp.w r4[8188],r4
-+	stswp.w lr[4],lr
-+	stswp.w pc[1156],r8
-+	stswp.w sp[7992],r10
-+	stswp.w r8[-1172],r5
-+	.text
-+	.global and2
-+and2:
-+	and pc,pc,pc<<0
-+	and r12,r12,r12<<31
-+	and r5,r5,r5<<16
-+	and r4,r4,r4<<15
-+	and lr,lr,lr<<1
-+	and r10,r2,r1<<1
-+	and r12,r8,r11<<27
-+	and r10,r7,r0<<3
-+	.text
-+	.global and3
-+and3:
-+	and pc,pc,pc>>0
-+	and r12,r12,r12>>31
-+	and r5,r5,r5>>16
-+	and r4,r4,r4>>15
-+	and lr,lr,lr>>1
-+	and r12,r8,r7>>17
-+	and pc,r4,r9>>20
-+	and r10,r9,r10>>12
-+	.text
-+	.global or2
-+or2:
-+	or pc,pc,pc<<0
-+	or r12,r12,r12<<31
-+	or r5,r5,r5<<16
-+	or r4,r4,r4<<15
-+	or lr,lr,lr<<1
-+	or r8,sp,r11<<29
-+	or pc,r9,r2<<28
-+	or r5,r1,r2<<3
-+	.text
-+	.global or3
-+or3:
-+	or pc,pc,pc>>0
-+	or r12,r12,r12>>31
-+	or r5,r5,r5>>16
-+	or r4,r4,r4>>15
-+	or lr,lr,lr>>1
-+	or r1,sp,sp>>2
-+	or r0,r1,r1>>29
-+	or r4,r12,r8>>8
-+	.text
-+	.global eor2
-+eor2:
-+	eor pc,pc,pc<<0
-+	eor r12,r12,r12<<31
-+	eor r5,r5,r5<<16
-+	eor r4,r4,r4<<15
-+	eor lr,lr,lr<<1
-+	eor r10,r9,r4<<11
-+	eor r4,r0,r1<<31
-+	eor r6,r2,r12<<13
-+	.text
-+	.global eor3
-+eor3:
-+	eor pc,pc,pc>>0
-+	eor r12,r12,r12>>31
-+	eor r5,r5,r5>>16
-+	eor r4,r4,r4>>15
-+	eor lr,lr,lr>>1
-+	eor r5,r5,r5>>22
-+	eor r10,r1,lr>>3
-+	eor r7,lr,sp>>26
-+	.text
-+	.global sthh_w2
-+sthh_w2:
-+	sthh.w pc[pc<<0],pc:b,pc:b
-+	sthh.w r12[r12<<3],r12:t,r12:t
-+	sthh.w r5[r5<<2],r5:t,r5:t
-+	sthh.w r4[r4<<1],r4:b,r4:b
-+	sthh.w lr[lr<<1],lr:t,lr:t
-+	sthh.w sp[r6<<3],r1:t,r12:t
-+	sthh.w r6[r6<<0],r9:t,r9:t
-+	sthh.w r10[r3<<0],r0:b,r11:t
-+	.text
-+	.global sthh_w1
-+sthh_w1:
-+	sthh.w pc[0],pc:b,pc:b
-+	sthh.w r12[1020],r12:t,r12:t
-+	sthh.w r5[512],r5:t,r5:t
-+	sthh.w r4[508],r4:b,r4:b
-+	sthh.w lr[4],lr:t,lr:t
-+	sthh.w r4[404],r9:t,r0:b
-+	sthh.w r8[348],r2:t,r10:b
-+	sthh.w sp[172],r9:b,r2:b
-+	.text
-+	.global cop
-+cop:
-+	cop cp0,cr0,cr0,cr0,0
-+	cop cp7,cr15,cr15,cr15,0x7f
-+	cop cp3,cr5,cr5,cr5,0x31
-+	cop cp2,cr4,cr4,cr4,0x30
-+	cop cp5,cr8,cr3,cr7,0x5a
-+	.text
-+	.global ldc_w1
-+ldc_w1:
-+	ldc.w cp0,cr0,r0[0]
-+	ldc.w cp7,cr15,pc[255<<2]
-+	ldc.w cp3,cr5,r5[128<<2]
-+	ldc.w cp2,cr4,r4[127<<2]
-+	ldc.w cp4,cr9,r13[36<<2]
-+	.text
-+	.global ldc_w2
-+ldc_w2:
-+	ldc.w cp0,cr0,--r0
-+	ldc.w cp7,cr15,--pc
-+	ldc.w cp3,cr5,--r5
-+	ldc.w cp2,cr4,--r4
-+	ldc.w cp4,cr9,--r13
-+	.text
-+	.global ldc_w3
-+ldc_w3:
-+	ldc.w cp0,cr0,r0[r0]
-+	ldc.w cp7,cr15,pc[pc<<3]
-+	ldc.w cp3,cr5,r5[r4<<2]
-+	ldc.w cp2,cr4,r4[r3<<1]
-+	ldc.w cp4,cr9,r13[r12<<0]
-+	.text
-+	.global ldc_d1
-+ldc_d1:
-+	ldc.d cp0,cr0,r0[0]
-+	ldc.d cp7,cr14,pc[255<<2]
-+	ldc.d cp3,cr6,r5[128<<2]
-+	ldc.d cp2,cr4,r4[127<<2]
-+	ldc.d cp4,cr8,r13[36<<2]
-+	.text
-+	.global ldc_d2
-+ldc_d2:
-+	ldc.d cp0,cr0,--r0
-+	ldc.d cp7,cr14,--pc
-+	ldc.d cp3,cr6,--r5
-+	ldc.d cp2,cr4,--r4
-+	ldc.d cp4,cr8,--r13
-+	.text
-+	.global ldc_d3
-+ldc_d3:
-+	ldc.d cp0,cr0,r0[r0]
-+	ldc.d cp7,cr14,pc[pc<<3]
-+	ldc.d cp3,cr6,r5[r4<<2]
-+	ldc.d cp2,cr4,r4[r3<<1]
-+	ldc.d cp4,cr8,r13[r12<<0]
-+	.text
-+	.global stc_w1
-+stc_w1:
-+	stc.w cp0,r0[0],cr0
-+	stc.w cp7,pc[255<<2],cr15
-+	stc.w cp3,r5[128<<2],cr5
-+	stc.w cp2,r4[127<<2],cr4
-+	stc.w cp4,r13[36<<2],cr9
-+	.text
-+	.global stc_w2
-+stc_w2:
-+	stc.w cp0,r0++,cr0
-+	stc.w cp7,pc++,cr15
-+	stc.w cp3,r5++,cr5
-+	stc.w cp2,r4++,cr4
-+	stc.w cp4,r13++,cr9
-+	.text
-+	.global stc_w3
-+stc_w3:
-+	stc.w cp0,r0[r0],cr0
-+	stc.w cp7,pc[pc<<3],cr15
-+	stc.w cp3,r5[r4<<2],cr5
-+	stc.w cp2,r4[r3<<1],cr4
-+	stc.w cp4,r13[r12<<0],cr9
-+	.text
-+	.global stc_d1
-+stc_d1:
-+	stc.d cp0,r0[0],cr0
-+	stc.d cp7,pc[255<<2],cr14
-+	stc.d cp3,r5[128<<2],cr6
-+	stc.d cp2,r4[127<<2],cr4
-+	stc.d cp4,r13[36<<2],cr8
-+	.text
-+	.global stc_d2
-+stc_d2:
-+	stc.d cp0,r0++,cr0
-+	stc.d cp7,pc++,cr14
-+	stc.d cp3,r5++,cr6
-+	stc.d cp2,r4++,cr4
-+	stc.d cp4,r13++,cr8
-+	.text
-+	.global stc_d3
-+stc_d3:
-+	stc.d cp0,r0[r0],cr0
-+	stc.d cp7,pc[pc<<3],cr14
-+	stc.d cp3,r5[r4<<2],cr6
-+	stc.d cp2,r4[r3<<1],cr4
-+	stc.d cp4,r13[r12<<0],cr8
-+	.text
-+	.global ldc0_w
-+ldc0_w:
-+	ldc0.w cr0,r0[0]
-+	ldc0.w cr15,pc[4095<<2]
-+	ldc0.w cr5,r5[2048<<2]
-+	ldc0.w cr4,r4[2047<<2]
-+	ldc0.w cr9,r13[147<<2]
-+	.text
-+	.global ldc0_d
-+ldc0_d:
-+	ldc0.d cr0,r0[0]
-+	ldc0.d cr14,pc[4095<<2]
-+	ldc0.d cr6,r5[2048<<2]
-+	ldc0.d cr4,r4[2047<<2]
-+	ldc0.d cr8,r13[147<<2]
-+	.text
-+	.global stc0_w
-+stc0_w:
-+	stc0.w r0[0],cr0
-+	stc0.w pc[4095<<2],cr15
-+	stc0.w r5[2048<<2],cr5
-+	stc0.w r4[2047<<2],cr4
-+	stc0.w r13[147<<2],cr9
-+	.text
-+	.global stc0_d
-+stc0_d:
-+	stc0.d r0[0],cr0
-+	stc0.d pc[4095<<2],cr14
-+	stc0.d r5[2048<<2],cr6
-+	stc0.d r4[2047<<2],cr4
-+	stc0.d r13[147<<2],cr8
-+	.text
-+	.global memc
-+memc:
-+	memc 0, 0
-+	memc -4, 31
-+	memc -65536, 16
-+	memc 65532, 15
-+	.text
-+	.global mems
-+mems:
-+	mems 0, 0
-+	mems -4, 31
-+	mems -65536, 16
-+	mems 65532, 15
-+	.text
-+	.global memt
-+memt:
-+	memt 0, 0
-+	memt -4, 31
-+	memt -65536, 16
-+	memt 65532, 15
-+
-+	.text
-+	.global stcond
-+stcond:
-+	stcond r0[0], r0
-+	stcond pc[-1], pc
-+	stcond r8[-32768], r7
-+	stcond r7[32767], r8
-+	stcond r5[0x1234], r10
-+
-+ldcm_w:
-+	ldcm.w cp0,pc,cr0-cr7
-+	ldcm.w cp7,r0,cr0
-+	ldcm.w cp4,r4++,cr0-cr6
-+	ldcm.w cp3,r7,cr7
-+	ldcm.w cp1,r12++,cr1,cr4-cr6
-+	ldcm.w cp0,pc,cr8-cr15
-+	ldcm.w cp7,r0,cr8
-+	ldcm.w cp4,r4++,cr8-cr14
-+	ldcm.w cp3,r7,cr15
-+	ldcm.w cp1,r12++,cr9,cr12-cr14
-+
-+ldcm_d:
-+	ldcm.d cp0,pc,cr0-cr15
-+	ldcm.d cp7,r0,cr0,cr1
-+	ldcm.d cp4,r4++,cr0-cr13
-+	ldcm.d cp3,r7,cr14-cr15
-+	ldcm.d cp2,r12++,cr0-cr3,cr8-cr9,cr14-cr15
-+
-+stcm_w:
-+	stcm.w cp0,pc,cr0-cr7
-+	stcm.w cp7,r0,cr0
-+	stcm.w cp4,--r4,cr0-cr6
-+	stcm.w cp3,r7,cr7
-+	stcm.w cp1,--r12,cr1,cr4-cr6
-+	stcm.w cp0,pc,cr8-cr15
-+	stcm.w cp7,r0,cr8
-+	stcm.w cp4,--r4,cr8-cr14
-+	stcm.w cp3,r7,cr15
-+	stcm.w cp1,--r12,cr9,cr12-cr14
-+
-+stcm_d:
-+	stcm.d cp0,pc,cr0-cr15
-+	stcm.d cp7,r0,cr0,cr1
-+	stcm.d cp4,--r4,cr0-cr13
-+	stcm.d cp3,r7,cr14-cr15
-+	stcm.d cp2,--r12,cr0-cr3,cr8-cr9,cr14-cr15
-+
-+mvcr_w:
-+	mvcr.w cp7,pc,cr15
-+	mvcr.w cp0,r0,cr0
-+	mvcr.w cp0,pc,cr15
-+	mvcr.w cp7,r0,cr15
-+	mvcr.w cp7,pc,cr0
-+	mvcr.w cp4,r7,cr8
-+	mvcr.w cp3,r8,cr7
-+
-+mvcr_d:
-+	mvcr.d cp7,lr,cr14
-+	mvcr.d cp0,r0,cr0
-+	mvcr.d cp0,lr,cr14
-+	mvcr.d cp7,r0,cr14
-+	mvcr.d cp7,lr,cr0
-+	mvcr.d cp4,r6,cr8
-+	mvcr.d cp3,r8,cr6
-+
-+mvrc_w:
-+	mvrc.w cp7,cr15,pc
-+	mvrc.w cp0,cr0,r0
-+	mvrc.w cp0,cr15,pc
-+	mvrc.w cp7,cr15,r0
-+	mvrc.w cp7,cr0,pc
-+	mvrc.w cp4,cr8,r7
-+	mvrc.w cp3,cr7,r8
-+
-+mvrc_d:
-+	mvrc.d cp7,cr14,lr
-+	mvrc.d cp0,cr0,r0
-+	mvrc.d cp0,cr14,lr
-+	mvrc.d cp7,cr14,r0
-+	mvrc.d cp7,cr0,lr
-+	mvrc.d cp4,cr8,r6
-+	mvrc.d cp3,cr6,r8
-+
-+bfexts:
-+	bfexts pc,pc,31,31
-+	bfexts r0,r0,0,0
-+	bfexts r0,pc,31,31
-+	bfexts pc,r0,31,31
-+	bfexts pc,pc,0,31
-+	bfexts pc,pc,31,0
-+	bfexts r7,r8,15,16
-+	bfexts r8,r7,16,15
-+
-+bfextu:
-+	bfextu pc,pc,31,31
-+	bfextu r0,r0,0,0
-+	bfextu r0,pc,31,31
-+	bfextu pc,r0,31,31
-+	bfextu pc,pc,0,31
-+	bfextu pc,pc,31,0
-+	bfextu r7,r8,15,16
-+	bfextu r8,r7,16,15
-+
-+bfins:
-+	bfins pc,pc,31,31
-+	bfins r0,r0,0,0
-+	bfins r0,pc,31,31
-+	bfins pc,r0,31,31
-+	bfins pc,pc,0,31
-+	bfins pc,pc,31,0
-+	bfins r7,r8,15,16
-+	bfins r8,r7,16,15
-+
-+rsubc:
-+	rsubeq pc,0
-+	rsubal r12,-1
-+	rsubls r5,-128
-+	rsubpl r4,127
-+	rsubne lr,1
-+	rsubls r12,118
-+	rsubvc lr,-12
-+	rsubmi r4,-13
-+
-+addc:
-+	addeq pc,pc,pc
-+	addal r12,r12,r12
-+	addls r5,r5,r5
-+	addpl r4,r4,r4
-+	addne lr,lr,lr
-+	addls r10,r2,r1
-+	addvc r12,r8,r11
-+	addmi r10,r7,r0   
-+
-+subc2:
-+	subeq pc,pc,pc
-+	subal r12,r12,r12
-+	subls r5,r5,r5
-+	subpl r4,r4,r4
-+	subne lr,lr,lr
-+	subls r10,r2,r1
-+	subvc r12,r8,r11
-+	submi r10,r7,r0   
-+
-+andc:
-+	andeq pc,pc,pc
-+	andal r12,r12,r12
-+	andls r5,r5,r5
-+	andpl r4,r4,r4
-+	andne lr,lr,lr
-+	andls r10,r2,r1
-+	andvc r12,r8,r11
-+	andmi r10,r7,r0   
-+
-+orc:
-+	oreq pc,pc,pc
-+	oral r12,r12,r12
-+	orls r5,r5,r5
-+	orpl r4,r4,r4
-+	orne lr,lr,lr
-+	orls r10,r2,r1
-+	orvc r12,r8,r11
-+	ormi r10,r7,r0   
-+
-+eorc:
-+	eoreq pc,pc,pc
-+	eoral r12,r12,r12
-+	eorls r5,r5,r5
-+	eorpl r4,r4,r4
-+	eorne lr,lr,lr
-+	eorls r10,r2,r1
-+	eorvc r12,r8,r11
-+	eormi r10,r7,r0   
-+
-+ldcond:
-+	ld.weq  pc,pc[2044]
-+	ld.shal r12,r12[1022]
-+	ld.uhls r5,r5[0]
-+	ld.ubpl r4,r4[511]
-+	ld.sbne lr,lr[0]
-+	ld.wls  r10,r2[0]
-+	ld.shvc r12,r8[0x3fe]
-+	ld.ubmi r10,r7[1]
-+  
-+stcond2:
-+	st.weq pc[2044],pc
-+	st.hal r12[1022],r12
-+	st.hls r5[0],r5
-+	st.bpl r4[511],r4
-+	st.bne lr[0],lr
-+	st.wls r2[0],r10
-+	st.hvc r8[0x3fe],r12
-+	st.bmi r7[1],r10
-+	
-+movh:	
-+	movh	pc, 65535
-+	movh	r0, 0
-+	movh	r5, 1
-+	movh	r12, 32767
-+	
-+		
-diff -Nur binutils-2.21.orig/gas/testsuite/gas/avr32/avr32.exp binutils-2.21/gas/testsuite/gas/avr32/avr32.exp
---- binutils-2.21.orig/gas/testsuite/gas/avr32/avr32.exp	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.21/gas/testsuite/gas/avr32/avr32.exp	2011-08-28 14:56:20.727983227 +0200
-@@ -0,0 +1,23 @@
-+# AVR32 assembler testsuite. -*- Tcl -*-
-+
-+if [istarget avr32-*-*] {
-+    run_dump_test "hwrd-lwrd"
-+    run_dump_test "pcrel"
-+    run_dump_test "aliases"
-+    run_dump_test "dwarf2"
-+    run_dump_test "pic_reloc"
-+    run_dump_test "fpinsn"
-+    run_dump_test "pico"
-+    run_dump_test "lda_pic"
-+    run_dump_test "lda_pic_linkrelax"
-+    run_dump_test "lda_nopic"
-+    run_dump_test "lda_nopic_linkrelax"
-+    run_dump_test "call_pic"
-+    run_dump_test "call_pic_linkrelax"
-+    run_dump_test "call_nopic"
-+    run_dump_test "call_nopic_linkrelax"
-+    run_dump_test "jmptable"
-+    run_dump_test "jmptable_linkrelax"
-+    run_dump_test "symdiff"
-+    run_dump_test "symdiff_linkrelax"
-+}
-diff -Nur binutils-2.21.orig/gas/testsuite/gas/avr32/call_nopic.d binutils-2.21/gas/testsuite/gas/avr32/call_nopic.d
---- binutils-2.21.orig/gas/testsuite/gas/avr32/call_nopic.d	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.21/gas/testsuite/gas/avr32/call_nopic.d	2011-08-28 14:56:20.777990675 +0200
-@@ -0,0 +1,36 @@
-+#source: call.s
-+#as:
-+#objdump: -dr
-+#name: call_nopic
-+
-+.*: +file format .*
-+
-+Disassembly of section \.text:
-+
-+00000000 <call_test>:
-+       0:	d7 03       	nop
-+
-+00000002 <toofar_negative>:
-+	\.\.\.
-+  1ffffe:	00 00       	add r0,r0
-+  200000:	f0 a0 00 00 	rcall 0 <call_test>
-+  200004:	f0 1f 00 0c 	mcall 200034 <toofar_negative\+0x200032>
-+  200008:	f0 1f 00 0c 	mcall 200038 <toofar_negative\+0x200036>
-+  20000c:	f0 1f 00 0c 	mcall 20003c <toofar_negative\+0x20003a>
-+  200010:	f0 1f 00 0c 	mcall 200040 <toofar_negative\+0x20003e>
-+	\.\.\.
-+  200030:	ee b0 ff ff 	rcall 40002e <far_positive>
-+	\.\.\.
-+			200034: R_AVR32_32_CPENT	\.text\+0x2
-+			200038: R_AVR32_32_CPENT	\.text\.init
-+			20003c: R_AVR32_32_CPENT	undefined
-+			200040: R_AVR32_32_CPENT	\.text\+0x40002c
-+
-+0040002c <toofar_positive>:
-+  40002c:	d7 03       	nop
-+0040002e <far_positive>:
-+  40002e:	d7 03       	nop
-+Disassembly of section \.text\.init:
-+
-+00000000 <different_section>:
-+   0:	e2 c0 00 00 	sub r0,r1,0
-diff -Nur binutils-2.21.orig/gas/testsuite/gas/avr32/call_nopic_linkrelax.d binutils-2.21/gas/testsuite/gas/avr32/call_nopic_linkrelax.d
---- binutils-2.21.orig/gas/testsuite/gas/avr32/call_nopic_linkrelax.d	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.21/gas/testsuite/gas/avr32/call_nopic_linkrelax.d	2011-08-28 14:56:20.837981728 +0200
-@@ -0,0 +1,43 @@
-+#source: call.s
-+#as: --linkrelax
-+#objdump: -dr
-+#name: call_nopic_linkrelax
-+
-+.*: +file format .*
-+
-+Disassembly of section \.text:
-+
-+00000000 <call_test>:
-+       0:	d7 03       	nop
-+
-+00000002 <toofar_negative>:
-+	\.\.\.
-+  1ffffe:	00 00       	add r0,r0
-+  200000:	e0 a0 00 00 	rcall 200000 <toofar_negative\+0x1ffffe>
-+			200000: R_AVR32_22H_PCREL	\.text
-+  200004:	f0 1f 00 00 	mcall 200004 <toofar_negative\+0x200002>
-+			200004: R_AVR32_CPCALL	\.text\+0x200034
-+  200008:	f0 1f 00 00 	mcall 200008 <toofar_negative\+0x200006>
-+			200008: R_AVR32_CPCALL	\.text\+0x200038
-+  20000c:	f0 1f 00 00 	mcall 20000c <toofar_negative\+0x20000a>
-+			20000c: R_AVR32_CPCALL	\.text\+0x20003c
-+  200010:	f0 1f 00 00 	mcall 200010 <toofar_negative\+0x20000e>
-+			200010: R_AVR32_CPCALL	\.text\+0x200040
-+	\.\.\.
-+  200030:	e0 a0 00 00 	rcall 200030 <toofar_negative\+0x20002e>
-+			200030: R_AVR32_22H_PCREL	\.text\+0x40002e
-+	\.\.\.
-+			200034: R_AVR32_ALIGN	\*ABS\*\+0x2
-+			200034: R_AVR32_32_CPENT	\.text\+0x2
-+			200038: R_AVR32_32_CPENT	\.text\.init
-+			20003c: R_AVR32_32_CPENT	undefined
-+			200040: R_AVR32_32_CPENT	\.text\+0x40002c
-+
-+0040002c <toofar_positive>:
-+  40002c:	d7 03       	nop
-+0040002e <far_positive>:
-+  40002e:	d7 03       	nop
-+Disassembly of section \.text\.init:
-+
-+00000000 <different_section>:
-+   0:	e2 c0 00 00 	sub r0,r1,0
-diff -Nur binutils-2.21.orig/gas/testsuite/gas/avr32/call_pic.d binutils-2.21/gas/testsuite/gas/avr32/call_pic.d
---- binutils-2.21.orig/gas/testsuite/gas/avr32/call_pic.d	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.21/gas/testsuite/gas/avr32/call_pic.d	2011-08-28 14:56:20.877986773 +0200
-@@ -0,0 +1,36 @@
-+#source: call.s
-+#as: --pic
-+#objdump: -dr
-+#name: call_pic
-+
-+.*: +file format .*
-+
-+Disassembly of section \.text:
-+
-+00000000 <call_test>:
-+       0:	d7 03       	nop
-+
-+00000002 <toofar_negative>:
-+	\.\.\.
-+  1ffffe:	00 00       	add r0,r0
-+  200000:	f0 a0 00 00 	rcall 0 <call_test>
-+  200004:	f0 16 00 00 	mcall r6\[0\]
-+			200004: R_AVR32_GOT18SW	toofar_negative
-+  200008:	f0 16 00 00 	mcall r6\[0\]
-+			200008: R_AVR32_GOT18SW	different_section
-+  20000c:	f0 16 00 00 	mcall r6\[0\]
-+			20000c: R_AVR32_GOT18SW	undefined
-+  200010:	f0 16 00 00 	mcall r6\[0\]
-+			200010: R_AVR32_GOT18SW	toofar_positive
-+	\.\.\.
-+  200030:	ee b0 ff ff 	rcall 40002e <far_positive>
-+	\.\.\.
-+
-+0040002c <toofar_positive>:
-+  40002c:	d7 03       	nop
-+0040002e <far_positive>:
-+  40002e:	d7 03       	nop
-+Disassembly of section \.text\.init:
-+
-+00000000 <different_section>:
-+   0:	e2 c0 00 00 	sub r0,r1,0
-diff -Nur binutils-2.21.orig/gas/testsuite/gas/avr32/call_pic_linkrelax.d binutils-2.21/gas/testsuite/gas/avr32/call_pic_linkrelax.d
---- binutils-2.21.orig/gas/testsuite/gas/avr32/call_pic_linkrelax.d	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.21/gas/testsuite/gas/avr32/call_pic_linkrelax.d	2011-08-28 14:56:20.927985506 +0200
-@@ -0,0 +1,47 @@
-+#source: call.s
-+#as: --pic --linkrelax
-+#objdump: -dr
-+#name: call_pic_linkrelax
-+
-+.*: +file format .*
-+
-+Disassembly of section \.text:
-+
-+00000000 <call_test>:
-+       0:	d7 03       	nop
-+
-+00000002 <toofar_negative>:
-+	\.\.\.
-+  1ffffe:	00 00       	add r0,r0
-+  200000:	e0 a0 00 00 	rcall 200000 <toofar_negative\+0x1ffffe>
-+			200000: R_AVR32_22H_PCREL	\.text
-+  200004:	e0 6e 00 00 	mov lr,0
-+			200004: R_AVR32_GOTCALL	toofar_negative
-+  200008:	ec 0e 03 2e 	ld\.w lr,r6\[lr<<0x2\]
-+  20000c:	5d 1e       	icall lr
-+  20000e:	e0 6e 00 00 	mov lr,0
-+			20000e: R_AVR32_GOTCALL	different_section
-+  200012:	ec 0e 03 2e 	ld\.w lr,r6\[lr<<0x2\]
-+  200016:	5d 1e       	icall lr
-+  200018:	e0 6e 00 00 	mov lr,0
-+			200018: R_AVR32_GOTCALL	undefined
-+  20001c:	ec 0e 03 2e 	ld\.w lr,r6\[lr<<0x2\]
-+  200020:	5d 1e       	icall lr
-+  200022:	e0 6e 00 00 	mov lr,0
-+			200022: R_AVR32_GOTCALL	toofar_positive
-+  200026:	ec 0e 03 2e 	ld\.w lr,r6\[lr<<0x2\]
-+  20002a:	5d 1e       	icall lr
-+  20002c:	00 00       	add r0,r0
-+  20002e:	00 00       	add r0,r0
-+  200030:	e0 a0 00 00 	rcall 200030 <toofar_negative\+0x20002e>
-+			200030: R_AVR32_22H_PCREL	\.text\+0x40002e
-+	\.\.\.
-+
-+0040002c <toofar_positive>:
-+  40002c:	d7 03       	nop
-+0040002e <far_positive>:
-+  40002e:	d7 03       	nop
-+Disassembly of section \.text\.init:
-+
-+00000000 <different_section>:
-+   0:	e2 c0 00 00 	sub r0,r1,0
-diff -Nur binutils-2.21.orig/gas/testsuite/gas/avr32/call.s binutils-2.21/gas/testsuite/gas/avr32/call.s
---- binutils-2.21.orig/gas/testsuite/gas/avr32/call.s	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.21/gas/testsuite/gas/avr32/call.s	2011-08-28 14:56:21.007978939 +0200
-@@ -0,0 +1,30 @@
-+
-+	.text
-+	.global call_test
-+call_test:
-+far_negative:
-+	nop
-+toofar_negative:
-+
-+	.org	0x200000
-+
-+	call	far_negative
-+	call	toofar_negative
-+	call	different_section
-+	call	undefined
-+	call	toofar_positive
-+	.org	0x200030
-+	call	far_positive
-+
-+	.cpool
-+
-+	.org	0x40002c
-+
-+toofar_positive:
-+	nop
-+far_positive:
-+	nop
-+
-+	.section .text.init,"ax",@progbits
-+different_section:
-+	sub	r0, r1, 0
-diff -Nur binutils-2.21.orig/gas/testsuite/gas/avr32/dwarf2.d binutils-2.21/gas/testsuite/gas/avr32/dwarf2.d
---- binutils-2.21.orig/gas/testsuite/gas/avr32/dwarf2.d	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.21/gas/testsuite/gas/avr32/dwarf2.d	2011-08-28 14:56:21.057991029 +0200
-@@ -0,0 +1,42 @@
-+#readelf: -wl
-+#name: dwarf2
-+#source: dwarf2.s
-+
-+Dump of debug contents of section \.debug_line:
-+
-+  Length:                      53
-+  DWARF Version:               2
-+  Prologue Length:             26
-+  Minimum Instruction Length:  1
-+  Initial value of 'is_stmt':  1
-+  Line Base:                   -5
-+  Line Range:                  14
-+  Opcode Base:                 10
-+  \(Pointer size:               4\)
-+
-+ Opcodes:
-+  Opcode 1 has 0 args
-+  Opcode 2 has 1 args
-+  Opcode 3 has 1 args
-+  Opcode 4 has 1 args
-+  Opcode 5 has 1 args
-+  Opcode 6 has 0 args
-+  Opcode 7 has 0 args
-+  Opcode 8 has 0 args
-+  Opcode 9 has 1 args
-+
-+ The Directory Table is empty\.
-+
-+ The File Name Table:
-+  Entry	Dir	Time	Size	Name
-+  1	0	0	0	main\.c
-+
-+ Line Number Statements:
-+  Extended opcode 2: set Address to 0x0
-+  Advance Line by 87 to 88
-+  Copy
-+  Advance Line by 23 to 111
-+  Special opcode .*: advance Address by 4 to 0x4 and Line by 0 to 111
-+  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 -Nur binutils-2.21.orig/gas/testsuite/gas/avr32/dwarf2.s binutils-2.21/gas/testsuite/gas/avr32/dwarf2.s
---- binutils-2.21.orig/gas/testsuite/gas/avr32/dwarf2.s	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.21/gas/testsuite/gas/avr32/dwarf2.s	2011-08-28 14:56:21.097979812 +0200
-@@ -0,0 +1,67 @@
-+# Source file used to test DWARF2 information for AVR32.
-+
-+	.file	"main.c"
-+
-+	.section .debug_abbrev,"",@progbits
-+.Ldebug_abbrev0:
-+	.section .debug_info,"",@progbits
-+.Ldebug_info0:
-+	.section .debug_line,"",@progbits
-+.Ldebug_line0:
-+
-+	.text
-+	.align	1
-+	.globl	main
-+	.type	main, @function
-+.Ltext0:
-+main:
-+	.file 1 "main.c"
-+	.loc 1 88 0
-+	pushm	r0-r7,lr
-+	sub	sp, 4
-+	.loc 1 111 0
-+	lddpc	r12, .LC1
-+	lddpc	r7, .LC1
-+	icall	r7
-+	.loc 1 112 0
-+	lddpc	r6, .LC4
-+
-+	.align	2
-+.LC4:	.int	0
-+
-+	.fill	256, 2, 0
-+
-+	.align	2
-+.LC1:
-+	.int	0
-+.LC2:
-+	.int	0
-+.LC3:
-+	.int	0
-+	.size	main, . - main
-+
-+.Letext0:
-+
-+	.section .debug_info
-+	.int	.Ledebug_info0 - .Ldebug_info0	// size
-+	.short	2				// version
-+	.int	.Ldebug_abbrev0			// abbrev offset
-+	.byte	4				// bytes per addr
-+
-+	.uleb128 1				// abbrev 1
-+	.int	.Ldebug_line0			// DW_AT_stmt_list
-+	.int	.Letext0			// DW_AT_high_pc
-+	.int	.Ltext0				// DW_AT_low_pc
-+
-+.Ledebug_info0:
-+
-+	.section .debug_abbrev
-+	.uleb128 0x01
-+	.uleb128 0x11		// DW_TAG_compile_unit
-+	.byte	0		// DW_CHILDREN_no
-+	.uleb128 0x10, 0x6	// DW_AT_stmt_list
-+	.uleb128 0x12, 0x1	// DW_AT_high_pc
-+	.uleb128 0x11, 0x1	// DW_AT_low_pc
-+	.uleb128 0, 0
-+
-+	.byte	0
-diff -Nur binutils-2.21.orig/gas/testsuite/gas/avr32/fpinsn.d binutils-2.21/gas/testsuite/gas/avr32/fpinsn.d
---- binutils-2.21.orig/gas/testsuite/gas/avr32/fpinsn.d	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.21/gas/testsuite/gas/avr32/fpinsn.d	2011-08-28 14:56:21.137980708 +0200
-@@ -0,0 +1,271 @@
-+#as:
-+#objdump: -dr
-+#name: fpinsn
-+
-+.*: +file format .*
-+
-+Disassembly of section \.text:
-+
-+[0-9a-f]* <fadd_s>:
-+ *[0-9a-f]*:	e1 a2 0f ff 	cop cp0,cr15,cr15,cr15,0x4
-+ *[0-9a-f]*:	e1 a2 00 00 	cop cp0,cr0,cr0,cr0,0x4
-+ *[0-9a-f]*:	e1 a2 00 ff 	cop cp0,cr0,cr15,cr15,0x4
-+ *[0-9a-f]*:	e1 a2 0f 0f 	cop cp0,cr15,cr0,cr15,0x4
-+ *[0-9a-f]*:	e1 a2 0f f0 	cop cp0,cr15,cr15,cr0,0x4
-+ *[0-9a-f]*:	e1 a2 07 88 	cop cp0,cr7,cr8,cr8,0x4
-+ *[0-9a-f]*:	e1 a2 08 78 	cop cp0,cr8,cr7,cr8,0x4
-+ *[0-9a-f]*:	e1 a2 08 87 	cop cp0,cr8,cr8,cr7,0x4
-+
-+[0-9a-f]* <fsub_s>:
-+ *[0-9a-f]*:	e1 a2 1f ff 	cop cp0,cr15,cr15,cr15,0x5
-+ *[0-9a-f]*:	e1 a2 10 00 	cop cp0,cr0,cr0,cr0,0x5
-+ *[0-9a-f]*:	e1 a2 10 ff 	cop cp0,cr0,cr15,cr15,0x5
-+ *[0-9a-f]*:	e1 a2 1f 0f 	cop cp0,cr15,cr0,cr15,0x5
-+ *[0-9a-f]*:	e1 a2 1f f0 	cop cp0,cr15,cr15,cr0,0x5
-+ *[0-9a-f]*:	e1 a2 17 88 	cop cp0,cr7,cr8,cr8,0x5
-+ *[0-9a-f]*:	e1 a2 18 78 	cop cp0,cr8,cr7,cr8,0x5
-+ *[0-9a-f]*:	e1 a2 18 87 	cop cp0,cr8,cr8,cr7,0x5
-+
-+[0-9a-f]* <fmac_s>:
-+ *[0-9a-f]*:	e1 a0 0f ff 	cop cp0,cr15,cr15,cr15,0x0
-+ *[0-9a-f]*:	e1 a0 00 00 	cop cp0,cr0,cr0,cr0,0x0
-+ *[0-9a-f]*:	e1 a0 00 ff 	cop cp0,cr0,cr15,cr15,0x0
-+ *[0-9a-f]*:	e1 a0 0f 0f 	cop cp0,cr15,cr0,cr15,0x0
-+ *[0-9a-f]*:	e1 a0 0f f0 	cop cp0,cr15,cr15,cr0,0x0
-+ *[0-9a-f]*:	e1 a0 07 88 	cop cp0,cr7,cr8,cr8,0x0
-+ *[0-9a-f]*:	e1 a0 08 78 	cop cp0,cr8,cr7,cr8,0x0
-+ *[0-9a-f]*:	e1 a0 08 87 	cop cp0,cr8,cr8,cr7,0x0
-+
-+[0-9a-f]* <fnmac_s>:
-+ *[0-9a-f]*:	e1 a0 1f ff 	cop cp0,cr15,cr15,cr15,0x1
-+ *[0-9a-f]*:	e1 a0 10 00 	cop cp0,cr0,cr0,cr0,0x1
-+ *[0-9a-f]*:	e1 a0 10 ff 	cop cp0,cr0,cr15,cr15,0x1
-+ *[0-9a-f]*:	e1 a0 1f 0f 	cop cp0,cr15,cr0,cr15,0x1
-+ *[0-9a-f]*:	e1 a0 1f f0 	cop cp0,cr15,cr15,cr0,0x1
-+ *[0-9a-f]*:	e1 a0 17 88 	cop cp0,cr7,cr8,cr8,0x1
-+ *[0-9a-f]*:	e1 a0 18 78 	cop cp0,cr8,cr7,cr8,0x1
-+ *[0-9a-f]*:	e1 a0 18 87 	cop cp0,cr8,cr8,cr7,0x1
-+
-+[0-9a-f]* <fmsc_s>:
-+ *[0-9a-f]*:	e1 a1 0f ff 	cop cp0,cr15,cr15,cr15,0x2
-+ *[0-9a-f]*:	e1 a1 00 00 	cop cp0,cr0,cr0,cr0,0x2
-+ *[0-9a-f]*:	e1 a1 00 ff 	cop cp0,cr0,cr15,cr15,0x2
-+ *[0-9a-f]*:	e1 a1 0f 0f 	cop cp0,cr15,cr0,cr15,0x2
-+ *[0-9a-f]*:	e1 a1 0f f0 	cop cp0,cr15,cr15,cr0,0x2
-+ *[0-9a-f]*:	e1 a1 07 88 	cop cp0,cr7,cr8,cr8,0x2
-+ *[0-9a-f]*:	e1 a1 08 78 	cop cp0,cr8,cr7,cr8,0x2
-+ *[0-9a-f]*:	e1 a1 08 87 	cop cp0,cr8,cr8,cr7,0x2
-+
-+[0-9a-f]* <fnmsc_s>:
-+ *[0-9a-f]*:	e1 a1 1f ff 	cop cp0,cr15,cr15,cr15,0x3
-+ *[0-9a-f]*:	e1 a1 10 00 	cop cp0,cr0,cr0,cr0,0x3
-+ *[0-9a-f]*:	e1 a1 10 ff 	cop cp0,cr0,cr15,cr15,0x3
-+ *[0-9a-f]*:	e1 a1 1f 0f 	cop cp0,cr15,cr0,cr15,0x3
-+ *[0-9a-f]*:	e1 a1 1f f0 	cop cp0,cr15,cr15,cr0,0x3
-+ *[0-9a-f]*:	e1 a1 17 88 	cop cp0,cr7,cr8,cr8,0x3
-+ *[0-9a-f]*:	e1 a1 18 78 	cop cp0,cr8,cr7,cr8,0x3
-+ *[0-9a-f]*:	e1 a1 18 87 	cop cp0,cr8,cr8,cr7,0x3
-+
-+[0-9a-f]* <fmul_s>:
-+ *[0-9a-f]*:	e1 a3 0f ff 	cop cp0,cr15,cr15,cr15,0x6
-+ *[0-9a-f]*:	e1 a3 00 00 	cop cp0,cr0,cr0,cr0,0x6
-+ *[0-9a-f]*:	e1 a3 00 ff 	cop cp0,cr0,cr15,cr15,0x6
-+ *[0-9a-f]*:	e1 a3 0f 0f 	cop cp0,cr15,cr0,cr15,0x6
-+ *[0-9a-f]*:	e1 a3 0f f0 	cop cp0,cr15,cr15,cr0,0x6
-+ *[0-9a-f]*:	e1 a3 07 88 	cop cp0,cr7,cr8,cr8,0x6
-+ *[0-9a-f]*:	e1 a3 08 78 	cop cp0,cr8,cr7,cr8,0x6
-+ *[0-9a-f]*:	e1 a3 08 87 	cop cp0,cr8,cr8,cr7,0x6
-+
-+[0-9a-f]* <fnmul_s>:
-+ *[0-9a-f]*:	e1 a3 1f ff 	cop cp0,cr15,cr15,cr15,0x7
-+ *[0-9a-f]*:	e1 a3 10 00 	cop cp0,cr0,cr0,cr0,0x7
-+ *[0-9a-f]*:	e1 a3 10 ff 	cop cp0,cr0,cr15,cr15,0x7
-+ *[0-9a-f]*:	e1 a3 1f 0f 	cop cp0,cr15,cr0,cr15,0x7
-+ *[0-9a-f]*:	e1 a3 1f f0 	cop cp0,cr15,cr15,cr0,0x7
-+ *[0-9a-f]*:	e1 a3 17 88 	cop cp0,cr7,cr8,cr8,0x7
-+ *[0-9a-f]*:	e1 a3 18 78 	cop cp0,cr8,cr7,cr8,0x7
-+ *[0-9a-f]*:	e1 a3 18 87 	cop cp0,cr8,cr8,cr7,0x7
-+
-+[0-9a-f]* <fneg_s>:
-+ *[0-9a-f]*:	e1 a4 0f f0 	cop cp0,cr15,cr15,cr0,0x8
-+ *[0-9a-f]*:	e1 a4 00 00 	cop cp0,cr0,cr0,cr0,0x8
-+ *[0-9a-f]*:	e1 a4 00 f0 	cop cp0,cr0,cr15,cr0,0x8
-+ *[0-9a-f]*:	e1 a4 0f 00 	cop cp0,cr15,cr0,cr0,0x8
-+ *[0-9a-f]*:	e1 a4 07 80 	cop cp0,cr7,cr8,cr0,0x8
-+ *[0-9a-f]*:	e1 a4 08 70 	cop cp0,cr8,cr7,cr0,0x8
-+
-+[0-9a-f]* <fabs_s>:
-+ *[0-9a-f]*:	e1 a4 1f f0 	cop cp0,cr15,cr15,cr0,0x9
-+ *[0-9a-f]*:	e1 a4 10 00 	cop cp0,cr0,cr0,cr0,0x9
-+ *[0-9a-f]*:	e1 a4 10 f0 	cop cp0,cr0,cr15,cr0,0x9
-+ *[0-9a-f]*:	e1 a4 1f 00 	cop cp0,cr15,cr0,cr0,0x9
-+ *[0-9a-f]*:	e1 a4 17 80 	cop cp0,cr7,cr8,cr0,0x9
-+ *[0-9a-f]*:	e1 a4 18 70 	cop cp0,cr8,cr7,cr0,0x9
-+
-+[0-9a-f]* <fcmp_s>:
-+ *[0-9a-f]*:	e1 a6 10 ff 	cop cp0,cr0,cr15,cr15,0xd
-+ *[0-9a-f]*:	e1 a6 10 00 	cop cp0,cr0,cr0,cr0,0xd
-+ *[0-9a-f]*:	e1 a6 10 0f 	cop cp0,cr0,cr0,cr15,0xd
-+ *[0-9a-f]*:	e1 a6 10 f0 	cop cp0,cr0,cr15,cr0,0xd
-+ *[0-9a-f]*:	e1 a6 10 78 	cop cp0,cr0,cr7,cr8,0xd
-+ *[0-9a-f]*:	e1 a6 10 87 	cop cp0,cr0,cr8,cr7,0xd
-+
-+[0-9a-f]* <fadd_d>:
-+ *[0-9a-f]*:	e5 a2 0e ee 	cop cp0,cr14,cr14,cr14,0x44
-+ *[0-9a-f]*:	e5 a2 00 00 	cop cp0,cr0,cr0,cr0,0x44
-+ *[0-9a-f]*:	e5 a2 00 ee 	cop cp0,cr0,cr14,cr14,0x44
-+ *[0-9a-f]*:	e5 a2 0e 0e 	cop cp0,cr14,cr0,cr14,0x44
-+ *[0-9a-f]*:	e5 a2 0e e0 	cop cp0,cr14,cr14,cr0,0x44
-+ *[0-9a-f]*:	e5 a2 06 88 	cop cp0,cr6,cr8,cr8,0x44
-+ *[0-9a-f]*:	e5 a2 08 68 	cop cp0,cr8,cr6,cr8,0x44
-+ *[0-9a-f]*:	e5 a2 08 86 	cop cp0,cr8,cr8,cr6,0x44
-+
-+[0-9a-f]* <fsub_d>:
-+ *[0-9a-f]*:	e5 a2 1e ee 	cop cp0,cr14,cr14,cr14,0x45
-+ *[0-9a-f]*:	e5 a2 10 00 	cop cp0,cr0,cr0,cr0,0x45
-+ *[0-9a-f]*:	e5 a2 10 ee 	cop cp0,cr0,cr14,cr14,0x45
-+ *[0-9a-f]*:	e5 a2 1e 0e 	cop cp0,cr14,cr0,cr14,0x45
-+ *[0-9a-f]*:	e5 a2 1e e0 	cop cp0,cr14,cr14,cr0,0x45
-+ *[0-9a-f]*:	e5 a2 16 88 	cop cp0,cr6,cr8,cr8,0x45
-+ *[0-9a-f]*:	e5 a2 18 68 	cop cp0,cr8,cr6,cr8,0x45
-+ *[0-9a-f]*:	e5 a2 18 86 	cop cp0,cr8,cr8,cr6,0x45
-+
-+[0-9a-f]* <fmac_d>:
-+ *[0-9a-f]*:	e5 a0 0e ee 	cop cp0,cr14,cr14,cr14,0x40
-+ *[0-9a-f]*:	e5 a0 00 00 	cop cp0,cr0,cr0,cr0,0x40
-+ *[0-9a-f]*:	e5 a0 00 ee 	cop cp0,cr0,cr14,cr14,0x40
-+ *[0-9a-f]*:	e5 a0 0e 0e 	cop cp0,cr14,cr0,cr14,0x40
-+ *[0-9a-f]*:	e5 a0 0e e0 	cop cp0,cr14,cr14,cr0,0x40
-+ *[0-9a-f]*:	e5 a0 06 88 	cop cp0,cr6,cr8,cr8,0x40
-+ *[0-9a-f]*:	e5 a0 08 68 	cop cp0,cr8,cr6,cr8,0x40
-+ *[0-9a-f]*:	e5 a0 08 86 	cop cp0,cr8,cr8,cr6,0x40
-+
-+[0-9a-f]* <fnmac_d>:
-+ *[0-9a-f]*:	e5 a0 1e ee 	cop cp0,cr14,cr14,cr14,0x41
-+ *[0-9a-f]*:	e5 a0 10 00 	cop cp0,cr0,cr0,cr0,0x41
-+ *[0-9a-f]*:	e5 a0 10 ee 	cop cp0,cr0,cr14,cr14,0x41
-+ *[0-9a-f]*:	e5 a0 1e 0e 	cop cp0,cr14,cr0,cr14,0x41
-+ *[0-9a-f]*:	e5 a0 1e e0 	cop cp0,cr14,cr14,cr0,0x41
-+ *[0-9a-f]*:	e5 a0 16 88 	cop cp0,cr6,cr8,cr8,0x41
-+ *[0-9a-f]*:	e5 a0 18 68 	cop cp0,cr8,cr6,cr8,0x41
-+ *[0-9a-f]*:	e5 a0 18 86 	cop cp0,cr8,cr8,cr6,0x41
-+
-+[0-9a-f]* <fmsc_d>:
-+ *[0-9a-f]*:	e5 a1 0e ee 	cop cp0,cr14,cr14,cr14,0x42
-+ *[0-9a-f]*:	e5 a1 00 00 	cop cp0,cr0,cr0,cr0,0x42
-+ *[0-9a-f]*:	e5 a1 00 ee 	cop cp0,cr0,cr14,cr14,0x42
-+ *[0-9a-f]*:	e5 a1 0e 0e 	cop cp0,cr14,cr0,cr14,0x42
-+ *[0-9a-f]*:	e5 a1 0e e0 	cop cp0,cr14,cr14,cr0,0x42
-+ *[0-9a-f]*:	e5 a1 06 88 	cop cp0,cr6,cr8,cr8,0x42
-+ *[0-9a-f]*:	e5 a1 08 68 	cop cp0,cr8,cr6,cr8,0x42
-+ *[0-9a-f]*:	e5 a1 08 86 	cop cp0,cr8,cr8,cr6,0x42
-+
-+[0-9a-f]* <fnmsc_d>:
-+ *[0-9a-f]*:	e5 a1 1e ee 	cop cp0,cr14,cr14,cr14,0x43
-+ *[0-9a-f]*:	e5 a1 10 00 	cop cp0,cr0,cr0,cr0,0x43
-+ *[0-9a-f]*:	e5 a1 10 ee 	cop cp0,cr0,cr14,cr14,0x43
-+ *[0-9a-f]*:	e5 a1 1e 0e 	cop cp0,cr14,cr0,cr14,0x43
-+ *[0-9a-f]*:	e5 a1 1e e0 	cop cp0,cr14,cr14,cr0,0x43
-+ *[0-9a-f]*:	e5 a1 16 88 	cop cp0,cr6,cr8,cr8,0x43
-+ *[0-9a-f]*:	e5 a1 18 68 	cop cp0,cr8,cr6,cr8,0x43
-+ *[0-9a-f]*:	e5 a1 18 86 	cop cp0,cr8,cr8,cr6,0x43
-+
-+[0-9a-f]* <fmul_d>:
-+ *[0-9a-f]*:	e5 a3 0e ee 	cop cp0,cr14,cr14,cr14,0x46
-+ *[0-9a-f]*:	e5 a3 00 00 	cop cp0,cr0,cr0,cr0,0x46
-+ *[0-9a-f]*:	e5 a3 00 ee 	cop cp0,cr0,cr14,cr14,0x46
-+ *[0-9a-f]*:	e5 a3 0e 0e 	cop cp0,cr14,cr0,cr14,0x46
-+ *[0-9a-f]*:	e5 a3 0e e0 	cop cp0,cr14,cr14,cr0,0x46
-+ *[0-9a-f]*:	e5 a3 06 88 	cop cp0,cr6,cr8,cr8,0x46
-+ *[0-9a-f]*:	e5 a3 08 68 	cop cp0,cr8,cr6,cr8,0x46
-+ *[0-9a-f]*:	e5 a3 08 86 	cop cp0,cr8,cr8,cr6,0x46
-+
-+[0-9a-f]* <fnmul_d>:
-+ *[0-9a-f]*:	e5 a3 1e ee 	cop cp0,cr14,cr14,cr14,0x47
-+ *[0-9a-f]*:	e5 a3 10 00 	cop cp0,cr0,cr0,cr0,0x47
-+ *[0-9a-f]*:	e5 a3 10 ee 	cop cp0,cr0,cr14,cr14,0x47
-+ *[0-9a-f]*:	e5 a3 1e 0e 	cop cp0,cr14,cr0,cr14,0x47
-+ *[0-9a-f]*:	e5 a3 1e e0 	cop cp0,cr14,cr14,cr0,0x47
-+ *[0-9a-f]*:	e5 a3 16 88 	cop cp0,cr6,cr8,cr8,0x47
-+ *[0-9a-f]*:	e5 a3 18 68 	cop cp0,cr8,cr6,cr8,0x47
-+ *[0-9a-f]*:	e5 a3 18 86 	cop cp0,cr8,cr8,cr6,0x47
-+
-+[0-9a-f]* <fneg_d>:
-+ *[0-9a-f]*:	e5 a4 0e e0 	cop cp0,cr14,cr14,cr0,0x48
-+ *[0-9a-f]*:	e5 a4 00 00 	cop cp0,cr0,cr0,cr0,0x48
-+ *[0-9a-f]*:	e5 a4 00 e0 	cop cp0,cr0,cr14,cr0,0x48
-+ *[0-9a-f]*:	e5 a4 0e 00 	cop cp0,cr14,cr0,cr0,0x48
-+ *[0-9a-f]*:	e5 a4 06 80 	cop cp0,cr6,cr8,cr0,0x48
-+ *[0-9a-f]*:	e5 a4 08 60 	cop cp0,cr8,cr6,cr0,0x48
-+
-+[0-9a-f]* <fabs_d>:
-+ *[0-9a-f]*:	e5 a4 1e e0 	cop cp0,cr14,cr14,cr0,0x49
-+ *[0-9a-f]*:	e5 a4 10 00 	cop cp0,cr0,cr0,cr0,0x49
-+ *[0-9a-f]*:	e5 a4 10 e0 	cop cp0,cr0,cr14,cr0,0x49
-+ *[0-9a-f]*:	e5 a4 1e 00 	cop cp0,cr14,cr0,cr0,0x49
-+ *[0-9a-f]*:	e5 a4 16 80 	cop cp0,cr6,cr8,cr0,0x49
-+ *[0-9a-f]*:	e5 a4 18 60 	cop cp0,cr8,cr6,cr0,0x49
-+
-+[0-9a-f]* <fcmp_d>:
-+ *[0-9a-f]*:	e5 a6 10 ee 	cop cp0,cr0,cr14,cr14,0x4d
-+ *[0-9a-f]*:	e5 a6 10 00 	cop cp0,cr0,cr0,cr0,0x4d
-+ *[0-9a-f]*:	e5 a6 10 0e 	cop cp0,cr0,cr0,cr14,0x4d
-+ *[0-9a-f]*:	e5 a6 10 e0 	cop cp0,cr0,cr14,cr0,0x4d
-+ *[0-9a-f]*:	e5 a6 10 68 	cop cp0,cr0,cr6,cr8,0x4d
-+ *[0-9a-f]*:	e5 a6 10 86 	cop cp0,cr0,cr8,cr6,0x4d
-+
-+[0-9a-f]* <fmov_s>:
-+ *[0-9a-f]*:	e1 a5 0f f0 	cop cp0,cr15,cr15,cr0,0xa
-+ *[0-9a-f]*:	e1 a5 00 00 	cop cp0,cr0,cr0,cr0,0xa
-+ *[0-9a-f]*:	e1 a5 0f 00 	cop cp0,cr15,cr0,cr0,0xa
-+ *[0-9a-f]*:	e1 a5 00 f0 	cop cp0,cr0,cr15,cr0,0xa
-+ *[0-9a-f]*:	e1 a5 08 70 	cop cp0,cr8,cr7,cr0,0xa
-+ *[0-9a-f]*:	e1 a5 07 80 	cop cp0,cr7,cr8,cr0,0xa
-+ *[0-9a-f]*:	ef af 0f 00 	mvcr.w cp0,pc,cr15
-+ *[0-9a-f]*:	ef a0 00 00 	mvcr.w cp0,r0,cr0
-+ *[0-9a-f]*:	ef af 00 00 	mvcr.w cp0,pc,cr0
-+ *[0-9a-f]*:	ef a0 0f 00 	mvcr.w cp0,r0,cr15
-+ *[0-9a-f]*:	ef a8 07 00 	mvcr.w cp0,r8,cr7
-+ *[0-9a-f]*:	ef a7 08 00 	mvcr.w cp0,r7,cr8
-+ *[0-9a-f]*:	ef af 0f 20 	mvrc.w cp0,cr15,pc
-+ *[0-9a-f]*:	ef a0 00 20 	mvrc.w cp0,cr0,r0
-+ *[0-9a-f]*:	ef a0 0f 20 	mvrc.w cp0,cr15,r0
-+ *[0-9a-f]*:	ef af 00 20 	mvrc.w cp0,cr0,pc
-+ *[0-9a-f]*:	ef a7 08 20 	mvrc.w cp0,cr8,r7
-+ *[0-9a-f]*:	ef a8 07 20 	mvrc.w cp0,cr7,r8
-+
-+[0-9a-f]* <fmov_d>:
-+ *[0-9a-f]*:	e5 a5 0e e0 	cop cp0,cr14,cr14,cr0,0x4a
-+ *[0-9a-f]*:	e5 a5 00 00 	cop cp0,cr0,cr0,cr0,0x4a
-+ *[0-9a-f]*:	e5 a5 0e 00 	cop cp0,cr14,cr0,cr0,0x4a
-+ *[0-9a-f]*:	e5 a5 00 e0 	cop cp0,cr0,cr14,cr0,0x4a
-+ *[0-9a-f]*:	e5 a5 08 60 	cop cp0,cr8,cr6,cr0,0x4a
-+ *[0-9a-f]*:	e5 a5 06 80 	cop cp0,cr6,cr8,cr0,0x4a
-+ *[0-9a-f]*:	ef ae 0e 10 	mvcr.d cp0,lr,cr14
-+ *[0-9a-f]*:	ef a0 00 10 	mvcr.d cp0,r0,cr0
-+ *[0-9a-f]*:	ef ae 00 10 	mvcr.d cp0,lr,cr0
-+ *[0-9a-f]*:	ef a0 0e 10 	mvcr.d cp0,r0,cr14
-+ *[0-9a-f]*:	ef a8 06 10 	mvcr.d cp0,r8,cr6
-+ *[0-9a-f]*:	ef a6 08 10 	mvcr.d cp0,r6,cr8
-+ *[0-9a-f]*:	ef ae 0e 30 	mvrc.d cp0,cr14,lr
-+ *[0-9a-f]*:	ef a0 00 30 	mvrc.d cp0,cr0,r0
-+ *[0-9a-f]*:	ef a0 0e 30 	mvrc.d cp0,cr14,r0
-+ *[0-9a-f]*:	ef ae 00 30 	mvrc.d cp0,cr0,lr
-+ *[0-9a-f]*:	ef a6 08 30 	mvrc.d cp0,cr8,r6
-+ *[0-9a-f]*:	ef a8 06 30 	mvrc.d cp0,cr6,r8
-+
-+[0-9a-f]* <fcasts_d>:
-+ *[0-9a-f]*:	e1 a7 1f e0 	cop cp0,cr15,cr14,cr0,0xf
-+ *[0-9a-f]*:	e1 a7 10 00 	cop cp0,cr0,cr0,cr0,0xf
-+ *[0-9a-f]*:	e1 a7 1f 00 	cop cp0,cr15,cr0,cr0,0xf
-+ *[0-9a-f]*:	e1 a7 10 e0 	cop cp0,cr0,cr14,cr0,0xf
-+ *[0-9a-f]*:	e1 a7 18 60 	cop cp0,cr8,cr6,cr0,0xf
-+ *[0-9a-f]*:	e1 a7 17 80 	cop cp0,cr7,cr8,cr0,0xf
-+
-+[0-9a-f]* <fcastd_s>:
-+ *[0-9a-f]*:	e1 a8 0e f0 	cop cp0,cr14,cr15,cr0,0x10
-+ *[0-9a-f]*:	e1 a8 00 00 	cop cp0,cr0,cr0,cr0,0x10
-+ *[0-9a-f]*:	e1 a8 0e 00 	cop cp0,cr14,cr0,cr0,0x10
-+ *[0-9a-f]*:	e1 a8 00 f0 	cop cp0,cr0,cr15,cr0,0x10
-+ *[0-9a-f]*:	e1 a8 08 70 	cop cp0,cr8,cr7,cr0,0x10
-+ *[0-9a-f]*:	e1 a8 06 80 	cop cp0,cr6,cr8,cr0,0x10
-diff -Nur binutils-2.21.orig/gas/testsuite/gas/avr32/fpinsn.s binutils-2.21/gas/testsuite/gas/avr32/fpinsn.s
---- binutils-2.21.orig/gas/testsuite/gas/avr32/fpinsn.s	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.21/gas/testsuite/gas/avr32/fpinsn.s	2011-08-28 14:56:21.197982789 +0200
-@@ -0,0 +1,266 @@
-+
-+	.text
-+	.global	fadd_s
-+fadd_s:
-+	fadd.s fr15, fr15, fr15
-+	fadd.s fr0, fr0, fr0
-+	fadd.s fr0, fr15, fr15
-+	fadd.s fr15, fr0, fr15
-+	fadd.s fr15, fr15, fr0
-+	fadd.s fr7, fr8, fr8
-+	fadd.s fr8, fr7, fr8
-+	fadd.s fr8, fr8, fr7
-+	.global	fsub_s
-+fsub_s:
-+	fsub.s fr15, fr15, fr15
-+	fsub.s fr0, fr0, fr0
-+	fsub.s fr0, fr15, fr15
-+	fsub.s fr15, fr0, fr15
-+	fsub.s fr15, fr15, fr0
-+	fsub.s fr7, fr8, fr8
-+	fsub.s fr8, fr7, fr8
-+	fsub.s fr8, fr8, fr7
-+	.global	fmac_s
-+fmac_s:
-+	fmac.s fr15, fr15, fr15
-+	fmac.s fr0, fr0, fr0
-+	fmac.s fr0, fr15, fr15
-+	fmac.s fr15, fr0, fr15
-+	fmac.s fr15, fr15, fr0
-+	fmac.s fr7, fr8, fr8
-+	fmac.s fr8, fr7, fr8
-+	fmac.s fr8, fr8, fr7
-+	.global	fnmac_s
-+fnmac_s:
-+	fnmac.s fr15, fr15, fr15
-+	fnmac.s fr0, fr0, fr0
-+	fnmac.s fr0, fr15, fr15
-+	fnmac.s fr15, fr0, fr15
-+	fnmac.s fr15, fr15, fr0
-+	fnmac.s fr7, fr8, fr8
-+	fnmac.s fr8, fr7, fr8
-+	fnmac.s fr8, fr8, fr7
-+	.global	fmsc_s
-+fmsc_s:
-+	fmsc.s fr15, fr15, fr15
-+	fmsc.s fr0, fr0, fr0
-+	fmsc.s fr0, fr15, fr15
-+	fmsc.s fr15, fr0, fr15
-+	fmsc.s fr15, fr15, fr0
-+	fmsc.s fr7, fr8, fr8
-+	fmsc.s fr8, fr7, fr8
-+	fmsc.s fr8, fr8, fr7
-+	.global	fnmsc_s
-+fnmsc_s:
-+	fnmsc.s fr15, fr15, fr15
-+	fnmsc.s fr0, fr0, fr0
-+	fnmsc.s fr0, fr15, fr15
-+	fnmsc.s fr15, fr0, fr15
-+	fnmsc.s fr15, fr15, fr0
-+	fnmsc.s fr7, fr8, fr8
-+	fnmsc.s fr8, fr7, fr8
-+	fnmsc.s fr8, fr8, fr7
-+	.global	fmul_s
-+fmul_s:
-+	fmul.s fr15, fr15, fr15
-+	fmul.s fr0, fr0, fr0
-+	fmul.s fr0, fr15, fr15
-+	fmul.s fr15, fr0, fr15
-+	fmul.s fr15, fr15, fr0
-+	fmul.s fr7, fr8, fr8
-+	fmul.s fr8, fr7, fr8
-+	fmul.s fr8, fr8, fr7
-+	.global	fnmul_s
-+fnmul_s:
-+	fnmul.s fr15, fr15, fr15
-+	fnmul.s fr0, fr0, fr0
-+	fnmul.s fr0, fr15, fr15
-+	fnmul.s fr15, fr0, fr15
-+	fnmul.s fr15, fr15, fr0
-+	fnmul.s fr7, fr8, fr8
-+	fnmul.s fr8, fr7, fr8
-+	fnmul.s fr8, fr8, fr7
-+	.global	fneg_s
-+fneg_s:
-+	fneg.s fr15, fr15
-+	fneg.s fr0, fr0
-+	fneg.s fr0, fr15
-+	fneg.s fr15, fr0
-+	fneg.s fr7, fr8
-+	fneg.s fr8, fr7
-+	.global	fabs_s
-+fabs_s:
-+	fabs.s fr15, fr15
-+	fabs.s fr0, fr0
-+	fabs.s fr0, fr15
-+	fabs.s fr15, fr0
-+	fabs.s fr7, fr8
-+	fabs.s fr8, fr7
-+	.global	fcmp_s
-+fcmp_s:
-+	fcmp.s fr15, fr15
-+	fcmp.s fr0, fr0
-+	fcmp.s fr0, fr15
-+	fcmp.s fr15, fr0
-+	fcmp.s fr7, fr8
-+	fcmp.s fr8, fr7
-+	.global	fadd_d
-+fadd_d:
-+	fadd.d fr14, fr14, fr14
-+	fadd.d fr0, fr0, fr0
-+	fadd.d fr0, fr14, fr14
-+	fadd.d fr14, fr0, fr14
-+	fadd.d fr14, fr14, fr0
-+	fadd.d fr6, fr8, fr8
-+	fadd.d fr8, fr6, fr8
-+	fadd.d fr8, fr8, fr6
-+	.global	fsub_d
-+fsub_d:
-+	fsub.d fr14, fr14, fr14
-+	fsub.d fr0, fr0, fr0
-+	fsub.d fr0, fr14, fr14
-+	fsub.d fr14, fr0, fr14
-+	fsub.d fr14, fr14, fr0
-+	fsub.d fr6, fr8, fr8
-+	fsub.d fr8, fr6, fr8
-+	fsub.d fr8, fr8, fr6
-+	.global	fmac_d
-+fmac_d:
-+	fmac.d fr14, fr14, fr14
-+	fmac.d fr0, fr0, fr0
-+	fmac.d fr0, fr14, fr14
-+	fmac.d fr14, fr0, fr14
-+	fmac.d fr14, fr14, fr0
-+	fmac.d fr6, fr8, fr8
-+	fmac.d fr8, fr6, fr8
-+	fmac.d fr8, fr8, fr6
-+	.global	fnmac_d
-+fnmac_d:
-+	fnmac.d fr14, fr14, fr14
-+	fnmac.d fr0, fr0, fr0
-+	fnmac.d fr0, fr14, fr14
-+	fnmac.d fr14, fr0, fr14
-+	fnmac.d fr14, fr14, fr0
-+	fnmac.d fr6, fr8, fr8
-+	fnmac.d fr8, fr6, fr8
-+	fnmac.d fr8, fr8, fr6
-+	.global	fmsc_d
-+fmsc_d:
-+	fmsc.d fr14, fr14, fr14
-+	fmsc.d fr0, fr0, fr0
-+	fmsc.d fr0, fr14, fr14
-+	fmsc.d fr14, fr0, fr14
-+	fmsc.d fr14, fr14, fr0
-+	fmsc.d fr6, fr8, fr8
-+	fmsc.d fr8, fr6, fr8
-+	fmsc.d fr8, fr8, fr6
-+	.global	fnmsc_d
-+fnmsc_d:
-+	fnmsc.d fr14, fr14, fr14
-+	fnmsc.d fr0, fr0, fr0
-+	fnmsc.d fr0, fr14, fr14
-+	fnmsc.d fr14, fr0, fr14
-+	fnmsc.d fr14, fr14, fr0
-+	fnmsc.d fr6, fr8, fr8
-+	fnmsc.d fr8, fr6, fr8
-+	fnmsc.d fr8, fr8, fr6
-+	.global	fmul_d
-+fmul_d:
-+	fmul.d fr14, fr14, fr14
-+	fmul.d fr0, fr0, fr0
-+	fmul.d fr0, fr14, fr14
-+	fmul.d fr14, fr0, fr14
-+	fmul.d fr14, fr14, fr0
-+	fmul.d fr6, fr8, fr8
-+	fmul.d fr8, fr6, fr8
-+	fmul.d fr8, fr8, fr6
-+	.global	fnmul_d
-+fnmul_d:
-+	fnmul.d fr14, fr14, fr14
-+	fnmul.d fr0, fr0, fr0
-+	fnmul.d fr0, fr14, fr14
-+	fnmul.d fr14, fr0, fr14
-+	fnmul.d fr14, fr14, fr0
-+	fnmul.d fr6, fr8, fr8
-+	fnmul.d fr8, fr6, fr8
-+	fnmul.d fr8, fr8, fr6
-+	.global	fneg_d
-+fneg_d:
-+	fneg.d fr14, fr14
-+	fneg.d fr0, fr0
-+	fneg.d fr0, fr14
-+	fneg.d fr14, fr0
-+	fneg.d fr6, fr8
-+	fneg.d fr8, fr6
-+	.global	fabs_d
-+fabs_d:
-+	fabs.d fr14, fr14
-+	fabs.d fr0, fr0
-+	fabs.d fr0, fr14
-+	fabs.d fr14, fr0
-+	fabs.d fr6, fr8
-+	fabs.d fr8, fr6
-+	.global	fcmp_d
-+fcmp_d:
-+	fcmp.d fr14, fr14
-+	fcmp.d fr0, fr0
-+	fcmp.d fr0, fr14
-+	fcmp.d fr14, fr0
-+	fcmp.d fr6, fr8
-+	fcmp.d fr8, fr6
-+	.global fmov_s
-+fmov_s:
-+	fmov.s fr15, fr15
-+	fmov.s fr0, fr0
-+	fmov.s fr15, fr0
-+	fmov.s fr0, fr15
-+	fmov.s fr8, fr7
-+	fmov.s fr7, fr8
-+	fmov.s pc, fr15
-+	fmov.s r0, fr0
-+	fmov.s pc, fr0
-+	fmov.s r0, fr15
-+	fmov.s r8, fr7
-+	fmov.s r7, fr8
-+	fmov.s fr15, pc
-+	fmov.s fr0, r0
-+	fmov.s fr15, r0
-+	fmov.s fr0, pc
-+	fmov.s fr8, r7
-+	fmov.s fr7, r8
-+	.global fmov_d
-+fmov_d:
-+	fmov.d fr14, fr14
-+	fmov.d fr0, fr0
-+	fmov.d fr14, fr0
-+	fmov.d fr0, fr14
-+	fmov.d fr8, fr6
-+	fmov.d fr6, fr8
-+	fmov.d lr, fr14
-+	fmov.d r0, fr0
-+	fmov.d lr, fr0
-+	fmov.d r0, fr14
-+	fmov.d r8, fr6
-+	fmov.d r6, fr8
-+	fmov.d fr14, lr
-+	fmov.d fr0, r0
-+	fmov.d fr14, r0
-+	fmov.d fr0, lr
-+	fmov.d fr8, r6
-+	fmov.d fr6, r8
-+	.global fcasts_d
-+fcasts_d:
-+	fcasts.d fr15, fr14
-+	fcasts.d fr0, fr0
-+	fcasts.d fr15, fr0
-+	fcasts.d fr0, fr14
-+	fcasts.d fr8, fr6
-+	fcasts.d fr7, fr8
-+	.global fcastd_s
-+fcastd_s:
-+	fcastd.s fr14, fr15
-+	fcastd.s fr0, fr0
-+	fcastd.s fr14, fr0
-+	fcastd.s fr0, fr15
-+	fcastd.s fr8, fr7
-+	fcastd.s fr6, fr8
-diff -Nur binutils-2.21.orig/gas/testsuite/gas/avr32/hwrd-lwrd.d binutils-2.21/gas/testsuite/gas/avr32/hwrd-lwrd.d
---- binutils-2.21.orig/gas/testsuite/gas/avr32/hwrd-lwrd.d	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.21/gas/testsuite/gas/avr32/hwrd-lwrd.d	2011-08-28 14:56:21.237983521 +0200
-@@ -0,0 +1,47 @@
-+#as:
-+#objdump: -dr
-+#name: hwrd-lwrd
-+
-+.*: +file format .*
-+
-+Disassembly of section \.text:
-+
-+00000000 <test_hwrd>:
-+   0:	e0 60 87 65 	mov r0,34661
-+   4:	e0 60 12 34 	mov r0,4660
-+   8:	e0 60 00 00 	mov r0,0
-+			8: R_AVR32_HI16	\.text\+0x60
-+   c:	e0 60 00 00 	mov r0,0
-+			c: R_AVR32_HI16	extsym1
-+  10:	ea 10 87 65 	orh r0,0x8765
-+  14:	ea 10 12 34 	orh r0,0x1234
-+  18:	ea 10 00 00 	orh r0,0x0
-+			18: R_AVR32_HI16	\.text\+0x60
-+  1c:	ea 10 00 00 	orh r0,0x0
-+			1c: R_AVR32_HI16	extsym1
-+  20:	e4 10 87 65 	andh r0,0x8765
-+  24:	e4 10 12 34 	andh r0,0x1234
-+  28:	e4 10 00 00 	andh r0,0x0
-+			28: R_AVR32_HI16	\.text\+0x60
-+  2c:	e4 10 00 00 	andh r0,0x0
-+			2c: R_AVR32_HI16	extsym1
-+
-+00000030 <test_lwrd>:
-+  30:	e0 60 43 21 	mov r0,17185
-+  34:	e0 60 56 78 	mov r0,22136
-+  38:	e0 60 00 00 	mov r0,0
-+			38: R_AVR32_LO16	\.text\+0x60
-+  3c:	e0 60 00 00 	mov r0,0
-+			3c: R_AVR32_LO16	extsym1
-+  40:	e8 10 43 21 	orl r0,0x4321
-+  44:	e8 10 56 78 	orl r0,0x5678
-+  48:	e8 10 00 00 	orl r0,0x0
-+			48: R_AVR32_LO16	\.text\+0x60
-+  4c:	e8 10 00 00 	orl r0,0x0
-+			4c: R_AVR32_LO16	extsym1
-+  50:	e0 10 43 21 	andl r0,0x4321
-+  54:	e0 10 56 78 	andl r0,0x5678
-+  58:	e0 10 00 00 	andl r0,0x0
-+			58: R_AVR32_LO16	\.text\+0x60
-+  5c:	e0 10 00 00 	andl r0,0x0
-+			5c: R_AVR32_LO16	extsym1
-diff -Nur binutils-2.21.orig/gas/testsuite/gas/avr32/hwrd-lwrd.s binutils-2.21/gas/testsuite/gas/avr32/hwrd-lwrd.s
---- binutils-2.21.orig/gas/testsuite/gas/avr32/hwrd-lwrd.s	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.21/gas/testsuite/gas/avr32/hwrd-lwrd.s	2011-08-28 14:56:21.287985939 +0200
-@@ -0,0 +1,39 @@
-+
-+        .equ    sym1, 0x12345678
-+
-+        .text
-+        .global test_hwrd
-+test_hwrd:
-+        mov     r0, hi(0x87654321)
-+        mov     r0, hi(sym1)
-+        mov     r0, hi(sym2)
-+        mov     r0, hi(extsym1)
-+
-+        orh	r0, hi(0x87654321)
-+        orh	r0, hi(sym1)
-+        orh	r0, hi(sym2)
-+        orh	r0, hi(extsym1)
-+
-+        andh	r0, hi(0x87654321)
-+        andh	r0, hi(sym1)
-+        andh	r0, hi(sym2)
-+        andh	r0, hi(extsym1)
-+
-+        .global test_lwrd
-+test_lwrd:
-+        mov     r0, lo(0x87654321)
-+        mov     r0, lo(sym1)
-+        mov     r0, lo(sym2)
-+        mov     r0, lo(extsym1)
-+
-+        orl	r0, lo(0x87654321)
-+        orl	r0, lo(sym1)
-+        orl	r0, lo(sym2)
-+        orl	r0, lo(extsym1)
-+
-+        andl	r0, lo(0x87654321)
-+        andl	r0, lo(sym1)
-+        andl	r0, lo(sym2)
-+        andl	r0, lo(extsym1)
-+
-+sym2:
-diff -Nur binutils-2.21.orig/gas/testsuite/gas/avr32/jmptable.d binutils-2.21/gas/testsuite/gas/avr32/jmptable.d
---- binutils-2.21.orig/gas/testsuite/gas/avr32/jmptable.d	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.21/gas/testsuite/gas/avr32/jmptable.d	2011-08-28 14:56:21.337984562 +0200
-@@ -0,0 +1,20 @@
-+#source: jmptable.s
-+#as:
-+#objdump: -dr
-+#name: jmptable
-+
-+.*: +file format .*
-+
-+Disassembly of section \.text:
-+
-+00000000 <jmptable_test>:
-+   0:	fe c8 ff f4 	sub r8,pc,-12
-+   4:	f0 00 00 2f 	add pc,r8,r0<<0x2
-+   8:	d7 03       	nop
-+   a:	00 00       	add r0,r0
-+   c:	c0 38       	rjmp 12 <jmptable_test\+0x12>
-+   e:	c0 38       	rjmp 14 <jmptable_test\+0x14>
-+  10:	c0 38       	rjmp 16 <jmptable_test\+0x16>
-+  12:	d7 03       	nop
-+  14:	d7 03       	nop
-+  16:	d7 03       	nop
-diff -Nur binutils-2.21.orig/gas/testsuite/gas/avr32/jmptable_linkrelax.d binutils-2.21/gas/testsuite/gas/avr32/jmptable_linkrelax.d
---- binutils-2.21.orig/gas/testsuite/gas/avr32/jmptable_linkrelax.d	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.21/gas/testsuite/gas/avr32/jmptable_linkrelax.d	2011-08-28 14:56:21.407984155 +0200
-@@ -0,0 +1,25 @@
-+#source: jmptable.s
-+#as: --linkrelax
-+#objdump: -dr
-+#name: jmptable_linkrelax
-+
-+.*: +file format .*
-+
-+Disassembly of section \.text:
-+
-+00000000 <jmptable_test>:
-+   0:	fe c8 00 00 	sub r8,pc,0
-+			0: R_AVR32_16N_PCREL	\.text\+0xc
-+   4:	f0 00 00 2f 	add pc,r8,r0<<0x2
-+   8:	d7 03       	nop
-+   a:	00 00       	add r0,r0
-+			a: R_AVR32_ALIGN	\*ABS\*\+0x2
-+   c:	c0 08       	rjmp c <jmptable_test\+0xc>
-+			c: R_AVR32_11H_PCREL	\.text\+0x12
-+   e:	c0 08       	rjmp e <jmptable_test\+0xe>
-+			e: R_AVR32_11H_PCREL	\.text\+0x14
-+  10:	c0 08       	rjmp 10 <jmptable_test\+0x10>
-+			10: R_AVR32_11H_PCREL	\.text\+0x16
-+  12:	d7 03       	nop
-+  14:	d7 03       	nop
-+  16:	d7 03       	nop
-diff -Nur binutils-2.21.orig/gas/testsuite/gas/avr32/jmptable.s binutils-2.21/gas/testsuite/gas/avr32/jmptable.s
---- binutils-2.21.orig/gas/testsuite/gas/avr32/jmptable.s	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.21/gas/testsuite/gas/avr32/jmptable.s	2011-08-28 14:56:21.477991202 +0200
-@@ -0,0 +1,14 @@
-+
-+	.text
-+	.global	jmptable_test
-+jmptable_test:
-+	sub	r8, pc, -(.L1 - .)
-+	add	pc, r8, r0 << 2
-+	nop
-+	.align	2
-+.L1:	rjmp	1f
-+	rjmp	2f
-+	rjmp	3f
-+1:	nop
-+2:	nop
-+3:	nop
-diff -Nur binutils-2.21.orig/gas/testsuite/gas/avr32/lda_nopic.d binutils-2.21/gas/testsuite/gas/avr32/lda_nopic.d
---- binutils-2.21.orig/gas/testsuite/gas/avr32/lda_nopic.d	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.21/gas/testsuite/gas/avr32/lda_nopic.d	2011-08-28 14:56:21.517988336 +0200
-@@ -0,0 +1,32 @@
-+#source: lda.s
-+#as:
-+#objdump: -dr
-+#name: lda_nopic
-+
-+.*: +file format .*
-+
-+Disassembly of section \.text:
-+
-+00000000 <lda_test>:
-+       0:	f2 c8 00 00 	sub r8,r9,0
-+
-+00000004 <far_negative>:
-+       4:	f6 ca 00 00 	sub r10,r11,0
-+	...
-+    8000:	fe c0 7f fc 	sub r0,pc,32764
-+    8004:	48 31       	lddpc r1,8010 <far_negative\+0x800c>
-+    8006:	48 42       	lddpc r2,8014 <far_negative\+0x8010>
-+    8008:	48 43       	lddpc r3,8018 <far_negative\+0x8014>
-+    800a:	48 54       	lddpc r4,801c <far_negative\+0x8018>
-+    800c:	fe c5 80 04 	sub r5,pc,-32764
-+	...
-+			8010: R_AVR32_32_CPENT	\.text
-+			8014: R_AVR32_32_CPENT	\.data
-+			8018: R_AVR32_32_CPENT	undefined
-+			801c: R_AVR32_32_CPENT	\.text\+0x1001c
-+
-+00010008 <far_positive>:
-+   10008:	fa cc 00 00 	sub r12,sp,0
-+	...
-+0001001c <toofar_positive>:
-+   1001c:	fe ce 00 00 	sub lr,pc,0
-diff -Nur binutils-2.21.orig/gas/testsuite/gas/avr32/lda_nopic_linkrelax.d binutils-2.21/gas/testsuite/gas/avr32/lda_nopic_linkrelax.d
---- binutils-2.21.orig/gas/testsuite/gas/avr32/lda_nopic_linkrelax.d	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.21/gas/testsuite/gas/avr32/lda_nopic_linkrelax.d	2011-08-28 14:56:21.557985456 +0200
-@@ -0,0 +1,41 @@
-+#source: lda.s
-+#as: --linkrelax
-+#objdump: -dr
-+#name: lda_nopic_linkrelax
-+
-+.*: +file format .*
-+
-+Disassembly of section \.text:
-+
-+00000000 <lda_test>:
-+       0:	f2 c8 00 00 	sub r8,r9,0
-+
-+00000004 <far_negative>:
-+       4:	f6 ca 00 00 	sub r10,r11,0
-+	\.\.\.
-+    8000:	48 00       	lddpc r0,8000 <far_negative\+0x7ffc>
-+			8000: R_AVR32_9W_CP	\.text\+0x800c
-+    8002:	48 01       	lddpc r1,8000 <far_negative\+0x7ffc>
-+			8002: R_AVR32_9W_CP	\.text\+0x8010
-+    8004:	48 02       	lddpc r2,8004 <far_negative\+0x8000>
-+			8004: R_AVR32_9W_CP	\.text\+0x8014
-+    8006:	48 03       	lddpc r3,8004 <far_negative\+0x8000>
-+			8006: R_AVR32_9W_CP	\.text\+0x8018
-+    8008:	48 04       	lddpc r4,8008 <far_negative\+0x8004>
-+			8008: R_AVR32_9W_CP	\.text\+0x801c
-+    800a:	48 05       	lddpc r5,8008 <far_negative\+0x8004>
-+			800a: R_AVR32_9W_CP	\.text\+0x8020
-+	\.\.\.
-+			800c: R_AVR32_ALIGN	\*ABS\*\+0x2
-+			800c: R_AVR32_32_CPENT	\.text\+0x4
-+			8010: R_AVR32_32_CPENT	\.text
-+			8014: R_AVR32_32_CPENT	\.data
-+			8018: R_AVR32_32_CPENT	undefined
-+			801c: R_AVR32_32_CPENT	\.text\+0x10020
-+			8020: R_AVR32_32_CPENT	\.text\+0x1000c
-+
-+0001000c <far_positive>:
-+   1000c:	fa cc 00 00 	sub r12,sp,0
-+	\.\.\.
-+00010020 <toofar_positive>:
-+   10020:	fe ce 00 00 	sub lr,pc,0
-diff -Nur binutils-2.21.orig/gas/testsuite/gas/avr32/lda_pic.d binutils-2.21/gas/testsuite/gas/avr32/lda_pic.d
---- binutils-2.21.orig/gas/testsuite/gas/avr32/lda_pic.d	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.21/gas/testsuite/gas/avr32/lda_pic.d	2011-08-28 14:56:21.597980257 +0200
-@@ -0,0 +1,32 @@
-+#source: lda.s
-+#as: --pic
-+#objdump: -dr
-+#name: lda_pic
-+
-+.*: +file format .*
-+
-+Disassembly of section \.text:
-+
-+00000000 <lda_test>:
-+       0:	f2 c8 00 00 	sub r8,r9,0
-+
-+00000004 <far_negative>:
-+       4:	f6 ca 00 00 	sub r10,r11,0
-+	...
-+    8000:	fe c0 7f fc 	sub r0,pc,32764
-+    8004:	ec f1 00 00 	ld.w r1,r6\[0\]
-+			8004: R_AVR32_GOT16S	toofar_negative
-+    8008:	ec f2 00 00 	ld.w r2,r6\[0\]
-+			8008: R_AVR32_GOT16S	different_section
-+    800c:	ec f3 00 00 	ld.w r3,r6\[0\]
-+			800c: R_AVR32_GOT16S	undefined
-+    8010:	ec f4 00 00 	ld.w r4,r6\[0\]
-+			8010: R_AVR32_GOT16S	toofar_positive
-+    8014:	fe c5 80 14 	sub r5,pc,-32748
-+	...
-+
-+00010000 <far_positive>:
-+   10000:	fa cc 00 00 	sub r12,sp,0
-+	...
-+00010014 <toofar_positive>:
-+   10014:	fe ce 00 00 	sub lr,pc,0
-diff -Nur binutils-2.21.orig/gas/testsuite/gas/avr32/lda_pic_linkrelax.d binutils-2.21/gas/testsuite/gas/avr32/lda_pic_linkrelax.d
---- binutils-2.21.orig/gas/testsuite/gas/avr32/lda_pic_linkrelax.d	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.21/gas/testsuite/gas/avr32/lda_pic_linkrelax.d	2011-08-28 14:56:21.677981137 +0200
-@@ -0,0 +1,40 @@
-+#source: lda.s
-+#as: --pic --linkrelax
-+#objdump: -dr
-+#name: lda_pic_linkrelax
-+
-+.*: +file format .*
-+
-+Disassembly of section \.text:
-+
-+00000000 <lda_test>:
-+       0:	f2 c8 00 00 	sub r8,r9,0
-+
-+00000004 <far_negative>:
-+       4:	f6 ca 00 00 	sub r10,r11,0
-+	...
-+    8000:	e0 60 00 00 	mov r0,0
-+			8000: R_AVR32_LDA_GOT	far_negative
-+    8004:	ec 00 03 20 	ld\.w r0,r6\[r0<<0x2\]
-+    8008:	e0 61 00 00 	mov r1,0
-+			8008: R_AVR32_LDA_GOT	toofar_negative
-+    800c:	ec 01 03 21 	ld\.w r1,r6\[r1<<0x2\]
-+    8010:	e0 62 00 00 	mov r2,0
-+			8010: R_AVR32_LDA_GOT	different_section
-+    8014:	ec 02 03 22 	ld\.w r2,r6\[r2<<0x2\]
-+    8018:	e0 63 00 00 	mov r3,0
-+			8018: R_AVR32_LDA_GOT	undefined
-+    801c:	ec 03 03 23 	ld\.w r3,r6\[r3<<0x2\]
-+    8020:	e0 64 00 00 	mov r4,0
-+			8020: R_AVR32_LDA_GOT	toofar_positive
-+    8024:	ec 04 03 24 	ld\.w r4,r6\[r4<<0x2\]
-+    8028:	e0 65 00 00 	mov r5,0
-+			8028: R_AVR32_LDA_GOT	far_positive
-+    802c:	ec 05 03 25 	ld\.w r5,r6\[r5<<0x2\]
-+	...
-+
-+00010018 <far_positive>:
-+   10018:	fa cc 00 00 	sub r12,sp,0
-+	...
-+0001002c <toofar_positive>:
-+   1002c:	fe ce 00 00 	sub lr,pc,0
-diff -Nur binutils-2.21.orig/gas/testsuite/gas/avr32/lda.s binutils-2.21/gas/testsuite/gas/avr32/lda.s
---- binutils-2.21.orig/gas/testsuite/gas/avr32/lda.s	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.21/gas/testsuite/gas/avr32/lda.s	2011-08-28 14:56:21.727980838 +0200
-@@ -0,0 +1,30 @@
-+
-+	.text
-+	.global lda_test
-+lda_test:
-+toofar_negative:
-+	sub	r8, r9, 0
-+far_negative:
-+	sub	r10, r11, 0
-+
-+	.fill	32760, 1, 0x00
-+
-+	lda.w	r0, far_negative
-+	lda.w	r1, toofar_negative
-+	lda.w	r2, different_section
-+	lda.w	r3, undefined
-+	lda.w	r4, toofar_positive
-+	lda.w	r5, far_positive
-+
-+	.cpool
-+
-+	.fill	32744, 1, 0x00
-+far_positive:
-+	sub	r12, sp, 0
-+	.fill	16, 1, 0x00
-+toofar_positive:
-+	sub	lr, pc, 0
-+
-+	.data
-+different_section:
-+	.long	0x12345678
-diff -Nur binutils-2.21.orig/gas/testsuite/gas/avr32/pcrel.d binutils-2.21/gas/testsuite/gas/avr32/pcrel.d
---- binutils-2.21.orig/gas/testsuite/gas/avr32/pcrel.d	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.21/gas/testsuite/gas/avr32/pcrel.d	2011-08-28 14:56:21.787986178 +0200
-@@ -0,0 +1,64 @@
-+#as:
-+#objdump: -dr
-+#name: pcrel
-+
-+.*: +file format .*
-+
-+Disassembly of section \.text:
-+
-+00000000 <test_rjmp>:
-+   0:	d7 03       	nop
-+   2:	c0 28       	rjmp 6 <test_rjmp\+0x6>
-+   4:	d7 03       	nop
-+   6:	e0 8f 00 00 	bral 6 <test_rjmp\+0x6>
-+			6: R_AVR32_22H_PCREL	extsym10
-+
-+0000000a <test_rcall>:
-+   a:	d7 03       	nop
-+0000000c <test_rcall2>:
-+   c:	c0 2c       	rcall 10 <test_rcall2\+0x4>
-+   e:	d7 03       	nop
-+  10:	e0 a0 00 00 	rcall 10 <test_rcall2\+0x4>
-+			10: R_AVR32_22H_PCREL	extsym21
-+
-+00000014 <test_branch>:
-+  14:	c0 31       	brne 1a <test_branch\+0x6>
-+  16:	e0 8f 00 00 	bral 16 <test_branch\+0x2>
-+			16: R_AVR32_22H_PCREL	test_branch
-+  1a:	e0 80 00 00 	breq 1a <test_branch\+0x6>
-+			1a: R_AVR32_22H_PCREL	extsym21
-+
-+0000001e <test_lddpc>:
-+  1e:	48 30       	lddpc r0,28 <sym1>
-+  20:	48 20       	lddpc r0,28 <sym1>
-+  22:	fe f0 00 00 	ld.w r0,pc\[0\]
-+			22: R_AVR32_16B_PCREL	extsym16
-+	\.\.\.
-+
-+00000028 <sym1>:
-+  28:	d7 03       	nop
-+  2a:	d7 03       	nop
-+
-+0000002c <test_local>:
-+  2c:	48 20       	lddpc r0,34 <test_local\+0x8>
-+  2e:	48 30       	lddpc r0,38 <test_local\+0xc>
-+  30:	48 20       	lddpc r0,38 <test_local\+0xc>
-+  32:	00 00       	add r0,r0
-+  34:	d7 03       	nop
-+  36:	d7 03       	nop
-+  38:	d7 03       	nop
-+  3a:	d7 03       	nop
-+
-+Disassembly of section \.text\.init:
-+
-+00000000 <test_inter_section>:
-+   0:	e0 a0 .. .. 	rcall [0-9a-f]+ <.*>
-+			0: R_AVR32_22H_PCREL	test_rcall
-+   4:	d7 03       	nop
-+   6:	e0 a0 .. .. 	rcall [0-9a-f]+ <.*>
-+			6: R_AVR32_22H_PCREL	test_rcall
-+   a:	e0 a0 .. .. 	rcall [0-9a-z]+ <.*>
-+			a: R_AVR32_22H_PCREL	\.text\+0xc
-+   e:	d7 03       	nop
-+  10:	e0 a0 .. .. 	rcall [0-9a-f]+ <.*>
-+			10: R_AVR32_22H_PCREL	\.text\+0xc
-diff -Nur binutils-2.21.orig/gas/testsuite/gas/avr32/pcrel.s binutils-2.21/gas/testsuite/gas/avr32/pcrel.s
---- binutils-2.21.orig/gas/testsuite/gas/avr32/pcrel.s	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.21/gas/testsuite/gas/avr32/pcrel.s	2011-08-28 14:56:21.837986264 +0200
-@@ -0,0 +1,57 @@
-+
-+        .text
-+        .global test_rjmp
-+test_rjmp:
-+        nop
-+        rjmp    0f
-+        nop
-+0:      rjmp    extsym10
-+
-+        .global test_rcall
-+test_rcall:
-+        nop
-+test_rcall2:
-+        rcall   0f
-+        nop
-+0:      rcall   extsym21
-+
-+        .global test_branch
-+test_branch:
-+        brne    0f
-+	/* This will generate a reloc since test_branch is global */
-+        bral    test_branch
-+0:	breq    extsym21
-+
-+        .global test_lddpc
-+test_lddpc:
-+        lddpc   r0,sym1
-+        lddpc   r0,sym1
-+        lddpc   r0,extsym16
-+
-+        .align	2
-+sym1:   nop
-+        nop
-+
-+	.global	test_local
-+test_local:
-+	lddpc	r0, .LC1
-+	lddpc	r0, .LC2
-+	lddpc	r0, .LC1 + 0x4
-+
-+	.align	2
-+.LC1:
-+	nop
-+	nop
-+.LC2:
-+	nop
-+	nop
-+
-+	.section .text.init,"ax"
-+	.global test_inter_section
-+test_inter_section:
-+	rcall	test_rcall
-+	nop
-+	rcall	test_rcall
-+	rcall	test_rcall2
-+	nop
-+	rcall	test_rcall2
-diff -Nur binutils-2.21.orig/gas/testsuite/gas/avr32/pico.d binutils-2.21/gas/testsuite/gas/avr32/pico.d
---- binutils-2.21.orig/gas/testsuite/gas/avr32/pico.d	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.21/gas/testsuite/gas/avr32/pico.d	2011-08-28 14:56:21.927980820 +0200
-@@ -0,0 +1,149 @@
-+#as:
-+#objdump: -dr
-+#name: pico
-+
-+.*: +file format .*
-+
-+Disassembly of section \.text:
-+
-+[0-9a-f]* <picosvmac>:
-+ *[0-9a-f]*:	e1 a6 20 00 	cop cp1,cr0,cr0,cr0,0xc
-+ *[0-9a-f]*:	e1 a7 2b bb 	cop cp1,cr11,cr11,cr11,0xe
-+ *[0-9a-f]*:	e1 a6 3a 05 	cop cp1,cr10,cr0,cr5,0xd
-+ *[0-9a-f]*:	e1 a7 36 90 	cop cp1,cr6,cr9,cr0,0xf
-+
-+[0-9a-f]* <picosvmul>:
-+ *[0-9a-f]*:	e1 a4 20 00 	cop cp1,cr0,cr0,cr0,0x8
-+ *[0-9a-f]*:	e1 a5 2b bb 	cop cp1,cr11,cr11,cr11,0xa
-+ *[0-9a-f]*:	e1 a4 3a 05 	cop cp1,cr10,cr0,cr5,0x9
-+ *[0-9a-f]*:	e1 a5 36 90 	cop cp1,cr6,cr9,cr0,0xb
-+
-+[0-9a-f]* <picovmac>:
-+ *[0-9a-f]*:	e1 a2 20 00 	cop cp1,cr0,cr0,cr0,0x4
-+ *[0-9a-f]*:	e1 a3 2b bb 	cop cp1,cr11,cr11,cr11,0x6
-+ *[0-9a-f]*:	e1 a2 3a 05 	cop cp1,cr10,cr0,cr5,0x5
-+ *[0-9a-f]*:	e1 a3 36 90 	cop cp1,cr6,cr9,cr0,0x7
-+
-+[0-9a-f]* <picovmul>:
-+ *[0-9a-f]*:	e1 a0 20 00 	cop cp1,cr0,cr0,cr0,0x0
-+ *[0-9a-f]*:	e1 a1 2b bb 	cop cp1,cr11,cr11,cr11,0x2
-+ *[0-9a-f]*:	e1 a0 3a 05 	cop cp1,cr10,cr0,cr5,0x1
-+ *[0-9a-f]*:	e1 a1 36 90 	cop cp1,cr6,cr9,cr0,0x3
-+
-+[0-9a-f]* <picold_d>:
-+ *[0-9a-f]*:	e9 af 3e ff 	ldc\.d cp1,cr14,pc\[0x3fc\]
-+ *[0-9a-f]*:	e9 a0 30 ff 	ldc\.d cp1,cr0,r0\[0x3fc\]
-+ *[0-9a-f]*:	e9 a0 30 00 	ldc\.d cp1,cr0,r0\[0x0\]
-+ *[0-9a-f]*:	ef a8 26 50 	ldc\.d cp1,cr6,--r8
-+ *[0-9a-f]*:	ef a7 28 50 	ldc\.d cp1,cr8,--r7
-+ *[0-9a-f]*:	ef aa 32 65 	ldc\.d cp1,cr2,r10\[r5<<0x2\]
-+ *[0-9a-f]*:	ef a3 3c 46 	ldc\.d cp1,cr12,r3\[r6\]
-+
-+[0-9a-f]* <picold_w>:
-+ *[0-9a-f]*:	e9 af 2f ff 	ldc\.w cp1,cr15,pc\[0x3fc\]
-+ *[0-9a-f]*:	e9 a0 20 ff 	ldc\.w cp1,cr0,r0\[0x3fc\]
-+ *[0-9a-f]*:	e9 a0 20 00 	ldc\.w cp1,cr0,r0\[0x0\]
-+ *[0-9a-f]*:	ef a8 27 40 	ldc\.w cp1,cr7,--r8
-+ *[0-9a-f]*:	ef a7 28 40 	ldc\.w cp1,cr8,--r7
-+ *[0-9a-f]*:	ef aa 31 25 	ldc\.w cp1,cr1,r10\[r5<<0x2\]
-+ *[0-9a-f]*:	ef a3 3d 06 	ldc\.w cp1,cr13,r3\[r6\]
-+
-+[0-9a-f]* <picoldm_d>:
-+ *[0-9a-f]*:	ed af 24 ff 	ldcm\.d cp1,pc,cr0-cr15
-+ *[0-9a-f]*:	ed a0 24 01 	ldcm\.d cp1,r0,cr0-cr1
-+ *[0-9a-f]*:	ed a7 24 80 	ldcm\.d cp1,r7,cr14-cr15
-+ *[0-9a-f]*:	ed a8 24 7f 	ldcm\.d cp1,r8,cr0-cr13
-+
-+[0-9a-f]* <picoldm_d_pu>:
-+ *[0-9a-f]*:	ed af 34 ff 	ldcm\.d cp1,pc\+\+,cr0-cr15
-+ *[0-9a-f]*:	ed a0 34 01 	ldcm\.d cp1,r0\+\+,cr0-cr1
-+ *[0-9a-f]*:	ed a7 34 80 	ldcm\.d cp1,r7\+\+,cr14-cr15
-+ *[0-9a-f]*:	ed a8 34 7f 	ldcm\.d cp1,r8\+\+,cr0-cr13
-+
-+[0-9a-f]* <picoldm_w>:
-+ *[0-9a-f]*:	ed af 20 ff 	ldcm\.w cp1,pc,cr0-cr7
-+ *[0-9a-f]*:	ed a0 20 01 	ldcm\.w cp1,r0,cr0
-+ *[0-9a-f]*:	ed a7 20 80 	ldcm\.w cp1,r7,cr7
-+ *[0-9a-f]*:	ed a8 20 7f 	ldcm\.w cp1,r8,cr0-cr6
-+ *[0-9a-f]*:	ed af 21 ff 	ldcm\.w cp1,pc,cr8-cr15
-+ *[0-9a-f]*:	ed a0 21 01 	ldcm\.w cp1,r0,cr8
-+ *[0-9a-f]*:	ed a7 21 80 	ldcm\.w cp1,r7,cr15
-+ *[0-9a-f]*:	ed a8 21 7f 	ldcm\.w cp1,r8,cr8-cr14
-+
-+[0-9a-f]* <picoldm_w_pu>:
-+ *[0-9a-f]*:	ed af 30 ff 	ldcm\.w cp1,pc\+\+,cr0-cr7
-+ *[0-9a-f]*:	ed a0 30 01 	ldcm\.w cp1,r0\+\+,cr0
-+ *[0-9a-f]*:	ed a7 30 80 	ldcm\.w cp1,r7\+\+,cr7
-+ *[0-9a-f]*:	ed a8 30 7f 	ldcm\.w cp1,r8\+\+,cr0-cr6
-+ *[0-9a-f]*:	ed af 31 ff 	ldcm\.w cp1,pc\+\+,cr8-cr15
-+ *[0-9a-f]*:	ed a0 31 01 	ldcm\.w cp1,r0\+\+,cr8
-+ *[0-9a-f]*:	ed a7 31 80 	ldcm\.w cp1,r7\+\+,cr15
-+ *[0-9a-f]*:	ed a8 31 7f 	ldcm\.w cp1,r8\+\+,cr8-cr14
-+
-+[0-9a-f]* <picomv_d>:
-+ *[0-9a-f]*:	ef ae 2e 30 	mvrc\.d cp1,cr14,lr
-+ *[0-9a-f]*:	ef a0 20 30 	mvrc\.d cp1,cr0,r0
-+ *[0-9a-f]*:	ef a8 26 30 	mvrc\.d cp1,cr6,r8
-+ *[0-9a-f]*:	ef a6 28 30 	mvrc\.d cp1,cr8,r6
-+ *[0-9a-f]*:	ef ae 2e 10 	mvcr\.d cp1,lr,cr14
-+ *[0-9a-f]*:	ef a0 20 10 	mvcr\.d cp1,r0,cr0
-+ *[0-9a-f]*:	ef a8 26 10 	mvcr\.d cp1,r8,cr6
-+ *[0-9a-f]*:	ef a6 28 10 	mvcr\.d cp1,r6,cr8
-+
-+[0-9a-f]* <picomv_w>:
-+ *[0-9a-f]*:	ef af 2f 20 	mvrc\.w cp1,cr15,pc
-+ *[0-9a-f]*:	ef a0 20 20 	mvrc\.w cp1,cr0,r0
-+ *[0-9a-f]*:	ef a8 27 20 	mvrc\.w cp1,cr7,r8
-+ *[0-9a-f]*:	ef a7 28 20 	mvrc\.w cp1,cr8,r7
-+ *[0-9a-f]*:	ef af 2f 00 	mvcr\.w cp1,pc,cr15
-+ *[0-9a-f]*:	ef a0 20 00 	mvcr\.w cp1,r0,cr0
-+ *[0-9a-f]*:	ef a8 27 00 	mvcr\.w cp1,r8,cr7
-+ *[0-9a-f]*:	ef a7 28 00 	mvcr\.w cp1,r7,cr8
-+
-+[0-9a-f]* <picost_d>:
-+ *[0-9a-f]*:	eb af 3e ff 	stc\.d cp1,pc\[0x3fc\],cr14
-+ *[0-9a-f]*:	eb a0 30 00 	stc\.d cp1,r0\[0x0\],cr0
-+ *[0-9a-f]*:	ef a8 26 70 	stc\.d cp1,r8\+\+,cr6
-+ *[0-9a-f]*:	ef a7 28 70 	stc\.d cp1,r7\+\+,cr8
-+ *[0-9a-f]*:	ef aa 32 e5 	stc\.d cp1,r10\[r5<<0x2\],cr2
-+ *[0-9a-f]*:	ef a3 3c c6 	stc\.d cp1,r3\[r6\],cr12
-+
-+[0-9a-f]* <picost_w>:
-+ *[0-9a-f]*:	eb af 2f ff 	stc\.w cp1,pc\[0x3fc\],cr15
-+ *[0-9a-f]*:	eb a0 20 00 	stc\.w cp1,r0\[0x0\],cr0
-+ *[0-9a-f]*:	ef a8 27 60 	stc\.w cp1,r8\+\+,cr7
-+ *[0-9a-f]*:	ef a7 28 60 	stc\.w cp1,r7\+\+,cr8
-+ *[0-9a-f]*:	ef aa 31 a5 	stc\.w cp1,r10\[r5<<0x2\],cr1
-+ *[0-9a-f]*:	ef a3 3d 86 	stc\.w cp1,r3\[r6\],cr13
-+
-+[0-9a-f]* <picostm_d>:
-+ *[0-9a-f]*:	ed af 25 ff 	stcm\.d cp1,pc,cr0-cr15
-+ *[0-9a-f]*:	ed a0 25 01 	stcm\.d cp1,r0,cr0-cr1
-+ *[0-9a-f]*:	ed a7 25 80 	stcm\.d cp1,r7,cr14-cr15
-+ *[0-9a-f]*:	ed a8 25 7f 	stcm\.d cp1,r8,cr0-cr13
-+
-+[0-9a-f]* <picostm_d_pu>:
-+ *[0-9a-f]*:	ed af 35 ff 	stcm\.d cp1,--pc,cr0-cr15
-+ *[0-9a-f]*:	ed a0 35 01 	stcm\.d cp1,--r0,cr0-cr1
-+ *[0-9a-f]*:	ed a7 35 80 	stcm\.d cp1,--r7,cr14-cr15
-+ *[0-9a-f]*:	ed a8 35 7f 	stcm\.d cp1,--r8,cr0-cr13
-+
-+[0-9a-f]* <picostm_w>:
-+ *[0-9a-f]*:	ed af 22 ff 	stcm\.w cp1,pc,cr0-cr7
-+ *[0-9a-f]*:	ed a0 22 01 	stcm\.w cp1,r0,cr0
-+ *[0-9a-f]*:	ed a7 22 80 	stcm\.w cp1,r7,cr7
-+ *[0-9a-f]*:	ed a8 22 7f 	stcm\.w cp1,r8,cr0-cr6
-+ *[0-9a-f]*:	ed af 23 ff 	stcm\.w cp1,pc,cr8-cr15
-+ *[0-9a-f]*:	ed a0 23 01 	stcm\.w cp1,r0,cr8
-+ *[0-9a-f]*:	ed a7 23 80 	stcm\.w cp1,r7,cr15
-+ *[0-9a-f]*:	ed a8 23 7f 	stcm\.w cp1,r8,cr8-cr14
-+
-+[0-9a-f]* <picostm_w_pu>:
-+ *[0-9a-f]*:	ed af 32 ff 	stcm\.w cp1,--pc,cr0-cr7
-+ *[0-9a-f]*:	ed a0 32 01 	stcm\.w cp1,--r0,cr0
-+ *[0-9a-f]*:	ed a7 32 80 	stcm\.w cp1,--r7,cr7
-+ *[0-9a-f]*:	ed a8 32 7f 	stcm\.w cp1,--r8,cr0-cr6
-+ *[0-9a-f]*:	ed af 33 ff 	stcm\.w cp1,--pc,cr8-cr15
-+ *[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 -Nur binutils-2.21.orig/gas/testsuite/gas/avr32/pico.s binutils-2.21/gas/testsuite/gas/avr32/pico.s
---- binutils-2.21.orig/gas/testsuite/gas/avr32/pico.s	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.21/gas/testsuite/gas/avr32/pico.s	2011-08-28 14:56:21.957982652 +0200
-@@ -0,0 +1,144 @@
-+
-+	.text
-+	.global	picosvmac
-+picosvmac:
-+	picosvmac	out0, in0, in0, in0
-+	picosvmac	out2, in11, in11, in11
-+	picosvmac	out1, in10, in0, in5
-+	picosvmac	out3, in6, in9, in0
-+	.global picosvmul
-+picosvmul:
-+	picosvmul	out0, in0, in0, in0
-+	picosvmul	out2, in11, in11, in11
-+	picosvmul	out1, in10, in0, in5
-+	picosvmul	out3, in6, in9, in0
-+	.global picovmac
-+picovmac:
-+	picovmac	out0, in0, in0, in0
-+	picovmac	out2, in11, in11, in11
-+	picovmac	out1, in10, in0, in5
-+	picovmac	out3, in6, in9, in0
-+	.global picovmul
-+picovmul:
-+	picovmul	out0, in0, in0, in0
-+	picovmul	out2, in11, in11, in11
-+	picovmul	out1, in10, in0, in5
-+	picovmul	out3, in6, in9, in0
-+	.global	picold_d
-+picold_d:
-+	picold.d	vmu2_out, pc[1020]
-+	picold.d	inpix2, r0[1020]
-+	picold.d	inpix2, r0[0]
-+	picold.d	coeff0_a, --r8
-+	picold.d	coeff1_a, --r7
-+	picold.d	inpix0, r10[r5 << 2]
-+	picold.d	vmu0_out, r3[r6 << 0]
-+	.global	picold_w
-+picold_w:	
-+	picold.w	config, pc[1020]
-+	picold.w	inpix2, r0[1020]
-+	picold.w	inpix2, r0[0]
-+	picold.w	coeff0_b, --r8
-+	picold.w	coeff1_a, --r7
-+	picold.w	inpix1, r10[r5 << 2]
-+	picold.w	vmu1_out, r3[r6 << 0]
-+	.global	picoldm_d
-+picoldm_d:
-+	picoldm.d	pc, inpix2-config
-+	picoldm.d	r0, inpix2, inpix1
-+	picoldm.d	r7, vmu2_out, config
-+	picoldm.d	r8, inpix2-vmu1_out
-+	.global	picoldm_d_pu
-+picoldm_d_pu:
-+	picoldm.d	pc++, inpix2, inpix1, inpix0, outpix2, outpix1, outpix0, coeff0_a, coeff0_b, coeff1_a, coeff1_b, coeff2_a, coeff2_b, vmu0_out, vmu1_out, vmu2_out, config
-+	picoldm.d	r0++, inpix2, inpix1
-+	picoldm.d	r7++, vmu2_out, config
-+	picoldm.d	r8++, inpix2, inpix1, inpix0, outpix2, outpix1, outpix0, coeff0_a, coeff0_b, coeff1_a, coeff1_b, coeff2_a, coeff2_b, vmu0_out, vmu1_out
-+	.global	picoldm_w
-+picoldm_w:
-+	picoldm.w	pc, inpix2-coeff0_b
-+	picoldm.w	r0, inpix2
-+	picoldm.w	r7, coeff0_b
-+	picoldm.w	r8, inpix2-coeff0_a
-+	picoldm.w	pc, coeff1_a-config
-+	picoldm.w	r0, coeff1_a
-+	picoldm.w	r7, config
-+	picoldm.w	r8, coeff1_a-vmu2_out
-+	.global	picoldm_w_pu
-+picoldm_w_pu:
-+	picoldm.w	pc++, inpix2-coeff0_b
-+	picoldm.w	r0++, inpix2
-+	picoldm.w	r7++, coeff0_b
-+	picoldm.w	r8++, inpix2-coeff0_a
-+	picoldm.w	pc++, coeff1_a-config
-+	picoldm.w	r0++, coeff1_a
-+	picoldm.w	r7++, config
-+	picoldm.w	r8++, coeff1_a-vmu2_out
-+	.global	picomv_d
-+picomv_d:
-+	picomv.d	vmu2_out, lr
-+	picomv.d	inpix2, r0
-+	picomv.d	coeff0_a, r8
-+	picomv.d	coeff1_a, r6
-+	picomv.d	pc, vmu2_out
-+	picomv.d	r0, inpix2
-+	picomv.d	r8, coeff0_a
-+	picomv.d	r6, coeff1_a
-+	.global	picomv_w
-+picomv_w:
-+	picomv.w	config, pc
-+	picomv.w	inpix2, r0
-+	picomv.w	coeff0_b, r8
-+	picomv.w	coeff1_a, r7
-+	picomv.w	pc, config
-+	picomv.w	r0, inpix2
-+	picomv.w	r8, coeff0_b
-+	picomv.w	r7, coeff1_a
-+	.global	picost_d
-+picost_d:
-+	picost.d	pc[1020], vmu2_out
-+	picost.d	r0[0], inpix2
-+	picost.d	r8++, coeff0_a
-+	picost.d	r7++, coeff1_a
-+	picost.d	r10[r5 << 2], inpix0
-+	picost.d	r3[r6 << 0], vmu0_out
-+	.global	picost_w
-+picost_w:	
-+	picost.w	pc[1020], config
-+	picost.w	r0[0], inpix2
-+	picost.w	r8++, coeff0_b
-+	picost.w	r7++, coeff1_a
-+	picost.w	r10[r5 << 2], inpix1
-+	picost.w	r3[r6 << 0], vmu1_out
-+	.global	picostm_d
-+picostm_d:
-+	picostm.d	pc, inpix2-config
-+	picostm.d	r0, inpix2, inpix1
-+	picostm.d	r7, vmu2_out, config
-+	picostm.d	r8, inpix2-vmu1_out
-+	.global	picostm_d_pu
-+picostm_d_pu:
-+	picostm.d	--pc, inpix2, inpix1, inpix0, outpix2, outpix1, outpix0, coeff0_a, coeff0_b, coeff1_a, coeff1_b, coeff2_a, coeff2_b, vmu0_out, vmu1_out, vmu2_out, config
-+	picostm.d	--r0, inpix2, inpix1
-+	picostm.d	--r7, vmu2_out, config
-+	picostm.d	--r8, inpix2, inpix1, inpix0, outpix2, outpix1, outpix0, coeff0_a, coeff0_b, coeff1_a, coeff1_b, coeff2_a, coeff2_b, vmu0_out, vmu1_out
-+	.global	picostm_w
-+picostm_w:
-+	picostm.w	pc, inpix2-coeff0_b
-+	picostm.w	r0, inpix2
-+	picostm.w	r7, coeff0_b
-+	picostm.w	r8, inpix2-coeff0_a
-+	picostm.w	pc, coeff1_a-config
-+	picostm.w	r0, coeff1_a
-+	picostm.w	r7, config
-+	picostm.w	r8, coeff1_a-vmu2_out
-+	.global	picostm_w_pu
-+picostm_w_pu:
-+	picostm.w	--pc, inpix2-coeff0_b
-+	picostm.w	--r0, inpix2
-+	picostm.w	--r7, coeff0_b
-+	picostm.w	--r8, inpix2-coeff0_a
-+	picostm.w	--pc, coeff1_a-config
-+	picostm.w	--r0, coeff1_a
-+	picostm.w	--r7, config
-+	picostm.w	--r8, coeff1_a-vmu2_out
-diff -Nur binutils-2.21.orig/gas/testsuite/gas/avr32/pic_reloc.d binutils-2.21/gas/testsuite/gas/avr32/pic_reloc.d
---- binutils-2.21.orig/gas/testsuite/gas/avr32/pic_reloc.d	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.21/gas/testsuite/gas/avr32/pic_reloc.d	2011-08-28 14:56:22.017991469 +0200
-@@ -0,0 +1,27 @@
-+#as:
-+#objdump: -dr
-+#name: pic_reloc
-+
-+.*: +file format .*
-+
-+Disassembly of section \.text:
-+
-+00000000 <mcall_got>:
-+   0:	f0 16 00 00 	mcall r6\[0\]
-+			0: R_AVR32_GOT18SW	extfunc
-+   4:	f0 16 00 00 	mcall r6\[0\]
-+			4: R_AVR32_GOT18SW	\.L1
-+   8:	f0 16 00 00 	mcall r6\[0\]
-+			8: R_AVR32_GOT18SW	\.L2
-+   c:	f0 16 00 00 	mcall r6\[0\]
-+			c: R_AVR32_GOT18SW	mcall_got
-+
-+00000010 <ldw_got>:
-+  10:	ec f0 00 00 	ld.w r0,r6\[0\]
-+			10: R_AVR32_GOT16S	extvar
-+  14:	ec f0 00 00 	ld.w r0,r6\[0\]
-+			14: R_AVR32_GOT16S	\.L3
-+  18:	ec f0 00 00 	ld.w r0,r6\[0\]
-+			18: R_AVR32_GOT16S	\.L4
-+  1c:	ec f0 00 00 	ld.w r0,r6\[0\]
-+			1c: R_AVR32_GOT16S	ldw_got
-diff -Nur binutils-2.21.orig/gas/testsuite/gas/avr32/pic_reloc.s binutils-2.21/gas/testsuite/gas/avr32/pic_reloc.s
---- binutils-2.21.orig/gas/testsuite/gas/avr32/pic_reloc.s	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.21/gas/testsuite/gas/avr32/pic_reloc.s	2011-08-28 14:56:22.057980163 +0200
-@@ -0,0 +1,18 @@
-+
-+	.text
-+	.global	mcall_got
-+mcall_got:
-+.L1:
-+	mcall	r6[extfunc@got]
-+	mcall	r6[.L1@got]
-+	mcall	r6[.L2@got]
-+	mcall	r6[mcall_got@got]
-+.L2:
-+
-+	.global	ldw_got
-+ldw_got:
-+.L3:	ld.w	r0,r6[extvar@got]
-+	ld.w	r0,r6[.L3@got]
-+	ld.w	r0,r6[.L4@got]
-+	ld.w	r0,r6[ldw_got@got]
-+.L4:
-diff -Nur binutils-2.21.orig/gas/testsuite/gas/avr32/symdiff.d binutils-2.21/gas/testsuite/gas/avr32/symdiff.d
---- binutils-2.21.orig/gas/testsuite/gas/avr32/symdiff.d	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.21/gas/testsuite/gas/avr32/symdiff.d	2011-08-28 14:56:22.097986770 +0200
-@@ -0,0 +1,24 @@
-+#source: symdiff.s
-+#as:
-+#objdump: -dr
-+#name: symdiff
-+
-+.*: +file format .*
-+
-+Disassembly of section \.text:
-+
-+00000000 <diff32>:
-+   0:	00 00       	add r0,r0
-+   2:	00 04       	add r4,r0
-+
-+00000004 <diff16>:
-+   4:	00 04       	add r4,r0
-+
-+00000006 <diff8>:
-+   6:	04 00       	add r0,r2
-+
-+00000008 <symdiff_test>:
-+   8:	d7 03       	nop
-+   a:	d7 03       	nop
-+   c:	d7 03       	nop
-+   e:	d7 03       	nop
-diff -Nur binutils-2.21.orig/gas/testsuite/gas/avr32/symdiff_linkrelax.d binutils-2.21/gas/testsuite/gas/avr32/symdiff_linkrelax.d
---- binutils-2.21.orig/gas/testsuite/gas/avr32/symdiff_linkrelax.d	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.21/gas/testsuite/gas/avr32/symdiff_linkrelax.d	2011-08-28 14:56:22.137987090 +0200
-@@ -0,0 +1,28 @@
-+#source: symdiff.s
-+#as: --linkrelax
-+#objdump: -dr
-+#name: symdiff_linkrelax
-+
-+.*: +file format .*
-+
-+Disassembly of section \.text:
-+
-+00000000 <diff32>:
-+   0:	00 00       	add r0,r0
-+			0: R_AVR32_DIFF32	\.text\+0xa
-+   2:	00 04       	add r4,r0
-+
-+00000004 <diff16>:
-+   4:	00 04       	add r4,r0
-+			4: R_AVR32_DIFF16	\.text\+0xa
-+
-+00000006 <diff8>:
-+   6:	04 00       	add r0,r2
-+			6: R_AVR32_DIFF8	\.text\+0xa
-+			7: R_AVR32_ALIGN	\*ABS\*\+0x1
-+
-+00000008 <symdiff_test>:
-+   8:	d7 03       	nop
-+   a:	d7 03       	nop
-+   c:	d7 03       	nop
-+   e:	d7 03       	nop
-diff -Nur binutils-2.21.orig/gas/testsuite/gas/avr32/symdiff.s binutils-2.21/gas/testsuite/gas/avr32/symdiff.s
---- binutils-2.21.orig/gas/testsuite/gas/avr32/symdiff.s	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.21/gas/testsuite/gas/avr32/symdiff.s	2011-08-28 14:56:22.217991432 +0200
-@@ -0,0 +1,19 @@
-+
-+	.text
-+	.global	diff32
-+diff32:
-+	.long	.L2 - .L1
-+	.global	diff16
-+diff16:
-+	.short	.L2 - .L1
-+	.global	diff8
-+diff8:
-+	.byte	.L2 - .L1
-+
-+	.global	symdiff_test
-+	.align	1
-+symdiff_test:
-+	nop
-+.L1:	nop
-+	nop
-+.L2:	nop
-diff -Nur binutils-2.21.orig/gas/write.c binutils-2.21/gas/write.c
---- binutils-2.21.orig/gas/write.c	2010-10-29 14:10:34.000000000 +0200
-+++ binutils-2.21/gas/write.c	2011-08-28 14:56:22.227982829 +0200
-@@ -2221,6 +2221,10 @@
- 
- #endif /* defined (TC_GENERIC_RELAX_TABLE)  */
- 
-+#ifdef TC_RELAX_ALIGN
-+#define RELAX_ALIGN(SEG, FRAG, ADDR) TC_RELAX_ALIGN(SEG, FRAG, ADDR)
-+#else
-+#define RELAX_ALIGN(SEG, FRAG, ADDR) relax_align(ADDR, (FRAG)->fr_offset)
- /* Relax_align. Advance location counter to next address that has 'alignment'
-    lowest order bits all 0s, return size of adjustment made.  */
- static relax_addressT
-@@ -2240,6 +2244,7 @@
- #endif
-   return (new_address - address);
- }
-+#endif
- 
- /* Now we have a segment, not a crowd of sub-segments, we can make
-    fr_address values.
-@@ -2286,7 +2291,7 @@
- 	case rs_align_code:
- 	case rs_align_test:
- 	  {
--	    addressT offset = relax_align (address, (int) fragP->fr_offset);
-+	    addressT offset = RELAX_ALIGN(segment, fragP, address);
- 
- 	    if (fragP->fr_subtype != 0 && offset > fragP->fr_subtype)
- 	      offset = 0;
-@@ -2497,10 +2502,10 @@
- 		{
- 		  addressT oldoff, newoff;
- 
--		  oldoff = relax_align (was_address + fragP->fr_fix,
--					(int) offset);
--		  newoff = relax_align (address + fragP->fr_fix,
--					(int) offset);
-+		  oldoff = RELAX_ALIGN (segment, fragP,
-+					was_address + fragP->fr_fix);
-+		  newoff = RELAX_ALIGN (segment, fragP,
-+					address + fragP->fr_fix);
- 
- 		  if (fragP->fr_subtype != 0)
- 		    {
-diff -Nur binutils-2.21.orig/include/dis-asm.h binutils-2.21/include/dis-asm.h
---- binutils-2.21.orig/include/dis-asm.h	2010-06-29 06:17:27.000000000 +0200
-+++ binutils-2.21/include/dis-asm.h	2011-08-28 14:56:22.277986557 +0200
-@@ -222,6 +222,7 @@
- 
- extern int print_insn_alpha		(bfd_vma, disassemble_info *);
- extern int print_insn_avr		(bfd_vma, disassemble_info *);
-+extern int print_insn_avr32		(bfd_vma, disassemble_info *);
- extern int print_insn_bfin		(bfd_vma, disassemble_info *);
- extern int print_insn_big_arm		(bfd_vma, disassemble_info *);
- extern int print_insn_big_mips		(bfd_vma, disassemble_info *);
-@@ -304,7 +305,9 @@
- extern void print_mips_disassembler_options (FILE *);
- extern void print_ppc_disassembler_options (FILE *);
- extern void print_arm_disassembler_options (FILE *);
-+extern void print_avr32_disassembler_options (FILE *);
- extern void parse_arm_disassembler_option (char *);
-+extern void parse_avr32_disassembler_option (char *);
- extern void print_s390_disassembler_options (FILE *);
- extern int  get_arm_regname_num_options (void);
- extern int  set_arm_regname_option (int);
-diff -Nur binutils-2.21.orig/include/elf/avr32.h binutils-2.21/include/elf/avr32.h
---- binutils-2.21.orig/include/elf/avr32.h	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.21/include/elf/avr32.h	2011-08-28 14:56:22.347981920 +0200
-@@ -0,0 +1,98 @@
-+/* AVR32 ELF support for BFD.
-+   Copyright 2003,2004,2005,2006,2007,2008,2009 Atmel Corporation.
-+
-+   Written by Haavard Skinnemoen, Atmel Norway, <hskinnemoen@atmel.com>
-+
-+   This file is part of BFD, the Binary File Descriptor library.
-+
-+   This program is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU General Public License as
-+   published by the Free Software Foundation; either version 2 of the
-+   License, or (at your option) any later version.
-+
-+   This program is distributed in the hope that it will be useful, but
-+   WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   General Public License for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with this program; if not, write to the Free Software
-+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+   02111-1307, USA.  */
-+
-+#include "elf/reloc-macros.h"
-+
-+/* CPU-specific flags for the ELF header e_flags field */
-+#define EF_AVR32_LINKRELAX		0x01
-+#define EF_AVR32_PIC			0x02
-+
-+START_RELOC_NUMBERS (elf_avr32_reloc_type)
-+    RELOC_NUMBER (R_AVR32_NONE,			0)
-+
-+    /* Data Relocations */
-+    RELOC_NUMBER (R_AVR32_32,			1)
-+    RELOC_NUMBER (R_AVR32_16,			2)
-+    RELOC_NUMBER (R_AVR32_8,			3)
-+    RELOC_NUMBER (R_AVR32_32_PCREL,		4)
-+    RELOC_NUMBER (R_AVR32_16_PCREL,		5)
-+    RELOC_NUMBER (R_AVR32_8_PCREL,		6)
-+    RELOC_NUMBER (R_AVR32_DIFF32,		7)
-+    RELOC_NUMBER (R_AVR32_DIFF16,		8)
-+    RELOC_NUMBER (R_AVR32_DIFF8,		9)
-+    RELOC_NUMBER (R_AVR32_GOT32,		10)
-+    RELOC_NUMBER (R_AVR32_GOT16,		11)
-+    RELOC_NUMBER (R_AVR32_GOT8,			12)
-+
-+    /* Normal Code Relocations */
-+    RELOC_NUMBER (R_AVR32_21S,			13)
-+    RELOC_NUMBER (R_AVR32_16U,			14)
-+    RELOC_NUMBER (R_AVR32_16S,			15)
-+    RELOC_NUMBER (R_AVR32_8S,			16)
-+    RELOC_NUMBER (R_AVR32_8S_EXT,		17)
-+
-+    /* PC-Relative Code Relocations */
-+    RELOC_NUMBER (R_AVR32_22H_PCREL,		18)
-+    RELOC_NUMBER (R_AVR32_18W_PCREL,		19)
-+    RELOC_NUMBER (R_AVR32_16B_PCREL,		20)
-+    RELOC_NUMBER (R_AVR32_16N_PCREL,		21)
-+    RELOC_NUMBER (R_AVR32_14UW_PCREL,		22)
-+    RELOC_NUMBER (R_AVR32_11H_PCREL,		23)
-+    RELOC_NUMBER (R_AVR32_10UW_PCREL,		24)
-+    RELOC_NUMBER (R_AVR32_9H_PCREL,		25)
-+    RELOC_NUMBER (R_AVR32_9UW_PCREL,		26)
-+
-+    /* Special Code Relocations */
-+    RELOC_NUMBER (R_AVR32_HI16,			27)
-+    RELOC_NUMBER (R_AVR32_LO16,			28)
-+
-+    /* PIC Relocations */
-+    RELOC_NUMBER (R_AVR32_GOTPC,		29)
-+    RELOC_NUMBER (R_AVR32_GOTCALL,		30)
-+    RELOC_NUMBER (R_AVR32_LDA_GOT,		31)
-+    RELOC_NUMBER (R_AVR32_GOT21S,		32)
-+    RELOC_NUMBER (R_AVR32_GOT18SW,		33)
-+    RELOC_NUMBER (R_AVR32_GOT16S,		34)
-+    RELOC_NUMBER (R_AVR32_GOT7UW,		35)
-+
-+    /* Constant Pool Relocations */
-+    RELOC_NUMBER (R_AVR32_32_CPENT,		36)
-+    RELOC_NUMBER (R_AVR32_CPCALL,		37)
-+    RELOC_NUMBER (R_AVR32_16_CP,		38)
-+    RELOC_NUMBER (R_AVR32_9W_CP,		39)
-+
-+    /* Dynamic Relocations */
-+    RELOC_NUMBER (R_AVR32_RELATIVE,		40)
-+    RELOC_NUMBER (R_AVR32_GLOB_DAT,		41)
-+    RELOC_NUMBER (R_AVR32_JMP_SLOT,		42)
-+
-+    /* Linkrelax Information */
-+    RELOC_NUMBER (R_AVR32_ALIGN,		43)
-+
-+    RELOC_NUMBER (R_AVR32_15S,		        44)
-+
-+END_RELOC_NUMBERS (R_AVR32_max)
-+
-+/* Processor specific dynamic array tags.  */
-+
-+/* The total size in bytes of the Global Offset Table */
-+#define DT_AVR32_GOTSZ			0x70000001
-diff -Nur binutils-2.21.orig/include/elf/common.h binutils-2.21/include/elf/common.h
---- binutils-2.21.orig/include/elf/common.h	2010-05-18 05:31:06.000000000 +0200
-+++ binutils-2.21/include/elf/common.h	2011-08-28 14:56:22.387990129 +0200
-@@ -289,7 +289,7 @@
- #define EM_INTEL182	182	/* Reserved by Intel */
- #define EM_res183	183	/* Reserved by ARM */
- #define EM_res184	184	/* Reserved by ARM */
--#define EM_AVR32	185	/* Atmel Corporation 32-bit microprocessor family */
-+#define EM_AVR32_OLD	185	/* Atmel Corporation 32-bit microprocessor family */
- #define EM_STM8	186	/* STMicroeletronics STM8 8-bit microcontroller */
- #define EM_TILE64	187	/* Tilera TILE64 multicore architecture family */
- #define EM_TILEPRO	188	/* Tilera TILEPro multicore architecture family */
-@@ -369,6 +369,9 @@
- /* V850 backend magic number.  Written in the absense of an ABI.  */
- #define EM_CYGNUS_V850		0x9080
- 
-+/* AVR32 magic number, picked by IAR Systems. */
-+#define EM_AVR32		0x18ad
-+
- /* old S/390 backend magic number. Written in the absence of an ABI.  */
- #define EM_S390_OLD		0xa390
- 
-diff -Nur binutils-2.21.orig/ld/autom4te.cache/output.0 binutils-2.21/ld/autom4te.cache/output.0
---- binutils-2.21.orig/ld/autom4te.cache/output.0	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.21/ld/autom4te.cache/output.0	2011-08-28 14:56:22.417984323 +0200
-@@ -0,0 +1,15806 @@
-+@%:@! /bin/sh
-+@%:@ Guess values for system-dependent variables and create Makefiles.
-+@%:@ Generated by GNU Autoconf 2.64.
-+@%:@ 
-+@%:@ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-+@%:@ 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
-+@%:@ Foundation, Inc.
-+@%:@ 
-+@%:@ This configure script is free software; the Free Software Foundation
-+@%:@ gives unlimited permission to copy, distribute and modify it.
-+## -------------------- ##
-+## M4sh Initialization. ##
-+## -------------------- ##
-+
-+# Be more Bourne compatible
-+DUALCASE=1; export DUALCASE # for MKS sh
-+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-+  emulate sh
-+  NULLCMD=:
-+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-+  # is contrary to our usage.  Disable this feature.
-+  alias -g '${1+"$@"}'='"$@"'
-+  setopt NO_GLOB_SUBST
-+else
-+  case `(set -o) 2>/dev/null` in @%:@(
-+  *posix*) :
-+    set -o posix ;; @%:@(
-+  *) :
-+     ;;
-+esac
-+fi
-+
-+
-+as_nl='
-+'
-+export as_nl
-+# Printing a long string crashes Solaris 7 /usr/bin/printf.
-+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-+# Prefer a ksh shell builtin over an external printf program on Solaris,
-+# but without wasting forks for bash or zsh.
-+if test -z "$BASH_VERSION$ZSH_VERSION" \
-+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-+  as_echo='print -r --'
-+  as_echo_n='print -rn --'
-+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-+  as_echo='printf %s\n'
-+  as_echo_n='printf %s'
-+else
-+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-+    as_echo_n='/usr/ucb/echo -n'
-+  else
-+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-+    as_echo_n_body='eval
-+      arg=$1;
-+      case $arg in @%:@(
-+      *"$as_nl"*)
-+	expr "X$arg" : "X\\(.*\\)$as_nl";
-+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-+      esac;
-+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-+    '
-+    export as_echo_n_body
-+    as_echo_n='sh -c $as_echo_n_body as_echo'
-+  fi
-+  export as_echo_body
-+  as_echo='sh -c $as_echo_body as_echo'
-+fi
-+
-+# The user is always right.
-+if test "${PATH_SEPARATOR+set}" != set; then
-+  PATH_SEPARATOR=:
-+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-+      PATH_SEPARATOR=';'
-+  }
-+fi
-+
-+
-+# IFS
-+# We need space, tab and new line, in precisely that order.  Quoting is
-+# there to prevent editors from complaining about space-tab.
-+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-+# splitting by setting IFS to empty value.)
-+IFS=" ""	$as_nl"
-+
-+# Find who we are.  Look in the path if we contain no directory separator.
-+case $0 in @%:@((
-+  *[\\/]* ) as_myself=$0 ;;
-+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-+  done
-+IFS=$as_save_IFS
-+
-+     ;;
-+esac
-+# We did not find ourselves, most probably we were run as `sh COMMAND'
-+# in which case we are not to be found in the path.
-+if test "x$as_myself" = x; then
-+  as_myself=$0
-+fi
-+if test ! -f "$as_myself"; then
-+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-+  exit 1
-+fi
-+
-+# Unset variables that we do not need and which cause bugs (e.g. in
-+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-+# suppresses any "Segmentation fault" message there.  '((' could
-+# trigger a bug in pdksh 5.2.14.
-+for as_var in BASH_ENV ENV MAIL MAILPATH
-+do eval test x\${$as_var+set} = xset \
-+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-+done
-+PS1='$ '
-+PS2='> '
-+PS4='+ '
-+
-+# NLS nuisances.
-+LC_ALL=C
-+export LC_ALL
-+LANGUAGE=C
-+export LANGUAGE
-+
-+# CDPATH.
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-+
-+if test "x$CONFIG_SHELL" = x; then
-+  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
-+  emulate sh
-+  NULLCMD=:
-+  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
-+  # is contrary to our usage.  Disable this feature.
-+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-+  setopt NO_GLOB_SUBST
-+else
-+  case \`(set -o) 2>/dev/null\` in @%:@(
-+  *posix*) :
-+    set -o posix ;; @%:@(
-+  *) :
-+     ;;
-+esac
-+fi
-+"
-+  as_required="as_fn_return () { (exit \$1); }
-+as_fn_success () { as_fn_return 0; }
-+as_fn_failure () { as_fn_return 1; }
-+as_fn_ret_success () { return 0; }
-+as_fn_ret_failure () { return 1; }
-+
-+exitcode=0
-+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
-+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
-+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
-+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
-+  
-+else
-+  exitcode=1; echo positional parameters were not saved.
-+fi
-+test x\$exitcode = x0 || exit 1"
-+  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
-+  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
-+  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
-+  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-+test \$(( 1 + 1 )) = 2 || exit 1
-+
-+  test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
-+    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
-+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
-+    PATH=/empty FPATH=/empty; export PATH FPATH
-+    test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
-+      || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1"
-+  if (eval "$as_required") 2>/dev/null; then :
-+  as_have_required=yes
-+else
-+  as_have_required=no
-+fi
-+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
-+  
-+else
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+as_found=false
-+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  as_found=:
-+  case $as_dir in @%:@(
-+	 /*)
-+	   for as_base in sh bash ksh sh5; do
-+	     # Try only shells that exist, to save several forks.
-+	     as_shell=$as_dir/$as_base
-+	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-+		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
-+  CONFIG_SHELL=$as_shell as_have_required=yes
-+		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
-+  break 2
-+fi
-+fi
-+	   done;;
-+       esac
-+  as_found=false
-+done
-+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
-+	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
-+  CONFIG_SHELL=$SHELL as_have_required=yes
-+fi; }
-+IFS=$as_save_IFS
-+
-+
-+      if test "x$CONFIG_SHELL" != x; then :
-+  # We cannot yet assume a decent shell, so we have to provide a
-+	# neutralization value for shells without unset; and this also
-+	# works around shells that cannot unset nonexistent variables.
-+	BASH_ENV=/dev/null
-+	ENV=/dev/null
-+	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-+	export CONFIG_SHELL
-+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-+fi
-+
-+    if test x$as_have_required = xno; then :
-+  $as_echo "$0: This script requires a shell more modern than all"
-+  $as_echo "$0: the shells that I found on your system."
-+  if test x${ZSH_VERSION+set} = xset ; then
-+    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-+    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
-+  else
-+    $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
-+$0: including any error possibly output before this
-+$0: message. Then install a modern shell, or manually run
-+$0: the script under such a shell if you do have one."
-+  fi
-+  exit 1
-+fi
-+fi
-+fi
-+SHELL=${CONFIG_SHELL-/bin/sh}
-+export SHELL
-+# Unset more variables known to interfere with behavior of common tools.
-+CLICOLOR_FORCE= GREP_OPTIONS=
-+unset CLICOLOR_FORCE GREP_OPTIONS
-+
-+## --------------------- ##
-+## M4sh Shell Functions. ##
-+## --------------------- ##
-+@%:@ as_fn_unset VAR
-+@%:@ ---------------
-+@%:@ Portably unset VAR.
-+as_fn_unset ()
-+{
-+  { eval $1=; unset $1;}
-+}
-+as_unset=as_fn_unset
-+
-+@%:@ as_fn_set_status STATUS
-+@%:@ -----------------------
-+@%:@ Set $? to STATUS, without forking.
-+as_fn_set_status ()
-+{
-+  return $1
-+} @%:@ as_fn_set_status
-+
-+@%:@ as_fn_exit STATUS
-+@%:@ -----------------
-+@%:@ Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-+as_fn_exit ()
-+{
-+  set +e
-+  as_fn_set_status $1
-+  exit $1
-+} @%:@ as_fn_exit
-+
-+@%:@ as_fn_mkdir_p
-+@%:@ -------------
-+@%:@ Create "$as_dir" as a directory, including parents if necessary.
-+as_fn_mkdir_p ()
-+{
-+
-+  case $as_dir in #(
-+  -*) as_dir=./$as_dir;;
-+  esac
-+  test -d "$as_dir" || eval $as_mkdir_p || {
-+    as_dirs=
-+    while :; do
-+      case $as_dir in #(
-+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-+      *) as_qdir=$as_dir;;
-+      esac
-+      as_dirs="'$as_qdir' $as_dirs"
-+      as_dir=`$as_dirname -- "$as_dir" ||
-+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$as_dir" : 'X\(//\)[^/]' \| \
-+	 X"$as_dir" : 'X\(//\)$' \| \
-+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-+$as_echo X"$as_dir" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-+      test -d "$as_dir" && break
-+    done
-+    test -z "$as_dirs" || eval "mkdir $as_dirs"
-+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
-+
-+
-+} @%:@ as_fn_mkdir_p
-+@%:@ as_fn_append VAR VALUE
-+@%:@ ----------------------
-+@%:@ Append the text in VALUE to the end of the definition contained in VAR. Take
-+@%:@ advantage of any shell optimizations that allow amortized linear growth over
-+@%:@ repeated appends, instead of the typical quadratic growth present in naive
-+@%:@ implementations.
-+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-+  eval 'as_fn_append ()
-+  {
-+    eval $1+=\$2
-+  }'
-+else
-+  as_fn_append ()
-+  {
-+    eval $1=\$$1\$2
-+  }
-+fi # as_fn_append
-+
-+@%:@ as_fn_arith ARG...
-+@%:@ ------------------
-+@%:@ Perform arithmetic evaluation on the ARGs, and store the result in the
-+@%:@ global $as_val. Take advantage of shells that can avoid forks. The arguments
-+@%:@ must be portable across $(()) and expr.
-+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-+  eval 'as_fn_arith ()
-+  {
-+    as_val=$(( $* ))
-+  }'
-+else
-+  as_fn_arith ()
-+  {
-+    as_val=`expr "$@" || test $? -eq 1`
-+  }
-+fi # as_fn_arith
-+
-+
-+@%:@ as_fn_error ERROR [LINENO LOG_FD]
-+@%:@ ---------------------------------
-+@%:@ Output "`basename @S|@0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-+@%:@ provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-+@%:@ script with status $?, using 1 if that was 0.
-+as_fn_error ()
-+{
-+  as_status=$?; test $as_status -eq 0 && as_status=1
-+  if test "$3"; then
-+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
-+  fi
-+  $as_echo "$as_me: error: $1" >&2
-+  as_fn_exit $as_status
-+} @%:@ as_fn_error
-+
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-+  as_expr=expr
-+else
-+  as_expr=false
-+fi
-+
-+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-+  as_basename=basename
-+else
-+  as_basename=false
-+fi
-+
-+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-+  as_dirname=dirname
-+else
-+  as_dirname=false
-+fi
-+
-+as_me=`$as_basename -- "$0" ||
-+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-+	 X"$0" : 'X\(//\)$' \| \
-+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-+$as_echo X/"$0" |
-+    sed '/^.*\/\([^/][^/]*\)\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\/\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\/\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-+
-+# Avoid depending upon Character Ranges.
-+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-+as_cr_digits='0123456789'
-+as_cr_alnum=$as_cr_Letters$as_cr_digits
-+
-+
-+  as_lineno_1=$LINENO as_lineno_1a=$LINENO
-+  as_lineno_2=$LINENO as_lineno_2a=$LINENO
-+  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
-+  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
-+  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
-+  sed -n '
-+    p
-+    /[$]LINENO/=
-+  ' <$as_myself |
-+    sed '
-+      s/[$]LINENO.*/&-/
-+      t lineno
-+      b
-+      :lineno
-+      N
-+      :loop
-+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-+      t loop
-+      s/-\n.*//
-+    ' >$as_me.lineno &&
-+  chmod +x "$as_me.lineno" ||
-+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
-+
-+  # Don't try to exec as it changes $[0], causing all sort of problems
-+  # (the dirname of $[0] is not the place where we might find the
-+  # original and so on.  Autoconf is especially sensitive to this).
-+  . "./$as_me.lineno"
-+  # Exit status is that of the last command.
-+  exit
-+}
-+
-+ECHO_C= ECHO_N= ECHO_T=
-+case `echo -n x` in @%:@(((((
-+-n*)
-+  case `echo 'xy\c'` in
-+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-+  xy)  ECHO_C='\c';;
-+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-+       ECHO_T='	';;
-+  esac;;
-+*)
-+  ECHO_N='-n';;
-+esac
-+
-+rm -f conf$$ conf$$.exe conf$$.file
-+if test -d conf$$.dir; then
-+  rm -f conf$$.dir/conf$$.file
-+else
-+  rm -f conf$$.dir
-+  mkdir conf$$.dir 2>/dev/null
-+fi
-+if (echo >conf$$.file) 2>/dev/null; then
-+  if ln -s conf$$.file conf$$ 2>/dev/null; then
-+    as_ln_s='ln -s'
-+    # ... but there are two gotchas:
-+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-+    # In both cases, we have to default to `cp -p'.
-+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-+      as_ln_s='cp -p'
-+  elif ln conf$$.file conf$$ 2>/dev/null; then
-+    as_ln_s=ln
-+  else
-+    as_ln_s='cp -p'
-+  fi
-+else
-+  as_ln_s='cp -p'
-+fi
-+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-+rmdir conf$$.dir 2>/dev/null
-+
-+if mkdir -p . 2>/dev/null; then
-+  as_mkdir_p='mkdir -p "$as_dir"'
-+else
-+  test -d ./-p && rmdir ./-p
-+  as_mkdir_p=false
-+fi
-+
-+if test -x / >/dev/null 2>&1; then
-+  as_test_x='test -x'
-+else
-+  if ls -dL / >/dev/null 2>&1; then
-+    as_ls_L_option=L
-+  else
-+    as_ls_L_option=
-+  fi
-+  as_test_x='
-+    eval sh -c '\''
-+      if test -d "$1"; then
-+	test -d "$1/.";
-+      else
-+	case $1 in @%:@(
-+	-*)set "./$1";;
-+	esac;
-+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in @%:@((
-+	???[sx]*):;;*)false;;esac;fi
-+    '\'' sh
-+  '
-+fi
-+as_executable_p=$as_test_x
-+
-+# 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'"
-+
-+# Sed expression to map a string onto a valid variable name.
-+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-+
-+SHELL=${CONFIG_SHELL-/bin/sh}
-+
-+
-+exec 7<&0 </dev/null 6>&1
-+
-+# Name of the host.
-+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-+# so uname gets run too.
-+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-+
-+#
-+# Initializations.
-+#
-+ac_default_prefix=/usr/local
-+ac_clean_files=
-+ac_config_libobj_dir=.
-+LIB@&t@OBJS=
-+cross_compiling=no
-+subdirs=
-+MFLAGS=
-+MAKEFLAGS=
-+
-+# Identity of this package.
-+PACKAGE_NAME=
-+PACKAGE_TARNAME=
-+PACKAGE_VERSION=
-+PACKAGE_STRING=
-+PACKAGE_BUGREPORT=
-+PACKAGE_URL=
-+
-+ac_unique_file="ldmain.c"
-+# Factoring default headers for most tests.
-+ac_includes_default="\
-+#include <stdio.h>
-+#ifdef HAVE_SYS_TYPES_H
-+# include <sys/types.h>
-+#endif
-+#ifdef HAVE_SYS_STAT_H
-+# include <sys/stat.h>
-+#endif
-+#ifdef STDC_HEADERS
-+# include <stdlib.h>
-+# include <stddef.h>
-+#else
-+# ifdef HAVE_STDLIB_H
-+#  include <stdlib.h>
-+# endif
-+#endif
-+#ifdef HAVE_STRING_H
-+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-+#  include <memory.h>
-+# endif
-+# include <string.h>
-+#endif
-+#ifdef HAVE_STRINGS_H
-+# include <strings.h>
-+#endif
-+#ifdef HAVE_INTTYPES_H
-+# include <inttypes.h>
-+#endif
-+#ifdef HAVE_STDINT_H
-+# include <stdint.h>
-+#endif
-+#ifdef HAVE_UNISTD_H
-+# include <unistd.h>
-+#endif"
-+
-+ac_subst_vars='am__EXEEXT_FALSE
-+am__EXEEXT_TRUE
-+LTLIBOBJS
-+LIB@&t@OBJS
-+TESTBFDLIB
-+EMULATION_LIBPATH
-+LIB_PATH
-+EMUL_EXTRA_OFILES
-+EMULATION_OFILES
-+EMUL
-+STRINGIFY
-+ENABLE_PLUGINS_FALSE
-+ENABLE_PLUGINS_TRUE
-+NATIVE_LIB_DIRS
-+HOSTING_LIBS
-+HOSTING_CRT0
-+HDEFINES
-+do_compare
-+GENINSRC_NEVER_FALSE
-+GENINSRC_NEVER_TRUE
-+LEXLIB
-+LEX_OUTPUT_ROOT
-+LEX
-+YFLAGS
-+YACC
-+MSGMERGE
-+MSGFMT
-+MKINSTALLDIRS
-+CATOBJEXT
-+GENCAT
-+INSTOBJEXT
-+DATADIRNAME
-+CATALOGS
-+POSUB
-+GMSGFMT
-+XGETTEXT
-+INCINTL
-+LIBINTL_DEP
-+LIBINTL
-+USE_NLS
-+OTOOL64
-+OTOOL
-+LIPO
-+NMEDIT
-+DSYMUTIL
-+RANLIB
-+AR
-+OBJDUMP
-+LN_S
-+NM
-+ac_ct_DUMPBIN
-+DUMPBIN
-+LD
-+FGREP
-+SED
-+LIBTOOL
-+NO_WERROR
-+WARN_CFLAGS
-+EGREP
-+GREP
-+CPP
-+installed_linker
-+install_as_default
-+TARGET_SYSTEM_ROOT_DEFINE
-+TARGET_SYSTEM_ROOT
-+use_sysroot
-+MAINT
-+MAINTAINER_MODE_FALSE
-+MAINTAINER_MODE_TRUE
-+am__fastdepCC_FALSE
-+am__fastdepCC_TRUE
-+CCDEPMODE
-+AMDEPBACKSLASH
-+AMDEP_FALSE
-+AMDEP_TRUE
-+am__quote
-+am__include
-+DEPDIR
-+am__untar
-+am__tar
-+AMTAR
-+am__leading_dot
-+SET_MAKE
-+AWK
-+mkdir_p
-+MKDIR_P
-+INSTALL_STRIP_PROGRAM
-+STRIP
-+install_sh
-+MAKEINFO
-+AUTOHEADER
-+AUTOMAKE
-+AUTOCONF
-+ACLOCAL
-+VERSION
-+PACKAGE
-+CYGPATH_W
-+am__isrc
-+INSTALL_DATA
-+INSTALL_SCRIPT
-+INSTALL_PROGRAM
-+OBJEXT
-+EXEEXT
-+ac_ct_CC
-+CPPFLAGS
-+LDFLAGS
-+CFLAGS
-+CC
-+target_os
-+target_vendor
-+target_cpu
-+target
-+host_os
-+host_vendor
-+host_cpu
-+host
-+build_os
-+build_vendor
-+build_cpu
-+build
-+target_alias
-+host_alias
-+build_alias
-+LIBS
-+ECHO_T
-+ECHO_N
-+ECHO_C
-+DEFS
-+mandir
-+localedir
-+libdir
-+psdir
-+pdfdir
-+dvidir
-+htmldir
-+infodir
-+docdir
-+oldincludedir
-+includedir
-+localstatedir
-+sharedstatedir
-+sysconfdir
-+datadir
-+datarootdir
-+libexecdir
-+sbindir
-+bindir
-+program_transform_name
-+prefix
-+exec_prefix
-+PACKAGE_URL
-+PACKAGE_BUGREPORT
-+PACKAGE_STRING
-+PACKAGE_VERSION
-+PACKAGE_TARNAME
-+PACKAGE_NAME
-+PATH_SEPARATOR
-+SHELL'
-+ac_subst_files='TDIRS'
-+ac_user_opts='
-+enable_option_checking
-+enable_dependency_tracking
-+enable_maintainer_mode
-+with_lib_path
-+enable_targets
-+enable_64_bit_bfd
-+with_sysroot
-+enable_gold
-+enable_got
-+enable_werror
-+enable_build_warnings
-+enable_plugins
-+enable_largefile
-+enable_shared
-+enable_static
-+with_pic
-+enable_fast_install
-+with_gnu_ld
-+enable_libtool_lock
-+enable_nls
-+'
-+      ac_precious_vars='build_alias
-+host_alias
-+target_alias
-+CC
-+CFLAGS
-+LDFLAGS
-+LIBS
-+CPPFLAGS
-+CPP
-+YACC
-+YFLAGS'
-+
-+
-+# Initialize some variables set by options.
-+ac_init_help=
-+ac_init_version=false
-+ac_unrecognized_opts=
-+ac_unrecognized_sep=
-+# The variables have the same names as the options, with
-+# dashes changed to underlines.
-+cache_file=/dev/null
-+exec_prefix=NONE
-+no_create=
-+no_recursion=
-+prefix=NONE
-+program_prefix=NONE
-+program_suffix=NONE
-+program_transform_name=s,x,x,
-+silent=
-+site=
-+srcdir=
-+verbose=
-+x_includes=NONE
-+x_libraries=NONE
-+
-+# Installation directory options.
-+# These are left unexpanded so users can "make install exec_prefix=/foo"
-+# 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.
-+# (The list follows the same order as the GNU Coding Standards.)
-+bindir='${exec_prefix}/bin'
-+sbindir='${exec_prefix}/sbin'
-+libexecdir='${exec_prefix}/libexec'
-+datarootdir='${prefix}/share'
-+datadir='${datarootdir}'
-+sysconfdir='${prefix}/etc'
-+sharedstatedir='${prefix}/com'
-+localstatedir='${prefix}/var'
-+includedir='${prefix}/include'
-+oldincludedir='/usr/include'
-+docdir='${datarootdir}/doc/${PACKAGE}'
-+infodir='${datarootdir}/info'
-+htmldir='${docdir}'
-+dvidir='${docdir}'
-+pdfdir='${docdir}'
-+psdir='${docdir}'
-+libdir='${exec_prefix}/lib'
-+localedir='${datarootdir}/locale'
-+mandir='${datarootdir}/man'
-+
-+ac_prev=
-+ac_dashdash=
-+for ac_option
-+do
-+  # If the previous option needs an argument, assign it.
-+  if test -n "$ac_prev"; then
-+    eval $ac_prev=\$ac_option
-+    ac_prev=
-+    continue
-+  fi
-+
-+  case $ac_option in
-+  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-+  *)	ac_optarg=yes ;;
-+  esac
-+
-+  # Accept the important Cygnus configure options, so we can diagnose typos.
-+
-+  case $ac_dashdash$ac_option in
-+  --)
-+    ac_dashdash=yes ;;
-+
-+  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-+    ac_prev=bindir ;;
-+  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-+    bindir=$ac_optarg ;;
-+
-+  -build | --build | --buil | --bui | --bu)
-+    ac_prev=build_alias ;;
-+  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-+    build_alias=$ac_optarg ;;
-+
-+  -cache-file | --cache-file | --cache-fil | --cache-fi \
-+  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-+    ac_prev=cache_file ;;
-+  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-+  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-+    cache_file=$ac_optarg ;;
-+
-+  --config-cache | -C)
-+    cache_file=config.cache ;;
-+
-+  -datadir | --datadir | --datadi | --datad)
-+    ac_prev=datadir ;;
-+  -datadir=* | --datadir=* | --datadi=* | --datad=*)
-+    datadir=$ac_optarg ;;
-+
-+  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-+  | --dataroo | --dataro | --datar)
-+    ac_prev=datarootdir ;;
-+  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-+  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-+    datarootdir=$ac_optarg ;;
-+
-+  -disable-* | --disable-*)
-+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-+    # Reject names that are not valid shell variable names.
-+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-+      as_fn_error "invalid feature name: $ac_useropt"
-+    ac_useropt_orig=$ac_useropt
-+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-+    case $ac_user_opts in
-+      *"
-+"enable_$ac_useropt"
-+"*) ;;
-+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
-+	 ac_unrecognized_sep=', ';;
-+    esac
-+    eval enable_$ac_useropt=no ;;
-+
-+  -docdir | --docdir | --docdi | --doc | --do)
-+    ac_prev=docdir ;;
-+  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-+    docdir=$ac_optarg ;;
-+
-+  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-+    ac_prev=dvidir ;;
-+  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-+    dvidir=$ac_optarg ;;
-+
-+  -enable-* | --enable-*)
-+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-+    # Reject names that are not valid shell variable names.
-+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-+      as_fn_error "invalid feature name: $ac_useropt"
-+    ac_useropt_orig=$ac_useropt
-+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-+    case $ac_user_opts in
-+      *"
-+"enable_$ac_useropt"
-+"*) ;;
-+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
-+	 ac_unrecognized_sep=', ';;
-+    esac
-+    eval enable_$ac_useropt=\$ac_optarg ;;
-+
-+  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-+  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-+  | --exec | --exe | --ex)
-+    ac_prev=exec_prefix ;;
-+  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-+  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-+  | --exec=* | --exe=* | --ex=*)
-+    exec_prefix=$ac_optarg ;;
-+
-+  -gas | --gas | --ga | --g)
-+    # Obsolete; use --with-gas.
-+    with_gas=yes ;;
-+
-+  -help | --help | --hel | --he | -h)
-+    ac_init_help=long ;;
-+  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-+    ac_init_help=recursive ;;
-+  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-+    ac_init_help=short ;;
-+
-+  -host | --host | --hos | --ho)
-+    ac_prev=host_alias ;;
-+  -host=* | --host=* | --hos=* | --ho=*)
-+    host_alias=$ac_optarg ;;
-+
-+  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-+    ac_prev=htmldir ;;
-+  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-+  | --ht=*)
-+    htmldir=$ac_optarg ;;
-+
-+  -includedir | --includedir | --includedi | --included | --include \
-+  | --includ | --inclu | --incl | --inc)
-+    ac_prev=includedir ;;
-+  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-+  | --includ=* | --inclu=* | --incl=* | --inc=*)
-+    includedir=$ac_optarg ;;
-+
-+  -infodir | --infodir | --infodi | --infod | --info | --inf)
-+    ac_prev=infodir ;;
-+  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-+    infodir=$ac_optarg ;;
-+
-+  -libdir | --libdir | --libdi | --libd)
-+    ac_prev=libdir ;;
-+  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-+    libdir=$ac_optarg ;;
-+
-+  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-+  | --libexe | --libex | --libe)
-+    ac_prev=libexecdir ;;
-+  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-+  | --libexe=* | --libex=* | --libe=*)
-+    libexecdir=$ac_optarg ;;
-+
-+  -localedir | --localedir | --localedi | --localed | --locale)
-+    ac_prev=localedir ;;
-+  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-+    localedir=$ac_optarg ;;
-+
-+  -localstatedir | --localstatedir | --localstatedi | --localstated \
-+  | --localstate | --localstat | --localsta | --localst | --locals)
-+    ac_prev=localstatedir ;;
-+  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-+  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
-+    localstatedir=$ac_optarg ;;
-+
-+  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-+    ac_prev=mandir ;;
-+  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-+    mandir=$ac_optarg ;;
-+
-+  -nfp | --nfp | --nf)
-+    # Obsolete; use --without-fp.
-+    with_fp=no ;;
-+
-+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-+  | --no-cr | --no-c | -n)
-+    no_create=yes ;;
-+
-+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-+    no_recursion=yes ;;
-+
-+  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-+  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-+  | --oldin | --oldi | --old | --ol | --o)
-+    ac_prev=oldincludedir ;;
-+  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-+  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-+  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-+    oldincludedir=$ac_optarg ;;
-+
-+  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-+    ac_prev=prefix ;;
-+  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-+    prefix=$ac_optarg ;;
-+
-+  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-+  | --program-pre | --program-pr | --program-p)
-+    ac_prev=program_prefix ;;
-+  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-+  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-+    program_prefix=$ac_optarg ;;
-+
-+  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-+  | --program-suf | --program-su | --program-s)
-+    ac_prev=program_suffix ;;
-+  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-+  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-+    program_suffix=$ac_optarg ;;
-+
-+  -program-transform-name | --program-transform-name \
-+  | --program-transform-nam | --program-transform-na \
-+  | --program-transform-n | --program-transform- \
-+  | --program-transform | --program-transfor \
-+  | --program-transfo | --program-transf \
-+  | --program-trans | --program-tran \
-+  | --progr-tra | --program-tr | --program-t)
-+    ac_prev=program_transform_name ;;
-+  -program-transform-name=* | --program-transform-name=* \
-+  | --program-transform-nam=* | --program-transform-na=* \
-+  | --program-transform-n=* | --program-transform-=* \
-+  | --program-transform=* | --program-transfor=* \
-+  | --program-transfo=* | --program-transf=* \
-+  | --program-trans=* | --program-tran=* \
-+  | --progr-tra=* | --program-tr=* | --program-t=*)
-+    program_transform_name=$ac_optarg ;;
-+
-+  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-+    ac_prev=pdfdir ;;
-+  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-+    pdfdir=$ac_optarg ;;
-+
-+  -psdir | --psdir | --psdi | --psd | --ps)
-+    ac_prev=psdir ;;
-+  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-+    psdir=$ac_optarg ;;
-+
-+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-+  | -silent | --silent | --silen | --sile | --sil)
-+    silent=yes ;;
-+
-+  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-+    ac_prev=sbindir ;;
-+  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-+  | --sbi=* | --sb=*)
-+    sbindir=$ac_optarg ;;
-+
-+  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-+  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-+  | --sharedst | --shareds | --shared | --share | --shar \
-+  | --sha | --sh)
-+    ac_prev=sharedstatedir ;;
-+  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-+  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-+  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-+  | --sha=* | --sh=*)
-+    sharedstatedir=$ac_optarg ;;
-+
-+  -site | --site | --sit)
-+    ac_prev=site ;;
-+  -site=* | --site=* | --sit=*)
-+    site=$ac_optarg ;;
-+
-+  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-+    ac_prev=srcdir ;;
-+  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-+    srcdir=$ac_optarg ;;
-+
-+  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-+  | --syscon | --sysco | --sysc | --sys | --sy)
-+    ac_prev=sysconfdir ;;
-+  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-+  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-+    sysconfdir=$ac_optarg ;;
-+
-+  -target | --target | --targe | --targ | --tar | --ta | --t)
-+    ac_prev=target_alias ;;
-+  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-+    target_alias=$ac_optarg ;;
-+
-+  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-+    verbose=yes ;;
-+
-+  -version | --version | --versio | --versi | --vers | -V)
-+    ac_init_version=: ;;
-+
-+  -with-* | --with-*)
-+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-+    # Reject names that are not valid shell variable names.
-+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-+      as_fn_error "invalid package name: $ac_useropt"
-+    ac_useropt_orig=$ac_useropt
-+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-+    case $ac_user_opts in
-+      *"
-+"with_$ac_useropt"
-+"*) ;;
-+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
-+	 ac_unrecognized_sep=', ';;
-+    esac
-+    eval with_$ac_useropt=\$ac_optarg ;;
-+
-+  -without-* | --without-*)
-+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-+    # Reject names that are not valid shell variable names.
-+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-+      as_fn_error "invalid package name: $ac_useropt"
-+    ac_useropt_orig=$ac_useropt
-+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-+    case $ac_user_opts in
-+      *"
-+"with_$ac_useropt"
-+"*) ;;
-+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
-+	 ac_unrecognized_sep=', ';;
-+    esac
-+    eval with_$ac_useropt=no ;;
-+
-+  --x)
-+    # Obsolete; use --with-x.
-+    with_x=yes ;;
-+
-+  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-+  | --x-incl | --x-inc | --x-in | --x-i)
-+    ac_prev=x_includes ;;
-+  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-+  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-+    x_includes=$ac_optarg ;;
-+
-+  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-+  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-+    ac_prev=x_libraries ;;
-+  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-+  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-+    x_libraries=$ac_optarg ;;
-+
-+  -*) as_fn_error "unrecognized option: \`$ac_option'
-+Try \`$0 --help' for more information."
-+    ;;
-+
-+  *=*)
-+    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-+    # Reject names that are not valid shell variable names.
-+    case $ac_envvar in #(
-+      '' | [0-9]* | *[!_$as_cr_alnum]* )
-+      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
-+    esac
-+    eval $ac_envvar=\$ac_optarg
-+    export $ac_envvar ;;
-+
-+  *)
-+    # FIXME: should be removed in autoconf 3.0.
-+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-+    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-+    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-+    ;;
-+
-+  esac
-+done
-+
-+if test -n "$ac_prev"; then
-+  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-+  as_fn_error "missing argument to $ac_option"
-+fi
-+
-+if test -n "$ac_unrecognized_opts"; then
-+  case $enable_option_checking in
-+    no) ;;
-+    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
-+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
-+  esac
-+fi
-+
-+# Check all directory arguments for consistency.
-+for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
-+		datadir sysconfdir sharedstatedir localstatedir includedir \
-+		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-+		libdir localedir mandir
-+do
-+  eval ac_val=\$$ac_var
-+  # Remove trailing slashes.
-+  case $ac_val in
-+    */ )
-+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
-+      eval $ac_var=\$ac_val;;
-+  esac
-+  # Be sure to have absolute directory names.
-+  case $ac_val in
-+    [\\/$]* | ?:[\\/]* )  continue;;
-+    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-+  esac
-+  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
-+done
-+
-+# There might be people who depend on the old broken behavior: `$host'
-+# used to hold the argument of --host etc.
-+# FIXME: To remove some day.
-+build=$build_alias
-+host=$host_alias
-+target=$target_alias
-+
-+# FIXME: To remove some day.
-+if test "x$host_alias" != x; then
-+  if test "x$build_alias" = x; then
-+    cross_compiling=maybe
-+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-+    If a cross compiler is detected then cross compile mode will be used." >&2
-+  elif test "x$build_alias" != "x$host_alias"; then
-+    cross_compiling=yes
-+  fi
-+fi
-+
-+ac_tool_prefix=
-+test -n "$host_alias" && ac_tool_prefix=$host_alias-
-+
-+test "$silent" = yes && exec 6>/dev/null
-+
-+
-+ac_pwd=`pwd` && test -n "$ac_pwd" &&
-+ac_ls_di=`ls -di .` &&
-+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-+  as_fn_error "working directory cannot be determined"
-+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-+  as_fn_error "pwd does not report name of working directory"
-+
-+
-+# Find the source files, if location was not specified.
-+if test -z "$srcdir"; then
-+  ac_srcdir_defaulted=yes
-+  # Try the directory containing this script, then the parent directory.
-+  ac_confdir=`$as_dirname -- "$as_myself" ||
-+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$as_myself" : 'X\(//\)[^/]' \| \
-+	 X"$as_myself" : 'X\(//\)$' \| \
-+	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-+$as_echo X"$as_myself" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-+  srcdir=$ac_confdir
-+  if test ! -r "$srcdir/$ac_unique_file"; then
-+    srcdir=..
-+  fi
-+else
-+  ac_srcdir_defaulted=no
-+fi
-+if test ! -r "$srcdir/$ac_unique_file"; then
-+  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-+  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
-+fi
-+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-+ac_abs_confdir=`(
-+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
-+	pwd)`
-+# When building in place, set srcdir=.
-+if test "$ac_abs_confdir" = "$ac_pwd"; then
-+  srcdir=.
-+fi
-+# Remove unnecessary trailing slashes from srcdir.
-+# Double slashes in file names in object file debugging info
-+# mess up M-x gdb in Emacs.
-+case $srcdir in
-+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-+esac
-+for ac_var in $ac_precious_vars; do
-+  eval ac_env_${ac_var}_set=\${${ac_var}+set}
-+  eval ac_env_${ac_var}_value=\$${ac_var}
-+  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-+  eval ac_cv_env_${ac_var}_value=\$${ac_var}
-+done
-+
-+#
-+# Report the --help message.
-+#
-+if test "$ac_init_help" = "long"; then
-+  # Omit some internal or obsolete options to make the list less imposing.
-+  # This message is too long to be a string in the A/UX 3.1 sh.
-+  cat <<_ACEOF
-+\`configure' configures this package to adapt to many kinds of systems.
-+
-+Usage: $0 [OPTION]... [VAR=VALUE]...
-+
-+To assign environment variables (e.g., CC, CFLAGS...), specify them as
-+VAR=VALUE.  See below for descriptions of some of the useful variables.
-+
-+Defaults for the options are specified in brackets.
-+
-+Configuration:
-+  -h, --help              display this help and exit
-+      --help=short        display options specific to this package
-+      --help=recursive    display the short help of all the included packages
-+  -V, --version           display version information and exit
-+  -q, --quiet, --silent   do not print \`checking...' messages
-+      --cache-file=FILE   cache test results in FILE [disabled]
-+  -C, --config-cache      alias for \`--cache-file=config.cache'
-+  -n, --no-create         do not create output files
-+      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-+
-+Installation directories:
-+  --prefix=PREFIX         install architecture-independent files in PREFIX
-+                          [$ac_default_prefix]
-+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-+                          [PREFIX]
-+
-+By default, \`make install' will install all the files in
-+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-+for instance \`--prefix=\$HOME'.
-+
-+For better control, use the options below.
-+
-+Fine tuning of the installation directories:
-+  --bindir=DIR            user executables [EPREFIX/bin]
-+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
-+  --libexecdir=DIR        program executables [EPREFIX/libexec]
-+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
-+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
-+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-+  --libdir=DIR            object code libraries [EPREFIX/lib]
-+  --includedir=DIR        C header files [PREFIX/include]
-+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
-+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
-+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
-+  --infodir=DIR           info documentation [DATAROOTDIR/info]
-+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
-+  --mandir=DIR            man documentation [DATAROOTDIR/man]
-+  --docdir=DIR            documentation root @<:@DATAROOTDIR/doc/PACKAGE@:>@
-+  --htmldir=DIR           html documentation [DOCDIR]
-+  --dvidir=DIR            dvi documentation [DOCDIR]
-+  --pdfdir=DIR            pdf documentation [DOCDIR]
-+  --psdir=DIR             ps documentation [DOCDIR]
-+_ACEOF
-+
-+  cat <<\_ACEOF
-+
-+Program names:
-+  --program-prefix=PREFIX            prepend PREFIX to installed program names
-+  --program-suffix=SUFFIX            append SUFFIX to installed program names
-+  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
-+
-+System types:
-+  --build=BUILD     configure for building on BUILD [guessed]
-+  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-+  --target=TARGET   configure for building compilers for TARGET [HOST]
-+_ACEOF
-+fi
-+
-+if test -n "$ac_init_help"; then
-+
-+  cat <<\_ACEOF
-+
-+Optional Features:
-+  --disable-option-checking  ignore unrecognized --enable/--with options
-+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-+  --disable-dependency-tracking  speeds up one-time build
-+  --enable-dependency-tracking   do not reject slow dependency extractors
-+  --enable-maintainer-mode  enable make rules and dependencies not useful
-+			  (and sometimes confusing) to the casual installer
-+  --enable-targets        alternative target configurations
-+  --enable-64-bit-bfd     64-bit support (on hosts with narrower word sizes)
-+  --enable-gold[=ARG]     build gold [ARG={default,yes,no}]
-+  --enable-got=<type>     GOT handling scheme (target, single, negative,
-+                          multigot)
-+  --enable-werror         treat compile warnings as errors
-+  --enable-build-warnings enable build-time compiler warnings
-+  --enable-plugins        Enable support for plugins (defaults no)
-+  --disable-largefile     omit support for large files
-+  --enable-shared@<:@=PKGS@:>@  build shared libraries @<:@default=yes@:>@
-+  --enable-static@<:@=PKGS@:>@  build static libraries @<:@default=yes@:>@
-+  --enable-fast-install@<:@=PKGS@:>@ 
-+                          optimize for fast installation @<:@default=yes@:>@
-+  --disable-libtool-lock  avoid locking (might break parallel builds)
-+  --disable-nls           do not use Native Language Support
-+
-+Optional Packages:
-+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-+  --with-lib-path=dir1:dir2...  set default LIB_PATH
-+  --with-sysroot=DIR Search for usr/lib et al within DIR.
-+  --with-pic              try to use only PIC/non-PIC objects @<:@default=use
-+                          both@:>@
-+  --with-gnu-ld           assume the C compiler uses GNU ld @<:@default=no@:>@
-+
-+Some influential environment variables:
-+  CC          C compiler command
-+  CFLAGS      C compiler flags
-+  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-+              nonstandard directory <lib dir>
-+  LIBS        libraries to pass to the linker, e.g. -l<library>
-+  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
-+              you have headers in a nonstandard directory <include dir>
-+  CPP         C preprocessor
-+  YACC        The `Yet Another C Compiler' implementation to use. Defaults to
-+              the first program found out of: `bison -y', `byacc', `yacc'.
-+  YFLAGS      The list of arguments that will be passed by default to $YACC.
-+              This script will default YFLAGS to the empty string to avoid a
-+              default value of `-d' given by some make applications.
-+
-+Use these variables to override the choices made by `configure' or to help
-+it to find libraries and programs with nonstandard names/locations.
-+
-+Report bugs to the package provider.
-+_ACEOF
-+ac_status=$?
-+fi
-+
-+if test "$ac_init_help" = "recursive"; then
-+  # If there are subdirs, report their specific --help.
-+  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-+    test -d "$ac_dir" ||
-+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
-+      continue
-+    ac_builddir=.
-+
-+case "$ac_dir" in
-+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+*)
-+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-+  # A ".." for each directory in $ac_dir_suffix.
-+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-+  case $ac_top_builddir_sub in
-+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-+  esac ;;
-+esac
-+ac_abs_top_builddir=$ac_pwd
-+ac_abs_builddir=$ac_pwd$ac_dir_suffix
-+# for backward compatibility:
-+ac_top_builddir=$ac_top_build_prefix
-+
-+case $srcdir in
-+  .)  # We are building in place.
-+    ac_srcdir=.
-+    ac_top_srcdir=$ac_top_builddir_sub
-+    ac_abs_top_srcdir=$ac_pwd ;;
-+  [\\/]* | ?:[\\/]* )  # Absolute name.
-+    ac_srcdir=$srcdir$ac_dir_suffix;
-+    ac_top_srcdir=$srcdir
-+    ac_abs_top_srcdir=$srcdir ;;
-+  *) # Relative name.
-+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-+    ac_top_srcdir=$ac_top_build_prefix$srcdir
-+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-+esac
-+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-+
-+    cd "$ac_dir" || { ac_status=$?; continue; }
-+    # Check for guested configure.
-+    if test -f "$ac_srcdir/configure.gnu"; then
-+      echo &&
-+      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-+    elif test -f "$ac_srcdir/configure"; then
-+      echo &&
-+      $SHELL "$ac_srcdir/configure" --help=recursive
-+    else
-+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-+    fi || ac_status=$?
-+    cd "$ac_pwd" || { ac_status=$?; break; }
-+  done
-+fi
-+
-+test -n "$ac_init_help" && exit $ac_status
-+if $ac_init_version; then
-+  cat <<\_ACEOF
-+configure
-+generated by GNU Autoconf 2.64
-+
-+Copyright (C) 2009 Free Software Foundation, Inc.
-+This configure script is free software; the Free Software Foundation
-+gives unlimited permission to copy, distribute and modify it.
-+_ACEOF
-+  exit
-+fi
-+
-+## ------------------------ ##
-+## Autoconf initialization. ##
-+## ------------------------ ##
-+
-+@%:@ ac_fn_c_try_compile LINENO
-+@%:@ --------------------------
-+@%:@ Try to compile conftest.$ac_ext, and return whether this succeeded.
-+ac_fn_c_try_compile ()
-+{
-+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+  rm -f conftest.$ac_objext
-+  if { { ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_compile") 2>conftest.err
-+  ac_status=$?
-+  if test -s conftest.err; then
-+    grep -v '^ *+' conftest.err >conftest.er1
-+    cat conftest.er1 >&5
-+    mv -f conftest.er1 conftest.err
-+  fi
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then :
-+  ac_retval=0
-+else
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_retval=1
-+fi
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+  return $ac_retval
-+
-+} @%:@ ac_fn_c_try_compile
-+
-+@%:@ ac_fn_c_try_link LINENO
-+@%:@ -----------------------
-+@%:@ Try to link conftest.$ac_ext, and return whether this succeeded.
-+ac_fn_c_try_link ()
-+{
-+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+  rm -f conftest.$ac_objext conftest$ac_exeext
-+  if { { ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_link") 2>conftest.err
-+  ac_status=$?
-+  if test -s conftest.err; then
-+    grep -v '^ *+' conftest.err >conftest.er1
-+    cat conftest.er1 >&5
-+    mv -f conftest.er1 conftest.err
-+  fi
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then :
-+  ac_retval=0
-+else
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_retval=1
-+fi
-+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
-+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
-+  # interfere with the next link command; also delete a directory that is
-+  # left behind by Apple's compiler.  We do this before executing the actions.
-+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+  return $ac_retval
-+
-+} @%:@ ac_fn_c_try_link
-+
-+@%:@ ac_fn_c_try_cpp LINENO
-+@%:@ ----------------------
-+@%:@ Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-+ac_fn_c_try_cpp ()
-+{
-+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+  if { { ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
-+  ac_status=$?
-+  if test -s conftest.err; then
-+    grep -v '^ *+' conftest.err >conftest.er1
-+    cat conftest.er1 >&5
-+    mv -f conftest.er1 conftest.err
-+  fi
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; } >/dev/null && {
-+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then :
-+  ac_retval=0
-+else
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+    ac_retval=1
-+fi
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+  return $ac_retval
-+
-+} @%:@ ac_fn_c_try_cpp
-+
-+@%:@ ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
-+@%:@ -------------------------------------------------------
-+@%:@ Tests whether HEADER exists, giving a warning if it cannot be compiled using
-+@%:@ the include files in INCLUDES and setting the cache variable VAR
-+@%:@ accordingly.
-+ac_fn_c_check_header_mongrel ()
-+{
-+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-+$as_echo_n "checking for $2... " >&6; }
-+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-+  $as_echo_n "(cached) " >&6
-+fi
-+eval ac_res=\$$3
-+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+else
-+  # Is the header compilable?
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
-+$as_echo_n "checking $2 usability... " >&6; }
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+$4
-+@%:@include <$2>
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_header_compiler=yes
-+else
-+  ac_header_compiler=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
-+$as_echo "$ac_header_compiler" >&6; }
-+
-+# Is the header present?
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
-+$as_echo_n "checking $2 presence... " >&6; }
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+@%:@include <$2>
-+_ACEOF
-+if ac_fn_c_try_cpp "$LINENO"; then :
-+  ac_header_preproc=yes
-+else
-+  ac_header_preproc=no
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
-+$as_echo "$ac_header_preproc" >&6; }
-+
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
-+  yes:no: )
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
-+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-+    ;;
-+  no:yes:* )
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
-+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
-+$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
-+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
-+$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-+    ;;
-+esac
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-+$as_echo_n "checking for $2... " >&6; }
-+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  eval "$3=\$ac_header_compiler"
-+fi
-+eval ac_res=\$$3
-+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+fi
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+
-+} @%:@ ac_fn_c_check_header_mongrel
-+
-+@%:@ ac_fn_c_try_run LINENO
-+@%:@ ----------------------
-+@%:@ Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-+@%:@ that executables *can* be run.
-+ac_fn_c_try_run ()
-+{
-+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+  if { { ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_link") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
-+  { { case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; }; then :
-+  ac_retval=0
-+else
-+  $as_echo "$as_me: program exited with status $ac_status" >&5
-+       $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+       ac_retval=$ac_status
-+fi
-+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+  return $ac_retval
-+
-+} @%:@ ac_fn_c_try_run
-+
-+@%:@ ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
-+@%:@ -------------------------------------------------------
-+@%:@ Tests whether HEADER exists and can be compiled using the include files in
-+@%:@ INCLUDES, setting the cache variable VAR accordingly.
-+ac_fn_c_check_header_compile ()
-+{
-+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-+$as_echo_n "checking for $2... " >&6; }
-+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+$4
-+@%:@include <$2>
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  eval "$3=yes"
-+else
-+  eval "$3=no"
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+eval ac_res=\$$3
-+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+
-+} @%:@ ac_fn_c_check_header_compile
-+
-+@%:@ ac_fn_c_check_func LINENO FUNC VAR
-+@%:@ ----------------------------------
-+@%:@ Tests whether FUNC exists, setting the cache variable VAR accordingly
-+ac_fn_c_check_func ()
-+{
-+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-+$as_echo_n "checking for $2... " >&6; }
-+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define $2 innocuous_$2
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $2 (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef $2
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char $2 ();
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined __stub_$2 || defined __stub___$2
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
-+return $2 ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  eval "$3=yes"
-+else
-+  eval "$3=no"
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+fi
-+eval ac_res=\$$3
-+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+
-+} @%:@ ac_fn_c_check_func
-+
-+@%:@ ac_fn_c_check_decl LINENO SYMBOL VAR
-+@%:@ ------------------------------------
-+@%:@ Tests whether SYMBOL is declared, setting cache variable VAR accordingly.
-+ac_fn_c_check_decl ()
-+{
-+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+  as_decl_name=`echo $2|sed 's/ *(.*//'`
-+  as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
-+$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
-+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+$4
-+int
-+main ()
-+{
-+@%:@ifndef $as_decl_name
-+@%:@ifdef __cplusplus
-+  (void) $as_decl_use;
-+@%:@else
-+  (void) $as_decl_name;
-+@%:@endif
-+@%:@endif
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  eval "$3=yes"
-+else
-+  eval "$3=no"
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+eval ac_res=\$$3
-+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+
-+} @%:@ ac_fn_c_check_decl
-+
-+@%:@ ac_fn_c_compute_int LINENO EXPR VAR INCLUDES
-+@%:@ --------------------------------------------
-+@%:@ Tries to find the compile-time value of EXPR in a program that includes
-+@%:@ INCLUDES, setting VAR accordingly. Returns whether the value could be
-+@%:@ computed
-+ac_fn_c_compute_int ()
-+{
-+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+  if test "$cross_compiling" = yes; then
-+    # Depending upon the size, compute the lo and hi bounds.
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+$4
-+int
-+main ()
-+{
-+static int test_array @<:@1 - 2 * !(($2) >= 0)@:>@;
-+test_array @<:@0@:>@ = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_lo=0 ac_mid=0
-+  while :; do
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+$4
-+int
-+main ()
-+{
-+static int test_array @<:@1 - 2 * !(($2) <= $ac_mid)@:>@;
-+test_array @<:@0@:>@ = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_hi=$ac_mid; break
-+else
-+  as_fn_arith $ac_mid + 1 && ac_lo=$as_val
-+			if test $ac_lo -le $ac_mid; then
-+			  ac_lo= ac_hi=
-+			  break
-+			fi
-+			as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  done
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+$4
-+int
-+main ()
-+{
-+static int test_array @<:@1 - 2 * !(($2) < 0)@:>@;
-+test_array @<:@0@:>@ = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_hi=-1 ac_mid=-1
-+  while :; do
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+$4
-+int
-+main ()
-+{
-+static int test_array @<:@1 - 2 * !(($2) >= $ac_mid)@:>@;
-+test_array @<:@0@:>@ = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_lo=$ac_mid; break
-+else
-+  as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
-+			if test $ac_mid -le $ac_hi; then
-+			  ac_lo= ac_hi=
-+			  break
-+			fi
-+			as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  done
-+else
-+  ac_lo= ac_hi=
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+# Binary search between lo and hi bounds.
-+while test "x$ac_lo" != "x$ac_hi"; do
-+  as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+$4
-+int
-+main ()
-+{
-+static int test_array @<:@1 - 2 * !(($2) <= $ac_mid)@:>@;
-+test_array @<:@0@:>@ = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_hi=$ac_mid
-+else
-+  as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+done
-+case $ac_lo in @%:@((
-+?*) eval "$3=\$ac_lo"; ac_retval=0 ;;
-+'') ac_retval=1 ;;
-+esac
-+  else
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+$4
-+static long int longval () { return $2; }
-+static unsigned long int ulongval () { return $2; }
-+@%:@include <stdio.h>
-+@%:@include <stdlib.h>
-+int
-+main ()
-+{
-+
-+  FILE *f = fopen ("conftest.val", "w");
-+  if (! f)
-+    return 1;
-+  if (($2) < 0)
-+    {
-+      long int i = longval ();
-+      if (i != ($2))
-+	return 1;
-+      fprintf (f, "%ld", i);
-+    }
-+  else
-+    {
-+      unsigned long int i = ulongval ();
-+      if (i != ($2))
-+	return 1;
-+      fprintf (f, "%lu", i);
-+    }
-+  /* Do not output a trailing newline, as this causes \r\n confusion
-+     on some platforms.  */
-+  return ferror (f) || fclose (f) != 0;
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+  echo >>conftest.val; read $3 <conftest.val; ac_retval=0
-+else
-+  ac_retval=1
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
-+rm -f conftest.val
-+
-+  fi
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+  return $ac_retval
-+
-+} @%:@ ac_fn_c_compute_int
-+cat >config.log <<_ACEOF
-+This file contains any messages produced by compilers while
-+running configure, to aid debugging if configure makes a mistake.
-+
-+It was created by $as_me, which was
-+generated by GNU Autoconf 2.64.  Invocation command line was
-+
-+  $ $0 $@
-+
-+_ACEOF
-+exec 5>>config.log
-+{
-+cat <<_ASUNAME
-+## --------- ##
-+## Platform. ##
-+## --------- ##
-+
-+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-+uname -m = `(uname -m) 2>/dev/null || echo unknown`
-+uname -r = `(uname -r) 2>/dev/null || echo unknown`
-+uname -s = `(uname -s) 2>/dev/null || echo unknown`
-+uname -v = `(uname -v) 2>/dev/null || echo unknown`
-+
-+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-+
-+/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`
-+/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
-+/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`
-+
-+_ASUNAME
-+
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    $as_echo "PATH: $as_dir"
-+  done
-+IFS=$as_save_IFS
-+
-+} >&5
-+
-+cat >&5 <<_ACEOF
-+
-+
-+## ----------- ##
-+## Core tests. ##
-+## ----------- ##
-+
-+_ACEOF
-+
-+
-+# Keep a trace of the command line.
-+# Strip out --no-create and --no-recursion so they do not pile up.
-+# Strip out --silent because we don't want to record it for future runs.
-+# Also quote any args containing shell meta-characters.
-+# Make two passes to allow for proper duplicate-argument suppression.
-+ac_configure_args=
-+ac_configure_args0=
-+ac_configure_args1=
-+ac_must_keep_next=false
-+for ac_pass in 1 2
-+do
-+  for ac_arg
-+  do
-+    case $ac_arg in
-+    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-+    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-+    | -silent | --silent | --silen | --sile | --sil)
-+      continue ;;
-+    *\'*)
-+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-+    esac
-+    case $ac_pass in
-+    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
-+    2)
-+      as_fn_append ac_configure_args1 " '$ac_arg'"
-+      if test $ac_must_keep_next = true; then
-+	ac_must_keep_next=false # Got value, back to normal.
-+      else
-+	case $ac_arg in
-+	  *=* | --config-cache | -C | -disable-* | --disable-* \
-+	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-+	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-+	  | -with-* | --with-* | -without-* | --without-* | --x)
-+	    case "$ac_configure_args0 " in
-+	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-+	    esac
-+	    ;;
-+	  -* ) ac_must_keep_next=true ;;
-+	esac
-+      fi
-+      as_fn_append ac_configure_args " '$ac_arg'"
-+      ;;
-+    esac
-+  done
-+done
-+{ ac_configure_args0=; unset ac_configure_args0;}
-+{ ac_configure_args1=; unset ac_configure_args1;}
-+
-+# 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.
-+# WARNING: Use '\'' to represent an apostrophe within the trap.
-+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-+trap 'exit_status=$?
-+  # Save into config.log some information that might help in debugging.
-+  {
-+    echo
-+
-+    cat <<\_ASBOX
-+## ---------------- ##
-+## Cache variables. ##
-+## ---------------- ##
-+_ASBOX
-+    echo
-+    # The following way of writing the cache mishandles newlines in values,
-+(
-+  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-+    eval ac_val=\$$ac_var
-+    case $ac_val in #(
-+    *${as_nl}*)
-+      case $ac_var in #(
-+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-+      esac
-+      case $ac_var in #(
-+      _ | IFS | as_nl) ;; #(
-+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-+      *) { eval $ac_var=; unset $ac_var;} ;;
-+      esac ;;
-+    esac
-+  done
-+  (set) 2>&1 |
-+    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-+    *${as_nl}ac_space=\ *)
-+      sed -n \
-+	"s/'\''/'\''\\\\'\'''\''/g;
-+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-+      ;; #(
-+    *)
-+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-+      ;;
-+    esac |
-+    sort
-+)
-+    echo
-+
-+    cat <<\_ASBOX
-+## ----------------- ##
-+## Output variables. ##
-+## ----------------- ##
-+_ASBOX
-+    echo
-+    for ac_var in $ac_subst_vars
-+    do
-+      eval ac_val=\$$ac_var
-+      case $ac_val in
-+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-+      esac
-+      $as_echo "$ac_var='\''$ac_val'\''"
-+    done | sort
-+    echo
-+
-+    if test -n "$ac_subst_files"; then
-+      cat <<\_ASBOX
-+## ------------------- ##
-+## File substitutions. ##
-+## ------------------- ##
-+_ASBOX
-+      echo
-+      for ac_var in $ac_subst_files
-+      do
-+	eval ac_val=\$$ac_var
-+	case $ac_val in
-+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-+	esac
-+	$as_echo "$ac_var='\''$ac_val'\''"
-+      done | sort
-+      echo
-+    fi
-+
-+    if test -s confdefs.h; then
-+      cat <<\_ASBOX
-+## ----------- ##
-+## confdefs.h. ##
-+## ----------- ##
-+_ASBOX
-+      echo
-+      cat confdefs.h
-+      echo
-+    fi
-+    test "$ac_signal" != 0 &&
-+      $as_echo "$as_me: caught signal $ac_signal"
-+    $as_echo "$as_me: exit $exit_status"
-+  } >&5
-+  rm -f core *.core core.conftest.* &&
-+    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-+    exit $exit_status
-+' 0
-+for ac_signal in 1 2 13 15; do
-+  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
-+done
-+ac_signal=0
-+
-+# confdefs.h avoids OS command line length limits that DEFS can exceed.
-+rm -f -r conftest* confdefs.h
-+
-+$as_echo "/* confdefs.h */" > confdefs.h
-+
-+# Predefined preprocessor variables.
-+
-+cat >>confdefs.h <<_ACEOF
-+@%:@define PACKAGE_NAME "$PACKAGE_NAME"
-+_ACEOF
-+
-+cat >>confdefs.h <<_ACEOF
-+@%:@define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-+_ACEOF
-+
-+cat >>confdefs.h <<_ACEOF
-+@%:@define PACKAGE_VERSION "$PACKAGE_VERSION"
-+_ACEOF
-+
-+cat >>confdefs.h <<_ACEOF
-+@%:@define PACKAGE_STRING "$PACKAGE_STRING"
-+_ACEOF
-+
-+cat >>confdefs.h <<_ACEOF
-+@%:@define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-+_ACEOF
-+
-+cat >>confdefs.h <<_ACEOF
-+@%:@define PACKAGE_URL "$PACKAGE_URL"
-+_ACEOF
-+
-+
-+# Let the site file select an alternate cache file if it wants to.
-+# Prefer an explicitly selected file to automatically selected ones.
-+ac_site_file1=NONE
-+ac_site_file2=NONE
-+if test -n "$CONFIG_SITE"; then
-+  ac_site_file1=$CONFIG_SITE
-+elif test "x$prefix" != xNONE; then
-+  ac_site_file1=$prefix/share/config.site
-+  ac_site_file2=$prefix/etc/config.site
-+else
-+  ac_site_file1=$ac_default_prefix/share/config.site
-+  ac_site_file2=$ac_default_prefix/etc/config.site
-+fi
-+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
-+do
-+  test "x$ac_site_file" = xNONE && continue
-+  if test -r "$ac_site_file"; then
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
-+    sed 's/^/| /' "$ac_site_file" >&5
-+    . "$ac_site_file"
-+  fi
-+done
-+
-+if test -r "$cache_file"; then
-+  # Some versions of bash will fail to source /dev/null (special
-+  # files actually), so we avoid doing that.
-+  if test -f "$cache_file"; then
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-+$as_echo "$as_me: loading cache $cache_file" >&6;}
-+    case $cache_file in
-+      [\\/]* | ?:[\\/]* ) . "$cache_file";;
-+      *)                      . "./$cache_file";;
-+    esac
-+  fi
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-+$as_echo "$as_me: creating cache $cache_file" >&6;}
-+  >$cache_file
-+fi
-+
-+# Check that the precious variables saved in the cache have kept the same
-+# value.
-+ac_cache_corrupted=false
-+for ac_var in $ac_precious_vars; do
-+  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-+  eval ac_new_set=\$ac_env_${ac_var}_set
-+  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-+  eval ac_new_val=\$ac_env_${ac_var}_value
-+  case $ac_old_set,$ac_new_set in
-+    set,)
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-+      ac_cache_corrupted=: ;;
-+    ,set)
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
-+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-+      ac_cache_corrupted=: ;;
-+    ,);;
-+    *)
-+      if test "x$ac_old_val" != "x$ac_new_val"; then
-+	# differences in whitespace do not lead to failure.
-+	ac_old_val_w=`echo x $ac_old_val`
-+	ac_new_val_w=`echo x $ac_new_val`
-+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-+	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
-+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-+	  ac_cache_corrupted=:
-+	else
-+	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
-+	  eval $ac_var=\$ac_old_val
-+	fi
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
-+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
-+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
-+      fi;;
-+  esac
-+  # Pass precious variables to config.status.
-+  if test "$ac_new_set" = set; then
-+    case $ac_new_val in
-+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-+    *) ac_arg=$ac_var=$ac_new_val ;;
-+    esac
-+    case " $ac_configure_args " in
-+      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-+      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
-+    esac
-+  fi
-+done
-+if $ac_cache_corrupted; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-+  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
-+fi
-+## -------------------- ##
-+## Main body of script. ##
-+## -------------------- ##
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+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
-+
-+
-+
-+
-+
-+
-+
-+ac_aux_dir=
-+for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-+  for ac_t in install-sh install.sh shtool; do
-+    if test -f "$ac_dir/$ac_t"; then
-+      ac_aux_dir=$ac_dir
-+      ac_install_sh="$ac_aux_dir/$ac_t -c"
-+      break 2
-+    fi
-+  done
-+done
-+if test -z "$ac_aux_dir"; then
-+  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
-+fi
-+
-+# These three variables are undocumented and unsupported,
-+# and are intended to be withdrawn in a future Autoconf release.
-+# They can cause serious problems if a builder's source tree is in a directory
-+# whose full name contains unusual characters.
-+ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-+ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-+ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-+
-+
-+# Make sure we can run config.sub.
-+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-+  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
-+$as_echo_n "checking build system type... " >&6; }
-+if test "${ac_cv_build+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_build_alias=$build_alias
-+test "x$ac_build_alias" = x &&
-+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-+test "x$ac_build_alias" = x &&
-+  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
-+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-+  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-+$as_echo "$ac_cv_build" >&6; }
-+case $ac_cv_build in
-+*-*-*) ;;
-+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
-+esac
-+build=$ac_cv_build
-+ac_save_IFS=$IFS; IFS='-'
-+set x $ac_cv_build
-+shift
-+build_cpu=$1
-+build_vendor=$2
-+shift; shift
-+# Remember, the first character of IFS is used to create $*,
-+# except with old shells:
-+build_os=$*
-+IFS=$ac_save_IFS
-+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
-+$as_echo_n "checking host system type... " >&6; }
-+if test "${ac_cv_host+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test "x$host_alias" = x; then
-+  ac_cv_host=$ac_cv_build
-+else
-+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-+    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
-+fi
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-+$as_echo "$ac_cv_host" >&6; }
-+case $ac_cv_host in
-+*-*-*) ;;
-+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
-+esac
-+host=$ac_cv_host
-+ac_save_IFS=$IFS; IFS='-'
-+set x $ac_cv_host
-+shift
-+host_cpu=$1
-+host_vendor=$2
-+shift; shift
-+# Remember, the first character of IFS is used to create $*,
-+# except with old shells:
-+host_os=$*
-+IFS=$ac_save_IFS
-+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
-+$as_echo_n "checking target system type... " >&6; }
-+if test "${ac_cv_target+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test "x$target_alias" = x; then
-+  ac_cv_target=$ac_cv_host
-+else
-+  ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
-+    as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
-+fi
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5
-+$as_echo "$ac_cv_target" >&6; }
-+case $ac_cv_target in
-+*-*-*) ;;
-+*) as_fn_error "invalid value of canonical target" "$LINENO" 5;;
-+esac
-+target=$ac_cv_target
-+ac_save_IFS=$IFS; IFS='-'
-+set x $ac_cv_target
-+shift
-+target_cpu=$1
-+target_vendor=$2
-+shift; shift
-+# Remember, the first character of IFS is used to create $*,
-+# except with old shells:
-+target_os=$*
-+IFS=$ac_save_IFS
-+case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
-+
-+
-+# The aliases save the names the user supplied, while $host etc.
-+# will get canonicalized.
-+test -n "$target_alias" &&
-+  test "$program_prefix$program_suffix$program_transform_name" = \
-+    NONENONEs,x,x, &&
-+  program_prefix=${target_alias}-
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+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
-+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
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_CC+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$CC"; then
-+  ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+CC=$ac_cv_prog_CC
-+if test -n "$CC"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-+$as_echo "$CC" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$ac_cv_prog_CC"; then
-+  ac_ct_CC=$CC
-+  # Extract the first word of "gcc", so it can be a program name with args.
-+set dummy gcc; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$ac_ct_CC"; then
-+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_CC="gcc"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_CC=$ac_cv_prog_ac_ct_CC
-+if test -n "$ac_ct_CC"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-+$as_echo "$ac_ct_CC" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+  if test "x$ac_ct_CC" = x; then
-+    CC=""
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    CC=$ac_ct_CC
-+  fi
-+else
-+  CC="$ac_cv_prog_CC"
-+fi
-+
-+if test -z "$CC"; then
-+          if test -n "$ac_tool_prefix"; then
-+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}cc; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_CC+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$CC"; then
-+  ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_CC="${ac_tool_prefix}cc"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+CC=$ac_cv_prog_CC
-+if test -n "$CC"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-+$as_echo "$CC" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+  fi
-+fi
-+if test -z "$CC"; then
-+  # Extract the first word of "cc", so it can be a program name with args.
-+set dummy cc; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_CC+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$CC"; then
-+  ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+  ac_prog_rejected=no
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-+       ac_prog_rejected=yes
-+       continue
-+     fi
-+    ac_cv_prog_CC="cc"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+if test $ac_prog_rejected = yes; then
-+  # We found a bogon in the path, so make sure we never use it.
-+  set dummy $ac_cv_prog_CC
-+  shift
-+  if test $@%:@ != 0; then
-+    # We chose a different compiler from the bogus one.
-+    # However, it has the same basename, so the bogon will be chosen
-+    # first if we set CC to just the basename; use the full file name.
-+    shift
-+    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-+  fi
-+fi
-+fi
-+fi
-+CC=$ac_cv_prog_CC
-+if test -n "$CC"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-+$as_echo "$CC" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$CC"; then
-+  if test -n "$ac_tool_prefix"; then
-+  for ac_prog in cl.exe
-+  do
-+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_CC+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$CC"; then
-+  ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+CC=$ac_cv_prog_CC
-+if test -n "$CC"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-+$as_echo "$CC" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+    test -n "$CC" && break
-+  done
-+fi
-+if test -z "$CC"; then
-+  ac_ct_CC=$CC
-+  for ac_prog in cl.exe
-+do
-+  # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$ac_ct_CC"; then
-+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_CC="$ac_prog"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_CC=$ac_cv_prog_ac_ct_CC
-+if test -n "$ac_ct_CC"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-+$as_echo "$ac_ct_CC" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+  test -n "$ac_ct_CC" && break
-+done
-+
-+  if test "x$ac_ct_CC" = x; then
-+    CC=""
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    CC=$ac_ct_CC
-+  fi
-+fi
-+
-+fi
-+
-+
-+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "no acceptable C compiler found in \$PATH
-+See \`config.log' for more details." "$LINENO" 5; }
-+
-+# Provide some information about the compiler.
-+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-+set X $ac_compile
-+ac_compiler=$2
-+for ac_option in --version -v -V -qversion; do
-+  { { ac_try="$ac_compiler $ac_option >&5"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-+  ac_status=$?
-+  if test -s conftest.err; then
-+    sed '10a\
-+... rest of stderr output deleted ...
-+         10q' conftest.err >conftest.er1
-+    cat conftest.er1 >&5
-+    rm -f conftest.er1 conftest.err
-+  fi
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }
-+done
-+
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+ac_clean_files_save=$ac_clean_files
-+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
-+# 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.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-+$as_echo_n "checking for C compiler default output file name... " >&6; }
-+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-+
-+# The possible output files:
-+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
-+
-+ac_rmfiles=
-+for ac_file in $ac_files
-+do
-+  case $ac_file in
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-+    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-+  esac
-+done
-+rm -f $ac_rmfiles
-+
-+if { { ac_try="$ac_link_default"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_link_default") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then :
-+  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-+# in a Makefile.  We should not override ac_cv_exeext if it was cached,
-+# so that the user can short-circuit this test for compilers unknown to
-+# Autoconf.
-+for ac_file in $ac_files ''
-+do
-+  test -f "$ac_file" || continue
-+  case $ac_file in
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
-+	;;
-+    [ab].out )
-+	# We found the default executable, but exeext='' is most
-+	# certainly right.
-+	break;;
-+    *.* )
-+	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-+	then :; else
-+	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-+	fi
-+	# We set ac_cv_exeext here because the later test for it is not
-+	# safe: cross compilers may not add the suffix if given an `-o'
-+	# argument, so we may need to know it at that point already.
-+	# Even if this section looks crufty: it has the advantage of
-+	# actually working.
-+	break;;
-+    * )
-+	break;;
-+  esac
-+done
-+test "$ac_cv_exeext" = no && ac_cv_exeext=
-+
-+else
-+  ac_file=''
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-+$as_echo "$ac_file" >&6; }
-+if test -z "$ac_file"; then :
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ as_fn_set_status 77
-+as_fn_error "C compiler cannot create executables
-+See \`config.log' for more details." "$LINENO" 5; }; }
-+fi
-+ac_exeext=$ac_cv_exeext
-+
-+# Check that the compiler produces executables we can run.  If not, either
-+# the compiler is broken, or we cross compile.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-+$as_echo_n "checking whether the C compiler works... " >&6; }
-+# If not cross compiling, check that we can run a simple program.
-+if test "$cross_compiling" != yes; then
-+  if { ac_try='./$ac_file'
-+  { { case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; }; then
-+    cross_compiling=no
-+  else
-+    if test "$cross_compiling" = maybe; then
-+	cross_compiling=yes
-+    else
-+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "cannot run C compiled programs.
-+If you meant to cross compile, use \`--host'.
-+See \`config.log' for more details." "$LINENO" 5; }
-+    fi
-+  fi
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+
-+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
-+ac_clean_files=$ac_clean_files_save
-+# Check that the compiler produces executables we can run.  If not, either
-+# the compiler is broken, or we cross compile.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-+$as_echo_n "checking whether we are cross compiling... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-+$as_echo "$cross_compiling" >&6; }
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
-+$as_echo_n "checking for suffix of executables... " >&6; }
-+if { { ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_link") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then :
-+  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-+# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-+# work properly (i.e., refer to `conftest.exe'), while it won't with
-+# `rm'.
-+for ac_file in conftest.exe conftest conftest.*; do
-+  test -f "$ac_file" || continue
-+  case $ac_file in
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-+    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-+	  break;;
-+    * ) break;;
-+  esac
-+done
-+else
-+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "cannot compute suffix of executables: cannot compile and link
-+See \`config.log' for more details." "$LINENO" 5; }
-+fi
-+rm -f conftest$ac_cv_exeext
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-+$as_echo "$ac_cv_exeext" >&6; }
-+
-+rm -f conftest.$ac_ext
-+EXEEXT=$ac_cv_exeext
-+ac_exeext=$EXEEXT
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
-+$as_echo_n "checking for suffix of object files... " >&6; }
-+if test "${ac_cv_objext+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.o conftest.obj
-+if { { ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_compile") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then :
-+  for ac_file in conftest.o conftest.obj conftest.*; do
-+  test -f "$ac_file" || continue;
-+  case $ac_file in
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
-+    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-+       break;;
-+  esac
-+done
-+else
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "cannot compute suffix of object files: cannot compile
-+See \`config.log' for more details." "$LINENO" 5; }
-+fi
-+rm -f conftest.$ac_cv_objext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-+$as_echo "$ac_cv_objext" >&6; }
-+OBJEXT=$ac_cv_objext
-+ac_objext=$OBJEXT
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+#ifndef __GNUC__
-+       choke me
-+#endif
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_compiler_gnu=yes
-+else
-+  ac_compiler_gnu=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ac_cv_c_compiler_gnu=$ac_compiler_gnu
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-+if test $ac_compiler_gnu = yes; then
-+  GCC=yes
-+else
-+  GCC=
-+fi
-+ac_test_CFLAGS=${CFLAGS+set}
-+ac_save_CFLAGS=$CFLAGS
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-+$as_echo_n "checking whether $CC accepts -g... " >&6; }
-+if test "${ac_cv_prog_cc_g+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_save_c_werror_flag=$ac_c_werror_flag
-+   ac_c_werror_flag=yes
-+   ac_cv_prog_cc_g=no
-+   CFLAGS="-g"
-+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_prog_cc_g=yes
-+else
-+  CFLAGS=""
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  
-+else
-+  ac_c_werror_flag=$ac_save_c_werror_flag
-+	 CFLAGS="-g"
-+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_prog_cc_g=yes
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+   ac_c_werror_flag=$ac_save_c_werror_flag
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-+$as_echo "$ac_cv_prog_cc_g" >&6; }
-+if test "$ac_test_CFLAGS" = set; then
-+  CFLAGS=$ac_save_CFLAGS
-+elif test $ac_cv_prog_cc_g = yes; then
-+  if test "$GCC" = yes; then
-+    CFLAGS="-g -O2"
-+  else
-+    CFLAGS="-g"
-+  fi
-+else
-+  if test "$GCC" = yes; then
-+    CFLAGS="-O2"
-+  else
-+    CFLAGS=
-+  fi
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-+if test "${ac_cv_prog_cc_c89+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_cv_prog_cc_c89=no
-+ac_save_CC=$CC
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <stdarg.h>
-+#include <stdio.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-+struct buf { int x; };
-+FILE * (*rcsopen) (struct buf *, struct stat *, int);
-+static char *e (p, i)
-+     char **p;
-+     int i;
-+{
-+  return p[i];
-+}
-+static char *f (char * (*g) (char **, int), char **p, ...)
-+{
-+  char *s;
-+  va_list v;
-+  va_start (v,p);
-+  s = g (p, va_arg (v,int));
-+  va_end (v);
-+  return s;
-+}
-+
-+/* 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
-+   as 'x'.  The following induces an error, until -std is added to get
-+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-+   array size at least.  It's necessary to write '\x00'==0 to get something
-+   that's true only with -std.  */
-+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-+
-+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-+   inside strings and character constants.  */
-+#define FOO(x) 'x'
-+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-+
-+int test (int i, double x);
-+struct s1 {int (*f) (int a);};
-+struct s2 {int (*f) (double a);};
-+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-+int argc;
-+char **argv;
-+int
-+main ()
-+{
-+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-+do
-+  CC="$ac_save_CC $ac_arg"
-+  if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_prog_cc_c89=$ac_arg
-+fi
-+rm -f core conftest.err conftest.$ac_objext
-+  test "x$ac_cv_prog_cc_c89" != "xno" && break
-+done
-+rm -f conftest.$ac_ext
-+CC=$ac_save_CC
-+
-+fi
-+# AC_CACHE_VAL
-+case "x$ac_cv_prog_cc_c89" in
-+  x)
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-+$as_echo "none needed" >&6; } ;;
-+  xno)
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-+$as_echo "unsupported" >&6; } ;;
-+  *)
-+    CC="$CC $ac_cv_prog_cc_c89"
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-+esac
-+if test "x$ac_cv_prog_cc_c89" != xno; then :
-+  
-+fi
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+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
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
-+$as_echo_n "checking for library containing strerror... " >&6; }
-+if test "${ac_cv_search_strerror+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_func_search_save_LIBS=$LIBS
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char strerror ();
-+int
-+main ()
-+{
-+return strerror ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+for ac_lib in '' cposix; do
-+  if test -z "$ac_lib"; then
-+    ac_res="none required"
-+  else
-+    ac_res=-l$ac_lib
-+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-+  fi
-+  if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_search_strerror=$ac_res
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext
-+  if test "${ac_cv_search_strerror+set}" = set; then :
-+  break
-+fi
-+done
-+if test "${ac_cv_search_strerror+set}" = set; then :
-+  
-+else
-+  ac_cv_search_strerror=no
-+fi
-+rm conftest.$ac_ext
-+LIBS=$ac_func_search_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5
-+$as_echo "$ac_cv_search_strerror" >&6; }
-+ac_res=$ac_cv_search_strerror
-+if test "$ac_res" != no; then :
-+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-+  
-+fi
-+
-+
-+BFD_VERSION=`sed -n -e 's/^.._INIT_AUTOMAKE.*,[ 	]*\([^ 	]*\)[ 	]*).*/\1/p' < ${srcdir}/../bfd/configure.in`
-+am__api_version='1.11'
-+
-+# Find a good install program.  We prefer a C program (faster),
-+# so one script is as good as another.  But avoid the broken or
-+# incompatible versions:
-+# SysV /etc/install, /usr/sbin/install
-+# SunOS /usr/etc/install
-+# IRIX /sbin/install
-+# AIX /bin/install
-+# AmigaOS /C/install, which installs bootblocks on floppy discs
-+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-+# 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.
-+# Reject install programs that cannot install multiple files.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
-+$as_echo_n "checking for a BSD-compatible install... " >&6; }
-+if test -z "$INSTALL"; then
-+if test "${ac_cv_path_install+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    # Account for people who put trailing slashes in PATH elements.
-+case $as_dir/ in @%:@((
-+  ./ | .// | /[cC]/* | \
-+  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-+  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
-+  /usr/ucb/* ) ;;
-+  *)
-+    # OSF1 and SCO ODT 3.0 have their own names for install.
-+    # Don't use installbsd from OSF since it installs stuff as root
-+    # by default.
-+    for ac_prog in ginstall scoinst install; do
-+      for ac_exec_ext in '' $ac_executable_extensions; do
-+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
-+	  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.
-+	    :
-+	  elif test $ac_prog = install &&
-+	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-+	    # program-specific install script used by HP pwplus--don't use.
-+	    :
-+	  else
-+	    rm -rf conftest.one conftest.two conftest.dir
-+	    echo one > conftest.one
-+	    echo two > conftest.two
-+	    mkdir conftest.dir
-+	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
-+	      test -s conftest.one && test -s conftest.two &&
-+	      test -s conftest.dir/conftest.one &&
-+	      test -s conftest.dir/conftest.two
-+	    then
-+	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-+	      break 3
-+	    fi
-+	  fi
-+	fi
-+      done
-+    done
-+    ;;
-+esac
-+
-+  done
-+IFS=$as_save_IFS
-+
-+rm -rf conftest.one conftest.two conftest.dir
-+
-+fi
-+  if test "${ac_cv_path_install+set}" = set; then
-+    INSTALL=$ac_cv_path_install
-+  else
-+    # As a last resort, use the slow shell script.  Don't cache a
-+    # value for INSTALL within a source directory, because that will
-+    # break other packages using the cache if that directory is
-+    # removed, or if the value is a relative name.
-+    INSTALL=$ac_install_sh
-+  fi
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
-+$as_echo "$INSTALL" >&6; }
-+
-+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-+# It thinks the first close brace ends the variable substitution.
-+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-+
-+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-+
-+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
-+$as_echo_n "checking whether build environment is sane... " >&6; }
-+# Just in case
-+sleep 1
-+echo timestamp > conftest.file
-+# Reject unsafe characters in $srcdir or the absolute working directory
-+# name.  Accept space and tab only in the latter.
-+am_lf='
-+'
-+case `pwd` in
-+  *[\\\"\#\$\&\'\`$am_lf]*)
-+    as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
-+esac
-+case $srcdir in
-+  *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-+    as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
-+esac
-+
-+# Do `set' in a subshell so we don't clobber the current shell's
-+# arguments.  Must try -L first in case configure is actually a
-+# symlink; some systems play weird games with the mod time of symlinks
-+# (eg FreeBSD returns the mod time of the symlink's containing
-+# directory).
-+if (
-+   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-+   if test "$*" = "X"; then
-+      # -L didn't work.
-+      set X `ls -t "$srcdir/configure" conftest.file`
-+   fi
-+   rm -f conftest.file
-+   if test "$*" != "X $srcdir/configure conftest.file" \
-+      && test "$*" != "X conftest.file $srcdir/configure"; then
-+
-+      # If neither matched, then we have a broken ls.  This can happen
-+      # if, for instance, CONFIG_SHELL is bash and it inherits a
-+      # broken ls alias from the environment.  This has actually
-+      # happened.  Such a system could not be considered "sane".
-+      as_fn_error "ls -t appears to fail.  Make sure there is not a broken
-+alias in your environment" "$LINENO" 5
-+   fi
-+
-+   test "$2" = conftest.file
-+   )
-+then
-+   # Ok.
-+   :
-+else
-+   as_fn_error "newly created file is older than distributed files!
-+Check your system clock" "$LINENO" 5
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+test "$program_prefix" != NONE &&
-+  program_transform_name="s&^&$program_prefix&;$program_transform_name"
-+# Use a double $ so make ignores it.
-+test "$program_suffix" != NONE &&
-+  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-+# Double any \ or $.
-+# By default was `s,x,x', remove it if useless.
-+ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
-+program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
-+
-+# expand $ac_aux_dir to an absolute path
-+am_aux_dir=`cd $ac_aux_dir && pwd`
-+
-+if test x"${MISSING+set}" != xset; then
-+  case $am_aux_dir in
-+  *\ * | *\	*)
-+    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-+  *)
-+    MISSING="\${SHELL} $am_aux_dir/missing" ;;
-+  esac
-+fi
-+# Use eval to expand $SHELL
-+if eval "$MISSING --run true"; then
-+  am_missing_run="$MISSING --run "
-+else
-+  am_missing_run=
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
-+$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
-+fi
-+
-+if test x"${install_sh}" != xset; then
-+  case $am_aux_dir in
-+  *\ * | *\	*)
-+    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
-+  *)
-+    install_sh="\${SHELL} $am_aux_dir/install-sh"
-+  esac
-+fi
-+
-+# Installed binaries are usually stripped using `strip' when the user
-+# run `make install-strip'.  However `strip' might not be the right
-+# tool to use in cross-compilation environments, therefore Automake
-+# will honor the `STRIP' environment variable to overrule this program.
-+if test "$cross_compiling" != no; then
-+  if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}strip; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_STRIP+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$STRIP"; then
-+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+STRIP=$ac_cv_prog_STRIP
-+if test -n "$STRIP"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-+$as_echo "$STRIP" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$ac_cv_prog_STRIP"; then
-+  ac_ct_STRIP=$STRIP
-+  # Extract the first word of "strip", so it can be a program name with args.
-+set dummy strip; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$ac_ct_STRIP"; then
-+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_STRIP="strip"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-+if test -n "$ac_ct_STRIP"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-+$as_echo "$ac_ct_STRIP" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+  if test "x$ac_ct_STRIP" = x; then
-+    STRIP=":"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    STRIP=$ac_ct_STRIP
-+  fi
-+else
-+  STRIP="$ac_cv_prog_STRIP"
-+fi
-+
-+fi
-+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
-+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
-+if test -z "$MKDIR_P"; then
-+  if test "${ac_cv_path_mkdir+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_prog in mkdir gmkdir; do
-+	 for ac_exec_ext in '' $ac_executable_extensions; do
-+	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
-+	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-+	     'mkdir (GNU coreutils) '* | \
-+	     'mkdir (coreutils) '* | \
-+	     'mkdir (fileutils) '4.1*)
-+	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
-+	       break 3;;
-+	   esac
-+	 done
-+       done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+
-+  if test "${ac_cv_path_mkdir+set}" = set; then
-+    MKDIR_P="$ac_cv_path_mkdir -p"
-+  else
-+    # As a last resort, use the slow shell script.  Don't cache a
-+    # value for MKDIR_P within a source directory, because that will
-+    # break other packages using the cache if that directory is
-+    # removed, or if the value is a relative name.
-+    test -d ./--version && rmdir ./--version
-+    MKDIR_P="$ac_install_sh -d"
-+  fi
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
-+$as_echo "$MKDIR_P" >&6; }
-+
-+mkdir_p="$MKDIR_P"
-+case $mkdir_p in
-+  [\\/$]* | ?:[\\/]*) ;;
-+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-+esac
-+
-+for ac_prog in gawk mawk nawk awk
-+do
-+  # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_AWK+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$AWK"; then
-+  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_AWK="$ac_prog"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+AWK=$ac_cv_prog_AWK
-+if test -n "$AWK"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-+$as_echo "$AWK" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+  test -n "$AWK" && break
-+done
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
-+set x ${MAKE-make}
-+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat >conftest.make <<\_ACEOF
-+SHELL = /bin/sh
-+all:
-+	@echo '@@@%%%=$(MAKE)=@@@%%%'
-+_ACEOF
-+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-+case `${MAKE-make} -f conftest.make 2>/dev/null` in
-+  *@@@%%%=?*=@@@%%%*)
-+    eval ac_cv_prog_make_${ac_make}_set=yes;;
-+  *)
-+    eval ac_cv_prog_make_${ac_make}_set=no;;
-+esac
-+rm -f conftest.make
-+fi
-+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+  SET_MAKE=
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+  SET_MAKE="MAKE=${MAKE-make}"
-+fi
-+
-+rm -rf .tst 2>/dev/null
-+mkdir .tst 2>/dev/null
-+if test -d .tst; then
-+  am__leading_dot=.
-+else
-+  am__leading_dot=_
-+fi
-+rmdir .tst 2>/dev/null
-+
-+DEPDIR="${am__leading_dot}deps"
-+
-+ac_config_commands="$ac_config_commands depfiles"
-+
-+
-+am_make=${MAKE-make}
-+cat > confinc << 'END'
-+am__doit:
-+	@echo this is the am__doit target
-+.PHONY: am__doit
-+END
-+# If we don't find an include directive, just comment out the code.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
-+$as_echo_n "checking for style of include used by $am_make... " >&6; }
-+am__include="#"
-+am__quote=
-+_am_result=none
-+# First try GNU make style include.
-+echo "include confinc" > confmf
-+# Ignore all kinds of additional output from `make'.
-+case `$am_make -s -f confmf 2> /dev/null` in #(
-+*the\ am__doit\ target*)
-+  am__include=include
-+  am__quote=
-+  _am_result=GNU
-+  ;;
-+esac
-+# Now try BSD make style include.
-+if test "$am__include" = "#"; then
-+   echo '.include "confinc"' > confmf
-+   case `$am_make -s -f confmf 2> /dev/null` in #(
-+   *the\ am__doit\ target*)
-+     am__include=.include
-+     am__quote="\""
-+     _am_result=BSD
-+     ;;
-+   esac
-+fi
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
-+$as_echo "$_am_result" >&6; }
-+rm -f confinc confmf
-+
-+@%:@ Check whether --enable-dependency-tracking was given.
-+if test "${enable_dependency_tracking+set}" = set; then :
-+  enableval=$enable_dependency_tracking; 
-+fi
-+
-+if test "x$enable_dependency_tracking" != xno; then
-+  am_depcomp="$ac_aux_dir/depcomp"
-+  AMDEPBACKSLASH='\'
-+fi
-+ if test "x$enable_dependency_tracking" != xno; then
-+  AMDEP_TRUE=
-+  AMDEP_FALSE='#'
-+else
-+  AMDEP_TRUE='#'
-+  AMDEP_FALSE=
-+fi
-+
-+
-+if test "`cd $srcdir && pwd`" != "`pwd`"; then
-+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-+  # is not polluted with repeated "-I."
-+  am__isrc=' -I$(srcdir)'
-+  # test to see if srcdir already configured
-+  if test -f $srcdir/config.status; then
-+    as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
-+  fi
-+fi
-+
-+# test whether we have cygpath
-+if test -z "$CYGPATH_W"; then
-+  if (cygpath --version) >/dev/null 2>/dev/null; then
-+    CYGPATH_W='cygpath -w'
-+  else
-+    CYGPATH_W=echo
-+  fi
-+fi
-+
-+
-+# Define the identity of the package.
-+ PACKAGE=ld
-+ VERSION=${BFD_VERSION}
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+@%:@define PACKAGE "$PACKAGE"
-+_ACEOF
-+
-+ 
-+cat >>confdefs.h <<_ACEOF
-+@%:@define VERSION "$VERSION"
-+_ACEOF
-+
-+# Some tools Automake needs.
-+
-+ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
-+
-+
-+AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
-+
-+
-+AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
-+
-+
-+AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
-+
-+
-+MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-+
-+# We need awk for the "check" target.  The system "awk" is bad on
-+# some platforms.
-+# Always define AMTAR for backward compatibility.
-+
-+AMTAR=${AMTAR-"${am_missing_run}tar"}
-+
-+am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
-+
-+
-+
-+
-+depcc="$CC"   am_compiler_list=
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-+$as_echo_n "checking dependency style of $depcc... " >&6; }
-+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-+  # We make a subdir and do the tests there.  Otherwise we can end up
-+  # making bogus files that we don't know about and never remove.  For
-+  # instance it was reported that on HP-UX the gcc test will end up
-+  # making a dummy file named `D' -- because `-MD' means `put the output
-+  # in D'.
-+  mkdir conftest.dir
-+  # Copy depcomp to subdir because otherwise we won't find it if we're
-+  # using a relative directory.
-+  cp "$am_depcomp" conftest.dir
-+  cd conftest.dir
-+  # We will build objects and dependencies in a subdirectory because
-+  # it helps to detect inapplicable dependency modes.  For instance
-+  # both Tru64's cc and ICC support -MD to output dependencies as a
-+  # side effect of compilation, but ICC will put the dependencies in
-+  # the current directory while Tru64 will put them in the object
-+  # directory.
-+  mkdir sub
-+
-+  am_cv_CC_dependencies_compiler_type=none
-+  if test "$am_compiler_list" = ""; then
-+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-+  fi
-+  am__universal=false
-+  case " $depcc " in #(
-+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-+     esac
-+
-+  for depmode in $am_compiler_list; do
-+    # Setup a source with many dependencies, because some compilers
-+    # like to wrap large dependency lists on column 80 (with \), and
-+    # we should not choose a depcomp mode which is confused by this.
-+    #
-+    # We need to recreate these files for each test, as the compiler may
-+    # overwrite some of them when testing with obscure command lines.
-+    # This happens at least with the AIX C compiler.
-+    : > sub/conftest.c
-+    for i in 1 2 3 4 5 6; do
-+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+      # Solaris 8's {/usr,}/bin/sh.
-+      touch sub/conftst$i.h
-+    done
-+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-+
-+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-+    # mode.  It turns out that the SunPro C++ compiler does not properly
-+    # handle `-M -o', and we need to detect this.  Also, some Intel
-+    # versions had trouble with output in subdirs
-+    am__obj=sub/conftest.${OBJEXT-o}
-+    am__minus_obj="-o $am__obj"
-+    case $depmode in
-+    gcc)
-+      # This depmode causes a compiler race in universal mode.
-+      test "$am__universal" = false || continue
-+      ;;
-+    nosideeffect)
-+      # after this tag, mechanisms are not by side-effect, so they'll
-+      # only be used when explicitly requested
-+      if test "x$enable_dependency_tracking" = xyes; then
-+	continue
-+      else
-+	break
-+      fi
-+      ;;
-+    msvisualcpp | msvcmsys)
-+      # This compiler won't grok `-c -o', but also, the minuso test has
-+      # not run yet.  These depmodes are late enough in the game, and
-+      # so weak that their functioning should not be impacted.
-+      am__obj=conftest.${OBJEXT-o}
-+      am__minus_obj=
-+      ;;
-+    none) break ;;
-+    esac
-+    if depmode=$depmode \
-+       source=sub/conftest.c object=$am__obj \
-+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-+         >/dev/null 2>conftest.err &&
-+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-+      # icc doesn't choke on unknown options, it will just issue warnings
-+      # or remarks (even with -Werror).  So we grep stderr for any message
-+      # that says an option was ignored or not supported.
-+      # When given -MP, icc 7.0 and 7.1 complain thusly:
-+      #   icc: Command line warning: ignoring option '-M'; no argument required
-+      # The diagnosis changed in icc 8.0:
-+      #   icc: Command line remark: option '-MP' not supported
-+      if (grep 'ignoring option' conftest.err ||
-+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-+        am_cv_CC_dependencies_compiler_type=$depmode
-+        break
-+      fi
-+    fi
-+  done
-+
-+  cd ..
-+  rm -rf conftest.dir
-+else
-+  am_cv_CC_dependencies_compiler_type=none
-+fi
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
-+$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
-+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-+
-+ if 
-+  test "x$enable_dependency_tracking" != xno \
-+  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-+  am__fastdepCC_TRUE=
-+  am__fastdepCC_FALSE='#'
-+else
-+  am__fastdepCC_TRUE='#'
-+  am__fastdepCC_FALSE=
-+fi
-+
-+
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
-+$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
-+    @%:@ Check whether --enable-maintainer-mode was given.
-+if test "${enable_maintainer_mode+set}" = set; then :
-+  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
-+else
-+  USE_MAINTAINER_MODE=no
-+fi
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
-+$as_echo "$USE_MAINTAINER_MODE" >&6; }
-+   if test $USE_MAINTAINER_MODE = yes; then
-+  MAINTAINER_MODE_TRUE=
-+  MAINTAINER_MODE_FALSE='#'
-+else
-+  MAINTAINER_MODE_TRUE='#'
-+  MAINTAINER_MODE_FALSE=
-+fi
-+
-+  MAINT=$MAINTAINER_MODE_TRUE
-+  
-+
-+
-+
-+@%:@ Check whether --with-lib-path was given.
-+if test "${with_lib_path+set}" = set; then :
-+  withval=$with_lib_path; LIB_PATH=$withval
-+fi
-+
-+@%:@ Check whether --enable-targets was given.
-+if test "${enable_targets+set}" = set; then :
-+  enableval=$enable_targets; case "${enableval}" in
-+  yes | "") as_fn_error "enable-targets option must specify target names or 'all'" "$LINENO" 5
-+            ;;
-+  no)       enable_targets= ;;
-+  *)        enable_targets=$enableval ;;
-+esac
-+fi
-+@%:@ Check whether --enable-64-bit-bfd was given.
-+if test "${enable_64_bit_bfd+set}" = set; then :
-+  enableval=$enable_64_bit_bfd; case "${enableval}" in
-+  yes)  want64=true  ;;
-+  no)   want64=false ;;
-+  *)    as_fn_error "bad value ${enableval} for 64-bit-bfd option" "$LINENO" 5 ;;
-+esac
-+else
-+  want64=false
-+fi
-+
-+
-+@%:@ Check whether --with-sysroot was given.
-+if test "${with_sysroot+set}" = set; then :
-+  withval=$with_sysroot; 
-+ case ${with_sysroot} in
-+ yes) TARGET_SYSTEM_ROOT='${exec_prefix}/${target_alias}/sys-root' ;;
-+ *) TARGET_SYSTEM_ROOT=$with_sysroot ;;
-+ esac
-+
-+ TARGET_SYSTEM_ROOT_DEFINE='-DTARGET_SYSTEM_ROOT=\"$(TARGET_SYSTEM_ROOT)\"'
-+ use_sysroot=yes
-+
-+ if test "x$prefix" = xNONE; then
-+  test_prefix=/usr/local
-+ else
-+  test_prefix=$prefix
-+ fi
-+ if test "x$exec_prefix" = xNONE; then
-+  test_exec_prefix=$test_prefix
-+ else
-+  test_exec_prefix=$exec_prefix
-+ fi
-+ case ${TARGET_SYSTEM_ROOT} in
-+ "${test_prefix}"|"${test_prefix}/"*|\
-+ "${test_exec_prefix}"|"${test_exec_prefix}/"*|\
-+ '${prefix}'|'${prefix}/'*|\
-+ '${exec_prefix}'|'${exec_prefix}/'*)
-+   t="$TARGET_SYSTEM_ROOT_DEFINE -DTARGET_SYSTEM_ROOT_RELOCATABLE"
-+   TARGET_SYSTEM_ROOT_DEFINE="$t"
-+   ;;
-+ esac
-+
-+else
-+  
-+ use_sysroot=no
-+ TARGET_SYSTEM_ROOT=
-+ TARGET_SYSTEM_ROOT_DEFINE='-DTARGET_SYSTEM_ROOT=\"\"'
-+
-+fi
-+
-+
-+
-+
-+
-+@%:@ Check whether --enable-gold was given.
-+if test "${enable_gold+set}" = set; then :
-+  enableval=$enable_gold; case "${enableval}" in 
-+ default)
-+   install_as_default=no
-+   installed_linker=ld.bfd
-+   ;;
-+ yes|no)
-+   install_as_default=yes
-+   installed_linker=ld.bfd
-+   ;;
-+ *)
-+   as_fn_error "invalid --enable-gold argument" "$LINENO" 5
-+   ;;
-+ esac
-+else
-+  install_as_default=yes
-+ installed_linker=ld.bfd
-+fi
-+
-+
-+
-+
-+@%:@ Check whether --enable-got was given.
-+if test "${enable_got+set}" = set; then :
-+  enableval=$enable_got; case "${enableval}" in
-+  target | single | negative | multigot)  got_handling=$enableval ;;
-+  *)  as_fn_error "bad value ${enableval} for --enable-got option" "$LINENO" 5 ;;
-+esac
-+else
-+  got_handling=target
-+fi
-+
-+
-+case "${got_handling}" in
-+  target)
-+    
-+$as_echo "@%:@define GOT_HANDLING_DEFAULT GOT_HANDLING_TARGET_DEFAULT" >>confdefs.h
-+ ;;
-+  single)
-+    
-+$as_echo "@%:@define GOT_HANDLING_DEFAULT GOT_HANDLING_SINGLE" >>confdefs.h
-+ ;;
-+  negative)
-+    
-+$as_echo "@%:@define GOT_HANDLING_DEFAULT GOT_HANDLING_NEGATIVE" >>confdefs.h
-+ ;;
-+  multigot)
-+    
-+$as_echo "@%:@define GOT_HANDLING_DEFAULT GOT_HANDLING_MULTIGOT" >>confdefs.h
-+ ;;
-+  *)  as_fn_error "bad value ${got_handling} for --enable-got option" "$LINENO" 5 ;;
-+esac
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+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
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-+$as_echo_n "checking how to run the C preprocessor... " >&6; }
-+# On Suns, sometimes $CPP names a directory.
-+if test -n "$CPP" && test -d "$CPP"; then
-+  CPP=
-+fi
-+if test -z "$CPP"; then
-+  if test "${ac_cv_prog_CPP+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+      # Double quotes because CPP needs to be expanded
-+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-+    do
-+      ac_preproc_ok=false
-+for ac_c_preproc_warn_flag in '' yes
-+do
-+  # Use a header file that comes with gcc, so configuring glibc
-+  # with a fresh cross-compiler works.
-+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+  # <limits.h> exists even on freestanding compilers.
-+  # On the NeXT, cc -E runs the code through the compiler's parser,
-+  # not just through cpp. "Syntax error" is here to catch this case.
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+@%:@ifdef __STDC__
-+@%:@ include <limits.h>
-+@%:@else
-+@%:@ include <assert.h>
-+@%:@endif
-+		     Syntax error
-+_ACEOF
-+if ac_fn_c_try_cpp "$LINENO"; then :
-+  
-+else
-+  # Broken: fails on valid input.
-+continue
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+
-+  # OK, works on sane cases.  Now check whether nonexistent headers
-+  # can be detected and how.
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+@%:@include <ac_nonexistent.h>
-+_ACEOF
-+if ac_fn_c_try_cpp "$LINENO"; then :
-+  # Broken: success on invalid input.
-+continue
-+else
-+  # Passes both tests.
-+ac_preproc_ok=:
-+break
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+
-+done
-+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-+rm -f conftest.err conftest.$ac_ext
-+if $ac_preproc_ok; then :
-+  break
-+fi
-+
-+    done
-+    ac_cv_prog_CPP=$CPP
-+  
-+fi
-+  CPP=$ac_cv_prog_CPP
-+else
-+  ac_cv_prog_CPP=$CPP
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-+$as_echo "$CPP" >&6; }
-+ac_preproc_ok=false
-+for ac_c_preproc_warn_flag in '' yes
-+do
-+  # Use a header file that comes with gcc, so configuring glibc
-+  # with a fresh cross-compiler works.
-+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+  # <limits.h> exists even on freestanding compilers.
-+  # On the NeXT, cc -E runs the code through the compiler's parser,
-+  # not just through cpp. "Syntax error" is here to catch this case.
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+@%:@ifdef __STDC__
-+@%:@ include <limits.h>
-+@%:@else
-+@%:@ include <assert.h>
-+@%:@endif
-+		     Syntax error
-+_ACEOF
-+if ac_fn_c_try_cpp "$LINENO"; then :
-+  
-+else
-+  # Broken: fails on valid input.
-+continue
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+
-+  # OK, works on sane cases.  Now check whether nonexistent headers
-+  # can be detected and how.
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+@%:@include <ac_nonexistent.h>
-+_ACEOF
-+if ac_fn_c_try_cpp "$LINENO"; then :
-+  # Broken: success on invalid input.
-+continue
-+else
-+  # Passes both tests.
-+ac_preproc_ok=:
-+break
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+
-+done
-+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-+rm -f conftest.err conftest.$ac_ext
-+if $ac_preproc_ok; then :
-+  
-+else
-+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "C preprocessor \"$CPP\" fails sanity check
-+See \`config.log' for more details." "$LINENO" 5; }
-+fi
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+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
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
-+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-+if test "${ac_cv_path_GREP+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -z "$GREP"; then
-+  ac_path_GREP_found=false
-+  # Loop through the user's path and test for each of PROGNAME-LIST
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_prog in grep ggrep; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-+      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-+# Check for GNU ac_path_GREP and select it if it is found.
-+  # Check for GNU $ac_path_GREP
-+case `"$ac_path_GREP" --version 2>&1` in
-+*GNU*)
-+  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-+*)
-+  ac_count=0
-+  $as_echo_n 0123456789 >"conftest.in"
-+  while :
-+  do
-+    cat "conftest.in" "conftest.in" >"conftest.tmp"
-+    mv "conftest.tmp" "conftest.in"
-+    cp "conftest.in" "conftest.nl"
-+    $as_echo 'GREP' >> "conftest.nl"
-+    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-+    as_fn_arith $ac_count + 1 && ac_count=$as_val
-+    if test $ac_count -gt ${ac_path_GREP_max-0}; then
-+      # Best one so far, save it but keep looking for a better one
-+      ac_cv_path_GREP="$ac_path_GREP"
-+      ac_path_GREP_max=$ac_count
-+    fi
-+    # 10*(2^10) chars as input seems more than enough
-+    test $ac_count -gt 10 && break
-+  done
-+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-+esac
-+
-+      $ac_path_GREP_found && break 3
-+    done
-+  done
-+  done
-+IFS=$as_save_IFS
-+  if test -z "$ac_cv_path_GREP"; then
-+    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-+  fi
-+else
-+  ac_cv_path_GREP=$GREP
-+fi
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-+$as_echo "$ac_cv_path_GREP" >&6; }
-+ GREP="$ac_cv_path_GREP"
-+ 
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-+$as_echo_n "checking for egrep... " >&6; }
-+if test "${ac_cv_path_EGREP+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-+   then ac_cv_path_EGREP="$GREP -E"
-+   else
-+     if test -z "$EGREP"; then
-+  ac_path_EGREP_found=false
-+  # Loop through the user's path and test for each of PROGNAME-LIST
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_prog in egrep; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-+      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-+# Check for GNU ac_path_EGREP and select it if it is found.
-+  # Check for GNU $ac_path_EGREP
-+case `"$ac_path_EGREP" --version 2>&1` in
-+*GNU*)
-+  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-+*)
-+  ac_count=0
-+  $as_echo_n 0123456789 >"conftest.in"
-+  while :
-+  do
-+    cat "conftest.in" "conftest.in" >"conftest.tmp"
-+    mv "conftest.tmp" "conftest.in"
-+    cp "conftest.in" "conftest.nl"
-+    $as_echo 'EGREP' >> "conftest.nl"
-+    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-+    as_fn_arith $ac_count + 1 && ac_count=$as_val
-+    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-+      # Best one so far, save it but keep looking for a better one
-+      ac_cv_path_EGREP="$ac_path_EGREP"
-+      ac_path_EGREP_max=$ac_count
-+    fi
-+    # 10*(2^10) chars as input seems more than enough
-+    test $ac_count -gt 10 && break
-+  done
-+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-+esac
-+
-+      $ac_path_EGREP_found && break 3
-+    done
-+  done
-+  done
-+IFS=$as_save_IFS
-+  if test -z "$ac_cv_path_EGREP"; then
-+    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-+  fi
-+else
-+  ac_cv_path_EGREP=$EGREP
-+fi
-+
-+   fi
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-+$as_echo "$ac_cv_path_EGREP" >&6; }
-+ EGREP="$ac_cv_path_EGREP"
-+ 
-+
-+
-+GCC_WARN_CFLAGS="-W -Wall -Wstrict-prototypes -Wmissing-prototypes"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+__GNUC__
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "^[0-3]$" >/dev/null 2>&1; then :
-+  
-+else
-+  GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Wshadow"
-+fi
-+rm -f conftest*
-+
-+
-+@%:@ Check whether --enable-werror was given.
-+if test "${enable_werror+set}" = set; then :
-+  enableval=$enable_werror; case "${enableval}" in
-+     yes | y) ERROR_ON_WARNING="yes" ;;
-+     no | n)  ERROR_ON_WARNING="no" ;;
-+     *) as_fn_error "bad value ${enableval} for --enable-werror" "$LINENO" 5 ;;
-+   esac
-+fi
-+
-+
-+# Disable -Wformat by default when using gcc on mingw
-+case "${host}" in
-+  *-*-mingw32*)
-+    if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
-+      GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Wno-format"
-+    fi
-+    ;;
-+  *) ;;
-+esac
-+
-+# Enable -Werror by default when using gcc
-+if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
-+    ERROR_ON_WARNING=yes
-+fi
-+
-+NO_WERROR=
-+if test "${ERROR_ON_WARNING}" = yes ; then
-+    GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Werror"
-+    NO_WERROR="-Wno-error"
-+fi
-+		   
-+if test "${GCC}" = yes ; then
-+  WARN_CFLAGS="${GCC_WARN_CFLAGS}"
-+fi
-+
-+@%:@ Check whether --enable-build-warnings was given.
-+if test "${enable_build_warnings+set}" = set; then :
-+  enableval=$enable_build_warnings; case "${enableval}" in
-+  yes)	WARN_CFLAGS="${GCC_WARN_CFLAGS}";;
-+  no)	if test "${GCC}" = yes ; then
-+	  WARN_CFLAGS="-w"
-+	fi;;
-+  ,*)   t=`echo "${enableval}" | sed -e "s/,/ /g"`
-+        WARN_CFLAGS="${GCC_WARN_CFLAGS} ${t}";;
-+  *,)   t=`echo "${enableval}" | sed -e "s/,/ /g"`
-+        WARN_CFLAGS="${t} ${GCC_WARN_CFLAGS}";;
-+  *)    WARN_CFLAGS=`echo "${enableval}" | sed -e "s/,/ /g"`;;
-+esac
-+fi
-+
-+
-+if test x"$silent" != x"yes" && test x"$WARN_CFLAGS" != x""; then
-+  echo "Setting warning flags = $WARN_CFLAGS" 6>&1
-+fi
-+
-+
-+
-+
-+
-+ac_config_headers="$ac_config_headers config.h:config.in"
-+
-+
-+if test -z "$target" ; then
-+    as_fn_error "Unrecognized target system type; please check config.sub." "$LINENO" 5
-+fi
-+if test -z "$host" ; then
-+    as_fn_error "Unrecognized host system type; please check config.sub." "$LINENO" 5
-+fi
-+
-+# host-specific stuff:
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+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
-+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
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_CC+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$CC"; then
-+  ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+CC=$ac_cv_prog_CC
-+if test -n "$CC"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-+$as_echo "$CC" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$ac_cv_prog_CC"; then
-+  ac_ct_CC=$CC
-+  # Extract the first word of "gcc", so it can be a program name with args.
-+set dummy gcc; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$ac_ct_CC"; then
-+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_CC="gcc"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_CC=$ac_cv_prog_ac_ct_CC
-+if test -n "$ac_ct_CC"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-+$as_echo "$ac_ct_CC" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+  if test "x$ac_ct_CC" = x; then
-+    CC=""
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    CC=$ac_ct_CC
-+  fi
-+else
-+  CC="$ac_cv_prog_CC"
-+fi
-+
-+if test -z "$CC"; then
-+          if test -n "$ac_tool_prefix"; then
-+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}cc; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_CC+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$CC"; then
-+  ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_CC="${ac_tool_prefix}cc"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+CC=$ac_cv_prog_CC
-+if test -n "$CC"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-+$as_echo "$CC" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+  fi
-+fi
-+if test -z "$CC"; then
-+  # Extract the first word of "cc", so it can be a program name with args.
-+set dummy cc; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_CC+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$CC"; then
-+  ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+  ac_prog_rejected=no
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-+       ac_prog_rejected=yes
-+       continue
-+     fi
-+    ac_cv_prog_CC="cc"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+if test $ac_prog_rejected = yes; then
-+  # We found a bogon in the path, so make sure we never use it.
-+  set dummy $ac_cv_prog_CC
-+  shift
-+  if test $@%:@ != 0; then
-+    # We chose a different compiler from the bogus one.
-+    # However, it has the same basename, so the bogon will be chosen
-+    # first if we set CC to just the basename; use the full file name.
-+    shift
-+    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-+  fi
-+fi
-+fi
-+fi
-+CC=$ac_cv_prog_CC
-+if test -n "$CC"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-+$as_echo "$CC" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$CC"; then
-+  if test -n "$ac_tool_prefix"; then
-+  for ac_prog in cl.exe
-+  do
-+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_CC+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$CC"; then
-+  ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+CC=$ac_cv_prog_CC
-+if test -n "$CC"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-+$as_echo "$CC" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+    test -n "$CC" && break
-+  done
-+fi
-+if test -z "$CC"; then
-+  ac_ct_CC=$CC
-+  for ac_prog in cl.exe
-+do
-+  # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$ac_ct_CC"; then
-+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_CC="$ac_prog"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_CC=$ac_cv_prog_ac_ct_CC
-+if test -n "$ac_ct_CC"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-+$as_echo "$ac_ct_CC" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+  test -n "$ac_ct_CC" && break
-+done
-+
-+  if test "x$ac_ct_CC" = x; then
-+    CC=""
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    CC=$ac_ct_CC
-+  fi
-+fi
-+
-+fi
-+
-+
-+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "no acceptable C compiler found in \$PATH
-+See \`config.log' for more details." "$LINENO" 5; }
-+
-+# Provide some information about the compiler.
-+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-+set X $ac_compile
-+ac_compiler=$2
-+for ac_option in --version -v -V -qversion; do
-+  { { ac_try="$ac_compiler $ac_option >&5"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-+  ac_status=$?
-+  if test -s conftest.err; then
-+    sed '10a\
-+... rest of stderr output deleted ...
-+         10q' conftest.err >conftest.er1
-+    cat conftest.er1 >&5
-+    rm -f conftest.er1 conftest.err
-+  fi
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }
-+done
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+#ifndef __GNUC__
-+       choke me
-+#endif
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_compiler_gnu=yes
-+else
-+  ac_compiler_gnu=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ac_cv_c_compiler_gnu=$ac_compiler_gnu
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-+if test $ac_compiler_gnu = yes; then
-+  GCC=yes
-+else
-+  GCC=
-+fi
-+ac_test_CFLAGS=${CFLAGS+set}
-+ac_save_CFLAGS=$CFLAGS
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-+$as_echo_n "checking whether $CC accepts -g... " >&6; }
-+if test "${ac_cv_prog_cc_g+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_save_c_werror_flag=$ac_c_werror_flag
-+   ac_c_werror_flag=yes
-+   ac_cv_prog_cc_g=no
-+   CFLAGS="-g"
-+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_prog_cc_g=yes
-+else
-+  CFLAGS=""
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  
-+else
-+  ac_c_werror_flag=$ac_save_c_werror_flag
-+	 CFLAGS="-g"
-+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_prog_cc_g=yes
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+   ac_c_werror_flag=$ac_save_c_werror_flag
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-+$as_echo "$ac_cv_prog_cc_g" >&6; }
-+if test "$ac_test_CFLAGS" = set; then
-+  CFLAGS=$ac_save_CFLAGS
-+elif test $ac_cv_prog_cc_g = yes; then
-+  if test "$GCC" = yes; then
-+    CFLAGS="-g -O2"
-+  else
-+    CFLAGS="-g"
-+  fi
-+else
-+  if test "$GCC" = yes; then
-+    CFLAGS="-O2"
-+  else
-+    CFLAGS=
-+  fi
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-+if test "${ac_cv_prog_cc_c89+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_cv_prog_cc_c89=no
-+ac_save_CC=$CC
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <stdarg.h>
-+#include <stdio.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-+struct buf { int x; };
-+FILE * (*rcsopen) (struct buf *, struct stat *, int);
-+static char *e (p, i)
-+     char **p;
-+     int i;
-+{
-+  return p[i];
-+}
-+static char *f (char * (*g) (char **, int), char **p, ...)
-+{
-+  char *s;
-+  va_list v;
-+  va_start (v,p);
-+  s = g (p, va_arg (v,int));
-+  va_end (v);
-+  return s;
-+}
-+
-+/* 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
-+   as 'x'.  The following induces an error, until -std is added to get
-+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-+   array size at least.  It's necessary to write '\x00'==0 to get something
-+   that's true only with -std.  */
-+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-+
-+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-+   inside strings and character constants.  */
-+#define FOO(x) 'x'
-+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-+
-+int test (int i, double x);
-+struct s1 {int (*f) (int a);};
-+struct s2 {int (*f) (double a);};
-+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-+int argc;
-+char **argv;
-+int
-+main ()
-+{
-+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-+do
-+  CC="$ac_save_CC $ac_arg"
-+  if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_prog_cc_c89=$ac_arg
-+fi
-+rm -f core conftest.err conftest.$ac_objext
-+  test "x$ac_cv_prog_cc_c89" != "xno" && break
-+done
-+rm -f conftest.$ac_ext
-+CC=$ac_save_CC
-+
-+fi
-+# AC_CACHE_VAL
-+case "x$ac_cv_prog_cc_c89" in
-+  x)
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-+$as_echo "none needed" >&6; } ;;
-+  xno)
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-+$as_echo "unsupported" >&6; } ;;
-+  *)
-+    CC="$CC $ac_cv_prog_cc_c89"
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-+esac
-+if test "x$ac_cv_prog_cc_c89" != xno; then :
-+  
-+fi
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+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
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-+$as_echo_n "checking for ANSI C header files... " >&6; }
-+if test "${ac_cv_header_stdc+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <stdlib.h>
-+#include <stdarg.h>
-+#include <string.h>
-+#include <float.h>
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_header_stdc=yes
-+else
-+  ac_cv_header_stdc=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+if test $ac_cv_header_stdc = yes; then
-+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <string.h>
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "memchr" >/dev/null 2>&1; then :
-+  
-+else
-+  ac_cv_header_stdc=no
-+fi
-+rm -f conftest*
-+
-+fi
-+
-+if test $ac_cv_header_stdc = yes; then
-+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <stdlib.h>
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "free" >/dev/null 2>&1; then :
-+  
-+else
-+  ac_cv_header_stdc=no
-+fi
-+rm -f conftest*
-+
-+fi
-+
-+if test $ac_cv_header_stdc = yes; then
-+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-+  if test "$cross_compiling" = yes; then :
-+  :
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <ctype.h>
-+#include <stdlib.h>
-+#if ((' ' & 0x0FF) == 0x020)
-+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-+#else
-+# define ISLOWER(c) \
-+		   (('a' <= (c) && (c) <= 'i') \
-+		     || ('j' <= (c) && (c) <= 'r') \
-+		     || ('s' <= (c) && (c) <= 'z'))
-+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-+#endif
-+
-+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-+int
-+main ()
-+{
-+  int i;
-+  for (i = 0; i < 256; i++)
-+    if (XOR (islower (i), ISLOWER (i))
-+	|| toupper (i) != TOUPPER (i))
-+      return 2;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+  
-+else
-+  ac_cv_header_stdc=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
-+
-+fi
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-+$as_echo "$ac_cv_header_stdc" >&6; }
-+if test $ac_cv_header_stdc = yes; then
-+  
-+$as_echo "@%:@define STDC_HEADERS 1" >>confdefs.h
-+
-+fi
-+
-+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-+		  inttypes.h stdint.h unistd.h
-+do :
-+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-+"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+@%:@define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+ 
-+fi
-+
-+done
-+
-+
-+
-+  ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
-+if test "x$ac_cv_header_minix_config_h" = x""yes; then :
-+  MINIX=yes
-+else
-+  MINIX=
-+fi
-+
-+
-+  if test "$MINIX" = yes; then
-+    
-+$as_echo "@%:@define _POSIX_SOURCE 1" >>confdefs.h
-+
-+    
-+$as_echo "@%:@define _POSIX_1_SOURCE 2" >>confdefs.h
-+
-+    
-+$as_echo "@%:@define _MINIX 1" >>confdefs.h
-+
-+  fi
-+
-+  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
-+$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
-+if test "${ac_cv_safe_to_define___extensions__+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+#	  define __EXTENSIONS__ 1
-+	  $ac_includes_default
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_safe_to_define___extensions__=yes
-+else
-+  ac_cv_safe_to_define___extensions__=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
-+$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
-+  test $ac_cv_safe_to_define___extensions__ = yes &&
-+    $as_echo "@%:@define __EXTENSIONS__ 1" >>confdefs.h
-+
-+  $as_echo "@%:@define _ALL_SOURCE 1" >>confdefs.h
-+
-+  $as_echo "@%:@define _GNU_SOURCE 1" >>confdefs.h
-+
-+  $as_echo "@%:@define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
-+
-+  $as_echo "@%:@define _TANDEM_SOURCE 1" >>confdefs.h
-+
-+
-+
-+
-+
-+# The tests for host and target for $enable_largefile require
-+# canonical names.
-+
-+
-+
-+# As the $enable_largefile decision depends on --enable-plugins we must set it
-+# even in directories otherwise not depending on the $plugins option.
-+
-+
-+@%:@ Check whether --enable-plugins was given.
-+if test "${enable_plugins+set}" = set; then :
-+  enableval=$enable_plugins; case "${enableval}" in
-+  yes | "") plugins=yes ;;
-+  no) plugins=no ;;
-+  *) plugins=yes ;;
-+ esac
-+else
-+  plugins=no
-+fi
-+
-+
-+
-+case "${host}" in
-+  sparc-*-solaris*|i[3-7]86-*-solaris*)
-+    # On native 32bit sparc and ia32 solaris, large-file and procfs support
-+    # are mutually exclusive; and without procfs support, the bfd/ elf module
-+    # cannot provide certain routines such as elfcore_write_prpsinfo
-+    # or elfcore_write_prstatus.  So unless the user explicitly requested
-+    # large-file support through the --enable-largefile switch, disable
-+    # large-file support in favor of procfs support.
-+    test "${target}" = "${host}" -a "x$plugins" = xno \
-+      && : ${enable_largefile="no"}
-+    ;;
-+esac
-+
-+@%:@ Check whether --enable-largefile was given.
-+if test "${enable_largefile+set}" = set; then :
-+  enableval=$enable_largefile; 
-+fi
-+
-+if test "$enable_largefile" != no; then
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
-+$as_echo_n "checking for special C compiler options needed for large files... " >&6; }
-+if test "${ac_cv_sys_largefile_CC+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_cv_sys_largefile_CC=no
-+     if test "$GCC" != yes; then
-+       ac_save_CC=$CC
-+       while :; do
-+	 # IRIX 6.2 and later do not support large files by default,
-+	 # so use the C compiler's -n32 option if that helps.
-+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+@%:@include <sys/types.h>
-+ /* Check that off_t can represent 2**63 - 1 correctly.
-+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-+    since some C++ compilers masquerading as C compilers
-+    incorrectly reject 9223372036854775807.  */
-+@%:@define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-+		       && LARGE_OFF_T % 2147483647 == 1)
-+		      ? 1 : -1];
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+	 if ac_fn_c_try_compile "$LINENO"; then :
-+  break
-+fi
-+rm -f core conftest.err conftest.$ac_objext
-+	 CC="$CC -n32"
-+	 if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_sys_largefile_CC=' -n32'; break
-+fi
-+rm -f core conftest.err conftest.$ac_objext
-+	 break
-+       done
-+       CC=$ac_save_CC
-+       rm -f conftest.$ac_ext
-+    fi
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
-+$as_echo "$ac_cv_sys_largefile_CC" >&6; }
-+  if test "$ac_cv_sys_largefile_CC" != no; then
-+    CC=$CC$ac_cv_sys_largefile_CC
-+  fi
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-+$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
-+if test "${ac_cv_sys_file_offset_bits+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  while :; do
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+@%:@include <sys/types.h>
-+ /* Check that off_t can represent 2**63 - 1 correctly.
-+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-+    since some C++ compilers masquerading as C compilers
-+    incorrectly reject 9223372036854775807.  */
-+@%:@define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-+		       && LARGE_OFF_T % 2147483647 == 1)
-+		      ? 1 : -1];
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_sys_file_offset_bits=no; break
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+@%:@define _FILE_OFFSET_BITS 64
-+@%:@include <sys/types.h>
-+ /* Check that off_t can represent 2**63 - 1 correctly.
-+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-+    since some C++ compilers masquerading as C compilers
-+    incorrectly reject 9223372036854775807.  */
-+@%:@define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-+		       && LARGE_OFF_T % 2147483647 == 1)
-+		      ? 1 : -1];
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_sys_file_offset_bits=64; break
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  ac_cv_sys_file_offset_bits=unknown
-+  break
-+done
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
-+$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
-+case $ac_cv_sys_file_offset_bits in #(
-+  no | unknown) ;;
-+  *) 
-+cat >>confdefs.h <<_ACEOF
-+@%:@define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
-+_ACEOF
-+;;
-+esac
-+rm -rf conftest*
-+  if test $ac_cv_sys_file_offset_bits = unknown; then
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
-+$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
-+if test "${ac_cv_sys_large_files+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  while :; do
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+@%:@include <sys/types.h>
-+ /* Check that off_t can represent 2**63 - 1 correctly.
-+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-+    since some C++ compilers masquerading as C compilers
-+    incorrectly reject 9223372036854775807.  */
-+@%:@define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-+		       && LARGE_OFF_T % 2147483647 == 1)
-+		      ? 1 : -1];
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_sys_large_files=no; break
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+@%:@define _LARGE_FILES 1
-+@%:@include <sys/types.h>
-+ /* Check that off_t can represent 2**63 - 1 correctly.
-+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-+    since some C++ compilers masquerading as C compilers
-+    incorrectly reject 9223372036854775807.  */
-+@%:@define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-+		       && LARGE_OFF_T % 2147483647 == 1)
-+		      ? 1 : -1];
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_sys_large_files=1; break
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  ac_cv_sys_large_files=unknown
-+  break
-+done
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
-+$as_echo "$ac_cv_sys_large_files" >&6; }
-+case $ac_cv_sys_large_files in #(
-+  no | unknown) ;;
-+  *) 
-+cat >>confdefs.h <<_ACEOF
-+@%:@define _LARGE_FILES $ac_cv_sys_large_files
-+_ACEOF
-+;;
-+esac
-+rm -rf conftest*
-+  fi
-+fi
-+
-+
-+
-+
-+case `pwd` in
-+  *\ * | *\	*)
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
-+$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
-+esac
-+
-+
-+
-+macro_version='2.2.7a'
-+macro_revision='1.3134'
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+
-+
-+ltmain="$ac_aux_dir/ltmain.sh"
-+
-+# Backslashify metacharacters that are still active within
-+# double-quoted strings.
-+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
-+
-+# Same as above, but do not quote variable references.
-+double_quote_subst='s/\(["`\\]\)/\\\1/g'
-+
-+# Sed substitution to delay expansion of an escaped shell variable in a
-+# double_quote_subst'ed string.
-+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-+
-+# Sed substitution to delay expansion of an escaped single quote.
-+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-+
-+# Sed substitution to avoid accidental globbing in evaled expressions
-+no_glob_subst='s/\*/\\\*/g'
-+
-+ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
-+$as_echo_n "checking how to print strings... " >&6; }
-+# Test print first, because it will be a builtin if present.
-+if test "X`print -r -- -n 2>/dev/null`" = X-n && \
-+   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
-+  ECHO='print -r --'
-+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
-+  ECHO='printf %s\n'
-+else
-+  # Use this function as a fallback that always works.
-+  func_fallback_echo ()
-+  {
-+    eval 'cat <<_LTECHO_EOF
-+$1
-+_LTECHO_EOF'
-+  }
-+  ECHO='func_fallback_echo'
-+fi
-+
-+# func_echo_all arg...
-+# Invoke $ECHO with all args, space-separated.
-+func_echo_all ()
-+{
-+    $ECHO "" 
-+}
-+
-+case "$ECHO" in
-+  printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
-+$as_echo "printf" >&6; } ;;
-+  print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
-+$as_echo "print -r" >&6; } ;;
-+  *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
-+$as_echo "cat" >&6; } ;;
-+esac
-+
-+
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
-+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
-+if test "${ac_cv_path_SED+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-+     for ac_i in 1 2 3 4 5 6 7; do
-+       ac_script="$ac_script$as_nl$ac_script"
-+     done
-+     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
-+     { ac_script=; unset ac_script;}
-+     if test -z "$SED"; then
-+  ac_path_SED_found=false
-+  # Loop through the user's path and test for each of PROGNAME-LIST
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_prog in sed gsed; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-+      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
-+# Check for GNU ac_path_SED and select it if it is found.
-+  # Check for GNU $ac_path_SED
-+case `"$ac_path_SED" --version 2>&1` in
-+*GNU*)
-+  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
-+*)
-+  ac_count=0
-+  $as_echo_n 0123456789 >"conftest.in"
-+  while :
-+  do
-+    cat "conftest.in" "conftest.in" >"conftest.tmp"
-+    mv "conftest.tmp" "conftest.in"
-+    cp "conftest.in" "conftest.nl"
-+    $as_echo '' >> "conftest.nl"
-+    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
-+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-+    as_fn_arith $ac_count + 1 && ac_count=$as_val
-+    if test $ac_count -gt ${ac_path_SED_max-0}; then
-+      # Best one so far, save it but keep looking for a better one
-+      ac_cv_path_SED="$ac_path_SED"
-+      ac_path_SED_max=$ac_count
-+    fi
-+    # 10*(2^10) chars as input seems more than enough
-+    test $ac_count -gt 10 && break
-+  done
-+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-+esac
-+
-+      $ac_path_SED_found && break 3
-+    done
-+  done
-+  done
-+IFS=$as_save_IFS
-+  if test -z "$ac_cv_path_SED"; then
-+    as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
-+  fi
-+else
-+  ac_cv_path_SED=$SED
-+fi
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
-+$as_echo "$ac_cv_path_SED" >&6; }
-+ SED="$ac_cv_path_SED"
-+  rm -f conftest.sed
-+
-+test -z "$SED" && SED=sed
-+Xsed="$SED -e 1s/^X//"
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
-+$as_echo_n "checking for fgrep... " >&6; }
-+if test "${ac_cv_path_FGREP+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-+   then ac_cv_path_FGREP="$GREP -F"
-+   else
-+     if test -z "$FGREP"; then
-+  ac_path_FGREP_found=false
-+  # Loop through the user's path and test for each of PROGNAME-LIST
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_prog in fgrep; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+      ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
-+      { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
-+# Check for GNU ac_path_FGREP and select it if it is found.
-+  # Check for GNU $ac_path_FGREP
-+case `"$ac_path_FGREP" --version 2>&1` in
-+*GNU*)
-+  ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
-+*)
-+  ac_count=0
-+  $as_echo_n 0123456789 >"conftest.in"
-+  while :
-+  do
-+    cat "conftest.in" "conftest.in" >"conftest.tmp"
-+    mv "conftest.tmp" "conftest.in"
-+    cp "conftest.in" "conftest.nl"
-+    $as_echo 'FGREP' >> "conftest.nl"
-+    "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
-+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-+    as_fn_arith $ac_count + 1 && ac_count=$as_val
-+    if test $ac_count -gt ${ac_path_FGREP_max-0}; then
-+      # Best one so far, save it but keep looking for a better one
-+      ac_cv_path_FGREP="$ac_path_FGREP"
-+      ac_path_FGREP_max=$ac_count
-+    fi
-+    # 10*(2^10) chars as input seems more than enough
-+    test $ac_count -gt 10 && break
-+  done
-+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-+esac
-+
-+      $ac_path_FGREP_found && break 3
-+    done
-+  done
-+  done
-+IFS=$as_save_IFS
-+  if test -z "$ac_cv_path_FGREP"; then
-+    as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-+  fi
-+else
-+  ac_cv_path_FGREP=$FGREP
-+fi
-+
-+   fi
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
-+$as_echo "$ac_cv_path_FGREP" >&6; }
-+ FGREP="$ac_cv_path_FGREP"
-+ 
-+
-+test -z "$GREP" && GREP=grep
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+
-+
-+
-+@%:@ Check whether --with-gnu-ld was given.
-+if test "${with_gnu_ld+set}" = set; then :
-+  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
-+else
-+  with_gnu_ld=no
-+fi
-+
-+ac_prog=ld
-+if test "$GCC" = yes; then
-+  # Check if gcc -print-prog-name=ld gives a path.
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
-+$as_echo_n "checking for ld used by $CC... " >&6; }
-+  case $host in
-+  *-*-mingw*)
-+    # gcc leaves a trailing carriage return which upsets mingw
-+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-+  *)
-+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-+  esac
-+  case $ac_prog in
-+    # Accept absolute paths.
-+    [\\/]* | ?:[\\/]*)
-+      re_direlt='/[^/][^/]*/\.\./'
-+      # Canonicalize the pathname of ld
-+      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
-+      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
-+	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
-+      done
-+      test -z "$LD" && LD="$ac_prog"
-+      ;;
-+  "")
-+    # If it fails, then pretend we aren't using GCC.
-+    ac_prog=ld
-+    ;;
-+  *)
-+    # If it is relative, then search for the first ld in PATH.
-+    with_gnu_ld=unknown
-+    ;;
-+  esac
-+elif test "$with_gnu_ld" = yes; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
-+$as_echo_n "checking for GNU ld... " >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
-+$as_echo_n "checking for non-GNU ld... " >&6; }
-+fi
-+if test "${lt_cv_path_LD+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -z "$LD"; then
-+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+  for ac_dir in $PATH; do
-+    IFS="$lt_save_ifs"
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-+      lt_cv_path_LD="$ac_dir/$ac_prog"
-+      # Check to see if the program is GNU ld.  I'd rather use --version,
-+      # but apparently some variants of GNU ld only accept -v.
-+      # Break only if it was the GNU/non-GNU ld that we prefer.
-+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-+      *GNU* | *'with BFD'*)
-+	test "$with_gnu_ld" != no && break
-+	;;
-+      *)
-+	test "$with_gnu_ld" != yes && break
-+	;;
-+      esac
-+    fi
-+  done
-+  IFS="$lt_save_ifs"
-+else
-+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-+fi
-+fi
-+
-+LD="$lt_cv_path_LD"
-+if test -n "$LD"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-+$as_echo "$LD" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
-+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-+if test "${lt_cv_prog_gnu_ld+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
-+case `$LD -v 2>&1 </dev/null` in
-+*GNU* | *'with BFD'*)
-+  lt_cv_prog_gnu_ld=yes
-+  ;;
-+*)
-+  lt_cv_prog_gnu_ld=no
-+  ;;
-+esac
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
-+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
-+with_gnu_ld=$lt_cv_prog_gnu_ld
-+
-+
-+
-+
-+    
-+    
-+    
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
-+$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
-+if test "${lt_cv_path_NM+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$NM"; then
-+  # Let the user override the test.
-+  lt_cv_path_NM="$NM"
-+else
-+  lt_nm_to_check="${ac_tool_prefix}nm"
-+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-+    lt_nm_to_check="$lt_nm_to_check nm"
-+  fi
-+  for lt_tmp_nm in $lt_nm_to_check; do
-+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-+      IFS="$lt_save_ifs"
-+      test -z "$ac_dir" && ac_dir=.
-+      tmp_nm="$ac_dir/$lt_tmp_nm"
-+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-+	# Check to see if the nm accepts a BSD-compat flag.
-+	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
-+	#   nm: unknown option "B" ignored
-+	# Tru64's nm complains that /dev/null is an invalid object file
-+	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-+	*/dev/null* | *'Invalid file or object type'*)
-+	  lt_cv_path_NM="$tmp_nm -B"
-+	  break
-+	  ;;
-+	*)
-+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-+	  */dev/null*)
-+	    lt_cv_path_NM="$tmp_nm -p"
-+	    break
-+	    ;;
-+	  *)
-+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-+	    continue # so that we can try to find one that supports BSD flags
-+	    ;;
-+	  esac
-+	  ;;
-+	esac
-+      fi
-+    done
-+    IFS="$lt_save_ifs"
-+  done
-+  : ${lt_cv_path_NM=no}
-+fi
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
-+$as_echo "$lt_cv_path_NM" >&6; }
-+if test "$lt_cv_path_NM" != "no"; then
-+  NM="$lt_cv_path_NM"
-+else
-+  # Didn't find any BSD compatible name lister, look for dumpbin.
-+  if test -n "$DUMPBIN"; then :
-+    # Let the user override the test.
-+  else
-+    if test -n "$ac_tool_prefix"; then
-+  for ac_prog in dumpbin "link -dump"
-+  do
-+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$DUMPBIN"; then
-+  ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+DUMPBIN=$ac_cv_prog_DUMPBIN
-+if test -n "$DUMPBIN"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
-+$as_echo "$DUMPBIN" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+    test -n "$DUMPBIN" && break
-+  done
-+fi
-+if test -z "$DUMPBIN"; then
-+  ac_ct_DUMPBIN=$DUMPBIN
-+  for ac_prog in dumpbin "link -dump"
-+do
-+  # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$ac_ct_DUMPBIN"; then
-+  ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
-+if test -n "$ac_ct_DUMPBIN"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
-+$as_echo "$ac_ct_DUMPBIN" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+  test -n "$ac_ct_DUMPBIN" && break
-+done
-+
-+  if test "x$ac_ct_DUMPBIN" = x; then
-+    DUMPBIN=":"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    DUMPBIN=$ac_ct_DUMPBIN
-+  fi
-+fi
-+
-+    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
-+    *COFF*)
-+      DUMPBIN="$DUMPBIN -symbols"
-+      ;;
-+    *)
-+      DUMPBIN=:
-+      ;;
-+    esac
-+  fi
-+  
-+  if test "$DUMPBIN" != ":"; then
-+    NM="$DUMPBIN"
-+  fi
-+fi
-+test -z "$NM" && NM=nm
-+
-+
-+    
-+    
-+    
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
-+$as_echo_n "checking the name lister ($NM) interface... " >&6; }
-+if test "${lt_cv_nm_interface+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  lt_cv_nm_interface="BSD nm"
-+  echo "int some_variable = 0;" > conftest.$ac_ext
-+  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
-+  (eval "$ac_compile" 2>conftest.err)
-+  cat conftest.err >&5
-+  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-+  cat conftest.err >&5
-+  (eval echo "\"\$as_me:$LINENO: output\"" >&5)
-+  cat conftest.out >&5
-+  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-+    lt_cv_nm_interface="MS dumpbin"
-+  fi
-+  rm -f conftest*
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
-+$as_echo "$lt_cv_nm_interface" >&6; }
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
-+$as_echo_n "checking whether ln -s works... " >&6; }
-+LN_S=$as_ln_s
-+if test "$LN_S" = "ln -s"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
-+$as_echo "no, using $LN_S" >&6; }
-+fi
-+
-+# find the maximum length of command line arguments
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
-+$as_echo_n "checking the maximum length of command line arguments... " >&6; }
-+if test "${lt_cv_sys_max_cmd_len+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+    i=0
-+  teststring="ABCD"
-+
-+  case $build_os in
-+  msdosdjgpp*)
-+    # On DJGPP, this test can blow up pretty badly due to problems in libc
-+    # (any single argument exceeding 2000 bytes causes a buffer overrun
-+    # during glob expansion).  Even if it were fixed, the result of this
-+    # check would be larger than it should be.
-+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-+    ;;
-+
-+  gnu*)
-+    # Under GNU Hurd, this test is not required because there is
-+    # no limit to the length of command line arguments.
-+    # Libtool will interpret -1 as no limit whatsoever
-+    lt_cv_sys_max_cmd_len=-1;
-+    ;;
-+
-+  cygwin* | mingw* | cegcc*)
-+    # On Win9x/ME, this test blows up -- it succeeds, but takes
-+    # about 5 minutes as the teststring grows exponentially.
-+    # Worse, since 9x/ME are not pre-emptively multitasking,
-+    # you end up with a "frozen" computer, even though with patience
-+    # the test eventually succeeds (with a max line length of 256k).
-+    # Instead, let's just punt: use the minimum linelength reported by
-+    # all of the supported platforms: 8192 (on NT/2K/XP).
-+    lt_cv_sys_max_cmd_len=8192;
-+    ;;
-+
-+  mint*)
-+    # On MiNT this can take a long time and run out of memory.
-+    lt_cv_sys_max_cmd_len=8192;
-+    ;;
-+
-+  amigaos*)
-+    # On AmigaOS with pdksh, this test takes hours, literally.
-+    # So we just punt and use a minimum line length of 8192.
-+    lt_cv_sys_max_cmd_len=8192;
-+    ;;
-+
-+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-+    # This has been around since 386BSD, at least.  Likely further.
-+    if test -x /sbin/sysctl; then
-+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-+    elif test -x /usr/sbin/sysctl; then
-+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-+    else
-+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
-+    fi
-+    # And add a safety zone
-+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-+    ;;
-+
-+  interix*)
-+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
-+    lt_cv_sys_max_cmd_len=196608
-+    ;;
-+
-+  osf*)
-+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-+    # nice to cause kernel panics so lets avoid the loop below.
-+    # First set a reasonable default.
-+    lt_cv_sys_max_cmd_len=16384
-+    #
-+    if test -x /sbin/sysconfig; then
-+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-+      esac
-+    fi
-+    ;;
-+  sco3.2v5*)
-+    lt_cv_sys_max_cmd_len=102400
-+    ;;
-+  sysv5* | sco5v6* | sysv4.2uw2*)
-+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
-+    if test -n "$kargmax"; then
-+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[	 ]//'`
-+    else
-+      lt_cv_sys_max_cmd_len=32768
-+    fi
-+    ;;
-+  *)
-+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-+    if test -n "$lt_cv_sys_max_cmd_len"; then
-+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-+    else
-+      # Make teststring a little bigger before we do anything with it.
-+      # a 1K string should be a reasonable start.
-+      for i in 1 2 3 4 5 6 7 8 ; do
-+        teststring=$teststring$teststring
-+      done
-+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-+      # If test is not a shell built-in, we'll probably end up computing a
-+      # maximum length that is only half of the actual maximum length, but
-+      # we can't tell.
-+      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
-+	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
-+	      test $i != 17 # 1/2 MB should be enough
-+      do
-+        i=`expr $i + 1`
-+        teststring=$teststring$teststring
-+      done
-+      # Only check the string length outside the loop.
-+      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
-+      teststring=
-+      # Add a significant safety factor because C++ compilers can tack on
-+      # massive amounts of additional arguments before passing them to the
-+      # linker.  It appears as though 1/2 is a usable value.
-+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-+    fi
-+    ;;
-+  esac
-+
-+fi
-+
-+if test -n $lt_cv_sys_max_cmd_len ; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
-+$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
-+$as_echo "none" >&6; }
-+fi
-+max_cmd_len=$lt_cv_sys_max_cmd_len
-+
-+    
-+    
-+    
-+
-+
-+: ${CP="cp -f"}
-+: ${MV="mv -f"}
-+: ${RM="rm -f"}
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
-+$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
-+# Try some XSI features
-+xsi_shell=no
-+( _lt_dummy="a/b/c"
-+  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
-+      = c,a/b,, \
-+    && eval 'test $(( 1 + 1 )) -eq 2 \
-+    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
-+  && xsi_shell=yes
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
-+$as_echo "$xsi_shell" >&6; }
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
-+$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
-+lt_shell_append=no
-+( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
-+    >/dev/null 2>&1 \
-+  && lt_shell_append=yes
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
-+$as_echo "$lt_shell_append" >&6; }
-+
-+
-+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-+  lt_unset=unset
-+else
-+  lt_unset=false
-+fi
-+
-+    
-+    
-+    
-+
-+# test EBCDIC or ASCII
-+case `echo X|tr X '\101'` in
-+ A) # ASCII based system
-+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-+  lt_SP2NL='tr \040 \012'
-+  lt_NL2SP='tr \015\012 \040\040'
-+  ;;
-+ *) # EBCDIC based system
-+  lt_SP2NL='tr \100 \n'
-+  lt_NL2SP='tr \r\n \100\100'
-+  ;;
-+esac
-+
-+    
-+    
-+    
-+
-+    
-+    
-+    
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
-+$as_echo_n "checking for $LD option to reload object files... " >&6; }
-+if test "${lt_cv_ld_reload_flag+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  lt_cv_ld_reload_flag='-r'
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
-+$as_echo "$lt_cv_ld_reload_flag" >&6; }
-+reload_flag=$lt_cv_ld_reload_flag
-+case $reload_flag in
-+"" | " "*) ;;
-+*) reload_flag=" $reload_flag" ;;
-+esac
-+reload_cmds='$LD$reload_flag -o $output$reload_objs'
-+case $host_os in
-+  darwin*)
-+    if test "$GCC" = yes; then
-+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-+    else
-+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-+    fi
-+    ;;
-+esac
-+
-+    
-+    
-+    
-+
-+    
-+    
-+    
-+
-+if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}objdump; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$OBJDUMP"; then
-+  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+OBJDUMP=$ac_cv_prog_OBJDUMP
-+if test -n "$OBJDUMP"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
-+$as_echo "$OBJDUMP" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$ac_cv_prog_OBJDUMP"; then
-+  ac_ct_OBJDUMP=$OBJDUMP
-+  # Extract the first word of "objdump", so it can be a program name with args.
-+set dummy objdump; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$ac_ct_OBJDUMP"; then
-+  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_OBJDUMP="objdump"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
-+if test -n "$ac_ct_OBJDUMP"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
-+$as_echo "$ac_ct_OBJDUMP" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+  if test "x$ac_ct_OBJDUMP" = x; then
-+    OBJDUMP="false"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    OBJDUMP=$ac_ct_OBJDUMP
-+  fi
-+else
-+  OBJDUMP="$ac_cv_prog_OBJDUMP"
-+fi
-+
-+test -z "$OBJDUMP" && OBJDUMP=objdump
-+
-+    
-+    
-+    
-+
-+
-+
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
-+$as_echo_n "checking how to recognize dependent libraries... " >&6; }
-+if test "${lt_cv_deplibs_check_method+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  lt_cv_file_magic_cmd='$MAGIC_CMD'
-+lt_cv_file_magic_test_file=
-+lt_cv_deplibs_check_method='unknown'
-+# Need to set the preceding variable on all platforms that support
-+# interlibrary dependencies.
-+# 'none' -- dependencies not supported.
-+# `unknown' -- same as none, but documents that we really don't know.
-+# 'pass_all' -- all dependencies passed with no checks.
-+# 'test_compile' -- check by making test program.
-+# 'file_magic [[regex]]' -- check by looking for files in library path
-+# which responds to the $file_magic_cmd with a given extended regex.
-+# If you have `file' or equivalent on your system and you're not sure
-+# whether `pass_all' will *always* work, you probably want this one.
-+
-+case $host_os in
-+aix[4-9]*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+beos*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+bsdi[45]*)
-+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
-+  lt_cv_file_magic_cmd='/usr/bin/file -L'
-+  lt_cv_file_magic_test_file=/shlib/libc.so
-+  ;;
-+
-+cygwin*)
-+  # func_win32_libid is a shell function defined in ltmain.sh
-+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-+  lt_cv_file_magic_cmd='func_win32_libid'
-+  ;;
-+
-+mingw* | pw32*)
-+  # Base MSYS/MinGW do not provide the 'file' command needed by
-+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
-+  # unless we find 'file', for example because we are cross-compiling.
-+  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
-+  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
-+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-+    lt_cv_file_magic_cmd='func_win32_libid'
-+  else
-+    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-+    lt_cv_file_magic_cmd='$OBJDUMP -f'
-+  fi
-+  ;;
-+
-+cegcc*)
-+  # use the weaker test based on 'objdump'. See mingw*.
-+  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
-+  lt_cv_file_magic_cmd='$OBJDUMP -f'
-+  ;;
-+
-+darwin* | rhapsody*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+freebsd* | dragonfly*)
-+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-+    case $host_cpu in
-+    i*86 )
-+      # Not sure whether the presence of OpenBSD here was a mistake.
-+      # Let's accept both of them until this is cleared up.
-+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
-+      lt_cv_file_magic_cmd=/usr/bin/file
-+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-+      ;;
-+    esac
-+  else
-+    lt_cv_deplibs_check_method=pass_all
-+  fi
-+  ;;
-+
-+gnu*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+haiku*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+hpux10.20* | hpux11*)
-+  lt_cv_file_magic_cmd=/usr/bin/file
-+  case $host_cpu in
-+  ia64*)
-+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
-+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-+    ;;
-+  hppa*64*)
-+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'
-+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-+    ;;
-+  *)
-+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'
-+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-+    ;;
-+  esac
-+  ;;
-+
-+interix[3-9]*)
-+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
-+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
-+  ;;
-+
-+irix5* | irix6* | nonstopux*)
-+  case $LD in
-+  *-32|*"-32 ") libmagic=32-bit;;
-+  *-n32|*"-n32 ") libmagic=N32;;
-+  *-64|*"-64 ") libmagic=64-bit;;
-+  *) libmagic=never-match;;
-+  esac
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+# This must be Linux ELF.
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+netbsd*)
-+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-+  else
-+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
-+  fi
-+  ;;
-+
-+newos6*)
-+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
-+  lt_cv_file_magic_cmd=/usr/bin/file
-+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-+  ;;
-+
-+*nto* | *qnx*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+openbsd*)
-+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
-+  else
-+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-+  fi
-+  ;;
-+
-+osf3* | osf4* | osf5*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+rdos*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+solaris*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+sysv4 | sysv4.3*)
-+  case $host_vendor in
-+  motorola)
-+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-+    ;;
-+  ncr)
-+    lt_cv_deplibs_check_method=pass_all
-+    ;;
-+  sequent)
-+    lt_cv_file_magic_cmd='/bin/file'
-+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
-+    ;;
-+  sni)
-+    lt_cv_file_magic_cmd='/bin/file'
-+    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
-+    lt_cv_file_magic_test_file=/lib/libc.so
-+    ;;
-+  siemens)
-+    lt_cv_deplibs_check_method=pass_all
-+    ;;
-+  pc)
-+    lt_cv_deplibs_check_method=pass_all
-+    ;;
-+  esac
-+  ;;
-+
-+tpf*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+esac
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
-+$as_echo "$lt_cv_deplibs_check_method" >&6; }
-+file_magic_cmd=$lt_cv_file_magic_cmd
-+deplibs_check_method=$lt_cv_deplibs_check_method
-+test -z "$deplibs_check_method" && deplibs_check_method=unknown
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+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
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_AR+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$AR"; then
-+  ac_cv_prog_AR="$AR" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_AR="${ac_tool_prefix}ar"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+AR=$ac_cv_prog_AR
-+if test -n "$AR"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-+$as_echo "$AR" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$ac_cv_prog_AR"; then
-+  ac_ct_AR=$AR
-+  # Extract the first word of "ar", so it can be a program name with args.
-+set dummy ar; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$ac_ct_AR"; then
-+  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_AR="ar"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_AR=$ac_cv_prog_ac_ct_AR
-+if test -n "$ac_ct_AR"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-+$as_echo "$ac_ct_AR" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+  if test "x$ac_ct_AR" = x; then
-+    AR="false"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    AR=$ac_ct_AR
-+  fi
-+else
-+  AR="$ac_cv_prog_AR"
-+fi
-+
-+test -z "$AR" && AR=ar
-+test -z "$AR_FLAGS" && AR_FLAGS=cru
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+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
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_STRIP+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$STRIP"; then
-+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+STRIP=$ac_cv_prog_STRIP
-+if test -n "$STRIP"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-+$as_echo "$STRIP" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$ac_cv_prog_STRIP"; then
-+  ac_ct_STRIP=$STRIP
-+  # Extract the first word of "strip", so it can be a program name with args.
-+set dummy strip; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$ac_ct_STRIP"; then
-+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_STRIP="strip"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-+if test -n "$ac_ct_STRIP"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-+$as_echo "$ac_ct_STRIP" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+  if test "x$ac_ct_STRIP" = x; then
-+    STRIP=":"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    STRIP=$ac_ct_STRIP
-+  fi
-+else
-+  STRIP="$ac_cv_prog_STRIP"
-+fi
-+
-+test -z "$STRIP" && STRIP=:
-+
-+    
-+    
-+    
-+
-+
-+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
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_RANLIB+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$RANLIB"; then
-+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+RANLIB=$ac_cv_prog_RANLIB
-+if test -n "$RANLIB"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-+$as_echo "$RANLIB" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$ac_cv_prog_RANLIB"; then
-+  ac_ct_RANLIB=$RANLIB
-+  # Extract the first word of "ranlib", so it can be a program name with args.
-+set dummy ranlib; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$ac_ct_RANLIB"; then
-+  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_RANLIB="ranlib"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-+if test -n "$ac_ct_RANLIB"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-+$as_echo "$ac_ct_RANLIB" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+  if test "x$ac_ct_RANLIB" = x; then
-+    RANLIB=":"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    RANLIB=$ac_ct_RANLIB
-+  fi
-+else
-+  RANLIB="$ac_cv_prog_RANLIB"
-+fi
-+
-+test -z "$RANLIB" && RANLIB=:
-+
-+    
-+    
-+    
-+
-+
-+# Determine commands to create old-style static archives.
-+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-+old_postinstall_cmds='chmod 644 $oldlib'
-+old_postuninstall_cmds=
-+
-+if test -n "$RANLIB"; then
-+  case $host_os in
-+  openbsd*)
-+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
-+    ;;
-+  *)
-+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
-+    ;;
-+  esac
-+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-+fi
-+
-+case $host_os in
-+  darwin*)
-+    lock_old_archive_extraction=yes ;;
-+  *)
-+    lock_old_archive_extraction=no ;;
-+esac
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+
-+
-+    
-+    
-+    
-+
-+    
-+    
-+    
-+
-+    
-+    
-+    
-+
-+    
-+    
-+    
-+
-+# If no C compiler was specified, use CC.
-+LTCC=${LTCC-"$CC"}
-+
-+# If no C compiler flags were specified, use CFLAGS.
-+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-+
-+# Allow CC to be a program name with arguments.
-+compiler=$CC
-+
-+
-+# Check for command to grab the raw symbol name followed by C symbol from nm.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
-+$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
-+if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  
-+# These are sane defaults that work on at least a few old systems.
-+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-+
-+# Character class describing NM global symbol codes.
-+symcode='[BCDEGRST]'
-+
-+# Regexp to match symbols that can be accessed directly from C.
-+sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
-+
-+# Define system-specific variables.
-+case $host_os in
-+aix*)
-+  symcode='[BCDT]'
-+  ;;
-+cygwin* | mingw* | pw32* | cegcc*)
-+  symcode='[ABCDGISTW]'
-+  ;;
-+hpux*)
-+  if test "$host_cpu" = ia64; then
-+    symcode='[ABCDEGRST]'
-+  fi
-+  ;;
-+irix* | nonstopux*)
-+  symcode='[BCDEGRST]'
-+  ;;
-+osf*)
-+  symcode='[BCDEGQRST]'
-+  ;;
-+solaris*)
-+  symcode='[BDRT]'
-+  ;;
-+sco3.2v5*)
-+  symcode='[DT]'
-+  ;;
-+sysv4.2uw2*)
-+  symcode='[DT]'
-+  ;;
-+sysv5* | sco5v6* | unixware* | OpenUNIX*)
-+  symcode='[ABDT]'
-+  ;;
-+sysv4)
-+  symcode='[DFNSTU]'
-+  ;;
-+esac
-+
-+# If we're using GNU nm, then use its standard symbol codes.
-+case `$NM -V 2>&1` in
-+*GNU* | *'with BFD'*)
-+  symcode='[ABCDGIRSTW]' ;;
-+esac
-+
-+# Transform an extracted symbol line into a proper C declaration.
-+# Some systems (esp. on ia64) link data and code symbols differently,
-+# so use this general approach.
-+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-+
-+# Transform an extracted symbol line into symbol name and symbol address
-+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (void *) \&\2},/p'"
-+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
-+
-+# Handle CRLF in mingw tool chain
-+opt_cr=
-+case $build_os in
-+mingw*)
-+  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-+  ;;
-+esac
-+
-+# Try without a prefix underscore, then with it.
-+for ac_symprfx in "" "_"; do
-+
-+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-+  symxfrm="\\1 $ac_symprfx\\2 \\2"
-+
-+  # Write the raw and C identifiers.
-+  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-+    # Fake it for dumpbin and say T for any non-static function
-+    # and D for any global variable.
-+    # Also find C++ and __fastcall symbols from MSVC++,
-+    # which start with @ or ?.
-+    lt_cv_sys_global_symbol_pipe="$AWK '"\
-+"     {last_section=section; section=\$ 3};"\
-+"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
-+"     \$ 0!~/External *\|/{next};"\
-+"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
-+"     {if(hide[section]) next};"\
-+"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-+"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-+"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
-+"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
-+"     ' prfx=^$ac_symprfx"
-+  else
-+    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[	 ]\($symcode$symcode*\)[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-+  fi
-+
-+  # Check to see that the pipe works correctly.
-+  pipe_works=no
-+
-+  rm -f conftest*
-+  cat > conftest.$ac_ext <<_LT_EOF
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+char nm_test_var;
-+void nm_test_func(void);
-+void nm_test_func(void){}
-+#ifdef __cplusplus
-+}
-+#endif
-+int main(){nm_test_var='a';nm_test_func();return(0);}
-+_LT_EOF
-+
-+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-+    # Now try to grab the symbols.
-+    nlist=conftest.nm
-+    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
-+  (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; } && test -s "$nlist"; then
-+      # Try sorting and uniquifying the output.
-+      if sort "$nlist" | uniq > "$nlist"T; then
-+	mv -f "$nlist"T "$nlist"
-+      else
-+	rm -f "$nlist"T
-+      fi
-+
-+      # Make sure that we snagged all the symbols we need.
-+      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
-+	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
-+	  cat <<_LT_EOF > conftest.$ac_ext
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+_LT_EOF
-+	  # Now generate the symbol file.
-+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
-+
-+	  cat <<_LT_EOF >> conftest.$ac_ext
-+
-+/* The mapping between symbol names and symbols.  */
-+const struct {
-+  const char *name;
-+  void       *address;
-+}
-+lt__PROGRAM__LTX_preloaded_symbols[] =
-+{
-+  { "@PROGRAM@", (void *) 0 },
-+_LT_EOF
-+	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
-+	  cat <<\_LT_EOF >> conftest.$ac_ext
-+  {0, (void *) 0}
-+};
-+
-+/* This works around a problem in FreeBSD linker */
-+#ifdef FREEBSD_WORKAROUND
-+static const void *lt_preloaded_setup() {
-+  return lt__PROGRAM__LTX_preloaded_symbols;
-+}
-+#endif
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+_LT_EOF
-+	  # Now try linking the two files.
-+	  mv conftest.$ac_objext conftstm.$ac_objext
-+	  lt_save_LIBS="$LIBS"
-+	  lt_save_CFLAGS="$CFLAGS"
-+	  LIBS="conftstm.$ac_objext"
-+	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
-+	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; } && test -s conftest${ac_exeext}; then
-+	    pipe_works=yes
-+	  fi
-+	  LIBS="$lt_save_LIBS"
-+	  CFLAGS="$lt_save_CFLAGS"
-+	else
-+	  echo "cannot find nm_test_func in $nlist" >&5
-+	fi
-+      else
-+	echo "cannot find nm_test_var in $nlist" >&5
-+      fi
-+    else
-+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
-+    fi
-+  else
-+    echo "$progname: failed program was:" >&5
-+    cat conftest.$ac_ext >&5
-+  fi
-+  rm -rf conftest* conftst*
-+
-+  # Do not use the global_symbol_pipe unless it works.
-+  if test "$pipe_works" = yes; then
-+    break
-+  else
-+    lt_cv_sys_global_symbol_pipe=
-+  fi
-+done
-+
-+fi
-+
-+if test -z "$lt_cv_sys_global_symbol_pipe"; then
-+  lt_cv_sys_global_symbol_to_cdecl=
-+fi
-+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-+$as_echo "failed" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-+$as_echo "ok" >&6; }
-+fi
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+@%:@ Check whether --enable-libtool-lock was given.
-+if test "${enable_libtool_lock+set}" = set; then :
-+  enableval=$enable_libtool_lock; 
-+fi
-+
-+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-+
-+# Some flags need to be propagated to the compiler or linker for good
-+# libtool support.
-+case $host in
-+ia64-*-hpux*)
-+  # Find out which ABI we are using.
-+  echo 'int i;' > conftest.$ac_ext
-+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-+    case `/usr/bin/file conftest.$ac_objext` in
-+      *ELF-32*)
-+	HPUX_IA64_MODE="32"
-+	;;
-+      *ELF-64*)
-+	HPUX_IA64_MODE="64"
-+	;;
-+    esac
-+  fi
-+  rm -rf conftest*
-+  ;;
-+*-*-irix6*)
-+  # Find out which ABI we are using.
-+  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
-+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-+    if test "$lt_cv_prog_gnu_ld" = yes; then
-+      case `/usr/bin/file conftest.$ac_objext` in
-+	*32-bit*)
-+	  LD="${LD-ld} -melf32bsmip"
-+	  ;;
-+	*N32*)
-+	  LD="${LD-ld} -melf32bmipn32"
-+	  ;;
-+	*64-bit*)
-+	  LD="${LD-ld} -melf64bmip"
-+	;;
-+      esac
-+    else
-+      case `/usr/bin/file conftest.$ac_objext` in
-+	*32-bit*)
-+	  LD="${LD-ld} -32"
-+	  ;;
-+	*N32*)
-+	  LD="${LD-ld} -n32"
-+	  ;;
-+	*64-bit*)
-+	  LD="${LD-ld} -64"
-+	  ;;
-+      esac
-+    fi
-+  fi
-+  rm -rf conftest*
-+  ;;
-+
-+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-+  # Find out which ABI we are using.
-+  echo 'int i;' > conftest.$ac_ext
-+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-+    case `/usr/bin/file conftest.o` in
-+      *32-bit*)
-+	case $host in
-+	  x86_64-*kfreebsd*-gnu)
-+	    LD="${LD-ld} -m elf_i386_fbsd"
-+	    ;;
-+	  x86_64-*linux*)
-+	    LD="${LD-ld} -m elf_i386"
-+	    ;;
-+	  ppc64-*linux*|powerpc64-*linux*)
-+	    LD="${LD-ld} -m elf32ppclinux"
-+	    ;;
-+	  s390x-*linux*)
-+	    LD="${LD-ld} -m elf_s390"
-+	    ;;
-+	  sparc64-*linux*)
-+	    LD="${LD-ld} -m elf32_sparc"
-+	    ;;
-+	esac
-+	;;
-+      *64-bit*)
-+	case $host in
-+	  x86_64-*kfreebsd*-gnu)
-+	    LD="${LD-ld} -m elf_x86_64_fbsd"
-+	    ;;
-+	  x86_64-*linux*)
-+	    LD="${LD-ld} -m elf_x86_64"
-+	    ;;
-+	  ppc*-*linux*|powerpc*-*linux*)
-+	    LD="${LD-ld} -m elf64ppc"
-+	    ;;
-+	  s390*-*linux*|s390*-*tpf*)
-+	    LD="${LD-ld} -m elf64_s390"
-+	    ;;
-+	  sparc*-*linux*)
-+	    LD="${LD-ld} -m elf64_sparc"
-+	    ;;
-+	esac
-+	;;
-+    esac
-+  fi
-+  rm -rf conftest*
-+  ;;
-+
-+*-*-sco3.2v5*)
-+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-+  SAVE_CFLAGS="$CFLAGS"
-+  CFLAGS="$CFLAGS -belf"
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
-+$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
-+if test "${lt_cv_cc_needs_belf+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+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
-+
-+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  lt_cv_cc_needs_belf=yes
-+else
-+  lt_cv_cc_needs_belf=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+     ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+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
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
-+$as_echo "$lt_cv_cc_needs_belf" >&6; }
-+  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"
-+  fi
-+  ;;
-+sparc*-*solaris*)
-+  # Find out which ABI we are using.
-+  echo 'int i;' > conftest.$ac_ext
-+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-+    case `/usr/bin/file conftest.o` in
-+    *64-bit*)
-+      case $lt_cv_prog_gnu_ld in
-+      yes*) LD="${LD-ld} -m elf64_sparc" ;;
-+      *)
-+	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-+	  LD="${LD-ld} -64"
-+	fi
-+	;;
-+      esac
-+      ;;
-+    esac
-+  fi
-+  rm -rf conftest*
-+  ;;
-+esac
-+
-+need_locks="$enable_libtool_lock"
-+
-+
-+  case $host_os in
-+    rhapsody* | darwin*)
-+    if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$DSYMUTIL"; then
-+  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+DSYMUTIL=$ac_cv_prog_DSYMUTIL
-+if test -n "$DSYMUTIL"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
-+$as_echo "$DSYMUTIL" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$ac_cv_prog_DSYMUTIL"; then
-+  ac_ct_DSYMUTIL=$DSYMUTIL
-+  # Extract the first word of "dsymutil", so it can be a program name with args.
-+set dummy dsymutil; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$ac_ct_DSYMUTIL"; then
-+  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
-+if test -n "$ac_ct_DSYMUTIL"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
-+$as_echo "$ac_ct_DSYMUTIL" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+  if test "x$ac_ct_DSYMUTIL" = x; then
-+    DSYMUTIL=":"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    DSYMUTIL=$ac_ct_DSYMUTIL
-+  fi
-+else
-+  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
-+fi
-+
-+    if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}nmedit; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_NMEDIT+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$NMEDIT"; then
-+  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+NMEDIT=$ac_cv_prog_NMEDIT
-+if test -n "$NMEDIT"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
-+$as_echo "$NMEDIT" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$ac_cv_prog_NMEDIT"; then
-+  ac_ct_NMEDIT=$NMEDIT
-+  # Extract the first word of "nmedit", so it can be a program name with args.
-+set dummy nmedit; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$ac_ct_NMEDIT"; then
-+  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_NMEDIT="nmedit"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
-+if test -n "$ac_ct_NMEDIT"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
-+$as_echo "$ac_ct_NMEDIT" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+  if test "x$ac_ct_NMEDIT" = x; then
-+    NMEDIT=":"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    NMEDIT=$ac_ct_NMEDIT
-+  fi
-+else
-+  NMEDIT="$ac_cv_prog_NMEDIT"
-+fi
-+
-+    if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}lipo; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_LIPO+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$LIPO"; then
-+  ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+LIPO=$ac_cv_prog_LIPO
-+if test -n "$LIPO"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
-+$as_echo "$LIPO" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$ac_cv_prog_LIPO"; then
-+  ac_ct_LIPO=$LIPO
-+  # Extract the first word of "lipo", so it can be a program name with args.
-+set dummy lipo; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$ac_ct_LIPO"; then
-+  ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_LIPO="lipo"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
-+if test -n "$ac_ct_LIPO"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
-+$as_echo "$ac_ct_LIPO" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+  if test "x$ac_ct_LIPO" = x; then
-+    LIPO=":"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    LIPO=$ac_ct_LIPO
-+  fi
-+else
-+  LIPO="$ac_cv_prog_LIPO"
-+fi
-+
-+    if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}otool; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_OTOOL+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$OTOOL"; then
-+  ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+OTOOL=$ac_cv_prog_OTOOL
-+if test -n "$OTOOL"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
-+$as_echo "$OTOOL" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$ac_cv_prog_OTOOL"; then
-+  ac_ct_OTOOL=$OTOOL
-+  # Extract the first word of "otool", so it can be a program name with args.
-+set dummy otool; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$ac_ct_OTOOL"; then
-+  ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_OTOOL="otool"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
-+if test -n "$ac_ct_OTOOL"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
-+$as_echo "$ac_ct_OTOOL" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+  if test "x$ac_ct_OTOOL" = x; then
-+    OTOOL=":"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    OTOOL=$ac_ct_OTOOL
-+  fi
-+else
-+  OTOOL="$ac_cv_prog_OTOOL"
-+fi
-+
-+    if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}otool64; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_OTOOL64+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$OTOOL64"; then
-+  ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+OTOOL64=$ac_cv_prog_OTOOL64
-+if test -n "$OTOOL64"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
-+$as_echo "$OTOOL64" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$ac_cv_prog_OTOOL64"; then
-+  ac_ct_OTOOL64=$OTOOL64
-+  # Extract the first word of "otool64", so it can be a program name with args.
-+set dummy otool64; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$ac_ct_OTOOL64"; then
-+  ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_OTOOL64="otool64"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
-+if test -n "$ac_ct_OTOOL64"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
-+$as_echo "$ac_ct_OTOOL64" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+  if test "x$ac_ct_OTOOL64" = x; then
-+    OTOOL64=":"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    OTOOL64=$ac_ct_OTOOL64
-+  fi
-+else
-+  OTOOL64="$ac_cv_prog_OTOOL64"
-+fi
-+
-+    
-+    
-+    
-+    
-+
-+    
-+    
-+    
-+    
-+
-+    
-+    
-+    
-+    
-+
-+    
-+    
-+    
-+    
-+
-+    
-+    
-+    
-+    
-+
-+
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
-+$as_echo_n "checking for -single_module linker flag... " >&6; }
-+if test "${lt_cv_apple_cc_single_mod+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  lt_cv_apple_cc_single_mod=no
-+      if test -z "${LT_MULTI_MODULE}"; then
-+	# By default we will add the -single_module flag. You can override
-+	# by either setting the environment variable LT_MULTI_MODULE
-+	# non-empty at configure time, or by adding -multi_module to the
-+	# link flags.
-+	rm -rf libconftest.dylib*
-+	echo "int foo(void){return 1;}" > conftest.c
-+	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-+-dynamiclib -Wl,-single_module conftest.c" >&5
-+	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-+	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
-+        _lt_result=$?
-+	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
-+	  lt_cv_apple_cc_single_mod=yes
-+	else
-+	  cat conftest.err >&5
-+	fi
-+	rm -rf libconftest.dylib*
-+	rm -f conftest.*
-+      fi
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
-+$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
-+$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
-+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  lt_cv_ld_exported_symbols_list=no
-+      save_LDFLAGS=$LDFLAGS
-+      echo "_main" > conftest.sym
-+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  lt_cv_ld_exported_symbols_list=yes
-+else
-+  lt_cv_ld_exported_symbols_list=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+	LDFLAGS="$save_LDFLAGS"
-+    
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
-+$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
-+$as_echo_n "checking for -force_load linker flag... " >&6; }
-+if test "${lt_cv_ld_force_load+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  lt_cv_ld_force_load=no
-+      cat > conftest.c << _LT_EOF
-+int forced_loaded() { return 2;}
-+_LT_EOF
-+      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
-+      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
-+      echo "$AR cru libconftest.a conftest.o" >&5
-+      $AR cru libconftest.a conftest.o 2>&5
-+      cat > conftest.c << _LT_EOF
-+int main() { return 0;}
-+_LT_EOF
-+      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
-+      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
-+      _lt_result=$?
-+      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
-+	lt_cv_ld_force_load=yes
-+      else
-+	cat conftest.err >&5
-+      fi
-+        rm -f conftest.err libconftest.a conftest conftest.c
-+        rm -rf conftest.dSYM
-+    
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
-+$as_echo "$lt_cv_ld_force_load" >&6; }
-+    case $host_os in
-+    rhapsody* | darwin1.[012])
-+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-+    darwin1.*)
-+      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-+    darwin*) # darwin 5.x on
-+      # if running on 10.5 or later, the deployment target defaults
-+      # to the OS version, if on x86, and 10.4, the deployment
-+      # target defaults to 10.4. Don't you love it?
-+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-+	10.0,*86*-darwin8*|10.0,*-darwin[91]*)
-+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-+	10.[012]*)
-+	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-+	10.*)
-+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-+      esac
-+    ;;
-+  esac
-+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
-+      _lt_dar_single_mod='$single_module'
-+    fi
-+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
-+    else
-+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+    fi
-+    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
-+      _lt_dsymutil='~$DSYMUTIL $lib || :'
-+    else
-+      _lt_dsymutil=
-+    fi
-+    ;;
-+  esac
-+
-+for ac_header in dlfcn.h
-+do :
-+  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
-+"
-+if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+@%:@define HAVE_DLFCN_H 1
-+_ACEOF
-+ 
-+fi
-+
-+done
-+
-+
-+
-+
-+
-+# Set options
-+
-+
-+
-+        enable_dlopen=no
-+  
-+
-+  enable_win32_dll=no
-+  
-+
-+            @%:@ Check whether --enable-shared was given.
-+if test "${enable_shared+set}" = set; then :
-+  enableval=$enable_shared; p=${PACKAGE-default}
-+    case $enableval in
-+    yes) enable_shared=yes ;;
-+    no) enable_shared=no ;;
-+    *)
-+      enable_shared=no
-+      # Look at the argument we got.  We use all the common list separators.
-+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+      for pkg in $enableval; do
-+	IFS="$lt_save_ifs"
-+	if test "X$pkg" = "X$p"; then
-+	  enable_shared=yes
-+	fi
-+      done
-+      IFS="$lt_save_ifs"
-+      ;;
-+    esac
-+else
-+  enable_shared=yes
-+fi
-+
-+
-+    
-+    
-+    
-+    
-+
-+
-+
-+  @%:@ Check whether --enable-static was given.
-+if test "${enable_static+set}" = set; then :
-+  enableval=$enable_static; p=${PACKAGE-default}
-+    case $enableval in
-+    yes) enable_static=yes ;;
-+    no) enable_static=no ;;
-+    *)
-+     enable_static=no
-+      # Look at the argument we got.  We use all the common list separators.
-+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+      for pkg in $enableval; do
-+	IFS="$lt_save_ifs"
-+	if test "X$pkg" = "X$p"; then
-+	  enable_static=yes
-+	fi
-+      done
-+      IFS="$lt_save_ifs"
-+      ;;
-+    esac
-+else
-+  enable_static=yes
-+fi
-+
-+
-+    
-+    
-+    
-+    
-+
-+
-+
-+  
-+@%:@ Check whether --with-pic was given.
-+if test "${with_pic+set}" = set; then :
-+  withval=$with_pic; pic_mode="$withval"
-+else
-+  pic_mode=default
-+fi
-+
-+
-+test -z "$pic_mode" && pic_mode=default
-+
-+
-+    
-+    
-+    
-+
-+
-+  @%:@ Check whether --enable-fast-install was given.
-+if test "${enable_fast_install+set}" = set; then :
-+  enableval=$enable_fast_install; p=${PACKAGE-default}
-+    case $enableval in
-+    yes) enable_fast_install=yes ;;
-+    no) enable_fast_install=no ;;
-+    *)
-+      enable_fast_install=no
-+      # Look at the argument we got.  We use all the common list separators.
-+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+      for pkg in $enableval; do
-+	IFS="$lt_save_ifs"
-+	if test "X$pkg" = "X$p"; then
-+	  enable_fast_install=yes
-+	fi
-+      done
-+      IFS="$lt_save_ifs"
-+      ;;
-+    esac
-+else
-+  enable_fast_install=yes
-+fi
-+
-+
-+
-+    
-+    
-+    
-+
-+
-+  
-+
-+
-+# This can be used to rebuild libtool when needed
-+LIBTOOL_DEPS="$ltmain"
-+
-+# Always use our own libtool.
-+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+
-+
-+
-+    
-+    
-+    
-+
-+    
-+    
-+    
-+
-+    
-+    
-+    
-+
-+    
-+    
-+    
-+
-+    
-+    
-+    
-+
-+    
-+    
-+    
-+test -z "$LN_S" && LN_S="ln -s"
-+
-+    
-+    
-+    
-+
-+    
-+    
-+    
-+
-+    
-+    
-+    
-+
-+
-+if test -n "${ZSH_VERSION+set}" ; then
-+   setopt NO_GLOB_SUBST
-+fi
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
-+$as_echo_n "checking for objdir... " >&6; }
-+if test "${lt_cv_objdir+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  rm -f .libs 2>/dev/null
-+mkdir .libs 2>/dev/null
-+if test -d .libs; then
-+  lt_cv_objdir=.libs
-+else
-+  # MS-DOS does not allow filenames that begin with a dot.
-+  lt_cv_objdir=_libs
-+fi
-+rmdir .libs 2>/dev/null
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
-+$as_echo "$lt_cv_objdir" >&6; }
-+objdir=$lt_cv_objdir
-+
-+    
-+    
-+    
-+
-+cat >>confdefs.h <<_ACEOF
-+@%:@define LT_OBJDIR "$lt_cv_objdir/"
-+_ACEOF
-+
-+
-+
-+
-+case $host_os in
-+aix3*)
-+  # AIX sometimes has problems with the GCC collect2 program.  For some
-+  # reason, if we set the COLLECT_NAMES environment variable, the problems
-+  # vanish in a puff of smoke.
-+  if test "X${COLLECT_NAMES+set}" != Xset; then
-+    COLLECT_NAMES=
-+    export COLLECT_NAMES
-+  fi
-+  ;;
-+esac
-+
-+# Global variables:
-+ofile=libtool
-+can_build_shared=yes
-+
-+# All known linkers require a `.a' archive for static linking (except MSVC,
-+# which needs '.lib').
-+libext=a
-+
-+with_gnu_ld="$lt_cv_prog_gnu_ld"
-+
-+old_CC="$CC"
-+old_CFLAGS="$CFLAGS"
-+
-+# Set sane defaults for various variables
-+test -z "$CC" && CC=cc
-+test -z "$LTCC" && LTCC=$CC
-+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-+test -z "$LD" && LD=ld
-+test -z "$ac_objext" && ac_objext=o
-+
-+for cc_temp in $compiler""; do
-+  case $cc_temp in
-+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-+    \-*) ;;
-+    *) break;;
-+  esac
-+done
-+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
-+
-+
-+# Only perform the check for file, if the check method requires it
-+test -z "$MAGIC_CMD" && MAGIC_CMD=file
-+case $deplibs_check_method in
-+file_magic*)
-+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
-+$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
-+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  case $MAGIC_CMD in
-+[\\/*] |  ?:[\\/]*)
-+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-+  ;;
-+*)
-+  lt_save_MAGIC_CMD="$MAGIC_CMD"
-+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-+  for ac_dir in $ac_dummy; do
-+    IFS="$lt_save_ifs"
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/${ac_tool_prefix}file; then
-+      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
-+      if test -n "$file_magic_test_file"; then
-+	case $deplibs_check_method in
-+	"file_magic "*)
-+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-+	    $EGREP "$file_magic_regex" > /dev/null; then
-+	    :
-+	  else
-+	    cat <<_LT_EOF 1>&2
-+
-+*** Warning: the command libtool uses to detect shared libraries,
-+*** $file_magic_cmd, produces output that libtool cannot recognize.
-+*** The result is that libtool may fail to recognize shared libraries
-+*** as such.  This will affect the creation of libtool libraries that
-+*** depend on shared libraries, but programs linked with such libtool
-+*** libraries will work regardless of this problem.  Nevertheless, you
-+*** may want to report the problem to your system manager and/or to
-+*** bug-libtool@gnu.org
-+
-+_LT_EOF
-+	  fi ;;
-+	esac
-+      fi
-+      break
-+    fi
-+  done
-+  IFS="$lt_save_ifs"
-+  MAGIC_CMD="$lt_save_MAGIC_CMD"
-+  ;;
-+esac
-+fi
-+
-+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+if test -n "$MAGIC_CMD"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-+$as_echo "$MAGIC_CMD" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+    
-+    
-+    
-+
-+if test -z "$lt_cv_path_MAGIC_CMD"; then
-+  if test -n "$ac_tool_prefix"; then
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
-+$as_echo_n "checking for file... " >&6; }
-+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  case $MAGIC_CMD in
-+[\\/*] |  ?:[\\/]*)
-+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-+  ;;
-+*)
-+  lt_save_MAGIC_CMD="$MAGIC_CMD"
-+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-+  for ac_dir in $ac_dummy; do
-+    IFS="$lt_save_ifs"
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/file; then
-+      lt_cv_path_MAGIC_CMD="$ac_dir/file"
-+      if test -n "$file_magic_test_file"; then
-+	case $deplibs_check_method in
-+	"file_magic "*)
-+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-+	    $EGREP "$file_magic_regex" > /dev/null; then
-+	    :
-+	  else
-+	    cat <<_LT_EOF 1>&2
-+
-+*** Warning: the command libtool uses to detect shared libraries,
-+*** $file_magic_cmd, produces output that libtool cannot recognize.
-+*** The result is that libtool may fail to recognize shared libraries
-+*** as such.  This will affect the creation of libtool libraries that
-+*** depend on shared libraries, but programs linked with such libtool
-+*** libraries will work regardless of this problem.  Nevertheless, you
-+*** may want to report the problem to your system manager and/or to
-+*** bug-libtool@gnu.org
-+
-+_LT_EOF
-+	  fi ;;
-+	esac
-+      fi
-+      break
-+    fi
-+  done
-+  IFS="$lt_save_ifs"
-+  MAGIC_CMD="$lt_save_MAGIC_CMD"
-+  ;;
-+esac
-+fi
-+
-+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+if test -n "$MAGIC_CMD"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-+$as_echo "$MAGIC_CMD" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+  else
-+    MAGIC_CMD=:
-+  fi
-+fi
-+
-+  fi
-+  ;;
-+esac
-+
-+# Use C for the default configuration in the libtool script
-+
-+lt_save_CC="$CC"
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+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
-+
-+
-+# Source file extension for C test sources.
-+ac_ext=c
-+
-+# Object file extension for compiled C test sources.
-+objext=o
-+objext=$objext
-+
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code="int some_variable = 0;"
-+
-+# Code to be used in simple link tests
-+lt_simple_link_test_code='int main(){return(0);}'
-+
-+
-+
-+
-+
-+
-+
-+# If no C compiler was specified, use CC.
-+LTCC=${LTCC-"$CC"}
-+
-+# If no C compiler flags were specified, use CFLAGS.
-+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-+
-+# Allow CC to be a program name with arguments.
-+compiler=$CC
-+
-+# Save the default compiler, since it gets overwritten when the other
-+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
-+compiler_DEFAULT=$CC
-+
-+# save warnings/boilerplate of simple test code
-+ac_outfile=conftest.$ac_objext
-+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-+_lt_compiler_boilerplate=`cat conftest.err`
-+$RM conftest*
-+
-+ac_outfile=conftest.$ac_objext
-+echo "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-+_lt_linker_boilerplate=`cat conftest.err`
-+$RM -r conftest*
-+
-+
-+## CAVEAT EMPTOR:
-+## There is no encapsulation within the following macros, do not change
-+## the running order or otherwise move them around unless you know exactly
-+## what you are doing...
-+if test -n "$compiler"; then
-+  
-+lt_prog_compiler_no_builtin_flag=
-+
-+if test "$GCC" = yes; then
-+  case $cc_basename in
-+  nvcc*)
-+    lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
-+  *)
-+    lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
-+  esac
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-+$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-+if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  lt_cv_prog_compiler_rtti_exceptions=no
-+   ac_outfile=conftest.$ac_objext
-+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-+   lt_compiler_flag="-fno-rtti -fno-exceptions"
-+   # Insert the option either (1) after the last *FLAGS variable, or
-+   # (2) before a word containing "conftest.", or (3) at the end.
-+   # Note that $ac_compile itself does not contain backslashes and begins
-+   # with a dollar sign (not a hyphen), so the echo should work correctly.
-+   # The option is referenced via a variable to avoid confusing sed.
-+   lt_compile=`echo "$ac_compile" | $SED \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+   -e 's:$: $lt_compiler_flag:'`
-+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-+   (eval "$lt_compile" 2>conftest.err)
-+   ac_status=$?
-+   cat conftest.err >&5
-+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+   if (exit $ac_status) && test -s "$ac_outfile"; then
-+     # The compiler can only warn and ignore the option if not recognized
-+     # So say no if there are warnings other than the usual output.
-+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
-+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-+       lt_cv_prog_compiler_rtti_exceptions=yes
-+     fi
-+   fi
-+   $RM conftest*
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-+$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
-+
-+if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-+    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-+else
-+    :
-+fi
-+
-+fi
-+
-+    
-+    
-+    
-+
-+
-+  lt_prog_compiler_wl=
-+lt_prog_compiler_pic=
-+lt_prog_compiler_static=
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-+
-+  if test "$GCC" = yes; then
-+    lt_prog_compiler_wl='-Wl,'
-+    lt_prog_compiler_static='-static'
-+
-+    case $host_os in
-+      aix*)
-+      # All AIX code is PIC.
-+      if test "$host_cpu" = ia64; then
-+	# AIX 5 now supports IA64 processor
-+	lt_prog_compiler_static='-Bstatic'
-+      fi
-+      ;;
-+
-+    amigaos*)
-+      case $host_cpu in
-+      powerpc)
-+            # see comment about AmigaOS4 .so support
-+            lt_prog_compiler_pic='-fPIC'
-+        ;;
-+      m68k)
-+            # FIXME: we need at least 68020 code to build shared libraries, but
-+            # adding the `-m68020' flag to GCC prevents building anything better,
-+            # like `-m68040'.
-+            lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
-+        ;;
-+      esac
-+      ;;
-+
-+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+      # PIC is the default for these OSes.
-+      ;;
-+
-+    mingw* | cygwin* | pw32* | os2* | cegcc*)
-+      # This hack is so that the source file can tell whether it is being
-+      # built for inclusion in a dll (and should export symbols for example).
-+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-+      # (--disable-auto-import) libraries
-+      lt_prog_compiler_pic='-DDLL_EXPORT'
-+      ;;
-+
-+    darwin* | rhapsody*)
-+      # PIC is the default on this platform
-+      # Common symbols not allowed in MH_DYLIB files
-+      lt_prog_compiler_pic='-fno-common'
-+      ;;
-+
-+    haiku*)
-+      # PIC is the default for Haiku.
-+      # The "-static" flag exists, but is broken.
-+      lt_prog_compiler_static=
-+      ;;
-+
-+    hpux*)
-+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-+      # sets the default TLS model and affects inlining.
-+      case $host_cpu in
-+      hppa*64*)
-+	# +Z the default
-+	;;
-+      *)
-+	lt_prog_compiler_pic='-fPIC'
-+	;;
-+      esac
-+      ;;
-+
-+    interix[3-9]*)
-+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-+      # Instead, we relocate shared libraries at runtime.
-+      ;;
-+
-+    msdosdjgpp*)
-+      # Just because we use GCC doesn't mean we suddenly get shared libraries
-+      # on systems that don't support them.
-+      lt_prog_compiler_can_build_shared=no
-+      enable_shared=no
-+      ;;
-+
-+    *nto* | *qnx*)
-+      # QNX uses GNU C++, but need to define -shared option too, otherwise
-+      # it will coredump.
-+      lt_prog_compiler_pic='-fPIC -shared'
-+      ;;
-+
-+    sysv4*MP*)
-+      if test -d /usr/nec; then
-+	lt_prog_compiler_pic=-Kconform_pic
-+      fi
-+      ;;
-+
-+    *)
-+      lt_prog_compiler_pic='-fPIC'
-+      ;;
-+    esac
-+
-+    case $cc_basename in
-+    nvcc*) # Cuda Compiler Driver 2.2
-+      lt_prog_compiler_wl='-Xlinker '
-+      lt_prog_compiler_pic='-Xcompiler -fPIC'
-+      ;;
-+    esac
-+  else
-+    # PORTME Check for flag to pass linker flags through the system compiler.
-+    case $host_os in
-+    aix*)
-+      lt_prog_compiler_wl='-Wl,'
-+      if test "$host_cpu" = ia64; then
-+	# AIX 5 now supports IA64 processor
-+	lt_prog_compiler_static='-Bstatic'
-+      else
-+	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
-+      fi
-+      ;;
-+
-+    mingw* | cygwin* | pw32* | os2* | cegcc*)
-+      # This hack is so that the source file can tell whether it is being
-+      # built for inclusion in a dll (and should export symbols for example).
-+      lt_prog_compiler_pic='-DDLL_EXPORT'
-+      ;;
-+
-+    hpux9* | hpux10* | hpux11*)
-+      lt_prog_compiler_wl='-Wl,'
-+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-+      # not for PA HP-UX.
-+      case $host_cpu in
-+      hppa*64*|ia64*)
-+	# +Z the default
-+	;;
-+      *)
-+	lt_prog_compiler_pic='+Z'
-+	;;
-+      esac
-+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-+      lt_prog_compiler_static='${wl}-a ${wl}archive'
-+      ;;
-+
-+    irix5* | irix6* | nonstopux*)
-+      lt_prog_compiler_wl='-Wl,'
-+      # PIC (with -KPIC) is the default.
-+      lt_prog_compiler_static='-non_shared'
-+      ;;
-+
-+    linux* | k*bsd*-gnu | kopensolaris*-gnu)
-+      case $cc_basename in
-+      # old Intel for x86_64 which still supported -KPIC.
-+      ecc*)
-+	lt_prog_compiler_wl='-Wl,'
-+	lt_prog_compiler_pic='-KPIC'
-+	lt_prog_compiler_static='-static'
-+        ;;
-+      # icc used to be incompatible with GCC.
-+      # ICC 10 doesn't accept -KPIC any more.
-+      icc* | ifort*)
-+	lt_prog_compiler_wl='-Wl,'
-+	lt_prog_compiler_pic='-fPIC'
-+	lt_prog_compiler_static='-static'
-+        ;;
-+      # Lahey Fortran 8.1.
-+      lf95*)
-+	lt_prog_compiler_wl='-Wl,'
-+	lt_prog_compiler_pic='--shared'
-+	lt_prog_compiler_static='--static'
-+	;;
-+      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
-+        # Portland Group compilers (*not* the Pentium gcc compiler,
-+	# which looks to be a dead project)
-+	lt_prog_compiler_wl='-Wl,'
-+	lt_prog_compiler_pic='-fpic'
-+	lt_prog_compiler_static='-Bstatic'
-+        ;;
-+      ccc*)
-+        lt_prog_compiler_wl='-Wl,'
-+        # All Alpha code is PIC.
-+        lt_prog_compiler_static='-non_shared'
-+        ;;
-+      xl* | bgxl* | bgf* | mpixl*)
-+	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
-+	lt_prog_compiler_wl='-Wl,'
-+	lt_prog_compiler_pic='-qpic'
-+	lt_prog_compiler_static='-qstaticlink'
-+	;;
-+      *)
-+	case `$CC -V 2>&1 | sed 5q` in
-+	*Sun\ F* | *Sun*Fortran*)
-+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-+	  lt_prog_compiler_pic='-KPIC'
-+	  lt_prog_compiler_static='-Bstatic'
-+	  lt_prog_compiler_wl=''
-+	  ;;
-+	*Sun\ C*)
-+	  # Sun C 5.9
-+	  lt_prog_compiler_pic='-KPIC'
-+	  lt_prog_compiler_static='-Bstatic'
-+	  lt_prog_compiler_wl='-Wl,'
-+	  ;;
-+	esac
-+	;;
-+      esac
-+      ;;
-+
-+    newsos6)
-+      lt_prog_compiler_pic='-KPIC'
-+      lt_prog_compiler_static='-Bstatic'
-+      ;;
-+
-+    *nto* | *qnx*)
-+      # QNX uses GNU C++, but need to define -shared option too, otherwise
-+      # it will coredump.
-+      lt_prog_compiler_pic='-fPIC -shared'
-+      ;;
-+
-+    osf3* | osf4* | osf5*)
-+      lt_prog_compiler_wl='-Wl,'
-+      # All OSF/1 code is PIC.
-+      lt_prog_compiler_static='-non_shared'
-+      ;;
-+
-+    rdos*)
-+      lt_prog_compiler_static='-non_shared'
-+      ;;
-+
-+    solaris*)
-+      lt_prog_compiler_pic='-KPIC'
-+      lt_prog_compiler_static='-Bstatic'
-+      case $cc_basename in
-+      f77* | f90* | f95*)
-+	lt_prog_compiler_wl='-Qoption ld ';;
-+      *)
-+	lt_prog_compiler_wl='-Wl,';;
-+      esac
-+      ;;
-+
-+    sunos4*)
-+      lt_prog_compiler_wl='-Qoption ld '
-+      lt_prog_compiler_pic='-PIC'
-+      lt_prog_compiler_static='-Bstatic'
-+      ;;
-+
-+    sysv4 | sysv4.2uw2* | sysv4.3*)
-+      lt_prog_compiler_wl='-Wl,'
-+      lt_prog_compiler_pic='-KPIC'
-+      lt_prog_compiler_static='-Bstatic'
-+      ;;
-+
-+    sysv4*MP*)
-+      if test -d /usr/nec ;then
-+	lt_prog_compiler_pic='-Kconform_pic'
-+	lt_prog_compiler_static='-Bstatic'
-+      fi
-+      ;;
-+
-+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-+      lt_prog_compiler_wl='-Wl,'
-+      lt_prog_compiler_pic='-KPIC'
-+      lt_prog_compiler_static='-Bstatic'
-+      ;;
-+
-+    unicos*)
-+      lt_prog_compiler_wl='-Wl,'
-+      lt_prog_compiler_can_build_shared=no
-+      ;;
-+
-+    uts4*)
-+      lt_prog_compiler_pic='-pic'
-+      lt_prog_compiler_static='-Bstatic'
-+      ;;
-+
-+    *)
-+      lt_prog_compiler_can_build_shared=no
-+      ;;
-+    esac
-+  fi
-+
-+case $host_os in
-+  # For platforms which do not support PIC, -DPIC is meaningless:
-+  *djgpp*)
-+    lt_prog_compiler_pic=
-+    ;;
-+  *)
-+    lt_prog_compiler_pic="$lt_prog_compiler_pic@&t@ -DPIC"
-+    ;;
-+esac
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
-+$as_echo "$lt_prog_compiler_pic" >&6; }
-+
-+    
-+    
-+    
-+
-+
-+#
-+# Check to make sure the PIC flag actually works.
-+#
-+if test -n "$lt_prog_compiler_pic"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
-+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  lt_cv_prog_compiler_pic_works=no
-+   ac_outfile=conftest.$ac_objext
-+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-+   lt_compiler_flag="$lt_prog_compiler_pic@&t@ -DPIC"
-+   # Insert the option either (1) after the last *FLAGS variable, or
-+   # (2) before a word containing "conftest.", or (3) at the end.
-+   # Note that $ac_compile itself does not contain backslashes and begins
-+   # with a dollar sign (not a hyphen), so the echo should work correctly.
-+   # The option is referenced via a variable to avoid confusing sed.
-+   lt_compile=`echo "$ac_compile" | $SED \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+   -e 's:$: $lt_compiler_flag:'`
-+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-+   (eval "$lt_compile" 2>conftest.err)
-+   ac_status=$?
-+   cat conftest.err >&5
-+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+   if (exit $ac_status) && test -s "$ac_outfile"; then
-+     # The compiler can only warn and ignore the option if not recognized
-+     # So say no if there are warnings other than the usual output.
-+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
-+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-+       lt_cv_prog_compiler_pic_works=yes
-+     fi
-+   fi
-+   $RM conftest*
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
-+$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
-+
-+if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-+    case $lt_prog_compiler_pic in
-+     "" | " "*) ;;
-+     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
-+     esac
-+else
-+    lt_prog_compiler_pic=
-+     lt_prog_compiler_can_build_shared=no
-+fi
-+
-+fi
-+
-+    
-+    
-+    
-+
-+
-+#
-+# Check to make sure the static flag actually works.
-+#
-+wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-+if test "${lt_cv_prog_compiler_static_works+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  lt_cv_prog_compiler_static_works=no
-+   save_LDFLAGS="$LDFLAGS"
-+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-+     # The linker can only warn and ignore the option if not recognized
-+     # So say no if there are warnings
-+     if test -s conftest.err; then
-+       # Append any errors to the config.log.
-+       cat conftest.err 1>&5
-+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-+       if diff conftest.exp conftest.er2 >/dev/null; then
-+         lt_cv_prog_compiler_static_works=yes
-+       fi
-+     else
-+       lt_cv_prog_compiler_static_works=yes
-+     fi
-+   fi
-+   $RM -r conftest*
-+   LDFLAGS="$save_LDFLAGS"
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
-+$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
-+
-+if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-+    :
-+else
-+    lt_prog_compiler_static=
-+fi
-+
-+
-+    
-+    
-+    
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  lt_cv_prog_compiler_c_o=no
-+   $RM -r conftest 2>/dev/null
-+   mkdir conftest
-+   cd conftest
-+   mkdir out
-+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-+
-+   lt_compiler_flag="-o out/conftest2.$ac_objext"
-+   # Insert the option either (1) after the last *FLAGS variable, or
-+   # (2) before a word containing "conftest.", or (3) at the end.
-+   # Note that $ac_compile itself does not contain backslashes and begins
-+   # with a dollar sign (not a hyphen), so the echo should work correctly.
-+   lt_compile=`echo "$ac_compile" | $SED \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+   -e 's:$: $lt_compiler_flag:'`
-+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-+   (eval "$lt_compile" 2>out/conftest.err)
-+   ac_status=$?
-+   cat out/conftest.err >&5
-+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-+   then
-+     # The compiler can only warn and ignore the option if not recognized
-+     # So say no if there are warnings
-+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
-+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-+       lt_cv_prog_compiler_c_o=yes
-+     fi
-+   fi
-+   chmod u+w . 2>&5
-+   $RM conftest*
-+   # SGI C++ compiler will create directory out/ii_files/ for
-+   # template instantiation
-+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-+   $RM out/* && rmdir out
-+   cd ..
-+   $RM -r conftest
-+   $RM conftest*
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-+
-+    
-+    
-+    
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  lt_cv_prog_compiler_c_o=no
-+   $RM -r conftest 2>/dev/null
-+   mkdir conftest
-+   cd conftest
-+   mkdir out
-+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-+
-+   lt_compiler_flag="-o out/conftest2.$ac_objext"
-+   # Insert the option either (1) after the last *FLAGS variable, or
-+   # (2) before a word containing "conftest.", or (3) at the end.
-+   # Note that $ac_compile itself does not contain backslashes and begins
-+   # with a dollar sign (not a hyphen), so the echo should work correctly.
-+   lt_compile=`echo "$ac_compile" | $SED \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+   -e 's:$: $lt_compiler_flag:'`
-+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-+   (eval "$lt_compile" 2>out/conftest.err)
-+   ac_status=$?
-+   cat out/conftest.err >&5
-+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-+   then
-+     # The compiler can only warn and ignore the option if not recognized
-+     # So say no if there are warnings
-+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
-+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-+       lt_cv_prog_compiler_c_o=yes
-+     fi
-+   fi
-+   chmod u+w . 2>&5
-+   $RM conftest*
-+   # SGI C++ compiler will create directory out/ii_files/ for
-+   # template instantiation
-+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-+   $RM out/* && rmdir out
-+   cd ..
-+   $RM -r conftest
-+   $RM conftest*
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-+
-+
-+
-+
-+hard_links="nottested"
-+if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
-+  # do not overwrite the value of need_locks provided by the user
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
-+$as_echo_n "checking if we can lock with hard links... " >&6; }
-+  hard_links=yes
-+  $RM conftest*
-+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+  touch conftest.a
-+  ln conftest.a conftest.b 2>&5 || hard_links=no
-+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
-+$as_echo "$hard_links" >&6; }
-+  if test "$hard_links" = no; then
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-+    need_locks=warn
-+  fi
-+else
-+  need_locks=no
-+fi
-+
-+    
-+    
-+    
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
-+
-+  runpath_var=
-+  allow_undefined_flag=
-+  always_export_symbols=no
-+  archive_cmds=
-+  archive_expsym_cmds=
-+  compiler_needs_object=no
-+  enable_shared_with_static_runtimes=no
-+  export_dynamic_flag_spec=
-+  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+  hardcode_automatic=no
-+  hardcode_direct=no
-+  hardcode_direct_absolute=no
-+  hardcode_libdir_flag_spec=
-+  hardcode_libdir_flag_spec_ld=
-+  hardcode_libdir_separator=
-+  hardcode_minus_L=no
-+  hardcode_shlibpath_var=unsupported
-+  inherit_rpath=no
-+  link_all_deplibs=unknown
-+  module_cmds=
-+  module_expsym_cmds=
-+  old_archive_from_new_cmds=
-+  old_archive_from_expsyms_cmds=
-+  thread_safe_flag_spec=
-+  whole_archive_flag_spec=
-+  # include_expsyms should be a list of space-separated symbols to be *always*
-+  # included in the symbol list
-+  include_expsyms=
-+  # exclude_expsyms can be an extended regexp of symbols to exclude
-+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-+  # as well as any symbol that contains `d'.
-+  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
-+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-+  # platforms (ab)use it in PIC code, but their linkers get confused if
-+  # the symbol is explicitly referenced.  Since portable code cannot
-+  # rely on this symbol name, it's probably fine to never include it in
-+  # preloaded symbol tables.
-+  # Exclude shared library initialization/finalization symbols.
-+  extract_expsyms_cmds=
-+
-+  case $host_os in
-+  cygwin* | mingw* | pw32* | cegcc*)
-+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-+    # When not using gcc, we currently assume that we are using
-+    # Microsoft Visual C++.
-+    if test "$GCC" != yes; then
-+      with_gnu_ld=no
-+    fi
-+    ;;
-+  interix*)
-+    # we just hope/assume this is gcc and not c89 (= MSVC++)
-+    with_gnu_ld=yes
-+    ;;
-+  openbsd*)
-+    with_gnu_ld=no
-+    ;;
-+  esac
-+
-+  ld_shlibs=yes
-+
-+  # On some targets, GNU ld is compatible enough with the native linker
-+  # that we're better off using the native interface for both.
-+  lt_use_gnu_ld_interface=no
-+  if test "$with_gnu_ld" = yes; then
-+    case $host_os in
-+      aix*)
-+	# The AIX port of GNU ld has always aspired to compatibility
-+	# with the native linker.  However, as the warning in the GNU ld
-+	# block says, versions before 2.19.5* couldn't really create working
-+	# shared libraries, regardless of the interface used.
-+	case `$LD -v 2>&1` in
-+	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
-+	  *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;;
-+	  *\ \(GNU\ Binutils\)\ [3-9]*) ;;
-+	  *)
-+	    lt_use_gnu_ld_interface=yes
-+	    ;;
-+	esac
-+	;;
-+      *)
-+	lt_use_gnu_ld_interface=yes
-+	;;
-+    esac
-+  fi
-+
-+  if test "$lt_use_gnu_ld_interface" = yes; then
-+    # If archive_cmds runs LD, not CC, wlarc should be empty
-+    wlarc='${wl}'
-+
-+    # Set some defaults for GNU ld with shared library support. These
-+    # are reset later if shared libraries are not supported. Putting them
-+    # here allows them to be overridden if necessary.
-+    runpath_var=LD_RUN_PATH
-+    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+    export_dynamic_flag_spec='${wl}--export-dynamic'
-+    # ancient GNU ld didn't support --whole-archive et. al.
-+    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
-+      whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+    else
-+      whole_archive_flag_spec=
-+    fi
-+    supports_anon_versioning=no
-+    case `$LD -v 2>&1` in
-+      *GNU\ gold*) supports_anon_versioning=yes ;;
-+      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-+      *\ 2.11.*) ;; # other 2.11 versions
-+      *) supports_anon_versioning=yes ;;
-+    esac
-+
-+    # See if GNU ld supports shared libraries.
-+    case $host_os in
-+    aix[3-9]*)
-+      # On AIX/PPC, the GNU linker is very broken
-+      if test "$host_cpu" != ia64; then
-+	ld_shlibs=no
-+	cat <<_LT_EOF 1>&2
-+
-+*** Warning: the GNU linker, at least up to release 2.19, is reported
-+*** to be unable to reliably create shared libraries on AIX.
-+*** Therefore, libtool is disabling shared libraries support.  If you
-+*** really care for shared libraries, you may want to install binutils
-+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
-+*** You will then need to restart the configuration process.
-+
-+_LT_EOF
-+      fi
-+      ;;
-+
-+    amigaos*)
-+      case $host_cpu in
-+      powerpc)
-+            # see comment about AmigaOS4 .so support
-+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+            archive_expsym_cmds=''
-+        ;;
-+      m68k)
-+            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-+            hardcode_libdir_flag_spec='-L$libdir'
-+            hardcode_minus_L=yes
-+        ;;
-+      esac
-+      ;;
-+
-+    beos*)
-+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+	allow_undefined_flag=unsupported
-+	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-+	# support --undefined.  This deserves some investigation.  FIXME
-+	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+      else
-+	ld_shlibs=no
-+      fi
-+      ;;
-+
-+    cygwin* | mingw* | pw32* | cegcc*)
-+      # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
-+      # as there is no search path for DLLs.
-+      hardcode_libdir_flag_spec='-L$libdir'
-+      export_dynamic_flag_spec='${wl}--export-all-symbols'
-+      allow_undefined_flag=unsupported
-+      always_export_symbols=no
-+      enable_shared_with_static_runtimes=yes
-+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
-+
-+      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-+        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+	# If the export-symbols file already is a .def file (1st line
-+	# is EXPORTS), use it as is; otherwise, prepend...
-+	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-+	  cp $export_symbols $output_objdir/$soname.def;
-+	else
-+	  echo EXPORTS > $output_objdir/$soname.def;
-+	  cat $export_symbols >> $output_objdir/$soname.def;
-+	fi~
-+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+      else
-+	ld_shlibs=no
-+      fi
-+      ;;
-+
-+    haiku*)
-+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+      link_all_deplibs=yes
-+      ;;
-+
-+    interix[3-9]*)
-+      hardcode_direct=no
-+      hardcode_shlibpath_var=no
-+      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+      export_dynamic_flag_spec='${wl}-E'
-+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-+      # Instead, shared libraries are loaded at an image base (0x10000000 by
-+      # default) and relocated if they conflict, which is a slow very memory
-+      # consuming and fragmenting process.  To avoid this, we pick a random,
-+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-+      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-+      archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-+      ;;
-+
-+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
-+      tmp_diet=no
-+      if test "$host_os" = linux-dietlibc; then
-+	case $cc_basename in
-+	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
-+	esac
-+      fi
-+      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-+	 && test "$tmp_diet" = no
-+      then
-+	tmp_addflag=
-+	tmp_sharedflag='-shared'
-+	case $cc_basename,$host_cpu in
-+        pgcc*)				# Portland Group C compiler
-+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  tmp_addflag=' $pic_flag'
-+	  ;;
-+	pgf77* | pgf90* | pgf95* | pgfortran*)
-+					# Portland Group f77 and f90 compilers
-+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  tmp_addflag=' $pic_flag -Mnomain' ;;
-+	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
-+	  tmp_addflag=' -i_dynamic' ;;
-+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-+	ifc* | ifort*)			# Intel Fortran compiler
-+	  tmp_addflag=' -nofor_main' ;;
-+	lf95*)				# Lahey Fortran 8.1
-+	  whole_archive_flag_spec=
-+	  tmp_sharedflag='--shared' ;;
-+	xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
-+	  tmp_sharedflag='-qmkshrobj'
-+	  tmp_addflag= ;;
-+	nvcc*)	# Cuda Compiler Driver 2.2
-+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  compiler_needs_object=yes
-+	  ;;
-+	esac
-+	case `$CC -V 2>&1 | sed 5q` in
-+	*Sun\ C*)			# Sun C 5.9
-+	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  compiler_needs_object=yes
-+	  tmp_sharedflag='-G' ;;
-+	*Sun\ F*)			# Sun Fortran 8.3
-+	  tmp_sharedflag='-G' ;;
-+	esac
-+	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+
-+        if test "x$supports_anon_versioning" = xyes; then
-+          archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-+	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+	    echo "local: *; };" >> $output_objdir/$libname.ver~
-+	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+        fi
-+
-+	case $cc_basename in
-+	xlf* | bgf* | bgxlf* | mpixlf*)
-+	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
-+	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
-+	  hardcode_libdir_flag_spec=
-+	  hardcode_libdir_flag_spec_ld='-rpath $libdir'
-+	  archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
-+	  if test "x$supports_anon_versioning" = xyes; then
-+	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-+	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+	      echo "local: *; };" >> $output_objdir/$libname.ver~
-+	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
-+	  fi
-+	  ;;
-+	esac
-+      else
-+        ld_shlibs=no
-+      fi
-+      ;;
-+
-+    netbsd*)
-+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-+	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-+	wlarc=
-+      else
-+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+      fi
-+      ;;
-+
-+    solaris*)
-+      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
-+	ld_shlibs=no
-+	cat <<_LT_EOF 1>&2
-+
-+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-+*** create shared libraries on Solaris systems.  Therefore, libtool
-+*** is disabling shared libraries support.  We urge you to upgrade GNU
-+*** binutils to release 2.9.1 or newer.  Another option is to modify
-+*** your PATH or compiler configuration so that the native linker is
-+*** used, and then restart.
-+
-+_LT_EOF
-+      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+      else
-+	ld_shlibs=no
-+      fi
-+      ;;
-+
-+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-+      case `$LD -v 2>&1` in
-+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
-+	ld_shlibs=no
-+	cat <<_LT_EOF 1>&2
-+
-+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-+*** reliably create shared libraries on SCO systems.  Therefore, libtool
-+*** is disabling shared libraries support.  We urge you to upgrade GNU
-+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-+*** your PATH or compiler configuration so that the native linker is
-+*** used, and then restart.
-+
-+_LT_EOF
-+	;;
-+	*)
-+	  # For security reasons, it is highly recommended that you always
-+	  # use absolute paths for naming shared libraries, and exclude the
-+	  # DT_RUNPATH tag from executables and libraries.  But doing so
-+	  # requires that you compile everything twice, which is a pain.
-+	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+	    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+	  else
-+	    ld_shlibs=no
-+	  fi
-+	;;
-+      esac
-+      ;;
-+
-+    sunos4*)
-+      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+      wlarc=
-+      hardcode_direct=yes
-+      hardcode_shlibpath_var=no
-+      ;;
-+
-+    *)
-+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+      else
-+	ld_shlibs=no
-+      fi
-+      ;;
-+    esac
-+
-+    if test "$ld_shlibs" = no; then
-+      runpath_var=
-+      hardcode_libdir_flag_spec=
-+      export_dynamic_flag_spec=
-+      whole_archive_flag_spec=
-+    fi
-+  else
-+    # PORTME fill in a description of your system's linker (not GNU ld)
-+    case $host_os in
-+    aix3*)
-+      allow_undefined_flag=unsupported
-+      always_export_symbols=yes
-+      archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-+      # Note: this linker hardcodes the directories in LIBPATH if there
-+      # are no directories specified by -L.
-+      hardcode_minus_L=yes
-+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-+	# Neither direct hardcoding nor static linking is supported with a
-+	# broken collect2.
-+	hardcode_direct=unsupported
-+      fi
-+      ;;
-+
-+    aix[4-9]*)
-+      if test "$host_cpu" = ia64; then
-+	# On IA64, the linker does run time linking by default, so we don't
-+	# have to do anything special.
-+	aix_use_runtimelinking=no
-+	exp_sym_flag='-Bexport'
-+	no_entry_flag=""
-+      else
-+	# If we're using GNU nm, then we don't want the "-C" option.
-+	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-+	# Also, AIX nm treats weak defined symbols like other global
-+	# defined symbols, whereas GNU nm marks them as "W".
-+	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-+	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-+	else
-+	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-+	fi
-+	aix_use_runtimelinking=no
-+
-+	# Test if we are trying to use run time linking or normal
-+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-+	# need to do runtime linking.
-+	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
-+	  for ld_flag in $LDFLAGS; do
-+	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-+	    aix_use_runtimelinking=yes
-+	    break
-+	  fi
-+	  done
-+	  ;;
-+	esac
-+
-+	exp_sym_flag='-bexport'
-+	no_entry_flag='-bnoentry'
-+      fi
-+
-+      # When large executables or shared objects are built, AIX ld can
-+      # have problems creating the table of contents.  If linking a library
-+      # or program results in "error TOC overflow" add -mminimal-toc to
-+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-+
-+      archive_cmds=''
-+      hardcode_direct=yes
-+      hardcode_direct_absolute=yes
-+      hardcode_libdir_separator=':'
-+      link_all_deplibs=yes
-+      file_list_spec='${wl}-f,'
-+
-+      if test "$GCC" = yes; then
-+	case $host_os in aix4.[012]|aix4.[012].*)
-+	# We only want to do this on AIX 4.2 and lower, the check
-+	# below for broken collect2 doesn't work under 4.3+
-+	  collect2name=`${CC} -print-prog-name=collect2`
-+	  if test -f "$collect2name" &&
-+	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-+	  then
-+	  # We have reworked collect2
-+	  :
-+	  else
-+	  # We have old collect2
-+	  hardcode_direct=unsupported
-+	  # It fails to find uninstalled libraries when the uninstalled
-+	  # path is not listed in the libpath.  Setting hardcode_minus_L
-+	  # to unsupported forces relinking
-+	  hardcode_minus_L=yes
-+	  hardcode_libdir_flag_spec='-L$libdir'
-+	  hardcode_libdir_separator=
-+	  fi
-+	  ;;
-+	esac
-+	shared_flag='-shared'
-+	if test "$aix_use_runtimelinking" = yes; then
-+	  shared_flag="$shared_flag "'${wl}-G'
-+	fi
-+      else
-+	# not using gcc
-+	if test "$host_cpu" = ia64; then
-+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-+	# chokes on -Wl,-G. The following line is correct:
-+	  shared_flag='-G'
-+	else
-+	  if test "$aix_use_runtimelinking" = yes; then
-+	    shared_flag='${wl}-G'
-+	  else
-+	    shared_flag='${wl}-bM:SRE'
-+	  fi
-+	fi
-+      fi
-+
-+      export_dynamic_flag_spec='${wl}-bexpall'
-+      # It seems that -bexpall does not export symbols beginning with
-+      # underscore (_), so it is better to generate a list of symbols to export.
-+      always_export_symbols=yes
-+      if test "$aix_use_runtimelinking" = yes; then
-+	# Warning - without using the other runtime loading flags (-brtl),
-+	# -berok will link without error, but may produce a broken library.
-+	allow_undefined_flag='-berok'
-+        # Determine the default libpath from the value encoded in an
-+        # empty executable.
-+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  
-+lt_aix_libpath_sed='
-+    /Import File Strings/,/^$/ {
-+	/^0/ {
-+	    s/^0  *\(.*\)$/\1/
-+	    p
-+	}
-+    }'
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+# Check for a 64-bit object if we didn't find anything.
-+if test -z "$aix_libpath"; then
-+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+fi
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-+
-+        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-+        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+      else
-+	if test "$host_cpu" = ia64; then
-+	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-+	  allow_undefined_flag="-z nodefs"
-+	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-+	else
-+	 # Determine the default libpath from the value encoded in an
-+	 # empty executable.
-+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  
-+lt_aix_libpath_sed='
-+    /Import File Strings/,/^$/ {
-+	/^0/ {
-+	    s/^0  *\(.*\)$/\1/
-+	    p
-+	}
-+    }'
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+# Check for a 64-bit object if we didn't find anything.
-+if test -z "$aix_libpath"; then
-+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+fi
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-+
-+	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-+	  # Warning - without using the other run time loading flags,
-+	  # -berok will link without error, but may produce a broken library.
-+	  no_undefined_flag=' ${wl}-bernotok'
-+	  allow_undefined_flag=' ${wl}-berok'
-+	  if test "$with_gnu_ld" = yes; then
-+	    # We only use this code for GNU lds that support --whole-archive.
-+	    whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-+	  else
-+	    # Exported symbols can be pulled into shared objects from archives
-+	    whole_archive_flag_spec='$convenience'
-+	  fi
-+	  archive_cmds_need_lc=yes
-+	  # This is similar to how AIX traditionally builds its shared libraries.
-+	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-+	fi
-+      fi
-+      ;;
-+
-+    amigaos*)
-+      case $host_cpu in
-+      powerpc)
-+            # see comment about AmigaOS4 .so support
-+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+            archive_expsym_cmds=''
-+        ;;
-+      m68k)
-+            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-+            hardcode_libdir_flag_spec='-L$libdir'
-+            hardcode_minus_L=yes
-+        ;;
-+      esac
-+      ;;
-+
-+    bsdi[45]*)
-+      export_dynamic_flag_spec=-rdynamic
-+      ;;
-+
-+    cygwin* | mingw* | pw32* | cegcc*)
-+      # When not using gcc, we currently assume that we are using
-+      # Microsoft Visual C++.
-+      # hardcode_libdir_flag_spec is actually meaningless, as there is
-+      # no search path for DLLs.
-+      hardcode_libdir_flag_spec=' '
-+      allow_undefined_flag=unsupported
-+      # Tell ltmain to make .lib files, not .a files.
-+      libext=lib
-+      # Tell ltmain to make .dll files, not .so files.
-+      shrext_cmds=".dll"
-+      # FIXME: Setting linknames here is a bad hack.
-+      archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
-+      # The linker will automatically build a .lib file if we build a DLL.
-+      old_archive_from_new_cmds='true'
-+      # FIXME: Should let the user specify the lib program.
-+      old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
-+      fix_srcfile_path='`cygpath -w "$srcfile"`'
-+      enable_shared_with_static_runtimes=yes
-+      ;;
-+
-+    darwin* | rhapsody*)
-+      
-+  
-+  archive_cmds_need_lc=no
-+  hardcode_direct=no
-+  hardcode_automatic=yes
-+  hardcode_shlibpath_var=unsupported
-+  if test "$lt_cv_ld_force_load" = "yes"; then
-+    whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
-+  else
-+    whole_archive_flag_spec=''
-+  fi
-+  link_all_deplibs=yes
-+  allow_undefined_flag="$_lt_dar_allow_undefined"
-+  case $cc_basename in
-+     ifort*) _lt_dar_can_shared=yes ;;
-+     *) _lt_dar_can_shared=$GCC ;;
-+  esac
-+  if test "$_lt_dar_can_shared" = "yes"; then
-+    output_verbose_link_cmd=func_echo_all
-+    archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-+    module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-+    archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-+    module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-+    
-+  else
-+  ld_shlibs=no
-+  fi
-+
-+      ;;
-+
-+    dgux*)
-+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      hardcode_libdir_flag_spec='-L$libdir'
-+      hardcode_shlibpath_var=no
-+      ;;
-+
-+    freebsd1*)
-+      ld_shlibs=no
-+      ;;
-+
-+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-+    # support.  Future versions do this automatically, but an explicit c++rt0.o
-+    # does not break anything, and helps significantly (at the cost of a little
-+    # extra space).
-+    freebsd2.2*)
-+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-+      hardcode_libdir_flag_spec='-R$libdir'
-+      hardcode_direct=yes
-+      hardcode_shlibpath_var=no
-+      ;;
-+
-+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-+    freebsd2*)
-+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+      hardcode_direct=yes
-+      hardcode_minus_L=yes
-+      hardcode_shlibpath_var=no
-+      ;;
-+
-+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-+    freebsd* | dragonfly*)
-+      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-+      hardcode_libdir_flag_spec='-R$libdir'
-+      hardcode_direct=yes
-+      hardcode_shlibpath_var=no
-+      ;;
-+
-+    hpux9*)
-+      if test "$GCC" = yes; then
-+	archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+      else
-+	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+      fi
-+      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-+      hardcode_libdir_separator=:
-+      hardcode_direct=yes
-+
-+      # hardcode_minus_L: Not really in the search PATH,
-+      # but as the default location of the library.
-+      hardcode_minus_L=yes
-+      export_dynamic_flag_spec='${wl}-E'
-+      ;;
-+
-+    hpux10*)
-+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-+	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-+      else
-+	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-+      fi
-+      if test "$with_gnu_ld" = no; then
-+	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-+	hardcode_libdir_flag_spec_ld='+b $libdir'
-+	hardcode_libdir_separator=:
-+	hardcode_direct=yes
-+	hardcode_direct_absolute=yes
-+	export_dynamic_flag_spec='${wl}-E'
-+	# hardcode_minus_L: Not really in the search PATH,
-+	# but as the default location of the library.
-+	hardcode_minus_L=yes
-+      fi
-+      ;;
-+
-+    hpux11*)
-+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-+	case $host_cpu in
-+	hppa*64*)
-+	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	ia64*)
-+	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	*)
-+	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	esac
-+      else
-+	case $host_cpu in
-+	hppa*64*)
-+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	ia64*)
-+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	*)
-+	
-+	  # Older versions of the 11.00 compiler do not understand -b yet
-+	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
-+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
-+$as_echo_n "checking if $CC understands -b... " >&6; }
-+if test "${lt_cv_prog_compiler__b+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  lt_cv_prog_compiler__b=no
-+   save_LDFLAGS="$LDFLAGS"
-+   LDFLAGS="$LDFLAGS -b"
-+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-+     # The linker can only warn and ignore the option if not recognized
-+     # So say no if there are warnings
-+     if test -s conftest.err; then
-+       # Append any errors to the config.log.
-+       cat conftest.err 1>&5
-+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-+       if diff conftest.exp conftest.er2 >/dev/null; then
-+         lt_cv_prog_compiler__b=yes
-+       fi
-+     else
-+       lt_cv_prog_compiler__b=yes
-+     fi
-+   fi
-+   $RM -r conftest*
-+   LDFLAGS="$save_LDFLAGS"
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
-+$as_echo "$lt_cv_prog_compiler__b" >&6; }
-+
-+if test x"$lt_cv_prog_compiler__b" = xyes; then
-+    archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-+else
-+    archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-+fi
-+
-+	  ;;
-+	esac
-+      fi
-+      if test "$with_gnu_ld" = no; then
-+	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-+	hardcode_libdir_separator=:
-+
-+	case $host_cpu in
-+	hppa*64*|ia64*)
-+	  hardcode_direct=no
-+	  hardcode_shlibpath_var=no
-+	  ;;
-+	*)
-+	  hardcode_direct=yes
-+	  hardcode_direct_absolute=yes
-+	  export_dynamic_flag_spec='${wl}-E'
-+
-+	  # hardcode_minus_L: Not really in the search PATH,
-+	  # but as the default location of the library.
-+	  hardcode_minus_L=yes
-+	  ;;
-+	esac
-+      fi
-+      ;;
-+
-+    irix5* | irix6* | nonstopux*)
-+      if test "$GCC" = yes; then
-+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	# Try to use the -exported_symbol ld option, if it does not
-+	# work, assume that -exports_file does not work either and
-+	# implicitly export all symbols.
-+        save_LDFLAGS="$LDFLAGS"
-+        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+int foo(void) {}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-+        
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+        LDFLAGS="$save_LDFLAGS"
-+      else
-+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
-+      fi
-+      archive_cmds_need_lc='no'
-+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+      hardcode_libdir_separator=:
-+      inherit_rpath=yes
-+      link_all_deplibs=yes
-+      ;;
-+
-+    netbsd*)
-+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-+	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-+      else
-+	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-+      fi
-+      hardcode_libdir_flag_spec='-R$libdir'
-+      hardcode_direct=yes
-+      hardcode_shlibpath_var=no
-+      ;;
-+
-+    newsos6)
-+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      hardcode_direct=yes
-+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+      hardcode_libdir_separator=:
-+      hardcode_shlibpath_var=no
-+      ;;
-+
-+    *nto* | *qnx*)
-+      ;;
-+
-+    openbsd*)
-+      if test -f /usr/libexec/ld.so; then
-+	hardcode_direct=yes
-+	hardcode_shlibpath_var=no
-+	hardcode_direct_absolute=yes
-+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-+	  hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+	  export_dynamic_flag_spec='${wl}-E'
-+	else
-+	  case $host_os in
-+	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-+	     archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+	     hardcode_libdir_flag_spec='-R$libdir'
-+	     ;;
-+	   *)
-+	     archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	     hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+	     ;;
-+	  esac
-+	fi
-+      else
-+	ld_shlibs=no
-+      fi
-+      ;;
-+
-+    os2*)
-+      hardcode_libdir_flag_spec='-L$libdir'
-+      hardcode_minus_L=yes
-+      allow_undefined_flag=unsupported
-+      archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-+      old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-+      ;;
-+
-+    osf3*)
-+      if test "$GCC" = yes; then
-+	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+      else
-+	allow_undefined_flag=' -expect_unresolved \*'
-+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-+      fi
-+      archive_cmds_need_lc='no'
-+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+      hardcode_libdir_separator=:
-+      ;;
-+
-+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-+      if test "$GCC" = yes; then
-+	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+      else
-+	allow_undefined_flag=' -expect_unresolved \*'
-+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-+	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-+	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
-+
-+	# Both c and cxx compiler support -rpath directly
-+	hardcode_libdir_flag_spec='-rpath $libdir'
-+      fi
-+      archive_cmds_need_lc='no'
-+      hardcode_libdir_separator=:
-+      ;;
-+
-+    solaris*)
-+      no_undefined_flag=' -z defs'
-+      if test "$GCC" = yes; then
-+	wlarc='${wl}'
-+	archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-+	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-+      else
-+	case `$CC -V 2>&1` in
-+	*"Compilers 5.0"*)
-+	  wlarc=''
-+	  archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-+	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
-+	  ;;
-+	*)
-+	  wlarc='${wl}'
-+	  archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-+	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-+	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-+	  ;;
-+	esac
-+      fi
-+      hardcode_libdir_flag_spec='-R$libdir'
-+      hardcode_shlibpath_var=no
-+      case $host_os in
-+      solaris2.[0-5] | solaris2.[0-5].*) ;;
-+      *)
-+	# The compiler driver will combine and reorder linker options,
-+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
-+	# but is careful enough not to reorder.
-+	# Supported since Solaris 2.6 (maybe 2.5.1?)
-+	if test "$GCC" = yes; then
-+	  whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-+	else
-+	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
-+	fi
-+	;;
-+      esac
-+      link_all_deplibs=yes
-+      ;;
-+
-+    sunos4*)
-+      if test "x$host_vendor" = xsequent; then
-+	# Use $CC to link under sequent, because it throws in some extra .o
-+	# files that make .init and .fini sections work.
-+	archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-+      else
-+	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-+      fi
-+      hardcode_libdir_flag_spec='-L$libdir'
-+      hardcode_direct=yes
-+      hardcode_minus_L=yes
-+      hardcode_shlibpath_var=no
-+      ;;
-+
-+    sysv4)
-+      case $host_vendor in
-+	sni)
-+	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	  hardcode_direct=yes # is this really true???
-+	;;
-+	siemens)
-+	  ## LD is ld it makes a PLAMLIB
-+	  ## CC just makes a GrossModule.
-+	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-+	  reload_cmds='$CC -r -o $output$reload_objs'
-+	  hardcode_direct=no
-+        ;;
-+	motorola)
-+	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
-+	;;
-+      esac
-+      runpath_var='LD_RUN_PATH'
-+      hardcode_shlibpath_var=no
-+      ;;
-+
-+    sysv4.3*)
-+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      hardcode_shlibpath_var=no
-+      export_dynamic_flag_spec='-Bexport'
-+      ;;
-+
-+    sysv4*MP*)
-+      if test -d /usr/nec; then
-+	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	hardcode_shlibpath_var=no
-+	runpath_var=LD_RUN_PATH
-+	hardcode_runpath_var=yes
-+	ld_shlibs=yes
-+      fi
-+      ;;
-+
-+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-+      no_undefined_flag='${wl}-z,text'
-+      archive_cmds_need_lc=no
-+      hardcode_shlibpath_var=no
-+      runpath_var='LD_RUN_PATH'
-+
-+      if test "$GCC" = yes; then
-+	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+      else
-+	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+      fi
-+      ;;
-+
-+    sysv5* | sco3.2v5* | sco5v6*)
-+      # Note: We can NOT use -z defs as we might desire, because we do not
-+      # link with -lc, and that would cause any symbols used from libc to
-+      # always be unresolved, which means just about no library would
-+      # ever link correctly.  If we're not using GNU ld we use -z text
-+      # though, which does catch some bad symbols but isn't as heavy-handed
-+      # as -z defs.
-+      no_undefined_flag='${wl}-z,text'
-+      allow_undefined_flag='${wl}-z,nodefs'
-+      archive_cmds_need_lc=no
-+      hardcode_shlibpath_var=no
-+      hardcode_libdir_flag_spec='${wl}-R,$libdir'
-+      hardcode_libdir_separator=':'
-+      link_all_deplibs=yes
-+      export_dynamic_flag_spec='${wl}-Bexport'
-+      runpath_var='LD_RUN_PATH'
-+
-+      if test "$GCC" = yes; then
-+	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+      else
-+	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+      fi
-+      ;;
-+
-+    uts4*)
-+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      hardcode_libdir_flag_spec='-L$libdir'
-+      hardcode_shlibpath_var=no
-+      ;;
-+
-+    *)
-+      ld_shlibs=no
-+      ;;
-+    esac
-+
-+    if test x$host_vendor = xsni; then
-+      case $host in
-+      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+	export_dynamic_flag_spec='${wl}-Blargedynsym'
-+	;;
-+      esac
-+    fi
-+  fi
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
-+$as_echo "$ld_shlibs" >&6; }
-+test "$ld_shlibs" = no && can_build_shared=no
-+
-+with_gnu_ld=$with_gnu_ld
-+
-+
-+    
-+    
-+    
-+
-+    
-+    
-+    
-+
-+    
-+    
-+    
-+
-+
-+#
-+# Do we need to explicitly link libc?
-+#
-+case "x$archive_cmds_need_lc" in
-+x|xyes)
-+  # Assume -lc should be added
-+  archive_cmds_need_lc=yes
-+
-+  if test "$enable_shared" = yes && test "$GCC" = yes; then
-+    case $archive_cmds in
-+    *'~'*)
-+      # FIXME: we may have to deal with multi-command sequences.
-+      ;;
-+    '$CC '*)
-+      # Test whether the compiler implicitly links with -lc since on some
-+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-+      # to ld, don't add -lc before -lgcc.
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
-+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-+if test "${lt_cv_archive_cmds_need_lc+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  $RM conftest*
-+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-+
-+	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; } 2>conftest.err; then
-+	  soname=conftest
-+	  lib=conftest
-+	  libobjs=conftest.$ac_objext
-+	  deplibs=
-+	  wl=$lt_prog_compiler_wl
-+	  pic_flag=$lt_prog_compiler_pic
-+	  compiler_flags=-v
-+	  linker_flags=-v
-+	  verstring=
-+	  output_objdir=.
-+	  libname=conftest
-+	  lt_save_allow_undefined_flag=$allow_undefined_flag
-+	  allow_undefined_flag=
-+	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
-+  (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }
-+	  then
-+	    lt_cv_archive_cmds_need_lc=no
-+	  else
-+	    lt_cv_archive_cmds_need_lc=yes
-+	  fi
-+	  allow_undefined_flag=$lt_save_allow_undefined_flag
-+	else
-+	  cat conftest.err 1>&5
-+	fi
-+	$RM conftest*
-+	
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
-+$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
-+      archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
-+      ;;
-+    esac
-+  fi
-+  ;;
-+esac
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
-+$as_echo_n "checking dynamic linker characteristics... " >&6; }
-+
-+if test "$GCC" = yes; then
-+  case $host_os in
-+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-+    *) lt_awk_arg="/^libraries:/" ;;
-+  esac
-+  case $host_os in
-+    mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;;
-+    *) lt_sed_strip_eq="s,=/,/,g" ;;
-+  esac
-+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
-+  case $lt_search_path_spec in
-+  *\;*)
-+    # if the path contains ";" then we assume it to be the separator
-+    # otherwise default to the standard path separator (i.e. ":") - it is
-+    # assumed that no part of a normal pathname contains ";" but that should
-+    # okay in the real world where ";" in dirpaths is itself problematic.
-+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
-+    ;;
-+  *)
-+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
-+    ;;
-+  esac
-+  # Ok, now we have the path, separated by spaces, we can step through it
-+  # and add multilib dir if necessary.
-+  lt_tmp_lt_search_path_spec=
-+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
-+  for lt_sys_path in $lt_search_path_spec; do
-+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
-+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
-+    else
-+      test -d "$lt_sys_path" && \
-+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-+    fi
-+  done
-+  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
-+BEGIN {RS=" "; FS="/|\n";} {
-+  lt_foo="";
-+  lt_count=0;
-+  for (lt_i = NF; lt_i > 0; lt_i--) {
-+    if ($lt_i != "" && $lt_i != ".") {
-+      if ($lt_i == "..") {
-+        lt_count++;
-+      } else {
-+        if (lt_count == 0) {
-+          lt_foo="/" $lt_i lt_foo;
-+        } else {
-+          lt_count--;
-+        }
-+      }
-+    }
-+  }
-+  if (lt_foo != "") { lt_freq[lt_foo]++; }
-+  if (lt_freq[lt_foo] == 1) { print lt_foo; }
-+}'`
-+  # AWK program above erroneously prepends '/' to C:/dos/paths
-+  # for these hosts.
-+  case $host_os in
-+    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
-+      $SED 's,/\([A-Za-z]:\),\1,g'` ;;
-+  esac
-+  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
-+else
-+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-+fi
-+library_names_spec=
-+libname_spec='lib$name'
-+soname_spec=
-+shrext_cmds=".so"
-+postinstall_cmds=
-+postuninstall_cmds=
-+finish_cmds=
-+finish_eval=
-+shlibpath_var=
-+shlibpath_overrides_runpath=unknown
-+version_type=none
-+dynamic_linker="$host_os ld.so"
-+sys_lib_dlsearch_path_spec="/lib /usr/lib"
-+need_lib_prefix=unknown
-+hardcode_into_libs=no
-+
-+# when you set need_version to no, make sure it does not cause -set_version
-+# flags to be left without arguments
-+need_version=unknown
-+
-+case $host_os in
-+aix3*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-+  shlibpath_var=LIBPATH
-+
-+  # AIX 3 has no versioning support, so we append a major version to the name.
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  ;;
-+
-+aix[4-9]*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  hardcode_into_libs=yes
-+  if test "$host_cpu" = ia64; then
-+    # AIX 5 supports IA64
-+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-+    shlibpath_var=LD_LIBRARY_PATH
-+  else
-+    # With GCC up to 2.95.x, collect2 would create an import file
-+    # for dependence libraries.  The import file would start with
-+    # the line `#! .'.  This would cause the generated library to
-+    # depend on `.', always an invalid library.  This was fixed in
-+    # development snapshots of GCC prior to 3.0.
-+    case $host_os in
-+      aix4 | aix4.[01] | aix4.[01].*)
-+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-+	   echo ' yes '
-+	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
-+	:
-+      else
-+	can_build_shared=no
-+      fi
-+      ;;
-+    esac
-+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-+    # soname into executable. Probably we can add versioning support to
-+    # collect2, so additional links can be useful in future.
-+    if test "$aix_use_runtimelinking" = yes; then
-+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-+      # instead of lib<name>.a to let people know that these are not
-+      # typical AIX shared libraries.
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    else
-+      # We preserve .a as extension for shared libraries through AIX4.2
-+      # and later when we are not doing run time linking.
-+      library_names_spec='${libname}${release}.a $libname.a'
-+      soname_spec='${libname}${release}${shared_ext}$major'
-+    fi
-+    shlibpath_var=LIBPATH
-+  fi
-+  ;;
-+
-+amigaos*)
-+  case $host_cpu in
-+  powerpc)
-+    # Since July 2007 AmigaOS4 officially supports .so libraries.
-+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    ;;
-+  m68k)
-+    library_names_spec='$libname.ixlibrary $libname.a'
-+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
-+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-+    ;;
-+  esac
-+  ;;
-+
-+beos*)
-+  library_names_spec='${libname}${shared_ext}'
-+  dynamic_linker="$host_os ld.so"
-+  shlibpath_var=LIBRARY_PATH
-+  ;;
-+
-+bsdi[45]*)
-+  version_type=linux
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-+  # the default ld.so.conf also contains /usr/contrib/lib and
-+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-+  # libtool to hard-code these into programs
-+  ;;
-+
-+cygwin* | mingw* | pw32* | cegcc*)
-+  version_type=windows
-+  shrext_cmds=".dll"
-+  need_version=no
-+  need_lib_prefix=no
-+
-+  case $GCC,$host_os in
-+  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
-+    library_names_spec='$libname.dll.a'
-+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-+    postinstall_cmds='base_file=`basename \${file}`~
-+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-+      dldir=$destdir/`dirname \$dlpath`~
-+      test -d \$dldir || mkdir -p \$dldir~
-+      $install_prog $dir/$dlname \$dldir/$dlname~
-+      chmod a+x \$dldir/$dlname~
-+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-+      fi'
-+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-+      dlpath=$dir/\$dldll~
-+       $RM \$dlpath'
-+    shlibpath_overrides_runpath=yes
-+
-+    case $host_os in
-+    cygwin*)
-+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-+
-+      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
-+      ;;
-+    mingw* | cegcc*)
-+      # MinGW DLLs use traditional 'lib' prefix
-+      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-+      ;;
-+    pw32*)
-+      # pw32 DLLs use 'pw' prefix rather than 'lib'
-+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-+      ;;
-+    esac
-+    ;;
-+
-+  *)
-+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-+    ;;
-+  esac
-+  dynamic_linker='Win32 ld.exe'
-+  # FIXME: first we should search . and the directory the executable is in
-+  shlibpath_var=PATH
-+  ;;
-+
-+darwin* | rhapsody*)
-+  dynamic_linker="$host_os dyld"
-+  version_type=darwin
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-+  soname_spec='${libname}${release}${major}$shared_ext'
-+  shlibpath_overrides_runpath=yes
-+  shlibpath_var=DYLD_LIBRARY_PATH
-+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-+
-+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
-+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-+  ;;
-+
-+dgux*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
-+
-+freebsd1*)
-+  dynamic_linker=no
-+  ;;
-+
-+freebsd* | dragonfly*)
-+  # DragonFly does not have aout.  When/if they implement a new
-+  # versioning mechanism, adjust this.
-+  if test -x /usr/bin/objformat; then
-+    objformat=`/usr/bin/objformat`
-+  else
-+    case $host_os in
-+    freebsd[123]*) objformat=aout ;;
-+    *) objformat=elf ;;
-+    esac
-+  fi
-+  version_type=freebsd-$objformat
-+  case $version_type in
-+    freebsd-elf*)
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+      need_version=no
-+      need_lib_prefix=no
-+      ;;
-+    freebsd-*)
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-+      need_version=yes
-+      ;;
-+  esac
-+  shlibpath_var=LD_LIBRARY_PATH
-+  case $host_os in
-+  freebsd2*)
-+    shlibpath_overrides_runpath=yes
-+    ;;
-+  freebsd3.[01]* | freebsdelf3.[01]*)
-+    shlibpath_overrides_runpath=yes
-+    hardcode_into_libs=yes
-+    ;;
-+  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
-+  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
-+    shlibpath_overrides_runpath=no
-+    hardcode_into_libs=yes
-+    ;;
-+  *) # from 4.6 on, and DragonFly
-+    shlibpath_overrides_runpath=yes
-+    hardcode_into_libs=yes
-+    ;;
-+  esac
-+  ;;
-+
-+gnu*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  hardcode_into_libs=yes
-+  ;;
-+
-+haiku*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  dynamic_linker="$host_os runtime_loader"
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
-+  hardcode_into_libs=yes
-+  ;;
-+
-+hpux9* | hpux10* | hpux11*)
-+  # Give a soname corresponding to the major version so that dld.sl refuses to
-+  # link against other versions.
-+  version_type=sunos
-+  need_lib_prefix=no
-+  need_version=no
-+  case $host_cpu in
-+  ia64*)
-+    shrext_cmds='.so'
-+    hardcode_into_libs=yes
-+    dynamic_linker="$host_os dld.so"
-+    shlibpath_var=LD_LIBRARY_PATH
-+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    soname_spec='${libname}${release}${shared_ext}$major'
-+    if test "X$HPUX_IA64_MODE" = X32; then
-+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-+    else
-+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-+    fi
-+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-+    ;;
-+  hppa*64*)
-+    shrext_cmds='.sl'
-+    hardcode_into_libs=yes
-+    dynamic_linker="$host_os dld.sl"
-+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    soname_spec='${libname}${release}${shared_ext}$major'
-+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-+    ;;
-+  *)
-+    shrext_cmds='.sl'
-+    dynamic_linker="$host_os dld.sl"
-+    shlibpath_var=SHLIB_PATH
-+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    soname_spec='${libname}${release}${shared_ext}$major'
-+    ;;
-+  esac
-+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
-+  postinstall_cmds='chmod 555 $lib'
-+  # or fails outright, so override atomically:
-+  install_override_mode=555
-+  ;;
-+
-+interix[3-9]*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  ;;
-+
-+irix5* | irix6* | nonstopux*)
-+  case $host_os in
-+    nonstopux*) version_type=nonstopux ;;
-+    *)
-+	if test "$lt_cv_prog_gnu_ld" = yes; then
-+		version_type=linux
-+	else
-+		version_type=irix
-+	fi ;;
-+  esac
-+  need_lib_prefix=no
-+  need_version=no
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  case $host_os in
-+  irix5* | nonstopux*)
-+    libsuff= shlibsuff=
-+    ;;
-+  *)
-+    case $LD in # libtool.m4 will add one of these switches to LD
-+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-+      libsuff= shlibsuff= libmagic=32-bit;;
-+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-+      libsuff=32 shlibsuff=N32 libmagic=N32;;
-+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-+    *) libsuff= shlibsuff= libmagic=never-match;;
-+    esac
-+    ;;
-+  esac
-+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-+  shlibpath_overrides_runpath=no
-+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-+  hardcode_into_libs=yes
-+  ;;
-+
-+# No shared lib support for Linux oldld, aout, or coff.
-+linux*oldld* | linux*aout* | linux*coff*)
-+  dynamic_linker=no
-+  ;;
-+
-+# This must be Linux ELF.
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+
-+  # Some binutils ld are patched to set DT_RUNPATH
-+  if test "${lt_cv_shlibpath_overrides_runpath+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  lt_cv_shlibpath_overrides_runpath=no
-+    save_LDFLAGS=$LDFLAGS
-+    save_libdir=$libdir
-+    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
-+	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
-+  lt_cv_shlibpath_overrides_runpath=yes
-+fi
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+    LDFLAGS=$save_LDFLAGS
-+    libdir=$save_libdir
-+    
-+fi
-+
-+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
-+
-+  # This implies no fast_install, which is unacceptable.
-+  # Some rework will be needed to allow for fast_install
-+  # before this can be enabled.
-+  hardcode_into_libs=yes
-+
-+  # Append ld.so.conf contents to the search path
-+  if test -f /etc/ld.so.conf; then
-+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
-+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-+  fi
-+
-+  # We used to test for /lib/ld.so.1 and disable shared libraries on
-+  # powerpc, because MkLinux only supported shared libraries with the
-+  # GNU dynamic linker.  Since this was broken with cross compilers,
-+  # most powerpc-linux boxes support dynamic linking these days and
-+  # people can always --disable-shared, the test was removed, and we
-+  # assume the GNU/Linux dynamic linker is in use.
-+  dynamic_linker='GNU/Linux ld.so'
-+  ;;
-+
-+netbsd*)
-+  version_type=sunos
-+  need_lib_prefix=no
-+  need_version=no
-+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+    dynamic_linker='NetBSD (a.out) ld.so'
-+  else
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+    soname_spec='${libname}${release}${shared_ext}$major'
-+    dynamic_linker='NetBSD ld.elf_so'
-+  fi
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  hardcode_into_libs=yes
-+  ;;
-+
-+newsos6)
-+  version_type=linux
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  ;;
-+
-+*nto* | *qnx*)
-+  version_type=qnx
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  dynamic_linker='ldqnx.so'
-+  ;;
-+
-+openbsd*)
-+  version_type=sunos
-+  sys_lib_dlsearch_path_spec="/usr/lib"
-+  need_lib_prefix=no
-+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-+  case $host_os in
-+    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
-+    *)				need_version=no  ;;
-+  esac
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+    case $host_os in
-+      openbsd2.[89] | openbsd2.[89].*)
-+	shlibpath_overrides_runpath=no
-+	;;
-+      *)
-+	shlibpath_overrides_runpath=yes
-+	;;
-+      esac
-+  else
-+    shlibpath_overrides_runpath=yes
-+  fi
-+  ;;
-+
-+os2*)
-+  libname_spec='$name'
-+  shrext_cmds=".dll"
-+  need_lib_prefix=no
-+  library_names_spec='$libname${shared_ext} $libname.a'
-+  dynamic_linker='OS/2 ld.exe'
-+  shlibpath_var=LIBPATH
-+  ;;
-+
-+osf3* | osf4* | osf5*)
-+  version_type=osf
-+  need_lib_prefix=no
-+  need_version=no
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-+  ;;
-+
-+rdos*)
-+  dynamic_linker=no
-+  ;;
-+
-+solaris*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  hardcode_into_libs=yes
-+  # ldd complains unless libraries are executable
-+  postinstall_cmds='chmod +x $lib'
-+  ;;
-+
-+sunos4*)
-+  version_type=sunos
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  if test "$with_gnu_ld" = yes; then
-+    need_lib_prefix=no
-+  fi
-+  need_version=yes
-+  ;;
-+
-+sysv4 | sysv4.3*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  case $host_vendor in
-+    sni)
-+      shlibpath_overrides_runpath=no
-+      need_lib_prefix=no
-+      runpath_var=LD_RUN_PATH
-+      ;;
-+    siemens)
-+      need_lib_prefix=no
-+      ;;
-+    motorola)
-+      need_lib_prefix=no
-+      need_version=no
-+      shlibpath_overrides_runpath=no
-+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-+      ;;
-+  esac
-+  ;;
-+
-+sysv4*MP*)
-+  if test -d /usr/nec ;then
-+    version_type=linux
-+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-+    soname_spec='$libname${shared_ext}.$major'
-+    shlibpath_var=LD_LIBRARY_PATH
-+  fi
-+  ;;
-+
-+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-+  version_type=freebsd-elf
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  hardcode_into_libs=yes
-+  if test "$with_gnu_ld" = yes; then
-+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-+  else
-+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-+    case $host_os in
-+      sco3.2v5*)
-+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-+	;;
-+    esac
-+  fi
-+  sys_lib_dlsearch_path_spec='/usr/lib'
-+  ;;
-+
-+tpf*)
-+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  ;;
-+
-+uts4*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
-+
-+*)
-+  dynamic_linker=no
-+  ;;
-+esac
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
-+$as_echo "$dynamic_linker" >&6; }
-+test "$dynamic_linker" = no && can_build_shared=no
-+
-+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-+if test "$GCC" = yes; then
-+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-+fi
-+
-+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-+  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-+fi
-+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-+  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-+fi
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
-+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
-+hardcode_action=
-+if test -n "$hardcode_libdir_flag_spec" ||
-+   test -n "$runpath_var" ||
-+   test "X$hardcode_automatic" = "Xyes" ; then
-+
-+  # We can hardcode non-existent directories.
-+  if test "$hardcode_direct" != no &&
-+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-+     # have to relink, otherwise we might link with an installed library
-+     # when we should be linking with a yet-to-be-installed one
-+     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no &&
-+     test "$hardcode_minus_L" != no; then
-+    # Linking always hardcodes the temporary library directory.
-+    hardcode_action=relink
-+  else
-+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-+    hardcode_action=immediate
-+  fi
-+else
-+  # We cannot hardcode anything, or else we can only hardcode existing
-+  # directories.
-+  hardcode_action=unsupported
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
-+$as_echo "$hardcode_action" >&6; }
-+
-+if test "$hardcode_action" = relink ||
-+   test "$inherit_rpath" = yes; then
-+  # Fast installation is not supported
-+  enable_fast_install=no
-+elif test "$shlibpath_overrides_runpath" = yes ||
-+     test "$enable_shared" = no; then
-+  # Fast installation is not necessary
-+  enable_fast_install=needless
-+fi
-+
-+    
-+    
-+    
-+
-+
-+  if test "x$enable_dlopen" != xyes; then
-+  enable_dlopen=unknown
-+  enable_dlopen_self=unknown
-+  enable_dlopen_self_static=unknown
-+else
-+  lt_cv_dlopen=no
-+  lt_cv_dlopen_libs=
-+
-+  case $host_os in
-+  beos*)
-+    lt_cv_dlopen="load_add_on"
-+    lt_cv_dlopen_libs=
-+    lt_cv_dlopen_self=yes
-+    ;;
-+
-+  mingw* | pw32* | cegcc*)
-+    lt_cv_dlopen="LoadLibrary"
-+    lt_cv_dlopen_libs=
-+    ;;
-+
-+  cygwin*)
-+    lt_cv_dlopen="dlopen"
-+    lt_cv_dlopen_libs=
-+    ;;
-+
-+  darwin*)
-+  # if libdl is installed we need to link against it
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-+$as_echo_n "checking for dlopen in -ldl... " >&6; }
-+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldl  $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char dlopen ();
-+int
-+main ()
-+{
-+return dlopen ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_dl_dlopen=yes
-+else
-+  ac_cv_lib_dl_dlopen=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
-+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-+else
-+  
-+    lt_cv_dlopen="dyld"
-+    lt_cv_dlopen_libs=
-+    lt_cv_dlopen_self=yes
-+    
-+fi
-+
-+    ;;
-+
-+  *)
-+    ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
-+if test "x$ac_cv_func_shl_load" = x""yes; then :
-+  lt_cv_dlopen="shl_load"
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
-+$as_echo_n "checking for shl_load in -ldld... " >&6; }
-+if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldld  $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char shl_load ();
-+int
-+main ()
-+{
-+return shl_load ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_dld_shl_load=yes
-+else
-+  ac_cv_lib_dld_shl_load=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
-+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-+if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
-+  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
-+else
-+  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-+if test "x$ac_cv_func_dlopen" = x""yes; then :
-+  lt_cv_dlopen="dlopen"
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-+$as_echo_n "checking for dlopen in -ldl... " >&6; }
-+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldl  $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char dlopen ();
-+int
-+main ()
-+{
-+return dlopen ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_dl_dlopen=yes
-+else
-+  ac_cv_lib_dl_dlopen=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
-+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
-+$as_echo_n "checking for dlopen in -lsvld... " >&6; }
-+if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lsvld  $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char dlopen ();
-+int
-+main ()
-+{
-+return dlopen ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_svld_dlopen=yes
-+else
-+  ac_cv_lib_svld_dlopen=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
-+$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
-+if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
-+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
-+$as_echo_n "checking for dld_link in -ldld... " >&6; }
-+if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldld  $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char dld_link ();
-+int
-+main ()
-+{
-+return dld_link ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_dld_dld_link=yes
-+else
-+  ac_cv_lib_dld_dld_link=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
-+$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
-+if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
-+  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
-+fi
-+
-+	      
-+fi
-+
-+	    
-+fi
-+
-+	  
-+fi
-+
-+	
-+fi
-+
-+      
-+fi
-+
-+    ;;
-+  esac
-+
-+  if test "x$lt_cv_dlopen" != xno; then
-+    enable_dlopen=yes
-+  else
-+    enable_dlopen=no
-+  fi
-+
-+  case $lt_cv_dlopen in
-+  dlopen)
-+    save_CPPFLAGS="$CPPFLAGS"
-+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-+
-+    save_LDFLAGS="$LDFLAGS"
-+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-+
-+    save_LIBS="$LIBS"
-+    LIBS="$lt_cv_dlopen_libs $LIBS"
-+
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
-+$as_echo_n "checking whether a program can dlopen itself... " >&6; }
-+if test "${lt_cv_dlopen_self+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  	  if test "$cross_compiling" = yes; then :
-+  lt_cv_dlopen_self=cross
-+else
-+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-+  lt_status=$lt_dlunknown
-+  cat > conftest.$ac_ext <<_LT_EOF
-+#line __oline__ "configure"
-+#include "confdefs.h"
-+
-+#if HAVE_DLFCN_H
-+#include <dlfcn.h>
-+#endif
-+
-+#include <stdio.h>
-+
-+#ifdef RTLD_GLOBAL
-+#  define LT_DLGLOBAL		RTLD_GLOBAL
-+#else
-+#  ifdef DL_GLOBAL
-+#    define LT_DLGLOBAL		DL_GLOBAL
-+#  else
-+#    define LT_DLGLOBAL		0
-+#  endif
-+#endif
-+
-+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-+   find out it does not work in some platform. */
-+#ifndef LT_DLLAZY_OR_NOW
-+#  ifdef RTLD_LAZY
-+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-+#  else
-+#    ifdef DL_LAZY
-+#      define LT_DLLAZY_OR_NOW		DL_LAZY
-+#    else
-+#      ifdef RTLD_NOW
-+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-+#      else
-+#        ifdef DL_NOW
-+#          define LT_DLLAZY_OR_NOW	DL_NOW
-+#        else
-+#          define LT_DLLAZY_OR_NOW	0
-+#        endif
-+#      endif
-+#    endif
-+#  endif
-+#endif
-+
-+/* When -fvisbility=hidden is used, assume the code has been annotated
-+   correspondingly for the symbols needed.  */
-+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-+void fnord () __attribute__((visibility("default")));
-+#endif
-+
-+void fnord () { int i=42; }
-+int main ()
-+{
-+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-+  int status = $lt_dlunknown;
-+
-+  if (self)
-+    {
-+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-+      else
-+        {
-+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
-+          else puts (dlerror ());
-+	}
-+      /* dlclose (self); */
-+    }
-+  else
-+    puts (dlerror ());
-+
-+  return status;
-+}
-+_LT_EOF
-+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
-+    (./conftest; exit; ) >&5 2>/dev/null
-+    lt_status=$?
-+    case x$lt_status in
-+      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-+      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
-+      x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
-+    esac
-+  else :
-+    # compilation failed
-+    lt_cv_dlopen_self=no
-+  fi
-+fi
-+rm -fr conftest*
-+
-+    
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
-+$as_echo "$lt_cv_dlopen_self" >&6; }
-+
-+    if test "x$lt_cv_dlopen_self" = xyes; then
-+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
-+$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
-+if test "${lt_cv_dlopen_self_static+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  	  if test "$cross_compiling" = yes; then :
-+  lt_cv_dlopen_self_static=cross
-+else
-+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-+  lt_status=$lt_dlunknown
-+  cat > conftest.$ac_ext <<_LT_EOF
-+#line __oline__ "configure"
-+#include "confdefs.h"
-+
-+#if HAVE_DLFCN_H
-+#include <dlfcn.h>
-+#endif
-+
-+#include <stdio.h>
-+
-+#ifdef RTLD_GLOBAL
-+#  define LT_DLGLOBAL		RTLD_GLOBAL
-+#else
-+#  ifdef DL_GLOBAL
-+#    define LT_DLGLOBAL		DL_GLOBAL
-+#  else
-+#    define LT_DLGLOBAL		0
-+#  endif
-+#endif
-+
-+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-+   find out it does not work in some platform. */
-+#ifndef LT_DLLAZY_OR_NOW
-+#  ifdef RTLD_LAZY
-+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-+#  else
-+#    ifdef DL_LAZY
-+#      define LT_DLLAZY_OR_NOW		DL_LAZY
-+#    else
-+#      ifdef RTLD_NOW
-+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-+#      else
-+#        ifdef DL_NOW
-+#          define LT_DLLAZY_OR_NOW	DL_NOW
-+#        else
-+#          define LT_DLLAZY_OR_NOW	0
-+#        endif
-+#      endif
-+#    endif
-+#  endif
-+#endif
-+
-+/* When -fvisbility=hidden is used, assume the code has been annotated
-+   correspondingly for the symbols needed.  */
-+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-+void fnord () __attribute__((visibility("default")));
-+#endif
-+
-+void fnord () { int i=42; }
-+int main ()
-+{
-+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-+  int status = $lt_dlunknown;
-+
-+  if (self)
-+    {
-+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-+      else
-+        {
-+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
-+          else puts (dlerror ());
-+	}
-+      /* dlclose (self); */
-+    }
-+  else
-+    puts (dlerror ());
-+
-+  return status;
-+}
-+_LT_EOF
-+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
-+    (./conftest; exit; ) >&5 2>/dev/null
-+    lt_status=$?
-+    case x$lt_status in
-+      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-+      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
-+      x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
-+    esac
-+  else :
-+    # compilation failed
-+    lt_cv_dlopen_self_static=no
-+  fi
-+fi
-+rm -fr conftest*
-+
-+      
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
-+$as_echo "$lt_cv_dlopen_self_static" >&6; }
-+    fi
-+
-+    CPPFLAGS="$save_CPPFLAGS"
-+    LDFLAGS="$save_LDFLAGS"
-+    LIBS="$save_LIBS"
-+    ;;
-+  esac
-+
-+  case $lt_cv_dlopen_self in
-+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-+  *) enable_dlopen_self=unknown ;;
-+  esac
-+
-+  case $lt_cv_dlopen_self_static in
-+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-+  *) enable_dlopen_self_static=unknown ;;
-+  esac
-+fi
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+  
-+striplib=
-+old_striplib=
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
-+$as_echo_n "checking whether stripping libraries is possible... " >&6; }
-+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
-+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+else
-+# FIXME - insert some real tests, host_os isn't really good enough
-+  case $host_os in
-+  darwin*)
-+    if test -n "$STRIP" ; then
-+      striplib="$STRIP -x"
-+      old_striplib="$STRIP -S"
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+    else
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+    fi
-+    ;;
-+  *)
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+    ;;
-+  esac
-+fi
-+
-+    
-+    
-+    
-+
-+
-+    
-+    
-+    
-+
-+
-+
-+  # Report which library types will actually be built
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
-+$as_echo_n "checking if libtool supports shared libraries... " >&6; }
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
-+$as_echo "$can_build_shared" >&6; }
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
-+$as_echo_n "checking whether to build shared libraries... " >&6; }
-+  test "$can_build_shared" = "no" && enable_shared=no
-+
-+  # On AIX, shared libraries and static libraries use the same namespace, and
-+  # are all built from PIC.
-+  case $host_os in
-+  aix3*)
-+    test "$enable_shared" = yes && enable_static=no
-+    if test -n "$RANLIB"; then
-+      archive_cmds="$archive_cmds~\$RANLIB \$lib"
-+      postinstall_cmds='$RANLIB $lib'
-+    fi
-+    ;;
-+
-+  aix[4-9]*)
-+    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-+      test "$enable_shared" = yes && enable_static=no
-+    fi
-+    ;;
-+  esac
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
-+$as_echo "$enable_shared" >&6; }
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
-+$as_echo_n "checking whether to build static libraries... " >&6; }
-+  # Make sure either enable_shared or enable_static is yes.
-+  test "$enable_shared" = yes || enable_static=yes
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
-+$as_echo "$enable_static" >&6; }
-+
-+  
-+
-+
-+fi
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+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
-+
-+CC="$lt_save_CC"
-+
-+
-+
-+
-+
-+
-+
-+
-+       
-+       
-+
-+
-+
-+        ac_config_commands="$ac_config_commands libtool"
-+
-+
-+
-+
-+# Only expand once:
-+
-+
-+
-+ALL_LINGUAS="fr sv tr es da vi zh_CN zh_TW ga fi id bg"
-+# If we haven't got the data from the intl directory,
-+# assume NLS is disabled.
-+USE_NLS=no	
-+LIBINTL=	
-+LIBINTL_DEP=	
-+INCINTL=	
-+XGETTEXT=	
-+GMSGFMT=	
-+POSUB=		
-+
-+if test -f  ../intl/config.intl; then
-+  .  ../intl/config.intl
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
-+$as_echo_n "checking whether NLS is requested... " >&6; }
-+if test x"$USE_NLS" != xyes; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+  
-+$as_echo "@%:@define ENABLE_NLS 1" >>confdefs.h
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5
-+$as_echo_n "checking for catalogs to be installed... " >&6; }
-+  # Look for .po and .gmo files in the source directory.
-+  CATALOGS=  
-+  XLINGUAS=
-+  for cat in $srcdir/po/*.gmo $srcdir/po/*.po; do
-+    # If there aren't any .gmo files the shell will give us the
-+    # literal string "../path/to/srcdir/po/*.gmo" which has to be
-+    # weeded out.
-+    case "$cat" in *\**)
-+      continue;;
-+    esac
-+    # The quadruple backslash is collapsed to a double backslash
-+    # by the backticks, then collapsed again by the double quotes,
-+    # leaving us with one backslash in the sed expression (right
-+    # before the dot that mustn't act as a wildcard).
-+    cat=`echo $cat | sed -e "s!$srcdir/po/!!" -e "s!\\\\.po!.gmo!"`
-+    lang=`echo $cat | sed -e "s!\\\\.gmo!!"`
-+    # The user is allowed to set LINGUAS to a list of languages to
-+    # install catalogs for.  If it's empty that means "all of them."
-+    if test "x$LINGUAS" = x; then
-+      CATALOGS="$CATALOGS $cat"
-+      XLINGUAS="$XLINGUAS $lang"
-+    else
-+      case "$LINGUAS" in *$lang*)
-+        CATALOGS="$CATALOGS $cat"
-+        XLINGUAS="$XLINGUAS $lang"
-+        ;;
-+      esac
-+    fi
-+  done
-+  LINGUAS="$XLINGUAS"
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5
-+$as_echo "$LINGUAS" >&6; }
-+
-+    
-+    DATADIRNAME=share
-+  
-+  INSTOBJEXT=.mo
-+  
-+  GENCAT=gencat
-+  
-+  CATOBJEXT=.gmo
-+  
-+fi
-+
-+        MKINSTALLDIRS=
-+  if test -n "$ac_aux_dir"; then
-+    case "$ac_aux_dir" in
-+      /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;;
-+      *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;;
-+    esac
-+  fi
-+  if test -z "$MKINSTALLDIRS"; then
-+    MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
-+  fi
-+  
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
-+$as_echo_n "checking whether NLS is requested... " >&6; }
-+    @%:@ Check whether --enable-nls was given.
-+if test "${enable_nls+set}" = set; then :
-+  enableval=$enable_nls; USE_NLS=$enableval
-+else
-+  USE_NLS=yes
-+fi
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
-+$as_echo "$USE_NLS" >&6; }
-+  
-+
-+
-+        
-+    
-+        
-+# Prepare PATH_SEPARATOR.
-+# The user is always right.
-+if test "${PATH_SEPARATOR+set}" != set; then
-+  echo "#! /bin/sh" >conf$$.sh
-+  echo  "exit 0"   >>conf$$.sh
-+  chmod +x conf$$.sh
-+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-+    PATH_SEPARATOR=';'
-+  else
-+    PATH_SEPARATOR=:
-+  fi
-+  rm -f conf$$.sh
-+fi
-+
-+# Find out how to test for executable files. Don't use a zero-byte file,
-+# as systems may use methods other than mode bits to determine executability.
-+cat >conf$$.file <<_ASEOF
-+#! /bin/sh
-+exit 0
-+_ASEOF
-+chmod +x conf$$.file
-+if test -x conf$$.file >/dev/null 2>&1; then
-+  ac_executable_p="test -x"
-+else
-+  ac_executable_p="test -f"
-+fi
-+rm -f conf$$.file
-+
-+# Extract the first word of "msgfmt", so it can be a program name with args.
-+set dummy msgfmt; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_path_MSGFMT+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  case "$MSGFMT" in
-+  [\\/]* | ?:[\\/]*)
-+    ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
-+    ;;
-+  *)
-+    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
-+    for ac_dir in $PATH; do
-+      IFS="$ac_save_IFS"
-+      test -z "$ac_dir" && ac_dir=.
-+      for ac_exec_ext in '' $ac_executable_extensions; do
-+        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
-+          if $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
-+     (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-+            ac_cv_path_MSGFMT="$ac_dir/$ac_word$ac_exec_ext"
-+            break 2
-+          fi
-+        fi
-+      done
-+    done
-+    IFS="$ac_save_IFS"
-+  test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":"
-+    ;;
-+esac
-+fi
-+MSGFMT="$ac_cv_path_MSGFMT"
-+if test "$MSGFMT" != ":"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
-+$as_echo "$MSGFMT" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+  # Extract the first word of "gmsgfmt", so it can be a program name with args.
-+set dummy gmsgfmt; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_path_GMSGFMT+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  case $GMSGFMT in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-+  ;;
-+esac
-+fi
-+GMSGFMT=$ac_cv_path_GMSGFMT
-+if test -n "$GMSGFMT"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
-+$as_echo "$GMSGFMT" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+
-+        
-+# Prepare PATH_SEPARATOR.
-+# The user is always right.
-+if test "${PATH_SEPARATOR+set}" != set; then
-+  echo "#! /bin/sh" >conf$$.sh
-+  echo  "exit 0"   >>conf$$.sh
-+  chmod +x conf$$.sh
-+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-+    PATH_SEPARATOR=';'
-+  else
-+    PATH_SEPARATOR=:
-+  fi
-+  rm -f conf$$.sh
-+fi
-+
-+# Find out how to test for executable files. Don't use a zero-byte file,
-+# as systems may use methods other than mode bits to determine executability.
-+cat >conf$$.file <<_ASEOF
-+#! /bin/sh
-+exit 0
-+_ASEOF
-+chmod +x conf$$.file
-+if test -x conf$$.file >/dev/null 2>&1; then
-+  ac_executable_p="test -x"
-+else
-+  ac_executable_p="test -f"
-+fi
-+rm -f conf$$.file
-+
-+# Extract the first word of "xgettext", so it can be a program name with args.
-+set dummy xgettext; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_path_XGETTEXT+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  case "$XGETTEXT" in
-+  [\\/]* | ?:[\\/]*)
-+    ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
-+    ;;
-+  *)
-+    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
-+    for ac_dir in $PATH; do
-+      IFS="$ac_save_IFS"
-+      test -z "$ac_dir" && ac_dir=.
-+      for ac_exec_ext in '' $ac_executable_extensions; do
-+        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
-+          if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
-+     (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-+            ac_cv_path_XGETTEXT="$ac_dir/$ac_word$ac_exec_ext"
-+            break 2
-+          fi
-+        fi
-+      done
-+    done
-+    IFS="$ac_save_IFS"
-+  test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
-+    ;;
-+esac
-+fi
-+XGETTEXT="$ac_cv_path_XGETTEXT"
-+if test "$XGETTEXT" != ":"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
-+$as_echo "$XGETTEXT" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+    rm -f messages.po
-+
-+    
-+# Prepare PATH_SEPARATOR.
-+# The user is always right.
-+if test "${PATH_SEPARATOR+set}" != set; then
-+  echo "#! /bin/sh" >conf$$.sh
-+  echo  "exit 0"   >>conf$$.sh
-+  chmod +x conf$$.sh
-+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-+    PATH_SEPARATOR=';'
-+  else
-+    PATH_SEPARATOR=:
-+  fi
-+  rm -f conf$$.sh
-+fi
-+
-+# Find out how to test for executable files. Don't use a zero-byte file,
-+# as systems may use methods other than mode bits to determine executability.
-+cat >conf$$.file <<_ASEOF
-+#! /bin/sh
-+exit 0
-+_ASEOF
-+chmod +x conf$$.file
-+if test -x conf$$.file >/dev/null 2>&1; then
-+  ac_executable_p="test -x"
-+else
-+  ac_executable_p="test -f"
-+fi
-+rm -f conf$$.file
-+
-+# Extract the first word of "msgmerge", so it can be a program name with args.
-+set dummy msgmerge; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_path_MSGMERGE+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  case "$MSGMERGE" in
-+  [\\/]* | ?:[\\/]*)
-+    ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
-+    ;;
-+  *)
-+    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
-+    for ac_dir in $PATH; do
-+      IFS="$ac_save_IFS"
-+      test -z "$ac_dir" && ac_dir=.
-+      for ac_exec_ext in '' $ac_executable_extensions; do
-+        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
-+          if $ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1; then
-+            ac_cv_path_MSGMERGE="$ac_dir/$ac_word$ac_exec_ext"
-+            break 2
-+          fi
-+        fi
-+      done
-+    done
-+    IFS="$ac_save_IFS"
-+  test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":"
-+    ;;
-+esac
-+fi
-+MSGMERGE="$ac_cv_path_MSGMERGE"
-+if test "$MSGMERGE" != ":"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
-+$as_echo "$MSGMERGE" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+      if test "$GMSGFMT" != ":"; then
-+            if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
-+       (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-+      : ;
-+    else
-+      GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $GMSGFMT program is not GNU msgfmt; ignore it" >&5
-+$as_echo "found $GMSGFMT program is not GNU msgfmt; ignore it" >&6; }
-+      GMSGFMT=":"
-+    fi
-+  fi
-+
-+      if test "$XGETTEXT" != ":"; then
-+            if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
-+       (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-+      : ;
-+    else
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5
-+$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
-+      XGETTEXT=":"
-+    fi
-+        rm -f messages.po
-+  fi
-+
-+  ac_config_commands="$ac_config_commands default-1"
-+
-+
-+
-+
-+
-+for ac_prog in 'bison -y' byacc
-+do
-+  # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_YACC+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$YACC"; then
-+  ac_cv_prog_YACC="$YACC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_YACC="$ac_prog"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+YACC=$ac_cv_prog_YACC
-+if test -n "$YACC"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5
-+$as_echo "$YACC" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+  test -n "$YACC" && break
-+done
-+test -n "$YACC" || YACC="yacc"
-+
-+for ac_prog in flex lex
-+do
-+  # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_LEX+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$LEX"; then
-+  ac_cv_prog_LEX="$LEX" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_LEX="$ac_prog"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+LEX=$ac_cv_prog_LEX
-+if test -n "$LEX"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LEX" >&5
-+$as_echo "$LEX" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+  test -n "$LEX" && break
-+done
-+test -n "$LEX" || LEX=":"
-+
-+if test "x$LEX" != "x:"; then
-+  cat >conftest.l <<_ACEOF
-+%%
-+a { ECHO; }
-+b { REJECT; }
-+c { yymore (); }
-+d { yyless (1); }
-+e { yyless (input () != 0); }
-+f { unput (yytext[0]); }
-+. { BEGIN INITIAL; }
-+%%
-+#ifdef YYTEXT_POINTER
-+extern char *yytext;
-+#endif
-+int
-+main (void)
-+{
-+  return ! yylex () + ! yywrap ();
-+}
-+_ACEOF
-+{ { ac_try="$LEX conftest.l"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$LEX conftest.l") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking lex output file root" >&5
-+$as_echo_n "checking lex output file root... " >&6; }
-+if test "${ac_cv_prog_lex_root+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  
-+if test -f lex.yy.c; then
-+  ac_cv_prog_lex_root=lex.yy
-+elif test -f lexyy.c; then
-+  ac_cv_prog_lex_root=lexyy
-+else
-+  as_fn_error "cannot find output from $LEX; giving up" "$LINENO" 5
-+fi
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_root" >&5
-+$as_echo "$ac_cv_prog_lex_root" >&6; }
-+LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
-+
-+if test -z "${LEXLIB+set}"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking lex library" >&5
-+$as_echo_n "checking lex library... " >&6; }
-+if test "${ac_cv_lib_lex+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  
-+    ac_save_LIBS=$LIBS
-+    ac_cv_lib_lex='none needed'
-+    for ac_lib in '' -lfl -ll; do
-+      LIBS="$ac_lib $ac_save_LIBS"
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+`cat $LEX_OUTPUT_ROOT.c`
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_lex=$ac_lib
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+      test "$ac_cv_lib_lex" != 'none needed' && break
-+    done
-+    LIBS=$ac_save_LIBS
-+  
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lex" >&5
-+$as_echo "$ac_cv_lib_lex" >&6; }
-+  test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex
-+fi
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether yytext is a pointer" >&5
-+$as_echo_n "checking whether yytext is a pointer... " >&6; }
-+if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  # POSIX says lex can declare yytext either as a pointer or an array; the
-+# default is implementation-dependent.  Figure out which it is, since
-+# not all implementations provide the %pointer and %array declarations.
-+ac_cv_prog_lex_yytext_pointer=no
-+ac_save_LIBS=$LIBS
-+LIBS="$LEXLIB $ac_save_LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#define YYTEXT_POINTER 1
-+`cat $LEX_OUTPUT_ROOT.c`
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_prog_lex_yytext_pointer=yes
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_save_LIBS
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_yytext_pointer" >&5
-+$as_echo "$ac_cv_prog_lex_yytext_pointer" >&6; }
-+if test $ac_cv_prog_lex_yytext_pointer = yes; then
-+  
-+$as_echo "@%:@define YYTEXT_POINTER 1" >>confdefs.h
-+
-+fi
-+rm -f conftest.l $LEX_OUTPUT_ROOT.c
-+
-+fi
-+if test "$LEX" = :; then
-+  LEX=${am_missing_run}flex
-+fi
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
-+$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
-+    @%:@ Check whether --enable-maintainer-mode was given.
-+if test "${enable_maintainer_mode+set}" = set; then :
-+  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
-+else
-+  USE_MAINTAINER_MODE=no
-+fi
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
-+$as_echo "$USE_MAINTAINER_MODE" >&6; }
-+   if test $USE_MAINTAINER_MODE = yes; then
-+  MAINTAINER_MODE_TRUE=
-+  MAINTAINER_MODE_FALSE='#'
-+else
-+  MAINTAINER_MODE_TRUE='#'
-+  MAINTAINER_MODE_FALSE=
-+fi
-+
-+  MAINT=$MAINTAINER_MODE_TRUE
-+  
-+
-+ if false; then
-+  GENINSRC_NEVER_TRUE=
-+  GENINSRC_NEVER_FALSE='#'
-+else
-+  GENINSRC_NEVER_TRUE='#'
-+  GENINSRC_NEVER_FALSE=
-+fi
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to compare bootstrapped objects" >&5
-+$as_echo_n "checking how to compare bootstrapped objects... " >&6; }
-+if test "${gcc_cv_prog_cmp_skip+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+   echo abfoo >t1
-+  echo cdfoo >t2
-+  gcc_cv_prog_cmp_skip='tail +16c $$f1 > tmp-foo1; tail +16c $$f2 > tmp-foo2; cmp tmp-foo1 tmp-foo2'
-+  if cmp t1 t2 2 2 > /dev/null 2>&1; then
-+    if cmp t1 t2 1 1 > /dev/null 2>&1; then
-+      :
-+    else
-+      gcc_cv_prog_cmp_skip='cmp $$f1 $$f2 16 16'
-+    fi
-+  fi
-+  if cmp --ignore-initial=2 t1 t2 > /dev/null 2>&1; then
-+    if cmp --ignore-initial=1 t1 t2 > /dev/null 2>&1; then
-+      :
-+    else
-+      gcc_cv_prog_cmp_skip='cmp --ignore-initial=16 $$f1 $$f2'
-+    fi
-+  fi
-+  rm t1 t2
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_prog_cmp_skip" >&5
-+$as_echo "$gcc_cv_prog_cmp_skip" >&6; }
-+do_compare="$gcc_cv_prog_cmp_skip"
-+
-+
-+
-+. ${srcdir}/configure.host
-+
-+
-+
-+
-+
-+
-+for ac_header in string.h strings.h stdlib.h unistd.h elf-hints.h limits.h sys/param.h
-+do :
-+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+@%:@define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+ 
-+fi
-+
-+done
-+
-+for ac_header in fcntl.h sys/file.h sys/time.h sys/stat.h
-+do :
-+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+@%:@define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+ 
-+fi
-+
-+done
-+
-+for ac_func in glob mkstemp realpath sbrk waitpid
-+do :
-+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+@%:@define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+ 
-+fi
-+done
-+
-+for ac_func in open lseek close
-+do :
-+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+@%:@define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+ 
-+fi
-+done
-+
-+ac_header_dirent=no
-+for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
-+  as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
-+$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <sys/types.h>
-+#include <$ac_hdr>
-+
-+int
-+main ()
-+{
-+if ((DIR *) 0)
-+return 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  eval "$as_ac_Header=yes"
-+else
-+  eval "$as_ac_Header=no"
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+eval ac_res=\$$as_ac_Header
-+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+@%:@define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
-+_ACEOF
-+
-+ac_header_dirent=$ac_hdr; break
-+fi
-+
-+done
-+# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
-+if test $ac_header_dirent = dirent.h; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
-+$as_echo_n "checking for library containing opendir... " >&6; }
-+if test "${ac_cv_search_opendir+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_func_search_save_LIBS=$LIBS
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char opendir ();
-+int
-+main ()
-+{
-+return opendir ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+for ac_lib in '' dir; do
-+  if test -z "$ac_lib"; then
-+    ac_res="none required"
-+  else
-+    ac_res=-l$ac_lib
-+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-+  fi
-+  if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_search_opendir=$ac_res
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext
-+  if test "${ac_cv_search_opendir+set}" = set; then :
-+  break
-+fi
-+done
-+if test "${ac_cv_search_opendir+set}" = set; then :
-+  
-+else
-+  ac_cv_search_opendir=no
-+fi
-+rm conftest.$ac_ext
-+LIBS=$ac_func_search_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
-+$as_echo "$ac_cv_search_opendir" >&6; }
-+ac_res=$ac_cv_search_opendir
-+if test "$ac_res" != no; then :
-+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-+  
-+fi
-+
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
-+$as_echo_n "checking for library containing opendir... " >&6; }
-+if test "${ac_cv_search_opendir+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_func_search_save_LIBS=$LIBS
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char opendir ();
-+int
-+main ()
-+{
-+return opendir ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+for ac_lib in '' x; do
-+  if test -z "$ac_lib"; then
-+    ac_res="none required"
-+  else
-+    ac_res=-l$ac_lib
-+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-+  fi
-+  if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_search_opendir=$ac_res
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext
-+  if test "${ac_cv_search_opendir+set}" = set; then :
-+  break
-+fi
-+done
-+if test "${ac_cv_search_opendir+set}" = set; then :
-+  
-+else
-+  ac_cv_search_opendir=no
-+fi
-+rm conftest.$ac_ext
-+LIBS=$ac_func_search_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
-+$as_echo "$ac_cv_search_opendir" >&6; }
-+ac_res=$ac_cv_search_opendir
-+if test "$ac_res" != no; then :
-+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-+  
-+fi
-+
-+fi
-+
-+
-+# Check for dlopen support and enable plugins if possible.
-+enable_plugins=yes
-+ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
-+"
-+if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
-+  
-+else
-+  enable_plugins=no
-+fi
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
-+$as_echo_n "checking for library containing dlopen... " >&6; }
-+if test "${ac_cv_search_dlopen+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_func_search_save_LIBS=$LIBS
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char dlopen ();
-+int
-+main ()
-+{
-+return dlopen ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+for ac_lib in '' dl; do
-+  if test -z "$ac_lib"; then
-+    ac_res="none required"
-+  else
-+    ac_res=-l$ac_lib
-+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-+  fi
-+  if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_search_dlopen=$ac_res
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext
-+  if test "${ac_cv_search_dlopen+set}" = set; then :
-+  break
-+fi
-+done
-+if test "${ac_cv_search_dlopen+set}" = set; then :
-+  
-+else
-+  ac_cv_search_dlopen=no
-+fi
-+rm conftest.$ac_ext
-+LIBS=$ac_func_search_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dlopen" >&5
-+$as_echo "$ac_cv_search_dlopen" >&6; }
-+ac_res=$ac_cv_search_dlopen
-+if test "$ac_res" != no; then :
-+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-+  
-+else
-+  enable_plugins=no
-+fi
-+
-+for ac_func in dlopen dlsym dlclose
-+do :
-+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+@%:@define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+ 
-+else
-+  enable_plugins=no
-+fi
-+done
-+
-+# We also support plugins on Windows (MinGW).
-+if test x$enable_plugins = xno ; then
-+  for ac_header in Windows.h
-+do :
-+  ac_fn_c_check_header_compile "$LINENO" "Windows.h" "ac_cv_header_Windows_h" "$ac_includes_default
-+"
-+if test "x$ac_cv_header_Windows_h" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+@%:@define HAVE_WINDOWS_H 1
-+_ACEOF
-+ enable_plugins=yes
-+fi
-+
-+done
-+
-+fi
-+ if test x$enable_plugins = xyes; then
-+  ENABLE_PLUGINS_TRUE=
-+  ENABLE_PLUGINS_FALSE='#'
-+else
-+  ENABLE_PLUGINS_TRUE='#'
-+  ENABLE_PLUGINS_FALSE=
-+fi
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a known getopt prototype in unistd.h" >&5
-+$as_echo_n "checking for a known getopt prototype in unistd.h... " >&6; }
-+if test "${ld_cv_decl_getopt_unistd_h+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <unistd.h>
-+int
-+main ()
-+{
-+extern int getopt (int, char *const*, const char *);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ld_cv_decl_getopt_unistd_h=yes
-+else
-+  ld_cv_decl_getopt_unistd_h=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_cv_decl_getopt_unistd_h" >&5
-+$as_echo "$ld_cv_decl_getopt_unistd_h" >&6; }
-+if test $ld_cv_decl_getopt_unistd_h = yes; then
-+  
-+$as_echo "@%:@define HAVE_DECL_GETOPT 1" >>confdefs.h
-+
-+fi
-+	
-+
-+case "${host}" in
-+*-*-msdos* | *-*-go32* | *-*-mingw32* | *-*-cygwin* | *-*-windows*)
-+  
-+$as_echo "@%:@define USE_BINARY_FOPEN 1" >>confdefs.h
-+ ;;
-+esac
-+
-+ac_fn_c_check_decl "$LINENO" "strstr" "ac_cv_have_decl_strstr" "$ac_includes_default"
-+if test "x$ac_cv_have_decl_strstr" = x""yes; then :
-+  ac_have_decl=1
-+else
-+  ac_have_decl=0
-+fi
-+
-+cat >>confdefs.h <<_ACEOF
-+@%:@define HAVE_DECL_STRSTR $ac_have_decl
-+_ACEOF
-+ac_fn_c_check_decl "$LINENO" "free" "ac_cv_have_decl_free" "$ac_includes_default"
-+if test "x$ac_cv_have_decl_free" = x""yes; then :
-+  ac_have_decl=1
-+else
-+  ac_have_decl=0
-+fi
-+
-+cat >>confdefs.h <<_ACEOF
-+@%:@define HAVE_DECL_FREE $ac_have_decl
-+_ACEOF
-+ac_fn_c_check_decl "$LINENO" "sbrk" "ac_cv_have_decl_sbrk" "$ac_includes_default"
-+if test "x$ac_cv_have_decl_sbrk" = x""yes; then :
-+  ac_have_decl=1
-+else
-+  ac_have_decl=0
-+fi
-+
-+cat >>confdefs.h <<_ACEOF
-+@%:@define HAVE_DECL_SBRK $ac_have_decl
-+_ACEOF
-+ac_fn_c_check_decl "$LINENO" "getenv" "ac_cv_have_decl_getenv" "$ac_includes_default"
-+if test "x$ac_cv_have_decl_getenv" = x""yes; then :
-+  ac_have_decl=1
-+else
-+  ac_have_decl=0
-+fi
-+
-+cat >>confdefs.h <<_ACEOF
-+@%:@define HAVE_DECL_GETENV $ac_have_decl
-+_ACEOF
-+ac_fn_c_check_decl "$LINENO" "environ" "ac_cv_have_decl_environ" "$ac_includes_default"
-+if test "x$ac_cv_have_decl_environ" = x""yes; then :
-+  ac_have_decl=1
-+else
-+  ac_have_decl=0
-+fi
-+
-+cat >>confdefs.h <<_ACEOF
-+@%:@define HAVE_DECL_ENVIRON $ac_have_decl
-+_ACEOF
-+
-+
-+# Link in zlib if we can.  This is needed only for the bootstrap tests
-+# right now, since those tests use libbfd, which depends on zlib.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing zlibVersion" >&5
-+$as_echo_n "checking for library containing zlibVersion... " >&6; }
-+if test "${ac_cv_search_zlibVersion+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_func_search_save_LIBS=$LIBS
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char zlibVersion ();
-+int
-+main ()
-+{
-+return zlibVersion ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+for ac_lib in '' z; do
-+  if test -z "$ac_lib"; then
-+    ac_res="none required"
-+  else
-+    ac_res=-l$ac_lib
-+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-+  fi
-+  if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_search_zlibVersion=$ac_res
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext
-+  if test "${ac_cv_search_zlibVersion+set}" = set; then :
-+  break
-+fi
-+done
-+if test "${ac_cv_search_zlibVersion+set}" = set; then :
-+  
-+else
-+  ac_cv_search_zlibVersion=no
-+fi
-+rm conftest.$ac_ext
-+LIBS=$ac_func_search_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_zlibVersion" >&5
-+$as_echo "$ac_cv_search_zlibVersion" >&6; }
-+ac_res=$ac_cv_search_zlibVersion
-+if test "$ac_res" != no; then :
-+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-+  for ac_header in zlib.h
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
-+if test "x$ac_cv_header_zlib_h" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+@%:@define HAVE_ZLIB_H 1
-+_ACEOF
-+ 
-+fi
-+
-+done
-+
-+fi
-+
-+
-+# When converting linker scripts into strings for use in emulation
-+# files, use astring.sed if the compiler supports ANSI string
-+# concatenation, or ostring.sed otherwise.  This is to support the
-+# broken Microsoft MSVC compiler, which limits the length of string
-+# constants, while still supporting pre-ANSI compilers which do not
-+# support string concatenation.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ANSI C string concatenation works" >&5
-+$as_echo_n "checking whether ANSI C string concatenation works... " >&6; }
-+if test "${ld_cv_string_concatenation+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+char *a = "a" "a";
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ld_cv_string_concatenation=yes
-+else
-+  ld_cv_string_concatenation=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_cv_string_concatenation" >&5
-+$as_echo "$ld_cv_string_concatenation" >&6; }
-+if test "$ld_cv_string_concatenation" = "yes"; then
-+  STRINGIFY=astring.sed
-+else
-+  STRINGIFY=ostring.sed
-+fi
-+
-+
-+# target-specific stuff:
-+
-+all_targets=
-+EMUL=
-+all_emuls=
-+all_emul_extras=
-+all_libpath=
-+
-+rm -f tdirs
-+
-+for targ_alias in `echo $target_alias $enable_targets | sed 's/,/ /g'`
-+do
-+  if test "$targ_alias" = "all"; then
-+    all_targets=true
-+  else
-+    # Canonicalize the secondary target names.
-+    result=`$ac_config_sub $targ_alias 2>/dev/null`
-+    if test -n "$result"; then
-+	targ=$result
-+    else
-+	targ=$targ_alias
-+    fi
-+
-+    . ${srcdir}/configure.tgt
-+
-+    if test "$targ" = "$target"; then
-+      EMUL=$targ_emul
-+    fi
-+
-+    if test x${want64} = xfalse; then
-+      . ${srcdir}/../bfd/config.bfd
-+    fi
-+
-+    if test x${want64} = xtrue; then
-+      targ_extra_emuls="$targ_extra_emuls $targ64_extra_emuls"
-+      targ_extra_libpath="$targ_extra_libpath $targ64_extra_libpath"
-+    fi
-+
-+    for i in $targ_emul $targ_extra_emuls $targ_extra_libpath; do
-+	case " $all_emuls " in
-+	*" e${i}.o "*) ;;
-+	*)
-+	  all_emuls="$all_emuls e${i}.o"
-+	  eval result=\$tdir_$i
-+	  test -z "$result" && result=$targ_alias
-+	  echo tdir_$i=$result >> tdirs
-+	  ;;
-+	esac
-+    done
-+
-+    for i in $targ_emul $targ_extra_libpath; do
-+	case " $all_libpath " in
-+	*" ${i} "*) ;;
-+	*)
-+	  if test -z "$all_libpath"; then
-+	    all_libpath=${i}
-+	  else
-+	    all_libpath="$all_libpath ${i}"
-+	  fi
-+	  ;;
-+	esac
-+    done
-+
-+    for i in $targ_extra_ofiles; do
-+	case " $all_emul_extras " in
-+	*" ${i} "*) ;;
-+	*)
-+	  all_emul_extras="$all_emul_extras ${i}"
-+	  ;;
-+	esac
-+    done
-+  fi
-+done
-+
-+
-+
-+TDIRS=tdirs
-+
-+
-+if test x${all_targets} = xtrue; then
-+  if test x${want64} = xfalse; then
-+    # The cast to long int works around a bug in the HP C Compiler
-+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+# This bug is HP SR number 8606223364.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
-+$as_echo_n "checking size of long... " >&6; }
-+if test "${ac_cv_sizeof_long+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
-+  
-+else
-+  if test "$ac_cv_type_long" = yes; then
-+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ as_fn_set_status 77
-+as_fn_error "cannot compute sizeof (long)
-+See \`config.log' for more details." "$LINENO" 5; }; }
-+   else
-+     ac_cv_sizeof_long=0
-+   fi
-+fi
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
-+$as_echo "$ac_cv_sizeof_long" >&6; }
-+
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+@%:@define SIZEOF_LONG $ac_cv_sizeof_long
-+_ACEOF
-+
-+
-+    if test "x${ac_cv_sizeof_long}" = "x8"; then
-+      want64=true
-+    fi
-+  fi
-+  if test x${want64} = xtrue; then
-+    EMULATION_OFILES='$(ALL_EMULATIONS) $(ALL_64_EMULATIONS)'
-+  else
-+    EMULATION_OFILES='$(ALL_EMULATIONS)'
-+  fi
-+  EMUL_EXTRA_OFILES='$(ALL_EMUL_EXTRA_OFILES)'
-+else
-+  EMULATION_OFILES=$all_emuls
-+  EMUL_EXTRA_OFILES=$all_emul_extras
-+fi
-+
-+
-+
-+
-+EMULATION_LIBPATH=$all_libpath
-+
-+
-+if test x${enable_static} = xno; then
-+  TESTBFDLIB="--rpath ../bfd/.libs ../bfd/.libs/libbfd.so"
-+else
-+  TESTBFDLIB="../bfd/.libs/libbfd.a"
-+fi
-+
-+
-+target_vendor=${target_vendor=$host_vendor}
-+case "$target_vendor" in
-+  hp) EXTRA_SHLIB_EXTENSION=".sl" ;;
-+  *)  EXTRA_SHLIB_EXTENSION= ;;
-+esac
-+
-+case "$target_os" in
-+  lynxos) EXTRA_SHLIB_EXTENSION=".a" ;;
-+esac
-+
-+if test x${EXTRA_SHLIB_EXTENSION} != x ; then
-+  
-+cat >>confdefs.h <<_ACEOF
-+@%:@define EXTRA_SHLIB_EXTENSION "$EXTRA_SHLIB_EXTENSION"
-+_ACEOF
-+
-+fi
-+
-+
-+
-+
-+
-+
-+ac_config_files="$ac_config_files Makefile po/Makefile.in:po/Make-in"
-+
-+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
-+# scripts and configure runs, see configure's option --config-cache.
-+# It is not useful on other systems.  If it contains results you don't
-+# want to keep, you may remove or edit it.
-+#
-+# config.status only pays attention to the cache file if you give it
-+# the --recheck option to rerun configure.
-+#
-+# `ac_cv_env_foo' variables (set or unset) will be overridden when
-+# loading this file, other *unset* `ac_cv_foo' will be assigned the
-+# following values.
-+
-+_ACEOF
-+
-+# The following way of writing the cache mishandles newlines in values,
-+# but we know of no workaround that is simple, portable, and efficient.
-+# So, we kill variables containing newlines.
-+# Ultrix sh set writes to stderr and can't be redirected directly,
-+# and sets the high bit in the cache file unless we assign to the vars.
-+(
-+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-+    eval ac_val=\$$ac_var
-+    case $ac_val in #(
-+    *${as_nl}*)
-+      case $ac_var in #(
-+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-+      esac
-+      case $ac_var in #(
-+      _ | IFS | as_nl) ;; #(
-+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-+      *) { eval $ac_var=; unset $ac_var;} ;;
-+      esac ;;
-+    esac
-+  done
-+
-+  (set) 2>&1 |
-+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-+    *${as_nl}ac_space=\ *)
-+      # `set' does not quote correctly, so add quotes: double-quote
-+      # substitution turns \\\\ into \\, and sed turns \\ into \.
-+      sed -n \
-+	"s/'/'\\\\''/g;
-+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-+      ;; #(
-+    *)
-+      # `set' quotes correctly as required by POSIX, so do not add quotes.
-+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-+      ;;
-+    esac |
-+    sort
-+) |
-+  sed '
-+     /^ac_cv_env_/b end
-+     t clear
-+     :clear
-+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-+     t end
-+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-+     :end' >>confcache
-+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-+  if test -w "$cache_file"; then
-+    test "x$cache_file" != "x/dev/null" &&
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-+$as_echo "$as_me: updating cache $cache_file" >&6;}
-+    cat confcache >$cache_file
-+  else
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-+  fi
-+fi
-+rm -f confcache
-+
-+test "x$prefix" = xNONE && prefix=$ac_default_prefix
-+# Let make expand exec_prefix.
-+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-+
-+DEFS=-DHAVE_CONFIG_H
-+
-+ac_libobjs=
-+ac_ltlibobjs=
-+for ac_i in : $LIB@&t@OBJS; do test "x$ac_i" = x: && continue
-+  # 1. Remove the extension, and $U if already installed.
-+  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
-+  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
-+  #    will be set to the directory where LIBOBJS objects are built.
-+  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-+  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
-+done
-+LIB@&t@OBJS=$ac_libobjs
-+
-+LTLIBOBJS=$ac_ltlibobjs
-+
-+
-+if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-+  as_fn_error "conditional \"AMDEP\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
-+fi
-+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-+  as_fn_error "conditional \"am__fastdepCC\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
-+fi
-+ if test -n "$EXEEXT"; then
-+  am__EXEEXT_TRUE=
-+  am__EXEEXT_FALSE='#'
-+else
-+  am__EXEEXT_TRUE='#'
-+  am__EXEEXT_FALSE=
-+fi
-+
-+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-+  as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
-+fi
-+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-+  as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
-+fi
-+if test -z "${GENINSRC_NEVER_TRUE}" && test -z "${GENINSRC_NEVER_FALSE}"; then
-+  as_fn_error "conditional \"GENINSRC_NEVER\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
-+fi
-+if test -z "${ENABLE_PLUGINS_TRUE}" && test -z "${ENABLE_PLUGINS_FALSE}"; then
-+  as_fn_error "conditional \"ENABLE_PLUGINS\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
-+fi
-+
-+: ${CONFIG_STATUS=./config.status}
-+ac_write_fail=0
-+ac_clean_files_save=$ac_clean_files
-+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-+as_write_fail=0
-+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
-+#! $SHELL
-+# Generated by $as_me.
-+# Run this file to recreate the current configuration.
-+# Compiler output produced by configure, useful for debugging
-+# configure, is in config.log if it exists.
-+
-+debug=false
-+ac_cs_recheck=false
-+ac_cs_silent=false
-+
-+SHELL=\${CONFIG_SHELL-$SHELL}
-+export SHELL
-+_ASEOF
-+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
-+## -------------------- ##
-+## M4sh Initialization. ##
-+## -------------------- ##
-+
-+# Be more Bourne compatible
-+DUALCASE=1; export DUALCASE # for MKS sh
-+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-+  emulate sh
-+  NULLCMD=:
-+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-+  # is contrary to our usage.  Disable this feature.
-+  alias -g '${1+"$@"}'='"$@"'
-+  setopt NO_GLOB_SUBST
-+else
-+  case `(set -o) 2>/dev/null` in @%:@(
-+  *posix*) :
-+    set -o posix ;; @%:@(
-+  *) :
-+     ;;
-+esac
-+fi
-+
-+
-+as_nl='
-+'
-+export as_nl
-+# Printing a long string crashes Solaris 7 /usr/bin/printf.
-+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-+# Prefer a ksh shell builtin over an external printf program on Solaris,
-+# but without wasting forks for bash or zsh.
-+if test -z "$BASH_VERSION$ZSH_VERSION" \
-+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-+  as_echo='print -r --'
-+  as_echo_n='print -rn --'
-+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-+  as_echo='printf %s\n'
-+  as_echo_n='printf %s'
-+else
-+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-+    as_echo_n='/usr/ucb/echo -n'
-+  else
-+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-+    as_echo_n_body='eval
-+      arg=$1;
-+      case $arg in @%:@(
-+      *"$as_nl"*)
-+	expr "X$arg" : "X\\(.*\\)$as_nl";
-+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-+      esac;
-+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-+    '
-+    export as_echo_n_body
-+    as_echo_n='sh -c $as_echo_n_body as_echo'
-+  fi
-+  export as_echo_body
-+  as_echo='sh -c $as_echo_body as_echo'
-+fi
-+
-+# The user is always right.
-+if test "${PATH_SEPARATOR+set}" != set; then
-+  PATH_SEPARATOR=:
-+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-+      PATH_SEPARATOR=';'
-+  }
-+fi
-+
-+
-+# IFS
-+# We need space, tab and new line, in precisely that order.  Quoting is
-+# there to prevent editors from complaining about space-tab.
-+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-+# splitting by setting IFS to empty value.)
-+IFS=" ""	$as_nl"
-+
-+# Find who we are.  Look in the path if we contain no directory separator.
-+case $0 in @%:@((
-+  *[\\/]* ) as_myself=$0 ;;
-+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-+  done
-+IFS=$as_save_IFS
-+
-+     ;;
-+esac
-+# We did not find ourselves, most probably we were run as `sh COMMAND'
-+# in which case we are not to be found in the path.
-+if test "x$as_myself" = x; then
-+  as_myself=$0
-+fi
-+if test ! -f "$as_myself"; then
-+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-+  exit 1
-+fi
-+
-+# Unset variables that we do not need and which cause bugs (e.g. in
-+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-+# suppresses any "Segmentation fault" message there.  '((' could
-+# trigger a bug in pdksh 5.2.14.
-+for as_var in BASH_ENV ENV MAIL MAILPATH
-+do eval test x\${$as_var+set} = xset \
-+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-+done
-+PS1='$ '
-+PS2='> '
-+PS4='+ '
-+
-+# NLS nuisances.
-+LC_ALL=C
-+export LC_ALL
-+LANGUAGE=C
-+export LANGUAGE
-+
-+# CDPATH.
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-+
-+
-+@%:@ as_fn_error ERROR [LINENO LOG_FD]
-+@%:@ ---------------------------------
-+@%:@ Output "`basename @S|@0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-+@%:@ provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-+@%:@ script with status $?, using 1 if that was 0.
-+as_fn_error ()
-+{
-+  as_status=$?; test $as_status -eq 0 && as_status=1
-+  if test "$3"; then
-+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
-+  fi
-+  $as_echo "$as_me: error: $1" >&2
-+  as_fn_exit $as_status
-+} @%:@ as_fn_error
-+
-+
-+@%:@ as_fn_set_status STATUS
-+@%:@ -----------------------
-+@%:@ Set $? to STATUS, without forking.
-+as_fn_set_status ()
-+{
-+  return $1
-+} @%:@ as_fn_set_status
-+
-+@%:@ as_fn_exit STATUS
-+@%:@ -----------------
-+@%:@ Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-+as_fn_exit ()
-+{
-+  set +e
-+  as_fn_set_status $1
-+  exit $1
-+} @%:@ as_fn_exit
-+
-+@%:@ as_fn_unset VAR
-+@%:@ ---------------
-+@%:@ Portably unset VAR.
-+as_fn_unset ()
-+{
-+  { eval $1=; unset $1;}
-+}
-+as_unset=as_fn_unset
-+@%:@ as_fn_append VAR VALUE
-+@%:@ ----------------------
-+@%:@ Append the text in VALUE to the end of the definition contained in VAR. Take
-+@%:@ advantage of any shell optimizations that allow amortized linear growth over
-+@%:@ repeated appends, instead of the typical quadratic growth present in naive
-+@%:@ implementations.
-+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-+  eval 'as_fn_append ()
-+  {
-+    eval $1+=\$2
-+  }'
-+else
-+  as_fn_append ()
-+  {
-+    eval $1=\$$1\$2
-+  }
-+fi # as_fn_append
-+
-+@%:@ as_fn_arith ARG...
-+@%:@ ------------------
-+@%:@ Perform arithmetic evaluation on the ARGs, and store the result in the
-+@%:@ global $as_val. Take advantage of shells that can avoid forks. The arguments
-+@%:@ must be portable across $(()) and expr.
-+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-+  eval 'as_fn_arith ()
-+  {
-+    as_val=$(( $* ))
-+  }'
-+else
-+  as_fn_arith ()
-+  {
-+    as_val=`expr "$@" || test $? -eq 1`
-+  }
-+fi # as_fn_arith
-+
-+
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-+  as_expr=expr
-+else
-+  as_expr=false
-+fi
-+
-+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-+  as_basename=basename
-+else
-+  as_basename=false
-+fi
-+
-+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-+  as_dirname=dirname
-+else
-+  as_dirname=false
-+fi
-+
-+as_me=`$as_basename -- "$0" ||
-+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-+	 X"$0" : 'X\(//\)$' \| \
-+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-+$as_echo X/"$0" |
-+    sed '/^.*\/\([^/][^/]*\)\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\/\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\/\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-+
-+# Avoid depending upon Character Ranges.
-+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-+as_cr_digits='0123456789'
-+as_cr_alnum=$as_cr_Letters$as_cr_digits
-+
-+ECHO_C= ECHO_N= ECHO_T=
-+case `echo -n x` in @%:@(((((
-+-n*)
-+  case `echo 'xy\c'` in
-+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-+  xy)  ECHO_C='\c';;
-+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-+       ECHO_T='	';;
-+  esac;;
-+*)
-+  ECHO_N='-n';;
-+esac
-+
-+rm -f conf$$ conf$$.exe conf$$.file
-+if test -d conf$$.dir; then
-+  rm -f conf$$.dir/conf$$.file
-+else
-+  rm -f conf$$.dir
-+  mkdir conf$$.dir 2>/dev/null
-+fi
-+if (echo >conf$$.file) 2>/dev/null; then
-+  if ln -s conf$$.file conf$$ 2>/dev/null; then
-+    as_ln_s='ln -s'
-+    # ... but there are two gotchas:
-+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-+    # In both cases, we have to default to `cp -p'.
-+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-+      as_ln_s='cp -p'
-+  elif ln conf$$.file conf$$ 2>/dev/null; then
-+    as_ln_s=ln
-+  else
-+    as_ln_s='cp -p'
-+  fi
-+else
-+  as_ln_s='cp -p'
-+fi
-+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-+rmdir conf$$.dir 2>/dev/null
-+
-+
-+@%:@ as_fn_mkdir_p
-+@%:@ -------------
-+@%:@ Create "$as_dir" as a directory, including parents if necessary.
-+as_fn_mkdir_p ()
-+{
-+
-+  case $as_dir in #(
-+  -*) as_dir=./$as_dir;;
-+  esac
-+  test -d "$as_dir" || eval $as_mkdir_p || {
-+    as_dirs=
-+    while :; do
-+      case $as_dir in #(
-+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-+      *) as_qdir=$as_dir;;
-+      esac
-+      as_dirs="'$as_qdir' $as_dirs"
-+      as_dir=`$as_dirname -- "$as_dir" ||
-+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$as_dir" : 'X\(//\)[^/]' \| \
-+	 X"$as_dir" : 'X\(//\)$' \| \
-+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-+$as_echo X"$as_dir" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-+      test -d "$as_dir" && break
-+    done
-+    test -z "$as_dirs" || eval "mkdir $as_dirs"
-+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
-+
-+
-+} @%:@ as_fn_mkdir_p
-+if mkdir -p . 2>/dev/null; then
-+  as_mkdir_p='mkdir -p "$as_dir"'
-+else
-+  test -d ./-p && rmdir ./-p
-+  as_mkdir_p=false
-+fi
-+
-+if test -x / >/dev/null 2>&1; then
-+  as_test_x='test -x'
-+else
-+  if ls -dL / >/dev/null 2>&1; then
-+    as_ls_L_option=L
-+  else
-+    as_ls_L_option=
-+  fi
-+  as_test_x='
-+    eval sh -c '\''
-+      if test -d "$1"; then
-+	test -d "$1/.";
-+      else
-+	case $1 in @%:@(
-+	-*)set "./$1";;
-+	esac;
-+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in @%:@((
-+	???[sx]*):;;*)false;;esac;fi
-+    '\'' sh
-+  '
-+fi
-+as_executable_p=$as_test_x
-+
-+# 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'"
-+
-+# Sed expression to map a string onto a valid variable name.
-+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-+
-+
-+exec 6>&1
-+## ----------------------------------- ##
-+## Main body of $CONFIG_STATUS script. ##
-+## ----------------------------------- ##
-+_ASEOF
-+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+# Save the log message, to keep $0 and so on meaningful, and to
-+# report actual input values of CONFIG_FILES etc. instead of their
-+# values after options handling.
-+ac_log="
-+This file was extended by $as_me, which was
-+generated by GNU Autoconf 2.64.  Invocation command line was
-+
-+  CONFIG_FILES    = $CONFIG_FILES
-+  CONFIG_HEADERS  = $CONFIG_HEADERS
-+  CONFIG_LINKS    = $CONFIG_LINKS
-+  CONFIG_COMMANDS = $CONFIG_COMMANDS
-+  $ $0 $@
-+
-+on `(hostname || uname -n) 2>/dev/null | sed 1q`
-+"
-+
-+_ACEOF
-+
-+case $ac_config_files in *"
-+"*) set x $ac_config_files; shift; ac_config_files=$*;;
-+esac
-+
-+case $ac_config_headers in *"
-+"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
-+esac
-+
-+
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+# Files that config.status was made for.
-+config_files="$ac_config_files"
-+config_headers="$ac_config_headers"
-+config_commands="$ac_config_commands"
-+
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+ac_cs_usage="\
-+\`$as_me' instantiates files and other configuration actions
-+from templates according to the current configuration.  Unless the files
-+and actions are specified as TAGs, all are instantiated by default.
-+
-+Usage: $0 [OPTION]... [TAG]...
-+
-+  -h, --help       print this help, then exit
-+  -V, --version    print version number and configuration settings, then exit
-+  -q, --quiet, --silent
-+                   do not print progress messages
-+  -d, --debug      don't remove temporary files
-+      --recheck    update $as_me by reconfiguring in the same conditions
-+      --file=FILE[:TEMPLATE] 
-+                   instantiate the configuration file FILE
-+      --header=FILE[:TEMPLATE] 
-+                   instantiate the configuration header FILE
-+
-+Configuration files:
-+$config_files
-+
-+Configuration headers:
-+$config_headers
-+
-+Configuration commands:
-+$config_commands
-+
-+Report bugs to the package provider."
-+
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+ac_cs_version="\\
-+config.status
-+configured by $0, generated by GNU Autoconf 2.64,
-+  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-+
-+Copyright (C) 2009 Free Software Foundation, Inc.
-+This config.status script is free software; the Free Software Foundation
-+gives unlimited permission to copy, distribute and modify it."
-+
-+ac_pwd='$ac_pwd'
-+srcdir='$srcdir'
-+INSTALL='$INSTALL'
-+MKDIR_P='$MKDIR_P'
-+AWK='$AWK'
-+test -n "\$AWK" || AWK=awk
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+# The default lists apply if the user does not specify any file.
-+ac_need_defaults=:
-+while test $# != 0
-+do
-+  case $1 in
-+  --*=*)
-+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-+    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-+    ac_shift=:
-+    ;;
-+  *)
-+    ac_option=$1
-+    ac_optarg=$2
-+    ac_shift=shift
-+    ;;
-+  esac
-+
-+  case $ac_option in
-+  # Handling of the options.
-+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-+    ac_cs_recheck=: ;;
-+  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-+    $as_echo "$ac_cs_version"; exit ;;
-+  --debug | --debu | --deb | --de | --d | -d )
-+    debug=: ;;
-+  --file | --fil | --fi | --f )
-+    $ac_shift
-+    case $ac_optarg in
-+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-+    esac
-+    as_fn_append CONFIG_FILES " '$ac_optarg'"
-+    ac_need_defaults=false;;
-+  --header | --heade | --head | --hea )
-+    $ac_shift
-+    case $ac_optarg in
-+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-+    esac
-+    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
-+    ac_need_defaults=false;;
-+  --he | --h)
-+    # Conflict between --help and --header
-+    as_fn_error "ambiguous option: \`$1'
-+Try \`$0 --help' for more information.";;
-+  --help | --hel | -h )
-+    $as_echo "$ac_cs_usage"; exit ;;
-+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-+  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-+    ac_cs_silent=: ;;
-+
-+  # This is an error.
-+  -*) as_fn_error "unrecognized option: \`$1'
-+Try \`$0 --help' for more information." ;;
-+
-+  *) as_fn_append ac_config_targets " $1"
-+     ac_need_defaults=false ;;
-+
-+  esac
-+  shift
-+done
-+
-+ac_configure_extra_args=
-+
-+if $ac_cs_silent; then
-+  exec 6>/dev/null
-+  ac_configure_extra_args="$ac_configure_extra_args --silent"
-+fi
-+
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+if \$ac_cs_recheck; then
-+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-+  shift
-+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
-+  CONFIG_SHELL='$SHELL'
-+  export CONFIG_SHELL
-+  exec "\$@"
-+fi
-+
-+_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+exec 5>>config.log
-+{
-+  echo
-+  sed 'h;s/./-/g;s/^.../@%:@@%:@ /;s/...$/ @%:@@%:@/;p;x;p;x' <<_ASBOX
-+@%:@@%:@ Running $as_me. @%:@@%:@
-+_ASBOX
-+  $as_echo "$ac_log"
-+} >&5
-+
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+#
-+# INIT-COMMANDS
-+#
-+AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
-+
-+
-+# The HP-UX ksh and POSIX shell print the target directory to stdout
-+# if CDPATH is set.
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-+
-+sed_quote_subst='$sed_quote_subst'
-+double_quote_subst='$double_quote_subst'
-+delay_variable_subst='$delay_variable_subst'
-+macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
-+macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
-+enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
-+enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
-+pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
-+enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
-+SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
-+ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
-+host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
-+host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
-+host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
-+build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
-+build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
-+build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
-+SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
-+Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
-+GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
-+EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
-+FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
-+LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
-+NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
-+LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
-+max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
-+ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
-+exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
-+lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
-+lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
-+lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
-+reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
-+reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
-+OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
-+deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
-+file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
-+AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
-+AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
-+STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
-+RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
-+old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
-+old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
-+old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
-+lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
-+CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
-+CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
-+compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
-+GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
-+lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
-+lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
-+lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
-+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
-+objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
-+MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
-+lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
-+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
-+lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
-+lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
-+lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
-+need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
-+DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
-+NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
-+LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
-+OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
-+OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
-+libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
-+shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
-+extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
-+archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
-+enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
-+export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
-+whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
-+compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
-+old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
-+old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
-+archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
-+archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
-+module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
-+module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
-+with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
-+allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
-+no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
-+hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
-+hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
-+hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
-+hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
-+hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
-+hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
-+hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
-+hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
-+inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
-+link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
-+fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
-+always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
-+export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
-+exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
-+include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
-+prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
-+file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
-+variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
-+need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
-+need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
-+version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
-+runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
-+shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
-+shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
-+libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
-+library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
-+soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
-+install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
-+postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
-+postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
-+finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
-+finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
-+hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
-+sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
-+sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
-+hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
-+enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
-+enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
-+enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
-+old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
-+striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
-+
-+LTCC='$LTCC'
-+LTCFLAGS='$LTCFLAGS'
-+compiler='$compiler_DEFAULT'
-+
-+# A function that is used when there is no print builtin or printf.
-+func_fallback_echo ()
-+{
-+  eval 'cat <<_LTECHO_EOF
-+\$1
-+_LTECHO_EOF'
-+}
-+
-+# Quote evaled strings.
-+for var in SHELL \
-+ECHO \
-+SED \
-+GREP \
-+EGREP \
-+FGREP \
-+LD \
-+NM \
-+LN_S \
-+lt_SP2NL \
-+lt_NL2SP \
-+reload_flag \
-+OBJDUMP \
-+deplibs_check_method \
-+file_magic_cmd \
-+AR \
-+AR_FLAGS \
-+STRIP \
-+RANLIB \
-+CC \
-+CFLAGS \
-+compiler \
-+lt_cv_sys_global_symbol_pipe \
-+lt_cv_sys_global_symbol_to_cdecl \
-+lt_cv_sys_global_symbol_to_c_name_address \
-+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
-+lt_prog_compiler_no_builtin_flag \
-+lt_prog_compiler_wl \
-+lt_prog_compiler_pic \
-+lt_prog_compiler_static \
-+lt_cv_prog_compiler_c_o \
-+need_locks \
-+DSYMUTIL \
-+NMEDIT \
-+LIPO \
-+OTOOL \
-+OTOOL64 \
-+shrext_cmds \
-+export_dynamic_flag_spec \
-+whole_archive_flag_spec \
-+compiler_needs_object \
-+with_gnu_ld \
-+allow_undefined_flag \
-+no_undefined_flag \
-+hardcode_libdir_flag_spec \
-+hardcode_libdir_flag_spec_ld \
-+hardcode_libdir_separator \
-+fix_srcfile_path \
-+exclude_expsyms \
-+include_expsyms \
-+file_list_spec \
-+variables_saved_for_relink \
-+libname_spec \
-+library_names_spec \
-+soname_spec \
-+install_override_mode \
-+finish_eval \
-+old_striplib \
-+striplib; do
-+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-+    *[\\\\\\\`\\"\\\$]*)
-+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
-+      ;;
-+    *)
-+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-+      ;;
-+    esac
-+done
-+
-+# Double-quote double-evaled strings.
-+for var in reload_cmds \
-+old_postinstall_cmds \
-+old_postuninstall_cmds \
-+old_archive_cmds \
-+extract_expsyms_cmds \
-+old_archive_from_new_cmds \
-+old_archive_from_expsyms_cmds \
-+archive_cmds \
-+archive_expsym_cmds \
-+module_cmds \
-+module_expsym_cmds \
-+export_symbols_cmds \
-+prelink_cmds \
-+postinstall_cmds \
-+postuninstall_cmds \
-+finish_cmds \
-+sys_lib_search_path_spec \
-+sys_lib_dlsearch_path_spec; do
-+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-+    *[\\\\\\\`\\"\\\$]*)
-+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
-+      ;;
-+    *)
-+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-+      ;;
-+    esac
-+done
-+
-+ac_aux_dir='$ac_aux_dir'
-+xsi_shell='$xsi_shell'
-+lt_shell_append='$lt_shell_append'
-+
-+# See if we are running on zsh, and set the options which allow our
-+# commands through without removal of \ escapes INIT.
-+if test -n "\${ZSH_VERSION+set}" ; then
-+   setopt NO_GLOB_SUBST
-+fi
-+
-+
-+    PACKAGE='$PACKAGE'
-+    VERSION='$VERSION'
-+    TIMESTAMP='$TIMESTAMP'
-+    RM='$RM'
-+    ofile='$ofile'
-+
-+
-+
-+# Capture the value of obsolete ALL_LINGUAS because we need it to compute
-+    # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it
-+    # from automake.
-+    eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
-+    # Capture the value of LINGUAS because we need it to compute CATALOGS.
-+    LINGUAS="${LINGUAS-%UNSET%}"
-+   
-+
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+
-+# Handling of arguments.
-+for ac_config_target in $ac_config_targets
-+do
-+  case $ac_config_target in
-+    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-+    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.in" ;;
-+    "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
-+    "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
-+    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-+    "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in:po/Make-in" ;;
-+
-+  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
-+  esac
-+done
-+
-+
-+# 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
-+# bizarre bug on SunOS 4.1.3.
-+if $ac_need_defaults; then
-+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-+  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-+  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
-+fi
-+
-+# Have a temporary directory for convenience.  Make it in the build tree
-+# simply because there is no reason against having it here, and in addition,
-+# creating and moving files from /tmp can sometimes cause problems.
-+# Hook for its removal unless debugging.
-+# Note that there is a small window in which the directory will not be cleaned:
-+# after its creation but before its name has been assigned to `$tmp'.
-+$debug ||
-+{
-+  tmp=
-+  trap 'exit_status=$?
-+  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
-+' 0
-+  trap 'as_fn_exit 1' 1 2 13 15
-+}
-+# Create a (secure) tmp directory for tmp files.
-+
-+{
-+  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-+  test -n "$tmp" && test -d "$tmp"
-+}  ||
-+{
-+  tmp=./conf$$-$RANDOM
-+  (umask 077 && mkdir "$tmp")
-+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
-+
-+# Set up the scripts for CONFIG_FILES section.
-+# No need to generate them if there are no CONFIG_FILES.
-+# This happens for instance with `./config.status config.h'.
-+if test -n "$CONFIG_FILES"; then
-+
-+if $AWK 'BEGIN { getline <"/dev/null" }' </dev/null 2>/dev/null; then
-+  ac_cs_awk_getline=:
-+  ac_cs_awk_pipe_init=
-+  ac_cs_awk_read_file='
-+      while ((getline aline < (F[key])) > 0)
-+	print(aline)
-+      close(F[key])'
-+  ac_cs_awk_pipe_fini=
-+else
-+  ac_cs_awk_getline=false
-+  ac_cs_awk_pipe_init="print \"cat <<'|#_!!_#|' &&\""
-+  ac_cs_awk_read_file='
-+      print "|#_!!_#|"
-+      print "cat " F[key] " &&"
-+      '$ac_cs_awk_pipe_init
-+  # The final `:' finishes the AND list.
-+  ac_cs_awk_pipe_fini='END { print "|#_!!_#|"; print ":" }'
-+fi
-+ac_cr=`echo X | tr X '\015'`
-+# On cygwin, bash can eat \r inside `` if the user requested igncr.
-+# But we know of no other shell where ac_cr would be empty at this
-+# point, so we can use a bashism as a fallback.
-+if test "x$ac_cr" = x; then
-+  eval ac_cr=\$\'\\r\'
-+fi
-+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
-+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-+  ac_cs_awk_cr='\r'
-+else
-+  ac_cs_awk_cr=$ac_cr
-+fi
-+
-+echo 'BEGIN {' >"$tmp/subs1.awk" &&
-+_ACEOF
-+
-+# Create commands to substitute file output variables.
-+{
-+  echo "cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1" &&
-+  echo 'cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&' &&
-+  echo "$ac_subst_files" | sed 's/.*/F@<:@"&"@:>@="$&"/' &&
-+  echo "_ACAWK" &&
-+  echo "_ACEOF"
-+} >conf$$files.sh &&
-+. ./conf$$files.sh ||
-+  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-+rm -f conf$$files.sh
-+
-+{
-+  echo "cat >conf$$subs.awk <<_ACEOF" &&
-+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
-+  echo "_ACEOF"
-+} >conf$$subs.sh ||
-+  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
-+ac_delim='%!_!# '
-+for ac_last_try in false false false false false :; do
-+  . ./conf$$subs.sh ||
-+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-+
-+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
-+  if test $ac_delim_n = $ac_delim_num; then
-+    break
-+  elif $ac_last_try; then
-+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-+  else
-+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-+  fi
-+done
-+rm -f conf$$subs.sh
-+
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
-+_ACEOF
-+sed -n '
-+h
-+s/^/S["/; s/!.*/"]=/
-+p
-+g
-+s/^[^!]*!//
-+:repl
-+t repl
-+s/'"$ac_delim"'$//
-+t delim
-+:nl
-+h
-+s/\(.\{148\}\).*/\1/
-+t more1
-+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
-+p
-+n
-+b repl
-+:more1
-+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-+p
-+g
-+s/.\{148\}//
-+t nl
-+:delim
-+h
-+s/\(.\{148\}\).*/\1/
-+t more2
-+s/["\\]/\\&/g; s/^/"/; s/$/"/
-+p
-+b
-+:more2
-+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-+p
-+g
-+s/.\{148\}//
-+t delim
-+' <conf$$subs.awk | sed '
-+/^[^""]/{
-+  N
-+  s/\n//
-+}
-+' >>$CONFIG_STATUS || ac_write_fail=1
-+rm -f conf$$subs.awk
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+_ACAWK
-+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
-+  for (key in S) S_is_set[key] = 1
-+  FS = ""
-+  \$ac_cs_awk_pipe_init
-+}
-+{
-+  line = $ 0
-+  nfields = split(line, field, "@")
-+  substed = 0
-+  len = length(field[1])
-+  for (i = 2; i < nfields; i++) {
-+    key = field[i]
-+    keylen = length(key)
-+    if (S_is_set[key]) {
-+      value = S[key]
-+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
-+      len += length(value) + length(field[++i])
-+      substed = 1
-+    } else
-+      len += 1 + keylen
-+  }
-+  if (nfields == 3 && !substed) {
-+    key = field[2]
-+    if (F[key] != "" && line ~ /^[	 ]*@.*@[	 ]*$/) {
-+      \$ac_cs_awk_read_file
-+      next
-+    }
-+  }
-+  print line
-+}
-+\$ac_cs_awk_pipe_fini
-+_ACAWK
-+_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
-+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
-+else
-+  cat
-+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-+  || as_fn_error "could not setup config files machinery" "$LINENO" 5
-+_ACEOF
-+
-+# VPATH may cause trouble with some makes, so we remove $(srcdir),
-+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-+# trailing colons and then remove the whole line if VPATH becomes empty
-+# (actually we leave an empty line to preserve line numbers).
-+if test "x$srcdir" = x.; then
-+  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-+s/:*\$(srcdir):*/:/
-+s/:*\${srcdir}:*/:/
-+s/:*@srcdir@:*/:/
-+s/^\([^=]*=[	 ]*\):*/\1/
-+s/:*$//
-+s/^[^=]*=[	 ]*$//
-+}'
-+fi
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+fi # test -n "$CONFIG_FILES"
-+
-+# Set up the scripts for CONFIG_HEADERS section.
-+# No need to generate them if there are no CONFIG_HEADERS.
-+# This happens for instance with `./config.status Makefile'.
-+if test -n "$CONFIG_HEADERS"; then
-+cat >"$tmp/defines.awk" <<\_ACAWK ||
-+BEGIN {
-+_ACEOF
-+
-+# Transform confdefs.h into an awk script `defines.awk', embedded as
-+# here-document in config.status, that substitutes the proper values into
-+# config.h.in to produce config.h.
-+
-+# Create a delimiter string that does not exist in confdefs.h, to ease
-+# handling of long lines.
-+ac_delim='%!_!# '
-+for ac_last_try in false false :; do
-+  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
-+  if test -z "$ac_t"; then
-+    break
-+  elif $ac_last_try; then
-+    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
-+  else
-+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-+  fi
-+done
-+
-+# For the awk script, D is an array of macro values keyed by name,
-+# likewise P contains macro parameters if any.  Preserve backslash
-+# newline sequences.
-+
-+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-+sed -n '
-+s/.\{148\}/&'"$ac_delim"'/g
-+t rset
-+:rset
-+s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
-+t def
-+d
-+:def
-+s/\\$//
-+t bsnl
-+s/["\\]/\\&/g
-+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
-+D["\1"]=" \3"/p
-+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
-+d
-+:bsnl
-+s/["\\]/\\&/g
-+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
-+D["\1"]=" \3\\\\\\n"\\/p
-+t cont
-+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
-+t cont
-+d
-+:cont
-+n
-+s/.\{148\}/&'"$ac_delim"'/g
-+t clear
-+:clear
-+s/\\$//
-+t bsnlc
-+s/["\\]/\\&/g; s/^/"/; s/$/"/p
-+d
-+:bsnlc
-+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
-+b cont
-+' <confdefs.h | sed '
-+s/'"$ac_delim"'/"\\\
-+"/g' >>$CONFIG_STATUS || ac_write_fail=1
-+
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+  for (key in D) D_is_set[key] = 1
-+  FS = ""
-+}
-+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
-+  line = \$ 0
-+  split(line, arg, " ")
-+  if (arg[1] == "#") {
-+    defundef = arg[2]
-+    mac1 = arg[3]
-+  } else {
-+    defundef = substr(arg[1], 2)
-+    mac1 = arg[2]
-+  }
-+  split(mac1, mac2, "(") #)
-+  macro = mac2[1]
-+  prefix = substr(line, 1, index(line, defundef) - 1)
-+  if (D_is_set[macro]) {
-+    # Preserve the white space surrounding the "#".
-+    print prefix "define", macro P[macro] D[macro]
-+    next
-+  } else {
-+    # Replace #undef with comments.  This is necessary, for example,
-+    # in the case of _POSIX_SOURCE, which is predefined and required
-+    # on some systems where configure will not decide to define it.
-+    if (defundef == "undef") {
-+      print "/*", prefix defundef, macro, "*/"
-+      next
-+    }
-+  }
-+}
-+{ print }
-+_ACAWK
-+_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+  as_fn_error "could not setup config headers machinery" "$LINENO" 5
-+fi # test -n "$CONFIG_HEADERS"
-+
-+
-+eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
-+shift
-+for ac_tag
-+do
-+  case $ac_tag in
-+  :[FHLC]) ac_mode=$ac_tag; continue;;
-+  esac
-+  case $ac_mode$ac_tag in
-+  :[FHL]*:*);;
-+  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
-+  :[FH]-) ac_tag=-:-;;
-+  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-+  esac
-+  ac_save_IFS=$IFS
-+  IFS=:
-+  set x $ac_tag
-+  IFS=$ac_save_IFS
-+  shift
-+  ac_file=$1
-+  shift
-+
-+  case $ac_mode in
-+  :L) ac_source=$1;;
-+  :[FH])
-+    ac_file_inputs=
-+    for ac_f
-+    do
-+      case $ac_f in
-+      -) ac_f="$tmp/stdin";;
-+      *) # Look for the file first in the build tree, then in the source tree
-+	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
-+	 # because $ac_f cannot contain `:'.
-+	 test -f "$ac_f" ||
-+	   case $ac_f in
-+	   [\\/$]*) false;;
-+	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-+	   esac ||
-+	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
-+      esac
-+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-+      as_fn_append ac_file_inputs " '$ac_f'"
-+    done
-+
-+    # Let's still pretend it is `configure' which instantiates (i.e., don't
-+    # use $as_me), people would be surprised to read:
-+    #    /* config.h.  Generated by config.status.  */
-+    configure_input='Generated from '`
-+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
-+	`' by configure.'
-+    if test x"$ac_file" != x-; then
-+      configure_input="$ac_file.  $configure_input"
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-+$as_echo "$as_me: creating $ac_file" >&6;}
-+    fi
-+    # Neutralize special characters interpreted by sed in replacement strings.
-+    case $configure_input in #(
-+    *\&* | *\|* | *\\* )
-+       ac_sed_conf_input=`$as_echo "$configure_input" |
-+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
-+    *) ac_sed_conf_input=$configure_input;;
-+    esac
-+
-+    case $ac_tag in
-+    *:-:* | *:-) cat >"$tmp/stdin" \
-+      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
-+    esac
-+    ;;
-+  esac
-+
-+  ac_dir=`$as_dirname -- "$ac_file" ||
-+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$ac_file" : 'X\(//\)[^/]' \| \
-+	 X"$ac_file" : 'X\(//\)$' \| \
-+	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-+$as_echo X"$ac_file" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-+  as_dir="$ac_dir"; as_fn_mkdir_p
-+  ac_builddir=.
-+
-+case "$ac_dir" in
-+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+*)
-+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-+  # A ".." for each directory in $ac_dir_suffix.
-+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-+  case $ac_top_builddir_sub in
-+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-+  esac ;;
-+esac
-+ac_abs_top_builddir=$ac_pwd
-+ac_abs_builddir=$ac_pwd$ac_dir_suffix
-+# for backward compatibility:
-+ac_top_builddir=$ac_top_build_prefix
-+
-+case $srcdir in
-+  .)  # We are building in place.
-+    ac_srcdir=.
-+    ac_top_srcdir=$ac_top_builddir_sub
-+    ac_abs_top_srcdir=$ac_pwd ;;
-+  [\\/]* | ?:[\\/]* )  # Absolute name.
-+    ac_srcdir=$srcdir$ac_dir_suffix;
-+    ac_top_srcdir=$srcdir
-+    ac_abs_top_srcdir=$srcdir ;;
-+  *) # Relative name.
-+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-+    ac_top_srcdir=$ac_top_build_prefix$srcdir
-+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-+esac
-+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-+
-+
-+  case $ac_mode in
-+  :F)
-+  #
-+  # CONFIG_FILE
-+  #
-+
-+  case $INSTALL in
-+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-+  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
-+  esac
-+  ac_MKDIR_P=$MKDIR_P
-+  case $MKDIR_P in
-+  [\\/$]* | ?:[\\/]* ) ;;
-+  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
-+  esac
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+# If the template does not know about datarootdir, expand it.
-+# FIXME: This hack should be removed a few years after 2.60.
-+ac_datarootdir_hack=; ac_datarootdir_seen=
-+ac_sed_dataroot='
-+/datarootdir/ {
-+  p
-+  q
-+}
-+/@datadir@/p
-+/@docdir@/p
-+/@infodir@/p
-+/@localedir@/p
-+/@mandir@/p'
-+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
-+*datarootdir*) ac_datarootdir_seen=yes;;
-+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+  ac_datarootdir_hack='
-+  s&@datadir@&$datadir&g
-+  s&@docdir@&$docdir&g
-+  s&@infodir@&$infodir&g
-+  s&@localedir@&$localedir&g
-+  s&@mandir@&$mandir&g
-+  s&\\\${datarootdir}&$datarootdir&g' ;;
-+esac
-+_ACEOF
-+
-+# Neutralize VPATH when `$srcdir' = `.'.
-+# Shell code in configure.ac might set extrasub.
-+# FIXME: do we really want to maintain this feature?
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+ac_sed_extra="$ac_vpsub
-+$extrasub
-+_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+:t
-+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-+s|@configure_input@|$ac_sed_conf_input|;t t
-+s&@top_builddir@&$ac_top_builddir_sub&;t t
-+s&@top_build_prefix@&$ac_top_build_prefix&;t t
-+s&@srcdir@&$ac_srcdir&;t t
-+s&@abs_srcdir@&$ac_abs_srcdir&;t t
-+s&@top_srcdir@&$ac_top_srcdir&;t t
-+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-+s&@builddir@&$ac_builddir&;t t
-+s&@abs_builddir@&$ac_abs_builddir&;t t
-+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-+s&@INSTALL@&$ac_INSTALL&;t t
-+s&@MKDIR_P@&$ac_MKDIR_P&;t t
-+$ac_datarootdir_hack
-+"
-+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" |
-+if $ac_cs_awk_getline; then
-+  $AWK -f "$tmp/subs.awk"
-+else
-+  $AWK -f "$tmp/subs.awk" | $SHELL
-+fi >$tmp/out \
-+  || as_fn_error "could not create $ac_file" "$LINENO" 5
-+
-+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-+  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-+which seems to be undefined.  Please make sure it is defined." >&5
-+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-+which seems to be undefined.  Please make sure it is defined." >&2;}
-+
-+  rm -f "$tmp/stdin"
-+  case $ac_file in
-+  -) cat "$tmp/out" && rm -f "$tmp/out";;
-+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
-+  esac \
-+  || as_fn_error "could not create $ac_file" "$LINENO" 5
-+ ;;
-+  :H)
-+  #
-+  # CONFIG_HEADER
-+  #
-+  if test x"$ac_file" != x-; then
-+    {
-+      $as_echo "/* $configure_input  */" \
-+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
-+    } >"$tmp/config.h" \
-+      || as_fn_error "could not create $ac_file" "$LINENO" 5
-+    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
-+$as_echo "$as_me: $ac_file is unchanged" >&6;}
-+    else
-+      rm -f "$ac_file"
-+      mv "$tmp/config.h" "$ac_file" \
-+	|| as_fn_error "could not create $ac_file" "$LINENO" 5
-+    fi
-+  else
-+    $as_echo "/* $configure_input  */" \
-+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-+      || as_fn_error "could not create -" "$LINENO" 5
-+  fi
-+# Compute "$ac_file"'s index in $config_headers.
-+_am_arg="$ac_file"
-+_am_stamp_count=1
-+for _am_header in $config_headers :; do
-+  case $_am_header in
-+    $_am_arg | $_am_arg:* )
-+      break ;;
-+    * )
-+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-+  esac
-+done
-+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
-+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$_am_arg" : 'X\(//\)[^/]' \| \
-+	 X"$_am_arg" : 'X\(//\)$' \| \
-+	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
-+$as_echo X"$_am_arg" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`/stamp-h$_am_stamp_count
-+ ;;
-+  
-+  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
-+$as_echo "$as_me: executing $ac_file commands" >&6;}
-+ ;;
-+  esac
-+
-+
-+  case $ac_file$ac_mode in
-+    "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
-+  # Autoconf 2.62 quotes --file arguments for eval, but not when files
-+  # are listed without --file.  Let's play safe and only enable the eval
-+  # if we detect the quoting.
-+  case $CONFIG_FILES in
-+  *\'*) eval set x "$CONFIG_FILES" ;;
-+  *)   set x $CONFIG_FILES ;;
-+  esac
-+  shift
-+  for mf
-+  do
-+    # 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.
-+    # We used to match only the files named `Makefile.in', but
-+    # some people rename them; so instead we look at the file content.
-+    # Grep'ing the first line is not enough: some people post-process
-+    # each Makefile.in and add a new line on top of each file to say so.
-+    # Grep'ing the whole file is not good either: AIX grep has a line
-+    # limit of 2048, but all sed's we know have understand at least 4000.
-+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-+      dirpart=`$as_dirname -- "$mf" ||
-+$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$mf" : 'X\(//\)[^/]' \| \
-+	 X"$mf" : 'X\(//\)$' \| \
-+	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-+$as_echo X"$mf" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-+    else
-+      continue
-+    fi
-+    # Extract the definition of DEPDIR, am__include, and am__quote
-+    # from the Makefile without running `make'.
-+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-+    test -z "$DEPDIR" && continue
-+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
-+    test -z "am__include" && continue
-+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-+    # When using ansi2knr, U may be empty or an underscore; expand it
-+    U=`sed -n 's/^U = //p' < "$mf"`
-+    # Find all dependency output files, they are included files with
-+    # $(DEPDIR) in their names.  We invoke sed twice because it is the
-+    # simplest approach to changing $(DEPDIR) to its actual value in the
-+    # expansion.
-+    for file in `sed -n "
-+      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-+      # Make sure the directory exists.
-+      test -f "$dirpart/$file" && continue
-+      fdir=`$as_dirname -- "$file" ||
-+$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$file" : 'X\(//\)[^/]' \| \
-+	 X"$file" : 'X\(//\)$' \| \
-+	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-+$as_echo X"$file" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-+      as_dir=$dirpart/$fdir; as_fn_mkdir_p
-+      # echo "creating $dirpart/$file"
-+      echo '# dummy' > "$dirpart/$file"
-+    done
-+  done
-+}
-+ ;;
-+    "libtool":C) 
-+    
-+    # See if we are running on zsh, and set the options which allow our
-+    # commands through without removal of \ escapes.
-+    if test -n "${ZSH_VERSION+set}" ; then
-+      setopt NO_GLOB_SUBST
-+    fi
-+
-+    cfgfile="${ofile}T"
-+    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
-+    $RM "$cfgfile"
-+
-+    cat <<_LT_EOF >> "$cfgfile"
-+#! $SHELL
-+
-+# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-+# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
-+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-+#
-+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-+#                 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-+#   Written by Gordon Matzigkeit, 1996
-+#
-+#   This file is part of GNU Libtool.
-+#
-+# GNU Libtool is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU General Public License as
-+# published by the Free Software Foundation; either version 2 of
-+# the License, or (at your option) any later version.
-+#
-+# As a special exception to the GNU General Public License,
-+# if you distribute this file as part of a program or library that
-+# is built using GNU Libtool, you may include this file under the
-+# same distribution terms that you use for the rest of that program.
-+#
-+# GNU Libtool is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with GNU Libtool; see the file COPYING.  If not, a copy
-+# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-+# obtained by writing to the Free Software Foundation, Inc.,
-+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+
-+
-+# The names of the tagged configurations supported by this script.
-+available_tags=""
-+
-+# ### BEGIN LIBTOOL CONFIG
-+
-+# Which release of libtool.m4 was used?
-+macro_version=$macro_version
-+macro_revision=$macro_revision
-+
-+# Whether or not to build shared libraries.
-+build_libtool_libs=$enable_shared
-+
-+# Whether or not to build static libraries.
-+build_old_libs=$enable_static
-+
-+# What type of objects to build.
-+pic_mode=$pic_mode
-+
-+# Whether or not to optimize for fast installation.
-+fast_install=$enable_fast_install
-+
-+# Shell to use when invoking shell scripts.
-+SHELL=$lt_SHELL
-+
-+# An echo program that protects backslashes.
-+ECHO=$lt_ECHO
-+
-+# The host system.
-+host_alias=$host_alias
-+host=$host
-+host_os=$host_os
-+
-+# The build system.
-+build_alias=$build_alias
-+build=$build
-+build_os=$build_os
-+
-+# A sed program that does not truncate output.
-+SED=$lt_SED
-+
-+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-+Xsed="\$SED -e 1s/^X//"
-+
-+# A grep program that handles long lines.
-+GREP=$lt_GREP
-+
-+# An ERE matcher.
-+EGREP=$lt_EGREP
-+
-+# A literal string matcher.
-+FGREP=$lt_FGREP
-+
-+# A BSD- or MS-compatible name lister.
-+NM=$lt_NM
-+
-+# Whether we need soft or hard links.
-+LN_S=$lt_LN_S
-+
-+# What is the maximum length of a command?
-+max_cmd_len=$max_cmd_len
-+
-+# Object file suffix (normally "o").
-+objext=$ac_objext
-+
-+# Executable file suffix (normally "").
-+exeext=$exeext
-+
-+# whether the shell understands "unset".
-+lt_unset=$lt_unset
-+
-+# turn spaces into newlines.
-+SP2NL=$lt_lt_SP2NL
-+
-+# turn newlines into spaces.
-+NL2SP=$lt_lt_NL2SP
-+
-+# An object symbol dumper.
-+OBJDUMP=$lt_OBJDUMP
-+
-+# Method to check whether dependent libraries are shared objects.
-+deplibs_check_method=$lt_deplibs_check_method
-+
-+# Command to use when deplibs_check_method == "file_magic".
-+file_magic_cmd=$lt_file_magic_cmd
-+
-+# The archiver.
-+AR=$lt_AR
-+AR_FLAGS=$lt_AR_FLAGS
-+
-+# A symbol stripping program.
-+STRIP=$lt_STRIP
-+
-+# Commands used to install an old-style archive.
-+RANLIB=$lt_RANLIB
-+old_postinstall_cmds=$lt_old_postinstall_cmds
-+old_postuninstall_cmds=$lt_old_postuninstall_cmds
-+
-+# Whether to use a lock for old archive extraction.
-+lock_old_archive_extraction=$lock_old_archive_extraction
-+
-+# A C compiler.
-+LTCC=$lt_CC
-+
-+# LTCC compiler flags.
-+LTCFLAGS=$lt_CFLAGS
-+
-+# Take the output of nm and produce a listing of raw symbols and C names.
-+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-+
-+# Transform the output of nm in a proper C declaration.
-+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-+
-+# Transform the output of nm in a C name address pair.
-+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-+
-+# Transform the output of nm in a C name address pair when lib prefix is needed.
-+global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
-+
-+# The name of the directory that contains temporary libtool files.
-+objdir=$objdir
-+
-+# Used to examine libraries when file_magic_cmd begins with "file".
-+MAGIC_CMD=$MAGIC_CMD
-+
-+# Must we lock files when doing compilation?
-+need_locks=$lt_need_locks
-+
-+# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
-+DSYMUTIL=$lt_DSYMUTIL
-+
-+# Tool to change global to local symbols on Mac OS X.
-+NMEDIT=$lt_NMEDIT
-+
-+# Tool to manipulate fat objects and archives on Mac OS X.
-+LIPO=$lt_LIPO
-+
-+# ldd/readelf like tool for Mach-O binaries on Mac OS X.
-+OTOOL=$lt_OTOOL
-+
-+# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
-+OTOOL64=$lt_OTOOL64
-+
-+# Old archive suffix (normally "a").
-+libext=$libext
-+
-+# Shared library suffix (normally ".so").
-+shrext_cmds=$lt_shrext_cmds
-+
-+# The commands to extract the exported symbol list from a shared archive.
-+extract_expsyms_cmds=$lt_extract_expsyms_cmds
-+
-+# Variables whose values should be saved in libtool wrapper scripts and
-+# restored at link time.
-+variables_saved_for_relink=$lt_variables_saved_for_relink
-+
-+# Do we need the "lib" prefix for modules?
-+need_lib_prefix=$need_lib_prefix
-+
-+# Do we need a version for libraries?
-+need_version=$need_version
-+
-+# Library versioning type.
-+version_type=$version_type
-+
-+# Shared library runtime path variable.
-+runpath_var=$runpath_var
-+
-+# Shared library path variable.
-+shlibpath_var=$shlibpath_var
-+
-+# Is shlibpath searched before the hard-coded library search path?
-+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-+
-+# Format of library name prefix.
-+libname_spec=$lt_libname_spec
-+
-+# List of archive names.  First name is the real one, the rest are links.
-+# The last name is the one that the linker finds with -lNAME
-+library_names_spec=$lt_library_names_spec
-+
-+# The coded name of the library, if different from the real name.
-+soname_spec=$lt_soname_spec
-+
-+# Permission mode override for installation of shared libraries.
-+install_override_mode=$lt_install_override_mode
-+
-+# Command to use after installation of a shared archive.
-+postinstall_cmds=$lt_postinstall_cmds
-+
-+# Command to use after uninstallation of a shared archive.
-+postuninstall_cmds=$lt_postuninstall_cmds
-+
-+# Commands used to finish a libtool library installation in a directory.
-+finish_cmds=$lt_finish_cmds
-+
-+# As "finish_cmds", except a single script fragment to be evaled but
-+# not shown.
-+finish_eval=$lt_finish_eval
-+
-+# Whether we should hardcode library paths into libraries.
-+hardcode_into_libs=$hardcode_into_libs
-+
-+# Compile-time system search path for libraries.
-+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-+
-+# Run-time system search path for libraries.
-+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-+
-+# Whether dlopen is supported.
-+dlopen_support=$enable_dlopen
-+
-+# Whether dlopen of programs is supported.
-+dlopen_self=$enable_dlopen_self
-+
-+# Whether dlopen of statically linked programs is supported.
-+dlopen_self_static=$enable_dlopen_self_static
-+
-+# Commands to strip libraries.
-+old_striplib=$lt_old_striplib
-+striplib=$lt_striplib
-+
-+
-+# The linker used to build libraries.
-+LD=$lt_LD
-+
-+# How to create reloadable object files.
-+reload_flag=$lt_reload_flag
-+reload_cmds=$lt_reload_cmds
-+
-+# Commands used to build an old-style archive.
-+old_archive_cmds=$lt_old_archive_cmds
-+
-+# A language specific compiler.
-+CC=$lt_compiler
-+
-+# Is the compiler the GNU compiler?
-+with_gcc=$GCC
-+
-+# Compiler flag to turn off builtin functions.
-+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
-+
-+# How to pass a linker flag through the compiler.
-+wl=$lt_lt_prog_compiler_wl
-+
-+# Additional compiler flags for building library objects.
-+pic_flag=$lt_lt_prog_compiler_pic
-+
-+# Compiler flag to prevent dynamic linking.
-+link_static_flag=$lt_lt_prog_compiler_static
-+
-+# Does compiler simultaneously support -c and -o options?
-+compiler_c_o=$lt_lt_cv_prog_compiler_c_o
-+
-+# Whether or not to add -lc for building shared libraries.
-+build_libtool_need_lc=$archive_cmds_need_lc
-+
-+# Whether or not to disallow shared libs when runtime libs are static.
-+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
-+
-+# Compiler flag to allow reflexive dlopens.
-+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
-+
-+# Compiler flag to generate shared objects directly from archives.
-+whole_archive_flag_spec=$lt_whole_archive_flag_spec
-+
-+# Whether the compiler copes with passing no objects directly.
-+compiler_needs_object=$lt_compiler_needs_object
-+
-+# Create an old-style archive from a shared archive.
-+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
-+
-+# Create a temporary old-style archive to link instead of a shared archive.
-+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
-+
-+# Commands used to build a shared archive.
-+archive_cmds=$lt_archive_cmds
-+archive_expsym_cmds=$lt_archive_expsym_cmds
-+
-+# Commands used to build a loadable module if different from building
-+# a shared archive.
-+module_cmds=$lt_module_cmds
-+module_expsym_cmds=$lt_module_expsym_cmds
-+
-+# Whether we are building with GNU ld or not.
-+with_gnu_ld=$lt_with_gnu_ld
-+
-+# Flag that allows shared libraries with undefined symbols to be built.
-+allow_undefined_flag=$lt_allow_undefined_flag
-+
-+# Flag that enforces no undefined symbols.
-+no_undefined_flag=$lt_no_undefined_flag
-+
-+# Flag to hardcode \$libdir into a binary during linking.
-+# This must work even if \$libdir does not exist
-+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
-+
-+# If ld is used when linking, flag to hardcode \$libdir into a binary
-+# during linking.  This must work even if \$libdir does not exist.
-+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
-+
-+# Whether we need a single "-rpath" flag with a separated argument.
-+hardcode_libdir_separator=$lt_hardcode_libdir_separator
-+
-+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
-+# DIR into the resulting binary.
-+hardcode_direct=$hardcode_direct
-+
-+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
-+# DIR into the resulting binary and the resulting library dependency is
-+# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
-+# library is relocated.
-+hardcode_direct_absolute=$hardcode_direct_absolute
-+
-+# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-+# into the resulting binary.
-+hardcode_minus_L=$hardcode_minus_L
-+
-+# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-+# into the resulting binary.
-+hardcode_shlibpath_var=$hardcode_shlibpath_var
-+
-+# Set to "yes" if building a shared library automatically hardcodes DIR
-+# into the library and all subsequent libraries and executables linked
-+# against it.
-+hardcode_automatic=$hardcode_automatic
-+
-+# Set to yes if linker adds runtime paths of dependent libraries
-+# to runtime path list.
-+inherit_rpath=$inherit_rpath
-+
-+# Whether libtool must link a program against all its dependency libraries.
-+link_all_deplibs=$link_all_deplibs
-+
-+# Fix the shell variable \$srcfile for the compiler.
-+fix_srcfile_path=$lt_fix_srcfile_path
-+
-+# Set to "yes" if exported symbols are required.
-+always_export_symbols=$always_export_symbols
-+
-+# The commands to list exported symbols.
-+export_symbols_cmds=$lt_export_symbols_cmds
-+
-+# Symbols that should not be listed in the preloaded symbols.
-+exclude_expsyms=$lt_exclude_expsyms
-+
-+# Symbols that must always be exported.
-+include_expsyms=$lt_include_expsyms
-+
-+# Commands necessary for linking programs (against libraries) with templates.
-+prelink_cmds=$lt_prelink_cmds
-+
-+# Specify filename containing input files.
-+file_list_spec=$lt_file_list_spec
-+
-+# How to hardcode a shared library path into an executable.
-+hardcode_action=$hardcode_action
-+
-+# ### END LIBTOOL CONFIG
-+
-+_LT_EOF
-+
-+  case $host_os in
-+  aix3*)
-+    cat <<\_LT_EOF >> "$cfgfile"
-+# AIX sometimes has problems with the GCC collect2 program.  For some
-+# reason, if we set the COLLECT_NAMES environment variable, the problems
-+# vanish in a puff of smoke.
-+if test "X${COLLECT_NAMES+set}" != Xset; then
-+  COLLECT_NAMES=
-+  export COLLECT_NAMES
-+fi
-+_LT_EOF
-+    ;;
-+  esac
-+
-+  
-+ltmain="$ac_aux_dir/ltmain.sh"
-+
-+
-+  # We use sed instead of cat because bash on DJGPP gets confused if
-+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-+  # text mode, it properly converts lines to CR/LF.  This bash problem
-+  # is reportedly fixed, but why not run on old versions too?
-+  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
-+    || (rm -f "$cfgfile"; exit 1)
-+
-+  case $xsi_shell in
-+  yes)
-+    cat << \_LT_EOF >> "$cfgfile"
-+
-+# func_dirname file append nondir_replacement
-+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-+# otherwise set result to NONDIR_REPLACEMENT.
-+func_dirname ()
-+{
-+  case ${1} in
-+    */*) func_dirname_result="${1%/*}${2}" ;;
-+    *  ) func_dirname_result="${3}" ;;
-+  esac
-+}
-+
-+# func_basename file
-+func_basename ()
-+{
-+  func_basename_result="${1##*/}"
-+}
-+
-+# func_dirname_and_basename file append nondir_replacement
-+# perform func_basename and func_dirname in a single function
-+# call:
-+#   dirname:  Compute the dirname of FILE.  If nonempty,
-+#             add APPEND to the result, otherwise set result
-+#             to NONDIR_REPLACEMENT.
-+#             value returned in "$func_dirname_result"
-+#   basename: Compute filename of FILE.
-+#             value retuned in "$func_basename_result"
-+# Implementation must be kept synchronized with func_dirname
-+# and func_basename. For efficiency, we do not delegate to
-+# those functions but instead duplicate the functionality here.
-+func_dirname_and_basename ()
-+{
-+  case ${1} in
-+    */*) func_dirname_result="${1%/*}${2}" ;;
-+    *  ) func_dirname_result="${3}" ;;
-+  esac
-+  func_basename_result="${1##*/}"
-+}
-+
-+# func_stripname prefix suffix name
-+# strip PREFIX and SUFFIX off of NAME.
-+# PREFIX and SUFFIX must not contain globbing or regex special
-+# characters, hashes, percent signs, but SUFFIX may contain a leading
-+# dot (in which case that matches only a dot).
-+func_stripname ()
-+{
-+  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
-+  # positional parameters, so assign one to ordinary parameter first.
-+  func_stripname_result=${3}
-+  func_stripname_result=${func_stripname_result#"${1}"}
-+  func_stripname_result=${func_stripname_result%"${2}"}
-+}
-+
-+# func_opt_split
-+func_opt_split ()
-+{
-+  func_opt_split_opt=${1%%=*}
-+  func_opt_split_arg=${1#*=}
-+}
-+
-+# func_lo2o object
-+func_lo2o ()
-+{
-+  case ${1} in
-+    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
-+    *)    func_lo2o_result=${1} ;;
-+  esac
-+}
-+
-+# func_xform libobj-or-source
-+func_xform ()
-+{
-+  func_xform_result=${1%.*}.lo
-+}
-+
-+# func_arith arithmetic-term...
-+func_arith ()
-+{
-+  func_arith_result=$(( $* ))
-+}
-+
-+# func_len string
-+# STRING may not start with a hyphen.
-+func_len ()
-+{
-+  func_len_result=${#1}
-+}
-+
-+_LT_EOF
-+    ;;
-+  *) # Bourne compatible functions.
-+    cat << \_LT_EOF >> "$cfgfile"
-+
-+# func_dirname file append nondir_replacement
-+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-+# otherwise set result to NONDIR_REPLACEMENT.
-+func_dirname ()
-+{
-+  # Extract subdirectory from the argument.
-+  func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
-+  if test "X$func_dirname_result" = "X${1}"; then
-+    func_dirname_result="${3}"
-+  else
-+    func_dirname_result="$func_dirname_result${2}"
-+  fi
-+}
-+
-+# func_basename file
-+func_basename ()
-+{
-+  func_basename_result=`$ECHO "${1}" | $SED "$basename"`
-+}
-+
-+
-+# func_stripname prefix suffix name
-+# strip PREFIX and SUFFIX off of NAME.
-+# PREFIX and SUFFIX must not contain globbing or regex special
-+# characters, hashes, percent signs, but SUFFIX may contain a leading
-+# dot (in which case that matches only a dot).
-+# func_strip_suffix prefix name
-+func_stripname ()
-+{
-+  case ${2} in
-+    .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
-+    *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
-+  esac
-+}
-+
-+# sed scripts:
-+my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
-+my_sed_long_arg='1s/^-[^=]*=//'
-+
-+# func_opt_split
-+func_opt_split ()
-+{
-+  func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
-+  func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
-+}
-+
-+# func_lo2o object
-+func_lo2o ()
-+{
-+  func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
-+}
-+
-+# func_xform libobj-or-source
-+func_xform ()
-+{
-+  func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
-+}
-+
-+# func_arith arithmetic-term...
-+func_arith ()
-+{
-+  func_arith_result=`expr "$@"`
-+}
-+
-+# func_len string
-+# STRING may not start with a hyphen.
-+func_len ()
-+{
-+  func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
-+}
-+
-+_LT_EOF
-+esac
-+
-+case $lt_shell_append in
-+  yes)
-+    cat << \_LT_EOF >> "$cfgfile"
-+
-+# func_append var value
-+# Append VALUE to the end of shell variable VAR.
-+func_append ()
-+{
-+  eval "$1+=\$2"
-+}
-+_LT_EOF
-+    ;;
-+  *)
-+    cat << \_LT_EOF >> "$cfgfile"
-+
-+# func_append var value
-+# Append VALUE to the end of shell variable VAR.
-+func_append ()
-+{
-+  eval "$1=\$$1\$2"
-+}
-+
-+_LT_EOF
-+    ;;
-+  esac
-+
-+
-+  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
-+    || (rm -f "$cfgfile"; exit 1)
-+
-+  mv -f "$cfgfile" "$ofile" ||
-+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-+  chmod +x "$ofile"
-+
-+ ;;
-+    "default-1":C) 
-+    for ac_file in $CONFIG_FILES; do
-+      # Support "outfile[:infile[:infile...]]"
-+      case "$ac_file" in
-+        *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-+      esac
-+      # PO directories have a Makefile.in generated from Makefile.in.in.
-+      case "$ac_file" in */Makefile.in)
-+        # Adjust a relative srcdir.
-+        ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-+        ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
-+        ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
-+        # In autoconf-2.13 it is called $ac_given_srcdir.
-+        # In autoconf-2.50 it is called $srcdir.
-+        test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
-+        case "$ac_given_srcdir" in
-+          .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
-+          /*) top_srcdir="$ac_given_srcdir" ;;
-+          *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
-+        esac
-+        if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
-+          rm -f "$ac_dir/POTFILES"
-+          test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
-+          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
-+          POMAKEFILEDEPS="POTFILES.in"
-+          # ALL_LINGUAS, POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES depend
-+          # on $ac_dir but don't depend on user-specified configuration
-+          # parameters.
-+          if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
-+            # The LINGUAS file contains the set of available languages.
-+            if test -n "$OBSOLETE_ALL_LINGUAS"; then
-+              test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
-+            fi
-+            ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-+            # Hide the ALL_LINGUAS assigment from automake.
-+            eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
-+            POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
-+          else
-+            # The set of available languages was given in configure.in.
-+            eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
-+          fi
-+          case "$ac_given_srcdir" in
-+            .) srcdirpre= ;;
-+            *) srcdirpre='$(srcdir)/' ;;
-+          esac
-+          POFILES=
-+          GMOFILES=
-+          UPDATEPOFILES=
-+          DUMMYPOFILES=
-+          for lang in $ALL_LINGUAS; do
-+            POFILES="$POFILES $srcdirpre$lang.po"
-+            GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
-+            UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
-+            DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
-+          done
-+          # CATALOGS depends on both $ac_dir and the user's LINGUAS
-+          # environment variable.
-+          INST_LINGUAS=
-+          if test -n "$ALL_LINGUAS"; then
-+            for presentlang in $ALL_LINGUAS; do
-+              useit=no
-+              if test "%UNSET%" != "$LINGUAS"; then
-+                desiredlanguages="$LINGUAS"
-+              else
-+                desiredlanguages="$ALL_LINGUAS"
-+              fi
-+              for desiredlang in $desiredlanguages; do
-+                # Use the presentlang catalog if desiredlang is
-+                #   a. equal to presentlang, or
-+                #   b. a variant of presentlang (because in this case,
-+                #      presentlang can be used as a fallback for messages
-+                #      which are not translated in the desiredlang catalog).
-+                case "$desiredlang" in
-+                  "$presentlang"*) useit=yes;;
-+                esac
-+              done
-+              if test $useit = yes; then
-+                INST_LINGUAS="$INST_LINGUAS $presentlang"
-+              fi
-+            done
-+          fi
-+          CATALOGS=
-+          if test -n "$INST_LINGUAS"; then
-+            for lang in $INST_LINGUAS; do
-+              CATALOGS="$CATALOGS $lang.gmo"
-+            done
-+          fi
-+          test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
-+          sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
-+          for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
-+            if test -f "$f"; then
-+              case "$f" in
-+                *.orig | *.bak | *~) ;;
-+                *) cat "$f" >> "$ac_dir/Makefile" ;;
-+              esac
-+            fi
-+          done
-+        fi
-+        ;;
-+      esac
-+    done ;;
-+
-+  esac
-+done # for ac_tag
-+
-+
-+as_fn_exit 0
-+_ACEOF
-+ac_clean_files=$ac_clean_files_save
-+
-+test $ac_write_fail = 0 ||
-+  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
-+
-+
-+# configure is writing to config.log, and then calls config.status.
-+# config.status does its own redirection, appending to config.log.
-+# Unfortunately, on DOS this fails, as config.log is still kept open
-+# by configure, so config.status won't be able to write to it; its
-+# output is simply discarded.  So we exec the FD to /dev/null,
-+# effectively closing config.log, so it can be properly (re)opened and
-+# appended to by config.status.  When coming back to configure, we
-+# need to make the FD available again.
-+if test "$no_create" != yes; then
-+  ac_cs_success=:
-+  ac_config_status_args=
-+  test "$silent" = yes &&
-+    ac_config_status_args="$ac_config_status_args --quiet"
-+  exec 5>/dev/null
-+  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-+  exec 5>>config.log
-+  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-+  # would make configure fail if this is the last instruction.
-+  $ac_cs_success || as_fn_exit $?
-+fi
-+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
-+fi
-+
-diff -Nur binutils-2.21.orig/ld/autom4te.cache/requests binutils-2.21/ld/autom4te.cache/requests
---- binutils-2.21.orig/ld/autom4te.cache/requests	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.21/ld/autom4te.cache/requests	2011-08-28 14:56:22.487981405 +0200
-@@ -0,0 +1,68 @@
-+# This file was generated.
-+# It contains the lists of macros which have been traced.
-+# It can be safely removed.
-+
-+@request = (
-+             bless( [
-+                      '0',
-+                      1,
-+                      [
-+                        '/usr/share/autoconf2.64'
-+                      ],
-+                      [
-+                        '/usr/share/autoconf2.64/autoconf/autoconf.m4f',
-+                        'aclocal.m4',
-+                        'configure.in'
-+                      ],
-+                      {
-+                        '_LT_AC_TAGCONFIG' => 1,
-+                        'AM_PROG_F77_C_O' => 1,
-+                        'AC_INIT' => 1,
-+                        'm4_pattern_forbid' => 1,
-+                        '_AM_COND_IF' => 1,
-+                        'AC_CANONICAL_TARGET' => 1,
-+                        'AC_SUBST' => 1,
-+                        'AC_CONFIG_LIBOBJ_DIR' => 1,
-+                        'AC_FC_SRCEXT' => 1,
-+                        'AC_CANONICAL_HOST' => 1,
-+                        'AC_PROG_LIBTOOL' => 1,
-+                        'AM_INIT_AUTOMAKE' => 1,
-+                        'AC_CONFIG_SUBDIRS' => 1,
-+                        'AM_AUTOMAKE_VERSION' => 1,
-+                        'LT_CONFIG_LTDL_DIR' => 1,
-+                        'AC_REQUIRE_AUX_FILE' => 1,
-+                        'AC_CONFIG_LINKS' => 1,
-+                        'm4_sinclude' => 1,
-+                        'LT_SUPPORTED_TAG' => 1,
-+                        'AM_MAINTAINER_MODE' => 1,
-+                        'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
-+                        '_m4_warn' => 1,
-+                        'AM_PROG_CXX_C_O' => 1,
-+                        '_AM_COND_ENDIF' => 1,
-+                        'AM_ENABLE_MULTILIB' => 1,
-+                        'AM_SILENT_RULES' => 1,
-+                        'AC_CONFIG_FILES' => 1,
-+                        'include' => 1,
-+                        'LT_INIT' => 1,
-+                        'AM_GNU_GETTEXT' => 1,
-+                        'AC_LIBSOURCE' => 1,
-+                        'AM_PROG_FC_C_O' => 1,
-+                        'AC_CANONICAL_BUILD' => 1,
-+                        'AC_FC_FREEFORM' => 1,
-+                        'AH_OUTPUT' => 1,
-+                        '_AM_SUBST_NOTMAKE' => 1,
-+                        'AC_CONFIG_AUX_DIR' => 1,
-+                        'sinclude' => 1,
-+                        'm4_pattern_allow' => 1,
-+                        'AM_PROG_CC_C_O' => 1,
-+                        'AC_CANONICAL_SYSTEM' => 1,
-+                        'AM_CONDITIONAL' => 1,
-+                        'AC_CONFIG_HEADERS' => 1,
-+                        'AC_DEFINE_TRACE_LITERAL' => 1,
-+                        'm4_include' => 1,
-+                        '_AM_COND_ELSE' => 1,
-+                        'AC_SUBST_TRACE' => 1
-+                      }
-+                    ], 'Autom4te::Request' )
-+           );
-+
-diff -Nur binutils-2.21.orig/ld/autom4te.cache/traces.0 binutils-2.21/ld/autom4te.cache/traces.0
---- binutils-2.21.orig/ld/autom4te.cache/traces.0	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.21/ld/autom4te.cache/traces.0	2011-08-28 14:56:22.547980166 +0200
-@@ -0,0 +1,912 @@
-+m4trace:aclocal.m4:992: -1- m4_include([../bfd/acinclude.m4])
-+m4trace:../bfd/acinclude.m4:1: -1- sinclude([../config/zlib.m4])
-+m4trace:aclocal.m4:993: -1- m4_include([../bfd/warning.m4])
-+m4trace:aclocal.m4:994: -1- m4_include([../config/acx.m4])
-+m4trace:aclocal.m4:995: -1- m4_include([../config/depstand.m4])
-+m4trace:aclocal.m4:996: -1- m4_include([../config/gettext-sister.m4])
-+m4trace:aclocal.m4:997: -1- m4_include([../config/largefile.m4])
-+m4trace:aclocal.m4:998: -1- m4_include([../config/lead-dot.m4])
-+m4trace:aclocal.m4:999: -1- m4_include([../config/nls.m4])
-+m4trace:aclocal.m4:1000: -1- m4_include([../config/override.m4])
-+m4trace:aclocal.m4:1001: -1- m4_include([../config/plugins.m4])
-+m4trace:aclocal.m4:1002: -1- m4_include([../config/po.m4])
-+m4trace:aclocal.m4:1003: -1- m4_include([../config/progtest.m4])
-+m4trace:aclocal.m4:1004: -1- m4_include([../libtool.m4])
-+m4trace:aclocal.m4:1005: -1- m4_include([../ltoptions.m4])
-+m4trace:aclocal.m4:1006: -1- m4_include([../ltsugar.m4])
-+m4trace:aclocal.m4:1007: -1- m4_include([../ltversion.m4])
-+m4trace:aclocal.m4:1008: -1- m4_include([../lt~obsolete.m4])
-+m4trace:configure.in:4: -1- AC_INIT
-+m4trace:configure.in:4: -1- m4_pattern_forbid([^_?A[CHUM]_])
-+m4trace:configure.in:4: -1- m4_pattern_forbid([_AC_])
-+m4trace:configure.in:4: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS'])
-+m4trace:configure.in:4: -1- m4_pattern_allow([^AS_FLAGS$])
-+m4trace:configure.in:4: -1- m4_pattern_forbid([^_?m4_])
-+m4trace:configure.in:4: -1- m4_pattern_forbid([^dnl$])
-+m4trace:configure.in:4: -1- m4_pattern_forbid([^_?AS_])
-+m4trace:configure.in:4: -1- AC_SUBST([SHELL])
-+m4trace:configure.in:4: -1- AC_SUBST_TRACE([SHELL])
-+m4trace:configure.in:4: -1- m4_pattern_allow([^SHELL$])
-+m4trace:configure.in:4: -1- AC_SUBST([PATH_SEPARATOR])
-+m4trace:configure.in:4: -1- AC_SUBST_TRACE([PATH_SEPARATOR])
-+m4trace:configure.in:4: -1- m4_pattern_allow([^PATH_SEPARATOR$])
-+m4trace:configure.in:4: -1- AC_SUBST([PACKAGE_NAME], [m4_ifdef([AC_PACKAGE_NAME],      ['AC_PACKAGE_NAME'])])
-+m4trace:configure.in:4: -1- AC_SUBST_TRACE([PACKAGE_NAME])
-+m4trace:configure.in:4: -1- m4_pattern_allow([^PACKAGE_NAME$])
-+m4trace:configure.in:4: -1- AC_SUBST([PACKAGE_TARNAME], [m4_ifdef([AC_PACKAGE_TARNAME],   ['AC_PACKAGE_TARNAME'])])
-+m4trace:configure.in:4: -1- AC_SUBST_TRACE([PACKAGE_TARNAME])
-+m4trace:configure.in:4: -1- m4_pattern_allow([^PACKAGE_TARNAME$])
-+m4trace:configure.in:4: -1- AC_SUBST([PACKAGE_VERSION], [m4_ifdef([AC_PACKAGE_VERSION],   ['AC_PACKAGE_VERSION'])])
-+m4trace:configure.in:4: -1- AC_SUBST_TRACE([PACKAGE_VERSION])
-+m4trace:configure.in:4: -1- m4_pattern_allow([^PACKAGE_VERSION$])
-+m4trace:configure.in:4: -1- AC_SUBST([PACKAGE_STRING], [m4_ifdef([AC_PACKAGE_STRING],    ['AC_PACKAGE_STRING'])])
-+m4trace:configure.in:4: -1- AC_SUBST_TRACE([PACKAGE_STRING])
-+m4trace:configure.in:4: -1- m4_pattern_allow([^PACKAGE_STRING$])
-+m4trace:configure.in:4: -1- AC_SUBST([PACKAGE_BUGREPORT], [m4_ifdef([AC_PACKAGE_BUGREPORT], ['AC_PACKAGE_BUGREPORT'])])
-+m4trace:configure.in:4: -1- AC_SUBST_TRACE([PACKAGE_BUGREPORT])
-+m4trace:configure.in:4: -1- m4_pattern_allow([^PACKAGE_BUGREPORT$])
-+m4trace:configure.in:4: -1- AC_SUBST([PACKAGE_URL], [m4_ifdef([AC_PACKAGE_URL],       ['AC_PACKAGE_URL'])])
-+m4trace:configure.in:4: -1- AC_SUBST_TRACE([PACKAGE_URL])
-+m4trace:configure.in:4: -1- m4_pattern_allow([^PACKAGE_URL$])
-+m4trace:configure.in:4: -1- AC_SUBST([exec_prefix], [NONE])
-+m4trace:configure.in:4: -1- AC_SUBST_TRACE([exec_prefix])
-+m4trace:configure.in:4: -1- m4_pattern_allow([^exec_prefix$])
-+m4trace:configure.in:4: -1- AC_SUBST([prefix], [NONE])
-+m4trace:configure.in:4: -1- AC_SUBST_TRACE([prefix])
-+m4trace:configure.in:4: -1- m4_pattern_allow([^prefix$])
-+m4trace:configure.in:4: -1- AC_SUBST([program_transform_name], [s,x,x,])
-+m4trace:configure.in:4: -1- AC_SUBST_TRACE([program_transform_name])
-+m4trace:configure.in:4: -1- m4_pattern_allow([^program_transform_name$])
-+m4trace:configure.in:4: -1- AC_SUBST([bindir], ['${exec_prefix}/bin'])
-+m4trace:configure.in:4: -1- AC_SUBST_TRACE([bindir])
-+m4trace:configure.in:4: -1- m4_pattern_allow([^bindir$])
-+m4trace:configure.in:4: -1- AC_SUBST([sbindir], ['${exec_prefix}/sbin'])
-+m4trace:configure.in:4: -1- AC_SUBST_TRACE([sbindir])
-+m4trace:configure.in:4: -1- m4_pattern_allow([^sbindir$])
-+m4trace:configure.in:4: -1- AC_SUBST([libexecdir], ['${exec_prefix}/libexec'])
-+m4trace:configure.in:4: -1- AC_SUBST_TRACE([libexecdir])
-+m4trace:configure.in:4: -1- m4_pattern_allow([^libexecdir$])
-+m4trace:configure.in:4: -1- AC_SUBST([datarootdir], ['${prefix}/share'])
-+m4trace:configure.in:4: -1- AC_SUBST_TRACE([datarootdir])
-+m4trace:configure.in:4: -1- m4_pattern_allow([^datarootdir$])
-+m4trace:configure.in:4: -1- AC_SUBST([datadir], ['${datarootdir}'])
-+m4trace:configure.in:4: -1- AC_SUBST_TRACE([datadir])
-+m4trace:configure.in:4: -1- m4_pattern_allow([^datadir$])
-+m4trace:configure.in:4: -1- AC_SUBST([sysconfdir], ['${prefix}/etc'])
-+m4trace:configure.in:4: -1- AC_SUBST_TRACE([sysconfdir])
-+m4trace:configure.in:4: -1- m4_pattern_allow([^sysconfdir$])
-+m4trace:configure.in:4: -1- AC_SUBST([sharedstatedir], ['${prefix}/com'])
-+m4trace:configure.in:4: -1- AC_SUBST_TRACE([sharedstatedir])
-+m4trace:configure.in:4: -1- m4_pattern_allow([^sharedstatedir$])
-+m4trace:configure.in:4: -1- AC_SUBST([localstatedir], ['${prefix}/var'])
-+m4trace:configure.in:4: -1- AC_SUBST_TRACE([localstatedir])
-+m4trace:configure.in:4: -1- m4_pattern_allow([^localstatedir$])
-+m4trace:configure.in:4: -1- AC_SUBST([includedir], ['${prefix}/include'])
-+m4trace:configure.in:4: -1- AC_SUBST_TRACE([includedir])
-+m4trace:configure.in:4: -1- m4_pattern_allow([^includedir$])
-+m4trace:configure.in:4: -1- AC_SUBST([oldincludedir], ['/usr/include'])
-+m4trace:configure.in:4: -1- AC_SUBST_TRACE([oldincludedir])
-+m4trace:configure.in:4: -1- m4_pattern_allow([^oldincludedir$])
-+m4trace:configure.in:4: -1- AC_SUBST([docdir], [m4_ifset([AC_PACKAGE_TARNAME],
-+				     ['${datarootdir}/doc/${PACKAGE_TARNAME}'],
-+				     ['${datarootdir}/doc/${PACKAGE}'])])
-+m4trace:configure.in:4: -1- AC_SUBST_TRACE([docdir])
-+m4trace:configure.in:4: -1- m4_pattern_allow([^docdir$])
-+m4trace:configure.in:4: -1- AC_SUBST([infodir], ['${datarootdir}/info'])
-+m4trace:configure.in:4: -1- AC_SUBST_TRACE([infodir])
-+m4trace:configure.in:4: -1- m4_pattern_allow([^infodir$])
-+m4trace:configure.in:4: -1- AC_SUBST([htmldir], ['${docdir}'])
-+m4trace:configure.in:4: -1- AC_SUBST_TRACE([htmldir])
-+m4trace:configure.in:4: -1- m4_pattern_allow([^htmldir$])
-+m4trace:configure.in:4: -1- AC_SUBST([dvidir], ['${docdir}'])
-+m4trace:configure.in:4: -1- AC_SUBST_TRACE([dvidir])
-+m4trace:configure.in:4: -1- m4_pattern_allow([^dvidir$])
-+m4trace:configure.in:4: -1- AC_SUBST([pdfdir], ['${docdir}'])
-+m4trace:configure.in:4: -1- AC_SUBST_TRACE([pdfdir])
-+m4trace:configure.in:4: -1- m4_pattern_allow([^pdfdir$])
-+m4trace:configure.in:4: -1- AC_SUBST([psdir], ['${docdir}'])
-+m4trace:configure.in:4: -1- AC_SUBST_TRACE([psdir])
-+m4trace:configure.in:4: -1- m4_pattern_allow([^psdir$])
-+m4trace:configure.in:4: -1- AC_SUBST([libdir], ['${exec_prefix}/lib'])
-+m4trace:configure.in:4: -1- AC_SUBST_TRACE([libdir])
-+m4trace:configure.in:4: -1- m4_pattern_allow([^libdir$])
-+m4trace:configure.in:4: -1- AC_SUBST([localedir], ['${datarootdir}/locale'])
-+m4trace:configure.in:4: -1- AC_SUBST_TRACE([localedir])
-+m4trace:configure.in:4: -1- m4_pattern_allow([^localedir$])
-+m4trace:configure.in:4: -1- AC_SUBST([mandir], ['${datarootdir}/man'])
-+m4trace:configure.in:4: -1- AC_SUBST_TRACE([mandir])
-+m4trace:configure.in:4: -1- m4_pattern_allow([^mandir$])
-+m4trace:configure.in:4: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_NAME])
-+m4trace:configure.in:4: -1- m4_pattern_allow([^PACKAGE_NAME$])
-+m4trace:configure.in:4: -1- AH_OUTPUT([PACKAGE_NAME], [/* Define to the full name of this package. */
-+@%:@undef PACKAGE_NAME])
-+m4trace:configure.in:4: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_TARNAME])
-+m4trace:configure.in:4: -1- m4_pattern_allow([^PACKAGE_TARNAME$])
-+m4trace:configure.in:4: -1- AH_OUTPUT([PACKAGE_TARNAME], [/* Define to the one symbol short name of this package. */
-+@%:@undef PACKAGE_TARNAME])
-+m4trace:configure.in:4: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_VERSION])
-+m4trace:configure.in:4: -1- m4_pattern_allow([^PACKAGE_VERSION$])
-+m4trace:configure.in:4: -1- AH_OUTPUT([PACKAGE_VERSION], [/* Define to the version of this package. */
-+@%:@undef PACKAGE_VERSION])
-+m4trace:configure.in:4: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_STRING])
-+m4trace:configure.in:4: -1- m4_pattern_allow([^PACKAGE_STRING$])
-+m4trace:configure.in:4: -1- AH_OUTPUT([PACKAGE_STRING], [/* Define to the full name and version of this package. */
-+@%:@undef PACKAGE_STRING])
-+m4trace:configure.in:4: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_BUGREPORT])
-+m4trace:configure.in:4: -1- m4_pattern_allow([^PACKAGE_BUGREPORT$])
-+m4trace:configure.in:4: -1- AH_OUTPUT([PACKAGE_BUGREPORT], [/* Define to the address where bug reports for this package should be sent. */
-+@%:@undef PACKAGE_BUGREPORT])
-+m4trace:configure.in:4: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_URL])
-+m4trace:configure.in:4: -1- m4_pattern_allow([^PACKAGE_URL$])
-+m4trace:configure.in:4: -1- AH_OUTPUT([PACKAGE_URL], [/* Define to the home page for this package. */
-+@%:@undef PACKAGE_URL])
-+m4trace:configure.in:4: -1- AC_SUBST([DEFS])
-+m4trace:configure.in:4: -1- AC_SUBST_TRACE([DEFS])
-+m4trace:configure.in:4: -1- m4_pattern_allow([^DEFS$])
-+m4trace:configure.in:4: -1- AC_SUBST([ECHO_C])
-+m4trace:configure.in:4: -1- AC_SUBST_TRACE([ECHO_C])
-+m4trace:configure.in:4: -1- m4_pattern_allow([^ECHO_C$])
-+m4trace:configure.in:4: -1- AC_SUBST([ECHO_N])
-+m4trace:configure.in:4: -1- AC_SUBST_TRACE([ECHO_N])
-+m4trace:configure.in:4: -1- m4_pattern_allow([^ECHO_N$])
-+m4trace:configure.in:4: -1- AC_SUBST([ECHO_T])
-+m4trace:configure.in:4: -1- AC_SUBST_TRACE([ECHO_T])
-+m4trace:configure.in:4: -1- m4_pattern_allow([^ECHO_T$])
-+m4trace:configure.in:4: -1- AC_SUBST([LIBS])
-+m4trace:configure.in:4: -1- AC_SUBST_TRACE([LIBS])
-+m4trace:configure.in:4: -1- m4_pattern_allow([^LIBS$])
-+m4trace:configure.in:4: -1- AC_SUBST([build_alias])
-+m4trace:configure.in:4: -1- AC_SUBST_TRACE([build_alias])
-+m4trace:configure.in:4: -1- m4_pattern_allow([^build_alias$])
-+m4trace:configure.in:4: -1- AC_SUBST([host_alias])
-+m4trace:configure.in:4: -1- AC_SUBST_TRACE([host_alias])
-+m4trace:configure.in:4: -1- m4_pattern_allow([^host_alias$])
-+m4trace:configure.in:4: -1- AC_SUBST([target_alias])
-+m4trace:configure.in:4: -1- AC_SUBST_TRACE([target_alias])
-+m4trace:configure.in:4: -1- m4_pattern_allow([^target_alias$])
-+m4trace:configure.in:7: -1- AC_CANONICAL_TARGET
-+m4trace:configure.in:7: -1- AC_CANONICAL_HOST
-+m4trace:configure.in:7: -1- AC_CANONICAL_BUILD
-+m4trace:configure.in:7: -1- AC_REQUIRE_AUX_FILE([config.sub])
-+m4trace:configure.in:7: -1- AC_REQUIRE_AUX_FILE([config.guess])
-+m4trace:configure.in:7: -1- AC_SUBST([build], [$ac_cv_build])
-+m4trace:configure.in:7: -1- AC_SUBST_TRACE([build])
-+m4trace:configure.in:7: -1- m4_pattern_allow([^build$])
-+m4trace:configure.in:7: -1- AC_SUBST([build_cpu], [$[1]])
-+m4trace:configure.in:7: -1- AC_SUBST_TRACE([build_cpu])
-+m4trace:configure.in:7: -1- m4_pattern_allow([^build_cpu$])
-+m4trace:configure.in:7: -1- AC_SUBST([build_vendor], [$[2]])
-+m4trace:configure.in:7: -1- AC_SUBST_TRACE([build_vendor])
-+m4trace:configure.in:7: -1- m4_pattern_allow([^build_vendor$])
-+m4trace:configure.in:7: -1- AC_SUBST([build_os])
-+m4trace:configure.in:7: -1- AC_SUBST_TRACE([build_os])
-+m4trace:configure.in:7: -1- m4_pattern_allow([^build_os$])
-+m4trace:configure.in:7: -1- AC_SUBST([host], [$ac_cv_host])
-+m4trace:configure.in:7: -1- AC_SUBST_TRACE([host])
-+m4trace:configure.in:7: -1- m4_pattern_allow([^host$])
-+m4trace:configure.in:7: -1- AC_SUBST([host_cpu], [$[1]])
-+m4trace:configure.in:7: -1- AC_SUBST_TRACE([host_cpu])
-+m4trace:configure.in:7: -1- m4_pattern_allow([^host_cpu$])
-+m4trace:configure.in:7: -1- AC_SUBST([host_vendor], [$[2]])
-+m4trace:configure.in:7: -1- AC_SUBST_TRACE([host_vendor])
-+m4trace:configure.in:7: -1- m4_pattern_allow([^host_vendor$])
-+m4trace:configure.in:7: -1- AC_SUBST([host_os])
-+m4trace:configure.in:7: -1- AC_SUBST_TRACE([host_os])
-+m4trace:configure.in:7: -1- m4_pattern_allow([^host_os$])
-+m4trace:configure.in:7: -1- AC_SUBST([target], [$ac_cv_target])
-+m4trace:configure.in:7: -1- AC_SUBST_TRACE([target])
-+m4trace:configure.in:7: -1- m4_pattern_allow([^target$])
-+m4trace:configure.in:7: -1- AC_SUBST([target_cpu], [$[1]])
-+m4trace:configure.in:7: -1- AC_SUBST_TRACE([target_cpu])
-+m4trace:configure.in:7: -1- m4_pattern_allow([^target_cpu$])
-+m4trace:configure.in:7: -1- AC_SUBST([target_vendor], [$[2]])
-+m4trace:configure.in:7: -1- AC_SUBST_TRACE([target_vendor])
-+m4trace:configure.in:7: -1- m4_pattern_allow([^target_vendor$])
-+m4trace:configure.in:7: -1- AC_SUBST([target_os])
-+m4trace:configure.in:7: -1- AC_SUBST_TRACE([target_os])
-+m4trace:configure.in:7: -1- m4_pattern_allow([^target_os$])
-+m4trace:configure.in:8: -1- _m4_warn([obsolete], [The macro `AC_ISC_POSIX' is obsolete.
-+You should run autoupdate.], [../../lib/autoconf/specific.m4:464: AC_ISC_POSIX is expanded from...
-+configure.in:8: the top level])
-+m4trace:configure.in:8: -1- AC_SUBST([CC])
-+m4trace:configure.in:8: -1- AC_SUBST_TRACE([CC])
-+m4trace:configure.in:8: -1- m4_pattern_allow([^CC$])
-+m4trace:configure.in:8: -1- AC_SUBST([CFLAGS])
-+m4trace:configure.in:8: -1- AC_SUBST_TRACE([CFLAGS])
-+m4trace:configure.in:8: -1- m4_pattern_allow([^CFLAGS$])
-+m4trace:configure.in:8: -1- AC_SUBST([LDFLAGS])
-+m4trace:configure.in:8: -1- AC_SUBST_TRACE([LDFLAGS])
-+m4trace:configure.in:8: -1- m4_pattern_allow([^LDFLAGS$])
-+m4trace:configure.in:8: -1- AC_SUBST([LIBS])
-+m4trace:configure.in:8: -1- AC_SUBST_TRACE([LIBS])
-+m4trace:configure.in:8: -1- m4_pattern_allow([^LIBS$])
-+m4trace:configure.in:8: -1- AC_SUBST([CPPFLAGS])
-+m4trace:configure.in:8: -1- AC_SUBST_TRACE([CPPFLAGS])
-+m4trace:configure.in:8: -1- m4_pattern_allow([^CPPFLAGS$])
-+m4trace:configure.in:8: -1- AC_SUBST([CC])
-+m4trace:configure.in:8: -1- AC_SUBST_TRACE([CC])
-+m4trace:configure.in:8: -1- m4_pattern_allow([^CC$])
-+m4trace:configure.in:8: -1- AC_SUBST([CC])
-+m4trace:configure.in:8: -1- AC_SUBST_TRACE([CC])
-+m4trace:configure.in:8: -1- m4_pattern_allow([^CC$])
-+m4trace:configure.in:8: -1- AC_SUBST([CC])
-+m4trace:configure.in:8: -1- AC_SUBST_TRACE([CC])
-+m4trace:configure.in:8: -1- m4_pattern_allow([^CC$])
-+m4trace:configure.in:8: -1- AC_SUBST([CC])
-+m4trace:configure.in:8: -1- AC_SUBST_TRACE([CC])
-+m4trace:configure.in:8: -1- m4_pattern_allow([^CC$])
-+m4trace:configure.in:8: -1- AC_SUBST([ac_ct_CC])
-+m4trace:configure.in:8: -1- AC_SUBST_TRACE([ac_ct_CC])
-+m4trace:configure.in:8: -1- m4_pattern_allow([^ac_ct_CC$])
-+m4trace:configure.in:8: -1- AC_SUBST([EXEEXT], [$ac_cv_exeext])
-+m4trace:configure.in:8: -1- AC_SUBST_TRACE([EXEEXT])
-+m4trace:configure.in:8: -1- m4_pattern_allow([^EXEEXT$])
-+m4trace:configure.in:8: -1- AC_SUBST([OBJEXT], [$ac_cv_objext])
-+m4trace:configure.in:8: -1- AC_SUBST_TRACE([OBJEXT])
-+m4trace:configure.in:8: -1- m4_pattern_allow([^OBJEXT$])
-+m4trace:configure.in:13: -1- AM_INIT_AUTOMAKE([ld], [${BFD_VERSION}])
-+m4trace:configure.in:13: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$])
-+m4trace:configure.in:13: -1- AM_AUTOMAKE_VERSION([1.11.1])
-+m4trace:configure.in:13: -1- AC_REQUIRE_AUX_FILE([install-sh])
-+m4trace:configure.in:13: -1- AC_SUBST([INSTALL_PROGRAM])
-+m4trace:configure.in:13: -1- AC_SUBST_TRACE([INSTALL_PROGRAM])
-+m4trace:configure.in:13: -1- m4_pattern_allow([^INSTALL_PROGRAM$])
-+m4trace:configure.in:13: -1- AC_SUBST([INSTALL_SCRIPT])
-+m4trace:configure.in:13: -1- AC_SUBST_TRACE([INSTALL_SCRIPT])
-+m4trace:configure.in:13: -1- m4_pattern_allow([^INSTALL_SCRIPT$])
-+m4trace:configure.in:13: -1- AC_SUBST([INSTALL_DATA])
-+m4trace:configure.in:13: -1- AC_SUBST_TRACE([INSTALL_DATA])
-+m4trace:configure.in:13: -1- m4_pattern_allow([^INSTALL_DATA$])
-+m4trace:configure.in:13: -1- AC_SUBST([am__isrc], [' -I$(srcdir)'])
-+m4trace:configure.in:13: -1- AC_SUBST_TRACE([am__isrc])
-+m4trace:configure.in:13: -1- m4_pattern_allow([^am__isrc$])
-+m4trace:configure.in:13: -1- _AM_SUBST_NOTMAKE([am__isrc])
-+m4trace:configure.in:13: -1- AC_SUBST([CYGPATH_W])
-+m4trace:configure.in:13: -1- AC_SUBST_TRACE([CYGPATH_W])
-+m4trace:configure.in:13: -1- m4_pattern_allow([^CYGPATH_W$])
-+m4trace:configure.in:13: -1- AC_SUBST([PACKAGE], [ld])
-+m4trace:configure.in:13: -1- AC_SUBST_TRACE([PACKAGE])
-+m4trace:configure.in:13: -1- m4_pattern_allow([^PACKAGE$])
-+m4trace:configure.in:13: -1- AC_SUBST([VERSION], [${BFD_VERSION}])
-+m4trace:configure.in:13: -1- AC_SUBST_TRACE([VERSION])
-+m4trace:configure.in:13: -1- m4_pattern_allow([^VERSION$])
-+m4trace:configure.in:13: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE])
-+m4trace:configure.in:13: -1- m4_pattern_allow([^PACKAGE$])
-+m4trace:configure.in:13: -1- AH_OUTPUT([PACKAGE], [/* Name of package */
-+@%:@undef PACKAGE])
-+m4trace:configure.in:13: -1- AC_DEFINE_TRACE_LITERAL([VERSION])
-+m4trace:configure.in:13: -1- m4_pattern_allow([^VERSION$])
-+m4trace:configure.in:13: -1- AH_OUTPUT([VERSION], [/* Version number of package */
-+@%:@undef VERSION])
-+m4trace:configure.in:13: -1- AC_REQUIRE_AUX_FILE([missing])
-+m4trace:configure.in:13: -1- AC_SUBST([ACLOCAL])
-+m4trace:configure.in:13: -1- AC_SUBST_TRACE([ACLOCAL])
-+m4trace:configure.in:13: -1- m4_pattern_allow([^ACLOCAL$])
-+m4trace:configure.in:13: -1- AC_SUBST([AUTOCONF])
-+m4trace:configure.in:13: -1- AC_SUBST_TRACE([AUTOCONF])
-+m4trace:configure.in:13: -1- m4_pattern_allow([^AUTOCONF$])
-+m4trace:configure.in:13: -1- AC_SUBST([AUTOMAKE])
-+m4trace:configure.in:13: -1- AC_SUBST_TRACE([AUTOMAKE])
-+m4trace:configure.in:13: -1- m4_pattern_allow([^AUTOMAKE$])
-+m4trace:configure.in:13: -1- AC_SUBST([AUTOHEADER])
-+m4trace:configure.in:13: -1- AC_SUBST_TRACE([AUTOHEADER])
-+m4trace:configure.in:13: -1- m4_pattern_allow([^AUTOHEADER$])
-+m4trace:configure.in:13: -1- AC_SUBST([MAKEINFO])
-+m4trace:configure.in:13: -1- AC_SUBST_TRACE([MAKEINFO])
-+m4trace:configure.in:13: -1- m4_pattern_allow([^MAKEINFO$])
-+m4trace:configure.in:13: -1- AC_SUBST([install_sh])
-+m4trace:configure.in:13: -1- AC_SUBST_TRACE([install_sh])
-+m4trace:configure.in:13: -1- m4_pattern_allow([^install_sh$])
-+m4trace:configure.in:13: -1- AC_SUBST([STRIP])
-+m4trace:configure.in:13: -1- AC_SUBST_TRACE([STRIP])
-+m4trace:configure.in:13: -1- m4_pattern_allow([^STRIP$])
-+m4trace:configure.in:13: -1- AC_SUBST([INSTALL_STRIP_PROGRAM])
-+m4trace:configure.in:13: -1- AC_SUBST_TRACE([INSTALL_STRIP_PROGRAM])
-+m4trace:configure.in:13: -1- m4_pattern_allow([^INSTALL_STRIP_PROGRAM$])
-+m4trace:configure.in:13: -1- AC_REQUIRE_AUX_FILE([install-sh])
-+m4trace:configure.in:13: -1- AC_SUBST([MKDIR_P])
-+m4trace:configure.in:13: -1- AC_SUBST_TRACE([MKDIR_P])
-+m4trace:configure.in:13: -1- m4_pattern_allow([^MKDIR_P$])
-+m4trace:configure.in:13: -1- AC_SUBST([mkdir_p], ["$MKDIR_P"])
-+m4trace:configure.in:13: -1- AC_SUBST_TRACE([mkdir_p])
-+m4trace:configure.in:13: -1- m4_pattern_allow([^mkdir_p$])
-+m4trace:configure.in:13: -1- AC_SUBST([AWK])
-+m4trace:configure.in:13: -1- AC_SUBST_TRACE([AWK])
-+m4trace:configure.in:13: -1- m4_pattern_allow([^AWK$])
-+m4trace:configure.in:13: -1- AC_SUBST([SET_MAKE])
-+m4trace:configure.in:13: -1- AC_SUBST_TRACE([SET_MAKE])
-+m4trace:configure.in:13: -1- m4_pattern_allow([^SET_MAKE$])
-+m4trace:configure.in:13: -1- AC_SUBST([am__leading_dot])
-+m4trace:configure.in:13: -1- AC_SUBST_TRACE([am__leading_dot])
-+m4trace:configure.in:13: -1- m4_pattern_allow([^am__leading_dot$])
-+m4trace:configure.in:13: -1- AC_SUBST([AMTAR])
-+m4trace:configure.in:13: -1- AC_SUBST_TRACE([AMTAR])
-+m4trace:configure.in:13: -1- m4_pattern_allow([^AMTAR$])
-+m4trace:configure.in:13: -1- AC_SUBST([am__tar])
-+m4trace:configure.in:13: -1- AC_SUBST_TRACE([am__tar])
-+m4trace:configure.in:13: -1- m4_pattern_allow([^am__tar$])
-+m4trace:configure.in:13: -1- AC_SUBST([am__untar])
-+m4trace:configure.in:13: -1- AC_SUBST_TRACE([am__untar])
-+m4trace:configure.in:13: -1- m4_pattern_allow([^am__untar$])
-+m4trace:configure.in:13: -1- AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])
-+m4trace:configure.in:13: -1- AC_SUBST_TRACE([DEPDIR])
-+m4trace:configure.in:13: -1- m4_pattern_allow([^DEPDIR$])
-+m4trace:configure.in:13: -1- AC_SUBST([am__include])
-+m4trace:configure.in:13: -1- AC_SUBST_TRACE([am__include])
-+m4trace:configure.in:13: -1- m4_pattern_allow([^am__include$])
-+m4trace:configure.in:13: -1- AC_SUBST([am__quote])
-+m4trace:configure.in:13: -1- AC_SUBST_TRACE([am__quote])
-+m4trace:configure.in:13: -1- m4_pattern_allow([^am__quote$])
-+m4trace:configure.in:13: -1- AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-+m4trace:configure.in:13: -1- AC_SUBST([AMDEP_TRUE])
-+m4trace:configure.in:13: -1- AC_SUBST_TRACE([AMDEP_TRUE])
-+m4trace:configure.in:13: -1- m4_pattern_allow([^AMDEP_TRUE$])
-+m4trace:configure.in:13: -1- AC_SUBST([AMDEP_FALSE])
-+m4trace:configure.in:13: -1- AC_SUBST_TRACE([AMDEP_FALSE])
-+m4trace:configure.in:13: -1- m4_pattern_allow([^AMDEP_FALSE$])
-+m4trace:configure.in:13: -1- _AM_SUBST_NOTMAKE([AMDEP_TRUE])
-+m4trace:configure.in:13: -1- _AM_SUBST_NOTMAKE([AMDEP_FALSE])
-+m4trace:configure.in:13: -1- AC_SUBST([AMDEPBACKSLASH])
-+m4trace:configure.in:13: -1- AC_SUBST_TRACE([AMDEPBACKSLASH])
-+m4trace:configure.in:13: -1- m4_pattern_allow([^AMDEPBACKSLASH$])
-+m4trace:configure.in:13: -1- _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])
-+m4trace:configure.in:13: -1- AC_SUBST([CCDEPMODE], [depmode=$am_cv_CC_dependencies_compiler_type])
-+m4trace:configure.in:13: -1- AC_SUBST_TRACE([CCDEPMODE])
-+m4trace:configure.in:13: -1- m4_pattern_allow([^CCDEPMODE$])
-+m4trace:configure.in:13: -1- AM_CONDITIONAL([am__fastdepCC], [
-+  test "x$enable_dependency_tracking" != xno \
-+  && test "$am_cv_CC_dependencies_compiler_type" = gcc3])
-+m4trace:configure.in:13: -1- AC_SUBST([am__fastdepCC_TRUE])
-+m4trace:configure.in:13: -1- AC_SUBST_TRACE([am__fastdepCC_TRUE])
-+m4trace:configure.in:13: -1- m4_pattern_allow([^am__fastdepCC_TRUE$])
-+m4trace:configure.in:13: -1- AC_SUBST([am__fastdepCC_FALSE])
-+m4trace:configure.in:13: -1- AC_SUBST_TRACE([am__fastdepCC_FALSE])
-+m4trace:configure.in:13: -1- m4_pattern_allow([^am__fastdepCC_FALSE$])
-+m4trace:configure.in:13: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_TRUE])
-+m4trace:configure.in:13: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_FALSE])
-+m4trace:configure.in:14: -1- AM_MAINTAINER_MODE
-+m4trace:configure.in:14: -1- AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
-+m4trace:configure.in:14: -1- AC_SUBST([MAINTAINER_MODE_TRUE])
-+m4trace:configure.in:14: -1- AC_SUBST_TRACE([MAINTAINER_MODE_TRUE])
-+m4trace:configure.in:14: -1- m4_pattern_allow([^MAINTAINER_MODE_TRUE$])
-+m4trace:configure.in:14: -1- AC_SUBST([MAINTAINER_MODE_FALSE])
-+m4trace:configure.in:14: -1- AC_SUBST_TRACE([MAINTAINER_MODE_FALSE])
-+m4trace:configure.in:14: -1- m4_pattern_allow([^MAINTAINER_MODE_FALSE$])
-+m4trace:configure.in:14: -1- _AM_SUBST_NOTMAKE([MAINTAINER_MODE_TRUE])
-+m4trace:configure.in:14: -1- _AM_SUBST_NOTMAKE([MAINTAINER_MODE_FALSE])
-+m4trace:configure.in:14: -1- AC_SUBST([MAINT])
-+m4trace:configure.in:14: -1- AC_SUBST_TRACE([MAINT])
-+m4trace:configure.in:14: -1- m4_pattern_allow([^MAINT$])
-+m4trace:configure.in:68: -1- AC_SUBST([use_sysroot])
-+m4trace:configure.in:68: -1- AC_SUBST_TRACE([use_sysroot])
-+m4trace:configure.in:68: -1- m4_pattern_allow([^use_sysroot$])
-+m4trace:configure.in:69: -1- AC_SUBST([TARGET_SYSTEM_ROOT])
-+m4trace:configure.in:69: -1- AC_SUBST_TRACE([TARGET_SYSTEM_ROOT])
-+m4trace:configure.in:69: -1- m4_pattern_allow([^TARGET_SYSTEM_ROOT$])
-+m4trace:configure.in:70: -1- AC_SUBST([TARGET_SYSTEM_ROOT_DEFINE])
-+m4trace:configure.in:70: -1- AC_SUBST_TRACE([TARGET_SYSTEM_ROOT_DEFINE])
-+m4trace:configure.in:70: -1- m4_pattern_allow([^TARGET_SYSTEM_ROOT_DEFINE$])
-+m4trace:configure.in:92: -1- AC_SUBST([install_as_default])
-+m4trace:configure.in:92: -1- AC_SUBST_TRACE([install_as_default])
-+m4trace:configure.in:92: -1- m4_pattern_allow([^install_as_default$])
-+m4trace:configure.in:93: -1- AC_SUBST([installed_linker])
-+m4trace:configure.in:93: -1- AC_SUBST_TRACE([installed_linker])
-+m4trace:configure.in:93: -1- m4_pattern_allow([^installed_linker$])
-+m4trace:configure.in:106: -1- AC_DEFINE_TRACE_LITERAL([GOT_HANDLING_DEFAULT])
-+m4trace:configure.in:106: -1- m4_pattern_allow([^GOT_HANDLING_DEFAULT$])
-+m4trace:configure.in:106: -1- AH_OUTPUT([GOT_HANDLING_DEFAULT], [/* Define to choose default GOT handling scheme */
-+@%:@undef GOT_HANDLING_DEFAULT])
-+m4trace:configure.in:109: -1- AC_DEFINE_TRACE_LITERAL([GOT_HANDLING_DEFAULT])
-+m4trace:configure.in:109: -1- m4_pattern_allow([^GOT_HANDLING_DEFAULT$])
-+m4trace:configure.in:109: -1- AH_OUTPUT([GOT_HANDLING_DEFAULT], [/* Define to choose default GOT handling scheme */
-+@%:@undef GOT_HANDLING_DEFAULT])
-+m4trace:configure.in:112: -1- AC_DEFINE_TRACE_LITERAL([GOT_HANDLING_DEFAULT])
-+m4trace:configure.in:112: -1- m4_pattern_allow([^GOT_HANDLING_DEFAULT$])
-+m4trace:configure.in:112: -1- AH_OUTPUT([GOT_HANDLING_DEFAULT], [/* Define to choose default GOT handling scheme */
-+@%:@undef GOT_HANDLING_DEFAULT])
-+m4trace:configure.in:115: -1- AC_DEFINE_TRACE_LITERAL([GOT_HANDLING_DEFAULT])
-+m4trace:configure.in:115: -1- m4_pattern_allow([^GOT_HANDLING_DEFAULT$])
-+m4trace:configure.in:115: -1- AH_OUTPUT([GOT_HANDLING_DEFAULT], [/* Define to choose default GOT handling scheme */
-+@%:@undef GOT_HANDLING_DEFAULT])
-+m4trace:configure.in:120: -1- AC_SUBST([CPP])
-+m4trace:configure.in:120: -1- AC_SUBST_TRACE([CPP])
-+m4trace:configure.in:120: -1- m4_pattern_allow([^CPP$])
-+m4trace:configure.in:120: -1- AC_SUBST([CPPFLAGS])
-+m4trace:configure.in:120: -1- AC_SUBST_TRACE([CPPFLAGS])
-+m4trace:configure.in:120: -1- m4_pattern_allow([^CPPFLAGS$])
-+m4trace:configure.in:120: -1- AC_SUBST([CPP])
-+m4trace:configure.in:120: -1- AC_SUBST_TRACE([CPP])
-+m4trace:configure.in:120: -1- m4_pattern_allow([^CPP$])
-+m4trace:configure.in:120: -1- AC_SUBST([GREP])
-+m4trace:configure.in:120: -1- AC_SUBST_TRACE([GREP])
-+m4trace:configure.in:120: -1- m4_pattern_allow([^GREP$])
-+m4trace:configure.in:120: -1- AC_SUBST([EGREP])
-+m4trace:configure.in:120: -1- AC_SUBST_TRACE([EGREP])
-+m4trace:configure.in:120: -1- m4_pattern_allow([^EGREP$])
-+m4trace:configure.in:120: -1- AC_SUBST([WARN_CFLAGS])
-+m4trace:configure.in:120: -1- AC_SUBST_TRACE([WARN_CFLAGS])
-+m4trace:configure.in:120: -1- m4_pattern_allow([^WARN_CFLAGS$])
-+m4trace:configure.in:120: -1- AC_SUBST([NO_WERROR])
-+m4trace:configure.in:120: -1- AC_SUBST_TRACE([NO_WERROR])
-+m4trace:configure.in:120: -1- m4_pattern_allow([^NO_WERROR$])
-+m4trace:configure.in:122: -1- AC_CONFIG_HEADERS([config.h:config.in])
-+m4trace:configure.in:133: -1- AC_SUBST([CC])
-+m4trace:configure.in:133: -1- AC_SUBST_TRACE([CC])
-+m4trace:configure.in:133: -1- m4_pattern_allow([^CC$])
-+m4trace:configure.in:133: -1- AC_SUBST([CFLAGS])
-+m4trace:configure.in:133: -1- AC_SUBST_TRACE([CFLAGS])
-+m4trace:configure.in:133: -1- m4_pattern_allow([^CFLAGS$])
-+m4trace:configure.in:133: -1- AC_SUBST([LDFLAGS])
-+m4trace:configure.in:133: -1- AC_SUBST_TRACE([LDFLAGS])
-+m4trace:configure.in:133: -1- m4_pattern_allow([^LDFLAGS$])
-+m4trace:configure.in:133: -1- AC_SUBST([LIBS])
-+m4trace:configure.in:133: -1- AC_SUBST_TRACE([LIBS])
-+m4trace:configure.in:133: -1- m4_pattern_allow([^LIBS$])
-+m4trace:configure.in:133: -1- AC_SUBST([CPPFLAGS])
-+m4trace:configure.in:133: -1- AC_SUBST_TRACE([CPPFLAGS])
-+m4trace:configure.in:133: -1- m4_pattern_allow([^CPPFLAGS$])
-+m4trace:configure.in:133: -1- AC_SUBST([CC])
-+m4trace:configure.in:133: -1- AC_SUBST_TRACE([CC])
-+m4trace:configure.in:133: -1- m4_pattern_allow([^CC$])
-+m4trace:configure.in:133: -1- AC_SUBST([CC])
-+m4trace:configure.in:133: -1- AC_SUBST_TRACE([CC])
-+m4trace:configure.in:133: -1- m4_pattern_allow([^CC$])
-+m4trace:configure.in:133: -1- AC_SUBST([CC])
-+m4trace:configure.in:133: -1- AC_SUBST_TRACE([CC])
-+m4trace:configure.in:133: -1- m4_pattern_allow([^CC$])
-+m4trace:configure.in:133: -1- AC_SUBST([CC])
-+m4trace:configure.in:133: -1- AC_SUBST_TRACE([CC])
-+m4trace:configure.in:133: -1- m4_pattern_allow([^CC$])
-+m4trace:configure.in:133: -1- AC_SUBST([ac_ct_CC])
-+m4trace:configure.in:133: -1- AC_SUBST_TRACE([ac_ct_CC])
-+m4trace:configure.in:133: -1- m4_pattern_allow([^ac_ct_CC$])
-+m4trace:configure.in:134: -1- _m4_warn([obsolete], [The macro `AC_GNU_SOURCE' is obsolete.
-+You should run autoupdate.], [../../lib/autoconf/specific.m4:332: AC_GNU_SOURCE is expanded from...
-+configure.in:134: the top level])
-+m4trace:configure.in:134: -1- AC_DEFINE_TRACE_LITERAL([STDC_HEADERS])
-+m4trace:configure.in:134: -1- m4_pattern_allow([^STDC_HEADERS$])
-+m4trace:configure.in:134: -1- AH_OUTPUT([STDC_HEADERS], [/* Define to 1 if you have the ANSI C header files. */
-+@%:@undef STDC_HEADERS])
-+m4trace:configure.in:134: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define to 1 if you have the <sys/types.h> header file. */
-+@%:@undef HAVE_SYS_TYPES_H])
-+m4trace:configure.in:134: -1- AH_OUTPUT([HAVE_SYS_STAT_H], [/* Define to 1 if you have the <sys/stat.h> header file. */
-+@%:@undef HAVE_SYS_STAT_H])
-+m4trace:configure.in:134: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the <stdlib.h> header file. */
-+@%:@undef HAVE_STDLIB_H])
-+m4trace:configure.in:134: -1- AH_OUTPUT([HAVE_STRING_H], [/* Define to 1 if you have the <string.h> header file. */
-+@%:@undef HAVE_STRING_H])
-+m4trace:configure.in:134: -1- AH_OUTPUT([HAVE_MEMORY_H], [/* Define to 1 if you have the <memory.h> header file. */
-+@%:@undef HAVE_MEMORY_H])
-+m4trace:configure.in:134: -1- AH_OUTPUT([HAVE_STRINGS_H], [/* Define to 1 if you have the <strings.h> header file. */
-+@%:@undef HAVE_STRINGS_H])
-+m4trace:configure.in:134: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define to 1 if you have the <inttypes.h> header file. */
-+@%:@undef HAVE_INTTYPES_H])
-+m4trace:configure.in:134: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define to 1 if you have the <stdint.h> header file. */
-+@%:@undef HAVE_STDINT_H])
-+m4trace:configure.in:134: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
-+@%:@undef HAVE_UNISTD_H])
-+m4trace:configure.in:134: -1- AC_DEFINE_TRACE_LITERAL([_POSIX_SOURCE])
-+m4trace:configure.in:134: -1- m4_pattern_allow([^_POSIX_SOURCE$])
-+m4trace:configure.in:134: -1- AH_OUTPUT([_POSIX_SOURCE], [/* Define to 1 if you need to in order for `stat\' and other things to work. */
-+@%:@undef _POSIX_SOURCE])
-+m4trace:configure.in:134: -1- AC_DEFINE_TRACE_LITERAL([_POSIX_1_SOURCE])
-+m4trace:configure.in:134: -1- m4_pattern_allow([^_POSIX_1_SOURCE$])
-+m4trace:configure.in:134: -1- AH_OUTPUT([_POSIX_1_SOURCE], [/* Define to 2 if the system does not provide POSIX.1 features except with
-+   this defined. */
-+@%:@undef _POSIX_1_SOURCE])
-+m4trace:configure.in:134: -1- AC_DEFINE_TRACE_LITERAL([_MINIX])
-+m4trace:configure.in:134: -1- m4_pattern_allow([^_MINIX$])
-+m4trace:configure.in:134: -1- AH_OUTPUT([_MINIX], [/* Define to 1 if on MINIX. */
-+@%:@undef _MINIX])
-+m4trace:configure.in:134: -1- AH_OUTPUT([USE_SYSTEM_EXTENSIONS], [/* Enable extensions on AIX 3, Interix.  */
-+#ifndef _ALL_SOURCE
-+# undef _ALL_SOURCE
-+#endif
-+/* Enable GNU extensions on systems that have them.  */
-+#ifndef _GNU_SOURCE
-+# undef _GNU_SOURCE
-+#endif
-+/* Enable threading extensions on Solaris.  */
-+#ifndef _POSIX_PTHREAD_SEMANTICS
-+# undef _POSIX_PTHREAD_SEMANTICS
-+#endif
-+/* Enable extensions on HP NonStop.  */
-+#ifndef _TANDEM_SOURCE
-+# undef _TANDEM_SOURCE
-+#endif
-+/* Enable general extensions on Solaris.  */
-+#ifndef __EXTENSIONS__
-+# undef __EXTENSIONS__
-+#endif
-+])
-+m4trace:configure.in:134: -1- AC_DEFINE_TRACE_LITERAL([__EXTENSIONS__])
-+m4trace:configure.in:134: -1- m4_pattern_allow([^__EXTENSIONS__$])
-+m4trace:configure.in:134: -1- AC_DEFINE_TRACE_LITERAL([_ALL_SOURCE])
-+m4trace:configure.in:134: -1- m4_pattern_allow([^_ALL_SOURCE$])
-+m4trace:configure.in:134: -1- AC_DEFINE_TRACE_LITERAL([_GNU_SOURCE])
-+m4trace:configure.in:134: -1- m4_pattern_allow([^_GNU_SOURCE$])
-+m4trace:configure.in:134: -1- AC_DEFINE_TRACE_LITERAL([_POSIX_PTHREAD_SEMANTICS])
-+m4trace:configure.in:134: -1- m4_pattern_allow([^_POSIX_PTHREAD_SEMANTICS$])
-+m4trace:configure.in:134: -1- AC_DEFINE_TRACE_LITERAL([_TANDEM_SOURCE])
-+m4trace:configure.in:134: -1- m4_pattern_allow([^_TANDEM_SOURCE$])
-+m4trace:configure.in:136: -1- AC_DEFINE_TRACE_LITERAL([_FILE_OFFSET_BITS])
-+m4trace:configure.in:136: -1- m4_pattern_allow([^_FILE_OFFSET_BITS$])
-+m4trace:configure.in:136: -1- AH_OUTPUT([_FILE_OFFSET_BITS], [/* Number of bits in a file offset, on hosts where this is settable. */
-+@%:@undef _FILE_OFFSET_BITS])
-+m4trace:configure.in:136: -1- AC_DEFINE_TRACE_LITERAL([_LARGE_FILES])
-+m4trace:configure.in:136: -1- m4_pattern_allow([^_LARGE_FILES$])
-+m4trace:configure.in:136: -1- AH_OUTPUT([_LARGE_FILES], [/* Define for large files, on AIX-style hosts. */
-+@%:@undef _LARGE_FILES])
-+m4trace:configure.in:139: -1- LT_INIT
-+m4trace:configure.in:139: -1- m4_pattern_forbid([^_?LT_[A-Z_]+$])
-+m4trace:configure.in:139: -1- m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])
-+m4trace:configure.in:139: -1- AC_REQUIRE_AUX_FILE([ltmain.sh])
-+m4trace:configure.in:139: -1- AC_SUBST([LIBTOOL])
-+m4trace:configure.in:139: -1- AC_SUBST_TRACE([LIBTOOL])
-+m4trace:configure.in:139: -1- m4_pattern_allow([^LIBTOOL$])
-+m4trace:configure.in:139: -1- AC_SUBST([SED])
-+m4trace:configure.in:139: -1- AC_SUBST_TRACE([SED])
-+m4trace:configure.in:139: -1- m4_pattern_allow([^SED$])
-+m4trace:configure.in:139: -1- AC_SUBST([FGREP])
-+m4trace:configure.in:139: -1- AC_SUBST_TRACE([FGREP])
-+m4trace:configure.in:139: -1- m4_pattern_allow([^FGREP$])
-+m4trace:configure.in:139: -1- AC_SUBST([GREP])
-+m4trace:configure.in:139: -1- AC_SUBST_TRACE([GREP])
-+m4trace:configure.in:139: -1- m4_pattern_allow([^GREP$])
-+m4trace:configure.in:139: -1- AC_SUBST([LD])
-+m4trace:configure.in:139: -1- AC_SUBST_TRACE([LD])
-+m4trace:configure.in:139: -1- m4_pattern_allow([^LD$])
-+m4trace:configure.in:139: -1- AC_SUBST([DUMPBIN])
-+m4trace:configure.in:139: -1- AC_SUBST_TRACE([DUMPBIN])
-+m4trace:configure.in:139: -1- m4_pattern_allow([^DUMPBIN$])
-+m4trace:configure.in:139: -1- AC_SUBST([ac_ct_DUMPBIN])
-+m4trace:configure.in:139: -1- AC_SUBST_TRACE([ac_ct_DUMPBIN])
-+m4trace:configure.in:139: -1- m4_pattern_allow([^ac_ct_DUMPBIN$])
-+m4trace:configure.in:139: -1- AC_SUBST([DUMPBIN])
-+m4trace:configure.in:139: -1- AC_SUBST_TRACE([DUMPBIN])
-+m4trace:configure.in:139: -1- m4_pattern_allow([^DUMPBIN$])
-+m4trace:configure.in:139: -1- AC_SUBST([NM])
-+m4trace:configure.in:139: -1- AC_SUBST_TRACE([NM])
-+m4trace:configure.in:139: -1- m4_pattern_allow([^NM$])
-+m4trace:configure.in:139: -1- AC_SUBST([LN_S], [$as_ln_s])
-+m4trace:configure.in:139: -1- AC_SUBST_TRACE([LN_S])
-+m4trace:configure.in:139: -1- m4_pattern_allow([^LN_S$])
-+m4trace:configure.in:139: -1- AC_SUBST([OBJDUMP])
-+m4trace:configure.in:139: -1- AC_SUBST_TRACE([OBJDUMP])
-+m4trace:configure.in:139: -1- m4_pattern_allow([^OBJDUMP$])
-+m4trace:configure.in:139: -1- AC_SUBST([OBJDUMP])
-+m4trace:configure.in:139: -1- AC_SUBST_TRACE([OBJDUMP])
-+m4trace:configure.in:139: -1- m4_pattern_allow([^OBJDUMP$])
-+m4trace:configure.in:139: -1- AC_SUBST([AR])
-+m4trace:configure.in:139: -1- AC_SUBST_TRACE([AR])
-+m4trace:configure.in:139: -1- m4_pattern_allow([^AR$])
-+m4trace:configure.in:139: -1- AC_SUBST([STRIP])
-+m4trace:configure.in:139: -1- AC_SUBST_TRACE([STRIP])
-+m4trace:configure.in:139: -1- m4_pattern_allow([^STRIP$])
-+m4trace:configure.in:139: -1- AC_SUBST([RANLIB])
-+m4trace:configure.in:139: -1- AC_SUBST_TRACE([RANLIB])
-+m4trace:configure.in:139: -1- m4_pattern_allow([^RANLIB$])
-+m4trace:configure.in:139: -1- m4_pattern_allow([LT_OBJDIR])
-+m4trace:configure.in:139: -1- AC_DEFINE_TRACE_LITERAL([LT_OBJDIR])
-+m4trace:configure.in:139: -1- m4_pattern_allow([^LT_OBJDIR$])
-+m4trace:configure.in:139: -1- AH_OUTPUT([LT_OBJDIR], [/* Define to the sub-directory in which libtool stores uninstalled libraries.
-+   */
-+@%:@undef LT_OBJDIR])
-+m4trace:configure.in:139: -1- LT_SUPPORTED_TAG([CC])
-+m4trace:configure.in:139: -1- AC_SUBST([DSYMUTIL])
-+m4trace:configure.in:139: -1- AC_SUBST_TRACE([DSYMUTIL])
-+m4trace:configure.in:139: -1- m4_pattern_allow([^DSYMUTIL$])
-+m4trace:configure.in:139: -1- AC_SUBST([NMEDIT])
-+m4trace:configure.in:139: -1- AC_SUBST_TRACE([NMEDIT])
-+m4trace:configure.in:139: -1- m4_pattern_allow([^NMEDIT$])
-+m4trace:configure.in:139: -1- AC_SUBST([LIPO])
-+m4trace:configure.in:139: -1- AC_SUBST_TRACE([LIPO])
-+m4trace:configure.in:139: -1- m4_pattern_allow([^LIPO$])
-+m4trace:configure.in:139: -1- AC_SUBST([OTOOL])
-+m4trace:configure.in:139: -1- AC_SUBST_TRACE([OTOOL])
-+m4trace:configure.in:139: -1- m4_pattern_allow([^OTOOL$])
-+m4trace:configure.in:139: -1- AC_SUBST([OTOOL64])
-+m4trace:configure.in:139: -1- AC_SUBST_TRACE([OTOOL64])
-+m4trace:configure.in:139: -1- m4_pattern_allow([^OTOOL64$])
-+m4trace:configure.in:139: -1- AH_OUTPUT([HAVE_DLFCN_H], [/* Define to 1 if you have the <dlfcn.h> header file. */
-+@%:@undef HAVE_DLFCN_H])
-+m4trace:configure.in:139: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DLFCN_H])
-+m4trace:configure.in:139: -1- m4_pattern_allow([^HAVE_DLFCN_H$])
-+m4trace:configure.in:142: -1- AC_SUBST([USE_NLS])
-+m4trace:configure.in:142: -1- AC_SUBST_TRACE([USE_NLS])
-+m4trace:configure.in:142: -1- m4_pattern_allow([^USE_NLS$])
-+m4trace:configure.in:142: -1- AC_SUBST([LIBINTL])
-+m4trace:configure.in:142: -1- AC_SUBST_TRACE([LIBINTL])
-+m4trace:configure.in:142: -1- m4_pattern_allow([^LIBINTL$])
-+m4trace:configure.in:142: -1- AC_SUBST([LIBINTL_DEP])
-+m4trace:configure.in:142: -1- AC_SUBST_TRACE([LIBINTL_DEP])
-+m4trace:configure.in:142: -1- m4_pattern_allow([^LIBINTL_DEP$])
-+m4trace:configure.in:142: -1- AC_SUBST([INCINTL])
-+m4trace:configure.in:142: -1- AC_SUBST_TRACE([INCINTL])
-+m4trace:configure.in:142: -1- m4_pattern_allow([^INCINTL$])
-+m4trace:configure.in:142: -1- AC_SUBST([XGETTEXT])
-+m4trace:configure.in:142: -1- AC_SUBST_TRACE([XGETTEXT])
-+m4trace:configure.in:142: -1- m4_pattern_allow([^XGETTEXT$])
-+m4trace:configure.in:142: -1- AC_SUBST([GMSGFMT])
-+m4trace:configure.in:142: -1- AC_SUBST_TRACE([GMSGFMT])
-+m4trace:configure.in:142: -1- m4_pattern_allow([^GMSGFMT$])
-+m4trace:configure.in:142: -1- AC_SUBST([POSUB])
-+m4trace:configure.in:142: -1- AC_SUBST_TRACE([POSUB])
-+m4trace:configure.in:142: -1- m4_pattern_allow([^POSUB$])
-+m4trace:configure.in:142: -1- AC_DEFINE_TRACE_LITERAL([ENABLE_NLS])
-+m4trace:configure.in:142: -1- m4_pattern_allow([^ENABLE_NLS$])
-+m4trace:configure.in:142: -1- AH_OUTPUT([ENABLE_NLS], [/* Define to 1 if translation of program messages to the user\'s native
-+   language is requested. */
-+@%:@undef ENABLE_NLS])
-+m4trace:configure.in:142: -1- AC_SUBST([CATALOGS])
-+m4trace:configure.in:142: -1- AC_SUBST_TRACE([CATALOGS])
-+m4trace:configure.in:142: -1- m4_pattern_allow([^CATALOGS$])
-+m4trace:configure.in:142: -1- AC_SUBST([DATADIRNAME])
-+m4trace:configure.in:142: -1- AC_SUBST_TRACE([DATADIRNAME])
-+m4trace:configure.in:142: -1- m4_pattern_allow([^DATADIRNAME$])
-+m4trace:configure.in:142: -1- AC_SUBST([INSTOBJEXT])
-+m4trace:configure.in:142: -1- AC_SUBST_TRACE([INSTOBJEXT])
-+m4trace:configure.in:142: -1- m4_pattern_allow([^INSTOBJEXT$])
-+m4trace:configure.in:142: -1- AC_SUBST([GENCAT])
-+m4trace:configure.in:142: -1- AC_SUBST_TRACE([GENCAT])
-+m4trace:configure.in:142: -1- m4_pattern_allow([^GENCAT$])
-+m4trace:configure.in:142: -1- AC_SUBST([CATOBJEXT])
-+m4trace:configure.in:142: -1- AC_SUBST_TRACE([CATOBJEXT])
-+m4trace:configure.in:142: -1- m4_pattern_allow([^CATOBJEXT$])
-+m4trace:configure.in:143: -1- AC_SUBST([MKINSTALLDIRS])
-+m4trace:configure.in:143: -1- AC_SUBST_TRACE([MKINSTALLDIRS])
-+m4trace:configure.in:143: -1- m4_pattern_allow([^MKINSTALLDIRS$])
-+m4trace:configure.in:143: -1- AC_SUBST([USE_NLS])
-+m4trace:configure.in:143: -1- AC_SUBST_TRACE([USE_NLS])
-+m4trace:configure.in:143: -1- m4_pattern_allow([^USE_NLS$])
-+m4trace:configure.in:143: -1- AC_SUBST([MSGFMT])
-+m4trace:configure.in:143: -1- AC_SUBST_TRACE([MSGFMT])
-+m4trace:configure.in:143: -1- m4_pattern_allow([^MSGFMT$])
-+m4trace:configure.in:143: -1- AC_SUBST([GMSGFMT])
-+m4trace:configure.in:143: -1- AC_SUBST_TRACE([GMSGFMT])
-+m4trace:configure.in:143: -1- m4_pattern_allow([^GMSGFMT$])
-+m4trace:configure.in:143: -1- AC_SUBST([XGETTEXT])
-+m4trace:configure.in:143: -1- AC_SUBST_TRACE([XGETTEXT])
-+m4trace:configure.in:143: -1- m4_pattern_allow([^XGETTEXT$])
-+m4trace:configure.in:143: -1- AC_SUBST([MSGMERGE])
-+m4trace:configure.in:143: -1- AC_SUBST_TRACE([MSGMERGE])
-+m4trace:configure.in:143: -1- m4_pattern_allow([^MSGMERGE$])
-+m4trace:configure.in:143: -1- _m4_warn([obsolete], [The macro `AC_OUTPUT_COMMANDS' is obsolete.
-+You should run autoupdate.], [../../lib/autoconf/status.m4:1040: AC_OUTPUT_COMMANDS is expanded from...
-+../config/po.m4:23: AM_PO_SUBDIRS is expanded from...
-+configure.in:143: the top level])
-+m4trace:configure.in:147: -1- AC_SUBST([YACC])
-+m4trace:configure.in:147: -1- AC_SUBST_TRACE([YACC])
-+m4trace:configure.in:147: -1- m4_pattern_allow([^YACC$])
-+m4trace:configure.in:147: -1- AC_SUBST([YACC])
-+m4trace:configure.in:147: -1- AC_SUBST_TRACE([YACC])
-+m4trace:configure.in:147: -1- m4_pattern_allow([^YACC$])
-+m4trace:configure.in:147: -1- AC_SUBST([YFLAGS])
-+m4trace:configure.in:147: -1- AC_SUBST_TRACE([YFLAGS])
-+m4trace:configure.in:147: -1- m4_pattern_allow([^YFLAGS$])
-+m4trace:configure.in:148: -1- AC_SUBST([LEX])
-+m4trace:configure.in:148: -1- AC_SUBST_TRACE([LEX])
-+m4trace:configure.in:148: -1- m4_pattern_allow([^LEX$])
-+m4trace:configure.in:148: -1- AC_SUBST([LEX_OUTPUT_ROOT], [$ac_cv_prog_lex_root])
-+m4trace:configure.in:148: -1- AC_SUBST_TRACE([LEX_OUTPUT_ROOT])
-+m4trace:configure.in:148: -1- m4_pattern_allow([^LEX_OUTPUT_ROOT$])
-+m4trace:configure.in:148: -1- AC_SUBST([LEXLIB])
-+m4trace:configure.in:148: -1- AC_SUBST_TRACE([LEXLIB])
-+m4trace:configure.in:148: -1- m4_pattern_allow([^LEXLIB$])
-+m4trace:configure.in:148: -1- AC_DEFINE_TRACE_LITERAL([YYTEXT_POINTER])
-+m4trace:configure.in:148: -1- m4_pattern_allow([^YYTEXT_POINTER$])
-+m4trace:configure.in:148: -1- AH_OUTPUT([YYTEXT_POINTER], [/* Define to 1 if `lex\' declares `yytext\' as a `char *\' by default, not a
-+   `char[]\'. */
-+@%:@undef YYTEXT_POINTER])
-+m4trace:configure.in:150: -1- AM_MAINTAINER_MODE
-+m4trace:configure.in:150: -1- AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
-+m4trace:configure.in:150: -1- AC_SUBST([MAINTAINER_MODE_TRUE])
-+m4trace:configure.in:150: -1- AC_SUBST_TRACE([MAINTAINER_MODE_TRUE])
-+m4trace:configure.in:150: -1- m4_pattern_allow([^MAINTAINER_MODE_TRUE$])
-+m4trace:configure.in:150: -1- AC_SUBST([MAINTAINER_MODE_FALSE])
-+m4trace:configure.in:150: -1- AC_SUBST_TRACE([MAINTAINER_MODE_FALSE])
-+m4trace:configure.in:150: -1- m4_pattern_allow([^MAINTAINER_MODE_FALSE$])
-+m4trace:configure.in:150: -1- _AM_SUBST_NOTMAKE([MAINTAINER_MODE_TRUE])
-+m4trace:configure.in:150: -1- _AM_SUBST_NOTMAKE([MAINTAINER_MODE_FALSE])
-+m4trace:configure.in:150: -1- AC_SUBST([MAINT])
-+m4trace:configure.in:150: -1- AC_SUBST_TRACE([MAINT])
-+m4trace:configure.in:150: -1- m4_pattern_allow([^MAINT$])
-+m4trace:configure.in:151: -1- AM_CONDITIONAL([GENINSRC_NEVER], [false])
-+m4trace:configure.in:151: -1- AC_SUBST([GENINSRC_NEVER_TRUE])
-+m4trace:configure.in:151: -1- AC_SUBST_TRACE([GENINSRC_NEVER_TRUE])
-+m4trace:configure.in:151: -1- m4_pattern_allow([^GENINSRC_NEVER_TRUE$])
-+m4trace:configure.in:151: -1- AC_SUBST([GENINSRC_NEVER_FALSE])
-+m4trace:configure.in:151: -1- AC_SUBST_TRACE([GENINSRC_NEVER_FALSE])
-+m4trace:configure.in:151: -1- m4_pattern_allow([^GENINSRC_NEVER_FALSE$])
-+m4trace:configure.in:151: -1- _AM_SUBST_NOTMAKE([GENINSRC_NEVER_TRUE])
-+m4trace:configure.in:151: -1- _AM_SUBST_NOTMAKE([GENINSRC_NEVER_FALSE])
-+m4trace:configure.in:152: -1- AC_SUBST([do_compare])
-+m4trace:configure.in:152: -1- AC_SUBST_TRACE([do_compare])
-+m4trace:configure.in:152: -1- m4_pattern_allow([^do_compare$])
-+m4trace:configure.in:156: -1- AC_SUBST([HDEFINES])
-+m4trace:configure.in:156: -1- AC_SUBST_TRACE([HDEFINES])
-+m4trace:configure.in:156: -1- m4_pattern_allow([^HDEFINES$])
-+m4trace:configure.in:157: -1- AC_SUBST([HOSTING_CRT0])
-+m4trace:configure.in:157: -1- AC_SUBST_TRACE([HOSTING_CRT0])
-+m4trace:configure.in:157: -1- m4_pattern_allow([^HOSTING_CRT0$])
-+m4trace:configure.in:158: -1- AC_SUBST([HOSTING_LIBS])
-+m4trace:configure.in:158: -1- AC_SUBST_TRACE([HOSTING_LIBS])
-+m4trace:configure.in:158: -1- m4_pattern_allow([^HOSTING_LIBS$])
-+m4trace:configure.in:159: -1- AC_SUBST([NATIVE_LIB_DIRS])
-+m4trace:configure.in:159: -1- AC_SUBST_TRACE([NATIVE_LIB_DIRS])
-+m4trace:configure.in:159: -1- m4_pattern_allow([^NATIVE_LIB_DIRS$])
-+m4trace:configure.in:161: -1- AH_OUTPUT([HAVE_STRING_H], [/* Define to 1 if you have the <string.h> header file. */
-+@%:@undef HAVE_STRING_H])
-+m4trace:configure.in:161: -1- AH_OUTPUT([HAVE_STRINGS_H], [/* Define to 1 if you have the <strings.h> header file. */
-+@%:@undef HAVE_STRINGS_H])
-+m4trace:configure.in:161: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the <stdlib.h> header file. */
-+@%:@undef HAVE_STDLIB_H])
-+m4trace:configure.in:161: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
-+@%:@undef HAVE_UNISTD_H])
-+m4trace:configure.in:161: -1- AH_OUTPUT([HAVE_ELF_HINTS_H], [/* Define to 1 if you have the <elf-hints.h> header file. */
-+@%:@undef HAVE_ELF_HINTS_H])
-+m4trace:configure.in:161: -1- AH_OUTPUT([HAVE_LIMITS_H], [/* Define to 1 if you have the <limits.h> header file. */
-+@%:@undef HAVE_LIMITS_H])
-+m4trace:configure.in:161: -1- AH_OUTPUT([HAVE_SYS_PARAM_H], [/* Define to 1 if you have the <sys/param.h> header file. */
-+@%:@undef HAVE_SYS_PARAM_H])
-+m4trace:configure.in:162: -1- AH_OUTPUT([HAVE_FCNTL_H], [/* Define to 1 if you have the <fcntl.h> header file. */
-+@%:@undef HAVE_FCNTL_H])
-+m4trace:configure.in:162: -1- AH_OUTPUT([HAVE_SYS_FILE_H], [/* Define to 1 if you have the <sys/file.h> header file. */
-+@%:@undef HAVE_SYS_FILE_H])
-+m4trace:configure.in:162: -1- AH_OUTPUT([HAVE_SYS_TIME_H], [/* Define to 1 if you have the <sys/time.h> header file. */
-+@%:@undef HAVE_SYS_TIME_H])
-+m4trace:configure.in:162: -1- AH_OUTPUT([HAVE_SYS_STAT_H], [/* Define to 1 if you have the <sys/stat.h> header file. */
-+@%:@undef HAVE_SYS_STAT_H])
-+m4trace:configure.in:163: -1- AH_OUTPUT([HAVE_GLOB], [/* Define to 1 if you have the `glob\' function. */
-+@%:@undef HAVE_GLOB])
-+m4trace:configure.in:163: -1- AH_OUTPUT([HAVE_MKSTEMP], [/* Define to 1 if you have the `mkstemp\' function. */
-+@%:@undef HAVE_MKSTEMP])
-+m4trace:configure.in:163: -1- AH_OUTPUT([HAVE_REALPATH], [/* Define to 1 if you have the `realpath\' function. */
-+@%:@undef HAVE_REALPATH])
-+m4trace:configure.in:163: -1- AH_OUTPUT([HAVE_SBRK], [/* Define to 1 if you have the `sbrk\' function. */
-+@%:@undef HAVE_SBRK])
-+m4trace:configure.in:163: -1- AH_OUTPUT([HAVE_WAITPID], [/* Define to 1 if you have the `waitpid\' function. */
-+@%:@undef HAVE_WAITPID])
-+m4trace:configure.in:164: -1- AH_OUTPUT([HAVE_OPEN], [/* Define to 1 if you have the `open\' function. */
-+@%:@undef HAVE_OPEN])
-+m4trace:configure.in:164: -1- AH_OUTPUT([HAVE_LSEEK], [/* Define to 1 if you have the `lseek\' function. */
-+@%:@undef HAVE_LSEEK])
-+m4trace:configure.in:164: -1- AH_OUTPUT([HAVE_CLOSE], [/* Define to 1 if you have the `close\' function. */
-+@%:@undef HAVE_CLOSE])
-+m4trace:configure.in:165: -1- AH_OUTPUT([HAVE_DIRENT_H], [/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR\'.
-+   */
-+@%:@undef HAVE_DIRENT_H])
-+m4trace:configure.in:165: -1- AH_OUTPUT([HAVE_SYS_NDIR_H], [/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR\'.
-+   */
-+@%:@undef HAVE_SYS_NDIR_H])
-+m4trace:configure.in:165: -1- AH_OUTPUT([HAVE_SYS_DIR_H], [/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR\'.
-+   */
-+@%:@undef HAVE_SYS_DIR_H])
-+m4trace:configure.in:165: -1- AH_OUTPUT([HAVE_NDIR_H], [/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR\'. */
-+@%:@undef HAVE_NDIR_H])
-+m4trace:configure.in:171: -1- AH_OUTPUT([HAVE_DLOPEN], [/* Define to 1 if you have the `dlopen\' function. */
-+@%:@undef HAVE_DLOPEN])
-+m4trace:configure.in:171: -1- AH_OUTPUT([HAVE_DLSYM], [/* Define to 1 if you have the `dlsym\' function. */
-+@%:@undef HAVE_DLSYM])
-+m4trace:configure.in:171: -1- AH_OUTPUT([HAVE_DLCLOSE], [/* Define to 1 if you have the `dlclose\' function. */
-+@%:@undef HAVE_DLCLOSE])
-+m4trace:configure.in:174: -1- AH_OUTPUT([HAVE_WINDOWS_H], [/* Define to 1 if you have the <Windows.h> header file. */
-+@%:@undef HAVE_WINDOWS_H])
-+m4trace:configure.in:174: -1- AC_DEFINE_TRACE_LITERAL([HAVE_WINDOWS_H])
-+m4trace:configure.in:174: -1- m4_pattern_allow([^HAVE_WINDOWS_H$])
-+m4trace:configure.in:176: -1- AM_CONDITIONAL([ENABLE_PLUGINS], [test x$enable_plugins = xyes])
-+m4trace:configure.in:176: -1- AC_SUBST([ENABLE_PLUGINS_TRUE])
-+m4trace:configure.in:176: -1- AC_SUBST_TRACE([ENABLE_PLUGINS_TRUE])
-+m4trace:configure.in:176: -1- m4_pattern_allow([^ENABLE_PLUGINS_TRUE$])
-+m4trace:configure.in:176: -1- AC_SUBST([ENABLE_PLUGINS_FALSE])
-+m4trace:configure.in:176: -1- AC_SUBST_TRACE([ENABLE_PLUGINS_FALSE])
-+m4trace:configure.in:176: -1- m4_pattern_allow([^ENABLE_PLUGINS_FALSE$])
-+m4trace:configure.in:176: -1- _AM_SUBST_NOTMAKE([ENABLE_PLUGINS_TRUE])
-+m4trace:configure.in:176: -1- _AM_SUBST_NOTMAKE([ENABLE_PLUGINS_FALSE])
-+m4trace:configure.in:184: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DECL_GETOPT])
-+m4trace:configure.in:184: -1- m4_pattern_allow([^HAVE_DECL_GETOPT$])
-+m4trace:configure.in:184: -1- AH_OUTPUT([HAVE_DECL_GETOPT], [/* Is the prototype for getopt in <unistd.h> in the expected format? */
-+@%:@undef HAVE_DECL_GETOPT])
-+m4trace:configure.in:188: -1- AC_DEFINE_TRACE_LITERAL([USE_BINARY_FOPEN])
-+m4trace:configure.in:188: -1- m4_pattern_allow([^USE_BINARY_FOPEN$])
-+m4trace:configure.in:188: -1- AH_OUTPUT([USE_BINARY_FOPEN], [/* Use b modifier when opening binary files? */
-+@%:@undef USE_BINARY_FOPEN])
-+m4trace:configure.in:190: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DECL_STRSTR])
-+m4trace:configure.in:190: -1- m4_pattern_allow([^HAVE_DECL_STRSTR$])
-+m4trace:configure.in:190: -1- AH_OUTPUT([HAVE_DECL_STRSTR], [/* Define to 1 if you have the declaration of `strstr\', and to 0 if you don\'t.
-+   */
-+@%:@undef HAVE_DECL_STRSTR])
-+m4trace:configure.in:190: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DECL_FREE])
-+m4trace:configure.in:190: -1- m4_pattern_allow([^HAVE_DECL_FREE$])
-+m4trace:configure.in:190: -1- AH_OUTPUT([HAVE_DECL_FREE], [/* Define to 1 if you have the declaration of `free\', and to 0 if you don\'t.
-+   */
-+@%:@undef HAVE_DECL_FREE])
-+m4trace:configure.in:190: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DECL_SBRK])
-+m4trace:configure.in:190: -1- m4_pattern_allow([^HAVE_DECL_SBRK$])
-+m4trace:configure.in:190: -1- AH_OUTPUT([HAVE_DECL_SBRK], [/* Define to 1 if you have the declaration of `sbrk\', and to 0 if you don\'t.
-+   */
-+@%:@undef HAVE_DECL_SBRK])
-+m4trace:configure.in:190: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DECL_GETENV])
-+m4trace:configure.in:190: -1- m4_pattern_allow([^HAVE_DECL_GETENV$])
-+m4trace:configure.in:190: -1- AH_OUTPUT([HAVE_DECL_GETENV], [/* Define to 1 if you have the declaration of `getenv\', and to 0 if you don\'t.
-+   */
-+@%:@undef HAVE_DECL_GETENV])
-+m4trace:configure.in:190: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DECL_ENVIRON])
-+m4trace:configure.in:190: -1- m4_pattern_allow([^HAVE_DECL_ENVIRON$])
-+m4trace:configure.in:190: -1- AH_OUTPUT([HAVE_DECL_ENVIRON], [/* Define to 1 if you have the declaration of `environ\', and to 0 if you
-+   don\'t. */
-+@%:@undef HAVE_DECL_ENVIRON])
-+m4trace:configure.in:194: -1- AH_OUTPUT([HAVE_ZLIB_H], [/* Define to 1 if you have the <zlib.h> header file. */
-+@%:@undef HAVE_ZLIB_H])
-+m4trace:configure.in:194: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ZLIB_H])
-+m4trace:configure.in:194: -1- m4_pattern_allow([^HAVE_ZLIB_H$])
-+m4trace:configure.in:213: -1- AC_SUBST([STRINGIFY])
-+m4trace:configure.in:213: -1- AC_SUBST_TRACE([STRINGIFY])
-+m4trace:configure.in:213: -1- m4_pattern_allow([^STRINGIFY$])
-+m4trace:configure.in:293: -1- AC_SUBST([EMUL])
-+m4trace:configure.in:293: -1- AC_SUBST_TRACE([EMUL])
-+m4trace:configure.in:293: -1- m4_pattern_allow([^EMUL$])
-+m4trace:configure.in:296: -1- m4_pattern_allow([^TDIRS$])
-+m4trace:configure.in:300: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_LONG])
-+m4trace:configure.in:300: -1- m4_pattern_allow([^SIZEOF_LONG$])
-+m4trace:configure.in:300: -1- AH_OUTPUT([SIZEOF_LONG], [/* The size of `long\', as computed by sizeof. */
-+@%:@undef SIZEOF_LONG])
-+m4trace:configure.in:315: -1- AC_SUBST([EMULATION_OFILES])
-+m4trace:configure.in:315: -1- AC_SUBST_TRACE([EMULATION_OFILES])
-+m4trace:configure.in:315: -1- m4_pattern_allow([^EMULATION_OFILES$])
-+m4trace:configure.in:316: -1- AC_SUBST([EMUL_EXTRA_OFILES])
-+m4trace:configure.in:316: -1- AC_SUBST_TRACE([EMUL_EXTRA_OFILES])
-+m4trace:configure.in:316: -1- m4_pattern_allow([^EMUL_EXTRA_OFILES$])
-+m4trace:configure.in:317: -1- AC_SUBST([LIB_PATH])
-+m4trace:configure.in:317: -1- AC_SUBST_TRACE([LIB_PATH])
-+m4trace:configure.in:317: -1- m4_pattern_allow([^LIB_PATH$])
-+m4trace:configure.in:320: -1- AC_SUBST([EMULATION_LIBPATH])
-+m4trace:configure.in:320: -1- AC_SUBST_TRACE([EMULATION_LIBPATH])
-+m4trace:configure.in:320: -1- m4_pattern_allow([^EMULATION_LIBPATH$])
-+m4trace:configure.in:327: -1- AC_SUBST([TESTBFDLIB])
-+m4trace:configure.in:327: -1- AC_SUBST_TRACE([TESTBFDLIB])
-+m4trace:configure.in:327: -1- m4_pattern_allow([^TESTBFDLIB$])
-+m4trace:configure.in:340: -1- AC_DEFINE_TRACE_LITERAL([EXTRA_SHLIB_EXTENSION])
-+m4trace:configure.in:340: -1- m4_pattern_allow([^EXTRA_SHLIB_EXTENSION$])
-+m4trace:configure.in:340: -1- AH_OUTPUT([EXTRA_SHLIB_EXTENSION], [/* Additional extension a shared object might have. */
-+@%:@undef EXTRA_SHLIB_EXTENSION])
-+m4trace:configure.in:345: -1- AC_SUBST([datarootdir])
-+m4trace:configure.in:345: -1- AC_SUBST_TRACE([datarootdir])
-+m4trace:configure.in:345: -1- m4_pattern_allow([^datarootdir$])
-+m4trace:configure.in:346: -1- AC_SUBST([docdir])
-+m4trace:configure.in:346: -1- AC_SUBST_TRACE([docdir])
-+m4trace:configure.in:346: -1- m4_pattern_allow([^docdir$])
-+m4trace:configure.in:347: -1- AC_SUBST([htmldir])
-+m4trace:configure.in:347: -1- AC_SUBST_TRACE([htmldir])
-+m4trace:configure.in:347: -1- m4_pattern_allow([^htmldir$])
-+m4trace:configure.in:348: -1- AC_SUBST([pdfdir])
-+m4trace:configure.in:348: -1- AC_SUBST_TRACE([pdfdir])
-+m4trace:configure.in:348: -1- m4_pattern_allow([^pdfdir$])
-+m4trace:configure.in:350: -1- AC_CONFIG_FILES([Makefile po/Makefile.in:po/Make-in])
-+m4trace:configure.in:351: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
-+m4trace:configure.in:351: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
-+m4trace:configure.in:351: -1- m4_pattern_allow([^LIB@&t@OBJS$])
-+m4trace:configure.in:351: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
-+m4trace:configure.in:351: -1- AC_SUBST_TRACE([LTLIBOBJS])
-+m4trace:configure.in:351: -1- m4_pattern_allow([^LTLIBOBJS$])
-+m4trace:configure.in:351: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
-+m4trace:configure.in:351: -1- AC_SUBST([am__EXEEXT_TRUE])
-+m4trace:configure.in:351: -1- AC_SUBST_TRACE([am__EXEEXT_TRUE])
-+m4trace:configure.in:351: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
-+m4trace:configure.in:351: -1- AC_SUBST([am__EXEEXT_FALSE])
-+m4trace:configure.in:351: -1- AC_SUBST_TRACE([am__EXEEXT_FALSE])
-+m4trace:configure.in:351: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
-+m4trace:configure.in:351: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
-+m4trace:configure.in:351: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
-+m4trace:configure.in:351: -1- AC_SUBST_TRACE([top_builddir])
-+m4trace:configure.in:351: -1- AC_SUBST_TRACE([top_build_prefix])
-+m4trace:configure.in:351: -1- AC_SUBST_TRACE([srcdir])
-+m4trace:configure.in:351: -1- AC_SUBST_TRACE([abs_srcdir])
-+m4trace:configure.in:351: -1- AC_SUBST_TRACE([top_srcdir])
-+m4trace:configure.in:351: -1- AC_SUBST_TRACE([abs_top_srcdir])
-+m4trace:configure.in:351: -1- AC_SUBST_TRACE([builddir])
-+m4trace:configure.in:351: -1- AC_SUBST_TRACE([abs_builddir])
-+m4trace:configure.in:351: -1- AC_SUBST_TRACE([abs_top_builddir])
-+m4trace:configure.in:351: -1- AC_SUBST_TRACE([INSTALL])
-+m4trace:configure.in:351: -1- AC_SUBST_TRACE([MKDIR_P])
-+m4trace:configure.in:351: -1- AC_REQUIRE_AUX_FILE([ltmain.sh])
-diff -Nur binutils-2.21.orig/ld/configdoc.texi binutils-2.21/ld/configdoc.texi
---- binutils-2.21.orig/ld/configdoc.texi	2010-12-08 09:39:09.000000000 +0100
-+++ binutils-2.21/ld/configdoc.texi	2011-08-28 14:56:22.607987562 +0200
-@@ -7,6 +7,7 @@
- @set H8300
- @set HPPA
- @set I960
-+@set AVR32
- @set M68HC11
- @set M68K
- @set MMIX
-diff -Nur binutils-2.21.orig/ld/configure.tgt binutils-2.21/ld/configure.tgt
---- binutils-2.21.orig/ld/configure.tgt	2010-12-01 12:03:47.000000000 +0100
-+++ binutils-2.21/ld/configure.tgt	2011-08-28 14:56:22.657984216 +0200
-@@ -113,6 +113,9 @@
- avr-*-*)		targ_emul=avr2
- 			targ_extra_emuls="avr1 avr25 avr3 avr31 avr35 avr4 avr5 avr51 avr6"
- 			;;
-+avr32-*-none)           targ_emul=avr32elf_ap7000
-+                        targ_extra_emuls="avr32elf_ap7001 avr32elf_ap7002 avr32elf_ap7200 avr32elf_uc3a0128 avr32elf_uc3a0256 avr32elf_uc3a0512 avr32elf_uc3a0512es avr32elf_uc3a1128 avr32elf_uc3a1256 avr32elf_uc3a1512es avr32elf_uc3a1512 avr32elf_uc3a364 avr32elf_uc3a364s avr32elf_uc3a3128 avr32elf_uc3a3128s avr32elf_uc3a3256 avr32elf_uc3a3256s avr32elf_uc3b064 avr32elf_uc3b0128 avr32elf_uc3b0256es avr32elf_uc3b0256 avr32elf_uc3b0512 avr32elf_uc3b0512revc avr32elf_uc3b164 avr32elf_uc3b1128 avr32elf_uc3b1256es avr32elf_uc3b1256 avr32elf_uc3b1512 avr32elf_uc3b1512revc avr32elf_uc3c0512crevc avr32elf_uc3c1512crevc avr32elf_uc3c2512crevc avr32elf_atuc3l0256 avr32elf_mxt768e avr32elf_uc3l064 avr32elf_uc3l032 avr32elf_uc3l016 avr32elf_uc3l064revb avr32elf_uc3c064c avr32elf_uc3c0128c avr32elf_uc3c0256c avr32elf_uc3c0512c avr32elf_uc3c164c avr32elf_uc3c1128c avr32elf_uc3c1256c avr32elf_uc3c1512c avr32elf_uc3c264c avr32elf_uc3c2128c avr32elf_uc3c2256c avr32elf_uc3c2512c" ;;
-+avr32-*-linux*)         targ_emul=avr32linux ;;
- bfin-*-elf)		targ_emul=elf32bfin;
- 			targ_extra_emuls="elf32bfinfd"
- 			targ_extra_libpath=$targ_extra_emuls
-diff -Nur binutils-2.21.orig/ld/emulparams/avr32elf.sh binutils-2.21/ld/emulparams/avr32elf.sh
---- binutils-2.21.orig/ld/emulparams/avr32elf.sh	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.21/ld/emulparams/avr32elf.sh	2011-08-28 14:56:22.707986669 +0200
-@@ -0,0 +1,402 @@
-+# This script is called from ld/genscript.sh 
-+# There is a difference on how 'bash' and POSIX handles 
-+# the  '.' (source) command in a script.
-+# genscript.sh calls this script with argument ${EMULATION_NAME}
-+# but that will fail on POSIX compilant shells like 'sh' or 'dash'
-+# therefor I use the variable directly instead of $1 
-+EMULATION=${EMULATION_NAME}
-+SCRIPT_NAME=avr32
-+TEMPLATE_NAME=elf32
-+EXTRA_EM_FILE=avr32elf
-+OUTPUT_FORMAT="elf32-avr32"
-+ARCH=avr32
-+MAXPAGESIZE=4096
-+ENTRY=_start
-+EMBEDDED=yes
-+NO_SMALL_DATA=yes
-+NOP=0xd703d703
-+
-+DATA_SEGMENT_ALIGN=8
-+BSS_ALIGNMENT=8
-+
-+RO_LMA_REGION="FLASH"
-+RO_VMA_REGION="FLASH"
-+RW_LMA_REGION="FLASH"
-+RW_VMA_REGION="CPUSRAM"
-+
-+STACK_SIZE=_stack_size
-+STACK_ADDR="ORIGIN(CPUSRAM) + LENGTH(CPUSRAM) - ${STACK_SIZE}"
-+
-+DATA_SEGMENT_END="
-+  __heap_start__ = ALIGN(8);
-+  . = ${STACK_ADDR};
-+  __heap_end__ = .;
-+"
-+
-+case "$EMULATION" in
-+avr32elf_ap*)
-+    MACHINE=ap
-+    INITIAL_READONLY_SECTIONS="
-+    .reset : {  *(.reset) } >FLASH AT>FLASH
-+    . = . & 0x9fffffff;
-+"
-+    TEXT_START_ADDR=0xa0000000
-+    case "$EMULATION" in
-+	    avr32elf_ap700[0-2])
-+	       MEMORY="
-+MEMORY
-+{
-+    FLASH (rxai) : ORIGIN = 0x00000000, LENGTH = 64M
-+    CPUSRAM (rwxa) : ORIGIN = 0x24000000, LENGTH = 32K
-+}
-+"
-+        ;;
-+    avr32elf_ap7200)
-+        MEMORY="
-+MEMORY
-+{
-+    FLASH (rxai) : ORIGIN = 0x00000000, LENGTH = 64M
-+    CPUSRAM (rwxa) : ORIGIN = 0x08000000, LENGTH = 64K
-+}
-+"
-+        ;;
-+    esac
-+    ;;
-+
-+avr32elf_mxt768e)
-+    MACHINE=uc
-+    INITIAL_READONLY_SECTIONS=".reset : {  *(.reset) } >FLASH AT>FLASH"
-+    TEXT_START_ADDR=0x80000000
-+    OTHER_SECTIONS="
-+  .userpage :  { *(.userpage .userpage.*)  } >USERPAGE AT>USERPAGE
-+  .factorypage :  { *(.factorypage .factorypage.*)  } >FACTORYPAGE AT>FACTORYPAGE
-+"
-+        MEMORY="
-+MEMORY
-+{
-+    FLASH (rxai!w) : ORIGIN = 0x80000000, LENGTH = 64K
-+    CPUSRAM (wxa!ri) : ORIGIN = 0x00000004, LENGTH = 0x3FFC
-+    USERPAGE : ORIGIN = 0x80800000, LENGTH = 512
-+    FACTORYPAGE : ORIGIN = 0x80800200, LENGTH = 512
-+    FLASHVAULT_FLASH_SIZE (r) : ORIGIN = 0x80800400, LENGTH = 8
-+    FLASHVAULT_RAM_SIZE (r) : ORIGIN = 0x80800408, LENGTH = 8
-+}
-+"
-+        OTHER_SECTIONS="${OTHER_SECTIONS}
-+  .flashvault_flash_size : { KEEP(*(.flashvault_flash_size .flashvault_flash_size.*)) } > FLASHVAULT_FLASH_SIZE
-+  .flashvault_ram_size   : { KEEP(*(.flashvault_ram_size .flashvault_ram_size.*)) } > FLASHVAULT_RAM_SIZE
-+"
-+      ;;
-+
-+avr32elf_atuc3*)
-+    MACHINE=uc
-+    INITIAL_READONLY_SECTIONS=".reset : {  *(.reset) } >FLASH AT>FLASH"
-+    TEXT_START_ADDR=0x80000000
-+    OTHER_SECTIONS="
-+  .userpage :  { *(.userpage .userpage.*)  } >USERPAGE AT>USERPAGE
-+  .factorypage :  { *(.factorypage .factorypage.*)  } >FACTORYPAGE AT>FACTORYPAGE
-+"
-+    case "$EMULATION" in
-+    avr32elf_atuc3l0256)
-+        MEMORY="
-+MEMORY
-+{
-+    FLASH (rxai!w) : ORIGIN = 0x80000000, LENGTH = 256K
-+    CPUSRAM (wxa!ri) : ORIGIN = 0x00000004, LENGTH = 0x3FFC
-+    USERPAGE : ORIGIN = 0x80800000, LENGTH = 512
-+    FACTORYPAGE : ORIGIN = 0x80800200, LENGTH = 512
-+    FLASHVAULT_FLASH_SIZE (r) : ORIGIN = 0x80800400, LENGTH = 8
-+    FLASHVAULT_RAM_SIZE (r) : ORIGIN = 0x80800408, LENGTH = 8
-+}
-+"
-+        OTHER_SECTIONS="${OTHER_SECTIONS}
-+  .flashvault_flash_size : { KEEP(*(.flashvault_flash_size .flashvault_flash_size.*)) } > FLASHVAULT_FLASH_SIZE
-+  .flashvault_ram_size   : { KEEP(*(.flashvault_ram_size .flashvault_ram_size.*)) } > FLASHVAULT_RAM_SIZE
-+"
-+        ;;
-+    esac
-+    ;;
-+
-+avr32elf_uc3*)
-+    MACHINE=uc
-+    INITIAL_READONLY_SECTIONS=".reset : {  *(.reset) } >FLASH AT>FLASH"
-+    TEXT_START_ADDR=0x80000000
-+    OTHER_SECTIONS="
-+  .userpage :  { *(.userpage .userpage.*)  } >USERPAGE AT>USERPAGE
-+  .factorypage :  { *(.factorypage .factorypage.*)  } >FACTORYPAGE AT>FACTORYPAGE
-+"
-+
-+    case "$EMULATION" in
-+    avr32elf_uc3c[012]512c)
-+        MEMORY="
-+MEMORY
-+{
-+    FLASH (rxai!w) : ORIGIN = 0x80000000, LENGTH = 512K
-+    CPUSRAM (wxa!ri) : ORIGIN = 0x00000004, LENGTH = 0xFFFC
-+    USERPAGE : ORIGIN = 0x80800000, LENGTH = 512
-+    FACTORYPAGE : ORIGIN = 0x80800200, LENGTH = 512
-+    FLASHVAULT_FLASH_SIZE (r) : ORIGIN = 0x80800400, LENGTH = 8
-+    FLASHVAULT_RAM_SIZE (r) : ORIGIN = 0x80800408, LENGTH = 8
-+}
-+"
-+        OTHER_SECTIONS="${OTHER_SECTIONS}
-+  .flashvault_flash_size : { KEEP(*(.flashvault_flash_size .flashvault_flash_size.*)) } > FLASHVAULT_FLASH_SIZE
-+  .flashvault_ram_size   : { KEEP(*(.flashvault_ram_size .flashvault_ram_size.*)) } > FLASHVAULT_RAM_SIZE
-+"
-+        ;;
-+
-+    avr32elf_uc3c[012]256c)
-+        MEMORY="
-+MEMORY
-+{
-+    FLASH (rxai!w) : ORIGIN = 0x80000000, LENGTH = 256K
-+    CPUSRAM (wxa!ri) : ORIGIN = 0x00000004, LENGTH = 0xFFFC
-+    USERPAGE : ORIGIN = 0x80800000, LENGTH = 512
-+    FACTORYPAGE : ORIGIN = 0x80800200, LENGTH = 512
-+    FLASHVAULT_FLASH_SIZE (r) : ORIGIN = 0x80800400, LENGTH = 8
-+    FLASHVAULT_RAM_SIZE (r) : ORIGIN = 0x80800408, LENGTH = 8
-+}
-+"
-+        OTHER_SECTIONS="${OTHER_SECTIONS}
-+  .flashvault_flash_size : { KEEP(*(.flashvault_flash_size .flashvault_flash_size.*)) } > FLASHVAULT_FLASH_SIZE
-+  .flashvault_ram_size   : { KEEP(*(.flashvault_ram_size .flashvault_ram_size.*)) } > FLASHVAULT_RAM_SIZE
-+"
-+        ;;
-+
-+    avr32elf_uc3c[012]128c)
-+        MEMORY="
-+MEMORY
-+{
-+    FLASH (rxai!w) : ORIGIN = 0x80000000, LENGTH = 128K
-+    CPUSRAM (wxa!ri) : ORIGIN = 0x00000004, LENGTH = 0x7FFC
-+    USERPAGE : ORIGIN = 0x80800000, LENGTH = 512
-+    FACTORYPAGE : ORIGIN = 0x80800200, LENGTH = 512
-+    FLASHVAULT_FLASH_SIZE (r) : ORIGIN = 0x80800400, LENGTH = 8
-+    FLASHVAULT_RAM_SIZE (r) : ORIGIN = 0x80800408, LENGTH = 8
-+}
-+"
-+        OTHER_SECTIONS="${OTHER_SECTIONS}
-+  .flashvault_flash_size : { KEEP(*(.flashvault_flash_size .flashvault_flash_size.*)) } > FLASHVAULT_FLASH_SIZE
-+  .flashvault_ram_size   : { KEEP(*(.flashvault_ram_size .flashvault_ram_size.*)) } > FLASHVAULT_RAM_SIZE
-+"
-+        ;;
-+
-+    avr32elf_uc3c[012]64c)
-+        MEMORY="
-+MEMORY
-+{
-+    FLASH (rxai!w) : ORIGIN = 0x80000000, LENGTH = 64K
-+    CPUSRAM (wxa!ri) : ORIGIN = 0x00000004, LENGTH = 0x3FFC
-+    USERPAGE : ORIGIN = 0x80800000, LENGTH = 512
-+    FACTORYPAGE : ORIGIN = 0x80800200, LENGTH = 512
-+    FLASHVAULT_FLASH_SIZE (r) : ORIGIN = 0x80800400, LENGTH = 8
-+    FLASHVAULT_RAM_SIZE (r) : ORIGIN = 0x80800408, LENGTH = 8
-+}
-+"
-+        OTHER_SECTIONS="${OTHER_SECTIONS}
-+  .flashvault_flash_size : { KEEP(*(.flashvault_flash_size .flashvault_flash_size.*)) } > FLASHVAULT_FLASH_SIZE
-+  .flashvault_ram_size   : { KEEP(*(.flashvault_ram_size .flashvault_ram_size.*)) } > FLASHVAULT_RAM_SIZE
-+"
-+        ;;
-+
-+   avr32elf_uc3[ac][012]512*)
-+       MEMORY="
-+MEMORY
-+{
-+    FLASH (rxai!w) : ORIGIN = 0x80000000, LENGTH = 512K
-+    CPUSRAM (wxa!ri) : ORIGIN = 0x00000004, LENGTH = 0xFFFC
-+    USERPAGE : ORIGIN = 0x80800000, LENGTH = 512
-+    FACTORYPAGE : ORIGIN = 0x80800200, LENGTH = 512
-+}
-+"
-+        ;;
-+
-+    avr32elf_uc3a[012]256*)
-+        MEMORY="
-+MEMORY
-+{
-+    FLASH (rxai!w) : ORIGIN = 0x80000000, LENGTH = 256K
-+    CPUSRAM (wxa!ri) : ORIGIN = 0x00000004, LENGTH = 0xFFFC
-+    USERPAGE : ORIGIN = 0x80800000, LENGTH = 512
-+    FACTORYPAGE : ORIGIN = 0x80800200, LENGTH = 512
-+}
-+"
-+        ;;
-+
-+    avr32elf_uc3b[01]512revc)
-+        MEMORY="
-+MEMORY
-+{
-+    FLASH (rxai!w) : ORIGIN = 0x80000000, LENGTH = 512K
-+    CPUSRAM (wxa!ri) : ORIGIN = 0x00000004, LENGTH = 0x17FFC
-+    USERPAGE : ORIGIN = 0x80800000, LENGTH = 512
-+    FACTORYPAGE : ORIGIN = 0x80800200, LENGTH = 512
-+}
-+"
-+         PADDING="
-+  .padding : {
-+  QUAD(0)
-+  QUAD(0)
-+  QUAD(0)
-+  QUAD(0)
-+  } >FLASH AT>FLASH
-+"
-+        ;;
-+
-+    avr32elf_uc3b[01]512)
-+        MEMORY="
-+MEMORY
-+{
-+    FLASH (rxai!w) : ORIGIN = 0x80000000, LENGTH = 512K
-+    CPUSRAM (wxa!ri) : ORIGIN = 0x00000004, LENGTH = 0x17FFC
-+    USERPAGE : ORIGIN = 0x80800000, LENGTH = 512
-+    FACTORYPAGE : ORIGIN = 0x80800200, LENGTH = 512
-+}
-+"
-+        ;;
-+
-+    avr32elf_uc3b[01]256*)
-+        MEMORY="
-+MEMORY
-+{
-+    FLASH (rxai!w) : ORIGIN = 0x80000000, LENGTH = 256K
-+    CPUSRAM (wxa!ri) : ORIGIN = 0x00000004, LENGTH = 0x7FFC
-+    USERPAGE : ORIGIN = 0x80800000, LENGTH = 512
-+    FACTORYPAGE : ORIGIN = 0x80800200, LENGTH = 512
-+}
-+"
-+        ;;
-+
-+    avr32elf_uc3[ab][012]128*)
-+        MEMORY="
-+MEMORY
-+{
-+    FLASH (rxai!w) : ORIGIN = 0x80000000, LENGTH = 128K
-+    CPUSRAM (wxa!ri) : ORIGIN = 0x00000004, LENGTH = 0x7FFC
-+    USERPAGE : ORIGIN = 0x80800000, LENGTH = 512
-+    FACTORYPAGE : ORIGIN = 0x80800200, LENGTH = 512
-+}
-+"
-+        ;;
-+
-+    avr32elf_uc3b[0123]64*)
-+        MEMORY="
-+MEMORY
-+{
-+    FLASH (rxai!w) : ORIGIN = 0x80000000, LENGTH = 64K
-+    CPUSRAM (wxa!ri) : ORIGIN = 0x00000004, LENGTH = 0x3FFC
-+    USERPAGE : ORIGIN = 0x80800000, LENGTH = 512
-+    FACTORYPAGE : ORIGIN = 0x80800200, LENGTH = 512
-+}
-+"
-+        ;;
-+
-+    avr32elf_uc3a3256*)
-+        MEMORY="
-+MEMORY
-+{
-+    FLASH (rxai!w) : ORIGIN = 0x80000000, LENGTH = 256K
-+    CPUSRAM (wxa!ri) : ORIGIN = 0x00000004, LENGTH = 0xFFFC
-+    HSBSRAM (wxa!ri) : ORIGIN = 0xFF000000, LENGTH = 64K
-+    USERPAGE : ORIGIN = 0x80800000, LENGTH = 512
-+    FACTORYPAGE : ORIGIN = 0x80800200, LENGTH = 512
-+}
-+"
-+        OTHER_SECTIONS="${OTHER_SECTIONS}
-+  .hsbsram       : { *(.hsbsram .hsbsram.*) } >HSBSRAM AT>FLASH :FLASH
-+"
-+  		
-+        ;;
-+
-+    avr32elf_uc3a3128*)
-+        MEMORY="
-+MEMORY
-+{
-+    FLASH (rxai!w) : ORIGIN = 0x80000000, LENGTH = 128K
-+    CPUSRAM (wxa!ri) : ORIGIN = 0x00000004, LENGTH = 0xFFFC
-+    HSBSRAM (wxa!ri) : ORIGIN = 0xFF000000, LENGTH = 64K
-+    USERPAGE : ORIGIN = 0x80800000, LENGTH = 512
-+    FACTORYPAGE : ORIGIN = 0x80800200, LENGTH = 512
-+}
-+"
-+        OTHER_SECTIONS="${OTHER_SECTIONS}
-+  .hsbsram       : { *(.hsbsram .hsbsram.*) } >HSBSRAM AT>FLASH :FLASH
-+"
-+        ;;
-+
-+    avr32elf_uc3a364*)
-+        MEMORY="
-+MEMORY
-+{
-+    FLASH (rxai!w) : ORIGIN = 0x80000000, LENGTH = 64K
-+    CPUSRAM (wxa!ri) : ORIGIN = 0x00000004, LENGTH = 0xFFFC
-+    HSBSRAM (wxa!ri) : ORIGIN = 0xFF000000, LENGTH = 64K
-+    USERPAGE : ORIGIN = 0x80800000, LENGTH = 512
-+    FACTORYPAGE : ORIGIN = 0x80800200, LENGTH = 512
-+}
-+"
-+        OTHER_SECTIONS="${OTHER_SECTIONS}
-+  .hsbsram       : { *(.hsbsram .hsbsram.*) } >HSBSRAM AT>FLASH :FLASH
-+"
-+        ;;
-+
-+
-+    avr32elf_uc3l[0123]64*)
-+        MEMORY="
-+MEMORY
-+{
-+    FLASH (rxai!w) : ORIGIN = 0x80000000, LENGTH = 64K
-+    CPUSRAM (wxa!ri) : ORIGIN = 0x00000004, LENGTH = 0x3FFC
-+    USERPAGE : ORIGIN = 0x80800000, LENGTH = 512
-+    FACTORYPAGE : ORIGIN = 0x80800200, LENGTH = 512
-+    FLASHVAULT_FLASH_SIZE (r) : ORIGIN = 0x80800400, LENGTH = 8
-+    FLASHVAULT_RAM_SIZE (r) : ORIGIN = 0x80800408, LENGTH = 8
-+}
-+"
-+        OTHER_SECTIONS="${OTHER_SECTIONS}
-+  .flashvault_flash_size : { KEEP(*(.flashvault_flash_size .flashvault_flash_size.*)) } > FLASHVAULT_FLASH_SIZE
-+  .flashvault_ram_size   : { KEEP(*(.flashvault_ram_size .flashvault_ram_size.*)) } > FLASHVAULT_RAM_SIZE
-+"
-+        ;;
-+
-+    avr32elf_uc3l[0123]32*)
-+        MEMORY="
-+MEMORY
-+{
-+    FLASH (rxai!w) : ORIGIN = 0x80000000, LENGTH = 32K
-+    CPUSRAM (wxa!ri) : ORIGIN = 0x00000004, LENGTH = 0x3FFC
-+    USERPAGE : ORIGIN = 0x80800000, LENGTH = 512
-+    FACTORYPAGE : ORIGIN = 0x80800200, LENGTH = 512
-+    FLASHVAULT_FLASH_SIZE (r) : ORIGIN = 0x80800400, LENGTH = 8
-+    FLASHVAULT_RAM_SIZE (r) : ORIGIN = 0x80800408, LENGTH = 8
-+}
-+"
-+        OTHER_SECTIONS="${OTHER_SECTIONS}
-+  .flashvault_flash_size : { KEEP(*(.flashvault_flash_size .flashvault_flash_size.*)) } > FLASHVAULT_FLASH_SIZE
-+  .flashvault_ram_size   : { KEEP(*(.flashvault_ram_size .flashvault_ram_size.*)) } > FLASHVAULT_RAM_SIZE
-+"
-+        ;;
-+
-+    avr32elf_uc3l[0123]16*)
-+        MEMORY="
-+MEMORY
-+{
-+    FLASH (rxai!w) : ORIGIN = 0x80000000, LENGTH = 16K
-+    CPUSRAM (wxa!ri) : ORIGIN = 0x00000004, LENGTH = 0x1FFC
-+    USERPAGE : ORIGIN = 0x80800000, LENGTH = 512
-+    FACTORYPAGE : ORIGIN = 0x80800200, LENGTH = 512
-+    FLASHVAULT_FLASH_SIZE (r) : ORIGIN = 0x80800400, LENGTH = 8
-+    FLASHVAULT_RAM_SIZE (r) : ORIGIN = 0x80800408, LENGTH = 8
-+}
-+"
-+        OTHER_SECTIONS="${OTHER_SECTIONS}
-+  .flashvault_flash_size : { KEEP(*(.flashvault_flash_size .flashvault_flash_size.*)) } > FLASHVAULT_FLASH_SIZE
-+  .flashvault_ram_size   : { KEEP(*(.flashvault_ram_size .flashvault_ram_size.*)) } > FLASHVAULT_RAM_SIZE
-+"
-+        ;;
-+
-+
-+    esac
-+    ;;
-+
-+esac
-diff -Nur binutils-2.21.orig/ld/emulparams/avr32linux.sh binutils-2.21/ld/emulparams/avr32linux.sh
---- binutils-2.21.orig/ld/emulparams/avr32linux.sh	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.21/ld/emulparams/avr32linux.sh	2011-08-28 14:56:22.757982985 +0200
-@@ -0,0 +1,14 @@
-+ARCH=avr32
-+SCRIPT_NAME=elf
-+TEMPLATE_NAME=elf32
-+EXTRA_EM_FILE=avr32elf
-+OUTPUT_FORMAT="elf32-avr32"
-+GENERATE_SHLIB_SCRIPT=yes
-+MAXPAGESIZE=0x1000
-+TEXT_START_ADDR=0x00001000
-+NOP=0xd703d703
-+
-+# This appears to place the GOT before the data section, which is
-+# 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 -Nur binutils-2.21.orig/ld/emultempl/avr32elf.em binutils-2.21/ld/emultempl/avr32elf.em
---- binutils-2.21.orig/ld/emultempl/avr32elf.em	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.21/ld/emultempl/avr32elf.em	2011-08-28 14:56:22.807982389 +0200
-@@ -0,0 +1,162 @@
-+# This shell script emits a C file. -*- C -*-
-+#   Copyright (C) 2007,2008,2009 Atmel Corporation
-+#
-+# This file is part of GLD, the Gnu Linker.
-+#
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-+#
-+
-+# This file is sourced from elf32.em, and defines extra avr32-elf
-+# specific routines.
-+#
-+
-+# Generate linker script for writable rodata
-+LD_FLAG=rodata-writable
-+DATA_ALIGNMENT=${DATA_ALIGNMENT_}
-+RELOCATING=" "
-+WRITABLE_RODATA=" "
-+( echo "/* Linker script for writable rodata */"
-+  . ${CUSTOMIZER_SCRIPT} ${EMULATION_NAME}
-+  . ${srcdir}/scripttempl/${SCRIPT_NAME}.sc
-+) | sed -e '/^ *$/d;s/[ 	]*$//' > ldscripts/${EMULATION_NAME}.xwr
-+
-+
-+cat >> e${EMULATION_NAME}.c <<EOF
-+
-+#include "libbfd.h"
-+#include "elf32-avr32.h"
-+
-+/* Whether to allow direct references (sub or mov) to SEC_DATA and
-+   !SEC_CONTENTS sections when optimizing.  Not enabled by default
-+   since it might cause link errors.  */
-+static int direct_data_refs = 0;
-+
-+static void avr32_elf_after_open (void)
-+{
-+  bfd_elf32_avr32_set_options (&link_info, direct_data_refs);
-+  gld${EMULATION_NAME}_after_open ();
-+}
-+
-+static int rodata_writable = 0;
-+
-+static int stack_size = 0x1000;
-+
-+static void avr32_elf_set_symbols (void)
-+{
-+  /* Glue the assignments into the abs section.  */
-+  lang_statement_list_type *save = stat_ptr;
-+
-+
-+  stat_ptr = &(abs_output_section->children);
-+
-+  lang_add_assignment (exp_assop ('=', "_stack_size",
-+                                  exp_intop (stack_size)));
-+  
-+  stat_ptr = save;
-+}
-+
-+static char * gld${EMULATION_NAME}_get_script (int *isfile);
-+
-+static char * avr32_elf_get_script (int *isfile)
-+{
-+  if ( rodata_writable )
-+    {
-+EOF
-+if test -n "$COMPILE_IN"
-+then
-+# Scripts compiled in.
-+
-+# sed commands to quote an ld script as a C string.
-+sc="-f stringify.sed"
-+
-+cat >>e${EMULATION_NAME}.c <<EOF
-+      *isfile = 0;
-+      return
-+EOF
-+sed $sc ldscripts/${EMULATION_NAME}.xwr			>> e${EMULATION_NAME}.c
-+echo  ';'	                                        >> e${EMULATION_NAME}.c
-+else
-+# Scripts read from the filesystem.
-+
-+cat >>e${EMULATION_NAME}.c <<EOF
-+      *isfile = 1;
-+      return "ldscripts/${EMULATION_NAME}.xwr";
-+EOF
-+fi
-+
-+cat >>e${EMULATION_NAME}.c <<EOF
-+    }
-+  return gld${EMULATION_NAME}_get_script (isfile);
-+}
-+
-+
-+EOF
-+
-+# Define some shell vars to insert bits of code into the standard elf
-+# parse_args and list_options functions.
-+#
-+PARSE_AND_LIST_PROLOGUE='
-+#define OPTION_DIRECT_DATA		300
-+#define OPTION_NO_DIRECT_DATA		301
-+#define OPTION_RODATA_WRITABLE		302
-+#define OPTION_NO_RODATA_WRITABLE	303
-+#define OPTION_STACK 	                304
-+'
-+
-+PARSE_AND_LIST_LONGOPTS='
-+  { "direct-data", no_argument, NULL, OPTION_DIRECT_DATA },
-+  { "no-direct-data", no_argument, NULL, OPTION_NO_DIRECT_DATA },
-+  { "rodata-writable", no_argument, NULL, OPTION_RODATA_WRITABLE },
-+  { "no-rodata-writable", no_argument, NULL, OPTION_NO_RODATA_WRITABLE },
-+  { "stack", required_argument, NULL, OPTION_STACK },
-+'
-+
-+PARSE_AND_LIST_OPTIONS='
-+  fprintf (file, _("  --direct-data\t\tAllow direct data references when optimizing\n"));
-+  fprintf (file, _("  --no-direct-data\tDo not allow direct data references when optimizing\n"));
-+  fprintf (file, _("  --rodata-writable\tPut read-only data in writable data section\n"));
-+  fprintf (file, _("  --no-rodata-writable\tDo not put read-only data in writable data section\n"));
-+  fprintf (file, _("  --stack <size>\tSet the initial size of the stack\n"));
-+'
-+
-+PARSE_AND_LIST_ARGS_CASES='
-+    case OPTION_DIRECT_DATA:
-+      direct_data_refs = 1;
-+      break;
-+    case OPTION_NO_DIRECT_DATA:
-+      direct_data_refs = 0;
-+      break;
-+    case OPTION_RODATA_WRITABLE:
-+      rodata_writable = 1;
-+      break;
-+    case OPTION_NO_RODATA_WRITABLE:
-+      rodata_writable = 0;
-+      break;
-+    case OPTION_STACK: 
-+     {
-+      char *end;
-+      stack_size = strtoul (optarg, &end, 0);
-+      if (end == optarg)
-+        einfo (_("%P%F: invalid hex number for parameter '%s'\n"), optarg);
-+      optarg = end;
-+      break;
-+     }
-+'
-+
-+# Replace some of the standard ELF functions with our own versions.
-+#
-+LDEMUL_AFTER_OPEN=avr32_elf_after_open
-+LDEMUL_GET_SCRIPT=avr32_elf_get_script
-+LDEMUL_SET_SYMBOLS=avr32_elf_set_symbols
-diff -Nur binutils-2.21.orig/ld/Makefile.am binutils-2.21/ld/Makefile.am
---- binutils-2.21.orig/ld/Makefile.am	2010-11-03 04:22:01.000000000 +0100
-+++ binutils-2.21/ld/Makefile.am	2011-08-28 14:56:22.837980145 +0200
-@@ -162,6 +162,58 @@
- 	eavr5.c \
- 	eavr51.c \
- 	eavr6.c \
-+	eavr32elf_ap7000.o \
-+	eavr32elf_ap7001.o \
-+	eavr32elf_ap7002.o \
-+	eavr32elf_ap7200.o \
-+	eavr32elf_uc3a0128.o \
-+	eavr32elf_uc3a0256.o \
-+	eavr32elf_uc3a0512.o \
-+	eavr32elf_uc3a0512es.o \
-+	eavr32elf_uc3a1128.o \
-+	eavr32elf_uc3a1256.o \
-+	eavr32elf_uc3a1512es.o \
-+	eavr32elf_uc3a1512.o \
-+	eavr32elf_uc3a364.o \
-+	eavr32elf_uc3a364s.o \
-+	eavr32elf_uc3a3128.o \
-+	eavr32elf_uc3a3128s.o \
-+	eavr32elf_uc3a3256.o \
-+	eavr32elf_uc3a3256s.o \
-+	eavr32elf_uc3b064.o \
-+	eavr32elf_uc3b0128.o \
-+	eavr32elf_uc3b0256es.o \
-+	eavr32elf_uc3b0256.o \
-+	eavr32elf_uc3b0512.o \
-+	eavr32elf_uc3b0512revc.o \
-+	eavr32elf_uc3b164.o \
-+	eavr32elf_uc3b1128.o \
-+	eavr32elf_uc3b1256es.o \
-+	eavr32elf_uc3b1256.o \
-+	eavr32elf_uc3b1512.o \
-+	eavr32elf_uc3b1512revc.o \
-+	eavr32elf_uc3c0512crevc.o \
-+	eavr32elf_uc3c1512crevc.o \
-+	eavr32elf_uc3c2512crevc.o \
-+	eavr32elf_atuc3l0256.o \
-+        eavr32elf_mxt768e.o \
-+	eavr32elf_uc3l064.o \
-+	eavr32elf_uc3l032.o \
-+	eavr32elf_uc3l016.o \
-+	eavr32elf_uc3l064revb.o \
-+	eavr32elf_uc3c064c.o \
-+	eavr32elf_uc3c0128c.o \
-+	eavr32elf_uc3c0256c.o \
-+	eavr32elf_uc3c0512c.o \
-+	eavr32elf_uc3c164c.o \
-+	eavr32elf_uc3c1128c.o \
-+	eavr32elf_uc3c1256c.o \
-+	eavr32elf_uc3c1512c.o \
-+	eavr32elf_uc3c264c.o \
-+	eavr32elf_uc3c2128c.o \
-+	eavr32elf_uc3c2256c.o \
-+	eavr32elf_uc3c2512c.o \
-+	eavr32linux.o \
- 	ecoff_i860.c \
- 	ecoff_sparc.c \
- 	eelf32_spu.c \
-@@ -760,6 +812,214 @@
-   $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
-   ${GEN_DEPENDS}
- 	${GENSCRIPTS} avr6 "$(tdir_avr2)"
-+eavr32elf_ap7000.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_ap7000 "$(tdir_avr32)" avr32elf
-+eavr32elf_ap7001.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_ap7001 "$(tdir_avr32)" avr32elf
-+eavr32elf_ap7002.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_ap7002 "$(tdir_avr32)" avr32elf
-+eavr32elf_ap7200.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_ap7200 "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3a0128.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3a0128 "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3a0256.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3a0256 "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3a0512.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3a0512 "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3a0512es.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3a0512es "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3a1128.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3a1128 "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3a1256.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3a1256 "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3a1512.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3a1512 "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3a1512es.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3a1512es "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3a364.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3a364 "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3a364s.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3a364s "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3a3128.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3a3128 "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3a3128s.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3a3128s "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3a3256.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3a3256 "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3a3256s.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3a3256s "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3b064.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3b064 "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3b0128.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3b0128 "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3b0256.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3b0256 "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3b0256es.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3b0256es "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3b0512.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3b0512 "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3b0512revc.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3b0512revc "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3b164.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3b164 "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3b1128.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3b1128 "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3b1256.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3b1256 "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3b1256es.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3b1256es "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3b1512.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3b1512 "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3b1512revc.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3b1512revc "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3c0512crevc.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3c0512crevc "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3c1512crevc.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3c1512crevc "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3c2512crevc.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3c2512crevc "$(tdir_avr32)" avr32elf
-+eavr32elf_atuc3l0256.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_atuc3l0256 "$(tdir_avr32)" avr32elf
-+eavr32elf_mxt768e.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_mxt768e "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3l064.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3l064 "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3l032.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3l032 "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3l016.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3l016 "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3l064revb.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3l064revb "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3c064c.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3c064c "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3c0128c.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3c0128c "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3c0256c.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3c0256c "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3c0512c.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3c0512c "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3c164c.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3c164c "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3c1128c.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3c1128c "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3c1256c.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3c1256c "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3c1512c.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3c1512c "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3c264c.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3c264c "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3c2128c.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3c2128c "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3c2256c.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3c2256c "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3c2512c.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3c2512c "$(tdir_avr32)" avr32elf
-+eavr32linux.c: $(srcdir)/emulparams/avr32linux.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32linux "$(tdir_avr32)"
- ecoff_i860.c: $(srcdir)/emulparams/coff_i860.sh \
-   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/i860coff.sc ${GEN_DEPENDS}
- 	${GENSCRIPTS} coff_i860 "$(tdir_coff_i860)"
-@@ -2052,7 +2312,9 @@
- 	  fi; \
- 	fi
- 
--install-data-local:
-+# We want install to imply install-info as per GNU standards, despite the
-+# cygnus option.
-+install-data-local: install-info
- 	$(mkinstalldirs) $(DESTDIR)$(scriptdir)/ldscripts
- 	for f in ldscripts/*; do \
- 	  $(INSTALL_DATA) $$f $(DESTDIR)$(scriptdir)/$$f ; \
-diff -Nur binutils-2.21.orig/ld/Makefile.in binutils-2.21/ld/Makefile.in
---- binutils-2.21.orig/ld/Makefile.in	2010-11-05 11:34:22.000000000 +0100
-+++ binutils-2.21/ld/Makefile.in	2011-08-28 14:56:22.907983934 +0200
-@@ -2183,6 +2183,194 @@
-   $(ELF_DEPS) $(srcdir)/scripttempl/avr.sc \
-   ${GEN_DEPENDS}
- 	${GENSCRIPTS} avr6 "$(tdir_avr2)"
-+eavr32elf_ap7000.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_ap7000 "$(tdir_avr32)" avr32elf
-+eavr32elf_ap7001.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_ap7001 "$(tdir_avr32)" avr32elf
-+eavr32elf_ap7002.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_ap7002 "$(tdir_avr32)" avr32elf
-+eavr32elf_ap7200.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_ap7200 "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3a0128.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3a0128 "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3a0256.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3a0256 "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3a0512.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3a0512 "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3a0512es.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3a0512es "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3a1128.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3a1128 "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3a1256.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3a1256 "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3a1512.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3a1512 "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3a1512es.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3a1512es "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3a364.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3a364 "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3a364s.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3a364s "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3a3128.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3a3128 "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3a3128s.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3a3128s "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3a3256.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3a3256 "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3a3256s.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3a3256s "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3b064.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3b064 "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3b0128.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3b0128 "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3b0256.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3b0256 "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3b0256es.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3b0256es "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3b0512.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3b0512 "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3b0512revc.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3b0512revc "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3b164.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3b164 "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3b1128.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3b1128 "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3b1256.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3b1256 "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3b1256es.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3b1256es "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3b1512.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3b1512 "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3b1512revc.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3b1512revc "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3c064c.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3c064c "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3c0128c.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3c0128c "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3c0256c.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3c0256c "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3c0512crevc.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3c0512crevc "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3c164c.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3c164c "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3c1128c.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3c1128c "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3c1256c.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3c1256c "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3c1512crevc.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3c1512crevc "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3c264c.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3c264c "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3c2128c.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3c2128c "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3c2256c.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3c2256c "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3c2512crevc.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3c2512crevc "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3l064.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3l064 "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3l032.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3l032 "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3l016.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3l016 "$(tdir_avr32)" avr32elf
-+eavr32elf_uc3l064revb.c: $(srcdir)/emulparams/avr32elf.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/avr32.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32elf_uc3l064revb "$(tdir_avr32)" avr32elf
-+eavr32linux.c: $(srcdir)/emulparams/avr32linux.sh \
-+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/avr32elf.em \
-+  $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} avr32linux "$(tdir_avr32)"
- ecoff_i860.c: $(srcdir)/emulparams/coff_i860.sh \
-   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/i860coff.sc ${GEN_DEPENDS}
- 	${GENSCRIPTS} coff_i860 "$(tdir_coff_i860)"
-diff -Nur binutils-2.21.orig/ld/scripttempl/avr32.sc binutils-2.21/ld/scripttempl/avr32.sc
---- binutils-2.21.orig/ld/scripttempl/avr32.sc	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.21/ld/scripttempl/avr32.sc	2011-08-28 14:56:22.957991418 +0200
-@@ -0,0 +1,459 @@
-+#
-+# Unusual variables checked by this code:
-+#	NOP - four byte opcode for no-op (defaults to 0)
-+#	NO_SMALL_DATA - no .sbss/.sbss2/.sdata/.sdata2 sections if not
-+#		empty.
-+#	SMALL_DATA_CTOR - .ctors contains small data.
-+#	SMALL_DATA_DTOR - .dtors contains small data.
-+#	DATA_ADDR - if end-of-text-plus-one-page isn't right for data start
-+#	INITIAL_READONLY_SECTIONS - at start of text segment
-+#	OTHER_READONLY_SECTIONS - other than .text .init .rodata ...
-+#		(e.g., .PARISC.milli)
-+#	OTHER_TEXT_SECTIONS - these get put in .text when relocating
-+#	OTHER_READWRITE_SECTIONS - other than .data .bss .ctors .sdata ...
-+#		(e.g., .PARISC.global)
-+#	OTHER_RELRO_SECTIONS - other than .data.rel.ro ...
-+#		(e.g. PPC32 .fixup, .got[12])
-+#	OTHER_BSS_SECTIONS - other than .bss .sbss ...
-+#	OTHER_SECTIONS - at the end
-+#	EXECUTABLE_SYMBOLS - symbols that must be defined for an
-+#		executable (e.g., _DYNAMIC_LINK)
-+#       TEXT_START_ADDR - the first byte of the text segment, after any
-+#               headers.
-+#       TEXT_BASE_ADDRESS - the first byte of the text segment.
-+#	TEXT_START_SYMBOLS - symbols that appear at the start of the
-+#		.text section.
-+#	DATA_START_SYMBOLS - symbols that appear at the start of the
-+#		.data section.
-+#	OTHER_GOT_SYMBOLS - symbols defined just before .got.
-+#	OTHER_GOT_SECTIONS - sections just after .got.
-+#	OTHER_SDATA_SECTIONS - sections just after .sdata.
-+#	OTHER_BSS_SYMBOLS - symbols that appear at the start of the
-+#		.bss section besides __bss_start.
-+#	DATA_PLT - .plt should be in data segment, not text segment.
-+#	PLT_BEFORE_GOT - .plt just before .got when .plt is in data segement.
-+#	BSS_PLT - .plt should be in bss segment
-+#	TEXT_DYNAMIC - .dynamic in text segment, not data segment.
-+#	EMBEDDED - whether this is for an embedded system.
-+#	SHLIB_TEXT_START_ADDR - if set, add to SIZEOF_HEADERS to set
-+#		start address of shared library.
-+#	INPUT_FILES - INPUT command of files to always include
-+#	WRITABLE_RODATA - if set, the .rodata section should be writable
-+#	INIT_START, INIT_END -  statements just before and just after
-+# 	combination of .init sections.
-+#	FINI_START, FINI_END - statements just before and just after
-+# 	combination of .fini sections.
-+#	STACK_ADDR - start of a .stack section.
-+#	OTHER_END_SYMBOLS - symbols to place right at the end of the script.
-+#	SEPARATE_GOTPLT - if set, .got.plt should be separate output section,
-+#		so that .got can be in the RELRO area.  It should be set to
-+#		the number of bytes in the beginning of .got.plt which can be
-+#		in the RELRO area as well.
-+#
-+# When adding sections, do note that the names of some sections are used
-+# when specifying the start address of the next.
-+#
-+
-+#  Many sections come in three flavours.  There is the 'real' section,
-+#  like ".data".  Then there are the per-procedure or per-variable
-+#  sections, generated by -ffunction-sections and -fdata-sections in GCC,
-+#  and useful for --gc-sections, which for a variable "foo" might be
-+#  ".data.foo".  Then there are the linkonce sections, for which the linker
-+#  eliminates duplicates, which are named like ".gnu.linkonce.d.foo".
-+#  The exact correspondences are:
-+#
-+#  Section	Linkonce section
-+#  .text	.gnu.linkonce.t.foo
-+#  .rodata	.gnu.linkonce.r.foo
-+#  .data	.gnu.linkonce.d.foo
-+#  .bss		.gnu.linkonce.b.foo
-+#  .sdata	.gnu.linkonce.s.foo
-+#  .sbss	.gnu.linkonce.sb.foo
-+#  .sdata2	.gnu.linkonce.s2.foo
-+#  .sbss2	.gnu.linkonce.sb2.foo
-+#  .debug_info	.gnu.linkonce.wi.foo
-+#  .tdata	.gnu.linkonce.td.foo
-+#  .tbss	.gnu.linkonce.tb.foo
-+#
-+#  Each of these can also have corresponding .rel.* and .rela.* sections.
-+
-+test -z "$ENTRY" && ENTRY=_start
-+test -z "${BIG_OUTPUT_FORMAT}" && BIG_OUTPUT_FORMAT=${OUTPUT_FORMAT}
-+test -z "${LITTLE_OUTPUT_FORMAT}" && LITTLE_OUTPUT_FORMAT=${OUTPUT_FORMAT}
-+if [ -z "$MACHINE" ]; then OUTPUT_ARCH=${ARCH}; else OUTPUT_ARCH=${ARCH}:${MACHINE}; fi
-+test -z "${ELFSIZE}" && ELFSIZE=32
-+test -z "${ALIGNMENT}" && ALIGNMENT="${ELFSIZE} / 8"
-+test "$LD_FLAG" = "N" && DATA_ADDR=.
-+test -n "$CREATE_SHLIB$CREATE_PIE" && test -n "$SHLIB_DATA_ADDR" && COMMONPAGESIZE=""
-+test -z "$CREATE_SHLIB$CREATE_PIE" && test -n "$DATA_ADDR" && COMMONPAGESIZE=""
-+test -n "$RELRO_NOW" && unset SEPARATE_GOTPLT
-+if test -n "$RELOCATING"; then
-+  RO_REGION="${RO_VMA_REGION+ >}${RO_VMA_REGION}${RO_LMA_REGION+ AT>}${RO_LMA_REGION}"
-+  RW_REGION="${RW_VMA_REGION+ >}${RW_VMA_REGION}${RW_LMA_REGION+ AT>}${RW_LMA_REGION}"
-+  RW_BSS_REGION="${RW_VMA_REGION+ >}${RW_VMA_REGION}"
-+else
-+  RO_REGION=""
-+  RW_REGION=""
-+  RW_BSS_REGION=""
-+fi
-+INTERP=".interp       ${RELOCATING-0} : { *(.interp) }${RO_REGION}"
-+PLT=".plt          ${RELOCATING-0} : { *(.plt) }"
-+if test -z "$GOT"; then
-+  if test -z "$SEPARATE_GOTPLT"; then
-+    GOT=".got          ${RELOCATING-0} : { *(.got.plt) *(.got) }"
-+  else
-+    GOT=".got          ${RELOCATING-0} : { *(.got) }"
-+    GOTPLT="${RELOCATING+${DATA_SEGMENT_RELRO_GOTPLT_END}}
-+  .got.plt      ${RELOCATING-0} : { *(.got.plt) }"
-+  fi
-+fi
-+DALIGN=".dalign	: { . = ALIGN(${DATA_SEGMENT_ALIGN}); PROVIDE(_data_lma = .); }${RO_REGION}"
-+BALIGN=".balign	: { . = ALIGN(${BSS_ALIGNMENT}); _edata = .; }${RW_REGION}"
-+DYNAMIC=".dynamic      ${RELOCATING-0} : { *(.dynamic) }"
-+RODATA=".rodata       ${RELOCATING-0} : { *(.rodata${RELOCATING+ .rodata.* .gnu.linkonce.r.*}) }"
-+DATARELRO=".data.rel.ro : { *(.data.rel.ro.local) *(.data.rel.ro*) }${RW_REGION}"
-+STACKNOTE="/DISCARD/ : { *(.note.GNU-stack) }"
-+if test -z "${NO_SMALL_DATA}"; then
-+  SBSS=".sbss         ${RELOCATING-0} :
-+  {
-+    ${RELOCATING+PROVIDE (__sbss_start = .);}
-+    ${RELOCATING+PROVIDE (___sbss_start = .);}
-+    ${CREATE_SHLIB+*(.sbss2 .sbss2.* .gnu.linkonce.sb2.*)}
-+    *(.dynsbss)
-+    *(.sbss${RELOCATING+ .sbss.* .gnu.linkonce.sb.*})
-+    *(.scommon)
-+    ${RELOCATING+PROVIDE (__sbss_end = .);}
-+    ${RELOCATING+PROVIDE (___sbss_end = .);}
-+  }${RW_BSS_REGION}"
-+  SBSS2=".sbss2        ${RELOCATING-0} : { *(.sbss2${RELOCATING+ .sbss2.* .gnu.linkonce.sb2.*}) }${RW_REGION}"
-+  SDATA="/* We want the small data sections together, so single-instruction offsets
-+     can access them all, and initialized data all before uninitialized, so
-+     we can shorten the on-disk segment size.  */
-+  .sdata        ${RELOCATING-0} :
-+  {
-+    ${RELOCATING+${SDATA_START_SYMBOLS}}
-+    ${CREATE_SHLIB+*(.sdata2 .sdata2.* .gnu.linkonce.s2.*)}
-+    *(.sdata${RELOCATING+ .sdata.* .gnu.linkonce.s.*})
-+  }${RW_REGION}"
-+  SDATA2=".sdata2       ${RELOCATING-0} : { *(.sdata2${RELOCATING+ .sdata2.* .gnu.linkonce.s2.*}) }${RW_REGION}"
-+  REL_SDATA=".rel.sdata    ${RELOCATING-0} : { *(.rel.sdata${RELOCATING+ .rel.sdata.* .rel.gnu.linkonce.s.*}) }${RO_REGION}
-+  .rela.sdata   ${RELOCATING-0} : { *(.rela.sdata${RELOCATING+ .rela.sdata.* .rela.gnu.linkonce.s.*}) }"
-+  REL_SBSS=".rel.sbss     ${RELOCATING-0} : { *(.rel.sbss${RELOCATING+ .rel.sbss.* .rel.gnu.linkonce.sb.*}) }${RO_REGION}
-+  .rela.sbss    ${RELOCATING-0} : { *(.rela.sbss${RELOCATING+ .rela.sbss.* .rela.gnu.linkonce.sb.*}) }${RO_REGION}"
-+  REL_SDATA2=".rel.sdata2   ${RELOCATING-0} : { *(.rel.sdata2${RELOCATING+ .rel.sdata2.* .rel.gnu.linkonce.s2.*}) }${RO_REGION}
-+  .rela.sdata2  ${RELOCATING-0} : { *(.rela.sdata2${RELOCATING+ .rela.sdata2.* .rela.gnu.linkonce.s2.*}) }${RO_REGION}"
-+  REL_SBSS2=".rel.sbss2    ${RELOCATING-0} : { *(.rel.sbss2${RELOCATING+ .rel.sbss2.* .rel.gnu.linkonce.sb2.*}) }${RO_REGION}
-+  .rela.sbss2   ${RELOCATING-0} : { *(.rela.sbss2${RELOCATING+ .rela.sbss2.* .rela.gnu.linkonce.sb2.*}) }${RO_REGION}"
-+else
-+  NO_SMALL_DATA=" "
-+fi
-+test -n "$SEPARATE_GOTPLT" && SEPARATE_GOTPLT=" "
-+CTOR=".ctors        ${CONSTRUCTING-0} :
-+  {
-+    ${CONSTRUCTING+${CTOR_START}}
-+    /* gcc uses crtbegin.o to find the start of
-+       the constructors, so we make sure it is
-+       first.  Because this is a wildcard, it
-+       doesn't matter if the user does not
-+       actually link against crtbegin.o; the
-+       linker won't look for a file to match a
-+       wildcard.  The wildcard also means that it
-+       doesn't matter which directory crtbegin.o
-+       is in.  */
-+
-+    KEEP (*crtbegin*.o(.ctors))
-+
-+    /* We don't want to include the .ctor section from
-+       from the crtend.o file until after the sorted ctors.
-+       The .ctor section from the crtend file contains the
-+       end of ctors marker and it must be last */
-+
-+    KEEP (*(EXCLUDE_FILE (*crtend*.o $OTHER_EXCLUDE_FILES) .ctors))
-+    KEEP (*(SORT(.ctors.*)))
-+    KEEP (*(.ctors))
-+    ${CONSTRUCTING+${CTOR_END}}
-+  }"
-+DTOR=".dtors        ${CONSTRUCTING-0} :
-+  {
-+    ${CONSTRUCTING+${DTOR_START}}
-+    KEEP (*crtbegin*.o(.dtors))
-+    KEEP (*(EXCLUDE_FILE (*crtend*.o $OTHER_EXCLUDE_FILES) .dtors))
-+    KEEP (*(SORT(.dtors.*)))
-+    KEEP (*(.dtors))
-+    ${CONSTRUCTING+${DTOR_END}}
-+  }"
-+STACK=".stack        ${RELOCATING-0}${RELOCATING+${STACK_ADDR}} :
-+  {
-+    ${RELOCATING+_stack = .;}
-+    *(.stack)
-+    ${RELOCATING+${STACK_SIZE+. = ${STACK_SIZE};}}
-+    ${RELOCATING+_estack = .;}
-+  }${RW_BSS_REGION}"
-+
-+# if this is for an embedded system, don't add SIZEOF_HEADERS.
-+if [ -z "$EMBEDDED" ]; then
-+   test -z "${TEXT_BASE_ADDRESS}" && TEXT_BASE_ADDRESS="${TEXT_START_ADDR} + SIZEOF_HEADERS"
-+else
-+   test -z "${TEXT_BASE_ADDRESS}" && TEXT_BASE_ADDRESS="${TEXT_START_ADDR}"
-+fi
-+
-+cat <<EOF
-+OUTPUT_FORMAT("${OUTPUT_FORMAT}", "${BIG_OUTPUT_FORMAT}",
-+	      "${LITTLE_OUTPUT_FORMAT}")
-+OUTPUT_ARCH(${OUTPUT_ARCH})
-+ENTRY(${ENTRY})
-+
-+${RELOCATING+${LIB_SEARCH_DIRS}}
-+${RELOCATING+/* Do we need any of these for elf?
-+   __DYNAMIC = 0; ${STACKZERO+${STACKZERO}} ${SHLIB_PATH+${SHLIB_PATH}}  */}
-+${RELOCATING+${EXECUTABLE_SYMBOLS}}
-+${RELOCATING+${INPUT_FILES}}
-+${RELOCATING- /* For some reason, the Solaris linker makes bad executables
-+  if gld -r is used and the intermediate file has sections starting
-+  at non-zero addresses.  Could be a Solaris ld bug, could be a GNU ld
-+  bug.  But for now assigning the zero vmas works.  */}
-+
-+${RELOCATING+${MEMORY}}
-+
-+SECTIONS
-+{
-+  /* Read-only sections, merged into text segment: */
-+  ${CREATE_SHLIB-${CREATE_PIE-${RELOCATING+PROVIDE (__executable_start = ${TEXT_START_ADDR}); . = ${TEXT_BASE_ADDRESS};}}}
-+  ${PADDING}
-+  ${CREATE_SHLIB+${RELOCATING+. = ${SHLIB_TEXT_START_ADDR:-0} + SIZEOF_HEADERS;}}
-+  ${CREATE_PIE+${RELOCATING+. = ${SHLIB_TEXT_START_ADDR:-0} + SIZEOF_HEADERS;}}
-+  ${CREATE_SHLIB-${INTERP}}
-+  ${INITIAL_READONLY_SECTIONS}
-+  ${TEXT_DYNAMIC+${DYNAMIC}${RO_REGION}}
-+  .hash         ${RELOCATING-0} : { *(.hash) }${RO_REGION}
-+  .dynsym       ${RELOCATING-0} : { *(.dynsym) }${RO_REGION}
-+  .dynstr       ${RELOCATING-0} : { *(.dynstr) }${RO_REGION}
-+  .gnu.version  ${RELOCATING-0} : { *(.gnu.version) }${RO_REGION}
-+  .gnu.version_d ${RELOCATING-0}: { *(.gnu.version_d) }${RO_REGION}
-+  .gnu.version_r ${RELOCATING-0}: { *(.gnu.version_r) }${RO_REGION}
-+
-+EOF
-+if [ "x$COMBRELOC" = x ]; then
-+  COMBRELOCCAT=cat
-+else
-+  COMBRELOCCAT="cat > $COMBRELOC"
-+fi
-+eval $COMBRELOCCAT <<EOF
-+  .rel.init     ${RELOCATING-0} : { *(.rel.init) }${RO_REGION}
-+  .rela.init    ${RELOCATING-0} : { *(.rela.init) }${RO_REGION}
-+  .rel.text     ${RELOCATING-0} : { *(.rel.text${RELOCATING+ .rel.text.* .rel.gnu.linkonce.t.*}) }${RO_REGION}
-+  .rela.text    ${RELOCATING-0} : { *(.rela.text${RELOCATING+ .rela.text.* .rela.gnu.linkonce.t.*}) }${RO_REGION}
-+  .rel.fini     ${RELOCATING-0} : { *(.rel.fini) }${RO_REGION}
-+  .rela.fini    ${RELOCATING-0} : { *(.rela.fini) }${RO_REGION}
-+  .rel.rodata   ${RELOCATING-0} : { *(.rel.rodata${RELOCATING+ .rel.rodata.* .rel.gnu.linkonce.r.*}) }${RO_REGION}
-+  .rela.rodata  ${RELOCATING-0} : { *(.rela.rodata${RELOCATING+ .rela.rodata.* .rela.gnu.linkonce.r.*}) }${RO_REGION}
-+  ${OTHER_READONLY_RELOC_SECTIONS}
-+  .rel.data.rel.ro ${RELOCATING-0} : { *(.rel.data.rel.ro${RELOCATING+*}) }${RO_REGION}
-+  .rela.data.rel.ro ${RELOCATING-0} : { *(.rel.data.rel.ro${RELOCATING+*}) }${RO_REGION}
-+  .rel.data     ${RELOCATING-0} : { *(.rel.data${RELOCATING+ .rel.data.* .rel.gnu.linkonce.d.*}) }${RO_REGION}
-+  .rela.data    ${RELOCATING-0} : { *(.rela.data${RELOCATING+ .rela.data.* .rela.gnu.linkonce.d.*}) }${RO_REGION}
-+  .rel.tdata	${RELOCATING-0} : { *(.rel.tdata${RELOCATING+ .rel.tdata.* .rel.gnu.linkonce.td.*}) }${RO_REGION}
-+  .rela.tdata	${RELOCATING-0} : { *(.rela.tdata${RELOCATING+ .rela.tdata.* .rela.gnu.linkonce.td.*}) }${RO_REGION}
-+  .rel.tbss	${RELOCATING-0} : { *(.rel.tbss${RELOCATING+ .rel.tbss.* .rel.gnu.linkonce.tb.*}) }${RO_REGION}
-+  .rela.tbss	${RELOCATING-0} : { *(.rela.tbss${RELOCATING+ .rela.tbss.* .rela.gnu.linkonce.tb.*}) }${RO_REGION}
-+  .rel.ctors    ${RELOCATING-0} : { *(.rel.ctors) }${RO_REGION}
-+  .rela.ctors   ${RELOCATING-0} : { *(.rela.ctors) }${RO_REGION}
-+  .rel.dtors    ${RELOCATING-0} : { *(.rel.dtors) }${RO_REGION}
-+  .rela.dtors   ${RELOCATING-0} : { *(.rela.dtors) }${RO_REGION}
-+  .rel.got      ${RELOCATING-0} : { *(.rel.got) }${RO_REGION}
-+  .rela.got     ${RELOCATING-0} : { *(.rela.got) }${RO_REGION}
-+  ${OTHER_GOT_RELOC_SECTIONS}
-+  ${REL_SDATA}
-+  ${REL_SBSS}
-+  ${REL_SDATA2}
-+  ${REL_SBSS2}
-+  .rel.bss      ${RELOCATING-0} : { *(.rel.bss${RELOCATING+ .rel.bss.* .rel.gnu.linkonce.b.*}) }${RO_REGION}
-+  .rela.bss     ${RELOCATING-0} : { *(.rela.bss${RELOCATING+ .rela.bss.* .rela.gnu.linkonce.b.*}) }${RO_REGION}
-+EOF
-+if [ -n "$COMBRELOC" ]; then
-+cat <<EOF
-+  .rel.dyn      ${RELOCATING-0} :
-+    {
-+EOF
-+sed -e '/^[ 	]*[{}][ 	]*$/d;/:[ 	]*$/d;/\.rela\./d;s/^.*: { *\(.*\)}$/      \1/' $COMBRELOC
-+cat <<EOF
-+    }${RO_REGION}
-+  .rela.dyn     ${RELOCATING-0} :
-+    {
-+EOF
-+sed -e '/^[ 	]*[{}][ 	]*$/d;/:[ 	]*$/d;/\.rel\./d;s/^.*: { *\(.*\)}/      \1/' $COMBRELOC
-+cat <<EOF
-+    }${RO_REGION}
-+EOF
-+fi
-+cat <<EOF
-+  .rel.plt      ${RELOCATING-0} : { *(.rel.plt) }${RO_REGION}
-+  .rela.plt     ${RELOCATING-0} : { *(.rela.plt) }${RO_REGION}
-+  ${OTHER_PLT_RELOC_SECTIONS}
-+
-+  .init         ${RELOCATING-0} :
-+  {
-+    ${RELOCATING+${INIT_START}}
-+    KEEP (*(.init))
-+    ${RELOCATING+${INIT_END}}
-+  }${RO_REGION} =${NOP-0}
-+
-+  ${DATA_PLT-${BSS_PLT-${PLT}${RO_REGION}}}
-+  .text         ${RELOCATING-0} :
-+  {
-+    ${RELOCATING+${TEXT_START_SYMBOLS}}
-+    *(.text .stub${RELOCATING+ .text.* .gnu.linkonce.t.*})
-+    KEEP (*(.text.*personality*))
-+    /* .gnu.warning sections are handled specially by elf32.em.  */
-+    *(.gnu.warning)
-+    ${RELOCATING+${OTHER_TEXT_SECTIONS}}
-+  }${RO_REGION} =${NOP-0}
-+  .fini         ${RELOCATING-0} :
-+  {
-+    ${RELOCATING+${FINI_START}}
-+    KEEP (*(.fini))
-+    ${RELOCATING+${FINI_END}}
-+  }${RO_REGION} =${NOP-0}
-+  ${RELOCATING+PROVIDE (__etext = .);}
-+  ${RELOCATING+PROVIDE (_etext = .);}
-+  ${RELOCATING+PROVIDE (etext = .);}
-+  ${WRITABLE_RODATA-${RODATA}${RO_REGION}}
-+  .rodata1      ${RELOCATING-0} : { *(.rodata1) }${RO_REGION}
-+  ${CREATE_SHLIB-${SDATA2}}
-+  ${CREATE_SHLIB-${SBSS2}}
-+  ${OTHER_READONLY_SECTIONS}
-+  .eh_frame_hdr : { *(.eh_frame_hdr) }${RO_REGION}
-+  .eh_frame     ${RELOCATING-0} : ONLY_IF_RO { KEEP (*(.eh_frame)) }${RO_REGION}
-+  .gcc_except_table ${RELOCATING-0} : ONLY_IF_RO { KEEP (*(.gcc_except_table)) *(.gcc_except_table.*) }${RO_REGION}
-+
-+  ${RELOCATING+${DALIGN}}
-+  ${RELOCATING+PROVIDE (_data = ORIGIN(${RW_VMA_REGION}));}
-+  . = ORIGIN(${RW_VMA_REGION});
-+  /* Exception handling  */
-+  .eh_frame     ${RELOCATING-0} : ONLY_IF_RW { KEEP (*(.eh_frame)) }${RW_REGION}
-+  .gcc_except_table ${RELOCATING-0} : ONLY_IF_RW { KEEP (*(.gcc_except_table)) *(.gcc_except_table.*) }${RW_REGION}
-+
-+  /* Thread Local Storage sections  */
-+  .tdata	${RELOCATING-0} : { *(.tdata${RELOCATING+ .tdata.* .gnu.linkonce.td.*}) }${RW_REGION}
-+  .tbss		${RELOCATING-0} : { *(.tbss${RELOCATING+ .tbss.* .gnu.linkonce.tb.*})${RELOCATING+ *(.tcommon)} }${RW_BSS_REGION}
-+
-+  /* Ensure the __preinit_array_start label is properly aligned.  We
-+     could instead move the label definition inside the section, but
-+     the linker would then create the section even if it turns out to
-+     be empty, which isn't pretty.  */
-+  ${RELOCATING+${CREATE_SHLIB-PROVIDE (__preinit_array_start = ALIGN(${ALIGNMENT}));}}
-+  .preinit_array   ${RELOCATING-0} : { KEEP (*(.preinit_array)) }${RW_REGION}
-+  ${RELOCATING+${CREATE_SHLIB-PROVIDE (__preinit_array_end = .);}}
-+
-+  ${RELOCATING+${CREATE_SHLIB-PROVIDE (__init_array_start = .);}}
-+  .init_array   ${RELOCATING-0} : { KEEP (*(.init_array)) }${RW_REGION}
-+  ${RELOCATING+${CREATE_SHLIB-PROVIDE (__init_array_end = .);}}
-+
-+  ${RELOCATING+${CREATE_SHLIB-PROVIDE (__fini_array_start = .);}}
-+  .fini_array   ${RELOCATING-0} : { KEEP (*(.fini_array)) }${RW_REGION}
-+  ${RELOCATING+${CREATE_SHLIB-PROVIDE (__fini_array_end = .);}}
-+
-+  ${SMALL_DATA_CTOR-${RELOCATING+${CTOR}${RW_REGION}}}
-+  ${SMALL_DATA_DTOR-${RELOCATING+${DTOR}${RW_REGION}}}
-+  .jcr          ${RELOCATING-0} : { KEEP (*(.jcr)) }${RW_REGION}
-+
-+  ${RELOCATING+${DATARELRO}}
-+  ${OTHER_RELRO_SECTIONS}
-+  ${TEXT_DYNAMIC-${DYNAMIC}${RW_REGION}}
-+  ${NO_SMALL_DATA+${RELRO_NOW+${GOT}${RW_REGION}}}
-+  ${NO_SMALL_DATA+${RELRO_NOW-${SEPARATE_GOTPLT+${GOT}${RW_REGION}}}}
-+  ${NO_SMALL_DATA+${RELRO_NOW-${SEPARATE_GOTPLT+${GOTPLT}${RW_REGION}}}}
-+  ${RELOCATING+${DATA_SEGMENT_RELRO_END}}
-+  ${NO_SMALL_DATA+${RELRO_NOW-${SEPARATE_GOTPLT-${GOT}${RW_REGION}}}}
-+
-+  ${DATA_PLT+${PLT_BEFORE_GOT-${PLT}${RW_REGION}}}
-+
-+  .data         ${RELOCATING-0} :
-+  {
-+    ${RELOCATING+${DATA_START_SYMBOLS}}
-+    *(.data${RELOCATING+ .data.* .gnu.linkonce.d.*})
-+    KEEP (*(.gnu.linkonce.d.*personality*))
-+    ${CONSTRUCTING+SORT(CONSTRUCTORS)}
-+  }${RW_REGION}
-+  .data1        ${RELOCATING-0} : { *(.data1) }${RW_REGION}
-+  ${WRITABLE_RODATA+${RODATA}${RW_REGION}}
-+  ${OTHER_READWRITE_SECTIONS}
-+  ${SMALL_DATA_CTOR+${RELOCATING+${CTOR}${RW_REGION}}}
-+  ${SMALL_DATA_DTOR+${RELOCATING+${DTOR}${RW_REGION}}}
-+  ${DATA_PLT+${PLT_BEFORE_GOT+${PLT}${RW_REGION}}}
-+  ${RELOCATING+${OTHER_GOT_SYMBOLS}}
-+  ${NO_SMALL_DATA-${GOT}${RW_REGION}}
-+  ${OTHER_GOT_SECTIONS}
-+  ${SDATA}
-+  ${OTHER_SDATA_SECTIONS}
-+  ${RELOCATING+${BALIGN}}
-+  ${RELOCATING+_edata = .;}
-+  ${RELOCATING+PROVIDE (edata = .);}
-+  ${RELOCATING+__bss_start = .;}
-+  ${RELOCATING+${OTHER_BSS_SYMBOLS}}
-+  ${SBSS}
-+  ${BSS_PLT+${PLT}${RW_REGION}}
-+  .bss          ${RELOCATING-0} :
-+  {
-+   *(.dynbss)
-+   *(.bss${RELOCATING+ .bss.* .gnu.linkonce.b.*})
-+   *(COMMON)
-+   /* Align here to ensure that the .bss section occupies space up to
-+      _end.  Align after .bss to ensure correct alignment even if the
-+      .bss section disappears because there are no input sections.  */
-+   ${RELOCATING+. = ALIGN(${BSS_ALIGNMENT});}
-+  }${RW_BSS_REGION}
-+  ${OTHER_BSS_SECTIONS}
-+  ${RELOCATING+. = ALIGN(${BSS_ALIGNMENT});}
-+  ${RELOCATING+_end = .;}
-+  ${RELOCATING+${OTHER_BSS_END_SYMBOLS}}
-+  ${RELOCATING+PROVIDE (end = .);}
-+  ${RELOCATING+${DATA_SEGMENT_END}}
-+
-+  /* Stabs debugging sections.  */
-+  .stab          0 : { *(.stab) }
-+  .stabstr       0 : { *(.stabstr) }
-+  .stab.excl     0 : { *(.stab.excl) }
-+  .stab.exclstr  0 : { *(.stab.exclstr) }
-+  .stab.index    0 : { *(.stab.index) }
-+  .stab.indexstr 0 : { *(.stab.indexstr) }
-+
-+  .comment       0 : { *(.comment) }
-+
-+  /* DWARF debug sections.
-+     Symbols in the DWARF debugging sections are relative to the beginning
-+     of the section so we begin them at 0.  */
-+
-+  /* DWARF 1 */
-+  .debug          0 : { *(.debug) }
-+  .line           0 : { *(.line) }
-+
-+  /* GNU DWARF 1 extensions */
-+  .debug_srcinfo  0 : { *(.debug_srcinfo) }
-+  .debug_sfnames  0 : { *(.debug_sfnames) }
-+
-+  /* DWARF 1.1 and DWARF 2 */
-+  .debug_aranges  0 : { *(.debug_aranges) }
-+  .debug_pubnames 0 : { *(.debug_pubnames) }
-+
-+  /* DWARF 2 */
-+  .debug_info     0 : { *(.debug_info .gnu.linkonce.wi.*) }
-+  .debug_abbrev   0 : { *(.debug_abbrev) }
-+  .debug_line     0 : { *(.debug_line) }
-+  .debug_frame    0 : { *(.debug_frame) }
-+  .debug_str      0 : { *(.debug_str) }
-+  .debug_loc      0 : { *(.debug_loc) }
-+  .debug_macinfo  0 : { *(.debug_macinfo) }
-+
-+  /* SGI/MIPS DWARF 2 extensions */
-+  .debug_weaknames 0 : { *(.debug_weaknames) }
-+  .debug_funcnames 0 : { *(.debug_funcnames) }
-+  .debug_typenames 0 : { *(.debug_typenames) }
-+  .debug_varnames  0 : { *(.debug_varnames) }
-+
-+  ${STACK_ADDR+${STACK}}
-+  ${OTHER_SECTIONS}
-+  ${RELOCATING+${OTHER_END_SYMBOLS}}
-+  ${RELOCATING+${STACKNOTE}}
-+}
-+EOF
-diff -Nur binutils-2.21.orig/ld/testsuite/ld-avr32/avr32.exp binutils-2.21/ld/testsuite/ld-avr32/avr32.exp
---- binutils-2.21.orig/ld/testsuite/ld-avr32/avr32.exp	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.21/ld/testsuite/ld-avr32/avr32.exp	2011-08-28 14:56:23.007981837 +0200
-@@ -0,0 +1,25 @@
-+# Expect script for AVR32 ELF linker tests.
-+#   Copyright 2004-2006 Atmel Corporation.
-+#
-+# This file is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+#
-+# Written by Haavard Skinnemoen (hskinnemoen@atmel.com)
-+#
-+
-+if ![istarget avr32-*-*] {
-+    return
-+}
-+
-+run_dump_test "pcrel"
-diff -Nur binutils-2.21.orig/ld/testsuite/ld-avr32/pcrel.d binutils-2.21/ld/testsuite/ld-avr32/pcrel.d
---- binutils-2.21.orig/ld/testsuite/ld-avr32/pcrel.d	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.21/ld/testsuite/ld-avr32/pcrel.d	2011-08-28 14:56:23.057982771 +0200
-@@ -0,0 +1,74 @@
-+#name: AVR32 ELF PC-relative external relocs
-+#source: symbols.s
-+#source: ../../../gas/testsuite/gas/avr32/pcrel.s
-+#ld: -T $srcdir/$subdir/pcrel.ld
-+#objdump: -d
-+
-+.*:     file format elf.*avr32.*
-+
-+Disassembly of section .text:
-+
-+a0000000 <_start>:
-+a0000000:	d7 03       	nop
-+a0000002:	d7 03       	nop
-+
-+a0000004 <test_rjmp>:
-+a0000004:	d7 03       	nop
-+a0000006:	c0 28       	rjmp a000000a <test_rjmp\+0x6>
-+a0000008:	d7 03       	nop
-+a000000a:	e0 8f 01 fb 	bral a0000400 <extsym10>
-+
-+a000000e <test_rcall>:
-+a000000e:	d7 03       	nop
-+a0000010 <test_rcall2>:
-+a0000010:	c0 2c       	rcall a0000014 <test_rcall2\+0x4>
-+a0000012:	d7 03       	nop
-+a0000014:	ee b0 ff f6 	rcall a0200000 <extsym21>
-+
-+a0000018 <test_branch>:
-+a0000018:	c0 31       	brne a000001e <test_branch\+0x6>
-+a000001a:	fe 9f ff ff 	bral a0000018 <test_branch>
-+a000001e:	ee 90 ff f1 	breq a0200000 <extsym21>
-+
-+a0000022 <test_lddpc>:
-+a0000022:	48 30       	lddpc r0,a000002c <sym1>
-+a0000024:	48 20       	lddpc r0,a000002c <sym1>
-+a0000026:	fe f0 7f da 	ld.w r0,pc\[32730\]
-+	...
-+
-+a000002c <sym1>:
-+a000002c:	d7 03       	nop
-+a000002e:	d7 03       	nop
-+
-+a0000030 <test_local>:
-+a0000030:	48 20       	lddpc r0,a0000038 <test_local\+0x8>
-+a0000032:	48 30       	lddpc r0,a000003c <test_local\+0xc>
-+a0000034:	48 20       	lddpc r0,a000003c <test_local\+0xc>
-+a0000036:	00 00       	add r0,r0
-+a0000038:	d7 03       	nop
-+a000003a:	d7 03       	nop
-+a000003c:	d7 03       	nop
-+a000003e:	d7 03       	nop
-+
-+Disassembly of section \.text\.init:
-+a0000040 <test_inter_section>:
-+a0000040:	fe b0 ff e7 	rcall a000000e <test_rcall>
-+a0000044:	d7 03       	nop
-+a0000046:	fe b0 ff e4 	rcall a000000e <test_rcall>
-+a000004a:	fe b0 ff e3 	rcall a0000010 <test_rcall2>
-+a000004e:	d7 03       	nop
-+a0000050:	fe b0 ff e0 	rcall a0000010 <test_rcall2>
-+
-+Disassembly of section \.text\.pcrel10:
-+
-+a0000400 <extsym10>:
-+a0000400:	d7 03       	nop
-+
-+Disassembly of section \.text\.pcrel16:
-+
-+a0008000 <extsym16>:
-+a0008000:	d7 03       	nop
-+
-+Disassembly of section \.text\.pcrel21:
-+a0200000 <extsym21>:
-+a0200000:	d7 03       	nop
-diff -Nur binutils-2.21.orig/ld/testsuite/ld-avr32/pcrel.ld binutils-2.21/ld/testsuite/ld-avr32/pcrel.ld
---- binutils-2.21.orig/ld/testsuite/ld-avr32/pcrel.ld	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.21/ld/testsuite/ld-avr32/pcrel.ld	2011-08-28 14:56:23.107980446 +0200
-@@ -0,0 +1,23 @@
-+ENTRY(_start)
-+SECTIONS
-+{
-+	.text 0xa0000000:
-+	{
-+		*(.text)
-+	}
-+
-+	.text.pcrel10 0xa0000400:
-+	{
-+		*(.text.pcrel10)
-+	}
-+
-+	.text.pcrel16 0xa0008000:
-+	{
-+		*(.text.pcrel16)
-+	}
-+
-+	.text.pcrel21 0xa0200000:
-+	{
-+		*(.text.pcrel21)
-+	}
-+}
-diff -Nur binutils-2.21.orig/ld/testsuite/ld-avr32/symbols.s binutils-2.21/ld/testsuite/ld-avr32/symbols.s
---- binutils-2.21.orig/ld/testsuite/ld-avr32/symbols.s	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.21/ld/testsuite/ld-avr32/symbols.s	2011-08-28 14:56:23.177984059 +0200
-@@ -0,0 +1,20 @@
-+	.text
-+	.global _start
-+_start:
-+	nop
-+	nop
-+
-+	.section .text.pcrel10,"ax"
-+	.global extsym10
-+extsym10:
-+	nop
-+
-+	.section .text.pcrel16,"ax"
-+	.global extsym16
-+extsym16:
-+	nop
-+
-+	.section .text.pcrel21,"ax"
-+	.global extsym21
-+extsym21:
-+	nop
-diff -Nur binutils-2.21.orig/opcodes/avr32-asm.c binutils-2.21/opcodes/avr32-asm.c
---- binutils-2.21.orig/opcodes/avr32-asm.c	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.21/opcodes/avr32-asm.c	2011-08-28 14:56:23.217983259 +0200
-@@ -0,0 +1,244 @@
-+/* Assembler interface for AVR32.
-+   Copyright 2005,2006,2007,2008,2009 Atmel Corporation.
-+
-+   Written by Haavard Skinnemoen, Atmel Norway, <hskinnemoen@atmel.com>
-+
-+   This file is part of libopcodes.
-+
-+   This program is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU General Public License as
-+   published by the Free Software Foundation; either version 2 of the
-+   License, or (at your option) any later version.
-+
-+   This program is distributed in the hope that it will be useful, but
-+   WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   General Public License for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with this program; if not, write to the Free Software
-+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+   02111-1307, USA.  */
-+
-+#include <string.h>
-+
-+#include "avr32-opc.h"
-+#include "avr32-asm.h"
-+
-+/* Structure for a register hash table entry.  */
-+struct reg_entry
-+{
-+  const char	*name;
-+  int		number;
-+};
-+
-+/* Integer Registers.  */
-+static const struct reg_entry reg_table[] =
-+  {
-+    /* Primary names (used by the disassembler) */
-+    { "r0",   0 }, { "r1",   1 }, { "r2",   2 }, { "r3",   3 },
-+    { "r4",   4 }, { "r5",   5 }, { "r6",   6 }, { "r7",   7 },
-+    { "r8",   8 }, { "r9",   9 }, { "r10", 10 }, { "r11", 11 },
-+    { "r12", 12 }, { "sp",  13 }, { "lr",  14 }, { "pc",  15 },
-+    /* Alternatives to sp, lr and pc.  */
-+    { "r13", 13 }, { "r14", 14 }, { "r15", 15 },
-+  };
-+#define AVR32_NR_INTREGS (sizeof(reg_table)/sizeof(reg_table[0]))
-+
-+/* Coprocessor Registers.  */
-+static const struct reg_entry cr_table[] =
-+  {
-+    { "cr0",   0 }, { "cr1",   1 }, { "cr2",   2 }, { "cr3",   3 },
-+    { "cr4",   4 }, { "cr5",   5 }, { "cr6",   6 }, { "cr7",   7 },
-+    { "cr8",   8 }, { "cr9",   9 }, { "cr10", 10 }, { "cr11", 11 },
-+    { "cr12", 12 }, { "cr13", 13 }, { "cr14", 14 }, { "cr15", 15 },
-+  };
-+#define AVR32_NR_CPREGS (sizeof(cr_table)/sizeof(cr_table[0]))
-+
-+#define AVR32_NR_FPREGS (sizeof(fr_table)/sizeof(fr_table[0]))
-+
-+/* PiCo Registers.  */
-+static const struct reg_entry pico_table[] =
-+  {
-+    { "inpix2",    0 }, { "inpix1",    1 }, { "inpix0",    2 },
-+    { "outpix2",   3 }, { "outpix1",   4 }, { "outpix0",   5 },
-+    { "coeff0_a",  6 }, { "coeff0_b",  7 }, { "coeff1_a",  8 },
-+    { "coeff1_b",  9 }, { "coeff2_a", 10 }, { "coeff2_b", 11 },
-+    { "vmu0_out", 12 }, { "vmu1_out", 13 }, { "vmu2_out", 14 },
-+    { "config",   15 },
-+  };
-+#define AVR32_NR_PICOREGS (sizeof(pico_table)/sizeof(pico_table[0]))
-+
-+int
-+avr32_parse_intreg(const char *str)
-+{
-+  unsigned int i;
-+
-+  for (i = 0; i < AVR32_NR_INTREGS; i++)
-+    {
-+      if (strcasecmp(reg_table[i].name, str) == 0)
-+	return reg_table[i].number;
-+    }
-+
-+  return -1;
-+}
-+
-+int
-+avr32_parse_cpreg(const char *str)
-+{
-+  unsigned int i;
-+
-+  for (i = 0; i < AVR32_NR_CPREGS; i++)
-+    {
-+      if (strcasecmp(cr_table[i].name, str) == 0)
-+	return cr_table[i].number;
-+    }
-+
-+  return -1;
-+}
-+
-+
-+int avr32_parse_picoreg(const char *str)
-+{
-+  unsigned int i;
-+
-+  for (i = 0; i < AVR32_NR_PICOREGS; i++)
-+    {
-+      if (strcasecmp(pico_table[i].name, str) == 0)
-+	return pico_table[i].number;
-+    }
-+
-+  return -1;
-+}
-+
-+static unsigned long
-+parse_reglist(char *str, char **endptr, int (*parse_reg)(const char *))
-+{
-+  int reg_from, reg_to;
-+  unsigned long result = 0;
-+  char *p1, *p2, c;
-+
-+  while (*str)
-+    {
-+      for (p1 = str; *p1; p1++)
-+	if (*p1 == ',' || *p1 == '-')
-+	  break;
-+
-+      c = *p1, *p1 = 0;
-+      reg_from = parse_reg(str);
-+      *p1 = c;
-+
-+      if (reg_from < 0)
-+	break;
-+
-+      if (*p1 == '-')
-+	{
-+	  for (p2 = ++p1; *p2; p2++)
-+	    if (*p2 == ',')
-+	      break;
-+
-+	  c = *p2, *p2 = 0;
-+	  /* printf("going to parse reg_to from `%s'\n", p1); */
-+	  reg_to = parse_reg(p1);
-+	  *p2 = c;
-+
-+	  if (reg_to < 0)
-+	    break;
-+
-+	  while (reg_from <= reg_to)
-+	    result |= (1 << reg_from++);
-+	  p1 = p2;
-+	}
-+      else
-+	result |= (1 << reg_from);
-+
-+      str = p1;
-+      if (*str) ++str;
-+    }
-+
-+  if (endptr)
-+    *endptr = str;
-+
-+  return result;
-+}
-+
-+unsigned long
-+avr32_parse_reglist(char *str, char **endptr)
-+{
-+  return parse_reglist(str, endptr, avr32_parse_intreg);
-+}
-+
-+unsigned long
-+avr32_parse_cpreglist(char *str, char **endptr)
-+{
-+  return parse_reglist(str, endptr, avr32_parse_cpreg);
-+}
-+
-+unsigned long
-+avr32_parse_pico_reglist(char *str, char **endptr)
-+{
-+  return parse_reglist(str, endptr, avr32_parse_picoreg);
-+}
-+
-+int
-+avr32_make_regmask8(unsigned long regmask16, unsigned long *regmask8)
-+{
-+  unsigned long result = 0;
-+
-+  /* printf("convert regmask16 0x%04lx\n", regmask16); */
-+
-+  if (regmask16 & 0xf)
-+    {
-+      if ((regmask16 & 0xf) == 0xf)
-+	result |= 1 << 0;
-+      else
-+	return -1;
-+    }
-+  if (regmask16 & 0xf0)
-+    {
-+      if ((regmask16 & 0xf0) == 0xf0)
-+	result |= 1 << 1;
-+      else
-+	return -1;
-+    }
-+  if (regmask16 & 0x300)
-+    {
-+      if ((regmask16 & 0x300) == 0x300)
-+	result |= 1 << 2;
-+      else
-+	return -1;
-+    }
-+  if (regmask16 & (1 << 13))
-+    return -1;
-+
-+  if (regmask16 & (1 << 10))
-+    result |= 1 << 3;
-+  if (regmask16 & (1 << 11))
-+    result |= 1 << 4;
-+  if (regmask16 & (1 << 12))
-+    result |= 1 << 5;
-+  if (regmask16 & (1 << 14))
-+    result |= 1 << 6;
-+  if (regmask16 & (1 << 15))
-+    result |= 1 << 7;
-+
-+  *regmask8 = result;
-+
-+  return 0;
-+}
-+
-+#if 0
-+struct reg_map
-+{
-+  const struct reg_entry	*names;
-+  int				nr_regs;
-+  struct hash_control		*htab;
-+  const char			*errmsg;
-+};
-+
-+struct reg_map all_reg_maps[] =
-+  {
-+    { reg_table, AVR32_NR_INTREGS, NULL, N_("integral register expected") },
-+    { cr_table,  AVR32_NR_CPREGS,  NULL, N_("coprocessor register expected") },
-+  };
-+#endif
-diff -Nur binutils-2.21.orig/opcodes/avr32-asm.h binutils-2.21/opcodes/avr32-asm.h
---- binutils-2.21.orig/opcodes/avr32-asm.h	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.21/opcodes/avr32-asm.h	2011-08-28 14:56:23.267979368 +0200
-@@ -0,0 +1,40 @@
-+/* Assembler interface for AVR32.
-+   Copyright 2005,2006,2007,2008,2009 Atmel Corporation.
-+
-+   Written by Haavard Skinnemoen, Atmel Norway, <hskinnemoen@atmel.com>
-+
-+   This file is part of libopcodes.
-+
-+   This program is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU General Public License as
-+   published by the Free Software Foundation; either version 2 of the
-+   License, or (at your option) any later version.
-+
-+   This program is distributed in the hope that it will be useful, but
-+   WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   General Public License for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with this program; if not, write to the Free Software
-+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+   02111-1307, USA.  */
-+#ifndef __OPCODES_AVR32_ASM_H
-+#define __OPCODES_AVR32_ASM_H
-+
-+extern int
-+avr32_parse_intreg(const char *str);
-+extern int
-+avr32_parse_cpreg(const char *str);
-+extern int
-+avr32_parse_picoreg(const char *str);
-+extern unsigned long
-+avr32_parse_reglist(char *str, char **endptr);
-+extern unsigned long
-+avr32_parse_cpreglist(char *str, char **endptr);
-+extern unsigned long
-+avr32_parse_pico_reglist(char *str, char **endptr);
-+extern int
-+avr32_make_regmask8(unsigned long regmask16, unsigned long *regmask8);
-+
-+#endif /* __OPCODES_AVR32_ASM_H */
-diff -Nur binutils-2.21.orig/opcodes/avr32-dis.c binutils-2.21/opcodes/avr32-dis.c
---- binutils-2.21.orig/opcodes/avr32-dis.c	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.21/opcodes/avr32-dis.c	2011-08-28 14:56:23.327983383 +0200
-@@ -0,0 +1,916 @@
-+/* Print AVR32 instructions for GDB and objdump.
-+   Copyright 2005,2006,2007,2008,2009 Atmel Corporation.
-+
-+   Written by Haavard Skinnemoen, Atmel Norway, <hskinnemoen@atmel.com>
-+
-+   This file is part of libopcodes.
-+
-+   This program is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU General Public License as
-+   published by the Free Software Foundation; either version 2 of the
-+   License, or (at your option) any later version.
-+
-+   This program is distributed in the hope that it will be useful, but
-+   WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   General Public License for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with this program; if not, write to the Free Software
-+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+   02111-1307, USA.  */
-+
-+#include "sysdep.h"
-+#include "dis-asm.h"
-+#include "avr32-opc.h"
-+#include "opintl.h"
-+#include "safe-ctype.h"
-+
-+/* TODO: Share this with -asm */
-+
-+/* Structure for a register hash table entry.  */
-+struct reg_entry
-+{
-+  const char	*name;
-+  int		number;
-+};
-+
-+#ifndef strneq
-+#define strneq(a,b,n)	(strncmp ((a), (b), (n)) == 0)
-+#endif
-+
-+static char avr32_opt_decode_fpu = 0;
-+
-+static const struct reg_entry reg_table[] =
-+  {
-+    /* Primary names (used by the disassembler) */
-+    { "r0",   0 }, { "r1",   1 }, { "r2",   2 }, { "r3",   3 },
-+    { "r4",   4 }, { "r5",   5 }, { "r6",   6 }, { "r7",   7 },
-+    { "r8",   8 }, { "r9",   9 }, { "r10", 10 }, { "r11", 11 },
-+    { "r12", 12 }, { "sp",  13 }, { "lr",  14 }, { "pc",  15 },
-+    /* Alternatives to sp, lr and pc.  */
-+    { "r13", 13 }, { "r14", 14 }, { "r15", 15 },
-+  };
-+#define AVR32_NR_INTREGS (sizeof(reg_table)/sizeof(reg_table[0]))
-+
-+/* Coprocessor Registers.  */
-+static const struct reg_entry cr_table[] =
-+  {
-+    { "cr0",   0 }, { "cr1",   1 }, { "cr2",   2 }, { "cr3",   3 },
-+    { "cr4",   4 }, { "cr5",   5 }, { "cr6",   6 }, { "cr7",   7 },
-+    { "cr8",   8 }, { "cr9",   9 }, { "cr10", 10 }, { "cr11", 11 },
-+    { "cr12", 12 }, { "cr13", 13 }, { "cr14", 14 }, { "cr15", 15 },
-+  };
-+#define AVR32_NR_CPREGS (sizeof(cr_table)/sizeof(cr_table[0]))
-+
-+static const char bparts[4] = { 'b', 'l', 'u', 't' };
-+static bfd_vma current_pc;
-+
-+struct avr32_field_value
-+{
-+  const struct avr32_ifield *ifield;
-+  unsigned long value;
-+};
-+
-+struct avr32_operand
-+{
-+  int id;
-+  int is_pcrel;
-+  int align_order;
-+  int (*print)(struct avr32_operand *op, struct disassemble_info *info,
-+	       struct avr32_field_value *ifields);
-+};
-+
-+static signed long
-+get_signed_value(const struct avr32_field_value *fv)
-+{
-+  signed long value = fv->value;
-+
-+  if (fv->value & (1 << (fv->ifield->bitsize - 1)))
-+    value |= (~0UL << fv->ifield->bitsize);
-+
-+  return value;
-+}
-+
-+static void
-+print_reglist_range(unsigned int first, unsigned int last,
-+		    const struct reg_entry *reg_names,
-+		    int need_comma,
-+		    struct disassemble_info *info)
-+{
-+  if (need_comma)
-+    info->fprintf_func(info->stream, ",");
-+
-+  if (first == last)
-+    info->fprintf_func(info->stream, "%s",
-+		       reg_names[first].name);
-+  else
-+    info->fprintf_func(info->stream, "%s-%s",
-+		       reg_names[first].name, reg_names[last].name);
-+}
-+
-+static int
-+print_intreg(struct avr32_operand *op,
-+	     struct disassemble_info *info,
-+	     struct avr32_field_value *ifields)
-+{
-+  unsigned long regid = ifields[0].value << op->align_order;
-+
-+  info->fprintf_func(info->stream, "%s",
-+		     reg_table[regid].name);
-+  return 1;
-+}
-+
-+static int
-+print_intreg_predec(struct avr32_operand *op ATTRIBUTE_UNUSED,
-+		    struct disassemble_info *info,
-+		    struct avr32_field_value *ifields)
-+{
-+  info->fprintf_func(info->stream, "--%s",
-+		     reg_table[ifields[0].value].name);
-+  return 1;
-+}
-+
-+static int
-+print_intreg_postinc(struct avr32_operand *op ATTRIBUTE_UNUSED,
-+		     struct disassemble_info *info,
-+		     struct avr32_field_value *ifields)
-+{
-+  info->fprintf_func(info->stream, "%s++",
-+		     reg_table[ifields[0].value].name);
-+  return 1;
-+}
-+
-+static int
-+print_intreg_lsl(struct avr32_operand *op ATTRIBUTE_UNUSED,
-+		 struct disassemble_info *info,
-+		 struct avr32_field_value *ifields)
-+{
-+  const char *rp = reg_table[ifields[0].value].name;
-+  unsigned long sa = ifields[1].value;
-+
-+  if (sa)
-+    info->fprintf_func(info->stream, "%s<<0x%lx", rp, sa);
-+  else
-+    info->fprintf_func(info->stream, "%s", rp);
-+
-+  return 2;
-+}
-+
-+static int
-+print_intreg_lsr(struct avr32_operand *op ATTRIBUTE_UNUSED,
-+		 struct disassemble_info *info,
-+		 struct avr32_field_value *ifields)
-+{
-+  const char *rp = reg_table[ifields[0].value].name;
-+  unsigned long sa = ifields[1].value;
-+
-+  if (sa)
-+    info->fprintf_func(info->stream, "%s>>0x%lx", rp, sa);
-+  else
-+    info->fprintf_func(info->stream, "%s", rp);
-+
-+  return 2;
-+}
-+
-+static int
-+print_intreg_bpart(struct avr32_operand *op ATTRIBUTE_UNUSED,
-+		   struct disassemble_info *info,
-+		   struct avr32_field_value *ifields)
-+{
-+  info->fprintf_func(info->stream, "%s:%c",
-+		     reg_table[ifields[0].value].name,
-+		     bparts[ifields[1].value]);
-+  return 2;
-+}
-+
-+static int
-+print_intreg_hpart(struct avr32_operand *op ATTRIBUTE_UNUSED,
-+		   struct disassemble_info *info,
-+		   struct avr32_field_value *ifields)
-+{
-+  info->fprintf_func(info->stream, "%s:%c",
-+		     reg_table[ifields[0].value].name,
-+		     ifields[1].value ? 't' : 'b');
-+  return 2;
-+}
-+
-+static int
-+print_intreg_sdisp(struct avr32_operand *op,
-+		  struct disassemble_info *info,
-+		  struct avr32_field_value *ifields)
-+{
-+  signed long disp;
-+
-+  disp = get_signed_value(&ifields[1]) << op->align_order;
-+
-+  info->fprintf_func(info->stream, "%s[%ld]",
-+		     reg_table[ifields[0].value].name, disp);
-+  return 2;
-+}
-+
-+static int
-+print_intreg_udisp(struct avr32_operand *op,
-+		   struct disassemble_info *info,
-+		   struct avr32_field_value *ifields)
-+{
-+  info->fprintf_func(info->stream, "%s[0x%lx]",
-+		     reg_table[ifields[0].value].name,
-+		     ifields[1].value << op->align_order);
-+  return 2;
-+}
-+
-+static int
-+print_intreg_index(struct avr32_operand *op ATTRIBUTE_UNUSED,
-+		   struct disassemble_info *info,
-+		   struct avr32_field_value *ifields)
-+{
-+  const char *rb, *ri;
-+  unsigned long sa = ifields[2].value;
-+
-+  rb = reg_table[ifields[0].value].name;
-+  ri = reg_table[ifields[1].value].name;
-+
-+  if (sa)
-+    info->fprintf_func(info->stream, "%s[%s<<0x%lx]", rb, ri, sa);
-+  else
-+    info->fprintf_func(info->stream, "%s[%s]", rb, ri);
-+
-+  return 3;
-+}
-+
-+static int
-+print_intreg_xindex(struct avr32_operand *op ATTRIBUTE_UNUSED,
-+		    struct disassemble_info *info,
-+		    struct avr32_field_value *ifields)
-+{
-+  info->fprintf_func(info->stream, "%s[%s:%c<<2]",
-+		     reg_table[ifields[0].value].name,
-+		     reg_table[ifields[1].value].name,
-+		     bparts[ifields[2].value]);
-+  return 3;
-+}
-+
-+static int
-+print_jmplabel(struct avr32_operand *op,
-+	       struct disassemble_info *info,
-+	       struct avr32_field_value *ifields)
-+{
-+  bfd_vma address, offset;
-+
-+  offset = get_signed_value(ifields) << op->align_order;
-+  address = (current_pc & (~0UL << op->align_order)) + offset;
-+
-+  info->print_address_func(address, info);
-+
-+  return 1;
-+}
-+
-+static int
-+print_pc_disp(struct avr32_operand *op,
-+	      struct disassemble_info *info,
-+	      struct avr32_field_value *ifields)
-+{
-+  bfd_vma address, offset;
-+
-+  offset = ifields[0].value << op->align_order;
-+  address = (current_pc & (~0UL << op->align_order)) + offset;
-+
-+  info->print_address_func(address, info);
-+
-+  return 1;
-+}
-+
-+static int
-+print_sp(struct avr32_operand *op ATTRIBUTE_UNUSED,
-+	 struct disassemble_info *info,
-+	 struct avr32_field_value *ifields ATTRIBUTE_UNUSED)
-+{
-+  info->fprintf_func(info->stream, "sp");
-+  return 1;
-+}
-+
-+static int
-+print_sp_disp(struct avr32_operand *op,
-+	      struct disassemble_info *info,
-+	      struct avr32_field_value *ifields)
-+{
-+  info->fprintf_func(info->stream, "sp[0x%lx]",
-+		     ifields[0].value << op->align_order);
-+  return 1;
-+}
-+
-+static int
-+print_cpno(struct avr32_operand *op ATTRIBUTE_UNUSED,
-+	   struct disassemble_info *info,
-+	   struct avr32_field_value *ifields)
-+{
-+  info->fprintf_func(info->stream, "cp%lu", ifields[0].value);
-+  return 1;
-+}
-+
-+static int
-+print_cpreg(struct avr32_operand *op,
-+	    struct disassemble_info *info,
-+	    struct avr32_field_value *ifields)
-+{
-+  info->fprintf_func(info->stream, "cr%lu",
-+		     ifields[0].value << op->align_order);
-+  return 1;
-+}
-+
-+static int
-+print_uconst(struct avr32_operand *op,
-+	     struct disassemble_info *info,
-+	     struct avr32_field_value *ifields)
-+{
-+  info->fprintf_func(info->stream, "0x%lx",
-+		     ifields[0].value << op->align_order);
-+  return 1;
-+}
-+
-+static int
-+print_sconst(struct avr32_operand *op,
-+	     struct disassemble_info *info,
-+	     struct avr32_field_value *ifields)
-+{
-+  info->fprintf_func(info->stream, "%ld",
-+		     get_signed_value(ifields) << op->align_order);
-+  return 1;
-+}
-+
-+static int
-+print_reglist8_head(unsigned long regmask, int *commap,
-+		    struct disassemble_info *info)
-+{
-+  int first = -1, last, i = 0;
-+  int need_comma = 0;
-+
-+  while (i < 12)
-+    {
-+      if (first == -1 && (regmask & 1))
-+	{
-+	  first = i;
-+	}
-+      else if (first != -1 && !(regmask & 1))
-+	{
-+	  last = i - 1;
-+
-+	  print_reglist_range(first, last, reg_table, need_comma, info);
-+	  need_comma = 1;
-+	  first = -1;
-+	}
-+
-+      if (i < 8)
-+	i += 4;
-+      else if (i < 10)
-+	i += 2;
-+      else
-+	i++;
-+      regmask >>= 1;
-+    }
-+
-+  *commap = need_comma;
-+  return first;
-+}
-+
-+static void
-+print_reglist8_tail(unsigned long regmask, int first, int need_comma,
-+		    struct disassemble_info *info)
-+{
-+  int last = 11;
-+
-+  if (regmask & 0x20)
-+    {
-+      if (first == -1)
-+	first = 12;
-+      last = 12;
-+    }
-+
-+  if (first != -1)
-+    {
-+      print_reglist_range(first, last, reg_table, need_comma, info);
-+      need_comma = 1;
-+      first = -1;
-+    }
-+
-+  if (regmask & 0x40)
-+    {
-+      if (first == -1)
-+	first = 14;
-+      last = 14;
-+    }
-+
-+  if (regmask & 0x80)
-+    {
-+      if (first == -1)
-+	first = 15;
-+      last = 15;
-+    }
-+
-+  if (first != -1)
-+    print_reglist_range(first, last, reg_table, need_comma, info);
-+}
-+
-+static int
-+print_reglist8(struct avr32_operand *op ATTRIBUTE_UNUSED,
-+	       struct disassemble_info *info,
-+	       struct avr32_field_value *ifields)
-+{
-+  unsigned long regmask = ifields[0].value;
-+  int first, need_comma;
-+
-+  first = print_reglist8_head(regmask, &need_comma, info);
-+  print_reglist8_tail(regmask, first, need_comma, info);
-+
-+  return 1;
-+}
-+
-+static int
-+print_reglist9(struct avr32_operand *op ATTRIBUTE_UNUSED,
-+	       struct disassemble_info *info,
-+	       struct avr32_field_value *ifields)
-+{
-+  unsigned long regmask = ifields[0].value >> 1;
-+  int first, last, need_comma;
-+
-+  first = print_reglist8_head(regmask, &need_comma, info);
-+
-+  if ((ifields[0].value & 0x101) == 0x101)
-+    {
-+      if (first != -1)
-+	{
-+	  last = 11;
-+
-+	  print_reglist_range(first, last, reg_table, need_comma, info);
-+	  need_comma = 1;
-+	  first = -1;
-+	}
-+
-+      print_reglist_range(15, 15, reg_table, need_comma, info);
-+
-+      regmask >>= 5;
-+
-+      if ((regmask & 3) == 0)
-+	info->fprintf_func(info->stream, ",r12=0");
-+      else if ((regmask & 3) == 1)
-+	info->fprintf_func(info->stream, ",r12=1");
-+      else
-+	info->fprintf_func(info->stream, ",r12=-1");
-+    }
-+  else
-+      print_reglist8_tail(regmask, first, need_comma, info);
-+
-+  return 1;
-+}
-+
-+static int
-+print_reglist16(struct avr32_operand *op ATTRIBUTE_UNUSED,
-+		struct disassemble_info *info,
-+		struct avr32_field_value *ifields)
-+{
-+  unsigned long regmask = ifields[0].value;
-+  unsigned int i = 0, first, last;
-+  int need_comma = 0;
-+
-+  while (i < 16)
-+    {
-+      if (regmask & 1)
-+	{
-+	  first = i;
-+	  while (i < 16)
-+	    {
-+	      i++;
-+	      regmask >>= 1;
-+	      if (!(regmask & 1))
-+		break;
-+	    }
-+	  last = i - 1;
-+	  print_reglist_range(first, last, reg_table, need_comma, info);
-+	  need_comma = 1;
-+	}
-+      else
-+	{
-+	  i++;
-+	  regmask >>= 1;
-+	}
-+    }
-+
-+  return 1;
-+}
-+
-+static int
-+print_reglist_ldm(struct avr32_operand *op,
-+		  struct disassemble_info *info,
-+		  struct avr32_field_value *ifields)
-+{
-+  int rp, w_bit;
-+  int i, first, last;
-+  unsigned long regmask;
-+
-+  rp = ifields[0].value;
-+  w_bit = ifields[1].value;
-+  regmask = ifields[2].value;
-+
-+  if (regmask & (1 << AVR32_REG_PC) && rp == AVR32_REG_PC)
-+    {
-+      if (w_bit)
-+	info->fprintf_func(info->stream, "sp++");
-+      else
-+	info->fprintf_func(info->stream, "sp");
-+
-+      for (i = 0; i < 12; )
-+	{
-+	  if (regmask & (1 << i))
-+	    {
-+	      first = i;
-+	      while (i < 12)
-+		{
-+		  i++;
-+		  if (!(regmask & (1 << i)))
-+		    break;
-+		}
-+	      last = i - 1;
-+	      print_reglist_range(first, last, reg_table, 1, info);
-+	    }
-+	  else
-+	    i++;
-+	}
-+
-+      info->fprintf_func(info->stream, ",pc");
-+      if (regmask & (1 << AVR32_REG_LR))
-+	info->fprintf_func(info->stream, ",r12=-1");
-+      else if (regmask & (1 << AVR32_REG_R12))
-+	info->fprintf_func(info->stream, ",r12=1");
-+      else
-+	info->fprintf_func(info->stream, ",r12=0");
-+    }
-+  else
-+    {
-+      if (w_bit)
-+	info->fprintf_func(info->stream, "%s++,", reg_table[rp].name);
-+      else
-+	info->fprintf_func(info->stream, "%s,", reg_table[rp].name);
-+
-+      print_reglist16(op, info, ifields + 2);
-+    }
-+
-+  return 3;
-+}
-+
-+static int
-+print_reglist_cp8(struct avr32_operand *op ATTRIBUTE_UNUSED,
-+		  struct disassemble_info *info,
-+		  struct avr32_field_value *ifields)
-+{
-+  unsigned long regmask = ifields[0].value;
-+  unsigned int i = 0, first, last, offset = 0;
-+  int need_comma = 0;
-+
-+  if (ifields[1].value)
-+    offset = 8;
-+
-+  while (i < 8)
-+    {
-+      if (regmask & 1)
-+	{
-+	  first = i;
-+	  while (i < 8)
-+	    {
-+	      i++;
-+	      regmask >>= 1;
-+	      if (!(regmask & 1))
-+		break;
-+	    }
-+	  last = i - 1;
-+	  print_reglist_range(offset + first, offset + last,
-+			      cr_table, need_comma, info);
-+	  need_comma = 1;
-+	}
-+      else
-+	{
-+	  i++;
-+	  regmask >>= 1;
-+	}
-+    }
-+
-+  return 2;
-+}
-+
-+static int
-+print_reglist_cpd8(struct avr32_operand *op ATTRIBUTE_UNUSED,
-+		   struct disassemble_info *info,
-+		   struct avr32_field_value *ifields)
-+{
-+  unsigned long regmask = ifields[0].value;
-+  unsigned int i = 0, first, last;
-+  int need_comma = 0;
-+
-+  while (i < 8)
-+    {
-+      if (regmask & 1)
-+	{
-+	  first = 2 * i;
-+	  while (i < 8)
-+	    {
-+	      i++;
-+	      regmask >>= 1;
-+	      if (!(regmask & 1))
-+		break;
-+	    }
-+	  last = 2 * (i - 1) + 1;
-+	  print_reglist_range(first, last, cr_table, need_comma, info);
-+	  need_comma = 1;
-+	}
-+      else
-+	{
-+	  i++;
-+	  regmask >>= 1;
-+	}
-+    }
-+
-+  return 1;
-+}
-+
-+static int
-+print_retval(struct avr32_operand *op ATTRIBUTE_UNUSED,
-+	     struct disassemble_info *info,
-+	     struct avr32_field_value *ifields)
-+{
-+  unsigned long regid = ifields[0].value;
-+  const char *retval;
-+
-+  if (regid < AVR32_REG_SP)
-+    retval = reg_table[regid].name;
-+  else if (regid == AVR32_REG_SP)
-+    retval = "0";
-+  else if (regid == AVR32_REG_LR)
-+    retval = "-1";
-+  else
-+    retval = "1";
-+
-+  info->fprintf_func(info->stream, "%s", retval);
-+
-+  return 1;
-+}
-+
-+static int
-+print_mcall(struct avr32_operand *op,
-+	    struct disassemble_info *info,
-+	    struct avr32_field_value *ifields)
-+{
-+  unsigned long regid = ifields[0].value;
-+
-+  if (regid == AVR32_REG_PC)
-+    print_jmplabel(op, info, ifields + 1);
-+  else
-+    print_intreg_sdisp(op, info, ifields);
-+
-+  return 2;
-+}
-+
-+static int
-+print_jospinc(struct avr32_operand *op ATTRIBUTE_UNUSED,
-+	      struct disassemble_info *info,
-+	      struct avr32_field_value *ifields)
-+{
-+  signed long value = ifields[0].value;
-+
-+  if (value >= 4)
-+    value -= 8;
-+  else
-+    value += 1;
-+
-+  info->fprintf_func(info->stream, "%ld", value);
-+
-+  return 1;
-+}
-+
-+static int
-+print_coh(struct avr32_operand *op ATTRIBUTE_UNUSED,
-+	  struct disassemble_info *info,
-+	  struct avr32_field_value *ifields ATTRIBUTE_UNUSED)
-+{
-+  info->fprintf_func(info->stream, "COH");
-+  return 0;
-+}
-+
-+#define OP(name, sgn, pcrel, align, func) \
-+  { AVR32_OPERAND_##name, pcrel, align, print_##func }
-+
-+struct avr32_operand operand[AVR32_NR_OPERANDS] =
-+  {
-+    OP(INTREG, 0, 0, 0, intreg),
-+    OP(INTREG_PREDEC, 0, 0, 0, intreg_predec),
-+    OP(INTREG_POSTINC, 0, 0, 0, intreg_postinc),
-+    OP(INTREG_LSL, 0, 0, 0, intreg_lsl),
-+    OP(INTREG_LSR, 0, 0, 0, intreg_lsr),
-+    OP(INTREG_BSEL, 0, 0, 0, intreg_bpart),
-+    OP(INTREG_HSEL, 0, 0, 1, intreg_hpart),
-+    OP(INTREG_SDISP, 1, 0, 0, intreg_sdisp),
-+    OP(INTREG_SDISP_H, 1, 0, 1, intreg_sdisp),
-+    OP(INTREG_SDISP_W, 1, 0, 2, intreg_sdisp),
-+    OP(INTREG_UDISP, 0, 0, 0, intreg_udisp),
-+    OP(INTREG_UDISP_H, 0, 0, 1, intreg_udisp),
-+    OP(INTREG_UDISP_W, 0, 0, 2, intreg_udisp),
-+    OP(INTREG_INDEX, 0, 0, 0, intreg_index),
-+    OP(INTREG_XINDEX, 0, 0, 0, intreg_xindex),
-+    OP(DWREG, 0, 0, 1, intreg),
-+    OP(PC_UDISP_W, 0, 1, 2, pc_disp),
-+    OP(SP, 0, 0, 0, sp),
-+    OP(SP_UDISP_W, 0, 0, 2, sp_disp),
-+    OP(CPNO, 0, 0, 0, cpno),
-+    OP(CPREG, 0, 0, 0, cpreg),
-+    OP(CPREG_D, 0, 0, 1, cpreg),
-+    OP(UNSIGNED_CONST, 0, 0, 0, uconst),
-+    OP(UNSIGNED_CONST_W, 0, 0, 2, uconst),
-+    OP(SIGNED_CONST, 1, 0, 0, sconst),
-+    OP(SIGNED_CONST_W, 1, 0, 2, sconst),
-+    OP(JMPLABEL, 1, 1, 1, jmplabel),
-+    OP(UNSIGNED_NUMBER, 0, 0, 0, uconst),
-+    OP(UNSIGNED_NUMBER_W, 0, 0, 2, uconst),
-+    OP(REGLIST8, 0, 0, 0, reglist8),
-+    OP(REGLIST9, 0, 0, 0, reglist9),
-+    OP(REGLIST16, 0, 0, 0, reglist16),
-+    OP(REGLIST_LDM, 0, 0, 0, reglist_ldm),
-+    OP(REGLIST_CP8, 0, 0, 0, reglist_cp8),
-+    OP(REGLIST_CPD8, 0, 0, 0, reglist_cpd8),
-+    OP(RETVAL, 0, 0, 0, retval),
-+    OP(MCALL, 1, 0, 2, mcall),
-+    OP(JOSPINC, 0, 0, 0, jospinc),
-+    OP(COH, 0, 0, 0, coh),
-+  };
-+
-+static void
-+print_opcode(bfd_vma insn_word, const struct avr32_opcode *opc,
-+	     bfd_vma pc, struct disassemble_info *info)
-+{
-+  const struct avr32_syntax *syntax = opc->syntax;
-+  struct avr32_field_value fields[AVR32_MAX_FIELDS];
-+  unsigned int i, next_field = 0, nr_operands;
-+
-+  for (i = 0; i < opc->nr_fields; i++)
-+    {
-+      opc->fields[i]->extract(opc->fields[i], &insn_word, &fields[i].value);
-+      fields[i].ifield = opc->fields[i];
-+    }
-+
-+  current_pc = pc;
-+  info->fprintf_func(info->stream, "%s", syntax->mnemonic->name);
-+
-+  if (syntax->nr_operands < 0)
-+    nr_operands = (unsigned int) -syntax->nr_operands;
-+  else
-+    nr_operands = (unsigned int) syntax->nr_operands;
-+
-+  for (i = 0; i < nr_operands; i++)
-+    {
-+      struct avr32_operand *op = &operand[syntax->operand[i]];
-+
-+      if (i)
-+	info->fprintf_func(info->stream, ",");
-+      else
-+	info->fprintf_func(info->stream, "\t");
-+      next_field += op->print(op, info, &fields[next_field]);
-+    }
-+}
-+
-+#define is_fpu_insn(iw) ((iw&0xf9f0e000)==0xe1a00000) 
-+
-+static const struct avr32_opcode *
-+find_opcode(bfd_vma insn_word)
-+{
-+  int i;
-+
-+  for (i = 0; i < AVR32_NR_OPCODES; i++)
-+    {
-+      const struct avr32_opcode *opc = &avr32_opc_table[i];
-+
-+      if ((insn_word & opc->mask) == opc->value)
-+      {
-+        if (avr32_opt_decode_fpu)
-+        {
-+          if (is_fpu_insn(insn_word))
-+          {
-+            if (opc->id != AVR32_OPC_COP)
-+	       return opc;
-+          }
-+          else
-+            return opc;
-+        }
-+        else
-+	return opc;
-+    }
-+   }
-+
-+  return NULL;
-+}
-+
-+static int
-+read_insn_word(bfd_vma pc, bfd_vma *valuep,
-+	       struct disassemble_info *info)
-+{
-+  bfd_byte b[4];
-+  int status;
-+
-+  status = info->read_memory_func(pc, b, 4, info);
-+  if (status)
-+    {
-+      status = info->read_memory_func(pc, b, 2, info);
-+      if (status)
-+	{
-+	  info->memory_error_func(status, pc, info);
-+	  return -1;
-+	}
-+      b[3] = b[2] = 0;
-+    }
-+
-+  *valuep =  (b[0] << 24) | (b[1] << 16) | (b[2] << 8) | b[3];
-+  return 0;
-+}
-+
-+/* Parse an individual disassembler option.  */
-+
-+void
-+parse_avr32_disassembler_option (option)
-+     char * option;
-+{
-+  if (option == NULL)
-+    return;
-+
-+  if (!strcmp(option,"decode-fpu"))
-+  {
-+    avr32_opt_decode_fpu = 1;
-+    return;
-+  }
-+
-+  printf("\n%s--",option);
-+  /* XXX - should break 'option' at following delimiter.  */
-+  fprintf (stderr, _("Unrecognised disassembler option: %s\n"), option);
-+
-+  return;
-+}
-+
-+/* Parse the string of disassembler options, spliting it at whitespaces
-+   or commas.  (Whitespace separators supported for backwards compatibility).  */
-+
-+static void
-+parse_disassembler_options (char *options)
-+{
-+  if (options == NULL)
-+    return;
-+
-+  while (*options)
-+    {
-+      parse_avr32_disassembler_option (options);
-+
-+      /* Skip forward to next seperator.  */
-+      while ((*options) && (! ISSPACE (*options)) && (*options != ','))
-+	++ options;
-+      /* Skip forward past seperators.  */
-+      while (ISSPACE (*options) || (*options == ','))
-+	++ options;
-+    }
-+}
-+
-+int
-+print_insn_avr32(bfd_vma pc, struct disassemble_info *info)
-+{
-+  bfd_vma insn_word;
-+  const struct avr32_opcode *opc;
-+
-+  if (info->disassembler_options)
-+    {
-+      parse_disassembler_options (info->disassembler_options);
-+
-+      /* To avoid repeated parsing of these options, we remove them here.  */
-+      info->disassembler_options = NULL;
-+    }
-+
-+  info->bytes_per_chunk = 1;
-+  info->display_endian = BFD_ENDIAN_BIG;
-+
-+  if (read_insn_word(pc, &insn_word, info))
-+    return -1;
-+
-+  opc = find_opcode(insn_word);
-+  if (opc)
-+    {
-+      print_opcode(insn_word, opc, pc, info);
-+      return opc->size;
-+    }
-+  else
-+    {
-+      info->fprintf_func(info->stream, _("*unknown*"));
-+      return 2;
-+    }
-+
-+}
-+
-+void
-+print_avr32_disassembler_options (FILE *stream ATTRIBUTE_UNUSED)
-+{
-+  fprintf(stream, "\n AVR32 Specific Disassembler Options:\n");
-+  fprintf(stream, "  -M decode-fpu                  Print FPU instructions instead of 'cop' \n");
-+}
-+
-diff -Nur binutils-2.21.orig/opcodes/avr32-opc.c binutils-2.21/opcodes/avr32-opc.c
---- binutils-2.21.orig/opcodes/avr32-opc.c	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.21/opcodes/avr32-opc.c	2011-08-28 14:56:23.347980430 +0200
-@@ -0,0 +1,6906 @@
-+/* Opcode tables for AVR32.
-+   Copyright 2005,2006,2007,2008,2009 Atmel Corporation.
-+
-+   Written by Haavard Skinnemoen, Atmel Norway, <hskinnemoen@atmel.com>
-+
-+   This file is part of libopcodes.
-+
-+   This program is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU General Public License as
-+   published by the Free Software Foundation; either version 2 of the
-+   License, or (at your option) any later version.
-+
-+   This program is distributed in the hope that it will be useful, but
-+   WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   General Public License for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with this program; if not, write to the Free Software
-+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+   02111-1307, USA.  */
-+
-+#include <stdlib.h>
-+#include <assert.h>
-+
-+#include "avr32-opc.h"
-+
-+#define PICO_CPNO	1
-+
-+void
-+avr32_insert_simple(const struct avr32_ifield *field,
-+		    void *buf, unsigned long value)
-+{
-+  bfd_vma word;
-+
-+  word = bfd_getb32(buf);
-+  word &= ~field->mask;
-+  word |= (value << field->shift) & field->mask;
-+  bfd_putb32(word, buf);
-+}
-+
-+void
-+avr32_insert_bit5c(const struct avr32_ifield *field ATTRIBUTE_UNUSED,
-+		   void *buf, unsigned long value)
-+{
-+  char *opcode = buf;
-+
-+  opcode[0] = (opcode[0] & 0xe1) | (value & 0x1e);
-+  opcode[1] = (opcode[1] & 0xef) | ((value & 1) << 4);
-+}
-+
-+void
-+avr32_insert_k10(const struct avr32_ifield *field ATTRIBUTE_UNUSED,
-+		 void *buf, unsigned long value)
-+{
-+  char *opcode = buf;
-+
-+  opcode[0] = (opcode[0] & 0xf0) | ((value & 0xf0) >> 4);
-+  opcode[1] = ((opcode[1] & 0x0c) | ((value & 0x0f) << 4)
-+	       | ((value & 0x300) >> 8));
-+}
-+
-+
-+void
-+avr32_insert_k21(const struct avr32_ifield *field,
-+		 void *buf, unsigned long value)
-+{
-+  bfd_vma word;
-+  bfd_vma k21;
-+
-+  word = bfd_getb32(buf);
-+  word &= ~field->mask;
-+  k21 = ((value & 0xffff) | ((value & 0x10000) << 4)
-+	 | ((value & 0x1e0000) << 8));
-+  assert(!(k21 & ~field->mask));
-+  word |= k21;
-+  bfd_putb32(word, buf);
-+}
-+
-+void
-+avr32_insert_cpop(const struct avr32_ifield *field,
-+		  void *buf, unsigned long value)
-+{
-+  bfd_vma word;
-+
-+  word = bfd_getb32(buf);
-+  word &= ~field->mask;
-+  word |= (((value & 0x1e) << 15) | ((value & 0x60) << 20)
-+	   | ((value & 0x01) << 12));
-+  bfd_putb32(word, buf);
-+}
-+
-+void
-+avr32_insert_k12cp(const struct avr32_ifield *field,
-+		   void *buf, unsigned long value)
-+{
-+  bfd_vma word;
-+
-+  word = bfd_getb32(buf);
-+  word &= ~field->mask;
-+  word |= ((value & 0xf00) << 4) | (value & 0xff);
-+  bfd_putb32(word, buf);
-+}
-+
-+void avr32_extract_simple(const struct avr32_ifield *field,
-+			  void *buf, unsigned long *value)
-+{
-+  /* XXX: The disassembler has done any necessary byteswapping already */
-+  bfd_vma word = *(bfd_vma *)buf;
-+
-+  *value = (word & field->mask) >> field->shift;
-+}
-+
-+void avr32_extract_bit5c(const struct avr32_ifield *field ATTRIBUTE_UNUSED,
-+			 void *buf, unsigned long *value)
-+{
-+  bfd_vma word = *(bfd_vma *)buf;
-+
-+  *value = ((word >> 20) & 1) | ((word >> 24) & 0x1e);
-+}
-+
-+void avr32_extract_k10(const struct avr32_ifield *field ATTRIBUTE_UNUSED,
-+		       void *buf, unsigned long *value)
-+{
-+  bfd_vma word = *(bfd_vma *)buf;
-+
-+  *value = ((word >> 8) & 0x300) | ((word >> 20) & 0xff);
-+}
-+
-+void avr32_extract_k21(const struct avr32_ifield *field ATTRIBUTE_UNUSED,
-+		       void *buf, unsigned long *value)
-+{
-+  bfd_vma word = *(bfd_vma *)buf;
-+
-+  *value = ((word & 0xffff) | ((word >> 4) & 0x10000)
-+	    | ((word >> 8) & 0x1e0000));
-+}
-+
-+void avr32_extract_cpop(const struct avr32_ifield *field ATTRIBUTE_UNUSED,
-+			void *buf, unsigned long *value)
-+{
-+  bfd_vma word = *(bfd_vma *)buf;
-+
-+  *value = (((word >> 12) & 1) | ((word >> 15) & 0x1e)
-+	    | ((word >> 20) & 0x60));
-+}
-+
-+void avr32_extract_k12cp(const struct avr32_ifield *field ATTRIBUTE_UNUSED,
-+			 void *buf, unsigned long *value)
-+{
-+  bfd_vma word = *(bfd_vma *)buf;
-+
-+  *value = ((word >> 4) & 0xf00) | (word & 0xff);
-+}
-+
-+
-+#define IFLD(id, bitsz, shift, mask, func) \
-+  { AVR32_IFIELD_##id, bitsz, shift, mask, \
-+    avr32_insert_##func, avr32_extract_##func }
-+
-+const struct avr32_ifield avr32_ifield_table[] =
-+  {
-+    IFLD(RX, 4, 25, 0x1e000000, simple),
-+    IFLD(RY, 4, 16, 0x000f0000, simple),
-+    IFLD(COND4C, 4, 20, 0x00f00000, simple),
-+    IFLD(K8C, 8, 20, 0x0ff00000, simple),
-+    IFLD(K7C, 7, 20, 0x07f00000, simple),
-+    IFLD(K5C, 5, 20, 0x01f00000, simple),
-+    IFLD(K3, 3, 20, 0x00700000, simple),
-+    IFLD(RY_DW, 3, 17, 0x000e0000, simple),
-+    IFLD(COND4E, 4, 8, 0x00000f00, simple),
-+    IFLD(K8E, 8, 0, 0x000000ff, simple),
-+    IFLD(BIT5C, 5, 20, 0x1e100000, bit5c),
-+    IFLD(COND3, 3, 16, 0x00070000, simple),
-+    IFLD(K10, 10, 16, 0x0ff30000, k10),
-+    IFLD(POPM, 9, 19, 0x0ff80000, simple),
-+    IFLD(K2, 2, 4, 0x00000030, simple),
-+    IFLD(RD_E, 4, 0, 0x0000000f, simple),
-+    IFLD(RD_DW, 3, 1, 0x0000000e, simple),
-+    IFLD(X, 1, 5, 0x00000020, simple),
-+    IFLD(Y, 1, 4, 0x00000010, simple),
-+    IFLD(X2, 1, 13, 0x00002000, simple),
-+    IFLD(Y2, 1, 12, 0x00001000, simple),
-+    IFLD(K5E, 5, 0, 0x0000001f, simple),
-+    IFLD(PART2, 2, 0, 0x00000003, simple),
-+    IFLD(PART1, 1, 0, 0x00000001, simple),
-+    IFLD(K16, 16, 0, 0x0000ffff, simple),
-+    IFLD(CACHEOP, 5, 11, 0x0000f800, simple),
-+    IFLD(K11, 11, 0, 0x000007ff, simple),
-+    IFLD(K21, 21, 0, 0x1e10ffff, k21),
-+    IFLD(CPOP, 7, 12, 0x060f1000, cpop),
-+    IFLD(CPNO, 3, 13, 0x0000e000, simple),
-+    IFLD(CRD_RI, 4, 8, 0x00000f00, simple),
-+    IFLD(CRX, 4, 4, 0x000000f0, simple),
-+    IFLD(CRY, 4, 0, 0x0000000f, simple),
-+    IFLD(K7E, 7, 0, 0x0000007f, simple),
-+    IFLD(CRD_DW, 3, 9, 0x00000e00, simple),
-+    IFLD(PART1_K12, 1, 12, 0x00001000, simple),
-+    IFLD(PART2_K12, 2, 12, 0x00003000, simple),
-+    IFLD(K12, 12, 0, 0x00000fff, simple),
-+    IFLD(S5, 5, 5, 0x000003e0, simple),
-+    IFLD(K5E2, 5, 4, 0x000001f0, simple),
-+    IFLD(K4, 4, 20, 0x00f00000, simple),
-+    IFLD(COND4E2, 4, 4, 0x000000f0, simple),
-+    IFLD(K8E2, 8, 4, 0x00000ff0, simple),
-+    IFLD(K6, 6, 20, 0x03f00000, simple),
-+    IFLD(MEM15, 15, 0, 0x00007fff, simple),
-+    IFLD(MEMB5, 5, 15, 0x000f8000, simple),
-+    IFLD(W, 1, 25, 0x02000000, simple),
-+    /* Coprocessor Multiple High/Low */
-+    IFLD(CM_HL, 1, 8, 0x00000100, simple),
-+    IFLD(K12CP, 12 ,0, 0x0000f0ff, k12cp),
-+    IFLD(K9E, 9 ,0, 0x000001ff, simple),
-+    IFLD (FP_RX, 4,  4, 0x000000F0, simple),
-+    IFLD (FP_RY, 4,  0, 0x0000000F, simple),
-+    IFLD (FP_RD, 4,  8, 0x00000F00, simple),
-+    IFLD (FP_RA, 4, 16, 0x000F0000, simple) 
-+  };
-+#undef IFLD
-+
-+
-+struct avr32_opcode avr32_opc_table[] =
-+  {
-+    {
-+      AVR32_OPC_ABS, 2, 0x5c400000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_ABS],
-+      BFD_RELOC_UNUSED, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      }
-+    },
-+    {
-+      AVR32_OPC_ACALL, 2, 0xd0000000, 0xf00f0000,
-+      &avr32_syntax_table[AVR32_SYNTAX_ACALL],
-+      BFD_RELOC_UNUSED, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_K8C],
-+      },
-+    },
-+    {
-+      AVR32_OPC_ACR, 2, 0x5c000000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_ACR],
-+      BFD_RELOC_UNUSED, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_ADC, 4, 0xe0000040, 0xe1f0fff0,
-+      &avr32_syntax_table[AVR32_SYNTAX_ADC],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_ADD1, 2, 0x00000000, 0xe1f00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_ADD1],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+      },
-+    },
-+    {
-+      AVR32_OPC_ADD2, 4, 0xe0000000, 0xe1f0ffc0,
-+      &avr32_syntax_table[AVR32_SYNTAX_ADD2],
-+      BFD_RELOC_UNUSED, 4, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K2],
-+      },
-+    },
-+    {
-+      AVR32_OPC_ADDABS, 4, 0xe0000e40, 0xe1f0fff0,
-+      &avr32_syntax_table[AVR32_SYNTAX_ADDABS],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_ADDHH_W, 4, 0xe0000e00, 0xe1f0ffc0,
-+      &avr32_syntax_table[AVR32_SYNTAX_ADDHH_W],
-+      BFD_RELOC_UNUSED, 5, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_X],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_Y],
-+      },
-+    },
-+    {
-+      AVR32_OPC_AND1, 2, 0x00600000, 0xe1f00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_AND1],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+      },
-+    },
-+    {
-+      AVR32_OPC_AND2, 4, 0xe1e00000, 0xe1f0fe00,
-+      &avr32_syntax_table[AVR32_SYNTAX_AND2],
-+      BFD_RELOC_UNUSED, 4, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K5E2],
-+      },
-+    },
-+    {
-+      AVR32_OPC_AND3, 4, 0xe1e00200, 0xe1f0fe00,
-+      &avr32_syntax_table[AVR32_SYNTAX_AND3],
-+      BFD_RELOC_UNUSED, 4, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K5E2],
-+      },
-+    },
-+    {
-+      AVR32_OPC_ANDH, 4, 0xe4100000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_ANDH],
-+      BFD_RELOC_AVR32_16U, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K16],
-+      },
-+    },
-+    {
-+      AVR32_OPC_ANDH_COH, 4, 0xe6100000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_ANDH_COH],
-+      BFD_RELOC_AVR32_16U, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K16],
-+      },
-+    },
-+    {
-+      AVR32_OPC_ANDL, 4, 0xe0100000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_ANDL],
-+      BFD_RELOC_AVR32_16U, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K16],
-+      },
-+    },
-+    {
-+      AVR32_OPC_ANDL_COH, 4, 0xe2100000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_ANDL_COH],
-+      BFD_RELOC_AVR32_16U, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K16],
-+      },
-+    },
-+    {
-+      AVR32_OPC_ANDN, 2, 0x00800000, 0xe1f00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_ANDN],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+      },
-+    },
-+    {
-+      AVR32_OPC_ASR1, 4, 0xe0000840, 0xe1f0fff0,
-+      &avr32_syntax_table[AVR32_SYNTAX_ASR1],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_ASR3, 4, 0xe0001400, 0xe1f0ffe0,
-+      &avr32_syntax_table[AVR32_SYNTAX_ASR3],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_K5E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_ASR2, 2, 0xa1400000, 0xe1e00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_ASR2],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_BIT5C],
-+      },
-+    },
-+    {
-+      AVR32_OPC_BLD, 4, 0xedb00000, 0xfff0ffe0,
-+      &avr32_syntax_table[AVR32_SYNTAX_BLD],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K5E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_BREQ1, 2, 0xc0000000, 0xf00f0000,
-+      &avr32_syntax_table[AVR32_SYNTAX_BREQ1],
-+      BFD_RELOC_AVR32_9H_PCREL, 1, 0,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_K8C],
-+      },
-+    },
-+    {
-+      AVR32_OPC_BRNE1, 2, 0xc0010000, 0xf00f0000,
-+      &avr32_syntax_table[AVR32_SYNTAX_BRNE1],
-+      BFD_RELOC_AVR32_9H_PCREL, 1, 0,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_K8C],
-+      },
-+    },
-+    {
-+      AVR32_OPC_BRCC1, 2, 0xc0020000, 0xf00f0000,
-+      &avr32_syntax_table[AVR32_SYNTAX_BRCC1],
-+      BFD_RELOC_AVR32_9H_PCREL, 1, 0,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_K8C],
-+      },
-+    },
-+    {
-+      AVR32_OPC_BRCS1, 2, 0xc0030000, 0xf00f0000,
-+      &avr32_syntax_table[AVR32_SYNTAX_BRCS1],
-+      BFD_RELOC_AVR32_9H_PCREL, 1, 0,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_K8C],
-+      },
-+    },
-+    {
-+      AVR32_OPC_BRGE1, 2, 0xc0040000, 0xf00f0000,
-+      &avr32_syntax_table[AVR32_SYNTAX_BRGE1],
-+      BFD_RELOC_AVR32_9H_PCREL, 1, 0,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_K8C],
-+      },
-+    },
-+    {
-+      AVR32_OPC_BRLT1, 2, 0xc0050000, 0xf00f0000,
-+      &avr32_syntax_table[AVR32_SYNTAX_BRLT1],
-+      BFD_RELOC_AVR32_9H_PCREL, 1, 0,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_K8C],
-+      },
-+    },
-+    {
-+      AVR32_OPC_BRMI1, 2, 0xc0060000, 0xf00f0000,
-+      &avr32_syntax_table[AVR32_SYNTAX_BRMI1],
-+      BFD_RELOC_AVR32_9H_PCREL, 1, 0,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_K8C],
-+      },
-+    },
-+    {
-+      AVR32_OPC_BRPL1, 2, 0xc0070000, 0xf00f0000,
-+      &avr32_syntax_table[AVR32_SYNTAX_BRPL1],
-+      BFD_RELOC_AVR32_9H_PCREL, 1, 0,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_K8C],
-+      },
-+    },
-+    {
-+      AVR32_OPC_BREQ2, 4, 0xe0800000, 0xe1ef0000,
-+      &avr32_syntax_table[AVR32_SYNTAX_BREQ2],
-+      BFD_RELOC_AVR32_22H_PCREL, 1, 0,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_K21],
-+      },
-+    },
-+    {
-+      AVR32_OPC_BRNE2, 4, 0xe0810000, 0xe1ef0000,
-+      &avr32_syntax_table[AVR32_SYNTAX_BRNE2],
-+      BFD_RELOC_AVR32_22H_PCREL, 1, 0,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_K21],
-+      },
-+    },
-+    {
-+      AVR32_OPC_BRCC2, 4, 0xe0820000, 0xe1ef0000,
-+      &avr32_syntax_table[AVR32_SYNTAX_BRHS2],
-+      BFD_RELOC_AVR32_22H_PCREL, 1, 0,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_K21],
-+      },
-+    },
-+    {
-+      AVR32_OPC_BRCS2, 4, 0xe0830000, 0xe1ef0000,
-+      &avr32_syntax_table[AVR32_SYNTAX_BRLO2],
-+      BFD_RELOC_AVR32_22H_PCREL, 1, 0,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_K21],
-+      },
-+    },
-+    {
-+      AVR32_OPC_BRGE2, 4, 0xe0840000, 0xe1ef0000,
-+      &avr32_syntax_table[AVR32_SYNTAX_BRGE2],
-+      BFD_RELOC_AVR32_22H_PCREL, 1, 0,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_K21],
-+      },
-+    },
-+    {
-+      AVR32_OPC_BRLT2, 4, 0xe0850000, 0xe1ef0000,
-+      &avr32_syntax_table[AVR32_SYNTAX_BRLT2],
-+      BFD_RELOC_AVR32_22H_PCREL, 1, 0,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_K21],
-+      },
-+    },
-+    {
-+      AVR32_OPC_BRMI2, 4, 0xe0860000, 0xe1ef0000,
-+      &avr32_syntax_table[AVR32_SYNTAX_BRMI2],
-+      BFD_RELOC_AVR32_22H_PCREL, 1, 0,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_K21],
-+      },
-+    },
-+    {
-+      AVR32_OPC_BRPL2, 4, 0xe0870000, 0xe1ef0000,
-+      &avr32_syntax_table[AVR32_SYNTAX_BRPL2],
-+      BFD_RELOC_AVR32_22H_PCREL, 1, 0,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_K21],
-+      },
-+    },
-+    {
-+      AVR32_OPC_BRLS, 4, 0xe0880000, 0xe1ef0000,
-+      &avr32_syntax_table[AVR32_SYNTAX_BRLS],
-+      BFD_RELOC_AVR32_22H_PCREL, 1, 0,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_K21],
-+      },
-+    },
-+    {
-+      AVR32_OPC_BRGT, 4, 0xe0890000, 0xe1ef0000,
-+      &avr32_syntax_table[AVR32_SYNTAX_BRGT],
-+      BFD_RELOC_AVR32_22H_PCREL, 1, 0,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_K21],
-+      },
-+    },
-+    {
-+      AVR32_OPC_BRLE, 4, 0xe08a0000, 0xe1ef0000,
-+      &avr32_syntax_table[AVR32_SYNTAX_BRLE],
-+      BFD_RELOC_AVR32_22H_PCREL, 1, 0,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_K21],
-+      },
-+    },
-+    {
-+      AVR32_OPC_BRHI, 4, 0xe08b0000, 0xe1ef0000,
-+      &avr32_syntax_table[AVR32_SYNTAX_BRHI],
-+      BFD_RELOC_AVR32_22H_PCREL, 1, 0,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_K21],
-+      },
-+    },
-+    {
-+      AVR32_OPC_BRVS, 4, 0xe08c0000, 0xe1ef0000,
-+      &avr32_syntax_table[AVR32_SYNTAX_BRVS],
-+      BFD_RELOC_AVR32_22H_PCREL, 1, 0,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_K21],
-+      },
-+    },
-+    {
-+      AVR32_OPC_BRVC, 4, 0xe08d0000, 0xe1ef0000,
-+      &avr32_syntax_table[AVR32_SYNTAX_BRVC],
-+      BFD_RELOC_AVR32_22H_PCREL, 1, 0,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_K21],
-+      },
-+    },
-+    {
-+      AVR32_OPC_BRQS, 4, 0xe08e0000, 0xe1ef0000,
-+      &avr32_syntax_table[AVR32_SYNTAX_BRQS],
-+      BFD_RELOC_AVR32_22H_PCREL, 1, 0,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_K21],
-+      },
-+    },
-+    {
-+      AVR32_OPC_BRAL, 4, 0xe08f0000, 0xe1ef0000,
-+      &avr32_syntax_table[AVR32_SYNTAX_BRAL],
-+      BFD_RELOC_AVR32_22H_PCREL, 1, 0,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_K21],
-+      },
-+    },
-+    {
-+      AVR32_OPC_BREAKPOINT, 2, 0xd6730000, 0xffff0000,
-+      &avr32_syntax_table[AVR32_SYNTAX_BREAKPOINT],
-+      BFD_RELOC_UNUSED, 0, -1, { NULL },
-+    },
-+    {
-+      AVR32_OPC_BREV, 2, 0x5c900000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_BREV],
-+      BFD_RELOC_UNUSED, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_BST, 4, 0xefb00000, 0xfff0ffe0,
-+      &avr32_syntax_table[AVR32_SYNTAX_BST],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K5E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_CACHE, 4, 0xf4100000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_CACHE],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K11],
-+	&avr32_ifield_table[AVR32_IFIELD_CACHEOP],
-+      },
-+    },
-+    {
-+      AVR32_OPC_CASTS_B, 2, 0x5c600000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_CASTS_B],
-+      BFD_RELOC_UNUSED, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_CASTS_H, 2, 0x5c800000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_CASTS_H],
-+      BFD_RELOC_UNUSED, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_CASTU_B, 2, 0x5c500000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_CASTU_B],
-+      BFD_RELOC_UNUSED, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_CASTU_H, 2, 0x5c700000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_CASTU_H],
-+      BFD_RELOC_UNUSED, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_CBR, 2, 0xa1c00000, 0xe1e00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_CBR],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_BIT5C],
-+      },
-+    },
-+    {
-+      AVR32_OPC_CLZ, 4, 0xe0001200, 0xe1f0ffff,
-+      &avr32_syntax_table[AVR32_SYNTAX_CLZ],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+      },
-+    },
-+    {
-+      AVR32_OPC_COM, 2, 0x5cd00000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_COM],
-+      BFD_RELOC_UNUSED, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_COP, 4, 0xe1a00000, 0xf9f00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_COP],
-+      BFD_RELOC_UNUSED, 5, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_CPNO],
-+	&avr32_ifield_table[AVR32_IFIELD_CRD_RI],
-+	&avr32_ifield_table[AVR32_IFIELD_CRX],
-+	&avr32_ifield_table[AVR32_IFIELD_CRY],
-+	&avr32_ifield_table[AVR32_IFIELD_CPOP],
-+      },
-+    },
-+    {
-+      AVR32_OPC_CP_B, 4, 0xe0001800, 0xe1f0ffff,
-+      &avr32_syntax_table[AVR32_SYNTAX_CP_B],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+      },
-+    },
-+    {
-+      AVR32_OPC_CP_H, 4, 0xe0001900, 0xe1f0ffff,
-+      &avr32_syntax_table[AVR32_SYNTAX_CP_H],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+      },
-+    },
-+    {
-+      AVR32_OPC_CP_W1, 2, 0x00300000, 0xe1f00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_CP_W1],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+      },
-+    },
-+    {
-+      AVR32_OPC_CP_W2, 2, 0x58000000, 0xfc000000,
-+      &avr32_syntax_table[AVR32_SYNTAX_CP_W2],
-+      BFD_RELOC_AVR32_6S, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K6],
-+      },
-+    },
-+    {
-+      AVR32_OPC_CP_W3, 4, 0xe0400000, 0xe1e00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_CP_W3],
-+      BFD_RELOC_AVR32_21S, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K21],
-+      },
-+    },
-+    {
-+      AVR32_OPC_CPC1, 4, 0xe0001300, 0xe1f0ffff,
-+      &avr32_syntax_table[AVR32_SYNTAX_CPC1],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+      },
-+    },
-+    {
-+      AVR32_OPC_CPC2, 2, 0x5c200000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_CPC2],
-+      BFD_RELOC_UNUSED, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_CSRF, 2, 0xd4030000, 0xfe0f0000,
-+      &avr32_syntax_table[AVR32_SYNTAX_CSRF],
-+      BFD_RELOC_UNUSED, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_K5C],
-+      },
-+    },
-+    {
-+      AVR32_OPC_CSRFCZ, 2, 0xd0030000, 0xfe0f0000,
-+      &avr32_syntax_table[AVR32_SYNTAX_CSRFCZ],
-+      BFD_RELOC_UNUSED, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_K5C],
-+      },
-+    },
-+    {
-+      AVR32_OPC_DIVS, 4, 0xe0000c00, 0xe1f0ffc0,
-+      &avr32_syntax_table[AVR32_SYNTAX_DIVS],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_DIVU, 4, 0xe0000d00, 0xe1f0ffc0,
-+      &avr32_syntax_table[AVR32_SYNTAX_DIVU],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_EOR1, 2, 0x00500000, 0xe1f00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_EOR1],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+      },
-+    },
-+    {
-+      AVR32_OPC_EOR2, 4, 0xe1e02000, 0xe1f0fe00,
-+      &avr32_syntax_table[AVR32_SYNTAX_EOR2],
-+      BFD_RELOC_UNUSED, 4, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K5E2],
-+      }
-+    },
-+    {
-+      AVR32_OPC_EOR3, 4, 0xe1e02200, 0xe1f0fe00,
-+      &avr32_syntax_table[AVR32_SYNTAX_EOR3],
-+      BFD_RELOC_UNUSED, 4, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K5E2],
-+      }
-+    },
-+    {
-+      AVR32_OPC_EORL, 4, 0xec100000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_EORL],
-+      BFD_RELOC_AVR32_16U, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K16],
-+      },
-+    },
-+    {
-+      AVR32_OPC_EORH, 4, 0xee100000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_EORH],
-+      BFD_RELOC_AVR32_16U, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K16],
-+      },
-+    },
-+    {
-+      AVR32_OPC_FRS, 2, 0xd7430000, 0xffff0000,
-+      &avr32_syntax_table[AVR32_SYNTAX_FRS],
-+      BFD_RELOC_UNUSED, 0, -1, { NULL },
-+    },
-+    {
-+      AVR32_OPC_ICALL, 2, 0x5d100000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_ICALL],
-+      BFD_RELOC_UNUSED, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_INCJOSP, 2, 0xd6830000, 0xff8f0000,
-+      &avr32_syntax_table[AVR32_SYNTAX_INCJOSP],
-+      BFD_RELOC_UNUSED, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_K3],
-+      },
-+    },
-+    {
-+      AVR32_OPC_LD_D1, 2, 0xa1010000, 0xe1f10000,
-+      &avr32_syntax_table[AVR32_SYNTAX_LD_D1],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY_DW],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+      },
-+    },
-+    {
-+      AVR32_OPC_LD_D2, 2, 0xa1100000, 0xe1f10000,
-+      &avr32_syntax_table[AVR32_SYNTAX_LD_D2],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY_DW],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+      },
-+    },
-+    {
-+      AVR32_OPC_LD_D3, 2, 0xa1000000, 0xe1f10000,
-+      &avr32_syntax_table[AVR32_SYNTAX_LD_D3],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY_DW],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+      },
-+    },
-+    {
-+      AVR32_OPC_LD_D5, 4, 0xe0000200, 0xe1f0ffc1,
-+      &avr32_syntax_table[AVR32_SYNTAX_LD_D5],
-+      BFD_RELOC_UNUSED, 4, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_DW],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K2],
-+      },
-+    },
-+    {
-+      AVR32_OPC_LD_D4, 4, 0xe0e00000, 0xe1f10000,
-+      &avr32_syntax_table[AVR32_SYNTAX_LD_D4],
-+      BFD_RELOC_AVR32_16S, 3, 2,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY_DW],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_K16],
-+      },
-+    },
-+    {
-+      AVR32_OPC_LD_SB2, 4, 0xe0000600, 0xe1f0ffc0,
-+      &avr32_syntax_table[AVR32_SYNTAX_LD_SB2],
-+      BFD_RELOC_UNUSED, 4, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K2],
-+      },
-+    },
-+    {
-+      AVR32_OPC_LD_SB1, 4, 0xe1200000, 0xe1f00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_LD_SB1],
-+      BFD_RELOC_AVR32_16S, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_K16],
-+      },
-+    },
-+    {
-+      AVR32_OPC_LD_UB1, 2, 0x01300000, 0xe1f00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_LD_UB1],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+      },
-+    },
-+    {
-+      AVR32_OPC_LD_UB2, 2, 0x01700000, 0xe1f00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_LD_UB2],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+      },
-+    },
-+    {
-+      AVR32_OPC_LD_UB5, 4, 0xe0000700, 0xe1f0ffc0,
-+      &avr32_syntax_table[AVR32_SYNTAX_LD_UB5],
-+      BFD_RELOC_UNUSED, 4, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K2],
-+      },
-+    },
-+    {
-+      AVR32_OPC_LD_UB3, 2, 0x01800000, 0xe1800000,
-+      &avr32_syntax_table[AVR32_SYNTAX_LD_UB3],
-+      BFD_RELOC_AVR32_3U, 3, 2,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_K3],
-+      },
-+    },
-+    {
-+      AVR32_OPC_LD_UB4, 4, 0xe1300000, 0xe1f00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_LD_UB4],
-+      BFD_RELOC_AVR32_16S, 3, 2,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_K16],
-+      },
-+    },
-+    {
-+      AVR32_OPC_LD_SH1, 2, 0x01100000, 0xe1f00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_LD_SH1],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+      },
-+    },
-+    {
-+      AVR32_OPC_LD_SH2, 2, 0x01500000, 0xe1f00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_LD_SH2],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+      },
-+    },
-+    {
-+      AVR32_OPC_LD_SH5, 4, 0xe0000400, 0xe1f0ffc0,
-+      &avr32_syntax_table[AVR32_SYNTAX_LD_SH5],
-+      BFD_RELOC_UNUSED, 4, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K2],
-+      },
-+    },
-+    {
-+      AVR32_OPC_LD_SH3, 2, 0x80000000, 0xe1800000,
-+      &avr32_syntax_table[AVR32_SYNTAX_LD_SH3],
-+      BFD_RELOC_AVR32_4UH, 3, 2,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_K3],
-+      },
-+    },
-+    {
-+      AVR32_OPC_LD_SH4, 4, 0xe1000000, 0xe1f00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_LD_SH4],
-+      BFD_RELOC_AVR32_16S, 3, 2,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_K16],
-+      },
-+    },
-+    {
-+      AVR32_OPC_LD_UH1, 2, 0x01200000, 0xe1f00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_LD_UH1],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+      },
-+    },
-+    {
-+      AVR32_OPC_LD_UH2, 2, 0x01600000, 0xe1f00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_LD_UH2],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+      },
-+    },
-+    {
-+      AVR32_OPC_LD_UH5, 4, 0xe0000500, 0xe1f0ffc0,
-+      &avr32_syntax_table[AVR32_SYNTAX_LD_UH5],
-+      BFD_RELOC_UNUSED, 4, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K2],
-+      },
-+    },
-+    {
-+      AVR32_OPC_LD_UH3, 2, 0x80800000, 0xe1800000,
-+      &avr32_syntax_table[AVR32_SYNTAX_LD_UH3],
-+      BFD_RELOC_AVR32_4UH, 3, 2,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_K3],
-+      },
-+    },
-+    {
-+      AVR32_OPC_LD_UH4, 4, 0xe1100000, 0xe1f00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_LD_UH4],
-+      BFD_RELOC_AVR32_16S, 3, 2,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_K16],
-+      },
-+    },
-+    {
-+      AVR32_OPC_LD_W1, 2, 0x01000000, 0xe1f00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_LD_W1],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+      },
-+    },
-+    {
-+      AVR32_OPC_LD_W2, 2, 0x01400000, 0xe1f00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_LD_W2],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+      },
-+    },
-+    {
-+      AVR32_OPC_LD_W5, 4, 0xe0000300, 0xe1f0ffc0,
-+      &avr32_syntax_table[AVR32_SYNTAX_LD_W5],
-+      BFD_RELOC_UNUSED, 4, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K2],
-+      },
-+    },
-+    {
-+      AVR32_OPC_LD_W6, 4, 0xe0000f80, 0xe1f0ffc0,
-+      &avr32_syntax_table[AVR32_SYNTAX_LD_W6],
-+      BFD_RELOC_UNUSED, 4, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K2],
-+      },
-+    },
-+    {
-+      AVR32_OPC_LD_W3, 2, 0x60000000, 0xe0000000,
-+      &avr32_syntax_table[AVR32_SYNTAX_LD_W3],
-+      BFD_RELOC_AVR32_7UW, 3, 2,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_K5C],
-+      },
-+    },
-+    {
-+      AVR32_OPC_LD_W4, 4, 0xe0f00000, 0xe1f00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_LD_W4],
-+      BFD_RELOC_AVR32_16S, 3, 2,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_K16],
-+      },
-+    },
-+    {
-+      AVR32_OPC_LDC_D1, 4, 0xe9a01000, 0xfff01100,
-+      &avr32_syntax_table[AVR32_SYNTAX_LDC_D1],
-+      BFD_RELOC_AVR32_10UW, 4, 3,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_CPNO],
-+	&avr32_ifield_table[AVR32_IFIELD_CRD_DW],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_LDC_D2, 4, 0xefa00050, 0xfff011ff,
-+      &avr32_syntax_table[AVR32_SYNTAX_LDC_D2],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_CPNO],
-+	&avr32_ifield_table[AVR32_IFIELD_CRD_DW],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_LDC_D3, 4, 0xefa01040, 0xfff011c0,
-+      &avr32_syntax_table[AVR32_SYNTAX_LDC_D3],
-+      BFD_RELOC_UNUSED, 5, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_CPNO],
-+	&avr32_ifield_table[AVR32_IFIELD_CRD_DW],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_K2],
-+      },
-+    },
-+    {
-+      AVR32_OPC_LDC_W1, 4, 0xe9a00000, 0xfff01000,
-+      &avr32_syntax_table[AVR32_SYNTAX_LDC_W1],
-+      BFD_RELOC_AVR32_10UW, 4, 3,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_CPNO],
-+	&avr32_ifield_table[AVR32_IFIELD_CRD_RI],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_LDC_W2, 4, 0xefa00040, 0xfff010ff,
-+      &avr32_syntax_table[AVR32_SYNTAX_LDC_W2],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_CPNO],
-+	&avr32_ifield_table[AVR32_IFIELD_CRD_RI],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_LDC_W3, 4, 0xefa01000, 0xfff010c0,
-+      &avr32_syntax_table[AVR32_SYNTAX_LDC_W3],
-+      BFD_RELOC_UNUSED, 5, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_CPNO],
-+	&avr32_ifield_table[AVR32_IFIELD_CRD_RI],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_K2],
-+      },
-+    },
-+    {
-+      AVR32_OPC_LDC0_D, 4, 0xf3a00000, 0xfff00100,
-+      &avr32_syntax_table[AVR32_SYNTAX_LDC0_D],
-+      BFD_RELOC_AVR32_14UW, 3, 2,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_CRD_DW],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K12CP],
-+      },
-+    },
-+    {
-+      AVR32_OPC_LDC0_W, 4, 0xf1a00000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_LDC0_W],
-+      BFD_RELOC_AVR32_14UW, 3, 2,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_CRD_RI],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K12CP],
-+      },
-+    },
-+    {
-+      AVR32_OPC_LDCM_D, 4, 0xeda00400, 0xfff01f00,
-+      &avr32_syntax_table[AVR32_SYNTAX_LDCM_D],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_CPNO],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_LDCM_D_PU, 4, 0xeda01400, 0xfff01f00,
-+      &avr32_syntax_table[AVR32_SYNTAX_LDCM_D_PU],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_CPNO],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_LDCM_W, 4, 0xeda00000, 0xfff01e00,
-+      &avr32_syntax_table[AVR32_SYNTAX_LDCM_W],
-+      BFD_RELOC_UNUSED, 4, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_CPNO],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+	&avr32_ifield_table[AVR32_IFIELD_CM_HL],
-+      },
-+    },
-+    {
-+      AVR32_OPC_LDCM_W_PU, 4, 0xeda01000, 0xfff01e00,
-+      &avr32_syntax_table[AVR32_SYNTAX_LDCM_W_PU],
-+      BFD_RELOC_UNUSED, 4, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_CPNO],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+	&avr32_ifield_table[AVR32_IFIELD_CM_HL],
-+      },
-+    },
-+    {
-+      AVR32_OPC_LDDPC, 2, 0x48000000, 0xf8000000,
-+      &avr32_syntax_table[AVR32_SYNTAX_LDDPC],
-+      BFD_RELOC_AVR32_9UW_PCREL, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K7C],
-+      },
-+    },
-+    {
-+      AVR32_OPC_LDDPC_EXT, 4, 0xfef00000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_LDDPC_EXT],
-+      BFD_RELOC_AVR32_16B_PCREL, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K16],
-+      },
-+    },
-+    {
-+      AVR32_OPC_LDDSP, 2, 0x40000000, 0xf8000000,
-+      &avr32_syntax_table[AVR32_SYNTAX_LDDSP],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K7C],
-+      },
-+    },
-+    {
-+      AVR32_OPC_LDINS_B, 4, 0xe1d04000, 0xe1f0c000,
-+      &avr32_syntax_table[AVR32_SYNTAX_LDINS_B],
-+      BFD_RELOC_UNUSED, 4, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_PART2_K12],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_K12],
-+      },
-+    },
-+    {
-+      AVR32_OPC_LDINS_H, 4, 0xe1d00000, 0xe1f0e000,
-+      &avr32_syntax_table[AVR32_SYNTAX_LDINS_H],
-+      BFD_RELOC_UNUSED, 4, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_PART1_K12],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_K12],
-+      },
-+    },
-+    {
-+      AVR32_OPC_LDM, 4, 0xe1c00000, 0xfdf00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_LDM],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_W],
-+	&avr32_ifield_table[AVR32_IFIELD_K16],
-+      },
-+    },
-+    {
-+      AVR32_OPC_LDMTS, 4, 0xe5c00000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_LDMTS],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K16],
-+      },
-+    },
-+    {
-+      AVR32_OPC_LDMTS_PU, 4, 0xe7c00000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_LDMTS_PU],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K16],
-+      },
-+    },
-+    {
-+      AVR32_OPC_LDSWP_SH, 4, 0xe1d02000, 0xe1f0f000,
-+      &avr32_syntax_table[AVR32_SYNTAX_LDSWP_SH],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_K12],
-+      },
-+    },
-+    {
-+      AVR32_OPC_LDSWP_UH, 4, 0xe1d03000, 0xe1f0f000,
-+      &avr32_syntax_table[AVR32_SYNTAX_LDSWP_UH],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_K12],
-+      },
-+    },
-+    {
-+      AVR32_OPC_LDSWP_W, 4, 0xe1d08000, 0xe1f0f000,
-+      &avr32_syntax_table[AVR32_SYNTAX_LDSWP_W],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_K12],
-+      },
-+    },
-+    {
-+      AVR32_OPC_LSL1, 4, 0xe0000940, 0xe1f0fff0,
-+      &avr32_syntax_table[AVR32_SYNTAX_LSL1],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_LSL3, 4, 0xe0001500, 0xe1f0ffe0,
-+      &avr32_syntax_table[AVR32_SYNTAX_LSL3],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_K5E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_LSL2, 2, 0xa1600000, 0xe1e00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_LSL2],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_BIT5C],
-+      },
-+    },
-+    {
-+      AVR32_OPC_LSR1, 4, 0xe0000a40, 0xe1f0fff0,
-+      &avr32_syntax_table[AVR32_SYNTAX_LSR1],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_LSR3, 4, 0xe0001600, 0xe1f0ffe0,
-+      &avr32_syntax_table[AVR32_SYNTAX_LSR3],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_K5E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_LSR2, 2, 0xa1800000, 0xe1e00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_LSR2],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_BIT5C],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MAC, 4, 0xe0000340, 0xe1f0fff0,
-+      &avr32_syntax_table[AVR32_SYNTAX_MAC],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MACHH_D, 4, 0xe0000580, 0xe1f0ffc1,
-+      &avr32_syntax_table[AVR32_SYNTAX_MACHH_D],
-+      BFD_RELOC_UNUSED, 5, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_X],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_Y],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MACHH_W, 4, 0xe0000480, 0xe1f0ffc0,
-+      &avr32_syntax_table[AVR32_SYNTAX_MACHH_W],
-+      BFD_RELOC_UNUSED, 5, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_X],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_Y],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MACS_D, 4, 0xe0000540, 0xe1f0fff1,
-+      &avr32_syntax_table[AVR32_SYNTAX_MACS_D],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MACSATHH_W, 4, 0xe0000680, 0xe1f0ffc0,
-+      &avr32_syntax_table[AVR32_SYNTAX_MACSATHH_W],
-+      BFD_RELOC_UNUSED, 5, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_X],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_Y],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MACUD, 4, 0xe0000740, 0xe1f0fff1,
-+      &avr32_syntax_table[AVR32_SYNTAX_MACUD],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MACWH_D, 4, 0xe0000c80, 0xe1f0ffe1,
-+      &avr32_syntax_table[AVR32_SYNTAX_MACWH_D],
-+      BFD_RELOC_UNUSED, 4, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_Y],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MAX, 4, 0xe0000c40, 0xe1f0fff0,
-+      &avr32_syntax_table[AVR32_SYNTAX_MAX],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MCALL, 4, 0xf0100000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_MCALL],
-+      BFD_RELOC_AVR32_18W_PCREL, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K16],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MFDR, 4, 0xe5b00000, 0xfff0ff00,
-+      &avr32_syntax_table[AVR32_SYNTAX_MFDR],
-+      BFD_RELOC_AVR32_8S_EXT, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MFSR, 4, 0xe1b00000, 0xfff0ff00,
-+      &avr32_syntax_table[AVR32_SYNTAX_MFSR],
-+      BFD_RELOC_AVR32_8S_EXT, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MIN, 4, 0xe0000d40, 0xe1f0fff0,
-+      &avr32_syntax_table[AVR32_SYNTAX_MIN],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MOV3, 2, 0x00900000, 0xe1f00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_MOV3],
-+      BFD_RELOC_NONE, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MOV1, 2, 0x30000000, 0xf0000000,
-+      &avr32_syntax_table[AVR32_SYNTAX_MOV1],
-+      BFD_RELOC_AVR32_8S, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8C],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MOV2, 4, 0xe0600000, 0xe1e00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_MOV2],
-+      BFD_RELOC_AVR32_21S, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K21],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MOVEQ1, 4, 0xe0001700, 0xe1f0ffff,
-+      &avr32_syntax_table[AVR32_SYNTAX_MOVEQ1],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MOVNE1, 4, 0xe0001710, 0xe1f0ffff,
-+      &avr32_syntax_table[AVR32_SYNTAX_MOVNE1],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MOVCC1, 4, 0xe0001720, 0xe1f0ffff,
-+      &avr32_syntax_table[AVR32_SYNTAX_MOVHS1],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MOVCS1, 4, 0xe0001730, 0xe1f0ffff,
-+      &avr32_syntax_table[AVR32_SYNTAX_MOVLO1],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MOVGE1, 4, 0xe0001740, 0xe1f0ffff,
-+      &avr32_syntax_table[AVR32_SYNTAX_MOVGE1],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MOVLT1, 4, 0xe0001750, 0xe1f0ffff,
-+      &avr32_syntax_table[AVR32_SYNTAX_MOVLT1],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MOVMI1, 4, 0xe0001760, 0xe1f0ffff,
-+      &avr32_syntax_table[AVR32_SYNTAX_MOVMI1],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MOVPL1, 4, 0xe0001770, 0xe1f0ffff,
-+      &avr32_syntax_table[AVR32_SYNTAX_MOVPL1],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MOVLS1, 4, 0xe0001780, 0xe1f0ffff,
-+      &avr32_syntax_table[AVR32_SYNTAX_MOVLS1],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MOVGT1, 4, 0xe0001790, 0xe1f0ffff,
-+      &avr32_syntax_table[AVR32_SYNTAX_MOVGT1],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MOVLE1, 4, 0xe00017a0, 0xe1f0ffff,
-+      &avr32_syntax_table[AVR32_SYNTAX_MOVLE1],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MOVHI1, 4, 0xe00017b0, 0xe1f0ffff,
-+      &avr32_syntax_table[AVR32_SYNTAX_MOVHI1],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MOVVS1, 4, 0xe00017c0, 0xe1f0ffff,
-+      &avr32_syntax_table[AVR32_SYNTAX_MOVVS1],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MOVVC1, 4, 0xe00017d0, 0xe1f0ffff,
-+      &avr32_syntax_table[AVR32_SYNTAX_MOVVC1],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MOVQS1, 4, 0xe00017e0, 0xe1f0ffff,
-+      &avr32_syntax_table[AVR32_SYNTAX_MOVQS1],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MOVAL1, 4, 0xe00017f0, 0xe1f0ffff,
-+      &avr32_syntax_table[AVR32_SYNTAX_MOVAL1],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MOVEQ2, 4, 0xf9b00000, 0xfff0ff00,
-+      &avr32_syntax_table[AVR32_SYNTAX_MOVEQ2],
-+      BFD_RELOC_AVR32_8S_EXT, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MOVNE2, 4, 0xf9b00100, 0xfff0ff00,
-+      &avr32_syntax_table[AVR32_SYNTAX_MOVNE2],
-+      BFD_RELOC_AVR32_8S_EXT, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MOVCC2, 4, 0xf9b00200, 0xfff0ff00,
-+      &avr32_syntax_table[AVR32_SYNTAX_MOVHS2],
-+      BFD_RELOC_AVR32_8S_EXT, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MOVCS2, 4, 0xf9b00300, 0xfff0ff00,
-+      &avr32_syntax_table[AVR32_SYNTAX_MOVLO2],
-+      BFD_RELOC_AVR32_8S_EXT, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MOVGE2, 4, 0xf9b00400, 0xfff0ff00,
-+      &avr32_syntax_table[AVR32_SYNTAX_MOVGE2],
-+      BFD_RELOC_AVR32_8S_EXT, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MOVLT2, 4, 0xf9b00500, 0xfff0ff00,
-+      &avr32_syntax_table[AVR32_SYNTAX_MOVLT2],
-+      BFD_RELOC_AVR32_8S_EXT, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MOVMI2, 4, 0xf9b00600, 0xfff0ff00,
-+      &avr32_syntax_table[AVR32_SYNTAX_MOVMI2],
-+      BFD_RELOC_AVR32_8S_EXT, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MOVPL2, 4, 0xf9b00700, 0xfff0ff00,
-+      &avr32_syntax_table[AVR32_SYNTAX_MOVPL2],
-+      BFD_RELOC_AVR32_8S_EXT, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MOVLS2, 4, 0xf9b00800, 0xfff0ff00,
-+      &avr32_syntax_table[AVR32_SYNTAX_MOVLS2],
-+      BFD_RELOC_AVR32_8S_EXT, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MOVGT2, 4, 0xf9b00900, 0xfff0ff00,
-+      &avr32_syntax_table[AVR32_SYNTAX_MOVGT2],
-+      BFD_RELOC_AVR32_8S_EXT, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MOVLE2, 4, 0xf9b00a00, 0xfff0ff00,
-+      &avr32_syntax_table[AVR32_SYNTAX_MOVLE2],
-+      BFD_RELOC_AVR32_8S_EXT, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MOVHI2, 4, 0xf9b00b00, 0xfff0ff00,
-+      &avr32_syntax_table[AVR32_SYNTAX_MOVHI2],
-+      BFD_RELOC_AVR32_8S_EXT, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MOVVS2, 4, 0xf9b00c00, 0xfff0ff00,
-+      &avr32_syntax_table[AVR32_SYNTAX_MOVVS2],
-+      BFD_RELOC_AVR32_8S_EXT, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MOVVC2, 4, 0xf9b00d00, 0xfff0ff00,
-+      &avr32_syntax_table[AVR32_SYNTAX_MOVVC2],
-+      BFD_RELOC_AVR32_8S_EXT, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MOVQS2, 4, 0xf9b00e00, 0xfff0ff00,
-+      &avr32_syntax_table[AVR32_SYNTAX_MOVQS2],
-+      BFD_RELOC_AVR32_8S_EXT, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MOVAL2, 4, 0xf9b00f00, 0xfff0ff00,
-+      &avr32_syntax_table[AVR32_SYNTAX_MOVAL2],
-+      BFD_RELOC_AVR32_8S_EXT, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MTDR, 4, 0xe7b00000, 0xfff0ff00,
-+      &avr32_syntax_table[AVR32_SYNTAX_MTDR],
-+      BFD_RELOC_AVR32_8S_EXT, 2, 0,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MTSR, 4, 0xe3b00000, 0xfff0ff00,
-+      &avr32_syntax_table[AVR32_SYNTAX_MTSR],
-+      BFD_RELOC_AVR32_8S_EXT, 2, 0,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MUL1, 2, 0xa1300000, 0xe1f00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_MUL1],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MUL2, 4, 0xe0000240, 0xe1f0fff0,
-+      &avr32_syntax_table[AVR32_SYNTAX_MUL2],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MUL3, 4, 0xe0001000, 0xe1f0ff00,
-+      &avr32_syntax_table[AVR32_SYNTAX_MUL3],
-+      BFD_RELOC_AVR32_8S_EXT, 3, 2,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MULHH_W, 4, 0xe0000780, 0xe1f0ffc0,
-+      &avr32_syntax_table[AVR32_SYNTAX_MULHH_W],
-+      BFD_RELOC_UNUSED, 5, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_X],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_Y],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MULNHH_W, 4, 0xe0000180, 0xe1f0ffc0,
-+      &avr32_syntax_table[AVR32_SYNTAX_MULNHH_W],
-+      BFD_RELOC_UNUSED, 5, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_X],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_Y],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MULNWH_D, 4, 0xe0000280, 0xe1f0ffe1,
-+      &avr32_syntax_table[AVR32_SYNTAX_MULNWH_D],
-+      BFD_RELOC_UNUSED, 4, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_Y],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MULSD, 4, 0xe0000440, 0xe1f0fff0,
-+      &avr32_syntax_table[AVR32_SYNTAX_MULSD],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MULSATHH_H, 4, 0xe0000880, 0xe1f0ffc0,
-+      &avr32_syntax_table[AVR32_SYNTAX_MULSATHH_H],
-+      BFD_RELOC_UNUSED, 5, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_X],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_Y],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MULSATHH_W, 4, 0xe0000980, 0xe1f0ffc0,
-+      &avr32_syntax_table[AVR32_SYNTAX_MULSATHH_W],
-+      BFD_RELOC_UNUSED, 5, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_X],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_Y],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MULSATRNDHH_H, 4, 0xe0000a80, 0xe1f0ffc0,
-+      &avr32_syntax_table[AVR32_SYNTAX_MULSATRNDHH_H],
-+      BFD_RELOC_UNUSED, 5, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_X],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_Y],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MULSATRNDWH_W, 4, 0xe0000b80, 0xe1f0ffe0,
-+      &avr32_syntax_table[AVR32_SYNTAX_MULSATRNDWH_W],
-+      BFD_RELOC_UNUSED, 4, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_Y],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MULSATWH_W, 4, 0xe0000e80, 0xe1f0ffe0,
-+      &avr32_syntax_table[AVR32_SYNTAX_MULSATWH_W],
-+      BFD_RELOC_UNUSED, 4, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_Y],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MULU_D, 4, 0xe0000640, 0xe1f0fff1,
-+      &avr32_syntax_table[AVR32_SYNTAX_MULU_D],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MULWH_D, 4, 0xe0000d80, 0xe1f0ffe1,
-+      &avr32_syntax_table[AVR32_SYNTAX_MULWH_D],
-+      BFD_RELOC_UNUSED, 4, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_Y],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MUSFR, 2, 0x5d300000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_MUSFR],
-+      BFD_RELOC_UNUSED, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      }
-+    },
-+    {
-+      AVR32_OPC_MUSTR, 2, 0x5d200000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_MUSTR],
-+      BFD_RELOC_UNUSED, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      }
-+    },
-+    {
-+      AVR32_OPC_MVCR_D, 4, 0xefa00010, 0xfff111ff,
-+      &avr32_syntax_table[AVR32_SYNTAX_MVCR_D],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_CPNO],
-+	&avr32_ifield_table[AVR32_IFIELD_RY_DW],
-+	&avr32_ifield_table[AVR32_IFIELD_CRD_DW],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MVCR_W, 4, 0xefa00000, 0xfff010ff,
-+      &avr32_syntax_table[AVR32_SYNTAX_MVCR_W],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_CPNO],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_CRD_RI],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MVRC_D, 4, 0xefa00030, 0xfff111ff,
-+      &avr32_syntax_table[AVR32_SYNTAX_MVRC_D],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_CPNO],
-+	&avr32_ifield_table[AVR32_IFIELD_CRD_DW],
-+	&avr32_ifield_table[AVR32_IFIELD_RY_DW],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MVRC_W, 4, 0xefa00020, 0xfff010ff,
-+      &avr32_syntax_table[AVR32_SYNTAX_MVRC_W],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_CPNO],
-+	&avr32_ifield_table[AVR32_IFIELD_CRD_RI],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_NEG, 2, 0x5c300000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_NEG],
-+      BFD_RELOC_UNUSED, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      }
-+    },
-+    {
-+      AVR32_OPC_NOP, 2, 0xd7030000, 0xffff0000,
-+      &avr32_syntax_table[AVR32_SYNTAX_NOP],
-+      BFD_RELOC_UNUSED, 0, -1, { NULL },
-+    },
-+    {
-+      AVR32_OPC_OR1, 2, 0x00400000, 0xe1f00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_OR1],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+      },
-+    },
-+    {
-+      AVR32_OPC_OR2, 4, 0xe1e01000, 0xe1f0fe00,
-+      &avr32_syntax_table[AVR32_SYNTAX_OR2],
-+      BFD_RELOC_UNUSED, 4, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K5E2],
-+      },
-+    },
-+    {
-+      AVR32_OPC_OR3, 4, 0xe1e01200, 0xe1f0fe00,
-+      &avr32_syntax_table[AVR32_SYNTAX_OR3],
-+      BFD_RELOC_UNUSED, 4, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K5E2],
-+      },
-+    },
-+    {
-+      AVR32_OPC_ORH, 4, 0xea100000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_ORH],
-+      BFD_RELOC_AVR32_16U, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K16],
-+      },
-+    },
-+    {
-+      AVR32_OPC_ORL, 4, 0xe8100000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_ORL],
-+      BFD_RELOC_AVR32_16U, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K16],
-+      },
-+    },
-+    {
-+      AVR32_OPC_PABS_SB, 4, 0xe00023e0, 0xfff0fff0,
-+      &avr32_syntax_table[AVR32_SYNTAX_PABS_SB],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_PABS_SH, 4, 0xe00023f0, 0xfff0fff0,
-+      &avr32_syntax_table[AVR32_SYNTAX_PABS_SH],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_PACKSH_SB, 4, 0xe00024d0, 0xe1f0fff0,
-+      &avr32_syntax_table[AVR32_SYNTAX_PACKSH_SB],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_PACKSH_UB, 4, 0xe00024c0, 0xe1f0fff0,
-+      &avr32_syntax_table[AVR32_SYNTAX_PACKSH_UB],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_PACKW_SH, 4, 0xe0002470, 0xe1f0fff0,
-+      &avr32_syntax_table[AVR32_SYNTAX_PACKW_SH],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_PADD_B, 4, 0xe0002300, 0xe1f0fff0,
-+      &avr32_syntax_table[AVR32_SYNTAX_PADD_B],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_PADD_H, 4, 0xe0002000, 0xe1f0fff0,
-+      &avr32_syntax_table[AVR32_SYNTAX_PADD_H],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_PADDH_SH, 4, 0xe00020c0, 0xe1f0fff0,
-+      &avr32_syntax_table[AVR32_SYNTAX_PADDH_SH],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_PADDH_UB, 4, 0xe0002360, 0xe1f0fff0,
-+      &avr32_syntax_table[AVR32_SYNTAX_PADDH_UB],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_PADDS_SB, 4, 0xe0002320, 0xe1f0fff0,
-+      &avr32_syntax_table[AVR32_SYNTAX_PADDS_SB],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_PADDS_SH, 4, 0xe0002040, 0xe1f0fff0,
-+      &avr32_syntax_table[AVR32_SYNTAX_PADDS_SH],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_PADDS_UB, 4, 0xe0002340, 0xe1f0fff0,
-+      &avr32_syntax_table[AVR32_SYNTAX_PADDS_UB],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_PADDS_UH, 4, 0xe0002080, 0xe1f0fff0,
-+      &avr32_syntax_table[AVR32_SYNTAX_PADDS_UH],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_PADDSUB_H, 4, 0xe0002100, 0xe1f0ffc0,
-+      &avr32_syntax_table[AVR32_SYNTAX_PADDSUB_H],
-+      BFD_RELOC_UNUSED, 5, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_X],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_Y],
-+      },
-+    },
-+    {
-+      AVR32_OPC_PADDSUBH_SH, 4, 0xe0002280, 0xe1f0ffc0,
-+      &avr32_syntax_table[AVR32_SYNTAX_PADDSUBH_SH],
-+      BFD_RELOC_UNUSED, 5, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_X],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_Y],
-+      },
-+    },
-+    {
-+      AVR32_OPC_PADDSUBS_SH, 4, 0xe0002180, 0xe1f0ffc0,
-+      &avr32_syntax_table[AVR32_SYNTAX_PADDSUBS_SH],
-+      BFD_RELOC_UNUSED, 5, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_X],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_Y],
-+      },
-+    },
-+    {
-+      AVR32_OPC_PADDSUBS_UH, 4, 0xe0002200, 0xe1f0ffc0,
-+      &avr32_syntax_table[AVR32_SYNTAX_PADDSUBS_UH],
-+      BFD_RELOC_UNUSED, 5, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_X],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_Y],
-+      },
-+    },
-+    {
-+      AVR32_OPC_PADDX_H, 4, 0xe0002020, 0xe1f0fff0,
-+      &avr32_syntax_table[AVR32_SYNTAX_PADDX_H],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_PADDXH_SH, 4, 0xe00020e0, 0xe1f0fff0,
-+      &avr32_syntax_table[AVR32_SYNTAX_PADDXH_SH],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_PADDXS_SH, 4, 0xe0002060, 0xe1f0fff0,
-+      &avr32_syntax_table[AVR32_SYNTAX_PADDXS_SH],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_PADDXS_UH, 4, 0xe00020a0, 0xe1f0fff0,
-+      &avr32_syntax_table[AVR32_SYNTAX_PADDXS_UH],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_PASR_B, 4, 0xe0002410, 0xe1f8fff0,
-+      &avr32_syntax_table[AVR32_SYNTAX_PASR_B],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_COND3],
-+      },
-+    },
-+    {
-+      AVR32_OPC_PASR_H, 4, 0xe0002440, 0xe1f0fff0,
-+      &avr32_syntax_table[AVR32_SYNTAX_PASR_H],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_PAVG_SH, 4, 0xe00023d0, 0xe1f0fff0,
-+      &avr32_syntax_table[AVR32_SYNTAX_PAVG_SH],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_PAVG_UB, 4, 0xe00023c0, 0xe1f0fff0,
-+      &avr32_syntax_table[AVR32_SYNTAX_PAVG_UB],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_PLSL_B, 4, 0xe0002420, 0xe1f8fff0,
-+      &avr32_syntax_table[AVR32_SYNTAX_PLSL_B],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_COND3],
-+      },
-+    },
-+    {
-+      AVR32_OPC_PLSL_H, 4, 0xe0002450, 0xe1f0fff0,
-+      &avr32_syntax_table[AVR32_SYNTAX_PLSL_H],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_PLSR_B, 4, 0xe0002430, 0xe1f8fff0,
-+      &avr32_syntax_table[AVR32_SYNTAX_PLSR_B],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_COND3],
-+      },
-+    },
-+    {
-+      AVR32_OPC_PLSR_H, 4, 0xe0002460, 0xe1f0fff0,
-+      &avr32_syntax_table[AVR32_SYNTAX_PLSR_H],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_PMAX_SH, 4, 0xe0002390, 0xe1f0fff0,
-+      &avr32_syntax_table[AVR32_SYNTAX_PMAX_SH],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_PMAX_UB, 4, 0xe0002380, 0xe1f0fff0,
-+      &avr32_syntax_table[AVR32_SYNTAX_PMAX_UB],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_PMIN_SH, 4, 0xe00023b0, 0xe1f0fff0,
-+      &avr32_syntax_table[AVR32_SYNTAX_PMIN_SH],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_PMIN_UB, 4, 0xe00023a0, 0xe1f0fff0,
-+      &avr32_syntax_table[AVR32_SYNTAX_PMIN_UB],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_POPJC, 2, 0xd7130000, 0xffff0000,
-+      &avr32_syntax_table[AVR32_SYNTAX_POPJC],
-+      BFD_RELOC_UNUSED, 0, -1, { NULL },
-+    },
-+    {
-+      AVR32_OPC_POPM, 2, 0xd0020000, 0xf0070000,
-+      &avr32_syntax_table[AVR32_SYNTAX_POPM],
-+      BFD_RELOC_UNUSED, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_POPM],
-+      },
-+    },
-+    {
-+      AVR32_OPC_POPM_E, 4, 0xe3cd0000, 0xffff0000,
-+      &avr32_syntax_table[AVR32_SYNTAX_POPM_E],
-+      BFD_RELOC_UNUSED, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_K16],
-+      },
-+    },
-+    {
-+      AVR32_OPC_PREF, 4, 0xf2100000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_PREF],
-+      BFD_RELOC_AVR32_16S, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K16],
-+      },
-+    },
-+    {
-+      AVR32_OPC_PSAD, 4, 0xe0002400, 0xe1f0fff0,
-+      &avr32_syntax_table[AVR32_SYNTAX_PSAD],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_PSUB_B, 4, 0xe0002310, 0xe1f0fff0,
-+      &avr32_syntax_table[AVR32_SYNTAX_PSUB_B],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_PSUB_H, 4, 0xe0002010, 0xe1f0fff0,
-+      &avr32_syntax_table[AVR32_SYNTAX_PSUB_H],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_PSUBADD_H, 4, 0xe0002140, 0xe1f0ffc0,
-+      &avr32_syntax_table[AVR32_SYNTAX_PSUBADD_H],
-+      BFD_RELOC_UNUSED, 5, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_X],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_Y],
-+      },
-+    },
-+    {
-+      AVR32_OPC_PSUBADDH_SH, 4, 0xe00022c0, 0xe1f0ffc0,
-+      &avr32_syntax_table[AVR32_SYNTAX_PSUBADDH_SH],
-+      BFD_RELOC_UNUSED, 5, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_X],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_Y],
-+      },
-+    },
-+    {
-+      AVR32_OPC_PSUBADDS_SH, 4, 0xe00021c0, 0xe1f0ffc0,
-+      &avr32_syntax_table[AVR32_SYNTAX_PSUBADDS_SH],
-+      BFD_RELOC_UNUSED, 5, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_X],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_Y],
-+      },
-+    },
-+    {
-+      AVR32_OPC_PSUBADDS_UH, 4, 0xe0002240, 0xe1f0ffc0,
-+      &avr32_syntax_table[AVR32_SYNTAX_PSUBADDS_UH],
-+      BFD_RELOC_UNUSED, 5, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_X],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_Y],
-+      },
-+    },
-+    {
-+      AVR32_OPC_PSUBH_SH, 4, 0xe00020d0, 0xe1f0fff0,
-+      &avr32_syntax_table[AVR32_SYNTAX_PSUBH_SH],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_PSUBH_UB, 4, 0xe0002370, 0xe1f0fff0,
-+      &avr32_syntax_table[AVR32_SYNTAX_PSUBH_UB],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_PSUBS_SB, 4, 0xe0002330, 0xe1f0fff0,
-+      &avr32_syntax_table[AVR32_SYNTAX_PSUBS_SB],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_PSUBS_SH, 4, 0xe0002050, 0xe1f0fff0,
-+      &avr32_syntax_table[AVR32_SYNTAX_PSUBS_SH],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_PSUBS_UB, 4, 0xe0002350, 0xe1f0fff0,
-+      &avr32_syntax_table[AVR32_SYNTAX_PSUBS_UB],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_PSUBS_UH, 4, 0xe0002090, 0xe1f0fff0,
-+      &avr32_syntax_table[AVR32_SYNTAX_PSUBS_UH],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_PSUBX_H, 4, 0xe0002030, 0xe1f0fff0,
-+      &avr32_syntax_table[AVR32_SYNTAX_PSUBX_H],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_PSUBXH_SH, 4, 0xe00020f0, 0xe1f0fff0,
-+      &avr32_syntax_table[AVR32_SYNTAX_PSUBXH_SH],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_PSUBXS_SH, 4, 0xe0002070, 0xe1f0fff0,
-+      &avr32_syntax_table[AVR32_SYNTAX_PSUBXS_SH],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_PSUBXS_UH, 4, 0xe00020b0, 0xe1f0fff0,
-+      &avr32_syntax_table[AVR32_SYNTAX_PSUBXS_UH],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_PUNPCKSB_H, 4, 0xe00024a0, 0xe1ffffe0,
-+      &avr32_syntax_table[AVR32_SYNTAX_PUNPCKSB_H],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_Y],
-+      },
-+    },
-+    {
-+      AVR32_OPC_PUNPCKUB_H, 4, 0xe0002480, 0xe1ffffe0,
-+      &avr32_syntax_table[AVR32_SYNTAX_PUNPCKUB_H],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_Y],
-+      },
-+    },
-+    {
-+      AVR32_OPC_PUSHJC, 2, 0xd7230000, 0xffff0000,
-+      &avr32_syntax_table[AVR32_SYNTAX_PUSHJC],
-+      BFD_RELOC_UNUSED, 0, -1, { NULL },
-+    },
-+    {
-+      AVR32_OPC_PUSHM, 2, 0xd0010000, 0xf00f0000,
-+      &avr32_syntax_table[AVR32_SYNTAX_PUSHM],
-+      BFD_RELOC_UNUSED, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_K8C],
-+      },
-+    },
-+    {
-+      AVR32_OPC_PUSHM_E, 4, 0xebcd0000, 0xffff0000,
-+      &avr32_syntax_table[AVR32_SYNTAX_PUSHM_E],
-+      BFD_RELOC_UNUSED, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_K16],
-+      },
-+    },
-+    {
-+      AVR32_OPC_RCALL1, 2, 0xc00c0000, 0xf00c0000,
-+      &avr32_syntax_table[AVR32_SYNTAX_RCALL1],
-+      BFD_RELOC_AVR32_11H_PCREL, 1, 0,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_K10],
-+      },
-+    },
-+    {
-+      AVR32_OPC_RCALL2, 4, 0xe0a00000, 0xe1ef0000,
-+      &avr32_syntax_table[AVR32_SYNTAX_RCALL2],
-+      BFD_RELOC_AVR32_22H_PCREL, 1, 0,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_K21],
-+      },
-+    },
-+    {
-+      AVR32_OPC_RETEQ, 2, 0x5e000000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_RETEQ],
-+      BFD_RELOC_NONE, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_RETNE, 2, 0x5e100000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_RETNE],
-+      BFD_RELOC_NONE, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_RETCC, 2, 0x5e200000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_RETHS],
-+      BFD_RELOC_NONE, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_RETCS, 2, 0x5e300000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_RETLO],
-+      BFD_RELOC_NONE, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_RETGE, 2, 0x5e400000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_RETGE],
-+      BFD_RELOC_NONE, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_RETLT, 2, 0x5e500000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_RETLT],
-+      BFD_RELOC_NONE, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_RETMI, 2, 0x5e600000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_RETMI],
-+      BFD_RELOC_NONE, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_RETPL, 2, 0x5e700000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_RETPL],
-+      BFD_RELOC_NONE, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_RETLS, 2, 0x5e800000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_RETLS],
-+      BFD_RELOC_NONE, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_RETGT, 2, 0x5e900000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_RETGT],
-+      BFD_RELOC_NONE, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_RETLE, 2, 0x5ea00000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_RETLE],
-+      BFD_RELOC_NONE, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_RETHI, 2, 0x5eb00000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_RETHI],
-+      BFD_RELOC_NONE, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_RETVS, 2, 0x5ec00000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_RETVS],
-+      BFD_RELOC_NONE, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_RETVC, 2, 0x5ed00000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_RETVC],
-+      BFD_RELOC_NONE, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_RETQS, 2, 0x5ee00000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_RETQS],
-+      BFD_RELOC_NONE, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_RETAL, 2, 0x5ef00000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_RETAL],
-+      BFD_RELOC_NONE, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_RETD, 2, 0xd6230000, 0xffff0000,
-+      &avr32_syntax_table[AVR32_SYNTAX_RETD],
-+      BFD_RELOC_NONE, 0, -1, { NULL },
-+    },
-+    {
-+      AVR32_OPC_RETE, 2, 0xd6030000, 0xffff0000,
-+      &avr32_syntax_table[AVR32_SYNTAX_RETE],
-+      BFD_RELOC_NONE, 0, -1, { NULL },
-+    },
-+    {
-+      AVR32_OPC_RETJ, 2, 0xd6330000, 0xffff0000,
-+      &avr32_syntax_table[AVR32_SYNTAX_RETJ],
-+      BFD_RELOC_NONE, 0, -1, { NULL },
-+    },
-+    {
-+      AVR32_OPC_RETS, 2, 0xd6130000, 0xffff0000,
-+      &avr32_syntax_table[AVR32_SYNTAX_RETS],
-+      BFD_RELOC_NONE, 0, -1, { NULL },
-+    },
-+    {
-+      AVR32_OPC_RJMP, 2, 0xc0080000, 0xf00c0000,
-+      &avr32_syntax_table[AVR32_SYNTAX_RJMP],
-+      BFD_RELOC_AVR32_11H_PCREL, 1, 0,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_K10],
-+      },
-+    },
-+    {
-+      AVR32_OPC_ROL, 2, 0x5cf00000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_ROL],
-+      BFD_RELOC_UNUSED, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      }
-+    },
-+    {
-+      AVR32_OPC_ROR, 2, 0x5d000000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_ROR],
-+      BFD_RELOC_UNUSED, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      }
-+    },
-+    {
-+      AVR32_OPC_RSUB1, 2, 0x00200000, 0xe1f00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_RSUB1],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+      },
-+    },
-+    {
-+      AVR32_OPC_RSUB2, 4, 0xe0001100, 0xe1f0ff00,
-+      &avr32_syntax_table[AVR32_SYNTAX_RSUB2],
-+      BFD_RELOC_AVR32_8S_EXT, 3, 2,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SATADD_H, 4, 0xe00002c0, 0xe1f0fff0,
-+      &avr32_syntax_table[AVR32_SYNTAX_SATADD_H],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SATADD_W, 4, 0xe00000c0, 0xe1f0fff0,
-+      &avr32_syntax_table[AVR32_SYNTAX_SATADD_W],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SATRNDS, 4, 0xf3b00000, 0xfff0fc00,
-+      &avr32_syntax_table[AVR32_SYNTAX_SATRNDS],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K5E],
-+	&avr32_ifield_table[AVR32_IFIELD_S5],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SATRNDU, 4, 0xf3b00400, 0xfff0fc00,
-+      &avr32_syntax_table[AVR32_SYNTAX_SATRNDU],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K5E],
-+	&avr32_ifield_table[AVR32_IFIELD_S5],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SATS, 4, 0xf1b00000, 0xfff0fc00,
-+      &avr32_syntax_table[AVR32_SYNTAX_SATS],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K5E],
-+	&avr32_ifield_table[AVR32_IFIELD_S5],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SATSUB_H, 4, 0xe00003c0, 0xe1f0fff0,
-+      &avr32_syntax_table[AVR32_SYNTAX_SATSUB_H],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SATSUB_W1, 4, 0xe00001c0, 0xe1f0fff0,
-+      &avr32_syntax_table[AVR32_SYNTAX_SATSUB_W1],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SATSUB_W2, 4, 0xe0d00000, 0xe1f00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_SATSUB_W2],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_K16],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SATU, 4, 0xf1b00400, 0xfff0fc00,
-+      &avr32_syntax_table[AVR32_SYNTAX_SATU],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K5E],
-+	&avr32_ifield_table[AVR32_IFIELD_S5],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SBC, 4, 0xe0000140, 0xe1f0fff0,
-+      &avr32_syntax_table[AVR32_SYNTAX_SBC],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SBR, 2, 0xa1a00000, 0xe1e00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_SBR],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_BIT5C],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SCALL, 2, 0xd7330000, 0xffff0000,
-+      &avr32_syntax_table[AVR32_SYNTAX_SCALL],
-+      BFD_RELOC_UNUSED, 0, -1, { NULL },
-+    },
-+    {
-+      AVR32_OPC_SCR, 2, 0x5c100000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_SCR],
-+      BFD_RELOC_UNUSED, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SLEEP, 4, 0xe9b00000, 0xffffff00,
-+      &avr32_syntax_table[AVR32_SYNTAX_SLEEP],
-+      BFD_RELOC_AVR32_8S_EXT, 1, 0,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SREQ, 2, 0x5f000000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_SREQ],
-+      BFD_RELOC_UNUSED, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SRNE, 2, 0x5f100000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_SRNE],
-+      BFD_RELOC_UNUSED, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SRCC, 2, 0x5f200000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_SRHS],
-+      BFD_RELOC_UNUSED, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SRCS, 2, 0x5f300000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_SRLO],
-+      BFD_RELOC_UNUSED, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SRGE, 2, 0x5f400000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_SRGE],
-+      BFD_RELOC_UNUSED, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SRLT, 2, 0x5f500000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_SRLT],
-+      BFD_RELOC_UNUSED, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SRMI, 2, 0x5f600000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_SRMI],
-+      BFD_RELOC_UNUSED, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SRPL, 2, 0x5f700000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_SRPL],
-+      BFD_RELOC_UNUSED, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SRLS, 2, 0x5f800000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_SRLS],
-+      BFD_RELOC_UNUSED, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SRGT, 2, 0x5f900000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_SRGT],
-+      BFD_RELOC_UNUSED, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SRLE, 2, 0x5fa00000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_SRLE],
-+      BFD_RELOC_UNUSED, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SRHI, 2, 0x5fb00000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_SRHI],
-+      BFD_RELOC_UNUSED, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SRVS, 2, 0x5fc00000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_SRVS],
-+      BFD_RELOC_UNUSED, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SRVC, 2, 0x5fd00000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_SRVC],
-+      BFD_RELOC_UNUSED, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SRQS, 2, 0x5fe00000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_SRQS],
-+      BFD_RELOC_UNUSED, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SRAL, 2, 0x5ff00000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_SRAL],
-+      BFD_RELOC_UNUSED, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SSRF, 2, 0xd2030000, 0xfe0f0000,
-+      &avr32_syntax_table[AVR32_SYNTAX_SSRF],
-+      BFD_RELOC_UNUSED, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_K5C],
-+      },
-+    },
-+    {
-+      AVR32_OPC_ST_B1, 2, 0x00c00000, 0xe1f00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_ST_B1],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_ST_B2, 2, 0x00f00000, 0xe1f00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_ST_B2],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_ST_B5, 4, 0xe0000b00, 0xe1f0ffc0,
-+      &avr32_syntax_table[AVR32_SYNTAX_ST_B5],
-+      BFD_RELOC_UNUSED, 4, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K2],
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_ST_B3, 2, 0xa0800000, 0xe1800000,
-+      &avr32_syntax_table[AVR32_SYNTAX_ST_B3],
-+      BFD_RELOC_AVR32_3U, 3, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_K3],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_ST_B4, 4, 0xe1600000, 0xe1f00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_ST_B4],
-+      BFD_RELOC_AVR32_16S, 3, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_K16],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_ST_D1, 2, 0xa1200000, 0xe1f10000,
-+      &avr32_syntax_table[AVR32_SYNTAX_ST_D1],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY_DW],
-+      },
-+    },
-+    {
-+      AVR32_OPC_ST_D2, 2, 0xa1210000, 0xe1f10000,
-+      &avr32_syntax_table[AVR32_SYNTAX_ST_D2],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY_DW],
-+      },
-+    },
-+    {
-+      AVR32_OPC_ST_D3, 2, 0xa1110000, 0xe1f10000,
-+      &avr32_syntax_table[AVR32_SYNTAX_ST_D3],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY_DW],
-+      },
-+    },
-+    {
-+      AVR32_OPC_ST_D5, 4, 0xe0000800, 0xe1f0ffc1,
-+      &avr32_syntax_table[AVR32_SYNTAX_ST_D5],
-+      BFD_RELOC_UNUSED, 4, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K2],
-+	&avr32_ifield_table[AVR32_IFIELD_RD_DW],
-+      },
-+    },
-+    {
-+      AVR32_OPC_ST_D4, 4, 0xe0e10000, 0xe1f10000,
-+      &avr32_syntax_table[AVR32_SYNTAX_ST_D4],
-+      BFD_RELOC_AVR32_16S, 3, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_K16],
-+	&avr32_ifield_table[AVR32_IFIELD_RY_DW],
-+      },
-+    },
-+    {
-+      AVR32_OPC_ST_H1, 2, 0x00b00000, 0xe1f00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_ST_H1],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_ST_H2, 2, 0x00e00000, 0xe1f00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_ST_H2],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_ST_H5, 4, 0xe0000a00, 0xe1f0ffc0,
-+      &avr32_syntax_table[AVR32_SYNTAX_ST_H5],
-+      BFD_RELOC_UNUSED, 4, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K2],
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_ST_H3, 2, 0xa0000000, 0xe1800000,
-+      &avr32_syntax_table[AVR32_SYNTAX_ST_H3],
-+      BFD_RELOC_AVR32_4UH, 3, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_K3],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_ST_H4, 4, 0xe1500000, 0xe1f00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_ST_H4],
-+      BFD_RELOC_AVR32_16S, 3, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_K16],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_ST_W1, 2, 0x00a00000, 0xe1f00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_ST_W1],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_ST_W2, 2, 0x00d00000, 0xe1f00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_ST_W2],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_ST_W5, 4, 0xe0000900, 0xe1f0ffc0,
-+      &avr32_syntax_table[AVR32_SYNTAX_ST_W5],
-+      BFD_RELOC_UNUSED, 4, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K2],
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_ST_W3, 2, 0x81000000, 0xe1000000,
-+      &avr32_syntax_table[AVR32_SYNTAX_ST_W3],
-+      BFD_RELOC_AVR32_6UW, 3, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_K4],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_ST_W4, 4, 0xe1400000, 0xe1f00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_ST_W4],
-+      BFD_RELOC_AVR32_16S, 3, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_K16],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_STC_D1, 4, 0xeba01000, 0xfff01100,
-+      &avr32_syntax_table[AVR32_SYNTAX_STC_D1],
-+      BFD_RELOC_AVR32_10UW, 4, 2,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_CPNO],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+	&avr32_ifield_table[AVR32_IFIELD_CRD_DW],
-+      },
-+    },
-+    {
-+      AVR32_OPC_STC_D2, 4, 0xefa00070, 0xfff011f0,
-+      &avr32_syntax_table[AVR32_SYNTAX_STC_D2],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_CPNO],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_CRD_DW],
-+      },
-+    },
-+    {
-+      AVR32_OPC_STC_D3, 4, 0xefa010c0, 0xfff011c0,
-+      &avr32_syntax_table[AVR32_SYNTAX_STC_D3],
-+      BFD_RELOC_UNUSED, 5, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_CPNO],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_K2],
-+	&avr32_ifield_table[AVR32_IFIELD_CRD_DW],
-+      },
-+    },
-+    {
-+      AVR32_OPC_STC_W1, 4, 0xeba00000, 0xfff01000,
-+      &avr32_syntax_table[AVR32_SYNTAX_STC_W1],
-+      BFD_RELOC_AVR32_10UW, 4, 2,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_CPNO],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+	&avr32_ifield_table[AVR32_IFIELD_CRD_RI],
-+      },
-+    },
-+    {
-+      AVR32_OPC_STC_W2, 4, 0xefa00060, 0xfff010ff,
-+      &avr32_syntax_table[AVR32_SYNTAX_STC_W2],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_CPNO],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_CRD_RI],
-+      },
-+    },
-+    {
-+      AVR32_OPC_STC_W3, 4, 0xefa01080, 0xfff010c0,
-+      &avr32_syntax_table[AVR32_SYNTAX_STC_W3],
-+      BFD_RELOC_UNUSED, 5, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_CPNO],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_K2],
-+	&avr32_ifield_table[AVR32_IFIELD_CRD_RI],
-+      },
-+    },
-+    {
-+      AVR32_OPC_STC0_D, 4, 0xf7a00000, 0xfff00100,
-+      &avr32_syntax_table[AVR32_SYNTAX_STC0_D],
-+      BFD_RELOC_AVR32_14UW, 3, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K12CP],
-+	&avr32_ifield_table[AVR32_IFIELD_CRD_DW],
-+      },
-+    },
-+    {
-+      AVR32_OPC_STC0_W, 4, 0xf5a00000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_STC0_W],
-+      BFD_RELOC_AVR32_14UW, 3, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K12CP],
-+	&avr32_ifield_table[AVR32_IFIELD_CRD_RI],
-+      },
-+    },
-+    {
-+      AVR32_OPC_STCM_D, 4, 0xeda00500, 0xfff01f00,
-+      &avr32_syntax_table[AVR32_SYNTAX_STCM_D],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_CPNO],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_STCM_D_PU, 4, 0xeda01500, 0xfff01f00,
-+      &avr32_syntax_table[AVR32_SYNTAX_STCM_D_PU],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_CPNO],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_STCM_W, 4, 0xeda00200, 0xfff01e00,
-+      &avr32_syntax_table[AVR32_SYNTAX_STCM_W],
-+      BFD_RELOC_UNUSED, 4, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_CPNO],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+	&avr32_ifield_table[AVR32_IFIELD_CM_HL],
-+      },
-+    },
-+    {
-+      AVR32_OPC_STCM_W_PU, 4, 0xeda01200, 0xfff01e00,
-+      &avr32_syntax_table[AVR32_SYNTAX_STCM_W_PU],
-+      BFD_RELOC_UNUSED, 4, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_CPNO],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+	&avr32_ifield_table[AVR32_IFIELD_CM_HL],
-+      },
-+    },
-+    {
-+      AVR32_OPC_STCOND, 4, 0xe1700000, 0xe1f00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_STCOND],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_K16],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_STDSP, 2, 0x50000000, 0xf8000000,
-+      &avr32_syntax_table[AVR32_SYNTAX_STDSP],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_K7C],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_STHH_W2, 4, 0xe1e08000, 0xe1f0c0c0,
-+      &avr32_syntax_table[AVR32_SYNTAX_STHH_W2],
-+      BFD_RELOC_UNUSED, 7, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_CRD_RI],
-+	&avr32_ifield_table[AVR32_IFIELD_K2],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_X2],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_Y2],
-+      },
-+    },
-+    {
-+      AVR32_OPC_STHH_W1, 4, 0xe1e0c000, 0xe1f0c000,
-+      &avr32_syntax_table[AVR32_SYNTAX_STHH_W1],
-+      BFD_RELOC_AVR32_STHH_W, 6, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E2],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_X2],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_Y2],
-+      },
-+    },
-+    {
-+      AVR32_OPC_STM, 4, 0xe9c00000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_STM],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K16],
-+      },
-+    },
-+    {
-+      AVR32_OPC_STM_PU, 4, 0xebc00000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_STM_PU],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K16],
-+      },
-+    },
-+    {
-+      AVR32_OPC_STMTS, 4, 0xedc00000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_STMTS],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K16],
-+      },
-+    },
-+    {
-+      AVR32_OPC_STMTS_PU, 4, 0xefc00000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_STMTS_PU],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K16],
-+      },
-+    },
-+    {
-+      AVR32_OPC_STSWP_H, 4, 0xe1d09000, 0xe1f0f000,
-+      &avr32_syntax_table[AVR32_SYNTAX_STSWP_H],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_K12],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_STSWP_W, 4, 0xe1d0a000, 0xe1f0f000,
-+      &avr32_syntax_table[AVR32_SYNTAX_STSWP_W],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_K12],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SUB1, 2, 0x00100000, 0xe1f00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_SUB1],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SUB2, 4, 0xe0000100, 0xe1f0ffc0,
-+      &avr32_syntax_table[AVR32_SYNTAX_SUB2],
-+      BFD_RELOC_UNUSED, 4, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K2],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SUB5, 4, 0xe0c00000, 0xe1f00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_SUB5],
-+      BFD_RELOC_AVR32_SUB5, 3, 2,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_K16],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SUB3_SP, 2, 0x200d0000, 0xf00f0000,
-+      &avr32_syntax_table[AVR32_SYNTAX_SUB3_SP],
-+      BFD_RELOC_AVR32_10SW, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8C],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SUB3, 2, 0x20000000, 0xf0000000,
-+      &avr32_syntax_table[AVR32_SYNTAX_SUB3],
-+      BFD_RELOC_AVR32_8S, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8C],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SUB4, 4, 0xe0200000, 0xe1e00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_SUB4],
-+      BFD_RELOC_AVR32_21S, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K21],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SUBEQ, 4, 0xf7b00000, 0xfff0ff00,
-+      &avr32_syntax_table[AVR32_SYNTAX_SUBEQ],
-+      BFD_RELOC_AVR32_8S_EXT, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SUBNE, 4, 0xf7b00100, 0xfff0ff00,
-+      &avr32_syntax_table[AVR32_SYNTAX_SUBNE],
-+      BFD_RELOC_AVR32_8S_EXT, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SUBCC, 4, 0xf7b00200, 0xfff0ff00,
-+      &avr32_syntax_table[AVR32_SYNTAX_SUBHS],
-+      BFD_RELOC_AVR32_8S_EXT, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SUBCS, 4, 0xf7b00300, 0xfff0ff00,
-+      &avr32_syntax_table[AVR32_SYNTAX_SUBLO],
-+      BFD_RELOC_AVR32_8S_EXT, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SUBGE, 4, 0xf7b00400, 0xfff0ff00,
-+      &avr32_syntax_table[AVR32_SYNTAX_SUBGE],
-+      BFD_RELOC_AVR32_8S_EXT, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SUBLT, 4, 0xf7b00500, 0xfff0ff00,
-+      &avr32_syntax_table[AVR32_SYNTAX_SUBLT],
-+      BFD_RELOC_AVR32_8S_EXT, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SUBMI, 4, 0xf7b00600, 0xfff0ff00,
-+      &avr32_syntax_table[AVR32_SYNTAX_SUBMI],
-+      BFD_RELOC_AVR32_8S_EXT, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SUBPL, 4, 0xf7b00700, 0xfff0ff00,
-+      &avr32_syntax_table[AVR32_SYNTAX_SUBPL],
-+      BFD_RELOC_AVR32_8S_EXT, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SUBLS, 4, 0xf7b00800, 0xfff0ff00,
-+      &avr32_syntax_table[AVR32_SYNTAX_SUBLS],
-+      BFD_RELOC_AVR32_8S_EXT, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SUBGT, 4, 0xf7b00900, 0xfff0ff00,
-+      &avr32_syntax_table[AVR32_SYNTAX_SUBGT],
-+      BFD_RELOC_AVR32_8S_EXT, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SUBLE, 4, 0xf7b00a00, 0xfff0ff00,
-+      &avr32_syntax_table[AVR32_SYNTAX_SUBLE],
-+      BFD_RELOC_AVR32_8S_EXT, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SUBHI, 4, 0xf7b00b00, 0xfff0ff00,
-+      &avr32_syntax_table[AVR32_SYNTAX_SUBHI],
-+      BFD_RELOC_AVR32_8S_EXT, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SUBVS, 4, 0xf7b00c00, 0xfff0ff00,
-+      &avr32_syntax_table[AVR32_SYNTAX_SUBVS],
-+      BFD_RELOC_AVR32_8S_EXT, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SUBVC, 4, 0xf7b00d00, 0xfff0ff00,
-+      &avr32_syntax_table[AVR32_SYNTAX_SUBVC],
-+      BFD_RELOC_AVR32_8S_EXT, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SUBQS, 4, 0xf7b00e00, 0xfff0ff00,
-+      &avr32_syntax_table[AVR32_SYNTAX_SUBQS],
-+      BFD_RELOC_AVR32_8S_EXT, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SUBAL, 4, 0xf7b00f00, 0xfff0ff00,
-+      &avr32_syntax_table[AVR32_SYNTAX_SUBAL],
-+      BFD_RELOC_AVR32_8S_EXT, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SUBFEQ, 4, 0xf5b00000, 0xfff0ff00,
-+      &avr32_syntax_table[AVR32_SYNTAX_SUBFEQ],
-+      BFD_RELOC_AVR32_8S_EXT, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SUBFNE, 4, 0xf5b00100, 0xfff0ff00,
-+      &avr32_syntax_table[AVR32_SYNTAX_SUBFNE],
-+      BFD_RELOC_AVR32_8S_EXT, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SUBFCC, 4, 0xf5b00200, 0xfff0ff00,
-+      &avr32_syntax_table[AVR32_SYNTAX_SUBFHS],
-+      BFD_RELOC_AVR32_8S_EXT, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SUBFCS, 4, 0xf5b00300, 0xfff0ff00,
-+      &avr32_syntax_table[AVR32_SYNTAX_SUBFLO],
-+      BFD_RELOC_AVR32_8S_EXT, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SUBFGE, 4, 0xf5b00400, 0xfff0ff00,
-+      &avr32_syntax_table[AVR32_SYNTAX_SUBFGE],
-+      BFD_RELOC_AVR32_8S_EXT, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SUBFLT, 4, 0xf5b00500, 0xfff0ff00,
-+      &avr32_syntax_table[AVR32_SYNTAX_SUBFLT],
-+      BFD_RELOC_AVR32_8S_EXT, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SUBFMI, 4, 0xf5b00600, 0xfff0ff00,
-+      &avr32_syntax_table[AVR32_SYNTAX_SUBFMI],
-+      BFD_RELOC_AVR32_8S_EXT, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SUBFPL, 4, 0xf5b00700, 0xfff0ff00,
-+      &avr32_syntax_table[AVR32_SYNTAX_SUBFPL],
-+      BFD_RELOC_AVR32_8S_EXT, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SUBFLS, 4, 0xf5b00800, 0xfff0ff00,
-+      &avr32_syntax_table[AVR32_SYNTAX_SUBFLS],
-+      BFD_RELOC_AVR32_8S_EXT, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SUBFGT, 4, 0xf5b00900, 0xfff0ff00,
-+      &avr32_syntax_table[AVR32_SYNTAX_SUBFGT],
-+      BFD_RELOC_AVR32_8S_EXT, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SUBFLE, 4, 0xf5b00a00, 0xfff0ff00,
-+      &avr32_syntax_table[AVR32_SYNTAX_SUBFLE],
-+      BFD_RELOC_AVR32_8S_EXT, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SUBFHI, 4, 0xf5b00b00, 0xfff0ff00,
-+      &avr32_syntax_table[AVR32_SYNTAX_SUBFHI],
-+      BFD_RELOC_AVR32_8S_EXT, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SUBFVS, 4, 0xf5b00c00, 0xfff0ff00,
-+      &avr32_syntax_table[AVR32_SYNTAX_SUBFVS],
-+      BFD_RELOC_AVR32_8S_EXT, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SUBFVC, 4, 0xf5b00d00, 0xfff0ff00,
-+      &avr32_syntax_table[AVR32_SYNTAX_SUBFVC],
-+      BFD_RELOC_AVR32_8S_EXT, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SUBFQS, 4, 0xf5b00e00, 0xfff0ff00,
-+      &avr32_syntax_table[AVR32_SYNTAX_SUBFQS],
-+      BFD_RELOC_AVR32_8S_EXT, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SUBFAL, 4, 0xf5b00f00, 0xfff0ff00,
-+      &avr32_syntax_table[AVR32_SYNTAX_SUBFAL],
-+      BFD_RELOC_AVR32_8S_EXT, 2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SUBHH_W, 4, 0xe0000f00, 0xe1f0ffc0,
-+      &avr32_syntax_table[AVR32_SYNTAX_SUBHH_W],
-+      BFD_RELOC_UNUSED, 5, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_X],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_Y],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SWAP_B, 2, 0x5cb00000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_SWAP_B],
-+      BFD_RELOC_UNUSED, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      }
-+    },
-+    {
-+      AVR32_OPC_SWAP_BH, 2, 0x5cc00000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_SWAP_BH],
-+      BFD_RELOC_UNUSED, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      }
-+    },
-+    {
-+      AVR32_OPC_SWAP_H, 2, 0x5ca00000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_SWAP_H],
-+      BFD_RELOC_UNUSED, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      }
-+    },
-+    {
-+      AVR32_OPC_SYNC, 4, 0xebb00000, 0xffffff00,
-+      &avr32_syntax_table[AVR32_SYNTAX_SYNC],
-+      BFD_RELOC_AVR32_8S_EXT, 1, 0,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],
-+      }
-+    },
-+    {
-+      AVR32_OPC_TLBR, 2, 0xd6430000, 0xffff0000,
-+      &avr32_syntax_table[AVR32_SYNTAX_TLBR],
-+      BFD_RELOC_UNUSED, 0, -1, { NULL },
-+    },
-+    {
-+      AVR32_OPC_TLBS, 2, 0xd6530000, 0xffff0000,
-+      &avr32_syntax_table[AVR32_SYNTAX_TLBS],
-+      BFD_RELOC_UNUSED, 0, -1, { NULL },
-+    },
-+    {
-+      AVR32_OPC_TLBW, 2, 0xd6630000, 0xffff0000,
-+      &avr32_syntax_table[AVR32_SYNTAX_TLBW],
-+      BFD_RELOC_UNUSED, 0, -1, { NULL },
-+    },
-+    {
-+      AVR32_OPC_TNBZ, 2, 0x5ce00000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_TNBZ],
-+      BFD_RELOC_UNUSED, 1, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      }
-+    },
-+    {
-+      AVR32_OPC_TST, 2, 0x00700000, 0xe1f00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_TST],
-+      BFD_RELOC_UNUSED, 2, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+      },
-+    },
-+    {
-+      AVR32_OPC_XCHG, 4, 0xe0000b40, 0xe1f0fff0,
-+      &avr32_syntax_table[AVR32_SYNTAX_XCHG],
-+      BFD_RELOC_UNUSED, 3, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MEMC, 4, 0xf6100000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_MEMC],
-+      BFD_RELOC_AVR32_15S, 2, 0,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_MEM15],
-+	&avr32_ifield_table[AVR32_IFIELD_MEMB5],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MEMS, 4, 0xf8100000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_MEMS],
-+      BFD_RELOC_AVR32_15S, 2, 0,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_MEM15],
-+	&avr32_ifield_table[AVR32_IFIELD_MEMB5],
-+      },
-+    },
-+    {
-+      AVR32_OPC_MEMT, 4, 0xfa100000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_MEMT],
-+      BFD_RELOC_AVR32_15S, 2, 0,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_MEM15],
-+	&avr32_ifield_table[AVR32_IFIELD_MEMB5],
-+      },
-+    },
-+    {
-+      AVR32_OPC_BFEXTS, 4, 0xe1d0b000, 0xe1f0fc00,
-+      &avr32_syntax_table[AVR32_SYNTAX_BFEXTS],
-+      BFD_RELOC_UNUSED, 4, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_S5],
-+	&avr32_ifield_table[AVR32_IFIELD_K5E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_BFEXTU, 4, 0xe1d0c000, 0xe1f0fc00,
-+      &avr32_syntax_table[AVR32_SYNTAX_BFEXTU],
-+      BFD_RELOC_UNUSED, 4, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_S5],
-+	&avr32_ifield_table[AVR32_IFIELD_K5E],
-+      },
-+    },
-+    {
-+      AVR32_OPC_BFINS, 4, 0xe1d0d000, 0xe1f0fc00,
-+      &avr32_syntax_table[AVR32_SYNTAX_BFINS],
-+      BFD_RELOC_UNUSED, 4, -1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RX],
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_S5],
-+	&avr32_ifield_table[AVR32_IFIELD_K5E],
-+      },
-+    },
-+#define AVR32_OPCODE_RSUBCOND(cond_name, cond_field)                    \
-+    {                                                                   \
-+      AVR32_OPC_RSUB ## cond_name , 4,                                  \
-+      0xfbb00000 | (cond_field << 8), 0xfff0ff00,                       \
-+      &avr32_syntax_table[AVR32_SYNTAX_RSUB ## cond_name ],             \
-+      BFD_RELOC_AVR32_8S_EXT, 2, 1,                                     \
-+      {                                                                 \
-+	&avr32_ifield_table[AVR32_IFIELD_RY],                           \
-+	&avr32_ifield_table[AVR32_IFIELD_K8E],                          \
-+      },                                                                \
-+    },
-+
-+    AVR32_OPCODE_RSUBCOND (EQ, 0) 
-+    AVR32_OPCODE_RSUBCOND (NE, 1) 
-+    AVR32_OPCODE_RSUBCOND (CC, 2) 
-+    AVR32_OPCODE_RSUBCOND (CS, 3) 
-+    AVR32_OPCODE_RSUBCOND (GE, 4) 
-+    AVR32_OPCODE_RSUBCOND (LT, 5) 
-+    AVR32_OPCODE_RSUBCOND (MI, 6) 
-+    AVR32_OPCODE_RSUBCOND (PL, 7) 
-+    AVR32_OPCODE_RSUBCOND (LS, 8) 
-+    AVR32_OPCODE_RSUBCOND (GT, 9) 
-+    AVR32_OPCODE_RSUBCOND (LE, 10) 
-+    AVR32_OPCODE_RSUBCOND (HI, 11) 
-+    AVR32_OPCODE_RSUBCOND (VS, 12) 
-+    AVR32_OPCODE_RSUBCOND (VC, 13) 
-+    AVR32_OPCODE_RSUBCOND (QS, 14) 
-+    AVR32_OPCODE_RSUBCOND (AL, 15) 
-+
-+#define AVR32_OPCODE_OP3_COND(op_name, op_field, cond_name, cond_field) \
-+    {                                                                   \
-+      AVR32_OPC_ ## op_name ## cond_name , 4,                           \
-+      0xe1d0e000 | (cond_field << 8) | (op_field << 4), 0xe1f0fff0,     \
-+      &avr32_syntax_table[AVR32_SYNTAX_ ## op_name ## cond_name ],      \
-+      BFD_RELOC_UNUSED, 3, -1,                                          \
-+      {                                                                 \
-+	&avr32_ifield_table[AVR32_IFIELD_RD_E],                         \
-+	&avr32_ifield_table[AVR32_IFIELD_RX],                           \
-+	&avr32_ifield_table[AVR32_IFIELD_RY],                           \
-+      },                                                                \
-+    },
-+
-+    AVR32_OPCODE_OP3_COND (ADD, 0, EQ, 0)
-+    AVR32_OPCODE_OP3_COND (ADD, 0, NE, 1)
-+    AVR32_OPCODE_OP3_COND (ADD, 0, CC, 2)
-+    AVR32_OPCODE_OP3_COND (ADD, 0, CS, 3)
-+    AVR32_OPCODE_OP3_COND (ADD, 0, GE, 4)
-+    AVR32_OPCODE_OP3_COND (ADD, 0, LT, 5)
-+    AVR32_OPCODE_OP3_COND (ADD, 0, MI, 6)
-+    AVR32_OPCODE_OP3_COND (ADD, 0, PL, 7)
-+    AVR32_OPCODE_OP3_COND (ADD, 0, LS, 8)
-+    AVR32_OPCODE_OP3_COND (ADD, 0, GT, 9)
-+    AVR32_OPCODE_OP3_COND (ADD, 0, LE, 10)
-+    AVR32_OPCODE_OP3_COND (ADD, 0, HI, 11)
-+    AVR32_OPCODE_OP3_COND (ADD, 0, VS, 12)
-+    AVR32_OPCODE_OP3_COND (ADD, 0, VC, 13)
-+    AVR32_OPCODE_OP3_COND (ADD, 0, QS, 14)
-+    AVR32_OPCODE_OP3_COND (ADD, 0, AL, 15)
-+
-+    AVR32_OPCODE_OP3_COND (SUB2, 1, EQ, 0)
-+    AVR32_OPCODE_OP3_COND (SUB2, 1, NE, 1)
-+    AVR32_OPCODE_OP3_COND (SUB2, 1, CC, 2)
-+    AVR32_OPCODE_OP3_COND (SUB2, 1, CS, 3)
-+    AVR32_OPCODE_OP3_COND (SUB2, 1, GE, 4)
-+    AVR32_OPCODE_OP3_COND (SUB2, 1, LT, 5)
-+    AVR32_OPCODE_OP3_COND (SUB2, 1, MI, 6)
-+    AVR32_OPCODE_OP3_COND (SUB2, 1, PL, 7)
-+    AVR32_OPCODE_OP3_COND (SUB2, 1, LS, 8)
-+    AVR32_OPCODE_OP3_COND (SUB2, 1, GT, 9)
-+    AVR32_OPCODE_OP3_COND (SUB2, 1, LE, 10)
-+    AVR32_OPCODE_OP3_COND (SUB2, 1, HI, 11)
-+    AVR32_OPCODE_OP3_COND (SUB2, 1, VS, 12)
-+    AVR32_OPCODE_OP3_COND (SUB2, 1, VC, 13)
-+    AVR32_OPCODE_OP3_COND (SUB2, 1, QS, 14)
-+    AVR32_OPCODE_OP3_COND (SUB2, 1, AL, 15)
-+
-+    AVR32_OPCODE_OP3_COND (AND, 2, EQ, 0)
-+    AVR32_OPCODE_OP3_COND (AND, 2, NE, 1)
-+    AVR32_OPCODE_OP3_COND (AND, 2, CC, 2)
-+    AVR32_OPCODE_OP3_COND (AND, 2, CS, 3)
-+    AVR32_OPCODE_OP3_COND (AND, 2, GE, 4)
-+    AVR32_OPCODE_OP3_COND (AND, 2, LT, 5)
-+    AVR32_OPCODE_OP3_COND (AND, 2, MI, 6)
-+    AVR32_OPCODE_OP3_COND (AND, 2, PL, 7)
-+    AVR32_OPCODE_OP3_COND (AND, 2, LS, 8)
-+    AVR32_OPCODE_OP3_COND (AND, 2, GT, 9)
-+    AVR32_OPCODE_OP3_COND (AND, 2, LE, 10)
-+    AVR32_OPCODE_OP3_COND (AND, 2, HI, 11)
-+    AVR32_OPCODE_OP3_COND (AND, 2, VS, 12)
-+    AVR32_OPCODE_OP3_COND (AND, 2, VC, 13)
-+    AVR32_OPCODE_OP3_COND (AND, 2, QS, 14)
-+    AVR32_OPCODE_OP3_COND (AND, 2, AL, 15)
-+
-+    AVR32_OPCODE_OP3_COND (OR, 3, EQ, 0)
-+    AVR32_OPCODE_OP3_COND (OR, 3, NE, 1)
-+    AVR32_OPCODE_OP3_COND (OR, 3, CC, 2)
-+    AVR32_OPCODE_OP3_COND (OR, 3, CS, 3)
-+    AVR32_OPCODE_OP3_COND (OR, 3, GE, 4)
-+    AVR32_OPCODE_OP3_COND (OR, 3, LT, 5)
-+    AVR32_OPCODE_OP3_COND (OR, 3, MI, 6)
-+    AVR32_OPCODE_OP3_COND (OR, 3, PL, 7)
-+    AVR32_OPCODE_OP3_COND (OR, 3, LS, 8)
-+    AVR32_OPCODE_OP3_COND (OR, 3, GT, 9)
-+    AVR32_OPCODE_OP3_COND (OR, 3, LE, 10)
-+    AVR32_OPCODE_OP3_COND (OR, 3, HI, 11)
-+    AVR32_OPCODE_OP3_COND (OR, 3, VS, 12)
-+    AVR32_OPCODE_OP3_COND (OR, 3, VC, 13)
-+    AVR32_OPCODE_OP3_COND (OR, 3, QS, 14)
-+    AVR32_OPCODE_OP3_COND (OR, 3, AL, 15)
-+
-+    AVR32_OPCODE_OP3_COND (EOR, 4, EQ, 0)
-+    AVR32_OPCODE_OP3_COND (EOR, 4, NE, 1)
-+    AVR32_OPCODE_OP3_COND (EOR, 4, CC, 2)
-+    AVR32_OPCODE_OP3_COND (EOR, 4, CS, 3)
-+    AVR32_OPCODE_OP3_COND (EOR, 4, GE, 4)
-+    AVR32_OPCODE_OP3_COND (EOR, 4, LT, 5)
-+    AVR32_OPCODE_OP3_COND (EOR, 4, MI, 6)
-+    AVR32_OPCODE_OP3_COND (EOR, 4, PL, 7)
-+    AVR32_OPCODE_OP3_COND (EOR, 4, LS, 8)
-+    AVR32_OPCODE_OP3_COND (EOR, 4, GT, 9)
-+    AVR32_OPCODE_OP3_COND (EOR, 4, LE, 10)
-+    AVR32_OPCODE_OP3_COND (EOR, 4, HI, 11)
-+    AVR32_OPCODE_OP3_COND (EOR, 4, VS, 12)
-+    AVR32_OPCODE_OP3_COND (EOR, 4, VC, 13)
-+    AVR32_OPCODE_OP3_COND (EOR, 4, QS, 14)
-+    AVR32_OPCODE_OP3_COND (EOR, 4, AL, 15) 
-+
-+#define AVR32_OPCODE_LD_COND(op_name, op_field, cond_name, cond_field)  \
-+    {                                                                   \
-+      AVR32_OPC_ ## op_name ## cond_name , 4,                           \
-+      0xe1f00000 | (cond_field << 12) | (op_field  << 9), 0xe1f0fe00,   \
-+      &avr32_syntax_table[AVR32_SYNTAX_ ## op_name ## cond_name ],      \
-+      BFD_RELOC_UNUSED, 3, -1,                                          \
-+      {                                                                 \
-+	&avr32_ifield_table[AVR32_IFIELD_RY],                           \
-+	&avr32_ifield_table[AVR32_IFIELD_RX],                           \
-+	&avr32_ifield_table[AVR32_IFIELD_K9E],                          \
-+      },                                                                \
-+    },
-+    
-+#define AVR32_OPCODE_ST_COND(op_name, op_field, cond_name, cond_field)  \
-+    {                                                                   \
-+      AVR32_OPC_ ## op_name ## cond_name , 4,                           \
-+      0xe1f00000 | (cond_field << 12) | (op_field  << 9), 0xe1f0fe00,   \
-+      &avr32_syntax_table[AVR32_SYNTAX_ ## op_name ## cond_name ],      \
-+      BFD_RELOC_UNUSED, 3, -1,                                          \
-+      {                                                                 \
-+	&avr32_ifield_table[AVR32_IFIELD_RX],                           \
-+	&avr32_ifield_table[AVR32_IFIELD_K9E],                          \
-+	&avr32_ifield_table[AVR32_IFIELD_RY],                           \
-+      },                                                                \
-+    },
-+
-+    AVR32_OPCODE_LD_COND (LD_W, 0, EQ, 0) 
-+    AVR32_OPCODE_LD_COND (LD_W, 0, NE, 1) 
-+    AVR32_OPCODE_LD_COND (LD_W, 0, CC, 2) 
-+    AVR32_OPCODE_LD_COND (LD_W, 0, CS, 3) 
-+    AVR32_OPCODE_LD_COND (LD_W, 0, GE, 4) 
-+    AVR32_OPCODE_LD_COND (LD_W, 0, LT, 5) 
-+    AVR32_OPCODE_LD_COND (LD_W, 0, MI, 6) 
-+    AVR32_OPCODE_LD_COND (LD_W, 0, PL, 7) 
-+    AVR32_OPCODE_LD_COND (LD_W, 0, LS, 8) 
-+    AVR32_OPCODE_LD_COND (LD_W, 0, GT, 9) 
-+    AVR32_OPCODE_LD_COND (LD_W, 0, LE, 10) 
-+    AVR32_OPCODE_LD_COND (LD_W, 0, HI, 11) 
-+    AVR32_OPCODE_LD_COND (LD_W, 0, VS, 12) 
-+    AVR32_OPCODE_LD_COND (LD_W, 0, VC, 13) 
-+    AVR32_OPCODE_LD_COND (LD_W, 0, QS, 14) 
-+    AVR32_OPCODE_LD_COND (LD_W, 0, AL, 15) 
-+
-+    AVR32_OPCODE_LD_COND (LD_SH, 1, EQ, 0) 
-+    AVR32_OPCODE_LD_COND (LD_SH, 1, NE, 1) 
-+    AVR32_OPCODE_LD_COND (LD_SH, 1, CC, 2) 
-+    AVR32_OPCODE_LD_COND (LD_SH, 1, CS, 3) 
-+    AVR32_OPCODE_LD_COND (LD_SH, 1, GE, 4) 
-+    AVR32_OPCODE_LD_COND (LD_SH, 1, LT, 5) 
-+    AVR32_OPCODE_LD_COND (LD_SH, 1, MI, 6) 
-+    AVR32_OPCODE_LD_COND (LD_SH, 1, PL, 7) 
-+    AVR32_OPCODE_LD_COND (LD_SH, 1, LS, 8) 
-+    AVR32_OPCODE_LD_COND (LD_SH, 1, GT, 9) 
-+    AVR32_OPCODE_LD_COND (LD_SH, 1, LE, 10) 
-+    AVR32_OPCODE_LD_COND (LD_SH, 1, HI, 11) 
-+    AVR32_OPCODE_LD_COND (LD_SH, 1, VS, 12) 
-+    AVR32_OPCODE_LD_COND (LD_SH, 1, VC, 13) 
-+    AVR32_OPCODE_LD_COND (LD_SH, 1, QS, 14) 
-+    AVR32_OPCODE_LD_COND (LD_SH, 1, AL, 15) 
-+
-+    AVR32_OPCODE_LD_COND (LD_UH, 2, EQ, 0) 
-+    AVR32_OPCODE_LD_COND (LD_UH, 2, NE, 1) 
-+    AVR32_OPCODE_LD_COND (LD_UH, 2, CC, 2) 
-+    AVR32_OPCODE_LD_COND (LD_UH, 2, CS, 3) 
-+    AVR32_OPCODE_LD_COND (LD_UH, 2, GE, 4) 
-+    AVR32_OPCODE_LD_COND (LD_UH, 2, LT, 5) 
-+    AVR32_OPCODE_LD_COND (LD_UH, 2, MI, 6) 
-+    AVR32_OPCODE_LD_COND (LD_UH, 2, PL, 7) 
-+    AVR32_OPCODE_LD_COND (LD_SH, 2, LS, 8) 
-+    AVR32_OPCODE_LD_COND (LD_SH, 2, GT, 9) 
-+    AVR32_OPCODE_LD_COND (LD_SH, 2, LE, 10) 
-+    AVR32_OPCODE_LD_COND (LD_SH, 2, HI, 11) 
-+    AVR32_OPCODE_LD_COND (LD_SH, 2, VS, 12) 
-+    AVR32_OPCODE_LD_COND (LD_SH, 2, VC, 13) 
-+    AVR32_OPCODE_LD_COND (LD_SH, 2, QS, 14) 
-+    AVR32_OPCODE_LD_COND (LD_SH, 2, AL, 15) 
-+
-+    AVR32_OPCODE_LD_COND (LD_SB, 3, EQ, 0) 
-+    AVR32_OPCODE_LD_COND (LD_SB, 3, NE, 1) 
-+    AVR32_OPCODE_LD_COND (LD_SB, 3, CC, 2) 
-+    AVR32_OPCODE_LD_COND (LD_SB, 3, CS, 3) 
-+    AVR32_OPCODE_LD_COND (LD_SB, 3, GE, 4) 
-+    AVR32_OPCODE_LD_COND (LD_SB, 3, LT, 5) 
-+    AVR32_OPCODE_LD_COND (LD_SB, 3, MI, 6) 
-+    AVR32_OPCODE_LD_COND (LD_SB, 3, PL, 7) 
-+    AVR32_OPCODE_LD_COND (LD_SB, 3, LS, 8) 
-+    AVR32_OPCODE_LD_COND (LD_SB, 3, GT, 9) 
-+    AVR32_OPCODE_LD_COND (LD_SB, 3, LE, 10) 
-+    AVR32_OPCODE_LD_COND (LD_SB, 3, HI, 11) 
-+    AVR32_OPCODE_LD_COND (LD_SB, 3, VS, 12) 
-+    AVR32_OPCODE_LD_COND (LD_SB, 3, VC, 13) 
-+    AVR32_OPCODE_LD_COND (LD_SB, 3, QS, 14) 
-+    AVR32_OPCODE_LD_COND (LD_SB, 3, AL, 15) 
-+
-+    AVR32_OPCODE_LD_COND (LD_UB, 4, EQ, 0) 
-+    AVR32_OPCODE_LD_COND (LD_UB, 4, NE, 1) 
-+    AVR32_OPCODE_LD_COND (LD_UB, 4, CC, 2) 
-+    AVR32_OPCODE_LD_COND (LD_UB, 4, CS, 3) 
-+    AVR32_OPCODE_LD_COND (LD_UB, 4, GE, 4) 
-+    AVR32_OPCODE_LD_COND (LD_UB, 4, LT, 5) 
-+    AVR32_OPCODE_LD_COND (LD_UB, 4, MI, 6) 
-+    AVR32_OPCODE_LD_COND (LD_UB, 4, PL, 7) 
-+    AVR32_OPCODE_LD_COND (LD_UB, 4, LS, 8) 
-+    AVR32_OPCODE_LD_COND (LD_UB, 4, GT, 9) 
-+    AVR32_OPCODE_LD_COND (LD_UB, 4, LE, 10) 
-+    AVR32_OPCODE_LD_COND (LD_UB, 4, HI, 11) 
-+    AVR32_OPCODE_LD_COND (LD_UB, 4, VS, 12) 
-+    AVR32_OPCODE_LD_COND (LD_UB, 4, VC, 13) 
-+    AVR32_OPCODE_LD_COND (LD_UB, 4, QS, 14) 
-+    AVR32_OPCODE_LD_COND (LD_UB, 4, AL, 15) 
-+
-+    AVR32_OPCODE_ST_COND (ST_W, 5, EQ, 0) 
-+    AVR32_OPCODE_ST_COND (ST_W, 5, NE, 1) 
-+    AVR32_OPCODE_ST_COND (ST_W, 5, CC, 2) 
-+    AVR32_OPCODE_ST_COND (ST_W, 5, CS, 3) 
-+    AVR32_OPCODE_ST_COND (ST_W, 5, GE, 4) 
-+    AVR32_OPCODE_ST_COND (ST_W, 5, LT, 5) 
-+    AVR32_OPCODE_ST_COND (ST_W, 5, MI, 6) 
-+    AVR32_OPCODE_ST_COND (ST_W, 5, PL, 7) 
-+    AVR32_OPCODE_ST_COND (ST_W, 5, LS, 8) 
-+    AVR32_OPCODE_ST_COND (ST_W, 5, GT, 9) 
-+    AVR32_OPCODE_ST_COND (ST_W, 5, LE, 10) 
-+    AVR32_OPCODE_ST_COND (ST_W, 5, HI, 11) 
-+    AVR32_OPCODE_ST_COND (ST_W, 5, VS, 12) 
-+    AVR32_OPCODE_ST_COND (ST_W, 5, VC, 13) 
-+    AVR32_OPCODE_ST_COND (ST_W, 5, QS, 14) 
-+    AVR32_OPCODE_ST_COND (ST_W, 5, AL, 15) 
-+
-+    AVR32_OPCODE_ST_COND (ST_H, 6, EQ, 0) 
-+    AVR32_OPCODE_ST_COND (ST_H, 6, NE, 1) 
-+    AVR32_OPCODE_ST_COND (ST_H, 6, CC, 2) 
-+    AVR32_OPCODE_ST_COND (ST_H, 6, CS, 3) 
-+    AVR32_OPCODE_ST_COND (ST_H, 6, GE, 4) 
-+    AVR32_OPCODE_ST_COND (ST_H, 6, LT, 5) 
-+    AVR32_OPCODE_ST_COND (ST_H, 6, MI, 6) 
-+    AVR32_OPCODE_ST_COND (ST_H, 6, PL, 7) 
-+    AVR32_OPCODE_ST_COND (ST_H, 6, LS, 8) 
-+    AVR32_OPCODE_ST_COND (ST_H, 6, GT, 9) 
-+    AVR32_OPCODE_ST_COND (ST_H, 6, LE, 10) 
-+    AVR32_OPCODE_ST_COND (ST_H, 6, HI, 11) 
-+    AVR32_OPCODE_ST_COND (ST_H, 6, VS, 12) 
-+    AVR32_OPCODE_ST_COND (ST_H, 6, VC, 13) 
-+    AVR32_OPCODE_ST_COND (ST_H, 6, QS, 14) 
-+    AVR32_OPCODE_ST_COND (ST_H, 6, AL, 15) 
-+
-+    AVR32_OPCODE_ST_COND (ST_B, 7, EQ, 0) 
-+    AVR32_OPCODE_ST_COND (ST_B, 7, NE, 1) 
-+    AVR32_OPCODE_ST_COND (ST_B, 7, CC, 2) 
-+    AVR32_OPCODE_ST_COND (ST_B, 7, CS, 3) 
-+    AVR32_OPCODE_ST_COND (ST_B, 7, GE, 4) 
-+    AVR32_OPCODE_ST_COND (ST_B, 7, LT, 5) 
-+    AVR32_OPCODE_ST_COND (ST_B, 7, MI, 6) 
-+    AVR32_OPCODE_ST_COND (ST_B, 7, PL, 7) 
-+    AVR32_OPCODE_ST_COND (ST_B, 7, LS, 8) 
-+    AVR32_OPCODE_ST_COND (ST_B, 7, GT, 9) 
-+    AVR32_OPCODE_ST_COND (ST_B, 7, LE, 10) 
-+    AVR32_OPCODE_ST_COND (ST_B, 7, HI, 11) 
-+    AVR32_OPCODE_ST_COND (ST_B, 7, VS, 12) 
-+    AVR32_OPCODE_ST_COND (ST_B, 7, VC, 13) 
-+    AVR32_OPCODE_ST_COND (ST_B, 7, QS, 14) 
-+    AVR32_OPCODE_ST_COND (ST_B, 7, AL, 15) 
-+
-+    {
-+      AVR32_OPC_MOVH, 4, 0xfc100000, 0xfff00000,
-+      &avr32_syntax_table[AVR32_SYNTAX_MOVH],
-+      BFD_RELOC_AVR32_16U,  2, 1,
-+      {
-+	&avr32_ifield_table[AVR32_IFIELD_RY],
-+	&avr32_ifield_table[AVR32_IFIELD_K16],
-+      },
-+    },
-+    {
-+      AVR32_OPC_SSCALL, 2, 0xd7530000, 0xffff0000,
-+      &avr32_syntax_table[AVR32_SYNTAX_SSCALL],
-+      BFD_RELOC_UNUSED, 0, -1, { NULL },
-+    },
-+    {
-+      AVR32_OPC_RETSS, 2, 0xd7630000, 0xffff0000,
-+      &avr32_syntax_table[AVR32_SYNTAX_RETSS],
-+      BFD_RELOC_UNUSED, 0, -1, { NULL },
-+    },
-+
-+  {
-+    AVR32_OPC_FMAC_S, 4, 0xE1A00000, 0xFFF0F000,
-+    &avr32_syntax_table[AVR32_SYNTAX_FMAC_S],
-+    BFD_RELOC_UNUSED, 4, -1,
-+    {
-+      &avr32_ifield_table[AVR32_IFIELD_FP_RD],
-+      &avr32_ifield_table[AVR32_IFIELD_FP_RA],
-+      &avr32_ifield_table[AVR32_IFIELD_FP_RX],
-+      &avr32_ifield_table[AVR32_IFIELD_FP_RY]
-+    }
-+  },
-+  {
-+    AVR32_OPC_FNMAC_S, 4, 0xE1A01000, 0xFFF0F000,
-+    &avr32_syntax_table[AVR32_SYNTAX_FNMAC_S],
-+    BFD_RELOC_UNUSED, 4, -1,
-+    {
-+      &avr32_ifield_table[AVR32_IFIELD_FP_RD],
-+      &avr32_ifield_table[AVR32_IFIELD_FP_RA],
-+      &avr32_ifield_table[AVR32_IFIELD_FP_RX],
-+      &avr32_ifield_table[AVR32_IFIELD_FP_RY]
-+    }
-+  },
-+  {
-+    AVR32_OPC_FMSC_S, 4, 0xE3A00000, 0xFFF0F000,
-+    &avr32_syntax_table[AVR32_SYNTAX_FMSC_S],
-+    BFD_RELOC_UNUSED, 4, -1,
-+    {
-+      &avr32_ifield_table[AVR32_IFIELD_FP_RD],
-+      &avr32_ifield_table[AVR32_IFIELD_FP_RA],
-+      &avr32_ifield_table[AVR32_IFIELD_FP_RX],
-+      &avr32_ifield_table[AVR32_IFIELD_FP_RY]
-+    }
-+  },
-+  {
-+    AVR32_OPC_FNMSC_S, 4, 0xE3A01000, 0xFFF0F000,
-+    &avr32_syntax_table[AVR32_SYNTAX_FNMSC_S],
-+    BFD_RELOC_UNUSED, 4, -1,
-+    {
-+      &avr32_ifield_table[AVR32_IFIELD_FP_RD],
-+      &avr32_ifield_table[AVR32_IFIELD_FP_RA],
-+      &avr32_ifield_table[AVR32_IFIELD_FP_RX],
-+      &avr32_ifield_table[AVR32_IFIELD_FP_RY]
-+    }
-+  },
-+  {
-+    AVR32_OPC_FMUL_S, 4, 0xE5A20000, 0xFFFFF000,
-+    &avr32_syntax_table[AVR32_SYNTAX_FMUL_S],
-+    BFD_RELOC_UNUSED, 3, -1,
-+    {
-+      &avr32_ifield_table[AVR32_IFIELD_FP_RD],
-+      &avr32_ifield_table[AVR32_IFIELD_FP_RX],
-+      &avr32_ifield_table[AVR32_IFIELD_FP_RY]
-+    }
-+  },
-+  {
-+    AVR32_OPC_FNMUL_S, 4, 0xE5A30000, 0xFFFFF000,
-+    &avr32_syntax_table[AVR32_SYNTAX_FNMUL_S],
-+    BFD_RELOC_UNUSED, 3, -1,
-+    {
-+      &avr32_ifield_table[AVR32_IFIELD_FP_RD],
-+      &avr32_ifield_table[AVR32_IFIELD_FP_RX],
-+      &avr32_ifield_table[AVR32_IFIELD_FP_RY]
-+    }
-+  },
-+  {
-+    AVR32_OPC_FADD_S, 4, 0xE5A00000, 0xFFFFF000,
-+    &avr32_syntax_table[AVR32_SYNTAX_FADD_S],
-+    BFD_RELOC_UNUSED, 3, -1,
-+    {
-+      &avr32_ifield_table[AVR32_IFIELD_FP_RD],
-+      &avr32_ifield_table[AVR32_IFIELD_FP_RX],
-+      &avr32_ifield_table[AVR32_IFIELD_FP_RY]
-+    }
-+  },
-+  {
-+    AVR32_OPC_FSUB_S, 4, 0xE5A10000, 0xFFFFF000,
-+    &avr32_syntax_table[AVR32_SYNTAX_FSUB_S],
-+    BFD_RELOC_UNUSED, 3, -1,
-+    {
-+      &avr32_ifield_table[AVR32_IFIELD_FP_RD],
-+      &avr32_ifield_table[AVR32_IFIELD_FP_RX],
-+      &avr32_ifield_table[AVR32_IFIELD_FP_RY]
-+    }
-+  },
-+  {
-+    AVR32_OPC_FCASTRS_SW, 4, 0xE5AB0000, 0xFFFFF0F0,
-+    &avr32_syntax_table[AVR32_SYNTAX_FCASTRS_SW],
-+    BFD_RELOC_UNUSED, 2, -1,
-+    {
-+      &avr32_ifield_table[AVR32_IFIELD_FP_RD],
-+      &avr32_ifield_table[AVR32_IFIELD_FP_RY]
-+    }
-+  },
-+  {
-+    AVR32_OPC_FCASTRS_UW, 4, 0xE5A90000, 0xFFFFF0F0,
-+    &avr32_syntax_table[AVR32_SYNTAX_FCASTRS_UW],
-+    BFD_RELOC_UNUSED, 2, -1,
-+    {
-+      &avr32_ifield_table[AVR32_IFIELD_FP_RD],
-+      &avr32_ifield_table[AVR32_IFIELD_FP_RY]
-+    }
-+  },
-+  {
-+    AVR32_OPC_FCASTSW_S, 4, 0xE5A60000, 0xFFFFF0F0,
-+    &avr32_syntax_table[AVR32_SYNTAX_FCASTSW_S],
-+    BFD_RELOC_UNUSED, 2, -1,
-+    {
-+      &avr32_ifield_table[AVR32_IFIELD_FP_RD],
-+      &avr32_ifield_table[AVR32_IFIELD_FP_RY]
-+    }
-+  },
-+  {
-+    AVR32_OPC_FCASTUW_S, 4, 0xE5A40000, 0xFFFFF0F0,
-+    &avr32_syntax_table[AVR32_SYNTAX_FCASTUW_S],
-+    BFD_RELOC_UNUSED, 2, -1,
-+    {
-+      &avr32_ifield_table[AVR32_IFIELD_FP_RD],
-+      &avr32_ifield_table[AVR32_IFIELD_FP_RY]
-+    }
-+  },
-+  {
-+    AVR32_OPC_FCMP_S, 4, 0xE5AC0000, 0xFFFFFF00,
-+    &avr32_syntax_table[AVR32_SYNTAX_FCMP_S],
-+    BFD_RELOC_UNUSED, 2, -1,
-+    {
-+      &avr32_ifield_table[AVR32_IFIELD_FP_RX],
-+      &avr32_ifield_table[AVR32_IFIELD_FP_RY]
-+    }
-+  },
-+  {
-+    AVR32_OPC_FCHK_S, 4, 0xE5AD0000, 0xFFFFFFF0,
-+    &avr32_syntax_table[AVR32_SYNTAX_FCHK_S],
-+    BFD_RELOC_UNUSED, 1, -1,
-+    {
-+      &avr32_ifield_table[AVR32_IFIELD_FP_RY]
-+    }
-+  },
-+  {
-+    AVR32_OPC_FRCPA_S, 4, 0xE5AE0000, 0xFFFFF0F0,
-+    &avr32_syntax_table[AVR32_SYNTAX_FRCPA_S],
-+    BFD_RELOC_UNUSED, 2, -1,
-+    {
-+      &avr32_ifield_table[AVR32_IFIELD_FP_RD],
-+      &avr32_ifield_table[AVR32_IFIELD_FP_RY]
-+    }
-+  },
-+  {
-+    AVR32_OPC_FRSQRTA_S, 4, 0xE5AF0000, 0xFFFFF0F0,
-+    &avr32_syntax_table[AVR32_SYNTAX_FRSQRTA_S],
-+    BFD_RELOC_UNUSED, 2, -1,
-+    {
-+      &avr32_ifield_table[AVR32_IFIELD_FP_RD],
-+      &avr32_ifield_table[AVR32_IFIELD_FP_RY]
-+    }
-+  }
-+
-+};
-+
-+
-+const struct avr32_alias avr32_alias_table[] =
-+  {
-+    {
-+      AVR32_ALIAS_PICOSVMAC0,
-+      &avr32_opc_table[AVR32_OPC_COP],
-+      {
-+	{ 0, PICO_CPNO },
-+	{ 1, 0 }, { 1, 1 }, { 1, 2 },
-+	{ 0, 0x0c },
-+      },
-+    },
-+    {
-+      AVR32_ALIAS_PICOSVMAC1,
-+      &avr32_opc_table[AVR32_OPC_COP],
-+      {
-+	{ 0, PICO_CPNO },
-+	{ 1, 0 }, { 1, 1 }, { 1, 2 },
-+	{ 0, 0x0d },
-+      },
-+    },
-+    {
-+      AVR32_ALIAS_PICOSVMAC2,
-+      &avr32_opc_table[AVR32_OPC_COP],
-+      {
-+	{ 0, PICO_CPNO },
-+	{ 1, 0 }, { 1, 1 }, { 1, 2 },
-+	{ 0, 0x0e },
-+      },
-+    },
-+    {
-+      AVR32_ALIAS_PICOSVMAC3,
-+      &avr32_opc_table[AVR32_OPC_COP],
-+      {
-+	{ 0, PICO_CPNO },
-+	{ 1, 0 }, { 1, 1 }, { 1, 2 },
-+	{ 0, 0x0f },
-+      },
-+    },
-+    {
-+      AVR32_ALIAS_PICOSVMUL0,
-+      &avr32_opc_table[AVR32_OPC_COP],
-+      {
-+	{ 0, PICO_CPNO },
-+	{ 1, 0 }, { 1, 1 }, { 1, 2 },
-+	{ 0, 0x08 },
-+      },
-+    },
-+    {
-+      AVR32_ALIAS_PICOSVMUL1,
-+      &avr32_opc_table[AVR32_OPC_COP],
-+      {
-+	{ 0, PICO_CPNO },
-+	{ 1, 0 }, { 1, 1 }, { 1, 2 },
-+	{ 0, 0x09 },
-+      },
-+    },
-+    {
-+      AVR32_ALIAS_PICOSVMUL2,
-+      &avr32_opc_table[AVR32_OPC_COP],
-+      {
-+	{ 0, PICO_CPNO },
-+	{ 1, 0 }, { 1, 1 }, { 1, 2 },
-+	{ 0, 0x0a },
-+      },
-+    },
-+    {
-+      AVR32_ALIAS_PICOSVMUL3,
-+      &avr32_opc_table[AVR32_OPC_COP],
-+      {
-+	{ 0, PICO_CPNO },
-+	{ 1, 0 }, { 1, 1 }, { 1, 2 },
-+	{ 0, 0x0b },
-+      },
-+    },
-+    {
-+      AVR32_ALIAS_PICOVMAC0,
-+      &avr32_opc_table[AVR32_OPC_COP],
-+      {
-+	{ 0, PICO_CPNO },
-+	{ 1, 0 }, { 1, 1 }, { 1, 2 },
-+	{ 0, 0x04 },
-+      },
-+    },
-+    {
-+      AVR32_ALIAS_PICOVMAC1,
-+      &avr32_opc_table[AVR32_OPC_COP],
-+      {
-+	{ 0, PICO_CPNO },
-+	{ 1, 0 }, { 1, 1 }, { 1, 2 },
-+	{ 0, 0x05 },
-+      },
-+    },
-+    {
-+      AVR32_ALIAS_PICOVMAC2,
-+      &avr32_opc_table[AVR32_OPC_COP],
-+      {
-+	{ 0, PICO_CPNO },
-+	{ 1, 0 }, { 1, 1 }, { 1, 2 },
-+	{ 0, 0x06 },
-+      },
-+    },
-+    {
-+      AVR32_ALIAS_PICOVMAC3,
-+      &avr32_opc_table[AVR32_OPC_COP],
-+      {
-+	{ 0, PICO_CPNO },
-+	{ 1, 0 }, { 1, 1 }, { 1, 2 },
-+	{ 0, 0x07 },
-+      },
-+    },
-+    {
-+      AVR32_ALIAS_PICOVMUL0,
-+      &avr32_opc_table[AVR32_OPC_COP],
-+      {
-+	{ 0, PICO_CPNO },
-+	{ 1, 0 }, { 1, 1 }, { 1, 2 },
-+	{ 0, 0x00 },
-+      },
-+    },
-+    {
-+      AVR32_ALIAS_PICOVMUL1,
-+      &avr32_opc_table[AVR32_OPC_COP],
-+      {
-+	{ 0, PICO_CPNO },
-+	{ 1, 0 }, { 1, 1 }, { 1, 2 },
-+	{ 0, 0x01 },
-+      },
-+    },
-+    {
-+      AVR32_ALIAS_PICOVMUL2,
-+      &avr32_opc_table[AVR32_OPC_COP],
-+      {
-+	{ 0, PICO_CPNO },
-+	{ 1, 0 }, { 1, 1 }, { 1, 2 },
-+	{ 0, 0x02 },
-+      },
-+    },
-+    {
-+      AVR32_ALIAS_PICOVMUL3,
-+      &avr32_opc_table[AVR32_OPC_COP],
-+      {
-+	{ 0, PICO_CPNO },
-+	{ 1, 0 }, { 1, 1 }, { 1, 2 },
-+	{ 0, 0x03 },
-+      },
-+    },
-+    {
-+      AVR32_ALIAS_PICOLD_D1,
-+      &avr32_opc_table[AVR32_OPC_LDC_D1],
-+      {
-+	{ 0, PICO_CPNO },
-+	{ 1, 0 }, { 1, 1 },
-+      },
-+    },
-+    {
-+      AVR32_ALIAS_PICOLD_D2,
-+      &avr32_opc_table[AVR32_OPC_LDC_D2],
-+      {
-+	{ 0, PICO_CPNO },
-+	{ 1, 0 }, { 1, 1 },
-+      },
-+    },
-+    {
-+      AVR32_ALIAS_PICOLD_D3,
-+      &avr32_opc_table[AVR32_OPC_LDC_D3],
-+      {
-+	{ 0, PICO_CPNO },
-+	{ 1, 0 }, { 1, 1 }, { 1, 2 }, { 1, 3 },
-+      },
-+    },
-+    {
-+      AVR32_ALIAS_PICOLD_W1,
-+      &avr32_opc_table[AVR32_OPC_LDC_W1],
-+      {
-+	{ 0, PICO_CPNO },
-+	{ 1, 0 }, { 1, 1 },
-+      },
-+    },
-+    {
-+      AVR32_ALIAS_PICOLD_W2,
-+      &avr32_opc_table[AVR32_OPC_LDC_W2],
-+      {
-+	{ 0, PICO_CPNO },
-+	{ 1, 0 }, { 1, 1 },
-+      },
-+    },
-+    {
-+      AVR32_ALIAS_PICOLD_W3,
-+      &avr32_opc_table[AVR32_OPC_LDC_W3],
-+      {
-+	{ 0, PICO_CPNO },
-+	{ 1, 0 }, { 1, 1 }, { 1, 2 }, { 1, 3 },
-+      },
-+    },
-+    {
-+      AVR32_ALIAS_PICOLDM_D,
-+      &avr32_opc_table[AVR32_OPC_LDCM_D],
-+      {
-+	{ 0, PICO_CPNO },
-+	{ 1, 0 }, { 1, 1 },
-+      },
-+    },
-+    {
-+      AVR32_ALIAS_PICOLDM_D_PU,
-+      &avr32_opc_table[AVR32_OPC_LDCM_D_PU],
-+      {
-+	{ 0, PICO_CPNO },
-+	{ 1, 0 }, { 1, 1 },
-+      },
-+    },
-+    {
-+      AVR32_ALIAS_PICOLDM_W,
-+      &avr32_opc_table[AVR32_OPC_LDCM_W],
-+      {
-+	{ 0, PICO_CPNO },
-+	{ 1, 0 }, { 1, 1 }, { 1, 2 },
-+      },
-+    },
-+    {
-+      AVR32_ALIAS_PICOLDM_W_PU,
-+      &avr32_opc_table[AVR32_OPC_LDCM_W_PU],
-+      {
-+	{ 0, PICO_CPNO },
-+	{ 1, 0 }, { 1, 1 }, { 1, 2 },
-+      },
-+    },
-+    {
-+      AVR32_ALIAS_PICOMV_D1,
-+      &avr32_opc_table[AVR32_OPC_MVCR_D],
-+      {
-+	{ 0, PICO_CPNO },
-+	{ 1, 0 }, { 1, 1 },
-+      },
-+    },
-+    {
-+      AVR32_ALIAS_PICOMV_D2,
-+      &avr32_opc_table[AVR32_OPC_MVRC_D],
-+      {
-+	{ 0, PICO_CPNO },
-+	{ 1, 0 }, { 1, 1 },
-+      },
-+    },
-+    {
-+      AVR32_ALIAS_PICOMV_W1,
-+      &avr32_opc_table[AVR32_OPC_MVCR_W],
-+      {
-+	{ 0, PICO_CPNO },
-+	{ 1, 0 }, { 1, 1 },
-+      },
-+    },
-+    {
-+      AVR32_ALIAS_PICOMV_W2,
-+      &avr32_opc_table[AVR32_OPC_MVRC_W],
-+      {
-+	{ 0, PICO_CPNO },
-+	{ 1, 0 }, { 1, 1 },
-+      },
-+    },
-+    {
-+      AVR32_ALIAS_PICOST_D1,
-+      &avr32_opc_table[AVR32_OPC_STC_D1],
-+      {
-+	{ 0, PICO_CPNO },
-+	{ 1, 0 }, { 1, 1 }, { 1, 2 },
-+      },
-+    },
-+    {
-+      AVR32_ALIAS_PICOST_D2,
-+      &avr32_opc_table[AVR32_OPC_STC_D2],
-+      {
-+	{ 0, PICO_CPNO },
-+	{ 1, 0 }, { 1, 1 },
-+      },
-+    },
-+    {
-+      AVR32_ALIAS_PICOST_D3,
-+      &avr32_opc_table[AVR32_OPC_STC_D3],
-+      {
-+	{ 0, PICO_CPNO },
-+	{ 1, 0 }, { 1, 1 }, { 1, 2 }, { 1, 3 },
-+      },
-+    },
-+    {
-+      AVR32_ALIAS_PICOST_W1,
-+      &avr32_opc_table[AVR32_OPC_STC_W1],
-+      {
-+	{ 0, PICO_CPNO },
-+	{ 1, 0 }, { 1, 1 }, { 1, 2 },
-+      },
-+    },
-+    {
-+      AVR32_ALIAS_PICOST_W2,
-+      &avr32_opc_table[AVR32_OPC_STC_W2],
-+      {
-+	{ 0, PICO_CPNO },
-+	{ 1, 0 }, { 1, 1 },
-+      },
-+    },
-+    {
-+      AVR32_ALIAS_PICOST_W3,
-+      &avr32_opc_table[AVR32_OPC_STC_W3],
-+      {
-+	{ 0, PICO_CPNO },
-+	{ 1, 0 }, { 1, 1 }, { 1, 2 }, { 1, 3 },
-+      },
-+    },
-+    {
-+      AVR32_ALIAS_PICOSTM_D,
-+      &avr32_opc_table[AVR32_OPC_STCM_D],
-+      {
-+	{ 0, PICO_CPNO },
-+	{ 1, 0 }, { 1, 1 },
-+      },
-+    },
-+    {
-+      AVR32_ALIAS_PICOSTM_D_PU,
-+      &avr32_opc_table[AVR32_OPC_STCM_D_PU],
-+      {
-+	{ 0, PICO_CPNO },
-+	{ 1, 0 }, { 1, 1 },
-+      },
-+    },
-+    {
-+      AVR32_ALIAS_PICOSTM_W,
-+      &avr32_opc_table[AVR32_OPC_STCM_W],
-+      {
-+	{ 0, PICO_CPNO },
-+	{ 1, 0 }, { 1, 1 }, { 1, 2 },
-+      },
-+    },
-+    {
-+      AVR32_ALIAS_PICOSTM_W_PU,
-+      &avr32_opc_table[AVR32_OPC_STCM_W_PU],
-+      {
-+	{ 0, PICO_CPNO },
-+	{ 1, 0 }, { 1, 1 }, { 1, 2 },
-+      },
-+    },
-+  };
-+
-+
-+#define SYNTAX_NORMAL0(id, mne, opc, arch)			\
-+  {							\
-+    AVR32_SYNTAX_##id, arch,			\
-+    &avr32_mnemonic_table[AVR32_MNEMONIC_##mne],	\
-+    AVR32_PARSER_NORMAL,					\
-+    { &avr32_opc_table[AVR32_OPC_##opc], },		\
-+    NULL, 0, { }					\
-+  }
-+#define SYNTAX_NORMAL1(id, mne, opc, op0, arch)		\
-+  {							\
-+    AVR32_SYNTAX_##id, arch,			\
-+    &avr32_mnemonic_table[AVR32_MNEMONIC_##mne],	\
-+    AVR32_PARSER_NORMAL,					\
-+    { &avr32_opc_table[AVR32_OPC_##opc], },		\
-+    NULL, 1,						\
-+    {							\
-+      AVR32_OPERAND_##op0,				\
-+    }							\
-+  }
-+#define SYNTAX_NORMALM1(id, mne, opc, op0, arch)		\
-+  {							\
-+    AVR32_SYNTAX_##id, arch,			\
-+    &avr32_mnemonic_table[AVR32_MNEMONIC_##mne],	\
-+    AVR32_PARSER_NORMAL,					\
-+    { &avr32_opc_table[AVR32_OPC_##opc], },			\
-+    NULL, -1,						\
-+    {							\
-+      AVR32_OPERAND_##op0,				\
-+    }							\
-+  }
-+#define SYNTAX_NORMAL2(id, mne, opc, op0, op1, arch)		\
-+  {							\
-+    AVR32_SYNTAX_##id, arch,			\
-+    &avr32_mnemonic_table[AVR32_MNEMONIC_##mne],	\
-+    AVR32_PARSER_NORMAL,					\
-+    { &avr32_opc_table[AVR32_OPC_##opc], },			\
-+    NULL, 2,						\
-+    {							\
-+      AVR32_OPERAND_##op0, AVR32_OPERAND_##op1,		\
-+    }							\
-+  }
-+#define SYNTAX_NORMALM2(id, mne, opc, op0, op1, arch)		\
-+  {							\
-+    AVR32_SYNTAX_##id, arch,			\
-+    &avr32_mnemonic_table[AVR32_MNEMONIC_##mne],	\
-+    AVR32_PARSER_NORMAL,					\
-+    { &avr32_opc_table[AVR32_OPC_##opc], },			\
-+    NULL, -2,						\
-+    {							\
-+      AVR32_OPERAND_##op0, AVR32_OPERAND_##op1,		\
-+    }							\
-+  }
-+#define SYNTAX_NORMAL3(id, mne, opc, op0, op1, op2, arch)	\
-+  {							\
-+    AVR32_SYNTAX_##id, arch,			\
-+    &avr32_mnemonic_table[AVR32_MNEMONIC_##mne],	\
-+    AVR32_PARSER_NORMAL,					\
-+    { &avr32_opc_table[AVR32_OPC_##opc], },			\
-+    NULL, 3,						\
-+    {							\
-+      AVR32_OPERAND_##op0, AVR32_OPERAND_##op1,		\
-+      AVR32_OPERAND_##op2,				\
-+    }							\
-+  }
-+#define SYNTAX_NORMALM3(id, mne, opc, op0, op1, op2, arch)	\
-+  {							\
-+    AVR32_SYNTAX_##id, arch,			\
-+    &avr32_mnemonic_table[AVR32_MNEMONIC_##mne],	\
-+    AVR32_PARSER_NORMAL,					\
-+    { &avr32_opc_table[AVR32_OPC_##opc], },			\
-+    NULL, -3,						\
-+    {							\
-+      AVR32_OPERAND_##op0, AVR32_OPERAND_##op1,		\
-+      AVR32_OPERAND_##op2,				\
-+    }							\
-+  }
-+#define SYNTAX_NORMAL4(id, mne, opc, op0, op1, op2, op3, arch)\
-+  {							\
-+    AVR32_SYNTAX_##id, arch,			\
-+    &avr32_mnemonic_table[AVR32_MNEMONIC_##mne],	\
-+    AVR32_PARSER_NORMAL,					\
-+    { &avr32_opc_table[AVR32_OPC_##opc], },			\
-+    NULL, 4,						\
-+    {							\
-+      AVR32_OPERAND_##op0, AVR32_OPERAND_##op1,		\
-+      AVR32_OPERAND_##op2, AVR32_OPERAND_##op3,		\
-+    }							\
-+  }
-+#define SYNTAX_NORMAL5(id, mne, opc, op0, op1, op2, op3, op4, arch)	\
-+  {								\
-+    AVR32_SYNTAX_##id, arch,				\
-+    &avr32_mnemonic_table[AVR32_MNEMONIC_##mne],		\
-+    AVR32_PARSER_NORMAL,						\
-+    { &avr32_opc_table[AVR32_OPC_##opc], },				\
-+    NULL, 5,							\
-+    {								\
-+      AVR32_OPERAND_##op0, AVR32_OPERAND_##op1,			\
-+      AVR32_OPERAND_##op2, AVR32_OPERAND_##op3,			\
-+      AVR32_OPERAND_##op4,					\
-+    }								\
-+  }
-+
-+#define SYNTAX_NORMAL_C1(id, mne, opc, nxt, op0, arch)	\
-+  {							\
-+    AVR32_SYNTAX_##id, arch,			\
-+    &avr32_mnemonic_table[AVR32_MNEMONIC_##mne],	\
-+    AVR32_PARSER_NORMAL,					\
-+    { &avr32_opc_table[AVR32_OPC_##opc], },			\
-+    &avr32_syntax_table[AVR32_SYNTAX_##nxt], 1,		\
-+    {							\
-+      AVR32_OPERAND_##op0,				\
-+    }							\
-+  }
-+#define SYNTAX_NORMAL_CM1(id, mne, opc, nxt, op0, arch)	\
-+  {							\
-+    AVR32_SYNTAX_##id, arch,			\
-+    &avr32_mnemonic_table[AVR32_MNEMONIC_##mne],	\
-+    AVR32_PARSER_NORMAL,					\
-+    { &avr32_opc_table[AVR32_OPC_##opc], },			\
-+    &avr32_syntax_table[AVR32_SYNTAX_##nxt], -1,	\
-+    {							\
-+      AVR32_OPERAND_##op0,				\
-+    }							\
-+  }
-+#define SYNTAX_NORMAL_C2(id, mne, opc, nxt, op0, op1, arch)	\
-+  {							\
-+    AVR32_SYNTAX_##id, arch,			\
-+    &avr32_mnemonic_table[AVR32_MNEMONIC_##mne],	\
-+    AVR32_PARSER_NORMAL,					\
-+    { &avr32_opc_table[AVR32_OPC_##opc], },			\
-+    &avr32_syntax_table[AVR32_SYNTAX_##nxt], 2,		\
-+    {							\
-+      AVR32_OPERAND_##op0, AVR32_OPERAND_##op1,		\
-+    }							\
-+  }
-+#define SYNTAX_NORMAL_CM2(id, mne, opc, nxt, op0, op1, arch)	\
-+  {							\
-+    AVR32_SYNTAX_##id, arch,			\
-+    &avr32_mnemonic_table[AVR32_MNEMONIC_##mne],	\
-+    AVR32_PARSER_NORMAL,					\
-+    { &avr32_opc_table[AVR32_OPC_##opc], },			\
-+    &avr32_syntax_table[AVR32_SYNTAX_##nxt], -2,	\
-+    {							\
-+      AVR32_OPERAND_##op0, AVR32_OPERAND_##op1,		\
-+    }							\
-+  }
-+#define SYNTAX_NORMAL_C3(id, mne, opc, nxt, op0, op1, op2, arch)	\
-+  {								\
-+    AVR32_SYNTAX_##id, arch,				\
-+    &avr32_mnemonic_table[AVR32_MNEMONIC_##mne],		\
-+    AVR32_PARSER_NORMAL,						\
-+    { &avr32_opc_table[AVR32_OPC_##opc], },				\
-+    &avr32_syntax_table[AVR32_SYNTAX_##nxt], 3,			\
-+    {								\
-+      AVR32_OPERAND_##op0, AVR32_OPERAND_##op1,			\
-+      AVR32_OPERAND_##op2,					\
-+    }								\
-+  }
-+#define SYNTAX_NORMAL_CM3(id, mne, opc, nxt, op0, op1, op2, arch)	\
-+  {								\
-+    AVR32_SYNTAX_##id, arch,				\
-+    &avr32_mnemonic_table[AVR32_MNEMONIC_##mne],		\
-+    AVR32_PARSER_NORMAL,						\
-+    { &avr32_opc_table[AVR32_OPC_##opc], },				\
-+    &avr32_syntax_table[AVR32_SYNTAX_##nxt], -3,		\
-+    {								\
-+      AVR32_OPERAND_##op0, AVR32_OPERAND_##op1,			\
-+      AVR32_OPERAND_##op2,					\
-+    }								\
-+  }
-+
-+
-+const struct avr32_syntax avr32_syntax_table[] =
-+  {
-+    SYNTAX_NORMAL1(ABS, ABS, ABS, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL1(ACALL, ACALL, ACALL, UNSIGNED_CONST_W, AVR32_V1),
-+    SYNTAX_NORMAL1(ACR, ACR, ACR, INTREG,AVR32_V1),
-+    SYNTAX_NORMAL3(ADC, ADC, ADC, INTREG, INTREG, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL_C2(ADD1, ADD, ADD1, ADD2, INTREG, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL3(ADD2, ADD, ADD2, INTREG, INTREG, INTREG_LSL, AVR32_V1),
-+    SYNTAX_NORMAL3(ADDABS, ADDABS, ADDABS, INTREG, INTREG, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL3(ADDHH_W, ADDHH_W, ADDHH_W, INTREG, INTREG_HSEL, INTREG_HSEL, AVR32_DSP),
-+    SYNTAX_NORMAL_C2(AND1, AND, AND1, AND2, INTREG, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL_C3(AND2, AND, AND2, AND3, INTREG, INTREG, INTREG_LSL, AVR32_V1),
-+    SYNTAX_NORMAL3(AND3, AND, AND3, INTREG, INTREG, INTREG_LSR, AVR32_V1),
-+    SYNTAX_NORMAL_C2(ANDH, ANDH, ANDH, ANDH_COH, INTREG, UNSIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL3(ANDH_COH, ANDH, ANDH_COH, INTREG, UNSIGNED_CONST, COH, AVR32_V1),
-+    SYNTAX_NORMAL_C2(ANDL, ANDL, ANDL, ANDL_COH, INTREG, UNSIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL3(ANDL_COH, ANDL, ANDL_COH, INTREG, UNSIGNED_CONST, COH, AVR32_V1),
-+    SYNTAX_NORMAL2(ANDN, ANDN, ANDN, INTREG, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL_C3(ASR1, ASR, ASR1, ASR3, INTREG, INTREG, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL_C3(ASR3, ASR, ASR3, ASR2, INTREG, INTREG, UNSIGNED_NUMBER, AVR32_V1),
-+    SYNTAX_NORMAL2(ASR2, ASR, ASR2, INTREG, UNSIGNED_NUMBER, AVR32_V1),
-+    SYNTAX_NORMAL4(BFEXTS, BFEXTS, BFEXTS, INTREG, INTREG, UNSIGNED_NUMBER, UNSIGNED_NUMBER, AVR32_V1),
-+    SYNTAX_NORMAL4(BFEXTU, BFEXTU, BFEXTU, INTREG, INTREG, UNSIGNED_NUMBER, UNSIGNED_NUMBER, AVR32_V1),
-+    SYNTAX_NORMAL4(BFINS, BFINS, BFINS, INTREG, INTREG, UNSIGNED_NUMBER, UNSIGNED_NUMBER, AVR32_V1),
-+    SYNTAX_NORMAL2(BLD, BLD, BLD, INTREG, UNSIGNED_NUMBER, AVR32_V1),
-+    SYNTAX_NORMAL_C1(BREQ1, BREQ, BREQ1, BREQ2, JMPLABEL, AVR32_V1),
-+    SYNTAX_NORMAL_C1(BRNE1, BRNE, BRNE1, BRNE2, JMPLABEL, AVR32_V1),
-+    SYNTAX_NORMAL_C1(BRCC1, BRCC, BRCC1, BRCC2, JMPLABEL, AVR32_V1),
-+    SYNTAX_NORMAL_C1(BRCS1, BRCS, BRCS1, BRCS2, JMPLABEL, AVR32_V1),
-+    SYNTAX_NORMAL_C1(BRGE1, BRGE, BRGE1, BRGE2, JMPLABEL, AVR32_V1),
-+    SYNTAX_NORMAL_C1(BRLT1, BRLT, BRLT1, BRLT2, JMPLABEL, AVR32_V1),
-+    SYNTAX_NORMAL_C1(BRMI1, BRMI, BRMI1, BRMI2, JMPLABEL, AVR32_V1),
-+    SYNTAX_NORMAL_C1(BRPL1, BRPL, BRPL1, BRPL2, JMPLABEL, AVR32_V1),
-+    SYNTAX_NORMAL_C1(BRHS1, BRHS, BRCC1, BRHS2, JMPLABEL, AVR32_V1),
-+    SYNTAX_NORMAL_C1(BRLO1, BRLO, BRCS1, BRLO2, JMPLABEL, AVR32_V1),
-+    SYNTAX_NORMAL1(BREQ2, BREQ, BREQ2, JMPLABEL, AVR32_V1),
-+    SYNTAX_NORMAL1(BRNE2, BRNE, BRNE2, JMPLABEL, AVR32_V1),
-+    SYNTAX_NORMAL1(BRCC2, BRCC, BRCC2, JMPLABEL, AVR32_V1),
-+    SYNTAX_NORMAL1(BRCS2, BRCS, BRCS2, JMPLABEL, AVR32_V1),
-+    SYNTAX_NORMAL1(BRGE2, BRGE, BRGE2, JMPLABEL, AVR32_V1),
-+    SYNTAX_NORMAL1(BRLT2, BRLT, BRLT2, JMPLABEL, AVR32_V1),
-+    SYNTAX_NORMAL1(BRMI2, BRMI, BRMI2, JMPLABEL, AVR32_V1),
-+    SYNTAX_NORMAL1(BRPL2, BRPL, BRPL2, JMPLABEL, AVR32_V1),
-+    SYNTAX_NORMAL1(BRLS, BRLS, BRLS, JMPLABEL, AVR32_V1),
-+    SYNTAX_NORMAL1(BRGT, BRGT, BRGT, JMPLABEL, AVR32_V1),
-+    SYNTAX_NORMAL1(BRLE, BRLE, BRLE, JMPLABEL, AVR32_V1),
-+    SYNTAX_NORMAL1(BRHI, BRHI, BRHI, JMPLABEL, AVR32_V1),
-+    SYNTAX_NORMAL1(BRVS, BRVS, BRVS, JMPLABEL, AVR32_V1),
-+    SYNTAX_NORMAL1(BRVC, BRVC, BRVC, JMPLABEL, AVR32_V1),
-+    SYNTAX_NORMAL1(BRQS, BRQS, BRQS, JMPLABEL, AVR32_V1),
-+    SYNTAX_NORMAL1(BRAL, BRAL, BRAL, JMPLABEL, AVR32_V1),
-+    SYNTAX_NORMAL1(BRHS2, BRHS, BRCC2, JMPLABEL, AVR32_V1),
-+    SYNTAX_NORMAL1(BRLO2, BRLO, BRCS2, JMPLABEL, AVR32_V1),
-+    SYNTAX_NORMAL0(BREAKPOINT, BREAKPOINT, BREAKPOINT, AVR32_V1),
-+    SYNTAX_NORMAL1(BREV, BREV, BREV, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL2(BST, BST, BST, INTREG, UNSIGNED_NUMBER, AVR32_V1),
-+    SYNTAX_NORMAL2(CACHE, CACHE, CACHE, INTREG_SDISP, UNSIGNED_NUMBER, AVR32_V1),
-+    SYNTAX_NORMAL1(CASTS_B, CASTS_B, CASTS_B, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL1(CASTS_H, CASTS_H, CASTS_H, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL1(CASTU_B, CASTU_B, CASTU_B, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL1(CASTU_H, CASTU_H, CASTU_H, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL2(CBR, CBR, CBR, INTREG, UNSIGNED_NUMBER, AVR32_V1),
-+    SYNTAX_NORMAL2(CLZ, CLZ, CLZ, INTREG, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL1(COM, COM, COM, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL5(COP, COP, COP, CPNO, CPREG, CPREG, CPREG, UNSIGNED_NUMBER, AVR32_V1),
-+    SYNTAX_NORMAL2(CP_B, CP_B, CP_B, INTREG, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL2(CP_H, CP_H, CP_H, INTREG, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL_C2(CP_W1, CP_W, CP_W1, CP_W2, INTREG, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL_C2(CP_W2, CP_W, CP_W2, CP_W3, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL2(CP_W3, CP_W, CP_W3, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL_C2(CPC1, CPC, CPC1, CPC2, INTREG, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL1(CPC2, CPC, CPC2, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL1(CSRF, CSRF, CSRF, UNSIGNED_NUMBER, AVR32_V1),
-+    SYNTAX_NORMAL1(CSRFCZ, CSRFCZ, CSRFCZ, UNSIGNED_NUMBER, AVR32_V1),
-+    SYNTAX_NORMAL3(DIVS, DIVS, DIVS, INTREG, INTREG, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL3(DIVU, DIVU, DIVU, INTREG, INTREG, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL_C2(EOR1, EOR, EOR1, EOR2, INTREG, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL_C3(EOR2, EOR, EOR2, EOR3, INTREG, INTREG, INTREG_LSL, AVR32_V1),
-+    SYNTAX_NORMAL3(EOR3, EOR, EOR3, INTREG, INTREG, INTREG_LSR, AVR32_V1),
-+    SYNTAX_NORMAL2(EORL, EORL, EORL, INTREG, UNSIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL2(EORH, EORH, EORH, INTREG, UNSIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL0(FRS, FRS, FRS, AVR32_V1),
-+    SYNTAX_NORMAL0(SSCALL, SSCALL, SSCALL, AVR32_V3),
-+    SYNTAX_NORMAL0(RETSS, RETSS, RETSS, AVR32_V3),
-+    SYNTAX_NORMAL1(ICALL, ICALL, ICALL, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL1(INCJOSP, INCJOSP, INCJOSP, JOSPINC, AVR32_V1),
-+    SYNTAX_NORMAL_C2(LD_D1, LD_D, LD_D1, LD_D2, DWREG, INTREG_POSTINC, AVR32_V1),
-+    SYNTAX_NORMAL_C2(LD_D2, LD_D, LD_D2, LD_D3, DWREG, INTREG_PREDEC, AVR32_V1),
-+    SYNTAX_NORMAL_C2(LD_D3, LD_D, LD_D3, LD_D5, DWREG, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL_C2(LD_D5, LD_D, LD_D5, LD_D4, DWREG, INTREG_INDEX, AVR32_V1),
-+    SYNTAX_NORMAL2(LD_D4, LD_D, LD_D4, DWREG, INTREG_SDISP, AVR32_V1),
-+    SYNTAX_NORMAL_C2(LD_SB2, LD_SB, LD_SB2, LD_SB1, INTREG, INTREG_INDEX, AVR32_V1),
-+    SYNTAX_NORMAL2(LD_SB1, LD_SB, LD_SB1, INTREG, INTREG_SDISP, AVR32_V1),
-+    SYNTAX_NORMAL_C2(LD_UB1, LD_UB, LD_UB1, LD_UB2, INTREG, INTREG_POSTINC, AVR32_V1),
-+    SYNTAX_NORMAL_C2(LD_UB2, LD_UB, LD_UB2, LD_UB5, INTREG, INTREG_PREDEC, AVR32_V1),
-+    SYNTAX_NORMAL_C2(LD_UB5, LD_UB, LD_UB5, LD_UB3, INTREG, INTREG_INDEX, AVR32_V1),
-+    SYNTAX_NORMAL_C2(LD_UB3, LD_UB, LD_UB3, LD_UB4, INTREG, INTREG_UDISP, AVR32_V1),
-+    SYNTAX_NORMAL2(LD_UB4, LD_UB, LD_UB4, INTREG, INTREG_SDISP, AVR32_V1),
-+    SYNTAX_NORMAL_C2(LD_SH1, LD_SH, LD_SH1, LD_SH2, INTREG, INTREG_POSTINC, AVR32_V1),
-+    SYNTAX_NORMAL_C2(LD_SH2, LD_SH, LD_SH2, LD_SH5, INTREG, INTREG_PREDEC, AVR32_V1),
-+    SYNTAX_NORMAL_C2(LD_SH5, LD_SH, LD_SH5, LD_SH3, INTREG, INTREG_INDEX, AVR32_V1),
-+    SYNTAX_NORMAL_C2(LD_SH3, LD_SH, LD_SH3, LD_SH4, INTREG, INTREG_UDISP_H, AVR32_V1),
-+    SYNTAX_NORMAL2(LD_SH4, LD_SH, LD_SH4, INTREG, INTREG_SDISP, AVR32_V1),
-+    SYNTAX_NORMAL_C2(LD_UH1, LD_UH, LD_UH1, LD_UH2, INTREG, INTREG_POSTINC, AVR32_V1),
-+    SYNTAX_NORMAL_C2(LD_UH2, LD_UH, LD_UH2, LD_UH5, INTREG, INTREG_PREDEC, AVR32_V1),
-+    SYNTAX_NORMAL_C2(LD_UH5, LD_UH, LD_UH5, LD_UH3, INTREG, INTREG_INDEX, AVR32_V1),
-+    SYNTAX_NORMAL_C2(LD_UH3, LD_UH, LD_UH3, LD_UH4, INTREG, INTREG_UDISP_H, AVR32_V1),
-+    SYNTAX_NORMAL2(LD_UH4, LD_UH, LD_UH4, INTREG, INTREG_SDISP, AVR32_V1),
-+    SYNTAX_NORMAL_C2(LD_W1, LD_W, LD_W1, LD_W2, INTREG, INTREG_POSTINC, AVR32_V1),
-+    SYNTAX_NORMAL_C2(LD_W2, LD_W, LD_W2, LD_W5, INTREG, INTREG_PREDEC, AVR32_V1),
-+    SYNTAX_NORMAL_C2(LD_W5, LD_W, LD_W5, LD_W6, INTREG, INTREG_INDEX, AVR32_V1),
-+    SYNTAX_NORMAL_C2(LD_W6, LD_W, LD_W6, LD_W3, INTREG, INTREG_XINDEX, AVR32_V1),
-+    SYNTAX_NORMAL_C2(LD_W3, LD_W, LD_W3, LD_W4, INTREG, INTREG_UDISP_W, AVR32_V1),
-+    SYNTAX_NORMAL2(LD_W4, LD_W, LD_W4, INTREG, INTREG_SDISP, AVR32_V1),
-+    SYNTAX_NORMAL3(LDC_D1, LDC_D, LDC_D1, CPNO, CPREG_D, INTREG_UDISP_W, AVR32_V1),
-+    SYNTAX_NORMAL_C3(LDC_D2, LDC_D, LDC_D2, LDC_D1, CPNO, CPREG_D, INTREG_PREDEC, AVR32_V1),
-+    SYNTAX_NORMAL_C3(LDC_D3, LDC_D, LDC_D3, LDC_D2, CPNO, CPREG_D, INTREG_INDEX, AVR32_V1),
-+    SYNTAX_NORMAL3(LDC_W1, LDC_W, LDC_W1, CPNO, CPREG, INTREG_UDISP_W, AVR32_V1),
-+    SYNTAX_NORMAL_C3(LDC_W2, LDC_W, LDC_W2, LDC_W1, CPNO, CPREG, INTREG_PREDEC, AVR32_V1),
-+    SYNTAX_NORMAL_C3(LDC_W3, LDC_W, LDC_W3, LDC_W2, CPNO, CPREG, INTREG_INDEX, AVR32_V1),
-+    SYNTAX_NORMAL2(LDC0_D, LDC0_D, LDC0_D, CPREG_D, INTREG_UDISP_W, AVR32_V1),
-+    SYNTAX_NORMAL2(LDC0_W, LDC0_W, LDC0_W, CPREG, INTREG_UDISP_W, AVR32_V1),
-+    SYNTAX_NORMAL_CM3(LDCM_D, LDCM_D, LDCM_D, LDCM_D_PU, CPNO, INTREG, REGLIST_CPD8, AVR32_V1),
-+    SYNTAX_NORMALM3(LDCM_D_PU, LDCM_D, LDCM_D_PU, CPNO, INTREG_POSTINC, REGLIST_CPD8, AVR32_V1),
-+    SYNTAX_NORMAL_CM3(LDCM_W, LDCM_W, LDCM_W, LDCM_W_PU, CPNO, INTREG, REGLIST_CP8, AVR32_V1),
-+    SYNTAX_NORMALM3(LDCM_W_PU, LDCM_W, LDCM_W_PU, CPNO, INTREG_POSTINC, REGLIST_CP8, AVR32_V1),
-+    SYNTAX_NORMAL2(LDDPC, LDDPC, LDDPC, INTREG, PC_UDISP_W, AVR32_V1),
-+    SYNTAX_NORMAL2(LDDPC_EXT, LDDPC, LDDPC_EXT, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL2(LDDSP, LDDSP, LDDSP, INTREG, SP_UDISP_W, AVR32_V1),
-+    SYNTAX_NORMAL2(LDINS_B, LDINS_B, LDINS_B, INTREG_BSEL, INTREG_SDISP, AVR32_V1),
-+    SYNTAX_NORMAL2(LDINS_H, LDINS_H, LDINS_H, INTREG_HSEL, INTREG_SDISP_H, AVR32_V1),
-+    SYNTAX_NORMALM1(LDM, LDM, LDM, REGLIST_LDM, AVR32_V1),
-+    SYNTAX_NORMAL_CM2(LDMTS, LDMTS, LDMTS, LDMTS_PU, INTREG, REGLIST16, AVR32_V1),
-+    SYNTAX_NORMALM2(LDMTS_PU, LDMTS, LDMTS_PU, INTREG_POSTINC, REGLIST16, AVR32_V1),
-+    SYNTAX_NORMAL2(LDSWP_SH, LDSWP_SH, LDSWP_SH, INTREG, INTREG_SDISP_H, AVR32_V1),
-+    SYNTAX_NORMAL2(LDSWP_UH, LDSWP_UH, LDSWP_UH, INTREG, INTREG_SDISP_H, AVR32_V1),
-+    SYNTAX_NORMAL2(LDSWP_W, LDSWP_W, LDSWP_W, INTREG, INTREG_SDISP_W, AVR32_V1),
-+    SYNTAX_NORMAL_C3(LSL1, LSL, LSL1, LSL3, INTREG, INTREG, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL_C3(LSL3, LSL, LSL3, LSL2, INTREG, INTREG, UNSIGNED_NUMBER, AVR32_V1),
-+    SYNTAX_NORMAL2(LSL2, LSL, LSL2, INTREG, UNSIGNED_NUMBER, AVR32_V1),
-+    SYNTAX_NORMAL_C3(LSR1, LSR, LSR1, LSR3, INTREG, INTREG, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL_C3(LSR3, LSR, LSR3, LSR2, INTREG, INTREG, UNSIGNED_NUMBER, AVR32_V1),
-+    SYNTAX_NORMAL2(LSR2, LSR, LSR2, INTREG, UNSIGNED_NUMBER, AVR32_V1),
-+    SYNTAX_NORMAL3(MAC, MAC, MAC, INTREG, INTREG, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL3(MACHH_D, MACHH_D, MACHH_D, INTREG, INTREG_HSEL, INTREG_HSEL, AVR32_DSP),
-+    SYNTAX_NORMAL3(MACHH_W, MACHH_W, MACHH_W, INTREG, INTREG_HSEL, INTREG_HSEL, AVR32_DSP),
-+    SYNTAX_NORMAL3(MACS_D, MACS_D, MACS_D, INTREG, INTREG, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL3(MACSATHH_W, MACSATHH_W, MACSATHH_W, INTREG, INTREG_HSEL, INTREG_HSEL, AVR32_DSP),
-+    SYNTAX_NORMAL3(MACUD, MACU_D, MACUD, INTREG, INTREG, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL3(MACWH_D, MACWH_D, MACWH_D, INTREG, INTREG, INTREG_HSEL, AVR32_DSP),
-+    SYNTAX_NORMAL3(MAX, MAX, MAX, INTREG, INTREG, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL1(MCALL, MCALL, MCALL, MCALL, AVR32_V1),
-+    SYNTAX_NORMAL2(MFDR, MFDR, MFDR, INTREG, UNSIGNED_CONST_W, AVR32_V1),
-+    SYNTAX_NORMAL2(MFSR, MFSR, MFSR, INTREG, UNSIGNED_CONST_W, AVR32_V1),
-+    SYNTAX_NORMAL3(MIN, MIN, MIN, INTREG, INTREG, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL_C2(MOV3, MOV, MOV3, MOV1, INTREG, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL_C2(MOV1, MOV, MOV1, MOV2, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL2(MOV2, MOV, MOV2,INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL_C2(MOVEQ1, MOVEQ, MOVEQ1, MOVEQ2, INTREG, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL_C2(MOVNE1, MOVNE, MOVNE1, MOVNE2, INTREG, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL_C2(MOVCC1, MOVCC, MOVCC1, MOVCC2, INTREG, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL_C2(MOVCS1, MOVCS, MOVCS1, MOVCS2, INTREG, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL_C2(MOVGE1, MOVGE, MOVGE1, MOVGE2, INTREG, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL_C2(MOVLT1, MOVLT, MOVLT1, MOVLT2, INTREG, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL_C2(MOVMI1, MOVMI, MOVMI1, MOVMI2, INTREG, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL_C2(MOVPL1, MOVPL, MOVPL1, MOVPL2, INTREG, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL_C2(MOVLS1, MOVLS, MOVLS1, MOVLS2, INTREG, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL_C2(MOVGT1, MOVGT, MOVGT1, MOVGT2, INTREG, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL_C2(MOVLE1, MOVLE, MOVLE1, MOVLE2, INTREG, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL_C2(MOVHI1, MOVHI, MOVHI1, MOVHI2, INTREG, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL_C2(MOVVS1, MOVVS, MOVVS1, MOVVS2, INTREG, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL_C2(MOVVC1, MOVVC, MOVVC1, MOVVC2, INTREG, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL_C2(MOVQS1, MOVQS, MOVQS1, MOVQS2, INTREG, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL_C2(MOVAL1, MOVAL, MOVAL1, MOVAL2, INTREG, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL_C2(MOVHS1, MOVHS, MOVCC1, MOVHS2, INTREG, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL_C2(MOVLO1, MOVLO, MOVCS1, MOVLO2, INTREG, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL2(MOVEQ2, MOVEQ, MOVEQ2, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL2(MOVNE2, MOVNE, MOVNE2, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL2(MOVCC2, MOVCC, MOVCC2, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL2(MOVCS2, MOVCS, MOVCS2, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL2(MOVGE2, MOVGE, MOVGE2, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL2(MOVLT2, MOVLT, MOVLT2, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL2(MOVMI2, MOVMI, MOVMI2, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL2(MOVPL2, MOVPL, MOVPL2, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL2(MOVLS2, MOVLS, MOVLS2, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL2(MOVGT2, MOVGT, MOVGT2, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL2(MOVLE2, MOVLE, MOVLE2, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL2(MOVHI2, MOVHI, MOVHI2, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL2(MOVVS2, MOVVS, MOVVS2, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL2(MOVVC2, MOVVC, MOVVC2, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL2(MOVQS2, MOVQS, MOVQS2, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL2(MOVAL2, MOVAL, MOVAL2, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL2(MOVHS2, MOVHS, MOVCC2, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL2(MOVLO2, MOVLO, MOVCS2, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL2(MTDR, MTDR, MTDR, UNSIGNED_CONST_W, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL2(MTSR, MTSR, MTSR, UNSIGNED_CONST_W, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL_C2(MUL1, MUL, MUL1, MUL2, INTREG, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL_C3(MUL2, MUL, MUL2, MUL3, INTREG, INTREG, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL3(MUL3, MUL, MUL3, INTREG, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL3(MULHH_W, MULHH_W, MULHH_W, INTREG, INTREG_HSEL, INTREG_HSEL, AVR32_DSP),
-+    SYNTAX_NORMAL3(MULNHH_W, MULNHH_W, MULNHH_W, INTREG, INTREG_HSEL, INTREG_HSEL, AVR32_DSP),
-+    SYNTAX_NORMAL3(MULNWH_D, MULNWH_D, MULNWH_D, INTREG, INTREG, INTREG_HSEL, AVR32_DSP),
-+    SYNTAX_NORMAL3(MULSD, MULS_D, MULSD, INTREG, INTREG, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL3(MULSATHH_H, MULSATHH_H, MULSATHH_H, INTREG, INTREG_HSEL, INTREG_HSEL, AVR32_DSP),
-+    SYNTAX_NORMAL3(MULSATHH_W, MULSATHH_W, MULSATHH_W, INTREG, INTREG_HSEL, INTREG_HSEL, AVR32_DSP),
-+    SYNTAX_NORMAL3(MULSATRNDHH_H, MULSATRNDHH_H, MULSATRNDHH_H, INTREG, INTREG_HSEL, INTREG_HSEL, AVR32_DSP),
-+    SYNTAX_NORMAL3(MULSATRNDWH_W, MULSATRNDWH_W, MULSATRNDWH_W, INTREG, INTREG, INTREG_HSEL, AVR32_DSP),
-+    SYNTAX_NORMAL3(MULSATWH_W, MULSATWH_W, MULSATWH_W, INTREG, INTREG, INTREG_HSEL, AVR32_DSP),
-+    SYNTAX_NORMAL3(MULU_D, MULU_D, MULU_D, INTREG, INTREG, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL3(MULWH_D, MULWH_D, MULWH_D, INTREG, INTREG, INTREG_HSEL, AVR32_DSP),
-+    SYNTAX_NORMAL1(MUSFR, MUSFR, MUSFR, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL1(MUSTR, MUSTR, MUSTR, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL3(MVCR_D, MVCR_D, MVCR_D, CPNO, DWREG, CPREG_D, AVR32_V1),
-+    SYNTAX_NORMAL3(MVCR_W, MVCR_W, MVCR_W, CPNO, INTREG, CPREG, AVR32_V1),
-+    SYNTAX_NORMAL3(MVRC_D, MVRC_D, MVRC_D, CPNO, CPREG_D, DWREG, AVR32_V1),
-+    SYNTAX_NORMAL3(MVRC_W, MVRC_W, MVRC_W, CPNO, CPREG, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL1(NEG, NEG, NEG, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL0(NOP, NOP, NOP, AVR32_V1),
-+    SYNTAX_NORMAL_C2(OR1, OR, OR1, OR2, INTREG, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL_C3(OR2, OR, OR2, OR3, INTREG, INTREG, INTREG_LSL, AVR32_V1),
-+    SYNTAX_NORMAL3(OR3, OR, OR3, INTREG, INTREG, INTREG_LSR, AVR32_V1),
-+    SYNTAX_NORMAL2(ORH, ORH, ORH, INTREG, UNSIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL2(ORL, ORL, ORL, INTREG, UNSIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL2(PABS_SB, PABS_SB, PABS_SB, INTREG, INTREG, AVR32_SIMD),
-+    SYNTAX_NORMAL2(PABS_SH, PABS_SH, PABS_SH, INTREG, INTREG, AVR32_SIMD),
-+    SYNTAX_NORMAL3(PACKSH_SB, PACKSH_SB, PACKSH_SB, INTREG, INTREG, INTREG, AVR32_SIMD),
-+    SYNTAX_NORMAL3(PACKSH_UB, PACKSH_UB, PACKSH_UB, INTREG, INTREG, INTREG, AVR32_SIMD),
-+    SYNTAX_NORMAL3(PACKW_SH, PACKW_SH, PACKW_SH, INTREG, INTREG, INTREG, AVR32_SIMD),
-+    SYNTAX_NORMAL3(PADD_B, PADD_B, PADD_B, INTREG, INTREG, INTREG, AVR32_SIMD),
-+    SYNTAX_NORMAL3(PADD_H, PADD_H, PADD_H, INTREG, INTREG, INTREG, AVR32_SIMD),
-+    SYNTAX_NORMAL3(PADDH_SH, PADDH_SH, PADDH_SH, INTREG, INTREG, INTREG, AVR32_SIMD),
-+    SYNTAX_NORMAL3(PADDH_UB, PADDH_UB, PADDH_UB, INTREG, INTREG, INTREG, AVR32_SIMD),
-+    SYNTAX_NORMAL3(PADDS_SB, PADDS_SB, PADDS_SB, INTREG, INTREG, INTREG, AVR32_SIMD),
-+    SYNTAX_NORMAL3(PADDS_SH, PADDS_SH, PADDS_SH, INTREG, INTREG, INTREG, AVR32_SIMD),
-+    SYNTAX_NORMAL3(PADDS_UB, PADDS_UB, PADDS_UB, INTREG, INTREG, INTREG, AVR32_SIMD),
-+    SYNTAX_NORMAL3(PADDS_UH, PADDS_UH, PADDS_UH, INTREG, INTREG, INTREG, AVR32_SIMD),
-+    SYNTAX_NORMAL3(PADDSUB_H, PADDSUB_H, PADDSUB_H, INTREG, INTREG_HSEL, INTREG_HSEL, AVR32_SIMD),
-+    SYNTAX_NORMAL3(PADDSUBH_SH, PADDSUBH_SH, PADDSUBH_SH, INTREG, INTREG_HSEL, INTREG_HSEL, AVR32_SIMD),
-+    SYNTAX_NORMAL3(PADDSUBS_SH, PADDSUBS_SH, PADDSUBS_SH, INTREG, INTREG_HSEL, INTREG_HSEL, AVR32_SIMD),
-+    SYNTAX_NORMAL3(PADDSUBS_UH, PADDSUBS_UH, PADDSUBS_UH, INTREG, INTREG_HSEL, INTREG_HSEL, AVR32_SIMD),
-+    SYNTAX_NORMAL3(PADDX_H, PADDX_H, PADDX_H, INTREG, INTREG, INTREG, AVR32_SIMD),
-+    SYNTAX_NORMAL3(PADDXH_SH, PADDXH_SH, PADDXH_SH, INTREG, INTREG, INTREG, AVR32_SIMD),
-+    SYNTAX_NORMAL3(PADDXS_SH, PADDXS_SH, PADDXS_SH, INTREG, INTREG, INTREG, AVR32_SIMD),
-+    SYNTAX_NORMAL3(PADDXS_UH, PADDXS_UH, PADDXS_UH, INTREG, INTREG, INTREG, AVR32_SIMD),
-+    SYNTAX_NORMAL3(PASR_B, PASR_B, PASR_B, INTREG, INTREG, UNSIGNED_NUMBER, AVR32_SIMD),
-+    SYNTAX_NORMAL3(PASR_H, PASR_H, PASR_H, INTREG, INTREG, UNSIGNED_NUMBER, AVR32_SIMD),
-+    SYNTAX_NORMAL3(PAVG_SH, PAVG_SH, PAVG_SH, INTREG, INTREG, INTREG, AVR32_SIMD),
-+    SYNTAX_NORMAL3(PAVG_UB, PAVG_UB, PAVG_UB, INTREG, INTREG, INTREG, AVR32_SIMD),
-+    SYNTAX_NORMAL3(PLSL_B, PLSL_B, PLSL_B, INTREG, INTREG, UNSIGNED_NUMBER, AVR32_SIMD),
-+    SYNTAX_NORMAL3(PLSL_H, PLSL_H, PLSL_H, INTREG, INTREG, UNSIGNED_NUMBER, AVR32_SIMD),
-+    SYNTAX_NORMAL3(PLSR_B, PLSR_B, PLSR_B, INTREG, INTREG, UNSIGNED_NUMBER, AVR32_SIMD),
-+    SYNTAX_NORMAL3(PLSR_H, PLSR_H, PLSR_H, INTREG, INTREG, UNSIGNED_NUMBER, AVR32_SIMD),
-+    SYNTAX_NORMAL3(PMAX_SH, PMAX_SH, PMAX_SH, INTREG, INTREG, INTREG, AVR32_SIMD),
-+    SYNTAX_NORMAL3(PMAX_UB, PMAX_UB, PMAX_UB, INTREG, INTREG, INTREG, AVR32_SIMD),
-+    SYNTAX_NORMAL3(PMIN_SH, PMIN_SH, PMIN_SH, INTREG, INTREG, INTREG, AVR32_SIMD),
-+    SYNTAX_NORMAL3(PMIN_UB, PMIN_UB, PMIN_UB, INTREG, INTREG, INTREG, AVR32_SIMD),
-+    SYNTAX_NORMAL0(POPJC, POPJC, POPJC, AVR32_V1),
-+    SYNTAX_NORMAL_CM1(POPM, POPM, POPM, POPM_E, REGLIST9, AVR32_V1),
-+    SYNTAX_NORMALM1(POPM_E, POPM, POPM_E, REGLIST16, AVR32_V1),
-+    SYNTAX_NORMAL1(PREF, PREF, PREF, INTREG_SDISP, AVR32_V1),
-+    SYNTAX_NORMAL3(PSAD, PSAD, PSAD, INTREG, INTREG, INTREG, AVR32_SIMD),
-+    SYNTAX_NORMAL3(PSUB_B, PSUB_B, PSUB_B, INTREG, INTREG, INTREG, AVR32_SIMD),
-+    SYNTAX_NORMAL3(PSUB_H, PSUB_H, PSUB_H, INTREG, INTREG, INTREG, AVR32_SIMD),
-+    SYNTAX_NORMAL3(PSUBADD_H, PSUBADD_H, PSUBADD_H, INTREG, INTREG_HSEL, INTREG_HSEL, AVR32_SIMD),
-+    SYNTAX_NORMAL3(PSUBADDH_SH, PSUBADDH_SH, PSUBADDH_SH, INTREG, INTREG_HSEL, INTREG_HSEL, AVR32_SIMD),
-+    SYNTAX_NORMAL3(PSUBADDS_SH, PSUBADDS_SH, PSUBADDS_SH, INTREG, INTREG_HSEL, INTREG_HSEL, AVR32_SIMD),
-+    SYNTAX_NORMAL3(PSUBADDS_UH, PSUBADDS_UH, PSUBADDS_UH, INTREG, INTREG_HSEL, INTREG_HSEL, AVR32_SIMD),
-+    SYNTAX_NORMAL3(PSUBH_SH, PSUBH_SH, PSUBH_SH, INTREG, INTREG, INTREG, AVR32_SIMD),
-+    SYNTAX_NORMAL3(PSUBH_UB, PSUBH_UB, PSUBH_UB, INTREG, INTREG, INTREG, AVR32_SIMD),
-+    SYNTAX_NORMAL3(PSUBS_SB, PSUBS_SB, PSUBS_SB, INTREG, INTREG, INTREG, AVR32_SIMD),
-+    SYNTAX_NORMAL3(PSUBS_SH, PSUBS_SH, PSUBS_SH, INTREG, INTREG, INTREG, AVR32_SIMD),
-+    SYNTAX_NORMAL3(PSUBS_UB, PSUBS_UB, PSUBS_UB, INTREG, INTREG, INTREG, AVR32_SIMD),
-+    SYNTAX_NORMAL3(PSUBS_UH, PSUBS_UH, PSUBS_UH, INTREG, INTREG, INTREG, AVR32_SIMD),
-+    SYNTAX_NORMAL3(PSUBX_H, PSUBX_H, PSUBX_H, INTREG, INTREG, INTREG, AVR32_SIMD),
-+    SYNTAX_NORMAL3(PSUBXH_SH, PSUBXH_SH, PSUBXH_SH, INTREG, INTREG, INTREG, AVR32_SIMD),
-+    SYNTAX_NORMAL3(PSUBXS_SH, PSUBXS_SH, PSUBXS_SH, INTREG, INTREG, INTREG, AVR32_SIMD),
-+    SYNTAX_NORMAL3(PSUBXS_UH, PSUBXS_UH, PSUBXS_UH, INTREG, INTREG, INTREG, AVR32_SIMD),
-+    SYNTAX_NORMAL2(PUNPCKSB_H, PUNPCKSB_H, PUNPCKSB_H, INTREG, INTREG_HSEL, AVR32_SIMD),
-+    SYNTAX_NORMAL2(PUNPCKUB_H, PUNPCKUB_H, PUNPCKUB_H, INTREG, INTREG_HSEL, AVR32_SIMD),
-+    SYNTAX_NORMAL0(PUSHJC, PUSHJC, PUSHJC, AVR32_V1),
-+    SYNTAX_NORMAL_CM1(PUSHM, PUSHM, PUSHM, PUSHM_E, REGLIST8, AVR32_V1),
-+    SYNTAX_NORMALM1(PUSHM_E, PUSHM, PUSHM_E, REGLIST16, AVR32_V1),
-+    SYNTAX_NORMAL_C1(RCALL1, RCALL, RCALL1, RCALL2, JMPLABEL, AVR32_V1),
-+    SYNTAX_NORMAL1(RCALL2, RCALL, RCALL2, JMPLABEL, AVR32_V1),
-+    SYNTAX_NORMAL1(RETEQ, RETEQ, RETEQ, RETVAL, AVR32_V1),
-+    SYNTAX_NORMAL1(RETNE, RETNE, RETNE, RETVAL, AVR32_V1),
-+    SYNTAX_NORMAL1(RETCC, RETCC, RETCC, RETVAL, AVR32_V1),
-+    SYNTAX_NORMAL1(RETCS, RETCS, RETCS, RETVAL, AVR32_V1),
-+    SYNTAX_NORMAL1(RETGE, RETGE, RETGE, RETVAL, AVR32_V1),
-+    SYNTAX_NORMAL1(RETLT, RETLT, RETLT, RETVAL, AVR32_V1),
-+    SYNTAX_NORMAL1(RETMI, RETMI, RETMI, RETVAL, AVR32_V1),
-+    SYNTAX_NORMAL1(RETPL, RETPL, RETPL, RETVAL, AVR32_V1),
-+    SYNTAX_NORMAL1(RETLS, RETLS, RETLS, RETVAL, AVR32_V1),
-+    SYNTAX_NORMAL1(RETGT, RETGT, RETGT, RETVAL, AVR32_V1),
-+    SYNTAX_NORMAL1(RETLE, RETLE, RETLE, RETVAL, AVR32_V1),
-+    SYNTAX_NORMAL1(RETHI, RETHI, RETHI, RETVAL, AVR32_V1),
-+    SYNTAX_NORMAL1(RETVS, RETVS, RETVS, RETVAL, AVR32_V1),
-+    SYNTAX_NORMAL1(RETVC, RETVC, RETVC, RETVAL, AVR32_V1),
-+    SYNTAX_NORMAL1(RETQS, RETQS, RETQS, RETVAL, AVR32_V1),
-+    SYNTAX_NORMAL1(RETAL, RETAL, RETAL, RETVAL, AVR32_V1),
-+    SYNTAX_NORMAL1(RETHS, RETHS, RETCC, RETVAL, AVR32_V1),
-+    SYNTAX_NORMAL1(RETLO, RETLO, RETCS, RETVAL, AVR32_V1),
-+    SYNTAX_NORMAL0(RETD, RETD, RETD, AVR32_V1),
-+    SYNTAX_NORMAL0(RETE, RETE, RETE, AVR32_V1),
-+    SYNTAX_NORMAL0(RETJ, RETJ, RETJ, AVR32_V1),
-+    SYNTAX_NORMAL0(RETS, RETS, RETS, AVR32_V1),
-+    SYNTAX_NORMAL1(RJMP, RJMP, RJMP, JMPLABEL, AVR32_V1),
-+    SYNTAX_NORMAL1(ROL, ROL, ROL, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL1(ROR, ROR, ROR, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL_C2(RSUB1, RSUB, RSUB1, RSUB2, INTREG, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL3(RSUB2, RSUB, RSUB2, INTREG, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL3(SATADD_H, SATADD_H, SATADD_H, INTREG, INTREG, INTREG,  AVR32_DSP),
-+    SYNTAX_NORMAL3(SATADD_W, SATADD_W, SATADD_W, INTREG, INTREG, INTREG, AVR32_DSP),
-+    SYNTAX_NORMAL2(SATRNDS, SATRNDS, SATRNDS, INTREG_LSR, UNSIGNED_NUMBER, AVR32_DSP),
-+    SYNTAX_NORMAL2(SATRNDU, SATRNDU, SATRNDU, INTREG_LSR, UNSIGNED_NUMBER, AVR32_DSP),
-+    SYNTAX_NORMAL2(SATS, SATS, SATS, INTREG_LSR, UNSIGNED_NUMBER, AVR32_DSP),
-+    SYNTAX_NORMAL3(SATSUB_H, SATSUB_H, SATSUB_H, INTREG, INTREG, INTREG, AVR32_DSP),
-+    SYNTAX_NORMAL_C3(SATSUB_W1, SATSUB_W, SATSUB_W1, SATSUB_W2, INTREG, INTREG, INTREG, AVR32_DSP),
-+    SYNTAX_NORMAL3(SATSUB_W2, SATSUB_W, SATSUB_W2, INTREG, INTREG, SIGNED_CONST, AVR32_DSP),
-+    SYNTAX_NORMAL2(SATU, SATU, SATU, INTREG_LSR, UNSIGNED_NUMBER, AVR32_V1),
-+    SYNTAX_NORMAL3(SBC, SBC, SBC, INTREG, INTREG, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL2(SBR, SBR, SBR, INTREG, UNSIGNED_NUMBER, AVR32_V1),
-+    SYNTAX_NORMAL0(SCALL, SCALL, SCALL, AVR32_V1),
-+    SYNTAX_NORMAL1(SCR, SCR, SCR, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL1(SLEEP, SLEEP, SLEEP, UNSIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL1(SREQ, SREQ, SREQ, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL1(SRNE, SRNE, SRNE, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL1(SRCC, SRCC, SRCC, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL1(SRCS, SRCS, SRCS, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL1(SRGE, SRGE, SRGE, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL1(SRLT, SRLT, SRLT, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL1(SRMI, SRMI, SRMI, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL1(SRPL, SRPL, SRPL, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL1(SRLS, SRLS, SRLS, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL1(SRGT, SRGT, SRGT, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL1(SRLE, SRLE, SRLE, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL1(SRHI, SRHI, SRHI, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL1(SRVS, SRVS, SRVS, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL1(SRVC, SRVC, SRVC, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL1(SRQS, SRQS, SRQS, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL1(SRAL, SRAL, SRAL, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL1(SRHS, SRHS, SRCC, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL1(SRLO, SRLO, SRCS, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL1(SSRF, SSRF, SSRF, UNSIGNED_NUMBER, AVR32_V1),
-+    SYNTAX_NORMAL_C2(ST_B1, ST_B, ST_B1, ST_B2, INTREG_POSTINC, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL_C2(ST_B2, ST_B, ST_B2, ST_B5, INTREG_PREDEC, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL_C2(ST_B5, ST_B, ST_B5, ST_B3, INTREG_INDEX, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL_C2(ST_B3, ST_B, ST_B3, ST_B4, INTREG_UDISP, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL2(ST_B4, ST_B, ST_B4, INTREG_SDISP, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL_C2(ST_D1, ST_D, ST_D1, ST_D2, INTREG_POSTINC, DWREG, AVR32_V1),
-+    SYNTAX_NORMAL_C2(ST_D2, ST_D, ST_D2, ST_D3, INTREG_PREDEC, DWREG, AVR32_V1),
-+    SYNTAX_NORMAL_C2(ST_D3, ST_D, ST_D3, ST_D5, INTREG, DWREG, AVR32_V1),
-+    SYNTAX_NORMAL_C2(ST_D5, ST_D, ST_D5, ST_D4, INTREG_INDEX, DWREG, AVR32_V1),
-+    SYNTAX_NORMAL2(ST_D4, ST_D, ST_D4, INTREG_SDISP, DWREG, AVR32_V1),
-+    SYNTAX_NORMAL_C2(ST_H1, ST_H, ST_H1, ST_H2, INTREG_POSTINC, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL_C2(ST_H2, ST_H, ST_H2, ST_H5, INTREG_PREDEC, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL_C2(ST_H5, ST_H, ST_H5, ST_H3, INTREG_INDEX, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL_C2(ST_H3, ST_H, ST_H3, ST_H4, INTREG_UDISP_H, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL2(ST_H4, ST_H, ST_H4, INTREG_SDISP, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL_C2(ST_W1, ST_W, ST_W1, ST_W2, INTREG_POSTINC, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL_C2(ST_W2, ST_W, ST_W2, ST_W5, INTREG_PREDEC, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL_C2(ST_W5, ST_W, ST_W5, ST_W3, INTREG_INDEX, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL_C2(ST_W3, ST_W, ST_W3, ST_W4, INTREG_UDISP_W, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL2(ST_W4, ST_W, ST_W4, INTREG_SDISP, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL3(STC_D1, STC_D, STC_D1, CPNO, INTREG_UDISP_W, CPREG_D, AVR32_V1),
-+    SYNTAX_NORMAL_C3(STC_D2, STC_D, STC_D2, STC_D1, CPNO, INTREG_POSTINC, CPREG_D, AVR32_V1),
-+    SYNTAX_NORMAL_C3(STC_D3, STC_D, STC_D3, STC_D2, CPNO, INTREG_INDEX, CPREG_D, AVR32_V1),
-+    SYNTAX_NORMAL3(STC_W1, STC_W, STC_W1, CPNO, INTREG_UDISP_W, CPREG, AVR32_V1),
-+    SYNTAX_NORMAL_C3(STC_W2, STC_W, STC_W2, STC_W1, CPNO, INTREG_POSTINC, CPREG, AVR32_V1),
-+    SYNTAX_NORMAL_C3(STC_W3, STC_W, STC_W3, STC_W2, CPNO, INTREG_INDEX, CPREG, AVR32_V1),
-+    SYNTAX_NORMAL2(STC0_D, STC0_D, STC0_D, INTREG_UDISP_W, CPREG_D, AVR32_V1),
-+    SYNTAX_NORMAL2(STC0_W, STC0_W, STC0_W, INTREG_UDISP_W, CPREG, AVR32_V1),
-+    SYNTAX_NORMAL_CM3(STCM_D, STCM_D, STCM_D, STCM_D_PU, CPNO, INTREG, REGLIST_CPD8, AVR32_V1),
-+    SYNTAX_NORMALM3(STCM_D_PU, STCM_D, STCM_D_PU, CPNO, INTREG_PREDEC, REGLIST_CPD8, AVR32_V1),
-+    SYNTAX_NORMAL_CM3(STCM_W, STCM_W, STCM_W, STCM_W_PU, CPNO, INTREG, REGLIST_CP8, AVR32_V1),
-+    SYNTAX_NORMALM3(STCM_W_PU, STCM_W, STCM_W_PU, CPNO, INTREG_PREDEC, REGLIST_CP8, AVR32_V1),
-+    SYNTAX_NORMAL2(STCOND, STCOND, STCOND, INTREG_SDISP, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL2(STDSP, STDSP, STDSP, SP_UDISP_W, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL_C3(STHH_W2, STHH_W, STHH_W2, STHH_W1, INTREG_INDEX, INTREG_HSEL, INTREG_HSEL, AVR32_V1),
-+    SYNTAX_NORMAL3(STHH_W1, STHH_W, STHH_W1, INTREG_UDISP_W, INTREG_HSEL, INTREG_HSEL, AVR32_V1),
-+    SYNTAX_NORMAL_CM2(STM, STM, STM, STM_PU, INTREG, REGLIST16, AVR32_V1),
-+    SYNTAX_NORMALM2(STM_PU, STM, STM_PU, INTREG_PREDEC, REGLIST16, AVR32_V1),
-+    SYNTAX_NORMAL_CM2(STMTS, STMTS, STMTS, STMTS_PU, INTREG, REGLIST16, AVR32_V1),
-+    SYNTAX_NORMALM2(STMTS_PU, STMTS, STMTS_PU, INTREG_PREDEC, REGLIST16, AVR32_V1),
-+    SYNTAX_NORMAL2(STSWP_H, STSWP_H, STSWP_H, INTREG_SDISP_H, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL2(STSWP_W, STSWP_W, STSWP_W, INTREG_SDISP_W, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL_C2(SUB1, SUB, SUB1, SUB2, INTREG, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL_C3(SUB2, SUB, SUB2, SUB5, INTREG, INTREG, INTREG_LSL, AVR32_V1),
-+    SYNTAX_NORMAL_C3(SUB5, SUB, SUB5, SUB3_SP, INTREG, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL_C2(SUB3_SP, SUB, SUB3_SP, SUB3, SP, SIGNED_CONST_W, AVR32_V1),
-+    SYNTAX_NORMAL_C2(SUB3, SUB, SUB3, SUB4, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL2(SUB4, SUB, SUB4, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL_C2(SUBEQ, SUBEQ, SUBEQ, SUB2EQ, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL_C2(SUBNE, SUBNE, SUBNE, SUB2NE, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL_C2(SUBCC, SUBCC, SUBCC, SUB2CC, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL_C2(SUBCS, SUBCS, SUBCS, SUB2CS, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL_C2(SUBGE, SUBGE, SUBGE, SUB2GE, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL_C2(SUBLT, SUBLT, SUBLT, SUB2LT, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL_C2(SUBMI, SUBMI, SUBMI, SUB2MI, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL_C2(SUBPL, SUBPL, SUBPL, SUB2PL, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL_C2(SUBLS, SUBLS, SUBLS, SUB2LS, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL_C2(SUBGT, SUBGT, SUBGT, SUB2GT, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL_C2(SUBLE, SUBLE, SUBLE, SUB2LE, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL_C2(SUBHI, SUBHI, SUBHI, SUB2HI, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL_C2(SUBVS, SUBVS, SUBVS, SUB2VS, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL_C2(SUBVC, SUBVC, SUBVC, SUB2VC, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL_C2(SUBQS, SUBQS, SUBQS, SUB2QS, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL_C2(SUBAL, SUBAL, SUBAL, SUB2AL, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL_C2(SUBHS, SUBHS, SUBCC, SUB2CC, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL_C2(SUBLO, SUBLO, SUBCS, SUB2CS, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL2(SUBFEQ, SUBFEQ, SUBFEQ, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL2(SUBFNE, SUBFNE, SUBFNE, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL2(SUBFCC, SUBFCC, SUBFCC, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL2(SUBFCS, SUBFCS, SUBFCS, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL2(SUBFGE, SUBFGE, SUBFGE, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL2(SUBFLT, SUBFLT, SUBFLT, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL2(SUBFMI, SUBFMI, SUBFMI, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL2(SUBFPL, SUBFPL, SUBFPL, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL2(SUBFLS, SUBFLS, SUBFLS, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL2(SUBFGT, SUBFGT, SUBFGT, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL2(SUBFLE, SUBFLE, SUBFLE, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL2(SUBFHI, SUBFHI, SUBFHI, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL2(SUBFVS, SUBFVS, SUBFVS, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL2(SUBFVC, SUBFVC, SUBFVC, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL2(SUBFQS, SUBFQS, SUBFQS, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL2(SUBFAL, SUBFAL, SUBFAL, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL2(SUBFHS, SUBFHS, SUBFCC, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL2(SUBFLO, SUBFLO, SUBFCS, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL3(SUBHH_W, SUBHH_W, SUBHH_W, INTREG, INTREG_HSEL, INTREG_HSEL, AVR32_DSP),
-+    SYNTAX_NORMAL1(SWAP_B, SWAP_B, SWAP_B, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL1(SWAP_BH, SWAP_BH, SWAP_BH, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL1(SWAP_H, SWAP_H, SWAP_H, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL1(SYNC, SYNC, SYNC, UNSIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL0(TLBR, TLBR, TLBR, AVR32_V1),
-+    SYNTAX_NORMAL0(TLBS, TLBS, TLBS, AVR32_V1),
-+    SYNTAX_NORMAL0(TLBW, TLBW, TLBW, AVR32_V1),
-+    SYNTAX_NORMAL1(TNBZ, TNBZ, TNBZ, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL2(TST, TST, TST, INTREG, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL3(XCHG, XCHG, XCHG, INTREG, INTREG, INTREG, AVR32_V1),
-+    SYNTAX_NORMAL2(MEMC, MEMC, MEMC, SIGNED_CONST_W, UNSIGNED_NUMBER, AVR32_RMW),
-+    SYNTAX_NORMAL2(MEMS, MEMS, MEMS, SIGNED_CONST_W, UNSIGNED_NUMBER, AVR32_RMW),
-+    SYNTAX_NORMAL2(MEMT, MEMT, MEMT, SIGNED_CONST_W, UNSIGNED_NUMBER, AVR32_RMW),
-+  SYNTAX_NORMAL4 (FMAC_S,  FMAC_S,  FMAC_S,  INTREG, INTREG, INTREG, INTREG,
-+                  AVR32_V3FP),
-+  SYNTAX_NORMAL4 (FNMAC_S, FNMAC_S, FNMAC_S, INTREG, INTREG, INTREG, INTREG, 
-+                  AVR32_V3FP),
-+  SYNTAX_NORMAL4 (FMSC_S,  FMSC_S,  FMSC_S,  INTREG, INTREG, INTREG, INTREG, 
-+                  AVR32_V3FP),
-+  SYNTAX_NORMAL4 (FNMSC_S, FNMSC_S, FNMSC_S, INTREG, INTREG, INTREG, INTREG, 
-+                  AVR32_V3FP),
-+  SYNTAX_NORMAL3 (FMUL_S,  FMUL_S,  FMUL_S,  INTREG, INTREG, INTREG, AVR32_V3FP),
-+  SYNTAX_NORMAL3 (FNMUL_S, FNMUL_S, FNMUL_S, INTREG, INTREG, INTREG, AVR32_V3FP),
-+  SYNTAX_NORMAL3 (FADD_S,  FADD_S,  FADD_S,  INTREG, INTREG, INTREG, AVR32_V3FP),
-+  SYNTAX_NORMAL3 (FSUB_S,  FSUB_S,  FSUB_S,  INTREG, INTREG, INTREG, AVR32_V3FP),
-+  SYNTAX_NORMAL2 (FCASTRS_SW, FCASTRS_SW, FCASTRS_SW, INTREG, INTREG, AVR32_V3FP),
-+  SYNTAX_NORMAL2 (FCASTRS_UW, FCASTRS_UW, FCASTRS_UW, INTREG, INTREG, AVR32_V3FP),
-+  SYNTAX_NORMAL2 (FCASTSW_S,  FCASTSW_S,  FCASTSW_S,  INTREG, INTREG, AVR32_V3FP),
-+  SYNTAX_NORMAL2 (FCASTUW_S,  FCASTUW_S,  FCASTUW_S,  INTREG, INTREG, AVR32_V3FP),
-+  SYNTAX_NORMAL2 (FCMP_S, FCMP_S, FCMP_S, INTREG, INTREG, AVR32_V3FP),
-+  SYNTAX_NORMAL1 (FCHK_S, FCHK_S, FCHK_S, INTREG, AVR32_V3FP),
-+  SYNTAX_NORMAL2 (FRCPA_S,   FRCPA_S,   FRCPA_S,   INTREG, INTREG, AVR32_V3FP),
-+  SYNTAX_NORMAL2 (FRSQRTA_S, FRSQRTA_S, FRSQRTA_S, INTREG, INTREG, AVR32_V3FP),
-+    {
-+      AVR32_SYNTAX_LDA_W,
-+      AVR32_V1, NULL, AVR32_PARSER_LDA,
-+      { NULL }, NULL,
-+      2,
-+      {
-+	AVR32_OPERAND_INTREG,
-+	AVR32_OPERAND_SIGNED_CONST,
-+      },
-+    },
-+    {
-+      AVR32_SYNTAX_CALL,
-+      AVR32_V1, NULL, AVR32_PARSER_CALL,
-+      { NULL }, NULL,
-+      1,
-+      {
-+	AVR32_OPERAND_JMPLABEL,
-+      },
-+    },
-+    {
-+      AVR32_SYNTAX_PICOSVMAC0,
-+      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOSVMAC], AVR32_PARSER_ALIAS,
-+      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOSVMAC0] },
-+      &avr32_syntax_table[AVR32_SYNTAX_PICOSVMAC1], 4,
-+      {
-+	AVR32_OPERAND_PICO_OUT0,
-+	AVR32_OPERAND_PICO_IN,
-+	AVR32_OPERAND_PICO_IN,
-+	AVR32_OPERAND_PICO_IN,
-+      },
-+    },
-+    {
-+      AVR32_SYNTAX_PICOSVMAC1,
-+      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOSVMAC], AVR32_PARSER_ALIAS,
-+      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOSVMAC1] },
-+      &avr32_syntax_table[AVR32_SYNTAX_PICOSVMAC2], 4,
-+      {
-+	AVR32_OPERAND_PICO_OUT1,
-+	AVR32_OPERAND_PICO_IN,
-+	AVR32_OPERAND_PICO_IN,
-+	AVR32_OPERAND_PICO_IN,
-+      },
-+    },
-+    {
-+      AVR32_SYNTAX_PICOSVMAC2,
-+      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOSVMAC], AVR32_PARSER_ALIAS,
-+      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOSVMAC2] },
-+      &avr32_syntax_table[AVR32_SYNTAX_PICOSVMAC3], 4,
-+      {
-+	AVR32_OPERAND_PICO_OUT2,
-+	AVR32_OPERAND_PICO_IN,
-+	AVR32_OPERAND_PICO_IN,
-+	AVR32_OPERAND_PICO_IN,
-+      },
-+    },
-+    {
-+      AVR32_SYNTAX_PICOSVMAC3,
-+      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOSVMAC], AVR32_PARSER_ALIAS,
-+      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOSVMAC3] },
-+      NULL, 4,
-+      {
-+	AVR32_OPERAND_PICO_OUT3,
-+	AVR32_OPERAND_PICO_IN,
-+	AVR32_OPERAND_PICO_IN,
-+	AVR32_OPERAND_PICO_IN,
-+      },
-+    },
-+    {
-+      AVR32_SYNTAX_PICOSVMUL0,
-+      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOSVMUL], AVR32_PARSER_ALIAS,
-+      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOSVMUL0] },
-+      &avr32_syntax_table[AVR32_SYNTAX_PICOSVMUL1], 4,
-+      {
-+	AVR32_OPERAND_PICO_OUT0,
-+	AVR32_OPERAND_PICO_IN,
-+	AVR32_OPERAND_PICO_IN,
-+	AVR32_OPERAND_PICO_IN,
-+      },
-+    },
-+    {
-+      AVR32_SYNTAX_PICOSVMUL1,
-+      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOSVMUL], AVR32_PARSER_ALIAS,
-+      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOSVMUL1] },
-+      &avr32_syntax_table[AVR32_SYNTAX_PICOSVMUL2], 4,
-+      {
-+	AVR32_OPERAND_PICO_OUT1,
-+	AVR32_OPERAND_PICO_IN,
-+	AVR32_OPERAND_PICO_IN,
-+	AVR32_OPERAND_PICO_IN,
-+      },
-+    },
-+    {
-+      AVR32_SYNTAX_PICOSVMUL2,
-+      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOSVMUL], AVR32_PARSER_ALIAS,
-+      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOSVMUL2] },
-+      &avr32_syntax_table[AVR32_SYNTAX_PICOSVMUL3], 4,
-+      {
-+	AVR32_OPERAND_PICO_OUT2,
-+	AVR32_OPERAND_PICO_IN,
-+	AVR32_OPERAND_PICO_IN,
-+	AVR32_OPERAND_PICO_IN,
-+      },
-+    },
-+    {
-+      AVR32_SYNTAX_PICOSVMUL3,
-+      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOSVMUL], AVR32_PARSER_ALIAS,
-+      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOSVMUL3] },
-+      NULL, 4,
-+      {
-+	AVR32_OPERAND_PICO_OUT3,
-+	AVR32_OPERAND_PICO_IN,
-+	AVR32_OPERAND_PICO_IN,
-+	AVR32_OPERAND_PICO_IN,
-+      },
-+    },
-+    {
-+      AVR32_SYNTAX_PICOVMAC0,
-+      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOVMAC], AVR32_PARSER_ALIAS,
-+      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOVMAC0] },
-+      &avr32_syntax_table[AVR32_SYNTAX_PICOVMAC1], 4,
-+      {
-+	AVR32_OPERAND_PICO_OUT0,
-+	AVR32_OPERAND_PICO_IN,
-+	AVR32_OPERAND_PICO_IN,
-+	AVR32_OPERAND_PICO_IN,
-+      },
-+    },
-+    {
-+      AVR32_SYNTAX_PICOVMAC1,
-+      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOVMAC], AVR32_PARSER_ALIAS,
-+      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOVMAC1] },
-+      &avr32_syntax_table[AVR32_SYNTAX_PICOVMAC2], 4,
-+      {
-+	AVR32_OPERAND_PICO_OUT1,
-+	AVR32_OPERAND_PICO_IN,
-+	AVR32_OPERAND_PICO_IN,
-+	AVR32_OPERAND_PICO_IN,
-+      },
-+    },
-+    {
-+      AVR32_SYNTAX_PICOVMAC2,
-+      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOVMAC], AVR32_PARSER_ALIAS,
-+      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOVMAC2] },
-+      &avr32_syntax_table[AVR32_SYNTAX_PICOVMAC3], 4,
-+      {
-+	AVR32_OPERAND_PICO_OUT2,
-+	AVR32_OPERAND_PICO_IN,
-+	AVR32_OPERAND_PICO_IN,
-+	AVR32_OPERAND_PICO_IN,
-+      },
-+    },
-+    {
-+      AVR32_SYNTAX_PICOVMAC3,
-+      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOVMAC], AVR32_PARSER_ALIAS,
-+      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOVMAC3] },
-+      NULL, 4,
-+      {
-+	AVR32_OPERAND_PICO_OUT3,
-+	AVR32_OPERAND_PICO_IN,
-+	AVR32_OPERAND_PICO_IN,
-+	AVR32_OPERAND_PICO_IN,
-+      },
-+    },
-+    {
-+      AVR32_SYNTAX_PICOVMUL0,
-+      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOVMUL], AVR32_PARSER_ALIAS,
-+      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOVMUL0] },
-+      &avr32_syntax_table[AVR32_SYNTAX_PICOVMUL1], 4,
-+      {
-+	AVR32_OPERAND_PICO_OUT0,
-+	AVR32_OPERAND_PICO_IN,
-+	AVR32_OPERAND_PICO_IN,
-+	AVR32_OPERAND_PICO_IN,
-+      },
-+    },
-+    {
-+      AVR32_SYNTAX_PICOVMUL1,
-+      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOVMUL], AVR32_PARSER_ALIAS,
-+      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOVMUL1] },
-+      &avr32_syntax_table[AVR32_SYNTAX_PICOVMUL2], 4,
-+      {
-+	AVR32_OPERAND_PICO_OUT1,
-+	AVR32_OPERAND_PICO_IN,
-+	AVR32_OPERAND_PICO_IN,
-+	AVR32_OPERAND_PICO_IN,
-+      },
-+    },
-+    {
-+      AVR32_SYNTAX_PICOVMUL2,
-+      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOVMUL], AVR32_PARSER_ALIAS,
-+      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOVMUL2] },
-+      &avr32_syntax_table[AVR32_SYNTAX_PICOVMUL3], 4,
-+      {
-+	AVR32_OPERAND_PICO_OUT2,
-+	AVR32_OPERAND_PICO_IN,
-+	AVR32_OPERAND_PICO_IN,
-+	AVR32_OPERAND_PICO_IN,
-+      },
-+    },
-+    {
-+      AVR32_SYNTAX_PICOVMUL3,
-+      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOVMUL], AVR32_PARSER_ALIAS,
-+      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOVMUL3] },
-+      NULL, 4,
-+      {
-+	AVR32_OPERAND_PICO_OUT3,
-+	AVR32_OPERAND_PICO_IN,
-+	AVR32_OPERAND_PICO_IN,
-+	AVR32_OPERAND_PICO_IN,
-+      },
-+    },
-+    {
-+      AVR32_SYNTAX_PICOLD_D2,
-+      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOLD_D], AVR32_PARSER_ALIAS,
-+      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOLD_D2] },
-+      &avr32_syntax_table[AVR32_SYNTAX_PICOLD_D3], 2,
-+      {
-+	AVR32_OPERAND_PICO_REG_D,
-+	AVR32_OPERAND_INTREG_PREDEC,
-+      },
-+    },
-+    {
-+      AVR32_SYNTAX_PICOLD_D3,
-+      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOLD_D], AVR32_PARSER_ALIAS,
-+      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOLD_D3] },
-+      &avr32_syntax_table[AVR32_SYNTAX_PICOLD_D1], 2,
-+      {
-+	AVR32_OPERAND_PICO_REG_D,
-+	AVR32_OPERAND_INTREG_INDEX,
-+      },
-+    },
-+    {
-+      AVR32_SYNTAX_PICOLD_D1,
-+      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOLD_D], AVR32_PARSER_ALIAS,
-+      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOLD_D1] },
-+      NULL, 2,
-+      {
-+	AVR32_OPERAND_PICO_REG_D,
-+	AVR32_OPERAND_INTREG_UDISP_W,
-+      },
-+    },
-+    {
-+      AVR32_SYNTAX_PICOLD_W2,
-+      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOLD_W], AVR32_PARSER_ALIAS,
-+      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOLD_W2] },
-+      &avr32_syntax_table[AVR32_SYNTAX_PICOLD_W3], 2,
-+      {
-+	AVR32_OPERAND_PICO_REG_W,
-+	AVR32_OPERAND_INTREG_PREDEC,
-+      },
-+    },
-+    {
-+      AVR32_SYNTAX_PICOLD_W3,
-+      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOLD_W], AVR32_PARSER_ALIAS,
-+      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOLD_W3] },
-+      &avr32_syntax_table[AVR32_SYNTAX_PICOLD_W1], 2,
-+      {
-+	AVR32_OPERAND_PICO_REG_W,
-+	AVR32_OPERAND_INTREG_INDEX,
-+      },
-+    },
-+    {
-+      AVR32_SYNTAX_PICOLD_W1,
-+      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOLD_W], AVR32_PARSER_ALIAS,
-+      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOLD_W1] },
-+      NULL, 2,
-+      {
-+	AVR32_OPERAND_PICO_REG_W,
-+	AVR32_OPERAND_INTREG_UDISP_W,
-+      },
-+    },
-+    {
-+      AVR32_SYNTAX_PICOLDM_D,
-+      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOLDM_D], AVR32_PARSER_ALIAS,
-+      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOLDM_D] },
-+      &avr32_syntax_table[AVR32_SYNTAX_PICOLDM_D_PU], -2,
-+      {
-+	AVR32_OPERAND_INTREG,
-+	AVR32_OPERAND_PICO_REGLIST_D,
-+      },
-+    },
-+    {
-+      AVR32_SYNTAX_PICOLDM_D_PU,
-+      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOLDM_D], AVR32_PARSER_ALIAS,
-+      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOLDM_D_PU] },
-+      NULL, -2,
-+      {
-+	AVR32_OPERAND_INTREG_POSTINC,
-+	AVR32_OPERAND_PICO_REGLIST_D,
-+      },
-+    },
-+    {
-+      AVR32_SYNTAX_PICOLDM_W,
-+      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOLDM_W], AVR32_PARSER_ALIAS,
-+      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOLDM_W] },
-+      &avr32_syntax_table[AVR32_SYNTAX_PICOLDM_W_PU], -2,
-+      {
-+	AVR32_OPERAND_INTREG,
-+	AVR32_OPERAND_PICO_REGLIST_W,
-+      },
-+    },
-+    {
-+      AVR32_SYNTAX_PICOLDM_W_PU,
-+      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOLDM_W], AVR32_PARSER_ALIAS,
-+      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOLDM_W_PU] },
-+      NULL, -2,
-+      {
-+	AVR32_OPERAND_INTREG_POSTINC,
-+	AVR32_OPERAND_PICO_REGLIST_W,
-+      },
-+    },
-+    {
-+      AVR32_SYNTAX_PICOMV_D1,
-+      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOMV_D], AVR32_PARSER_ALIAS,
-+      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOMV_D1] },
-+      &avr32_syntax_table[AVR32_SYNTAX_PICOMV_D2], 2,
-+      {
-+	AVR32_OPERAND_DWREG,
-+	AVR32_OPERAND_PICO_REG_D,
-+      },
-+    },
-+    {
-+      AVR32_SYNTAX_PICOMV_D2,
-+      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOMV_D], AVR32_PARSER_ALIAS,
-+      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOMV_D2] },
-+      NULL, 2,
-+      {
-+	AVR32_OPERAND_PICO_REG_D,
-+	AVR32_OPERAND_DWREG,
-+      },
-+    },
-+    {
-+      AVR32_SYNTAX_PICOMV_W1,
-+      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOMV_W], AVR32_PARSER_ALIAS,
-+      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOMV_W1] },
-+      &avr32_syntax_table[AVR32_SYNTAX_PICOMV_W2], 2,
-+      {
-+	AVR32_OPERAND_INTREG,
-+	AVR32_OPERAND_PICO_REG_W,
-+      },
-+    },
-+    {
-+      AVR32_SYNTAX_PICOMV_W2,
-+      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOMV_W], AVR32_PARSER_ALIAS,
-+      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOMV_W2] },
-+      NULL, 2,
-+      {
-+	AVR32_OPERAND_PICO_REG_W,
-+	AVR32_OPERAND_INTREG,
-+      },
-+    },
-+    {
-+      AVR32_SYNTAX_PICOST_D2,
-+      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOST_D], AVR32_PARSER_ALIAS,
-+      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOST_D2] },
-+      &avr32_syntax_table[AVR32_SYNTAX_PICOST_D3], 2,
-+      {
-+	AVR32_OPERAND_INTREG_POSTINC,
-+	AVR32_OPERAND_PICO_REG_D,
-+      },
-+    },
-+    {
-+      AVR32_SYNTAX_PICOST_D3,
-+      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOST_D], AVR32_PARSER_ALIAS,
-+      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOST_D3] },
-+      &avr32_syntax_table[AVR32_SYNTAX_PICOST_D1], 2,
-+      {
-+	AVR32_OPERAND_INTREG_INDEX,
-+	AVR32_OPERAND_PICO_REG_D,
-+      },
-+    },
-+    {
-+      AVR32_SYNTAX_PICOST_D1,
-+      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOST_D], AVR32_PARSER_ALIAS,
-+      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOST_D1] },
-+      NULL, 2,
-+      {
-+	AVR32_OPERAND_INTREG_UDISP_W,
-+	AVR32_OPERAND_PICO_REG_D,
-+      },
-+    },
-+    {
-+      AVR32_SYNTAX_PICOST_W2,
-+      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOST_W], AVR32_PARSER_ALIAS,
-+      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOST_W2] },
-+      &avr32_syntax_table[AVR32_SYNTAX_PICOST_W3], 2,
-+      {
-+	AVR32_OPERAND_INTREG_POSTINC,
-+	AVR32_OPERAND_PICO_REG_W,
-+      },
-+    },
-+    {
-+      AVR32_SYNTAX_PICOST_W3,
-+      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOST_W], AVR32_PARSER_ALIAS,
-+      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOST_W3] },
-+      &avr32_syntax_table[AVR32_SYNTAX_PICOST_W1], 2,
-+      {
-+	AVR32_OPERAND_INTREG_INDEX,
-+	AVR32_OPERAND_PICO_REG_W,
-+      },
-+    },
-+    {
-+      AVR32_SYNTAX_PICOST_W1,
-+      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOST_W], AVR32_PARSER_ALIAS,
-+      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOST_W1] },
-+      NULL, 2,
-+      {
-+	AVR32_OPERAND_INTREG_UDISP_W,
-+	AVR32_OPERAND_PICO_REG_W,
-+      },
-+    },
-+    {
-+      AVR32_SYNTAX_PICOSTM_D,
-+      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOSTM_D], AVR32_PARSER_ALIAS,
-+      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOSTM_D] },
-+      &avr32_syntax_table[AVR32_SYNTAX_PICOSTM_D_PU], -2,
-+      {
-+	AVR32_OPERAND_INTREG,
-+	AVR32_OPERAND_PICO_REGLIST_D,
-+      },
-+    },
-+    {
-+      AVR32_SYNTAX_PICOSTM_D_PU,
-+      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOSTM_D], AVR32_PARSER_ALIAS,
-+      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOSTM_D_PU] },
-+      NULL, -2,
-+      {
-+	AVR32_OPERAND_INTREG_PREDEC,
-+	AVR32_OPERAND_PICO_REGLIST_D,
-+      },
-+    },
-+    {
-+      AVR32_SYNTAX_PICOSTM_W,
-+      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOSTM_W], AVR32_PARSER_ALIAS,
-+      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOSTM_W] },
-+      &avr32_syntax_table[AVR32_SYNTAX_PICOSTM_W_PU], -2,
-+      {
-+	AVR32_OPERAND_INTREG,
-+	AVR32_OPERAND_PICO_REGLIST_W,
-+      },
-+    },
-+    {
-+      AVR32_SYNTAX_PICOSTM_W_PU,
-+      AVR32_PICO, &avr32_mnemonic_table[AVR32_MNEMONIC_PICOSTM_W], AVR32_PARSER_ALIAS,
-+      { .alias = &avr32_alias_table[AVR32_ALIAS_PICOSTM_W_PU] },
-+      NULL, -2,
-+      {
-+	AVR32_OPERAND_INTREG_PREDEC,
-+	AVR32_OPERAND_PICO_REGLIST_W,
-+      },
-+    },
-+    SYNTAX_NORMAL2(RSUBEQ, RSUBEQ, RSUBEQ, INTREG, SIGNED_CONST, AVR32_V1),
-+    SYNTAX_NORMAL2(RSUBNE, RSUBNE, RSUBNE, INTREG, SIGNED_CONST, AVR32_V2),
-+    SYNTAX_NORMAL2(RSUBCC, RSUBCC, RSUBCC, INTREG, SIGNED_CONST, AVR32_V2),
-+    SYNTAX_NORMAL2(RSUBCS, RSUBCS, RSUBCS, INTREG, SIGNED_CONST, AVR32_V2),
-+    SYNTAX_NORMAL2(RSUBGE, RSUBGE, RSUBGE, INTREG, SIGNED_CONST, AVR32_V2),
-+    SYNTAX_NORMAL2(RSUBLT, RSUBLT, RSUBLT, INTREG, SIGNED_CONST, AVR32_V2),
-+    SYNTAX_NORMAL2(RSUBMI, RSUBMI, RSUBMI, INTREG, SIGNED_CONST, AVR32_V2),
-+    SYNTAX_NORMAL2(RSUBPL, RSUBPL, RSUBPL, INTREG, SIGNED_CONST, AVR32_V2),
-+    SYNTAX_NORMAL2(RSUBLS, RSUBLS, RSUBLS, INTREG, SIGNED_CONST, AVR32_V2),
-+    SYNTAX_NORMAL2(RSUBGT, RSUBGT, RSUBGT, INTREG, SIGNED_CONST, AVR32_V2),
-+    SYNTAX_NORMAL2(RSUBLE, RSUBLE, RSUBLE, INTREG, SIGNED_CONST, AVR32_V2),
-+    SYNTAX_NORMAL2(RSUBHI, RSUBHI, RSUBHI, INTREG, SIGNED_CONST, AVR32_V2),
-+    SYNTAX_NORMAL2(RSUBVS, RSUBVS, RSUBVS, INTREG, SIGNED_CONST, AVR32_V2),
-+    SYNTAX_NORMAL2(RSUBVC, RSUBVC, RSUBVC, INTREG, SIGNED_CONST, AVR32_V2),
-+    SYNTAX_NORMAL2(RSUBQS, RSUBQS, RSUBQS, INTREG, SIGNED_CONST, AVR32_V2),
-+    SYNTAX_NORMAL2(RSUBAL, RSUBAL, RSUBAL, INTREG, SIGNED_CONST, AVR32_V2),
-+    SYNTAX_NORMAL2(RSUBHS, RSUBHS, RSUBCC, INTREG, SIGNED_CONST, AVR32_V2),
-+    SYNTAX_NORMAL2(RSUBLO, RSUBLO, RSUBCS, INTREG, SIGNED_CONST, AVR32_V2),
-+    SYNTAX_NORMAL3(ADDEQ, ADDEQ, ADDEQ, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(ADDNE, ADDNE, ADDNE, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(ADDCC, ADDCC, ADDCC, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(ADDCS, ADDCS, ADDCS, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(ADDGE, ADDGE, ADDGE, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(ADDLT, ADDLT, ADDLT, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(ADDMI, ADDMI, ADDMI, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(ADDPL, ADDPL, ADDPL, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(ADDLS, ADDLS, ADDLS, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(ADDGT, ADDGT, ADDGT, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(ADDLE, ADDLE, ADDLE, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(ADDHI, ADDHI, ADDHI, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(ADDVS, ADDVS, ADDVS, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(ADDVC, ADDVC, ADDVC, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(ADDQS, ADDQS, ADDQS, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(ADDAL, ADDAL, ADDAL, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(ADDHS, ADDHS, ADDCC, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(ADDLO, ADDLO, ADDCS, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(SUB2EQ, SUBEQ, SUB2EQ, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(SUB2NE, SUBNE, SUB2NE, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(SUB2CC, SUBCC, SUB2CC, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(SUB2CS, SUBCS, SUB2CS, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(SUB2GE, SUBGE, SUB2GE, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(SUB2LT, SUBLT, SUB2LT, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(SUB2MI, SUBMI, SUB2MI, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(SUB2PL, SUBPL, SUB2PL, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(SUB2LS, SUBLS, SUB2LS, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(SUB2GT, SUBGT, SUB2GT, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(SUB2LE, SUBLE, SUB2LE, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(SUB2HI, SUBHI, SUB2HI, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(SUB2VS, SUBVS, SUB2VS, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(SUB2VC, SUBVC, SUB2VC, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(SUB2QS, SUBQS, SUB2QS, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(SUB2AL, SUBAL, SUB2AL, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(SUB2HS, SUBHS, SUB2CC, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(SUB2LO, SUBLO, SUB2CS, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(ANDEQ, ANDEQ, ANDEQ, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(ANDNE, ANDNE, ANDNE, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(ANDCC, ANDCC, ANDCC, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(ANDCS, ANDCS, ANDCS, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(ANDGE, ANDGE, ANDGE, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(ANDLT, ANDLT, ANDLT, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(ANDMI, ANDMI, ANDMI, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(ANDPL, ANDPL, ANDPL, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(ANDLS, ANDLS, ANDLS, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(ANDGT, ANDGT, ANDGT, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(ANDLE, ANDLE, ANDLE, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(ANDHI, ANDHI, ANDHI, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(ANDVS, ANDVS, ANDVS, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(ANDVC, ANDVC, ANDVC, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(ANDQS, ANDQS, ANDQS, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(ANDAL, ANDAL, ANDAL, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(ANDHS, ANDHS, ANDCC, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(ANDLO, ANDLO, ANDCS, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(OREQ, OREQ, OREQ, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(ORNE, ORNE, ORNE, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(ORCC, ORCC, ORCC, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(ORCS, ORCS, ORCS, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(ORGE, ORGE, ORGE, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(ORLT, ORLT, ORLT, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(ORMI, ORMI, ORMI, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(ORPL, ORPL, ORPL, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(ORLS, ORLS, ORLS, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(ORGT, ORGT, ORGT, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(ORLE, ORLE, ORLE, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(ORHI, ORHI, ORHI, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(ORVS, ORVS, ORVS, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(ORVC, ORVC, ORVC, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(ORQS, ORQS, ORQS, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(ORAL, ORAL, ORAL, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(ORHS, ORHS, ORCC, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(ORLO, ORLO, ORCS, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(EOREQ, EOREQ, EOREQ, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(EORNE, EORNE, EORNE, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(EORCC, EORCC, EORCC, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(EORCS, EORCS, EORCS, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(EORGE, EORGE, EORGE, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(EORLT, EORLT, EORLT, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(EORMI, EORMI, EORMI, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(EORPL, EORPL, EORPL, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(EORLS, EORLS, EORLS, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(EORGT, EORGT, EORGT, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(EORLE, EORLE, EORLE, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(EORHI, EORHI, EORHI, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(EORVS, EORVS, EORVS, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(EORVC, EORVC, EORVC, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(EORQS, EORQS, EORQS, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(EORAL, EORAL, EORAL, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(EORHS, EORHS, EORCC, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL3(EORLO, EORLO, EORCS, INTREG, INTREG, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_WEQ, LD_WEQ, LD_WEQ, INTREG, INTREG_UDISP_W, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_WNE, LD_WNE, LD_WNE, INTREG, INTREG_UDISP_W, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_WCC, LD_WCC, LD_WCC, INTREG, INTREG_UDISP_W, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_WCS, LD_WCS, LD_WCS, INTREG, INTREG_UDISP_W, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_WGE, LD_WGE, LD_WGE, INTREG, INTREG_UDISP_W, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_WLT, LD_WLT, LD_WLT, INTREG, INTREG_UDISP_W, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_WMI, LD_WMI, LD_WMI, INTREG, INTREG_UDISP_W, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_WPL, LD_WPL, LD_WPL, INTREG, INTREG_UDISP_W, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_WLS, LD_WLS, LD_WLS, INTREG, INTREG_UDISP_W, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_WGT, LD_WGT, LD_WGT, INTREG, INTREG_UDISP_W, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_WLE, LD_WLE, LD_WLE, INTREG, INTREG_UDISP_W, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_WHI, LD_WHI, LD_WHI, INTREG, INTREG_UDISP_W, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_WVS, LD_WVS, LD_WVS, INTREG, INTREG_UDISP_W, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_WVC, LD_WVC, LD_WVC, INTREG, INTREG_UDISP_W, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_WQS, LD_WQS, LD_WQS, INTREG, INTREG_UDISP_W, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_WAL, LD_WAL, LD_WAL, INTREG, INTREG_UDISP_W, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_WHS, LD_WHS, LD_WCC, INTREG, INTREG_UDISP_W, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_WLO, LD_WLO, LD_WCS, INTREG, INTREG_UDISP_W, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_SHEQ, LD_SHEQ, LD_SHEQ, INTREG, INTREG_UDISP_H, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_SHNE, LD_SHNE, LD_SHNE, INTREG, INTREG_UDISP_H, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_SHCC, LD_SHCC, LD_SHCC, INTREG, INTREG_UDISP_H, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_SHCS, LD_SHCS, LD_SHCS, INTREG, INTREG_UDISP_H, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_SHGE, LD_SHGE, LD_SHGE, INTREG, INTREG_UDISP_H, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_SHLT, LD_SHLT, LD_SHLT, INTREG, INTREG_UDISP_H, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_SHMI, LD_SHMI, LD_SHMI, INTREG, INTREG_UDISP_H, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_SHPL, LD_SHPL, LD_SHPL, INTREG, INTREG_UDISP_H, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_SHLS, LD_SHLS, LD_SHLS, INTREG, INTREG_UDISP_H, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_SHGT, LD_SHGT, LD_SHGT, INTREG, INTREG_UDISP_H, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_SHLE, LD_SHLE, LD_SHLE, INTREG, INTREG_UDISP_H, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_SHHI, LD_SHHI, LD_SHHI, INTREG, INTREG_UDISP_H, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_SHVS, LD_SHVS, LD_SHVS, INTREG, INTREG_UDISP_H, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_SHVC, LD_SHVC, LD_SHVC, INTREG, INTREG_UDISP_H, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_SHQS, LD_SHQS, LD_SHQS, INTREG, INTREG_UDISP_H, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_SHAL, LD_SHAL, LD_SHAL, INTREG, INTREG_UDISP_H, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_SHHS, LD_SHHS, LD_SHCC, INTREG, INTREG_UDISP_H, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_SHLO, LD_SHLO, LD_SHCS, INTREG, INTREG_UDISP_H, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_UHEQ, LD_UHEQ, LD_UHEQ, INTREG, INTREG_UDISP_H, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_UHNE, LD_UHNE, LD_UHNE, INTREG, INTREG_UDISP_H, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_UHCC, LD_UHCC, LD_UHCC, INTREG, INTREG_UDISP_H, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_UHCS, LD_UHCS, LD_UHCS, INTREG, INTREG_UDISP_H, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_UHGE, LD_UHGE, LD_UHGE, INTREG, INTREG_UDISP_H, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_UHLT, LD_UHLT, LD_UHLT, INTREG, INTREG_UDISP_H, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_UHMI, LD_UHMI, LD_UHMI, INTREG, INTREG_UDISP_H, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_UHPL, LD_UHPL, LD_UHPL, INTREG, INTREG_UDISP_H, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_UHLS, LD_UHLS, LD_UHLS, INTREG, INTREG_UDISP_H, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_UHGT, LD_UHGT, LD_UHGT, INTREG, INTREG_UDISP_H, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_UHLE, LD_UHLE, LD_UHLE, INTREG, INTREG_UDISP_H, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_UHHI, LD_UHHI, LD_UHHI, INTREG, INTREG_UDISP_H, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_UHVS, LD_UHVS, LD_UHVS, INTREG, INTREG_UDISP_H, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_UHVC, LD_UHVC, LD_UHVC, INTREG, INTREG_UDISP_H, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_UHQS, LD_UHQS, LD_UHQS, INTREG, INTREG_UDISP_H, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_UHAL, LD_UHAL, LD_UHAL, INTREG, INTREG_UDISP_H, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_UHHS, LD_UHHS, LD_UHCC, INTREG, INTREG_UDISP_H, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_UHLO, LD_UHLO, LD_UHCS, INTREG, INTREG_UDISP_H, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_SBEQ, LD_SBEQ, LD_SBEQ, INTREG, INTREG_UDISP, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_SBNE, LD_SBNE, LD_SBNE, INTREG, INTREG_UDISP, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_SBCC, LD_SBCC, LD_SBCC, INTREG, INTREG_UDISP, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_SBCS, LD_SBCS, LD_SBCS, INTREG, INTREG_UDISP, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_SBGE, LD_SBGE, LD_SBGE, INTREG, INTREG_UDISP, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_SBLT, LD_SBLT, LD_SBLT, INTREG, INTREG_UDISP, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_SBMI, LD_SBMI, LD_SBMI, INTREG, INTREG_UDISP, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_SBPL, LD_SBPL, LD_SBPL, INTREG, INTREG_UDISP, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_SBLS, LD_SBLS, LD_SBLS, INTREG, INTREG_UDISP, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_SBGT, LD_SBGT, LD_SBGT, INTREG, INTREG_UDISP, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_SBLE, LD_SBLE, LD_SBLE, INTREG, INTREG_UDISP, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_SBHI, LD_SBHI, LD_SBHI, INTREG, INTREG_UDISP, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_SBVS, LD_SBVS, LD_SBVS, INTREG, INTREG_UDISP, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_SBVC, LD_SBVC, LD_SBVC, INTREG, INTREG_UDISP, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_SBQS, LD_SBQS, LD_SBQS, INTREG, INTREG_UDISP, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_SBAL, LD_SBAL, LD_SBAL, INTREG, INTREG_UDISP, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_SBHS, LD_SBHS, LD_SBCC, INTREG, INTREG_UDISP, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_SBLO, LD_SBLO, LD_SBCS, INTREG, INTREG_UDISP, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_UBEQ, LD_UBEQ, LD_UBEQ, INTREG, INTREG_UDISP, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_UBNE, LD_UBNE, LD_UBNE, INTREG, INTREG_UDISP, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_UBCC, LD_UBCC, LD_UBCC, INTREG, INTREG_UDISP, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_UBCS, LD_UBCS, LD_UBCS, INTREG, INTREG_UDISP, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_UBGE, LD_UBGE, LD_UBGE, INTREG, INTREG_UDISP, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_UBLT, LD_UBLT, LD_UBLT, INTREG, INTREG_UDISP, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_UBMI, LD_UBMI, LD_UBMI, INTREG, INTREG_UDISP, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_UBPL, LD_UBPL, LD_UBPL, INTREG, INTREG_UDISP, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_UBLS, LD_UBLS, LD_UBLS, INTREG, INTREG_UDISP, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_UBGT, LD_UBGT, LD_UBGT, INTREG, INTREG_UDISP, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_UBLE, LD_UBLE, LD_UBLE, INTREG, INTREG_UDISP, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_UBHI, LD_UBHI, LD_UBHI, INTREG, INTREG_UDISP, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_UBVS, LD_UBVS, LD_UBVS, INTREG, INTREG_UDISP, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_UBVC, LD_UBVC, LD_UBVC, INTREG, INTREG_UDISP, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_UBQS, LD_UBQS, LD_UBQS, INTREG, INTREG_UDISP, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_UBAL, LD_UBAL, LD_UBAL, INTREG, INTREG_UDISP, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_UBHS, LD_UBHS, LD_UBCC, INTREG, INTREG_UDISP, AVR32_V2),
-+    SYNTAX_NORMAL2(LD_UBLO, LD_UBLO, LD_UBCS, INTREG, INTREG_UDISP, AVR32_V2),
-+    SYNTAX_NORMAL2(ST_WEQ, ST_WEQ, ST_WEQ, INTREG_UDISP_W, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL2(ST_WNE, ST_WNE, ST_WNE, INTREG_UDISP_W, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL2(ST_WCC, ST_WCC, ST_WCC, INTREG_UDISP_W, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL2(ST_WCS, ST_WCS, ST_WCS, INTREG_UDISP_W, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL2(ST_WGE, ST_WGE, ST_WGE, INTREG_UDISP_W, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL2(ST_WLT, ST_WLT, ST_WLT, INTREG_UDISP_W, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL2(ST_WMI, ST_WMI, ST_WMI, INTREG_UDISP_W, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL2(ST_WPL, ST_WPL, ST_WPL, INTREG_UDISP_W, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL2(ST_WLS, ST_WLS, ST_WLS, INTREG_UDISP_W, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL2(ST_WGT, ST_WGT, ST_WGT, INTREG_UDISP_W, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL2(ST_WLE, ST_WLE, ST_WLE, INTREG_UDISP_W, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL2(ST_WHI, ST_WHI, ST_WHI, INTREG_UDISP_W, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL2(ST_WVS, ST_WVS, ST_WVS, INTREG_UDISP_W, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL2(ST_WVC, ST_WVC, ST_WVC, INTREG_UDISP_W, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL2(ST_WQS, ST_WQS, ST_WQS, INTREG_UDISP_W, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL2(ST_WAL, ST_WAL, ST_WAL, INTREG_UDISP_W, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL2(ST_WHS, ST_WHS, ST_WCC, INTREG_UDISP_W, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL2(ST_WLO, ST_WLO, ST_WCS, INTREG_UDISP_W, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL2(ST_HEQ, ST_HEQ, ST_HEQ, INTREG_UDISP_H, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL2(ST_HNE, ST_HNE, ST_HNE, INTREG_UDISP_H, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL2(ST_HCC, ST_HCC, ST_HCC, INTREG_UDISP_H, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL2(ST_HCS, ST_HCS, ST_HCS, INTREG_UDISP_H, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL2(ST_HGE, ST_HGE, ST_HGE, INTREG_UDISP_H, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL2(ST_HLT, ST_HLT, ST_HLT, INTREG_UDISP_H, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL2(ST_HMI, ST_HMI, ST_HMI, INTREG_UDISP_H, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL2(ST_HPL, ST_HPL, ST_HPL, INTREG_UDISP_H, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL2(ST_HLS, ST_HLS, ST_HLS, INTREG_UDISP_H, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL2(ST_HGT, ST_HGT, ST_HGT, INTREG_UDISP_H, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL2(ST_HLE, ST_HLE, ST_HLE, INTREG_UDISP_H, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL2(ST_HHI, ST_HHI, ST_HHI, INTREG_UDISP_H, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL2(ST_HVS, ST_HVS, ST_HVS, INTREG_UDISP_H, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL2(ST_HVC, ST_HVC, ST_HVC, INTREG_UDISP_H, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL2(ST_HQS, ST_HQS, ST_HQS, INTREG_UDISP_H, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL2(ST_HAL, ST_HAL, ST_HAL, INTREG_UDISP_H, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL2(ST_HHS, ST_HHS, ST_HCC, INTREG_UDISP_H, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL2(ST_HLO, ST_HLO, ST_HCS, INTREG_UDISP_H, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL2(ST_BEQ, ST_BEQ, ST_BEQ, INTREG_UDISP, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL2(ST_BNE, ST_BNE, ST_BNE, INTREG_UDISP, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL2(ST_BCC, ST_BCC, ST_BCC, INTREG_UDISP, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL2(ST_BCS, ST_BCS, ST_BCS, INTREG_UDISP, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL2(ST_BGE, ST_BGE, ST_BGE, INTREG_UDISP, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL2(ST_BLT, ST_BLT, ST_BLT, INTREG_UDISP, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL2(ST_BMI, ST_BMI, ST_BMI, INTREG_UDISP, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL2(ST_BPL, ST_BPL, ST_BPL, INTREG_UDISP, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL2(ST_BLS, ST_BLS, ST_BLS, INTREG_UDISP, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL2(ST_BGT, ST_BGT, ST_BGT, INTREG_UDISP, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL2(ST_BLE, ST_BLE, ST_BLE, INTREG_UDISP, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL2(ST_BHI, ST_BHI, ST_BHI, INTREG_UDISP, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL2(ST_BVS, ST_BVS, ST_BVS, INTREG_UDISP, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL2(ST_BVC, ST_BVC, ST_BVC, INTREG_UDISP, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL2(ST_BQS, ST_BQS, ST_BQS, INTREG_UDISP, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL2(ST_BAL, ST_BAL, ST_BAL, INTREG_UDISP, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL2(ST_BHS, ST_BHS, ST_BCC, INTREG_UDISP, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL2(ST_BLO, ST_BLO, ST_BCS, INTREG_UDISP, INTREG, AVR32_V2),
-+    SYNTAX_NORMAL2(MOVH, MOVH, MOVH, INTREG, UNSIGNED_CONST, AVR32_V2),
-+
-+  };
-+
-+#define NORMAL_MNEMONIC(name, syntax, str)		\
-+  {							\
-+    AVR32_MNEMONIC_##name, str,				\
-+    &avr32_syntax_table[AVR32_SYNTAX_##syntax],		\
-+  }
-+#define FP_MNEMONIC(name, syntax, str)			\
-+  NORMAL_MNEMONIC(name##_S, syntax##_S, str ".s"),	\
-+  NORMAL_MNEMONIC(name##_D, syntax##_D, str ".d")
-+
-+const struct avr32_mnemonic avr32_mnemonic_table[] =
-+  {
-+    NORMAL_MNEMONIC(ABS, ABS, "abs"),
-+    NORMAL_MNEMONIC(ACALL, ACALL, "acall"),
-+    NORMAL_MNEMONIC(ACR, ACR, "acr"),
-+    NORMAL_MNEMONIC(ADC, ADC, "adc"),
-+    NORMAL_MNEMONIC(ADD, ADD1, "add"),
-+    NORMAL_MNEMONIC(ADDABS, ADDABS, "addabs"),
-+    NORMAL_MNEMONIC(ADDHH_W, ADDHH_W, "addhh.w"),
-+    NORMAL_MNEMONIC(AND, AND1, "and"),
-+    NORMAL_MNEMONIC(ANDH, ANDH, "andh"),
-+    NORMAL_MNEMONIC(ANDL, ANDL, "andl"),
-+    NORMAL_MNEMONIC(ANDN, ANDN, "andn"),
-+    NORMAL_MNEMONIC(ASR, ASR1, "asr"),
-+    NORMAL_MNEMONIC(BFEXTS, BFEXTS, "bfexts"),
-+    NORMAL_MNEMONIC(BFEXTU, BFEXTU, "bfextu"),
-+    NORMAL_MNEMONIC(BFINS, BFINS, "bfins"),
-+    NORMAL_MNEMONIC(BLD, BLD, "bld"),
-+    NORMAL_MNEMONIC(BREQ, BREQ1, "breq"),
-+    NORMAL_MNEMONIC(BRNE, BRNE1, "brne"),
-+    NORMAL_MNEMONIC(BRCC, BRCC1, "brcc"),
-+    NORMAL_MNEMONIC(BRCS, BRCS1, "brcs"),
-+    NORMAL_MNEMONIC(BRGE, BRGE1, "brge"),
-+    NORMAL_MNEMONIC(BRLT, BRLT1, "brlt"),
-+    NORMAL_MNEMONIC(BRMI, BRMI1, "brmi"),
-+    NORMAL_MNEMONIC(BRPL, BRPL1, "brpl"),
-+    NORMAL_MNEMONIC(BRHS, BRHS1, "brhs"),
-+    NORMAL_MNEMONIC(BRLO, BRLO1, "brlo"),
-+    NORMAL_MNEMONIC(BRLS, BRLS, "brls"),
-+    NORMAL_MNEMONIC(BRGT, BRGT, "brgt"),
-+    NORMAL_MNEMONIC(BRLE, BRLE, "brle"),
-+    NORMAL_MNEMONIC(BRHI, BRHI, "brhi"),
-+    NORMAL_MNEMONIC(BRVS, BRVS, "brvs"),
-+    NORMAL_MNEMONIC(BRVC, BRVC, "brvc"),
-+    NORMAL_MNEMONIC(BRQS, BRQS, "brqs"),
-+    NORMAL_MNEMONIC(BRAL, BRAL, "bral"),
-+    NORMAL_MNEMONIC(BREAKPOINT, BREAKPOINT, "breakpoint"),
-+    NORMAL_MNEMONIC(BREV, BREV, "brev"),
-+    NORMAL_MNEMONIC(BST, BST, "bst"),
-+    NORMAL_MNEMONIC(CACHE, CACHE, "cache"),
-+    NORMAL_MNEMONIC(CASTS_B, CASTS_B, "casts.b"),
-+    NORMAL_MNEMONIC(CASTS_H, CASTS_H, "casts.h"),
-+    NORMAL_MNEMONIC(CASTU_B, CASTU_B, "castu.b"),
-+    NORMAL_MNEMONIC(CASTU_H, CASTU_H, "castu.h"),
-+    NORMAL_MNEMONIC(CBR, CBR, "cbr"),
-+    NORMAL_MNEMONIC(CLZ, CLZ, "clz"),
-+    NORMAL_MNEMONIC(COM, COM, "com"),
-+    NORMAL_MNEMONIC(COP, COP, "cop"),
-+    NORMAL_MNEMONIC(CP_B, CP_B, "cp.b"),
-+    NORMAL_MNEMONIC(CP_H, CP_H, "cp.h"),
-+    NORMAL_MNEMONIC(CP_W, CP_W1, "cp.w"),
-+    NORMAL_MNEMONIC(CP, CP_W1, "cp"),
-+    NORMAL_MNEMONIC(CPC, CPC1, "cpc"),
-+    NORMAL_MNEMONIC(CSRF, CSRF, "csrf"),
-+    NORMAL_MNEMONIC(CSRFCZ, CSRFCZ, "csrfcz"),
-+    NORMAL_MNEMONIC(DIVS, DIVS, "divs"),
-+    NORMAL_MNEMONIC(DIVU, DIVU, "divu"),
-+    NORMAL_MNEMONIC(EOR, EOR1, "eor"),
-+    NORMAL_MNEMONIC(EORL, EORL, "eorl"),
-+    NORMAL_MNEMONIC(EORH, EORH, "eorh"),
-+    NORMAL_MNEMONIC(FRS, FRS, "frs"),
-+    NORMAL_MNEMONIC(SSCALL, SSCALL, "sscall"),
-+    NORMAL_MNEMONIC(RETSS, RETSS, "retss"),
-+    NORMAL_MNEMONIC(ICALL, ICALL, "icall"),
-+    NORMAL_MNEMONIC(INCJOSP, INCJOSP, "incjosp"),
-+    NORMAL_MNEMONIC(LD_D, LD_D1, "ld.d"),
-+    NORMAL_MNEMONIC(LD_SB, LD_SB2, "ld.sb"),
-+    NORMAL_MNEMONIC(LD_UB, LD_UB1, "ld.ub"),
-+    NORMAL_MNEMONIC(LD_SH, LD_SH1, "ld.sh"),
-+    NORMAL_MNEMONIC(LD_UH, LD_UH1, "ld.uh"),
-+    NORMAL_MNEMONIC(LD_W, LD_W1, "ld.w"),
-+    NORMAL_MNEMONIC(LDC_D, LDC_D3, "ldc.d"),
-+    NORMAL_MNEMONIC(LDC_W, LDC_W3, "ldc.w"),
-+    NORMAL_MNEMONIC(LDC0_D, LDC0_D, "ldc0.d"),
-+    NORMAL_MNEMONIC(LDC0_W, LDC0_W, "ldc0.w"),
-+    NORMAL_MNEMONIC(LDCM_D, LDCM_D, "ldcm.d"),
-+    NORMAL_MNEMONIC(LDCM_W, LDCM_W, "ldcm.w"),
-+    NORMAL_MNEMONIC(LDDPC, LDDPC, "lddpc"),
-+    NORMAL_MNEMONIC(LDDSP, LDDSP, "lddsp"),
-+    NORMAL_MNEMONIC(LDINS_B, LDINS_B, "ldins.b"),
-+    NORMAL_MNEMONIC(LDINS_H, LDINS_H, "ldins.h"),
-+    NORMAL_MNEMONIC(LDM, LDM, "ldm"),
-+    NORMAL_MNEMONIC(LDMTS, LDMTS, "ldmts"),
-+    NORMAL_MNEMONIC(LDSWP_SH, LDSWP_SH, "ldswp.sh"),
-+    NORMAL_MNEMONIC(LDSWP_UH, LDSWP_UH, "ldswp.uh"),
-+    NORMAL_MNEMONIC(LDSWP_W, LDSWP_W, "ldswp.w"),
-+    NORMAL_MNEMONIC(LSL, LSL1, "lsl"),
-+    NORMAL_MNEMONIC(LSR, LSR1, "lsr"),
-+    NORMAL_MNEMONIC(MAC, MAC, "mac"),
-+    NORMAL_MNEMONIC(MACHH_D, MACHH_D, "machh.d"),
-+    NORMAL_MNEMONIC(MACHH_W, MACHH_W, "machh.w"),
-+    NORMAL_MNEMONIC(MACS_D, MACS_D, "macs.d"),
-+    NORMAL_MNEMONIC(MACSATHH_W, MACSATHH_W, "macsathh.w"),
-+    NORMAL_MNEMONIC(MACU_D, MACUD, "macu.d"),
-+    NORMAL_MNEMONIC(MACWH_D, MACWH_D, "macwh.d"),
-+    NORMAL_MNEMONIC(MAX, MAX, "max"),
-+    NORMAL_MNEMONIC(MCALL, MCALL, "mcall"),
-+    NORMAL_MNEMONIC(MFDR, MFDR, "mfdr"),
-+    NORMAL_MNEMONIC(MFSR, MFSR, "mfsr"),
-+    NORMAL_MNEMONIC(MIN, MIN, "min"),
-+    NORMAL_MNEMONIC(MOV, MOV3, "mov"),
-+    NORMAL_MNEMONIC(MOVEQ, MOVEQ1, "moveq"),
-+    NORMAL_MNEMONIC(MOVNE, MOVNE1, "movne"),
-+    NORMAL_MNEMONIC(MOVCC, MOVCC1, "movcc"),
-+    NORMAL_MNEMONIC(MOVCS, MOVCS1, "movcs"),
-+    NORMAL_MNEMONIC(MOVGE, MOVGE1, "movge"),
-+    NORMAL_MNEMONIC(MOVLT, MOVLT1, "movlt"),
-+    NORMAL_MNEMONIC(MOVMI, MOVMI1, "movmi"),
-+    NORMAL_MNEMONIC(MOVPL, MOVPL1, "movpl"),
-+    NORMAL_MNEMONIC(MOVLS, MOVLS1, "movls"),
-+    NORMAL_MNEMONIC(MOVGT, MOVGT1, "movgt"),
-+    NORMAL_MNEMONIC(MOVLE, MOVLE1, "movle"),
-+    NORMAL_MNEMONIC(MOVHI, MOVHI1, "movhi"),
-+    NORMAL_MNEMONIC(MOVVS, MOVVS1, "movvs"),
-+    NORMAL_MNEMONIC(MOVVC, MOVVC1, "movvc"),
-+    NORMAL_MNEMONIC(MOVQS, MOVQS1, "movqs"),
-+    NORMAL_MNEMONIC(MOVAL, MOVAL1, "moval"),
-+    NORMAL_MNEMONIC(MOVHS, MOVHS1, "movhs"),
-+    NORMAL_MNEMONIC(MOVLO, MOVLO1, "movlo"),
-+    NORMAL_MNEMONIC(MTDR, MTDR, "mtdr"),
-+    NORMAL_MNEMONIC(MTSR, MTSR, "mtsr"),
-+    NORMAL_MNEMONIC(MUL, MUL1, "mul"),
-+    NORMAL_MNEMONIC(MULHH_W, MULHH_W, "mulhh.w"),
-+    NORMAL_MNEMONIC(MULNHH_W, MULNHH_W, "mulnhh.w"),
-+    NORMAL_MNEMONIC(MULNWH_D, MULNWH_D, "mulnwh.d"),
-+    NORMAL_MNEMONIC(MULS_D, MULSD, "muls.d"),
-+    NORMAL_MNEMONIC(MULSATHH_H, MULSATHH_H, "mulsathh.h"),
-+    NORMAL_MNEMONIC(MULSATHH_W, MULSATHH_W, "mulsathh.w"),
-+    NORMAL_MNEMONIC(MULSATRNDHH_H, MULSATRNDHH_H, "mulsatrndhh.h"),
-+    NORMAL_MNEMONIC(MULSATRNDWH_W, MULSATRNDWH_W, "mulsatrndwh.w"),
-+    NORMAL_MNEMONIC(MULSATWH_W, MULSATWH_W, "mulsatwh.w"),
-+    NORMAL_MNEMONIC(MULU_D, MULU_D, "mulu.d"),
-+    NORMAL_MNEMONIC(MULWH_D, MULWH_D, "mulwh.d"),
-+    NORMAL_MNEMONIC(MUSFR, MUSFR, "musfr"),
-+    NORMAL_MNEMONIC(MUSTR, MUSTR, "mustr"),
-+    NORMAL_MNEMONIC(MVCR_D, MVCR_D, "mvcr.d"),
-+    NORMAL_MNEMONIC(MVCR_W, MVCR_W, "mvcr.w"),
-+    NORMAL_MNEMONIC(MVRC_D, MVRC_D, "mvrc.d"),
-+    NORMAL_MNEMONIC(MVRC_W, MVRC_W, "mvrc.w"),
-+    NORMAL_MNEMONIC(NEG, NEG, "neg"),
-+    NORMAL_MNEMONIC(NOP, NOP, "nop"),
-+    NORMAL_MNEMONIC(OR, OR1, "or"),
-+    NORMAL_MNEMONIC(ORH, ORH, "orh"),
-+    NORMAL_MNEMONIC(ORL, ORL, "orl"),
-+    NORMAL_MNEMONIC(PABS_SB, PABS_SB, "pabs.sb"),
-+    NORMAL_MNEMONIC(PABS_SH, PABS_SH, "pabs.sh"),
-+    NORMAL_MNEMONIC(PACKSH_SB, PACKSH_SB, "packsh.sb"),
-+    NORMAL_MNEMONIC(PACKSH_UB, PACKSH_UB, "packsh.ub"),
-+    NORMAL_MNEMONIC(PACKW_SH, PACKW_SH, "packw.sh"),
-+    NORMAL_MNEMONIC(PADD_B, PADD_B, "padd.b"),
-+    NORMAL_MNEMONIC(PADD_H, PADD_H, "padd.h"),
-+    NORMAL_MNEMONIC(PADDH_SH, PADDH_SH, "paddh.sh"),
-+    NORMAL_MNEMONIC(PADDH_UB, PADDH_UB, "paddh.ub"),
-+    NORMAL_MNEMONIC(PADDS_SB, PADDS_SB, "padds.sb"),
-+    NORMAL_MNEMONIC(PADDS_SH, PADDS_SH, "padds.sh"),
-+    NORMAL_MNEMONIC(PADDS_UB, PADDS_UB, "padds.ub"),
-+    NORMAL_MNEMONIC(PADDS_UH, PADDS_UH, "padds.uh"),
-+    NORMAL_MNEMONIC(PADDSUB_H, PADDSUB_H, "paddsub.h"),
-+    NORMAL_MNEMONIC(PADDSUBH_SH, PADDSUBH_SH, "paddsubh.sh"),
-+    NORMAL_MNEMONIC(PADDSUBS_SH, PADDSUBS_SH, "paddsubs.sh"),
-+    NORMAL_MNEMONIC(PADDSUBS_UH, PADDSUBS_UH, "paddsubs.uh"),
-+    NORMAL_MNEMONIC(PADDX_H, PADDX_H, "paddx.h"),
-+    NORMAL_MNEMONIC(PADDXH_SH, PADDXH_SH, "paddxh.sh"),
-+    NORMAL_MNEMONIC(PADDXS_SH, PADDXS_SH, "paddxs.sh"),
-+    NORMAL_MNEMONIC(PADDXS_UH, PADDXS_UH, "paddxs.uh"),
-+    NORMAL_MNEMONIC(PASR_B, PASR_B, "pasr.b"),
-+    NORMAL_MNEMONIC(PASR_H, PASR_H, "pasr.h"),
-+    NORMAL_MNEMONIC(PAVG_SH, PAVG_SH, "pavg.sh"),
-+    NORMAL_MNEMONIC(PAVG_UB, PAVG_UB, "pavg.ub"),
-+    NORMAL_MNEMONIC(PLSL_B, PLSL_B, "plsl.b"),
-+    NORMAL_MNEMONIC(PLSL_H, PLSL_H, "plsl.h"),
-+    NORMAL_MNEMONIC(PLSR_B, PLSR_B, "plsr.b"),
-+    NORMAL_MNEMONIC(PLSR_H, PLSR_H, "plsr.h"),
-+    NORMAL_MNEMONIC(PMAX_SH, PMAX_SH, "pmax.sh"),
-+    NORMAL_MNEMONIC(PMAX_UB, PMAX_UB, "pmax.ub"),
-+    NORMAL_MNEMONIC(PMIN_SH, PMIN_SH, "pmin.sh"),
-+    NORMAL_MNEMONIC(PMIN_UB, PMIN_UB, "pmin.ub"),
-+    NORMAL_MNEMONIC(POPJC, POPJC, "popjc"),
-+    NORMAL_MNEMONIC(POPM, POPM, "popm"),
-+    NORMAL_MNEMONIC(PREF, PREF, "pref"),
-+    NORMAL_MNEMONIC(PSAD, PSAD, "psad"),
-+    NORMAL_MNEMONIC(PSUB_B, PSUB_B, "psub.b"),
-+    NORMAL_MNEMONIC(PSUB_H, PSUB_H, "psub.h"),
-+    NORMAL_MNEMONIC(PSUBADD_H, PSUBADD_H, "psubadd.h"),
-+    NORMAL_MNEMONIC(PSUBADDH_SH, PSUBADDH_SH, "psubaddh.sh"),
-+    NORMAL_MNEMONIC(PSUBADDS_SH, PSUBADDS_SH, "psubadds.sh"),
-+    NORMAL_MNEMONIC(PSUBADDS_UH, PSUBADDS_UH, "psubadds.uh"),
-+    NORMAL_MNEMONIC(PSUBH_SH, PSUBH_SH, "psubh.sh"),
-+    NORMAL_MNEMONIC(PSUBH_UB, PSUBH_UB, "psubh.ub"),
-+    NORMAL_MNEMONIC(PSUBS_SB, PSUBS_SB, "psubs.sb"),
-+    NORMAL_MNEMONIC(PSUBS_SH, PSUBS_SH, "psubs.sh"),
-+    NORMAL_MNEMONIC(PSUBS_UB, PSUBS_UB, "psubs.ub"),
-+    NORMAL_MNEMONIC(PSUBS_UH, PSUBS_UH, "psubs.uh"),
-+    NORMAL_MNEMONIC(PSUBX_H, PSUBX_H, "psubx.h"),
-+    NORMAL_MNEMONIC(PSUBXH_SH, PSUBXH_SH, "psubxh.sh"),
-+    NORMAL_MNEMONIC(PSUBXS_SH, PSUBXS_SH, "psubxs.sh"),
-+    NORMAL_MNEMONIC(PSUBXS_UH, PSUBXS_UH, "psubxs.uh"),
-+    NORMAL_MNEMONIC(PUNPCKSB_H, PUNPCKSB_H, "punpcksb.h"),
-+    NORMAL_MNEMONIC(PUNPCKUB_H, PUNPCKUB_H, "punpckub.h"),
-+    NORMAL_MNEMONIC(PUSHJC, PUSHJC, "pushjc"),
-+    NORMAL_MNEMONIC(PUSHM, PUSHM, "pushm"),
-+    NORMAL_MNEMONIC(RCALL, RCALL1, "rcall"),
-+    NORMAL_MNEMONIC(RETEQ, RETEQ, "reteq"),
-+    NORMAL_MNEMONIC(RETNE, RETNE, "retne"),
-+    NORMAL_MNEMONIC(RETCC, RETCC, "retcc"),
-+    NORMAL_MNEMONIC(RETCS, RETCS, "retcs"),
-+    NORMAL_MNEMONIC(RETGE, RETGE, "retge"),
-+    NORMAL_MNEMONIC(RETLT, RETLT, "retlt"),
-+    NORMAL_MNEMONIC(RETMI, RETMI, "retmi"),
-+    NORMAL_MNEMONIC(RETPL, RETPL, "retpl"),
-+    NORMAL_MNEMONIC(RETLS, RETLS, "retls"),
-+    NORMAL_MNEMONIC(RETGT, RETGT, "retgt"),
-+    NORMAL_MNEMONIC(RETLE, RETLE, "retle"),
-+    NORMAL_MNEMONIC(RETHI, RETHI, "rethi"),
-+    NORMAL_MNEMONIC(RETVS, RETVS, "retvs"),
-+    NORMAL_MNEMONIC(RETVC, RETVC, "retvc"),
-+    NORMAL_MNEMONIC(RETQS, RETQS, "retqs"),
-+    NORMAL_MNEMONIC(RETAL, RETAL, "retal"),
-+    NORMAL_MNEMONIC(RETHS, RETHS, "reths"),
-+    NORMAL_MNEMONIC(RETLO, RETLO, "retlo"),
-+    NORMAL_MNEMONIC(RET, RETAL, "ret"),
-+    NORMAL_MNEMONIC(RETD, RETD, "retd"),
-+    NORMAL_MNEMONIC(RETE, RETE, "rete"),
-+    NORMAL_MNEMONIC(RETJ, RETJ, "retj"),
-+    NORMAL_MNEMONIC(RETS, RETS, "rets"),
-+    NORMAL_MNEMONIC(RJMP, RJMP, "rjmp"),
-+    NORMAL_MNEMONIC(ROL, ROL, "rol"),
-+    NORMAL_MNEMONIC(ROR, ROR, "ror"),
-+    NORMAL_MNEMONIC(RSUB, RSUB1, "rsub"),
-+    NORMAL_MNEMONIC(SATADD_H, SATADD_H, "satadd.h"),
-+    NORMAL_MNEMONIC(SATADD_W, SATADD_W, "satadd.w"),
-+    NORMAL_MNEMONIC(SATRNDS, SATRNDS, "satrnds"),
-+    NORMAL_MNEMONIC(SATRNDU, SATRNDU, "satrndu"),
-+    NORMAL_MNEMONIC(SATS, SATS, "sats"),
-+    NORMAL_MNEMONIC(SATSUB_H, SATSUB_H, "satsub.h"),
-+    NORMAL_MNEMONIC(SATSUB_W, SATSUB_W1, "satsub.w"),
-+    NORMAL_MNEMONIC(SATU, SATU, "satu"),
-+    NORMAL_MNEMONIC(SBC, SBC, "sbc"),
-+    NORMAL_MNEMONIC(SBR, SBR, "sbr"),
-+    NORMAL_MNEMONIC(SCALL, SCALL, "scall"),
-+    NORMAL_MNEMONIC(SCR, SCR, "scr"),
-+    NORMAL_MNEMONIC(SLEEP, SLEEP, "sleep"),
-+    NORMAL_MNEMONIC(SREQ, SREQ, "sreq"),
-+    NORMAL_MNEMONIC(SRNE, SRNE, "srne"),
-+    NORMAL_MNEMONIC(SRCC, SRCC, "srcc"),
-+    NORMAL_MNEMONIC(SRCS, SRCS, "srcs"),
-+    NORMAL_MNEMONIC(SRGE, SRGE, "srge"),
-+    NORMAL_MNEMONIC(SRLT, SRLT, "srlt"),
-+    NORMAL_MNEMONIC(SRMI, SRMI, "srmi"),
-+    NORMAL_MNEMONIC(SRPL, SRPL, "srpl"),
-+    NORMAL_MNEMONIC(SRLS, SRLS, "srls"),
-+    NORMAL_MNEMONIC(SRGT, SRGT, "srgt"),
-+    NORMAL_MNEMONIC(SRLE, SRLE, "srle"),
-+    NORMAL_MNEMONIC(SRHI, SRHI, "srhi"),
-+    NORMAL_MNEMONIC(SRVS, SRVS, "srvs"),
-+    NORMAL_MNEMONIC(SRVC, SRVC, "srvc"),
-+    NORMAL_MNEMONIC(SRQS, SRQS, "srqs"),
-+    NORMAL_MNEMONIC(SRAL, SRAL, "sral"),
-+    NORMAL_MNEMONIC(SRHS, SRHS, "srhs"),
-+    NORMAL_MNEMONIC(SRLO, SRLO, "srlo"),
-+    NORMAL_MNEMONIC(SSRF, SSRF, "ssrf"),
-+    NORMAL_MNEMONIC(ST_B, ST_B1, "st.b"),
-+    NORMAL_MNEMONIC(ST_D, ST_D1, "st.d"),
-+    NORMAL_MNEMONIC(ST_H, ST_H1, "st.h"),
-+    NORMAL_MNEMONIC(ST_W, ST_W1, "st.w"),
-+    NORMAL_MNEMONIC(STC_D, STC_D3, "stc.d"),
-+    NORMAL_MNEMONIC(STC_W, STC_W3, "stc.w"),
-+    NORMAL_MNEMONIC(STC0_D, STC0_D, "stc0.d"),
-+    NORMAL_MNEMONIC(STC0_W, STC0_W, "stc0.w"),
-+    NORMAL_MNEMONIC(STCM_D, STCM_D, "stcm.d"),
-+    NORMAL_MNEMONIC(STCM_W, STCM_W, "stcm.w"),
-+    NORMAL_MNEMONIC(STCOND, STCOND, "stcond"),
-+    NORMAL_MNEMONIC(STDSP, STDSP, "stdsp"),
-+    NORMAL_MNEMONIC(STHH_W, STHH_W2, "sthh.w"),
-+    NORMAL_MNEMONIC(STM, STM, "stm"),
-+    NORMAL_MNEMONIC(STMTS, STMTS, "stmts"),
-+    NORMAL_MNEMONIC(STSWP_H, STSWP_H, "stswp.h"),
-+    NORMAL_MNEMONIC(STSWP_W, STSWP_W, "stswp.w"),
-+    NORMAL_MNEMONIC(SUB, SUB1, "sub"),
-+    NORMAL_MNEMONIC(SUBEQ, SUBEQ, "subeq"),
-+    NORMAL_MNEMONIC(SUBNE, SUBNE, "subne"),
-+    NORMAL_MNEMONIC(SUBCC, SUBCC, "subcc"),
-+    NORMAL_MNEMONIC(SUBCS, SUBCS, "subcs"),
-+    NORMAL_MNEMONIC(SUBGE, SUBGE, "subge"),
-+    NORMAL_MNEMONIC(SUBLT, SUBLT, "sublt"),
-+    NORMAL_MNEMONIC(SUBMI, SUBMI, "submi"),
-+    NORMAL_MNEMONIC(SUBPL, SUBPL, "subpl"),
-+    NORMAL_MNEMONIC(SUBLS, SUBLS, "subls"),
-+    NORMAL_MNEMONIC(SUBGT, SUBGT, "subgt"),
-+    NORMAL_MNEMONIC(SUBLE, SUBLE, "suble"),
-+    NORMAL_MNEMONIC(SUBHI, SUBHI, "subhi"),
-+    NORMAL_MNEMONIC(SUBVS, SUBVS, "subvs"),
-+    NORMAL_MNEMONIC(SUBVC, SUBVC, "subvc"),
-+    NORMAL_MNEMONIC(SUBQS, SUBQS, "subqs"),
-+    NORMAL_MNEMONIC(SUBAL, SUBAL, "subal"),
-+    NORMAL_MNEMONIC(SUBHS, SUBHS, "subhs"),
-+    NORMAL_MNEMONIC(SUBLO, SUBLO, "sublo"),
-+    NORMAL_MNEMONIC(SUBFEQ, SUBFEQ, "subfeq"),
-+    NORMAL_MNEMONIC(SUBFNE, SUBFNE, "subfne"),
-+    NORMAL_MNEMONIC(SUBFCC, SUBFCC, "subfcc"),
-+    NORMAL_MNEMONIC(SUBFCS, SUBFCS, "subfcs"),
-+    NORMAL_MNEMONIC(SUBFGE, SUBFGE, "subfge"),
-+    NORMAL_MNEMONIC(SUBFLT, SUBFLT, "subflt"),
-+    NORMAL_MNEMONIC(SUBFMI, SUBFMI, "subfmi"),
-+    NORMAL_MNEMONIC(SUBFPL, SUBFPL, "subfpl"),
-+    NORMAL_MNEMONIC(SUBFLS, SUBFLS, "subfls"),
-+    NORMAL_MNEMONIC(SUBFGT, SUBFGT, "subfgt"),
-+    NORMAL_MNEMONIC(SUBFLE, SUBFLE, "subfle"),
-+    NORMAL_MNEMONIC(SUBFHI, SUBFHI, "subfhi"),
-+    NORMAL_MNEMONIC(SUBFVS, SUBFVS, "subfvs"),
-+    NORMAL_MNEMONIC(SUBFVC, SUBFVC, "subfvc"),
-+    NORMAL_MNEMONIC(SUBFQS, SUBFQS, "subfqs"),
-+    NORMAL_MNEMONIC(SUBFAL, SUBFAL, "subfal"),
-+    NORMAL_MNEMONIC(SUBFHS, SUBFHS, "subfhs"),
-+    NORMAL_MNEMONIC(SUBFLO, SUBFLO, "subflo"),
-+    NORMAL_MNEMONIC(SUBHH_W, SUBHH_W, "subhh.w"),
-+    NORMAL_MNEMONIC(SWAP_B, SWAP_B, "swap.b"),
-+    NORMAL_MNEMONIC(SWAP_BH, SWAP_BH, "swap.bh"),
-+    NORMAL_MNEMONIC(SWAP_H, SWAP_H, "swap.h"),
-+    NORMAL_MNEMONIC(SYNC, SYNC, "sync"),
-+    NORMAL_MNEMONIC(TLBR, TLBR, "tlbr"),
-+    NORMAL_MNEMONIC(TLBS, TLBS, "tlbs"),
-+    NORMAL_MNEMONIC(TLBW, TLBW, "tlbw"),
-+    NORMAL_MNEMONIC(TNBZ, TNBZ, "tnbz"),
-+    NORMAL_MNEMONIC(TST, TST, "tst"),
-+    NORMAL_MNEMONIC(XCHG, XCHG, "xchg"),
-+    NORMAL_MNEMONIC(MEMC, MEMC, "memc"),
-+    NORMAL_MNEMONIC(MEMS, MEMS, "mems"),
-+    NORMAL_MNEMONIC(MEMT, MEMT, "memt"),
-+  NORMAL_MNEMONIC (FMAC_S,     FMAC_S,     "fmac.s"),
-+  NORMAL_MNEMONIC (FNMAC_S,    FNMAC_S,    "fnmac.s"),
-+  NORMAL_MNEMONIC (FMSC_S,     FMSC_S,     "fmsc.s"), 
-+  NORMAL_MNEMONIC (FNMSC_S,    FNMSC_S,    "fnmsc.s"), 
-+  NORMAL_MNEMONIC (FMUL_S,     FMUL_S,     "fmul.s"),
-+  NORMAL_MNEMONIC (FNMUL_S,    FNMUL_S,    "fnmul.s"),
-+  NORMAL_MNEMONIC (FADD_S,     FADD_S,     "fadd.s"),
-+  NORMAL_MNEMONIC (FSUB_S,     FSUB_S,     "fsub.s"),
-+  NORMAL_MNEMONIC (FCASTRS_SW, FCASTRS_SW, "fcastrs.sw"),
-+  NORMAL_MNEMONIC (FCASTRS_UW, FCASTRS_UW, "fcastrs.uw"),
-+  NORMAL_MNEMONIC (FCASTSW_S,  FCASTSW_S,  "fcastsw.s"),
-+  NORMAL_MNEMONIC (FCASTUW_S,  FCASTUW_S,  "fcastuw.s"),
-+  NORMAL_MNEMONIC (FCMP_S,     FCMP_S,     "fcmp.s"),
-+  NORMAL_MNEMONIC (FCHK_S,     FCHK_S,     "fchk.s"),
-+  NORMAL_MNEMONIC (FRCPA_S,    FRCPA_S,    "frcpa.s"),
-+  NORMAL_MNEMONIC (FRSQRTA_S,  FRSQRTA_S,  "frsqrta.s"),
-+    NORMAL_MNEMONIC(LDA_W, LDA_W, "lda.w"),
-+    NORMAL_MNEMONIC(CALL, CALL, "call"),
-+    NORMAL_MNEMONIC(PICOSVMAC, PICOSVMAC0, "picosvmac"),
-+    NORMAL_MNEMONIC(PICOSVMUL, PICOSVMUL0, "picosvmul"),
-+    NORMAL_MNEMONIC(PICOVMAC, PICOVMAC0, "picovmac"),
-+    NORMAL_MNEMONIC(PICOVMUL, PICOVMUL0, "picovmul"),
-+    NORMAL_MNEMONIC(PICOLD_D, PICOLD_D2, "picold.d"),
-+    NORMAL_MNEMONIC(PICOLD_W, PICOLD_W2, "picold.w"),
-+    NORMAL_MNEMONIC(PICOLDM_D, PICOLDM_D, "picoldm.d"),
-+    NORMAL_MNEMONIC(PICOLDM_W, PICOLDM_W, "picoldm.w"),
-+    NORMAL_MNEMONIC(PICOMV_D, PICOMV_D1, "picomv.d"),
-+    NORMAL_MNEMONIC(PICOMV_W, PICOMV_W1, "picomv.w"),
-+    NORMAL_MNEMONIC(PICOST_D, PICOST_D2, "picost.d"),
-+    NORMAL_MNEMONIC(PICOST_W, PICOST_W2, "picost.w"),
-+    NORMAL_MNEMONIC(PICOSTM_D, PICOSTM_D, "picostm.d"),
-+    NORMAL_MNEMONIC(PICOSTM_W, PICOSTM_W, "picostm.w"),
-+    NORMAL_MNEMONIC(RSUBEQ, RSUBEQ, "rsubeq"),
-+    NORMAL_MNEMONIC(RSUBNE, RSUBNE, "rsubne"),
-+    NORMAL_MNEMONIC(RSUBCC, RSUBCC, "rsubcc"),
-+    NORMAL_MNEMONIC(RSUBCS, RSUBCS, "rsubcs"),
-+    NORMAL_MNEMONIC(RSUBGE, RSUBGE, "rsubge"),
-+    NORMAL_MNEMONIC(RSUBLT, RSUBLT, "rsublt"),
-+    NORMAL_MNEMONIC(RSUBMI, RSUBMI, "rsubmi"),
-+    NORMAL_MNEMONIC(RSUBPL, RSUBPL, "rsubpl"),
-+    NORMAL_MNEMONIC(RSUBLS, RSUBLS, "rsubls"),
-+    NORMAL_MNEMONIC(RSUBGT, RSUBGT, "rsubgt"),
-+    NORMAL_MNEMONIC(RSUBLE, RSUBLE, "rsuble"),
-+    NORMAL_MNEMONIC(RSUBHI, RSUBHI, "rsubhi"),
-+    NORMAL_MNEMONIC(RSUBVS, RSUBVS, "rsubvs"),
-+    NORMAL_MNEMONIC(RSUBVC, RSUBVC, "rsubvc"),
-+    NORMAL_MNEMONIC(RSUBQS, RSUBQS, "rsubqs"),
-+    NORMAL_MNEMONIC(RSUBAL, RSUBAL, "rsubal"),
-+    NORMAL_MNEMONIC(RSUBHS, RSUBHS, "rsubhs"),
-+    NORMAL_MNEMONIC(RSUBLO, RSUBLO, "rsublo"),
-+    NORMAL_MNEMONIC(ADDEQ, ADDEQ, "addeq"),
-+    NORMAL_MNEMONIC(ADDNE, ADDNE, "addne"),
-+    NORMAL_MNEMONIC(ADDCC, ADDCC, "addcc"),
-+    NORMAL_MNEMONIC(ADDCS, ADDCS, "addcs"),
-+    NORMAL_MNEMONIC(ADDGE, ADDGE, "addge"),
-+    NORMAL_MNEMONIC(ADDLT, ADDLT, "addlt"),
-+    NORMAL_MNEMONIC(ADDMI, ADDMI, "addmi"),
-+    NORMAL_MNEMONIC(ADDPL, ADDPL, "addpl"),
-+    NORMAL_MNEMONIC(ADDLS, ADDLS, "addls"),
-+    NORMAL_MNEMONIC(ADDGT, ADDGT, "addgt"),
-+    NORMAL_MNEMONIC(ADDLE, ADDLE, "addle"),
-+    NORMAL_MNEMONIC(ADDHI, ADDHI, "addhi"),
-+    NORMAL_MNEMONIC(ADDVS, ADDVS, "addvs"),
-+    NORMAL_MNEMONIC(ADDVC, ADDVC, "addvc"),
-+    NORMAL_MNEMONIC(ADDQS, ADDQS, "addqs"),
-+    NORMAL_MNEMONIC(ADDAL, ADDAL, "addal"),
-+    NORMAL_MNEMONIC(ADDHS, ADDHS, "addhs"),
-+    NORMAL_MNEMONIC(ADDLO, ADDLO, "addlo"),
-+    NORMAL_MNEMONIC(ANDEQ, ANDEQ, "andeq"),
-+    NORMAL_MNEMONIC(ANDNE, ANDNE, "andne"),
-+    NORMAL_MNEMONIC(ANDCC, ANDCC, "andcc"),
-+    NORMAL_MNEMONIC(ANDCS, ANDCS, "andcs"),
-+    NORMAL_MNEMONIC(ANDGE, ANDGE, "andge"),
-+    NORMAL_MNEMONIC(ANDLT, ANDLT, "andlt"),
-+    NORMAL_MNEMONIC(ANDMI, ANDMI, "andmi"),
-+    NORMAL_MNEMONIC(ANDPL, ANDPL, "andpl"),
-+    NORMAL_MNEMONIC(ANDLS, ANDLS, "andls"),
-+    NORMAL_MNEMONIC(ANDGT, ANDGT, "andgt"),
-+    NORMAL_MNEMONIC(ANDLE, ANDLE, "andle"),
-+    NORMAL_MNEMONIC(ANDHI, ANDHI, "andhi"),
-+    NORMAL_MNEMONIC(ANDVS, ANDVS, "andvs"),
-+    NORMAL_MNEMONIC(ANDVC, ANDVC, "andvc"),
-+    NORMAL_MNEMONIC(ANDQS, ANDQS, "andqs"),
-+    NORMAL_MNEMONIC(ANDAL, ANDAL, "andal"),
-+    NORMAL_MNEMONIC(ANDHS, ANDHS, "andhs"),
-+    NORMAL_MNEMONIC(ANDLO, ANDLO, "andlo"),
-+    NORMAL_MNEMONIC(OREQ, OREQ, "oreq"),
-+    NORMAL_MNEMONIC(ORNE, ORNE, "orne"),
-+    NORMAL_MNEMONIC(ORCC, ORCC, "orcc"),
-+    NORMAL_MNEMONIC(ORCS, ORCS, "orcs"),
-+    NORMAL_MNEMONIC(ORGE, ORGE, "orge"),
-+    NORMAL_MNEMONIC(ORLT, ORLT, "orlt"),
-+    NORMAL_MNEMONIC(ORMI, ORMI, "ormi"),
-+    NORMAL_MNEMONIC(ORPL, ORPL, "orpl"),
-+    NORMAL_MNEMONIC(ORLS, ORLS, "orls"),
-+    NORMAL_MNEMONIC(ORGT, ORGT, "orgt"),
-+    NORMAL_MNEMONIC(ORLE, ORLE, "orle"),
-+    NORMAL_MNEMONIC(ORHI, ORHI, "orhi"),
-+    NORMAL_MNEMONIC(ORVS, ORVS, "orvs"),
-+    NORMAL_MNEMONIC(ORVC, ORVC, "orvc"),
-+    NORMAL_MNEMONIC(ORQS, ORQS, "orqs"),
-+    NORMAL_MNEMONIC(ORAL, ORAL, "oral"),
-+    NORMAL_MNEMONIC(ORHS, ORHS, "orhs"),
-+    NORMAL_MNEMONIC(ORLO, ORLO, "orlo"),
-+    NORMAL_MNEMONIC(EOREQ, EOREQ, "eoreq"),
-+    NORMAL_MNEMONIC(EORNE, EORNE, "eorne"),
-+    NORMAL_MNEMONIC(EORCC, EORCC, "eorcc"),
-+    NORMAL_MNEMONIC(EORCS, EORCS, "eorcs"),
-+    NORMAL_MNEMONIC(EORGE, EORGE, "eorge"),
-+    NORMAL_MNEMONIC(EORLT, EORLT, "eorlt"),
-+    NORMAL_MNEMONIC(EORMI, EORMI, "eormi"),
-+    NORMAL_MNEMONIC(EORPL, EORPL, "eorpl"),
-+    NORMAL_MNEMONIC(EORLS, EORLS, "eorls"),
-+    NORMAL_MNEMONIC(EORGT, EORGT, "eorgt"),
-+    NORMAL_MNEMONIC(EORLE, EORLE, "eorle"),
-+    NORMAL_MNEMONIC(EORHI, EORHI, "eorhi"),
-+    NORMAL_MNEMONIC(EORVS, EORVS, "eorvs"),
-+    NORMAL_MNEMONIC(EORVC, EORVC, "eorvc"),
-+    NORMAL_MNEMONIC(EORQS, EORQS, "eorqs"),
-+    NORMAL_MNEMONIC(EORAL, EORAL, "eoral"),
-+    NORMAL_MNEMONIC(EORHS, EORHS, "eorhs"),
-+    NORMAL_MNEMONIC(EORLO, EORLO, "eorlo"),
-+    NORMAL_MNEMONIC(LD_WEQ, LD_WEQ, "ld.weq"),
-+    NORMAL_MNEMONIC(LD_WNE, LD_WNE, "ld.wne"),
-+    NORMAL_MNEMONIC(LD_WCC, LD_WCC, "ld.wcc"),
-+    NORMAL_MNEMONIC(LD_WCS, LD_WCS, "ld.wcs"),
-+    NORMAL_MNEMONIC(LD_WGE, LD_WGE, "ld.wge"),
-+    NORMAL_MNEMONIC(LD_WLT, LD_WLT, "ld.wlt"),
-+    NORMAL_MNEMONIC(LD_WMI, LD_WMI, "ld.wmi"),
-+    NORMAL_MNEMONIC(LD_WPL, LD_WPL, "ld.wpl"),
-+    NORMAL_MNEMONIC(LD_WLS, LD_WLS, "ld.wls"),
-+    NORMAL_MNEMONIC(LD_WGT, LD_WGT, "ld.wgt"),
-+    NORMAL_MNEMONIC(LD_WLE, LD_WLE, "ld.wle"),
-+    NORMAL_MNEMONIC(LD_WHI, LD_WHI, "ld.whi"),
-+    NORMAL_MNEMONIC(LD_WVS, LD_WVS, "ld.wvs"),
-+    NORMAL_MNEMONIC(LD_WVC, LD_WVC, "ld.wvc"),
-+    NORMAL_MNEMONIC(LD_WQS, LD_WQS, "ld.wqs"),
-+    NORMAL_MNEMONIC(LD_WAL, LD_WAL, "ld.wal"),
-+    NORMAL_MNEMONIC(LD_WHS, LD_WHS, "ld.whs"),
-+    NORMAL_MNEMONIC(LD_WLO, LD_WLO, "ld.wlo"),
-+    NORMAL_MNEMONIC(LD_SHEQ, LD_SHEQ, "ld.sheq"),
-+    NORMAL_MNEMONIC(LD_SHNE, LD_SHNE, "ld.shne"),
-+    NORMAL_MNEMONIC(LD_SHCC, LD_SHCC, "ld.shcc"),
-+    NORMAL_MNEMONIC(LD_SHCS, LD_SHCS, "ld.shcs"),
-+    NORMAL_MNEMONIC(LD_SHGE, LD_SHGE, "ld.shge"),
-+    NORMAL_MNEMONIC(LD_SHLT, LD_SHLT, "ld.shlt"),
-+    NORMAL_MNEMONIC(LD_SHMI, LD_SHMI, "ld.shmi"),
-+    NORMAL_MNEMONIC(LD_SHPL, LD_SHPL, "ld.shpl"),
-+    NORMAL_MNEMONIC(LD_SHLS, LD_SHLS, "ld.shls"),
-+    NORMAL_MNEMONIC(LD_SHGT, LD_SHGT, "ld.shgt"),
-+    NORMAL_MNEMONIC(LD_SHLE, LD_SHLE, "ld.shle"),
-+    NORMAL_MNEMONIC(LD_SHHI, LD_SHHI, "ld.shhi"),
-+    NORMAL_MNEMONIC(LD_SHVS, LD_SHVS, "ld.shvs"),
-+    NORMAL_MNEMONIC(LD_SHVC, LD_SHVC, "ld.shvc"),
-+    NORMAL_MNEMONIC(LD_SHQS, LD_SHQS, "ld.shqs"),
-+    NORMAL_MNEMONIC(LD_SHAL, LD_SHAL, "ld.shal"),
-+    NORMAL_MNEMONIC(LD_SHHS, LD_SHHS, "ld.shhs"),
-+    NORMAL_MNEMONIC(LD_SHLO, LD_SHLO, "ld.shlo"),
-+    NORMAL_MNEMONIC(LD_UHEQ, LD_UHEQ, "ld.uheq"),
-+    NORMAL_MNEMONIC(LD_UHNE, LD_UHNE, "ld.uhne"),
-+    NORMAL_MNEMONIC(LD_UHCC, LD_UHCC, "ld.uhcc"),
-+    NORMAL_MNEMONIC(LD_UHCS, LD_UHCS, "ld.uhcs"),
-+    NORMAL_MNEMONIC(LD_UHGE, LD_UHGE, "ld.uhge"),
-+    NORMAL_MNEMONIC(LD_UHLT, LD_UHLT, "ld.uhlt"),
-+    NORMAL_MNEMONIC(LD_UHMI, LD_UHMI, "ld.uhmi"),
-+    NORMAL_MNEMONIC(LD_UHPL, LD_UHPL, "ld.uhpl"),
-+    NORMAL_MNEMONIC(LD_UHLS, LD_UHLS, "ld.uhls"),
-+    NORMAL_MNEMONIC(LD_UHGT, LD_UHGT, "ld.uhgt"),
-+    NORMAL_MNEMONIC(LD_UHLE, LD_UHLE, "ld.uhle"),
-+    NORMAL_MNEMONIC(LD_UHHI, LD_UHHI, "ld.uhhi"),
-+    NORMAL_MNEMONIC(LD_UHVS, LD_UHVS, "ld.uhvs"),
-+    NORMAL_MNEMONIC(LD_UHVC, LD_UHVC, "ld.uhvc"),
-+    NORMAL_MNEMONIC(LD_UHQS, LD_UHQS, "ld.uhqs"),
-+    NORMAL_MNEMONIC(LD_UHAL, LD_UHAL, "ld.uhal"),
-+    NORMAL_MNEMONIC(LD_UHHS, LD_UHHS, "ld.uhhs"),
-+    NORMAL_MNEMONIC(LD_UHLO, LD_UHLO, "ld.uhlo"),
-+    NORMAL_MNEMONIC(LD_SBEQ, LD_SBEQ, "ld.sbeq"),
-+    NORMAL_MNEMONIC(LD_SBNE, LD_SBNE, "ld.sbne"),
-+    NORMAL_MNEMONIC(LD_SBCC, LD_SBCC, "ld.sbcc"),
-+    NORMAL_MNEMONIC(LD_SBCS, LD_SBCS, "ld.sbcs"),
-+    NORMAL_MNEMONIC(LD_SBGE, LD_SBGE, "ld.sbge"),
-+    NORMAL_MNEMONIC(LD_SBLT, LD_SBLT, "ld.sblt"),
-+    NORMAL_MNEMONIC(LD_SBMI, LD_SBMI, "ld.sbmi"),
-+    NORMAL_MNEMONIC(LD_SBPL, LD_SBPL, "ld.sbpl"),
-+    NORMAL_MNEMONIC(LD_SBLS, LD_SBLS, "ld.sbls"),
-+    NORMAL_MNEMONIC(LD_SBGT, LD_SBGT, "ld.sbgt"),
-+    NORMAL_MNEMONIC(LD_SBLE, LD_SBLE, "ld.sble"),
-+    NORMAL_MNEMONIC(LD_SBHI, LD_SBHI, "ld.sbhi"),
-+    NORMAL_MNEMONIC(LD_SBVS, LD_SBVS, "ld.sbvs"),
-+    NORMAL_MNEMONIC(LD_SBVC, LD_SBVC, "ld.sbvc"),
-+    NORMAL_MNEMONIC(LD_SBQS, LD_SBQS, "ld.sbqs"),
-+    NORMAL_MNEMONIC(LD_SBAL, LD_SBAL, "ld.sbal"),
-+    NORMAL_MNEMONIC(LD_SBHS, LD_SBHS, "ld.sbhs"),
-+    NORMAL_MNEMONIC(LD_SBLO, LD_SBLO, "ld.sblo"),
-+    NORMAL_MNEMONIC(LD_UBEQ, LD_UBEQ, "ld.ubeq"),
-+    NORMAL_MNEMONIC(LD_UBNE, LD_UBNE, "ld.ubne"),
-+    NORMAL_MNEMONIC(LD_UBCC, LD_UBCC, "ld.ubcc"),
-+    NORMAL_MNEMONIC(LD_UBCS, LD_UBCS, "ld.ubcs"),
-+    NORMAL_MNEMONIC(LD_UBGE, LD_UBGE, "ld.ubge"),
-+    NORMAL_MNEMONIC(LD_UBLT, LD_UBLT, "ld.ublt"),
-+    NORMAL_MNEMONIC(LD_UBMI, LD_UBMI, "ld.ubmi"),
-+    NORMAL_MNEMONIC(LD_UBPL, LD_UBPL, "ld.ubpl"),
-+    NORMAL_MNEMONIC(LD_UBLS, LD_UBLS, "ld.ubls"),
-+    NORMAL_MNEMONIC(LD_UBGT, LD_UBGT, "ld.ubgt"),
-+    NORMAL_MNEMONIC(LD_UBLE, LD_UBLE, "ld.uble"),
-+    NORMAL_MNEMONIC(LD_UBHI, LD_UBHI, "ld.ubhi"),
-+    NORMAL_MNEMONIC(LD_UBVS, LD_UBVS, "ld.ubvs"),
-+    NORMAL_MNEMONIC(LD_UBVC, LD_UBVC, "ld.ubvc"),
-+    NORMAL_MNEMONIC(LD_UBQS, LD_UBQS, "ld.ubqs"),
-+    NORMAL_MNEMONIC(LD_UBAL, LD_UBAL, "ld.ubal"),
-+    NORMAL_MNEMONIC(LD_UBHS, LD_UBHS, "ld.ubhs"),
-+    NORMAL_MNEMONIC(LD_UBLO, LD_UBLO, "ld.ublo"),
-+    NORMAL_MNEMONIC(ST_WEQ, ST_WEQ, "st.weq"),
-+    NORMAL_MNEMONIC(ST_WNE, ST_WNE, "st.wne"),
-+    NORMAL_MNEMONIC(ST_WCC, ST_WCC, "st.wcc"),
-+    NORMAL_MNEMONIC(ST_WCS, ST_WCS, "st.wcs"),
-+    NORMAL_MNEMONIC(ST_WGE, ST_WGE, "st.wge"),
-+    NORMAL_MNEMONIC(ST_WLT, ST_WLT, "st.wlt"),
-+    NORMAL_MNEMONIC(ST_WMI, ST_WMI, "st.wmi"),
-+    NORMAL_MNEMONIC(ST_WPL, ST_WPL, "st.wpl"),
-+    NORMAL_MNEMONIC(ST_WLS, ST_WLS, "st.wls"),
-+    NORMAL_MNEMONIC(ST_WGT, ST_WGT, "st.wgt"),
-+    NORMAL_MNEMONIC(ST_WLE, ST_WLE, "st.wle"),
-+    NORMAL_MNEMONIC(ST_WHI, ST_WHI, "st.whi"),
-+    NORMAL_MNEMONIC(ST_WVS, ST_WVS, "st.wvs"),
-+    NORMAL_MNEMONIC(ST_WVC, ST_WVC, "st.wvc"),
-+    NORMAL_MNEMONIC(ST_WQS, ST_WQS, "st.wqs"),
-+    NORMAL_MNEMONIC(ST_WAL, ST_WAL, "st.wal"),
-+    NORMAL_MNEMONIC(ST_WHS, ST_WHS, "st.whs"),
-+    NORMAL_MNEMONIC(ST_WLO, ST_WLO, "st.wlo"),
-+    NORMAL_MNEMONIC(ST_HEQ, ST_HEQ, "st.heq"),
-+    NORMAL_MNEMONIC(ST_HNE, ST_HNE, "st.hne"),
-+    NORMAL_MNEMONIC(ST_HCC, ST_HCC, "st.hcc"),
-+    NORMAL_MNEMONIC(ST_HCS, ST_HCS, "st.hcs"),
-+    NORMAL_MNEMONIC(ST_HGE, ST_HGE, "st.hge"),
-+    NORMAL_MNEMONIC(ST_HLT, ST_HLT, "st.hlt"),
-+    NORMAL_MNEMONIC(ST_HMI, ST_HMI, "st.hmi"),
-+    NORMAL_MNEMONIC(ST_HPL, ST_HPL, "st.hpl"),
-+    NORMAL_MNEMONIC(ST_HLS, ST_HLS, "st.hls"),
-+    NORMAL_MNEMONIC(ST_HGT, ST_HGT, "st.hgt"),
-+    NORMAL_MNEMONIC(ST_HLE, ST_HLE, "st.hle"),
-+    NORMAL_MNEMONIC(ST_HHI, ST_HHI, "st.hhi"),
-+    NORMAL_MNEMONIC(ST_HVS, ST_HVS, "st.hvs"),
-+    NORMAL_MNEMONIC(ST_HVC, ST_HVC, "st.hvc"),
-+    NORMAL_MNEMONIC(ST_HQS, ST_HQS, "st.hqs"),
-+    NORMAL_MNEMONIC(ST_HAL, ST_HAL, "st.hal"),
-+    NORMAL_MNEMONIC(ST_HHS, ST_HHS, "st.hhs"),
-+    NORMAL_MNEMONIC(ST_HLO, ST_HLO, "st.hlo"),
-+    NORMAL_MNEMONIC(ST_BEQ, ST_BEQ, "st.beq"),
-+    NORMAL_MNEMONIC(ST_BNE, ST_BNE, "st.bne"),
-+    NORMAL_MNEMONIC(ST_BCC, ST_BCC, "st.bcc"),
-+    NORMAL_MNEMONIC(ST_BCS, ST_BCS, "st.bcs"),
-+    NORMAL_MNEMONIC(ST_BGE, ST_BGE, "st.bge"),
-+    NORMAL_MNEMONIC(ST_BLT, ST_BLT, "st.blt"),
-+    NORMAL_MNEMONIC(ST_BMI, ST_BMI, "st.bmi"),
-+    NORMAL_MNEMONIC(ST_BPL, ST_BPL, "st.bpl"),
-+    NORMAL_MNEMONIC(ST_BLS, ST_BLS, "st.bls"),
-+    NORMAL_MNEMONIC(ST_BGT, ST_BGT, "st.bgt"),
-+    NORMAL_MNEMONIC(ST_BLE, ST_BLE, "st.ble"),
-+    NORMAL_MNEMONIC(ST_BHI, ST_BHI, "st.bhi"),
-+    NORMAL_MNEMONIC(ST_BVS, ST_BVS, "st.bvs"),
-+    NORMAL_MNEMONIC(ST_BVC, ST_BVC, "st.bvc"),
-+    NORMAL_MNEMONIC(ST_BQS, ST_BQS, "st.bqs"),
-+    NORMAL_MNEMONIC(ST_BAL, ST_BAL, "st.bal"),
-+    NORMAL_MNEMONIC(ST_BHS, ST_BHS, "st.bhs"),
-+    NORMAL_MNEMONIC(ST_BLO, ST_BLO, "st.blo"),
-+    NORMAL_MNEMONIC(MOVH, MOVH, "movh"),
-+
-+  };
-+#undef NORMAL_MNEMONIC
-+#undef ALIAS_MNEMONIC
-+#undef FP_MNEMONIC
-diff -Nur binutils-2.21.orig/opcodes/avr32-opc.h binutils-2.21/opcodes/avr32-opc.h
---- binutils-2.21.orig/opcodes/avr32-opc.h	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.21/opcodes/avr32-opc.h	2011-08-28 14:56:23.387979564 +0200
-@@ -0,0 +1,2341 @@
-+/* Opcode tables for AVR32.
-+   Copyright 2005,2006,2007,2008,2009 Atmel Corporation.
-+
-+   Written by Haavard Skinnemoen, Atmel Norway, <hskinnemoen@atmel.com>
-+
-+   This file is part of libopcodes.
-+
-+   This program is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU General Public License as
-+   published by the Free Software Foundation; either version 2 of the
-+   License, or (at your option) any later version.
-+
-+   This program is distributed in the hope that it will be useful, but
-+   WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   General Public License for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with this program; if not, write to the Free Software
-+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+   02111-1307, USA.  */
-+
-+#include "bfd.h"
-+
-+#define AVR32_MAX_OPERANDS	8
-+#define AVR32_MAX_FIELDS	8
-+
-+#define AVR32_V1	        (1 << 1)
-+#define AVR32_SIMD		(1 << 2)
-+#define AVR32_DSP		(1 << 3)
-+#define AVR32_RMW		(1 << 4)
-+#define AVR32_V2	        (1 << 5)
-+#define AVR32_V3	        (1 << 6)
-+#define AVR32_V3FP	        (1 << 7)
-+#define AVR32_PICO		(1 << 17)
-+
-+/* Registers we commonly refer to */
-+#define AVR32_REG_R12		12
-+#define AVR32_REG_SP		13
-+#define AVR32_REG_LR		14
-+#define AVR32_REG_PC		15
-+
-+struct avr32_ifield
-+{
-+  int id;
-+  unsigned short bitsize;
-+  unsigned short shift;
-+  unsigned long mask;
-+
-+  /* If the value doesn't fit, it will be truncated with no warning */
-+  void (*insert)(const struct avr32_ifield *, void *, unsigned long);
-+  void (*extract)(const struct avr32_ifield *, void *, unsigned long *);
-+};
-+
-+struct avr32_opcode
-+{
-+  int id;
-+  int size;
-+  unsigned long value;
-+  unsigned long mask;
-+  const struct avr32_syntax *syntax;
-+  bfd_reloc_code_real_type reloc_type;
-+  unsigned int nr_fields;
-+  /* if relaxable, which field is variable, otherwise -1 */
-+  int var_field;
-+  const struct avr32_ifield *fields[AVR32_MAX_FIELDS];
-+};
-+
-+struct avr32_alias
-+{
-+  int id;
-+  const struct avr32_opcode *opc;
-+  struct {
-+    int is_opindex;
-+    unsigned long value;
-+  } operand_map[AVR32_MAX_OPERANDS];
-+};
-+
-+struct avr32_syntax
-+{
-+  int id;
-+  unsigned long isa_flags;
-+  const struct avr32_mnemonic *mnemonic;
-+  int type;
-+  union {
-+    const struct avr32_opcode *opc;
-+    const struct avr32_alias *alias;
-+  } u;
-+  const struct avr32_syntax *next;
-+  /* negative means "vararg" */
-+  int nr_operands;
-+  int operand[AVR32_MAX_OPERANDS];
-+};
-+
-+#if 0
-+#define AVR32_ALIAS_MAKE_CONST(val) ((val) | 0x80000000UL)
-+#define AVR32_ALIAS_IS_CONST(mapval) (((mapval) & 0x80000000UL) != 0)
-+#define AVR32_ALIAS_GET_CONST(mapval) ((mapval) & ~0x80000000UL)
-+#endif
-+
-+struct avr32_mnemonic
-+{
-+  int id;
-+  const char *name;
-+  const struct avr32_syntax *syntax;
-+};
-+
-+extern const struct avr32_ifield avr32_ifield_table[];
-+extern struct avr32_opcode avr32_opc_table[];
-+extern const struct avr32_syntax avr32_syntax_table[];
-+extern const struct avr32_alias avr32_alias_table[];
-+extern const struct avr32_mnemonic avr32_mnemonic_table[];
-+
-+extern void avr32_insert_simple(const struct avr32_ifield *field,
-+				void *buf, unsigned long value);
-+extern void avr32_insert_bit5c(const struct avr32_ifield *field,
-+			       void *buf, unsigned long value);
-+extern void avr32_insert_k10(const struct avr32_ifield *field,
-+			     void *buf, unsigned long value);
-+extern void avr32_insert_k21(const struct avr32_ifield *field,
-+			     void *buf, unsigned long value);
-+extern void avr32_insert_cpop(const struct avr32_ifield *field,
-+			      void *buf, unsigned long value);
-+extern void avr32_insert_k12cp(const struct avr32_ifield *field,
-+			       void *buf, unsigned long value);
-+
-+extern void avr32_extract_simple(const struct avr32_ifield *field,
-+				 void *buf, unsigned long *value);
-+extern void avr32_extract_bit5c(const struct avr32_ifield *field,
-+				void *buf, unsigned long *value);
-+extern void avr32_extract_k10(const struct avr32_ifield *field,
-+			      void *buf, unsigned long *value);
-+extern void avr32_extract_k21(const struct avr32_ifield *field,
-+			      void *buf, unsigned long *value);
-+extern void avr32_extract_cpop(const struct avr32_ifield *field,
-+			       void *buf, unsigned long *value);
-+extern void avr32_extract_k12cp(const struct avr32_ifield *field,
-+				void *buf, unsigned long *value);
-+
-+enum avr32_operand_type
-+{
-+  AVR32_OPERAND_INTREG,		/* just a register */
-+  AVR32_OPERAND_INTREG_PREDEC,	/* register with pre-decrement */
-+  AVR32_OPERAND_INTREG_POSTINC,	/* register with post-increment */
-+  AVR32_OPERAND_INTREG_LSL,	/* register with left shift */
-+  AVR32_OPERAND_INTREG_LSR,	/* register with right shift */
-+  AVR32_OPERAND_INTREG_BSEL,	/* register with byte selector */
-+  AVR32_OPERAND_INTREG_HSEL,	/* register with halfword selector */
-+  AVR32_OPERAND_INTREG_SDISP,	/* Rp[signed disp] */
-+  AVR32_OPERAND_INTREG_SDISP_H,	/* Rp[signed hword-aligned disp] */
-+  AVR32_OPERAND_INTREG_SDISP_W,	/* Rp[signed word-aligned disp] */
-+  AVR32_OPERAND_INTREG_UDISP,	/* Rp[unsigned disp] */
-+  AVR32_OPERAND_INTREG_UDISP_H,	/* Rp[unsigned hword-aligned disp] */
-+  AVR32_OPERAND_INTREG_UDISP_W, /* Rp[unsigned word-aligned disp] */
-+  AVR32_OPERAND_INTREG_INDEX,	/* Rp[Ri << sa] */
-+  AVR32_OPERAND_INTREG_XINDEX,	/* Rp[Ri:bytesel << 2] */
-+  AVR32_OPERAND_DWREG,		/* Even-numbered register */
-+  AVR32_OPERAND_PC_UDISP_W,	/* PC[unsigned word-aligned disp] or label */
-+  AVR32_OPERAND_SP,		/* Just SP */
-+  AVR32_OPERAND_SP_UDISP_W,	/* SP[unsigned word-aligned disp] */
-+  AVR32_OPERAND_CPNO,
-+  AVR32_OPERAND_CPREG,
-+  AVR32_OPERAND_CPREG_D,
-+  AVR32_OPERAND_UNSIGNED_CONST,
-+  AVR32_OPERAND_UNSIGNED_CONST_W,
-+  AVR32_OPERAND_SIGNED_CONST,
-+  AVR32_OPERAND_SIGNED_CONST_W,
-+  AVR32_OPERAND_JMPLABEL,
-+  AVR32_OPERAND_UNSIGNED_NUMBER,
-+  AVR32_OPERAND_UNSIGNED_NUMBER_W,
-+  AVR32_OPERAND_REGLIST8,
-+  AVR32_OPERAND_REGLIST9,
-+  AVR32_OPERAND_REGLIST16,
-+  AVR32_OPERAND_REGLIST_LDM,
-+  AVR32_OPERAND_REGLIST_CP8,
-+  AVR32_OPERAND_REGLIST_CPD8,
-+  AVR32_OPERAND_RETVAL,
-+  AVR32_OPERAND_MCALL,
-+  AVR32_OPERAND_JOSPINC,
-+  AVR32_OPERAND_COH,
-+  AVR32_OPERAND_PICO_REG_W,
-+  AVR32_OPERAND_PICO_REG_D,
-+  AVR32_OPERAND_PICO_REGLIST_W,
-+  AVR32_OPERAND_PICO_REGLIST_D,
-+  AVR32_OPERAND_PICO_IN,
-+  AVR32_OPERAND_PICO_OUT0,
-+  AVR32_OPERAND_PICO_OUT1,
-+  AVR32_OPERAND_PICO_OUT2,
-+  AVR32_OPERAND_PICO_OUT3,
-+  AVR32_OPERAND__END_
-+};
-+#define AVR32_OPERAND_UNKNOWN AVR32_OPERAND__END_
-+#define AVR32_NR_OPERANDS AVR32_OPERAND__END_
-+
-+enum avr32_ifield_type
-+{
-+  AVR32_IFIELD_RX,
-+  AVR32_IFIELD_RY,
-+  AVR32_IFIELD_COND4C,
-+  AVR32_IFIELD_K8C,
-+  AVR32_IFIELD_K7C,
-+  AVR32_IFIELD_K5C,
-+  AVR32_IFIELD_K3,
-+  AVR32_IFIELD_RY_DW,
-+  AVR32_IFIELD_COND4E,
-+  AVR32_IFIELD_K8E,
-+  AVR32_IFIELD_BIT5C,
-+  AVR32_IFIELD_COND3,
-+  AVR32_IFIELD_K10,
-+  AVR32_IFIELD_POPM,
-+  AVR32_IFIELD_K2,
-+  AVR32_IFIELD_RD_E,
-+  AVR32_IFIELD_RD_DW,
-+  AVR32_IFIELD_X,
-+  AVR32_IFIELD_Y,
-+  AVR32_IFIELD_X2,
-+  AVR32_IFIELD_Y2,
-+  AVR32_IFIELD_K5E,
-+  AVR32_IFIELD_PART2,
-+  AVR32_IFIELD_PART1,
-+  AVR32_IFIELD_K16,
-+  AVR32_IFIELD_CACHEOP,
-+  AVR32_IFIELD_K11,
-+  AVR32_IFIELD_K21,
-+  AVR32_IFIELD_CPOP,
-+  AVR32_IFIELD_CPNO,
-+  AVR32_IFIELD_CRD_RI,
-+  AVR32_IFIELD_CRX,
-+  AVR32_IFIELD_CRY,
-+  AVR32_IFIELD_K7E,
-+  AVR32_IFIELD_CRD_DW,
-+  AVR32_IFIELD_PART1_K12,
-+  AVR32_IFIELD_PART2_K12,
-+  AVR32_IFIELD_K12,
-+  AVR32_IFIELD_S5,
-+  AVR32_IFIELD_K5E2,
-+  AVR32_IFIELD_K4,
-+  AVR32_IFIELD_COND4E2,
-+  AVR32_IFIELD_K8E2,
-+  AVR32_IFIELD_K6,
-+  AVR32_IFIELD_MEM15,
-+  AVR32_IFIELD_MEMB5,
-+  AVR32_IFIELD_W,
-+  AVR32_IFIELD_CM_HL,
-+  AVR32_IFIELD_K12CP,
-+  AVR32_IFIELD_K9E,
-+  AVR32_IFIELD_FP_RX,
-+  AVR32_IFIELD_FP_RY,
-+  AVR32_IFIELD_FP_RD,
-+  AVR32_IFIELD_FP_RA,
-+  AVR32_IFIELD__END_,
-+};
-+#define AVR32_NR_IFIELDS AVR32_IFIELD__END_
-+
-+enum avr32_opc_type
-+{
-+  AVR32_OPC_ABS,
-+  AVR32_OPC_ACALL,
-+  AVR32_OPC_ACR,
-+  AVR32_OPC_ADC,
-+  AVR32_OPC_ADD1,
-+  AVR32_OPC_ADD2,
-+  AVR32_OPC_ADDABS,
-+  AVR32_OPC_ADDHH_W,
-+  AVR32_OPC_AND1,
-+  AVR32_OPC_AND2,
-+  AVR32_OPC_AND3,
-+  AVR32_OPC_ANDH,
-+  AVR32_OPC_ANDH_COH,
-+  AVR32_OPC_ANDL,
-+  AVR32_OPC_ANDL_COH,
-+  AVR32_OPC_ANDN,
-+  AVR32_OPC_ASR1,
-+  AVR32_OPC_ASR3,
-+  AVR32_OPC_ASR2,
-+  AVR32_OPC_BLD,
-+  AVR32_OPC_BREQ1,
-+  AVR32_OPC_BRNE1,
-+  AVR32_OPC_BRCC1,
-+  AVR32_OPC_BRCS1,
-+  AVR32_OPC_BRGE1,
-+  AVR32_OPC_BRLT1,
-+  AVR32_OPC_BRMI1,
-+  AVR32_OPC_BRPL1,
-+  AVR32_OPC_BREQ2,
-+  AVR32_OPC_BRNE2,
-+  AVR32_OPC_BRCC2,
-+  AVR32_OPC_BRCS2,
-+  AVR32_OPC_BRGE2,
-+  AVR32_OPC_BRLT2,
-+  AVR32_OPC_BRMI2,
-+  AVR32_OPC_BRPL2,
-+  AVR32_OPC_BRLS,
-+  AVR32_OPC_BRGT,
-+  AVR32_OPC_BRLE,
-+  AVR32_OPC_BRHI,
-+  AVR32_OPC_BRVS,
-+  AVR32_OPC_BRVC,
-+  AVR32_OPC_BRQS,
-+  AVR32_OPC_BRAL,
-+  AVR32_OPC_BREAKPOINT,
-+  AVR32_OPC_BREV,
-+  AVR32_OPC_BST,
-+  AVR32_OPC_CACHE,
-+  AVR32_OPC_CASTS_B,
-+  AVR32_OPC_CASTS_H,
-+  AVR32_OPC_CASTU_B,
-+  AVR32_OPC_CASTU_H,
-+  AVR32_OPC_CBR,
-+  AVR32_OPC_CLZ,
-+  AVR32_OPC_COM,
-+  AVR32_OPC_COP,
-+  AVR32_OPC_CP_B,
-+  AVR32_OPC_CP_H,
-+  AVR32_OPC_CP_W1,
-+  AVR32_OPC_CP_W2,
-+  AVR32_OPC_CP_W3,
-+  AVR32_OPC_CPC1,
-+  AVR32_OPC_CPC2,
-+  AVR32_OPC_CSRF,
-+  AVR32_OPC_CSRFCZ,
-+  AVR32_OPC_DIVS,
-+  AVR32_OPC_DIVU,
-+  AVR32_OPC_EOR1,
-+  AVR32_OPC_EOR2,
-+  AVR32_OPC_EOR3,
-+  AVR32_OPC_EORL,
-+  AVR32_OPC_EORH,
-+  AVR32_OPC_FRS,
-+  AVR32_OPC_ICALL,
-+  AVR32_OPC_INCJOSP,
-+  AVR32_OPC_LD_D1,
-+  AVR32_OPC_LD_D2,
-+  AVR32_OPC_LD_D3,
-+  AVR32_OPC_LD_D5,
-+  AVR32_OPC_LD_D4,
-+  AVR32_OPC_LD_SB2,
-+  AVR32_OPC_LD_SB1,
-+  AVR32_OPC_LD_UB1,
-+  AVR32_OPC_LD_UB2,
-+  AVR32_OPC_LD_UB5,
-+  AVR32_OPC_LD_UB3,
-+  AVR32_OPC_LD_UB4,
-+  AVR32_OPC_LD_SH1,
-+  AVR32_OPC_LD_SH2,
-+  AVR32_OPC_LD_SH5,
-+  AVR32_OPC_LD_SH3,
-+  AVR32_OPC_LD_SH4,
-+  AVR32_OPC_LD_UH1,
-+  AVR32_OPC_LD_UH2,
-+  AVR32_OPC_LD_UH5,
-+  AVR32_OPC_LD_UH3,
-+  AVR32_OPC_LD_UH4,
-+  AVR32_OPC_LD_W1,
-+  AVR32_OPC_LD_W2,
-+  AVR32_OPC_LD_W5,
-+  AVR32_OPC_LD_W6,
-+  AVR32_OPC_LD_W3,
-+  AVR32_OPC_LD_W4,
-+  AVR32_OPC_LDC_D1,
-+  AVR32_OPC_LDC_D2,
-+  AVR32_OPC_LDC_D3,
-+  AVR32_OPC_LDC_W1,
-+  AVR32_OPC_LDC_W2,
-+  AVR32_OPC_LDC_W3,
-+  AVR32_OPC_LDC0_D,
-+  AVR32_OPC_LDC0_W,
-+  AVR32_OPC_LDCM_D,
-+  AVR32_OPC_LDCM_D_PU,
-+  AVR32_OPC_LDCM_W,
-+  AVR32_OPC_LDCM_W_PU,
-+  AVR32_OPC_LDDPC,
-+  AVR32_OPC_LDDPC_EXT,
-+  AVR32_OPC_LDDSP,
-+  AVR32_OPC_LDINS_B,
-+  AVR32_OPC_LDINS_H,
-+  AVR32_OPC_LDM,
-+  AVR32_OPC_LDMTS,
-+  AVR32_OPC_LDMTS_PU,
-+  AVR32_OPC_LDSWP_SH,
-+  AVR32_OPC_LDSWP_UH,
-+  AVR32_OPC_LDSWP_W,
-+  AVR32_OPC_LSL1,
-+  AVR32_OPC_LSL3,
-+  AVR32_OPC_LSL2,
-+  AVR32_OPC_LSR1,
-+  AVR32_OPC_LSR3,
-+  AVR32_OPC_LSR2,
-+  AVR32_OPC_MAC,
-+  AVR32_OPC_MACHH_D,
-+  AVR32_OPC_MACHH_W,
-+  AVR32_OPC_MACS_D,
-+  AVR32_OPC_MACSATHH_W,
-+  AVR32_OPC_MACUD,
-+  AVR32_OPC_MACWH_D,
-+  AVR32_OPC_MAX,
-+  AVR32_OPC_MCALL,
-+  AVR32_OPC_MFDR,
-+  AVR32_OPC_MFSR,
-+  AVR32_OPC_MIN,
-+  AVR32_OPC_MOV3,
-+  AVR32_OPC_MOV1,
-+  AVR32_OPC_MOV2,
-+  AVR32_OPC_MOVEQ1,
-+  AVR32_OPC_MOVNE1,
-+  AVR32_OPC_MOVCC1,
-+  AVR32_OPC_MOVCS1,
-+  AVR32_OPC_MOVGE1,
-+  AVR32_OPC_MOVLT1,
-+  AVR32_OPC_MOVMI1,
-+  AVR32_OPC_MOVPL1,
-+  AVR32_OPC_MOVLS1,
-+  AVR32_OPC_MOVGT1,
-+  AVR32_OPC_MOVLE1,
-+  AVR32_OPC_MOVHI1,
-+  AVR32_OPC_MOVVS1,
-+  AVR32_OPC_MOVVC1,
-+  AVR32_OPC_MOVQS1,
-+  AVR32_OPC_MOVAL1,
-+  AVR32_OPC_MOVEQ2,
-+  AVR32_OPC_MOVNE2,
-+  AVR32_OPC_MOVCC2,
-+  AVR32_OPC_MOVCS2,
-+  AVR32_OPC_MOVGE2,
-+  AVR32_OPC_MOVLT2,
-+  AVR32_OPC_MOVMI2,
-+  AVR32_OPC_MOVPL2,
-+  AVR32_OPC_MOVLS2,
-+  AVR32_OPC_MOVGT2,
-+  AVR32_OPC_MOVLE2,
-+  AVR32_OPC_MOVHI2,
-+  AVR32_OPC_MOVVS2,
-+  AVR32_OPC_MOVVC2,
-+  AVR32_OPC_MOVQS2,
-+  AVR32_OPC_MOVAL2,
-+  AVR32_OPC_MTDR,
-+  AVR32_OPC_MTSR,
-+  AVR32_OPC_MUL1,
-+  AVR32_OPC_MUL2,
-+  AVR32_OPC_MUL3,
-+  AVR32_OPC_MULHH_W,
-+  AVR32_OPC_MULNHH_W,
-+  AVR32_OPC_MULNWH_D,
-+  AVR32_OPC_MULSD,
-+  AVR32_OPC_MULSATHH_H,
-+  AVR32_OPC_MULSATHH_W,
-+  AVR32_OPC_MULSATRNDHH_H,
-+  AVR32_OPC_MULSATRNDWH_W,
-+  AVR32_OPC_MULSATWH_W,
-+  AVR32_OPC_MULU_D,
-+  AVR32_OPC_MULWH_D,
-+  AVR32_OPC_MUSFR,
-+  AVR32_OPC_MUSTR,
-+  AVR32_OPC_MVCR_D,
-+  AVR32_OPC_MVCR_W,
-+  AVR32_OPC_MVRC_D,
-+  AVR32_OPC_MVRC_W,
-+  AVR32_OPC_NEG,
-+  AVR32_OPC_NOP,
-+  AVR32_OPC_OR1,
-+  AVR32_OPC_OR2,
-+  AVR32_OPC_OR3,
-+  AVR32_OPC_ORH,
-+  AVR32_OPC_ORL,
-+  AVR32_OPC_PABS_SB,
-+  AVR32_OPC_PABS_SH,
-+  AVR32_OPC_PACKSH_SB,
-+  AVR32_OPC_PACKSH_UB,
-+  AVR32_OPC_PACKW_SH,
-+  AVR32_OPC_PADD_B,
-+  AVR32_OPC_PADD_H,
-+  AVR32_OPC_PADDH_SH,
-+  AVR32_OPC_PADDH_UB,
-+  AVR32_OPC_PADDS_SB,
-+  AVR32_OPC_PADDS_SH,
-+  AVR32_OPC_PADDS_UB,
-+  AVR32_OPC_PADDS_UH,
-+  AVR32_OPC_PADDSUB_H,
-+  AVR32_OPC_PADDSUBH_SH,
-+  AVR32_OPC_PADDSUBS_SH,
-+  AVR32_OPC_PADDSUBS_UH,
-+  AVR32_OPC_PADDX_H,
-+  AVR32_OPC_PADDXH_SH,
-+  AVR32_OPC_PADDXS_SH,
-+  AVR32_OPC_PADDXS_UH,
-+  AVR32_OPC_PASR_B,
-+  AVR32_OPC_PASR_H,
-+  AVR32_OPC_PAVG_SH,
-+  AVR32_OPC_PAVG_UB,
-+  AVR32_OPC_PLSL_B,
-+  AVR32_OPC_PLSL_H,
-+  AVR32_OPC_PLSR_B,
-+  AVR32_OPC_PLSR_H,
-+  AVR32_OPC_PMAX_SH,
-+  AVR32_OPC_PMAX_UB,
-+  AVR32_OPC_PMIN_SH,
-+  AVR32_OPC_PMIN_UB,
-+  AVR32_OPC_POPJC,
-+  AVR32_OPC_POPM,
-+  AVR32_OPC_POPM_E,
-+  AVR32_OPC_PREF,
-+  AVR32_OPC_PSAD,
-+  AVR32_OPC_PSUB_B,
-+  AVR32_OPC_PSUB_H,
-+  AVR32_OPC_PSUBADD_H,
-+  AVR32_OPC_PSUBADDH_SH,
-+  AVR32_OPC_PSUBADDS_SH,
-+  AVR32_OPC_PSUBADDS_UH,
-+  AVR32_OPC_PSUBH_SH,
-+  AVR32_OPC_PSUBH_UB,
-+  AVR32_OPC_PSUBS_SB,
-+  AVR32_OPC_PSUBS_SH,
-+  AVR32_OPC_PSUBS_UB,
-+  AVR32_OPC_PSUBS_UH,
-+  AVR32_OPC_PSUBX_H,
-+  AVR32_OPC_PSUBXH_SH,
-+  AVR32_OPC_PSUBXS_SH,
-+  AVR32_OPC_PSUBXS_UH,
-+  AVR32_OPC_PUNPCKSB_H,
-+  AVR32_OPC_PUNPCKUB_H,
-+  AVR32_OPC_PUSHJC,
-+  AVR32_OPC_PUSHM,
-+  AVR32_OPC_PUSHM_E,
-+  AVR32_OPC_RCALL1,
-+  AVR32_OPC_RCALL2,
-+  AVR32_OPC_RETEQ,
-+  AVR32_OPC_RETNE,
-+  AVR32_OPC_RETCC,
-+  AVR32_OPC_RETCS,
-+  AVR32_OPC_RETGE,
-+  AVR32_OPC_RETLT,
-+  AVR32_OPC_RETMI,
-+  AVR32_OPC_RETPL,
-+  AVR32_OPC_RETLS,
-+  AVR32_OPC_RETGT,
-+  AVR32_OPC_RETLE,
-+  AVR32_OPC_RETHI,
-+  AVR32_OPC_RETVS,
-+  AVR32_OPC_RETVC,
-+  AVR32_OPC_RETQS,
-+  AVR32_OPC_RETAL,
-+  AVR32_OPC_RETD,
-+  AVR32_OPC_RETE,
-+  AVR32_OPC_RETJ,
-+  AVR32_OPC_RETS,
-+  AVR32_OPC_RJMP,
-+  AVR32_OPC_ROL,
-+  AVR32_OPC_ROR,
-+  AVR32_OPC_RSUB1,
-+  AVR32_OPC_RSUB2,
-+  AVR32_OPC_SATADD_H,
-+  AVR32_OPC_SATADD_W,
-+  AVR32_OPC_SATRNDS,
-+  AVR32_OPC_SATRNDU,
-+  AVR32_OPC_SATS,
-+  AVR32_OPC_SATSUB_H,
-+  AVR32_OPC_SATSUB_W1,
-+  AVR32_OPC_SATSUB_W2,
-+  AVR32_OPC_SATU,
-+  AVR32_OPC_SBC,
-+  AVR32_OPC_SBR,
-+  AVR32_OPC_SCALL,
-+  AVR32_OPC_SCR,
-+  AVR32_OPC_SLEEP,
-+  AVR32_OPC_SREQ,
-+  AVR32_OPC_SRNE,
-+  AVR32_OPC_SRCC,
-+  AVR32_OPC_SRCS,
-+  AVR32_OPC_SRGE,
-+  AVR32_OPC_SRLT,
-+  AVR32_OPC_SRMI,
-+  AVR32_OPC_SRPL,
-+  AVR32_OPC_SRLS,
-+  AVR32_OPC_SRGT,
-+  AVR32_OPC_SRLE,
-+  AVR32_OPC_SRHI,
-+  AVR32_OPC_SRVS,
-+  AVR32_OPC_SRVC,
-+  AVR32_OPC_SRQS,
-+  AVR32_OPC_SRAL,
-+  AVR32_OPC_SSRF,
-+  AVR32_OPC_ST_B1,
-+  AVR32_OPC_ST_B2,
-+  AVR32_OPC_ST_B5,
-+  AVR32_OPC_ST_B3,
-+  AVR32_OPC_ST_B4,
-+  AVR32_OPC_ST_D1,
-+  AVR32_OPC_ST_D2,
-+  AVR32_OPC_ST_D3,
-+  AVR32_OPC_ST_D5,
-+  AVR32_OPC_ST_D4,
-+  AVR32_OPC_ST_H1,
-+  AVR32_OPC_ST_H2,
-+  AVR32_OPC_ST_H5,
-+  AVR32_OPC_ST_H3,
-+  AVR32_OPC_ST_H4,
-+  AVR32_OPC_ST_W1,
-+  AVR32_OPC_ST_W2,
-+  AVR32_OPC_ST_W5,
-+  AVR32_OPC_ST_W3,
-+  AVR32_OPC_ST_W4,
-+  AVR32_OPC_STC_D1,
-+  AVR32_OPC_STC_D2,
-+  AVR32_OPC_STC_D3,
-+  AVR32_OPC_STC_W1,
-+  AVR32_OPC_STC_W2,
-+  AVR32_OPC_STC_W3,
-+  AVR32_OPC_STC0_D,
-+  AVR32_OPC_STC0_W,
-+  AVR32_OPC_STCM_D,
-+  AVR32_OPC_STCM_D_PU,
-+  AVR32_OPC_STCM_W,
-+  AVR32_OPC_STCM_W_PU,
-+  AVR32_OPC_STCOND,
-+  AVR32_OPC_STDSP,
-+  AVR32_OPC_STHH_W2,
-+  AVR32_OPC_STHH_W1,
-+  AVR32_OPC_STM,
-+  AVR32_OPC_STM_PU,
-+  AVR32_OPC_STMTS,
-+  AVR32_OPC_STMTS_PU,
-+  AVR32_OPC_STSWP_H,
-+  AVR32_OPC_STSWP_W,
-+  AVR32_OPC_SUB1,
-+  AVR32_OPC_SUB2,
-+  AVR32_OPC_SUB5,
-+  AVR32_OPC_SUB3_SP,
-+  AVR32_OPC_SUB3,
-+  AVR32_OPC_SUB4,
-+  AVR32_OPC_SUBEQ,
-+  AVR32_OPC_SUBNE,
-+  AVR32_OPC_SUBCC,
-+  AVR32_OPC_SUBCS,
-+  AVR32_OPC_SUBGE,
-+  AVR32_OPC_SUBLT,
-+  AVR32_OPC_SUBMI,
-+  AVR32_OPC_SUBPL,
-+  AVR32_OPC_SUBLS,
-+  AVR32_OPC_SUBGT,
-+  AVR32_OPC_SUBLE,
-+  AVR32_OPC_SUBHI,
-+  AVR32_OPC_SUBVS,
-+  AVR32_OPC_SUBVC,
-+  AVR32_OPC_SUBQS,
-+  AVR32_OPC_SUBAL,
-+  AVR32_OPC_SUBFEQ,
-+  AVR32_OPC_SUBFNE,
-+  AVR32_OPC_SUBFCC,
-+  AVR32_OPC_SUBFCS,
-+  AVR32_OPC_SUBFGE,
-+  AVR32_OPC_SUBFLT,
-+  AVR32_OPC_SUBFMI,
-+  AVR32_OPC_SUBFPL,
-+  AVR32_OPC_SUBFLS,
-+  AVR32_OPC_SUBFGT,
-+  AVR32_OPC_SUBFLE,
-+  AVR32_OPC_SUBFHI,
-+  AVR32_OPC_SUBFVS,
-+  AVR32_OPC_SUBFVC,
-+  AVR32_OPC_SUBFQS,
-+  AVR32_OPC_SUBFAL,
-+  AVR32_OPC_SUBHH_W,
-+  AVR32_OPC_SWAP_B,
-+  AVR32_OPC_SWAP_BH,
-+  AVR32_OPC_SWAP_H,
-+  AVR32_OPC_SYNC,
-+  AVR32_OPC_TLBR,
-+  AVR32_OPC_TLBS,
-+  AVR32_OPC_TLBW,
-+  AVR32_OPC_TNBZ,
-+  AVR32_OPC_TST,
-+  AVR32_OPC_XCHG,
-+  AVR32_OPC_MEMC,
-+  AVR32_OPC_MEMS,
-+  AVR32_OPC_MEMT,
-+  AVR32_OPC_BFEXTS,
-+  AVR32_OPC_BFEXTU,
-+  AVR32_OPC_BFINS,
-+  AVR32_OPC_RSUBEQ,
-+  AVR32_OPC_RSUBNE,
-+  AVR32_OPC_RSUBCC,
-+  AVR32_OPC_RSUBCS,
-+  AVR32_OPC_RSUBGE,
-+  AVR32_OPC_RSUBLT,
-+  AVR32_OPC_RSUBMI,
-+  AVR32_OPC_RSUBPL,
-+  AVR32_OPC_RSUBLS,
-+  AVR32_OPC_RSUBGT,
-+  AVR32_OPC_RSUBLE,
-+  AVR32_OPC_RSUBHI,
-+  AVR32_OPC_RSUBVS,
-+  AVR32_OPC_RSUBVC,
-+  AVR32_OPC_RSUBQS,
-+  AVR32_OPC_RSUBAL,
-+  AVR32_OPC_ADDEQ,
-+  AVR32_OPC_ADDNE,
-+  AVR32_OPC_ADDCC,
-+  AVR32_OPC_ADDCS,
-+  AVR32_OPC_ADDGE,
-+  AVR32_OPC_ADDLT,
-+  AVR32_OPC_ADDMI,
-+  AVR32_OPC_ADDPL,
-+  AVR32_OPC_ADDLS,
-+  AVR32_OPC_ADDGT,
-+  AVR32_OPC_ADDLE,
-+  AVR32_OPC_ADDHI,
-+  AVR32_OPC_ADDVS,
-+  AVR32_OPC_ADDVC,
-+  AVR32_OPC_ADDQS,
-+  AVR32_OPC_ADDAL,
-+  AVR32_OPC_SUB2EQ,
-+  AVR32_OPC_SUB2NE,
-+  AVR32_OPC_SUB2CC,
-+  AVR32_OPC_SUB2CS,
-+  AVR32_OPC_SUB2GE,
-+  AVR32_OPC_SUB2LT,
-+  AVR32_OPC_SUB2MI,
-+  AVR32_OPC_SUB2PL,
-+  AVR32_OPC_SUB2LS,
-+  AVR32_OPC_SUB2GT,
-+  AVR32_OPC_SUB2LE,
-+  AVR32_OPC_SUB2HI,
-+  AVR32_OPC_SUB2VS,
-+  AVR32_OPC_SUB2VC,
-+  AVR32_OPC_SUB2QS,
-+  AVR32_OPC_SUB2AL,
-+  AVR32_OPC_ANDEQ,
-+  AVR32_OPC_ANDNE,
-+  AVR32_OPC_ANDCC,
-+  AVR32_OPC_ANDCS,
-+  AVR32_OPC_ANDGE,
-+  AVR32_OPC_ANDLT,
-+  AVR32_OPC_ANDMI,
-+  AVR32_OPC_ANDPL,
-+  AVR32_OPC_ANDLS,
-+  AVR32_OPC_ANDGT,
-+  AVR32_OPC_ANDLE,
-+  AVR32_OPC_ANDHI,
-+  AVR32_OPC_ANDVS,
-+  AVR32_OPC_ANDVC,
-+  AVR32_OPC_ANDQS,
-+  AVR32_OPC_ANDAL,
-+  AVR32_OPC_OREQ,
-+  AVR32_OPC_ORNE,
-+  AVR32_OPC_ORCC,
-+  AVR32_OPC_ORCS,
-+  AVR32_OPC_ORGE,
-+  AVR32_OPC_ORLT,
-+  AVR32_OPC_ORMI,
-+  AVR32_OPC_ORPL,
-+  AVR32_OPC_ORLS,
-+  AVR32_OPC_ORGT,
-+  AVR32_OPC_ORLE,
-+  AVR32_OPC_ORHI,
-+  AVR32_OPC_ORVS,
-+  AVR32_OPC_ORVC,
-+  AVR32_OPC_ORQS,
-+  AVR32_OPC_ORAL,
-+  AVR32_OPC_EOREQ,
-+  AVR32_OPC_EORNE,
-+  AVR32_OPC_EORCC,
-+  AVR32_OPC_EORCS,
-+  AVR32_OPC_EORGE,
-+  AVR32_OPC_EORLT,
-+  AVR32_OPC_EORMI,
-+  AVR32_OPC_EORPL,
-+  AVR32_OPC_EORLS,
-+  AVR32_OPC_EORGT,
-+  AVR32_OPC_EORLE,
-+  AVR32_OPC_EORHI,
-+  AVR32_OPC_EORVS,
-+  AVR32_OPC_EORVC,
-+  AVR32_OPC_EORQS,
-+  AVR32_OPC_EORAL,
-+  AVR32_OPC_LD_WEQ,
-+  AVR32_OPC_LD_WNE,
-+  AVR32_OPC_LD_WCC,
-+  AVR32_OPC_LD_WCS,
-+  AVR32_OPC_LD_WGE,
-+  AVR32_OPC_LD_WLT,
-+  AVR32_OPC_LD_WMI,
-+  AVR32_OPC_LD_WPL,
-+  AVR32_OPC_LD_WLS,
-+  AVR32_OPC_LD_WGT,
-+  AVR32_OPC_LD_WLE,
-+  AVR32_OPC_LD_WHI,
-+  AVR32_OPC_LD_WVS,
-+  AVR32_OPC_LD_WVC,
-+  AVR32_OPC_LD_WQS,
-+  AVR32_OPC_LD_WAL,
-+  AVR32_OPC_LD_SHEQ,
-+  AVR32_OPC_LD_SHNE,
-+  AVR32_OPC_LD_SHCC,
-+  AVR32_OPC_LD_SHCS,
-+  AVR32_OPC_LD_SHGE,
-+  AVR32_OPC_LD_SHLT,
-+  AVR32_OPC_LD_SHMI,
-+  AVR32_OPC_LD_SHPL,
-+  AVR32_OPC_LD_SHLS,
-+  AVR32_OPC_LD_SHGT,
-+  AVR32_OPC_LD_SHLE,
-+  AVR32_OPC_LD_SHHI,
-+  AVR32_OPC_LD_SHVS,
-+  AVR32_OPC_LD_SHVC,
-+  AVR32_OPC_LD_SHQS,
-+  AVR32_OPC_LD_SHAL,
-+  AVR32_OPC_LD_UHEQ,
-+  AVR32_OPC_LD_UHNE,
-+  AVR32_OPC_LD_UHCC,
-+  AVR32_OPC_LD_UHCS,
-+  AVR32_OPC_LD_UHGE,
-+  AVR32_OPC_LD_UHLT,
-+  AVR32_OPC_LD_UHMI,
-+  AVR32_OPC_LD_UHPL,
-+  AVR32_OPC_LD_UHLS,
-+  AVR32_OPC_LD_UHGT,
-+  AVR32_OPC_LD_UHLE,
-+  AVR32_OPC_LD_UHHI,
-+  AVR32_OPC_LD_UHVS,
-+  AVR32_OPC_LD_UHVC,
-+  AVR32_OPC_LD_UHQS,
-+  AVR32_OPC_LD_UHAL,
-+  AVR32_OPC_LD_SBEQ,
-+  AVR32_OPC_LD_SBNE,
-+  AVR32_OPC_LD_SBCC,
-+  AVR32_OPC_LD_SBCS,
-+  AVR32_OPC_LD_SBGE,
-+  AVR32_OPC_LD_SBLT,
-+  AVR32_OPC_LD_SBMI,
-+  AVR32_OPC_LD_SBPL,
-+  AVR32_OPC_LD_SBLS,
-+  AVR32_OPC_LD_SBGT,
-+  AVR32_OPC_LD_SBLE,
-+  AVR32_OPC_LD_SBHI,
-+  AVR32_OPC_LD_SBVS,
-+  AVR32_OPC_LD_SBVC,
-+  AVR32_OPC_LD_SBQS,
-+  AVR32_OPC_LD_SBAL,
-+  AVR32_OPC_LD_UBEQ,
-+  AVR32_OPC_LD_UBNE,
-+  AVR32_OPC_LD_UBCC,
-+  AVR32_OPC_LD_UBCS,
-+  AVR32_OPC_LD_UBGE,
-+  AVR32_OPC_LD_UBLT,
-+  AVR32_OPC_LD_UBMI,
-+  AVR32_OPC_LD_UBPL,
-+  AVR32_OPC_LD_UBLS,
-+  AVR32_OPC_LD_UBGT,
-+  AVR32_OPC_LD_UBLE,
-+  AVR32_OPC_LD_UBHI,
-+  AVR32_OPC_LD_UBVS,
-+  AVR32_OPC_LD_UBVC,
-+  AVR32_OPC_LD_UBQS,
-+  AVR32_OPC_LD_UBAL,
-+  AVR32_OPC_ST_WEQ,
-+  AVR32_OPC_ST_WNE,
-+  AVR32_OPC_ST_WCC,
-+  AVR32_OPC_ST_WCS,
-+  AVR32_OPC_ST_WGE,
-+  AVR32_OPC_ST_WLT,
-+  AVR32_OPC_ST_WMI,
-+  AVR32_OPC_ST_WPL,
-+  AVR32_OPC_ST_WLS,
-+  AVR32_OPC_ST_WGT,
-+  AVR32_OPC_ST_WLE,
-+  AVR32_OPC_ST_WHI,
-+  AVR32_OPC_ST_WVS,
-+  AVR32_OPC_ST_WVC,
-+  AVR32_OPC_ST_WQS,
-+  AVR32_OPC_ST_WAL,
-+  AVR32_OPC_ST_HEQ,
-+  AVR32_OPC_ST_HNE,
-+  AVR32_OPC_ST_HCC,
-+  AVR32_OPC_ST_HCS,
-+  AVR32_OPC_ST_HGE,
-+  AVR32_OPC_ST_HLT,
-+  AVR32_OPC_ST_HMI,
-+  AVR32_OPC_ST_HPL,
-+  AVR32_OPC_ST_HLS,
-+  AVR32_OPC_ST_HGT,
-+  AVR32_OPC_ST_HLE,
-+  AVR32_OPC_ST_HHI,
-+  AVR32_OPC_ST_HVS,
-+  AVR32_OPC_ST_HVC,
-+  AVR32_OPC_ST_HQS,
-+  AVR32_OPC_ST_HAL,
-+  AVR32_OPC_ST_BEQ,
-+  AVR32_OPC_ST_BNE,
-+  AVR32_OPC_ST_BCC,
-+  AVR32_OPC_ST_BCS,
-+  AVR32_OPC_ST_BGE,
-+  AVR32_OPC_ST_BLT,
-+  AVR32_OPC_ST_BMI,
-+  AVR32_OPC_ST_BPL,
-+  AVR32_OPC_ST_BLS,
-+  AVR32_OPC_ST_BGT,
-+  AVR32_OPC_ST_BLE,
-+  AVR32_OPC_ST_BHI,
-+  AVR32_OPC_ST_BVS,
-+  AVR32_OPC_ST_BVC,
-+  AVR32_OPC_ST_BQS,
-+  AVR32_OPC_ST_BAL,
-+  AVR32_OPC_MOVH,
-+  AVR32_OPC_SSCALL,
-+  AVR32_OPC_RETSS,
-+  AVR32_OPC_FMAC_S,
-+  AVR32_OPC_FNMAC_S,
-+  AVR32_OPC_FMSC_S,
-+  AVR32_OPC_FNMSC_S,
-+  AVR32_OPC_FMUL_S,
-+  AVR32_OPC_FNMUL_S,
-+  AVR32_OPC_FADD_S,
-+  AVR32_OPC_FSUB_S,
-+  AVR32_OPC_FCASTRS_SW,
-+  AVR32_OPC_FCASTRS_UW,
-+  AVR32_OPC_FCASTSW_S,
-+  AVR32_OPC_FCASTUW_S,
-+  AVR32_OPC_FCMP_S,
-+  AVR32_OPC_FCHK_S,
-+  AVR32_OPC_FRCPA_S,
-+  AVR32_OPC_FRSQRTA_S,
-+  AVR32_OPC__END_
-+};
-+#define AVR32_NR_OPCODES AVR32_OPC__END_
-+
-+enum avr32_syntax_type
-+{
-+  AVR32_SYNTAX_ABS,
-+  AVR32_SYNTAX_ACALL,
-+  AVR32_SYNTAX_ACR,
-+  AVR32_SYNTAX_ADC,
-+  AVR32_SYNTAX_ADD1,
-+  AVR32_SYNTAX_ADD2,
-+  AVR32_SYNTAX_ADDABS,
-+  AVR32_SYNTAX_ADDHH_W,
-+  AVR32_SYNTAX_AND1,
-+  AVR32_SYNTAX_AND2,
-+  AVR32_SYNTAX_AND3,
-+  AVR32_SYNTAX_ANDH,
-+  AVR32_SYNTAX_ANDH_COH,
-+  AVR32_SYNTAX_ANDL,
-+  AVR32_SYNTAX_ANDL_COH,
-+  AVR32_SYNTAX_ANDN,
-+  AVR32_SYNTAX_ASR1,
-+  AVR32_SYNTAX_ASR3,
-+  AVR32_SYNTAX_ASR2,
-+  AVR32_SYNTAX_BFEXTS,
-+  AVR32_SYNTAX_BFEXTU,
-+  AVR32_SYNTAX_BFINS,
-+  AVR32_SYNTAX_BLD,
-+  AVR32_SYNTAX_BREQ1,
-+  AVR32_SYNTAX_BRNE1,
-+  AVR32_SYNTAX_BRCC1,
-+  AVR32_SYNTAX_BRCS1,
-+  AVR32_SYNTAX_BRGE1,
-+  AVR32_SYNTAX_BRLT1,
-+  AVR32_SYNTAX_BRMI1,
-+  AVR32_SYNTAX_BRPL1,
-+  AVR32_SYNTAX_BRHS1,
-+  AVR32_SYNTAX_BRLO1,
-+  AVR32_SYNTAX_BREQ2,
-+  AVR32_SYNTAX_BRNE2,
-+  AVR32_SYNTAX_BRCC2,
-+  AVR32_SYNTAX_BRCS2,
-+  AVR32_SYNTAX_BRGE2,
-+  AVR32_SYNTAX_BRLT2,
-+  AVR32_SYNTAX_BRMI2,
-+  AVR32_SYNTAX_BRPL2,
-+  AVR32_SYNTAX_BRLS,
-+  AVR32_SYNTAX_BRGT,
-+  AVR32_SYNTAX_BRLE,
-+  AVR32_SYNTAX_BRHI,
-+  AVR32_SYNTAX_BRVS,
-+  AVR32_SYNTAX_BRVC,
-+  AVR32_SYNTAX_BRQS,
-+  AVR32_SYNTAX_BRAL,
-+  AVR32_SYNTAX_BRHS2,
-+  AVR32_SYNTAX_BRLO2,
-+  AVR32_SYNTAX_BREAKPOINT,
-+  AVR32_SYNTAX_BREV,
-+  AVR32_SYNTAX_BST,
-+  AVR32_SYNTAX_CACHE,
-+  AVR32_SYNTAX_CASTS_B,
-+  AVR32_SYNTAX_CASTS_H,
-+  AVR32_SYNTAX_CASTU_B,
-+  AVR32_SYNTAX_CASTU_H,
-+  AVR32_SYNTAX_CBR,
-+  AVR32_SYNTAX_CLZ,
-+  AVR32_SYNTAX_COM,
-+  AVR32_SYNTAX_COP,
-+  AVR32_SYNTAX_CP_B,
-+  AVR32_SYNTAX_CP_H,
-+  AVR32_SYNTAX_CP_W1,
-+  AVR32_SYNTAX_CP_W2,
-+  AVR32_SYNTAX_CP_W3,
-+  AVR32_SYNTAX_CPC1,
-+  AVR32_SYNTAX_CPC2,
-+  AVR32_SYNTAX_CSRF,
-+  AVR32_SYNTAX_CSRFCZ,
-+  AVR32_SYNTAX_DIVS,
-+  AVR32_SYNTAX_DIVU,
-+  AVR32_SYNTAX_EOR1,
-+  AVR32_SYNTAX_EOR2,
-+  AVR32_SYNTAX_EOR3,
-+  AVR32_SYNTAX_EORL,
-+  AVR32_SYNTAX_EORH,
-+  AVR32_SYNTAX_FRS,
-+  AVR32_SYNTAX_SSCALL,
-+  AVR32_SYNTAX_RETSS,
-+  AVR32_SYNTAX_ICALL,
-+  AVR32_SYNTAX_INCJOSP,
-+  AVR32_SYNTAX_LD_D1,
-+  AVR32_SYNTAX_LD_D2,
-+  AVR32_SYNTAX_LD_D3,
-+  AVR32_SYNTAX_LD_D5,
-+  AVR32_SYNTAX_LD_D4,
-+  AVR32_SYNTAX_LD_SB2,
-+  AVR32_SYNTAX_LD_SB1,
-+  AVR32_SYNTAX_LD_UB1,
-+  AVR32_SYNTAX_LD_UB2,
-+  AVR32_SYNTAX_LD_UB5,
-+  AVR32_SYNTAX_LD_UB3,
-+  AVR32_SYNTAX_LD_UB4,
-+  AVR32_SYNTAX_LD_SH1,
-+  AVR32_SYNTAX_LD_SH2,
-+  AVR32_SYNTAX_LD_SH5,
-+  AVR32_SYNTAX_LD_SH3,
-+  AVR32_SYNTAX_LD_SH4,
-+  AVR32_SYNTAX_LD_UH1,
-+  AVR32_SYNTAX_LD_UH2,
-+  AVR32_SYNTAX_LD_UH5,
-+  AVR32_SYNTAX_LD_UH3,
-+  AVR32_SYNTAX_LD_UH4,
-+  AVR32_SYNTAX_LD_W1,
-+  AVR32_SYNTAX_LD_W2,
-+  AVR32_SYNTAX_LD_W5,
-+  AVR32_SYNTAX_LD_W6,
-+  AVR32_SYNTAX_LD_W3,
-+  AVR32_SYNTAX_LD_W4,
-+  AVR32_SYNTAX_LDC_D1,
-+  AVR32_SYNTAX_LDC_D2,
-+  AVR32_SYNTAX_LDC_D3,
-+  AVR32_SYNTAX_LDC_W1,
-+  AVR32_SYNTAX_LDC_W2,
-+  AVR32_SYNTAX_LDC_W3,
-+  AVR32_SYNTAX_LDC0_D,
-+  AVR32_SYNTAX_LDC0_W,
-+  AVR32_SYNTAX_LDCM_D,
-+  AVR32_SYNTAX_LDCM_D_PU,
-+  AVR32_SYNTAX_LDCM_W,
-+  AVR32_SYNTAX_LDCM_W_PU,
-+  AVR32_SYNTAX_LDDPC,
-+  AVR32_SYNTAX_LDDPC_EXT,
-+  AVR32_SYNTAX_LDDSP,
-+  AVR32_SYNTAX_LDINS_B,
-+  AVR32_SYNTAX_LDINS_H,
-+  AVR32_SYNTAX_LDM,
-+  AVR32_SYNTAX_LDMTS,
-+  AVR32_SYNTAX_LDMTS_PU,
-+  AVR32_SYNTAX_LDSWP_SH,
-+  AVR32_SYNTAX_LDSWP_UH,
-+  AVR32_SYNTAX_LDSWP_W,
-+  AVR32_SYNTAX_LSL1,
-+  AVR32_SYNTAX_LSL3,
-+  AVR32_SYNTAX_LSL2,
-+  AVR32_SYNTAX_LSR1,
-+  AVR32_SYNTAX_LSR3,
-+  AVR32_SYNTAX_LSR2,
-+  AVR32_SYNTAX_MAC,
-+  AVR32_SYNTAX_MACHH_D,
-+  AVR32_SYNTAX_MACHH_W,
-+  AVR32_SYNTAX_MACS_D,
-+  AVR32_SYNTAX_MACSATHH_W,
-+  AVR32_SYNTAX_MACUD,
-+  AVR32_SYNTAX_MACWH_D,
-+  AVR32_SYNTAX_MAX,
-+  AVR32_SYNTAX_MCALL,
-+  AVR32_SYNTAX_MFDR,
-+  AVR32_SYNTAX_MFSR,
-+  AVR32_SYNTAX_MIN,
-+  AVR32_SYNTAX_MOV3,
-+  AVR32_SYNTAX_MOV1,
-+  AVR32_SYNTAX_MOV2,
-+  AVR32_SYNTAX_MOVEQ1,
-+  AVR32_SYNTAX_MOVNE1,
-+  AVR32_SYNTAX_MOVCC1,
-+  AVR32_SYNTAX_MOVCS1,
-+  AVR32_SYNTAX_MOVGE1,
-+  AVR32_SYNTAX_MOVLT1,
-+  AVR32_SYNTAX_MOVMI1,
-+  AVR32_SYNTAX_MOVPL1,
-+  AVR32_SYNTAX_MOVLS1,
-+  AVR32_SYNTAX_MOVGT1,
-+  AVR32_SYNTAX_MOVLE1,
-+  AVR32_SYNTAX_MOVHI1,
-+  AVR32_SYNTAX_MOVVS1,
-+  AVR32_SYNTAX_MOVVC1,
-+  AVR32_SYNTAX_MOVQS1,
-+  AVR32_SYNTAX_MOVAL1,
-+  AVR32_SYNTAX_MOVHS1,
-+  AVR32_SYNTAX_MOVLO1,
-+  AVR32_SYNTAX_MOVEQ2,
-+  AVR32_SYNTAX_MOVNE2,
-+  AVR32_SYNTAX_MOVCC2,
-+  AVR32_SYNTAX_MOVCS2,
-+  AVR32_SYNTAX_MOVGE2,
-+  AVR32_SYNTAX_MOVLT2,
-+  AVR32_SYNTAX_MOVMI2,
-+  AVR32_SYNTAX_MOVPL2,
-+  AVR32_SYNTAX_MOVLS2,
-+  AVR32_SYNTAX_MOVGT2,
-+  AVR32_SYNTAX_MOVLE2,
-+  AVR32_SYNTAX_MOVHI2,
-+  AVR32_SYNTAX_MOVVS2,
-+  AVR32_SYNTAX_MOVVC2,
-+  AVR32_SYNTAX_MOVQS2,
-+  AVR32_SYNTAX_MOVAL2,
-+  AVR32_SYNTAX_MOVHS2,
-+  AVR32_SYNTAX_MOVLO2,
-+  AVR32_SYNTAX_MTDR,
-+  AVR32_SYNTAX_MTSR,
-+  AVR32_SYNTAX_MUL1,
-+  AVR32_SYNTAX_MUL2,
-+  AVR32_SYNTAX_MUL3,
-+  AVR32_SYNTAX_MULHH_W,
-+  AVR32_SYNTAX_MULNHH_W,
-+  AVR32_SYNTAX_MULNWH_D,
-+  AVR32_SYNTAX_MULSD,
-+  AVR32_SYNTAX_MULSATHH_H,
-+  AVR32_SYNTAX_MULSATHH_W,
-+  AVR32_SYNTAX_MULSATRNDHH_H,
-+  AVR32_SYNTAX_MULSATRNDWH_W,
-+  AVR32_SYNTAX_MULSATWH_W,
-+  AVR32_SYNTAX_MULU_D,
-+  AVR32_SYNTAX_MULWH_D,
-+  AVR32_SYNTAX_MUSFR,
-+  AVR32_SYNTAX_MUSTR,
-+  AVR32_SYNTAX_MVCR_D,
-+  AVR32_SYNTAX_MVCR_W,
-+  AVR32_SYNTAX_MVRC_D,
-+  AVR32_SYNTAX_MVRC_W,
-+  AVR32_SYNTAX_NEG,
-+  AVR32_SYNTAX_NOP,
-+  AVR32_SYNTAX_OR1,
-+  AVR32_SYNTAX_OR2,
-+  AVR32_SYNTAX_OR3,
-+  AVR32_SYNTAX_ORH,
-+  AVR32_SYNTAX_ORL,
-+  AVR32_SYNTAX_PABS_SB,
-+  AVR32_SYNTAX_PABS_SH,
-+  AVR32_SYNTAX_PACKSH_SB,
-+  AVR32_SYNTAX_PACKSH_UB,
-+  AVR32_SYNTAX_PACKW_SH,
-+  AVR32_SYNTAX_PADD_B,
-+  AVR32_SYNTAX_PADD_H,
-+  AVR32_SYNTAX_PADDH_SH,
-+  AVR32_SYNTAX_PADDH_UB,
-+  AVR32_SYNTAX_PADDS_SB,
-+  AVR32_SYNTAX_PADDS_SH,
-+  AVR32_SYNTAX_PADDS_UB,
-+  AVR32_SYNTAX_PADDS_UH,
-+  AVR32_SYNTAX_PADDSUB_H,
-+  AVR32_SYNTAX_PADDSUBH_SH,
-+  AVR32_SYNTAX_PADDSUBS_SH,
-+  AVR32_SYNTAX_PADDSUBS_UH,
-+  AVR32_SYNTAX_PADDX_H,
-+  AVR32_SYNTAX_PADDXH_SH,
-+  AVR32_SYNTAX_PADDXS_SH,
-+  AVR32_SYNTAX_PADDXS_UH,
-+  AVR32_SYNTAX_PASR_B,
-+  AVR32_SYNTAX_PASR_H,
-+  AVR32_SYNTAX_PAVG_SH,
-+  AVR32_SYNTAX_PAVG_UB,
-+  AVR32_SYNTAX_PLSL_B,
-+  AVR32_SYNTAX_PLSL_H,
-+  AVR32_SYNTAX_PLSR_B,
-+  AVR32_SYNTAX_PLSR_H,
-+  AVR32_SYNTAX_PMAX_SH,
-+  AVR32_SYNTAX_PMAX_UB,
-+  AVR32_SYNTAX_PMIN_SH,
-+  AVR32_SYNTAX_PMIN_UB,
-+  AVR32_SYNTAX_POPJC,
-+  AVR32_SYNTAX_POPM,
-+  AVR32_SYNTAX_POPM_E,
-+  AVR32_SYNTAX_PREF,
-+  AVR32_SYNTAX_PSAD,
-+  AVR32_SYNTAX_PSUB_B,
-+  AVR32_SYNTAX_PSUB_H,
-+  AVR32_SYNTAX_PSUBADD_H,
-+  AVR32_SYNTAX_PSUBADDH_SH,
-+  AVR32_SYNTAX_PSUBADDS_SH,
-+  AVR32_SYNTAX_PSUBADDS_UH,
-+  AVR32_SYNTAX_PSUBH_SH,
-+  AVR32_SYNTAX_PSUBH_UB,
-+  AVR32_SYNTAX_PSUBS_SB,
-+  AVR32_SYNTAX_PSUBS_SH,
-+  AVR32_SYNTAX_PSUBS_UB,
-+  AVR32_SYNTAX_PSUBS_UH,
-+  AVR32_SYNTAX_PSUBX_H,
-+  AVR32_SYNTAX_PSUBXH_SH,
-+  AVR32_SYNTAX_PSUBXS_SH,
-+  AVR32_SYNTAX_PSUBXS_UH,
-+  AVR32_SYNTAX_PUNPCKSB_H,
-+  AVR32_SYNTAX_PUNPCKUB_H,
-+  AVR32_SYNTAX_PUSHJC,
-+  AVR32_SYNTAX_PUSHM,
-+  AVR32_SYNTAX_PUSHM_E,
-+  AVR32_SYNTAX_RCALL1,
-+  AVR32_SYNTAX_RCALL2,
-+  AVR32_SYNTAX_RETEQ,
-+  AVR32_SYNTAX_RETNE,
-+  AVR32_SYNTAX_RETCC,
-+  AVR32_SYNTAX_RETCS,
-+  AVR32_SYNTAX_RETGE,
-+  AVR32_SYNTAX_RETLT,
-+  AVR32_SYNTAX_RETMI,
-+  AVR32_SYNTAX_RETPL,
-+  AVR32_SYNTAX_RETLS,
-+  AVR32_SYNTAX_RETGT,
-+  AVR32_SYNTAX_RETLE,
-+  AVR32_SYNTAX_RETHI,
-+  AVR32_SYNTAX_RETVS,
-+  AVR32_SYNTAX_RETVC,
-+  AVR32_SYNTAX_RETQS,
-+  AVR32_SYNTAX_RETAL,
-+  AVR32_SYNTAX_RETHS,
-+  AVR32_SYNTAX_RETLO,
-+  AVR32_SYNTAX_RETD,
-+  AVR32_SYNTAX_RETE,
-+  AVR32_SYNTAX_RETJ,
-+  AVR32_SYNTAX_RETS,
-+  AVR32_SYNTAX_RJMP,
-+  AVR32_SYNTAX_ROL,
-+  AVR32_SYNTAX_ROR,
-+  AVR32_SYNTAX_RSUB1,
-+  AVR32_SYNTAX_RSUB2,
-+  AVR32_SYNTAX_SATADD_H,
-+  AVR32_SYNTAX_SATADD_W,
-+  AVR32_SYNTAX_SATRNDS,
-+  AVR32_SYNTAX_SATRNDU,
-+  AVR32_SYNTAX_SATS,
-+  AVR32_SYNTAX_SATSUB_H,
-+  AVR32_SYNTAX_SATSUB_W1,
-+  AVR32_SYNTAX_SATSUB_W2,
-+  AVR32_SYNTAX_SATU,
-+  AVR32_SYNTAX_SBC,
-+  AVR32_SYNTAX_SBR,
-+  AVR32_SYNTAX_SCALL,
-+  AVR32_SYNTAX_SCR,
-+  AVR32_SYNTAX_SLEEP,
-+  AVR32_SYNTAX_SREQ,
-+  AVR32_SYNTAX_SRNE,
-+  AVR32_SYNTAX_SRCC,
-+  AVR32_SYNTAX_SRCS,
-+  AVR32_SYNTAX_SRGE,
-+  AVR32_SYNTAX_SRLT,
-+  AVR32_SYNTAX_SRMI,
-+  AVR32_SYNTAX_SRPL,
-+  AVR32_SYNTAX_SRLS,
-+  AVR32_SYNTAX_SRGT,
-+  AVR32_SYNTAX_SRLE,
-+  AVR32_SYNTAX_SRHI,
-+  AVR32_SYNTAX_SRVS,
-+  AVR32_SYNTAX_SRVC,
-+  AVR32_SYNTAX_SRQS,
-+  AVR32_SYNTAX_SRAL,
-+  AVR32_SYNTAX_SRHS,
-+  AVR32_SYNTAX_SRLO,
-+  AVR32_SYNTAX_SSRF,
-+  AVR32_SYNTAX_ST_B1,
-+  AVR32_SYNTAX_ST_B2,
-+  AVR32_SYNTAX_ST_B5,
-+  AVR32_SYNTAX_ST_B3,
-+  AVR32_SYNTAX_ST_B4,
-+  AVR32_SYNTAX_ST_D1,
-+  AVR32_SYNTAX_ST_D2,
-+  AVR32_SYNTAX_ST_D3,
-+  AVR32_SYNTAX_ST_D5,
-+  AVR32_SYNTAX_ST_D4,
-+  AVR32_SYNTAX_ST_H1,
-+  AVR32_SYNTAX_ST_H2,
-+  AVR32_SYNTAX_ST_H5,
-+  AVR32_SYNTAX_ST_H3,
-+  AVR32_SYNTAX_ST_H4,
-+  AVR32_SYNTAX_ST_W1,
-+  AVR32_SYNTAX_ST_W2,
-+  AVR32_SYNTAX_ST_W5,
-+  AVR32_SYNTAX_ST_W3,
-+  AVR32_SYNTAX_ST_W4,
-+  AVR32_SYNTAX_STC_D1,
-+  AVR32_SYNTAX_STC_D2,
-+  AVR32_SYNTAX_STC_D3,
-+  AVR32_SYNTAX_STC_W1,
-+  AVR32_SYNTAX_STC_W2,
-+  AVR32_SYNTAX_STC_W3,
-+  AVR32_SYNTAX_STC0_D,
-+  AVR32_SYNTAX_STC0_W,
-+  AVR32_SYNTAX_STCM_D,
-+  AVR32_SYNTAX_STCM_D_PU,
-+  AVR32_SYNTAX_STCM_W,
-+  AVR32_SYNTAX_STCM_W_PU,
-+  AVR32_SYNTAX_STCOND,
-+  AVR32_SYNTAX_STDSP,
-+  AVR32_SYNTAX_STHH_W2,
-+  AVR32_SYNTAX_STHH_W1,
-+  AVR32_SYNTAX_STM,
-+  AVR32_SYNTAX_STM_PU,
-+  AVR32_SYNTAX_STMTS,
-+  AVR32_SYNTAX_STMTS_PU,
-+  AVR32_SYNTAX_STSWP_H,
-+  AVR32_SYNTAX_STSWP_W,
-+  AVR32_SYNTAX_SUB1,
-+  AVR32_SYNTAX_SUB2,
-+  AVR32_SYNTAX_SUB5,
-+  AVR32_SYNTAX_SUB3_SP,
-+  AVR32_SYNTAX_SUB3,
-+  AVR32_SYNTAX_SUB4,
-+  AVR32_SYNTAX_SUBEQ,
-+  AVR32_SYNTAX_SUBNE,
-+  AVR32_SYNTAX_SUBCC,
-+  AVR32_SYNTAX_SUBCS,
-+  AVR32_SYNTAX_SUBGE,
-+  AVR32_SYNTAX_SUBLT,
-+  AVR32_SYNTAX_SUBMI,
-+  AVR32_SYNTAX_SUBPL,
-+  AVR32_SYNTAX_SUBLS,
-+  AVR32_SYNTAX_SUBGT,
-+  AVR32_SYNTAX_SUBLE,
-+  AVR32_SYNTAX_SUBHI,
-+  AVR32_SYNTAX_SUBVS,
-+  AVR32_SYNTAX_SUBVC,
-+  AVR32_SYNTAX_SUBQS,
-+  AVR32_SYNTAX_SUBAL,
-+  AVR32_SYNTAX_SUBHS,
-+  AVR32_SYNTAX_SUBLO,
-+  AVR32_SYNTAX_SUBFEQ,
-+  AVR32_SYNTAX_SUBFNE,
-+  AVR32_SYNTAX_SUBFCC,
-+  AVR32_SYNTAX_SUBFCS,
-+  AVR32_SYNTAX_SUBFGE,
-+  AVR32_SYNTAX_SUBFLT,
-+  AVR32_SYNTAX_SUBFMI,
-+  AVR32_SYNTAX_SUBFPL,
-+  AVR32_SYNTAX_SUBFLS,
-+  AVR32_SYNTAX_SUBFGT,
-+  AVR32_SYNTAX_SUBFLE,
-+  AVR32_SYNTAX_SUBFHI,
-+  AVR32_SYNTAX_SUBFVS,
-+  AVR32_SYNTAX_SUBFVC,
-+  AVR32_SYNTAX_SUBFQS,
-+  AVR32_SYNTAX_SUBFAL,
-+  AVR32_SYNTAX_SUBFHS,
-+  AVR32_SYNTAX_SUBFLO,
-+  AVR32_SYNTAX_SUBHH_W,
-+  AVR32_SYNTAX_SWAP_B,
-+  AVR32_SYNTAX_SWAP_BH,
-+  AVR32_SYNTAX_SWAP_H,
-+  AVR32_SYNTAX_SYNC,
-+  AVR32_SYNTAX_TLBR,
-+  AVR32_SYNTAX_TLBS,
-+  AVR32_SYNTAX_TLBW,
-+  AVR32_SYNTAX_TNBZ,
-+  AVR32_SYNTAX_TST,
-+  AVR32_SYNTAX_XCHG,
-+  AVR32_SYNTAX_MEMC,
-+  AVR32_SYNTAX_MEMS,
-+  AVR32_SYNTAX_MEMT,
-+  AVR32_SYNTAX_FMAC_S,
-+  AVR32_SYNTAX_FNMAC_S,
-+  AVR32_SYNTAX_FMSC_S,
-+  AVR32_SYNTAX_FNMSC_S,
-+  AVR32_SYNTAX_FMUL_S,
-+  AVR32_SYNTAX_FNMUL_S,
-+  AVR32_SYNTAX_FADD_S,
-+  AVR32_SYNTAX_FSUB_S,
-+  AVR32_SYNTAX_FCASTRS_SW,
-+  AVR32_SYNTAX_FCASTRS_UW,
-+  AVR32_SYNTAX_FCASTSW_S,
-+  AVR32_SYNTAX_FCASTUW_S,
-+  AVR32_SYNTAX_FCMP_S,
-+  AVR32_SYNTAX_FCHK_S,
-+  AVR32_SYNTAX_FRCPA_S,
-+  AVR32_SYNTAX_FRSQRTA_S,
-+  AVR32_SYNTAX_LDA_W,
-+  AVR32_SYNTAX_CALL,
-+  AVR32_SYNTAX_PICOSVMAC0,
-+  AVR32_SYNTAX_PICOSVMAC1,
-+  AVR32_SYNTAX_PICOSVMAC2,
-+  AVR32_SYNTAX_PICOSVMAC3,
-+  AVR32_SYNTAX_PICOSVMUL0,
-+  AVR32_SYNTAX_PICOSVMUL1,
-+  AVR32_SYNTAX_PICOSVMUL2,
-+  AVR32_SYNTAX_PICOSVMUL3,
-+  AVR32_SYNTAX_PICOVMAC0,
-+  AVR32_SYNTAX_PICOVMAC1,
-+  AVR32_SYNTAX_PICOVMAC2,
-+  AVR32_SYNTAX_PICOVMAC3,
-+  AVR32_SYNTAX_PICOVMUL0,
-+  AVR32_SYNTAX_PICOVMUL1,
-+  AVR32_SYNTAX_PICOVMUL2,
-+  AVR32_SYNTAX_PICOVMUL3,
-+  AVR32_SYNTAX_PICOLD_D2,
-+  AVR32_SYNTAX_PICOLD_D3,
-+  AVR32_SYNTAX_PICOLD_D1,
-+  AVR32_SYNTAX_PICOLD_W2,
-+  AVR32_SYNTAX_PICOLD_W3,
-+  AVR32_SYNTAX_PICOLD_W1,
-+  AVR32_SYNTAX_PICOLDM_D,
-+  AVR32_SYNTAX_PICOLDM_D_PU,
-+  AVR32_SYNTAX_PICOLDM_W,
-+  AVR32_SYNTAX_PICOLDM_W_PU,
-+  AVR32_SYNTAX_PICOMV_D1,
-+  AVR32_SYNTAX_PICOMV_D2,
-+  AVR32_SYNTAX_PICOMV_W1,
-+  AVR32_SYNTAX_PICOMV_W2,
-+  AVR32_SYNTAX_PICOST_D2,
-+  AVR32_SYNTAX_PICOST_D3,
-+  AVR32_SYNTAX_PICOST_D1,
-+  AVR32_SYNTAX_PICOST_W2,
-+  AVR32_SYNTAX_PICOST_W3,
-+  AVR32_SYNTAX_PICOST_W1,
-+  AVR32_SYNTAX_PICOSTM_D,
-+  AVR32_SYNTAX_PICOSTM_D_PU,
-+  AVR32_SYNTAX_PICOSTM_W,
-+  AVR32_SYNTAX_PICOSTM_W_PU,
-+  AVR32_SYNTAX_RSUBEQ,
-+  AVR32_SYNTAX_RSUBNE,
-+  AVR32_SYNTAX_RSUBCC,
-+  AVR32_SYNTAX_RSUBCS,
-+  AVR32_SYNTAX_RSUBGE,
-+  AVR32_SYNTAX_RSUBLT,
-+  AVR32_SYNTAX_RSUBMI,
-+  AVR32_SYNTAX_RSUBPL,
-+  AVR32_SYNTAX_RSUBLS,
-+  AVR32_SYNTAX_RSUBGT,
-+  AVR32_SYNTAX_RSUBLE,
-+  AVR32_SYNTAX_RSUBHI,
-+  AVR32_SYNTAX_RSUBVS,
-+  AVR32_SYNTAX_RSUBVC,
-+  AVR32_SYNTAX_RSUBQS,
-+  AVR32_SYNTAX_RSUBAL,
-+  AVR32_SYNTAX_RSUBHS,
-+  AVR32_SYNTAX_RSUBLO,
-+  AVR32_SYNTAX_ADDEQ,
-+  AVR32_SYNTAX_ADDNE,
-+  AVR32_SYNTAX_ADDCC,
-+  AVR32_SYNTAX_ADDCS,
-+  AVR32_SYNTAX_ADDGE,
-+  AVR32_SYNTAX_ADDLT,
-+  AVR32_SYNTAX_ADDMI,
-+  AVR32_SYNTAX_ADDPL,
-+  AVR32_SYNTAX_ADDLS,
-+  AVR32_SYNTAX_ADDGT,
-+  AVR32_SYNTAX_ADDLE,
-+  AVR32_SYNTAX_ADDHI,
-+  AVR32_SYNTAX_ADDVS,
-+  AVR32_SYNTAX_ADDVC,
-+  AVR32_SYNTAX_ADDQS,
-+  AVR32_SYNTAX_ADDAL,
-+  AVR32_SYNTAX_ADDHS,
-+  AVR32_SYNTAX_ADDLO,
-+  AVR32_SYNTAX_SUB2EQ,
-+  AVR32_SYNTAX_SUB2NE,
-+  AVR32_SYNTAX_SUB2CC,
-+  AVR32_SYNTAX_SUB2CS,
-+  AVR32_SYNTAX_SUB2GE,
-+  AVR32_SYNTAX_SUB2LT,
-+  AVR32_SYNTAX_SUB2MI,
-+  AVR32_SYNTAX_SUB2PL,
-+  AVR32_SYNTAX_SUB2LS,
-+  AVR32_SYNTAX_SUB2GT,
-+  AVR32_SYNTAX_SUB2LE,
-+  AVR32_SYNTAX_SUB2HI,
-+  AVR32_SYNTAX_SUB2VS,
-+  AVR32_SYNTAX_SUB2VC,
-+  AVR32_SYNTAX_SUB2QS,
-+  AVR32_SYNTAX_SUB2AL,
-+  AVR32_SYNTAX_SUB2HS,
-+  AVR32_SYNTAX_SUB2LO,
-+  AVR32_SYNTAX_ANDEQ,
-+  AVR32_SYNTAX_ANDNE,
-+  AVR32_SYNTAX_ANDCC,
-+  AVR32_SYNTAX_ANDCS,
-+  AVR32_SYNTAX_ANDGE,
-+  AVR32_SYNTAX_ANDLT,
-+  AVR32_SYNTAX_ANDMI,
-+  AVR32_SYNTAX_ANDPL,
-+  AVR32_SYNTAX_ANDLS,
-+  AVR32_SYNTAX_ANDGT,
-+  AVR32_SYNTAX_ANDLE,
-+  AVR32_SYNTAX_ANDHI,
-+  AVR32_SYNTAX_ANDVS,
-+  AVR32_SYNTAX_ANDVC,
-+  AVR32_SYNTAX_ANDQS,
-+  AVR32_SYNTAX_ANDAL,
-+  AVR32_SYNTAX_ANDHS,
-+  AVR32_SYNTAX_ANDLO,
-+  AVR32_SYNTAX_OREQ,
-+  AVR32_SYNTAX_ORNE,
-+  AVR32_SYNTAX_ORCC,
-+  AVR32_SYNTAX_ORCS,
-+  AVR32_SYNTAX_ORGE,
-+  AVR32_SYNTAX_ORLT,
-+  AVR32_SYNTAX_ORMI,
-+  AVR32_SYNTAX_ORPL,
-+  AVR32_SYNTAX_ORLS,
-+  AVR32_SYNTAX_ORGT,
-+  AVR32_SYNTAX_ORLE,
-+  AVR32_SYNTAX_ORHI,
-+  AVR32_SYNTAX_ORVS,
-+  AVR32_SYNTAX_ORVC,
-+  AVR32_SYNTAX_ORQS,
-+  AVR32_SYNTAX_ORAL,
-+  AVR32_SYNTAX_ORHS,
-+  AVR32_SYNTAX_ORLO,
-+  AVR32_SYNTAX_EOREQ,
-+  AVR32_SYNTAX_EORNE,
-+  AVR32_SYNTAX_EORCC,
-+  AVR32_SYNTAX_EORCS,
-+  AVR32_SYNTAX_EORGE,
-+  AVR32_SYNTAX_EORLT,
-+  AVR32_SYNTAX_EORMI,
-+  AVR32_SYNTAX_EORPL,
-+  AVR32_SYNTAX_EORLS,
-+  AVR32_SYNTAX_EORGT,
-+  AVR32_SYNTAX_EORLE,
-+  AVR32_SYNTAX_EORHI,
-+  AVR32_SYNTAX_EORVS,
-+  AVR32_SYNTAX_EORVC,
-+  AVR32_SYNTAX_EORQS,
-+  AVR32_SYNTAX_EORAL,
-+  AVR32_SYNTAX_EORHS,
-+  AVR32_SYNTAX_EORLO,
-+  AVR32_SYNTAX_LD_WEQ,
-+  AVR32_SYNTAX_LD_WNE,
-+  AVR32_SYNTAX_LD_WCC,
-+  AVR32_SYNTAX_LD_WCS,
-+  AVR32_SYNTAX_LD_WGE,
-+  AVR32_SYNTAX_LD_WLT,
-+  AVR32_SYNTAX_LD_WMI,
-+  AVR32_SYNTAX_LD_WPL,
-+  AVR32_SYNTAX_LD_WLS,
-+  AVR32_SYNTAX_LD_WGT,
-+  AVR32_SYNTAX_LD_WLE,
-+  AVR32_SYNTAX_LD_WHI,
-+  AVR32_SYNTAX_LD_WVS,
-+  AVR32_SYNTAX_LD_WVC,
-+  AVR32_SYNTAX_LD_WQS,
-+  AVR32_SYNTAX_LD_WAL,
-+  AVR32_SYNTAX_LD_WHS,
-+  AVR32_SYNTAX_LD_WLO,
-+  AVR32_SYNTAX_LD_SHEQ,
-+  AVR32_SYNTAX_LD_SHNE,
-+  AVR32_SYNTAX_LD_SHCC,
-+  AVR32_SYNTAX_LD_SHCS,
-+  AVR32_SYNTAX_LD_SHGE,
-+  AVR32_SYNTAX_LD_SHLT,
-+  AVR32_SYNTAX_LD_SHMI,
-+  AVR32_SYNTAX_LD_SHPL,
-+  AVR32_SYNTAX_LD_SHLS,
-+  AVR32_SYNTAX_LD_SHGT,
-+  AVR32_SYNTAX_LD_SHLE,
-+  AVR32_SYNTAX_LD_SHHI,
-+  AVR32_SYNTAX_LD_SHVS,
-+  AVR32_SYNTAX_LD_SHVC,
-+  AVR32_SYNTAX_LD_SHQS,
-+  AVR32_SYNTAX_LD_SHAL,
-+  AVR32_SYNTAX_LD_SHHS,
-+  AVR32_SYNTAX_LD_SHLO,
-+  AVR32_SYNTAX_LD_UHEQ,
-+  AVR32_SYNTAX_LD_UHNE,
-+  AVR32_SYNTAX_LD_UHCC,
-+  AVR32_SYNTAX_LD_UHCS,
-+  AVR32_SYNTAX_LD_UHGE,
-+  AVR32_SYNTAX_LD_UHLT,
-+  AVR32_SYNTAX_LD_UHMI,
-+  AVR32_SYNTAX_LD_UHPL,
-+  AVR32_SYNTAX_LD_UHLS,
-+  AVR32_SYNTAX_LD_UHGT,
-+  AVR32_SYNTAX_LD_UHLE,
-+  AVR32_SYNTAX_LD_UHHI,
-+  AVR32_SYNTAX_LD_UHVS,
-+  AVR32_SYNTAX_LD_UHVC,
-+  AVR32_SYNTAX_LD_UHQS,
-+  AVR32_SYNTAX_LD_UHAL,
-+  AVR32_SYNTAX_LD_UHHS,
-+  AVR32_SYNTAX_LD_UHLO,
-+  AVR32_SYNTAX_LD_SBEQ,
-+  AVR32_SYNTAX_LD_SBNE,
-+  AVR32_SYNTAX_LD_SBCC,
-+  AVR32_SYNTAX_LD_SBCS,
-+  AVR32_SYNTAX_LD_SBGE,
-+  AVR32_SYNTAX_LD_SBLT,
-+  AVR32_SYNTAX_LD_SBMI,
-+  AVR32_SYNTAX_LD_SBPL,
-+  AVR32_SYNTAX_LD_SBLS,
-+  AVR32_SYNTAX_LD_SBGT,
-+  AVR32_SYNTAX_LD_SBLE,
-+  AVR32_SYNTAX_LD_SBHI,
-+  AVR32_SYNTAX_LD_SBVS,
-+  AVR32_SYNTAX_LD_SBVC,
-+  AVR32_SYNTAX_LD_SBQS,
-+  AVR32_SYNTAX_LD_SBAL,
-+  AVR32_SYNTAX_LD_SBHS,
-+  AVR32_SYNTAX_LD_SBLO,
-+  AVR32_SYNTAX_LD_UBEQ,
-+  AVR32_SYNTAX_LD_UBNE,
-+  AVR32_SYNTAX_LD_UBCC,
-+  AVR32_SYNTAX_LD_UBCS,
-+  AVR32_SYNTAX_LD_UBGE,
-+  AVR32_SYNTAX_LD_UBLT,
-+  AVR32_SYNTAX_LD_UBMI,
-+  AVR32_SYNTAX_LD_UBPL,
-+  AVR32_SYNTAX_LD_UBLS,
-+  AVR32_SYNTAX_LD_UBGT,
-+  AVR32_SYNTAX_LD_UBLE,
-+  AVR32_SYNTAX_LD_UBHI,
-+  AVR32_SYNTAX_LD_UBVS,
-+  AVR32_SYNTAX_LD_UBVC,
-+  AVR32_SYNTAX_LD_UBQS,
-+  AVR32_SYNTAX_LD_UBAL,
-+  AVR32_SYNTAX_LD_UBHS,
-+  AVR32_SYNTAX_LD_UBLO,
-+  AVR32_SYNTAX_ST_WEQ,
-+  AVR32_SYNTAX_ST_WNE,
-+  AVR32_SYNTAX_ST_WCC,
-+  AVR32_SYNTAX_ST_WCS,
-+  AVR32_SYNTAX_ST_WGE,
-+  AVR32_SYNTAX_ST_WLT,
-+  AVR32_SYNTAX_ST_WMI,
-+  AVR32_SYNTAX_ST_WPL,
-+  AVR32_SYNTAX_ST_WLS,
-+  AVR32_SYNTAX_ST_WGT,
-+  AVR32_SYNTAX_ST_WLE,
-+  AVR32_SYNTAX_ST_WHI,
-+  AVR32_SYNTAX_ST_WVS,
-+  AVR32_SYNTAX_ST_WVC,
-+  AVR32_SYNTAX_ST_WQS,
-+  AVR32_SYNTAX_ST_WAL,
-+  AVR32_SYNTAX_ST_WHS,
-+  AVR32_SYNTAX_ST_WLO,
-+  AVR32_SYNTAX_ST_HEQ,
-+  AVR32_SYNTAX_ST_HNE,
-+  AVR32_SYNTAX_ST_HCC,
-+  AVR32_SYNTAX_ST_HCS,
-+  AVR32_SYNTAX_ST_HGE,
-+  AVR32_SYNTAX_ST_HLT,
-+  AVR32_SYNTAX_ST_HMI,
-+  AVR32_SYNTAX_ST_HPL,
-+  AVR32_SYNTAX_ST_HLS,
-+  AVR32_SYNTAX_ST_HGT,
-+  AVR32_SYNTAX_ST_HLE,
-+  AVR32_SYNTAX_ST_HHI,
-+  AVR32_SYNTAX_ST_HVS,
-+  AVR32_SYNTAX_ST_HVC,
-+  AVR32_SYNTAX_ST_HQS,
-+  AVR32_SYNTAX_ST_HAL,
-+  AVR32_SYNTAX_ST_HHS,
-+  AVR32_SYNTAX_ST_HLO,
-+  AVR32_SYNTAX_ST_BEQ,
-+  AVR32_SYNTAX_ST_BNE,
-+  AVR32_SYNTAX_ST_BCC,
-+  AVR32_SYNTAX_ST_BCS,
-+  AVR32_SYNTAX_ST_BGE,
-+  AVR32_SYNTAX_ST_BLT,
-+  AVR32_SYNTAX_ST_BMI,
-+  AVR32_SYNTAX_ST_BPL,
-+  AVR32_SYNTAX_ST_BLS,
-+  AVR32_SYNTAX_ST_BGT,
-+  AVR32_SYNTAX_ST_BLE,
-+  AVR32_SYNTAX_ST_BHI,
-+  AVR32_SYNTAX_ST_BVS,
-+  AVR32_SYNTAX_ST_BVC,
-+  AVR32_SYNTAX_ST_BQS,
-+  AVR32_SYNTAX_ST_BAL,
-+  AVR32_SYNTAX_ST_BHS,
-+  AVR32_SYNTAX_ST_BLO,
-+  AVR32_SYNTAX_MOVH,
-+  AVR32_SYNTAX__END_
-+};
-+#define AVR32_NR_SYNTAX AVR32_SYNTAX__END_
-+
-+enum avr32_alias_type
-+  {
-+    AVR32_ALIAS_PICOSVMAC0,
-+    AVR32_ALIAS_PICOSVMAC1,
-+    AVR32_ALIAS_PICOSVMAC2,
-+    AVR32_ALIAS_PICOSVMAC3,
-+    AVR32_ALIAS_PICOSVMUL0,
-+    AVR32_ALIAS_PICOSVMUL1,
-+    AVR32_ALIAS_PICOSVMUL2,
-+    AVR32_ALIAS_PICOSVMUL3,
-+    AVR32_ALIAS_PICOVMAC0,
-+    AVR32_ALIAS_PICOVMAC1,
-+    AVR32_ALIAS_PICOVMAC2,
-+    AVR32_ALIAS_PICOVMAC3,
-+    AVR32_ALIAS_PICOVMUL0,
-+    AVR32_ALIAS_PICOVMUL1,
-+    AVR32_ALIAS_PICOVMUL2,
-+    AVR32_ALIAS_PICOVMUL3,
-+    AVR32_ALIAS_PICOLD_D1,
-+    AVR32_ALIAS_PICOLD_D2,
-+    AVR32_ALIAS_PICOLD_D3,
-+    AVR32_ALIAS_PICOLD_W1,
-+    AVR32_ALIAS_PICOLD_W2,
-+    AVR32_ALIAS_PICOLD_W3,
-+    AVR32_ALIAS_PICOLDM_D,
-+    AVR32_ALIAS_PICOLDM_D_PU,
-+    AVR32_ALIAS_PICOLDM_W,
-+    AVR32_ALIAS_PICOLDM_W_PU,
-+    AVR32_ALIAS_PICOMV_D1,
-+    AVR32_ALIAS_PICOMV_D2,
-+    AVR32_ALIAS_PICOMV_W1,
-+    AVR32_ALIAS_PICOMV_W2,
-+    AVR32_ALIAS_PICOST_D1,
-+    AVR32_ALIAS_PICOST_D2,
-+    AVR32_ALIAS_PICOST_D3,
-+    AVR32_ALIAS_PICOST_W1,
-+    AVR32_ALIAS_PICOST_W2,
-+    AVR32_ALIAS_PICOST_W3,
-+    AVR32_ALIAS_PICOSTM_D,
-+    AVR32_ALIAS_PICOSTM_D_PU,
-+    AVR32_ALIAS_PICOSTM_W,
-+    AVR32_ALIAS_PICOSTM_W_PU,
-+    AVR32_ALIAS__END_
-+  };
-+#define AVR32_NR_ALIAS AVR32_ALIAS__END_
-+
-+enum avr32_mnemonic_type
-+{
-+  AVR32_MNEMONIC_ABS,
-+  AVR32_MNEMONIC_ACALL,
-+  AVR32_MNEMONIC_ACR,
-+  AVR32_MNEMONIC_ADC,
-+  AVR32_MNEMONIC_ADD,
-+  AVR32_MNEMONIC_ADDABS,
-+  AVR32_MNEMONIC_ADDHH_W,
-+  AVR32_MNEMONIC_AND,
-+  AVR32_MNEMONIC_ANDH,
-+  AVR32_MNEMONIC_ANDL,
-+  AVR32_MNEMONIC_ANDN,
-+  AVR32_MNEMONIC_ASR,
-+  AVR32_MNEMONIC_BFEXTS,
-+  AVR32_MNEMONIC_BFEXTU,
-+  AVR32_MNEMONIC_BFINS,
-+  AVR32_MNEMONIC_BLD,
-+  AVR32_MNEMONIC_BREQ,
-+  AVR32_MNEMONIC_BRNE,
-+  AVR32_MNEMONIC_BRCC,
-+  AVR32_MNEMONIC_BRCS,
-+  AVR32_MNEMONIC_BRGE,
-+  AVR32_MNEMONIC_BRLT,
-+  AVR32_MNEMONIC_BRMI,
-+  AVR32_MNEMONIC_BRPL,
-+  AVR32_MNEMONIC_BRHS,
-+  AVR32_MNEMONIC_BRLO,
-+  AVR32_MNEMONIC_BRLS,
-+  AVR32_MNEMONIC_BRGT,
-+  AVR32_MNEMONIC_BRLE,
-+  AVR32_MNEMONIC_BRHI,
-+  AVR32_MNEMONIC_BRVS,
-+  AVR32_MNEMONIC_BRVC,
-+  AVR32_MNEMONIC_BRQS,
-+  AVR32_MNEMONIC_BRAL,
-+  AVR32_MNEMONIC_BREAKPOINT,
-+  AVR32_MNEMONIC_BREV,
-+  AVR32_MNEMONIC_BST,
-+  AVR32_MNEMONIC_CACHE,
-+  AVR32_MNEMONIC_CASTS_B,
-+  AVR32_MNEMONIC_CASTS_H,
-+  AVR32_MNEMONIC_CASTU_B,
-+  AVR32_MNEMONIC_CASTU_H,
-+  AVR32_MNEMONIC_CBR,
-+  AVR32_MNEMONIC_CLZ,
-+  AVR32_MNEMONIC_COM,
-+  AVR32_MNEMONIC_COP,
-+  AVR32_MNEMONIC_CP_B,
-+  AVR32_MNEMONIC_CP_H,
-+  AVR32_MNEMONIC_CP_W,
-+  AVR32_MNEMONIC_CP,
-+  AVR32_MNEMONIC_CPC,
-+  AVR32_MNEMONIC_CSRF,
-+  AVR32_MNEMONIC_CSRFCZ,
-+  AVR32_MNEMONIC_DIVS,
-+  AVR32_MNEMONIC_DIVU,
-+  AVR32_MNEMONIC_EOR,
-+  AVR32_MNEMONIC_EORL,
-+  AVR32_MNEMONIC_EORH,
-+  AVR32_MNEMONIC_FRS,
-+  AVR32_MNEMONIC_SSCALL,
-+  AVR32_MNEMONIC_RETSS,
-+  AVR32_MNEMONIC_ICALL,
-+  AVR32_MNEMONIC_INCJOSP,
-+  AVR32_MNEMONIC_LD_D,
-+  AVR32_MNEMONIC_LD_SB,
-+  AVR32_MNEMONIC_LD_UB,
-+  AVR32_MNEMONIC_LD_SH,
-+  AVR32_MNEMONIC_LD_UH,
-+  AVR32_MNEMONIC_LD_W,
-+  AVR32_MNEMONIC_LDC_D,
-+  AVR32_MNEMONIC_LDC_W,
-+  AVR32_MNEMONIC_LDC0_D,
-+  AVR32_MNEMONIC_LDC0_W,
-+  AVR32_MNEMONIC_LDCM_D,
-+  AVR32_MNEMONIC_LDCM_W,
-+  AVR32_MNEMONIC_LDDPC,
-+  AVR32_MNEMONIC_LDDSP,
-+  AVR32_MNEMONIC_LDINS_B,
-+  AVR32_MNEMONIC_LDINS_H,
-+  AVR32_MNEMONIC_LDM,
-+  AVR32_MNEMONIC_LDMTS,
-+  AVR32_MNEMONIC_LDSWP_SH,
-+  AVR32_MNEMONIC_LDSWP_UH,
-+  AVR32_MNEMONIC_LDSWP_W,
-+  AVR32_MNEMONIC_LSL,
-+  AVR32_MNEMONIC_LSR,
-+  AVR32_MNEMONIC_MAC,
-+  AVR32_MNEMONIC_MACHH_D,
-+  AVR32_MNEMONIC_MACHH_W,
-+  AVR32_MNEMONIC_MACS_D,
-+  AVR32_MNEMONIC_MACSATHH_W,
-+  AVR32_MNEMONIC_MACU_D,
-+  AVR32_MNEMONIC_MACWH_D,
-+  AVR32_MNEMONIC_MAX,
-+  AVR32_MNEMONIC_MCALL,
-+  AVR32_MNEMONIC_MFDR,
-+  AVR32_MNEMONIC_MFSR,
-+  AVR32_MNEMONIC_MIN,
-+  AVR32_MNEMONIC_MOV,
-+  AVR32_MNEMONIC_MOVEQ,
-+  AVR32_MNEMONIC_MOVNE,
-+  AVR32_MNEMONIC_MOVCC,
-+  AVR32_MNEMONIC_MOVCS,
-+  AVR32_MNEMONIC_MOVGE,
-+  AVR32_MNEMONIC_MOVLT,
-+  AVR32_MNEMONIC_MOVMI,
-+  AVR32_MNEMONIC_MOVPL,
-+  AVR32_MNEMONIC_MOVLS,
-+  AVR32_MNEMONIC_MOVGT,
-+  AVR32_MNEMONIC_MOVLE,
-+  AVR32_MNEMONIC_MOVHI,
-+  AVR32_MNEMONIC_MOVVS,
-+  AVR32_MNEMONIC_MOVVC,
-+  AVR32_MNEMONIC_MOVQS,
-+  AVR32_MNEMONIC_MOVAL,
-+  AVR32_MNEMONIC_MOVHS,
-+  AVR32_MNEMONIC_MOVLO,
-+  AVR32_MNEMONIC_MTDR,
-+  AVR32_MNEMONIC_MTSR,
-+  AVR32_MNEMONIC_MUL,
-+  AVR32_MNEMONIC_MULHH_W,
-+  AVR32_MNEMONIC_MULNHH_W,
-+  AVR32_MNEMONIC_MULNWH_D,
-+  AVR32_MNEMONIC_MULS_D,
-+  AVR32_MNEMONIC_MULSATHH_H,
-+  AVR32_MNEMONIC_MULSATHH_W,
-+  AVR32_MNEMONIC_MULSATRNDHH_H,
-+  AVR32_MNEMONIC_MULSATRNDWH_W,
-+  AVR32_MNEMONIC_MULSATWH_W,
-+  AVR32_MNEMONIC_MULU_D,
-+  AVR32_MNEMONIC_MULWH_D,
-+  AVR32_MNEMONIC_MUSFR,
-+  AVR32_MNEMONIC_MUSTR,
-+  AVR32_MNEMONIC_MVCR_D,
-+  AVR32_MNEMONIC_MVCR_W,
-+  AVR32_MNEMONIC_MVRC_D,
-+  AVR32_MNEMONIC_MVRC_W,
-+  AVR32_MNEMONIC_NEG,
-+  AVR32_MNEMONIC_NOP,
-+  AVR32_MNEMONIC_OR,
-+  AVR32_MNEMONIC_ORH,
-+  AVR32_MNEMONIC_ORL,
-+  AVR32_MNEMONIC_PABS_SB,
-+  AVR32_MNEMONIC_PABS_SH,
-+  AVR32_MNEMONIC_PACKSH_SB,
-+  AVR32_MNEMONIC_PACKSH_UB,
-+  AVR32_MNEMONIC_PACKW_SH,
-+  AVR32_MNEMONIC_PADD_B,
-+  AVR32_MNEMONIC_PADD_H,
-+  AVR32_MNEMONIC_PADDH_SH,
-+  AVR32_MNEMONIC_PADDH_UB,
-+  AVR32_MNEMONIC_PADDS_SB,
-+  AVR32_MNEMONIC_PADDS_SH,
-+  AVR32_MNEMONIC_PADDS_UB,
-+  AVR32_MNEMONIC_PADDS_UH,
-+  AVR32_MNEMONIC_PADDSUB_H,
-+  AVR32_MNEMONIC_PADDSUBH_SH,
-+  AVR32_MNEMONIC_PADDSUBS_SH,
-+  AVR32_MNEMONIC_PADDSUBS_UH,
-+  AVR32_MNEMONIC_PADDX_H,
-+  AVR32_MNEMONIC_PADDXH_SH,
-+  AVR32_MNEMONIC_PADDXS_SH,
-+  AVR32_MNEMONIC_PADDXS_UH,
-+  AVR32_MNEMONIC_PASR_B,
-+  AVR32_MNEMONIC_PASR_H,
-+  AVR32_MNEMONIC_PAVG_SH,
-+  AVR32_MNEMONIC_PAVG_UB,
-+  AVR32_MNEMONIC_PLSL_B,
-+  AVR32_MNEMONIC_PLSL_H,
-+  AVR32_MNEMONIC_PLSR_B,
-+  AVR32_MNEMONIC_PLSR_H,
-+  AVR32_MNEMONIC_PMAX_SH,
-+  AVR32_MNEMONIC_PMAX_UB,
-+  AVR32_MNEMONIC_PMIN_SH,
-+  AVR32_MNEMONIC_PMIN_UB,
-+  AVR32_MNEMONIC_POPJC,
-+  AVR32_MNEMONIC_POPM,
-+  AVR32_MNEMONIC_PREF,
-+  AVR32_MNEMONIC_PSAD,
-+  AVR32_MNEMONIC_PSUB_B,
-+  AVR32_MNEMONIC_PSUB_H,
-+  AVR32_MNEMONIC_PSUBADD_H,
-+  AVR32_MNEMONIC_PSUBADDH_SH,
-+  AVR32_MNEMONIC_PSUBADDS_SH,
-+  AVR32_MNEMONIC_PSUBADDS_UH,
-+  AVR32_MNEMONIC_PSUBH_SH,
-+  AVR32_MNEMONIC_PSUBH_UB,
-+  AVR32_MNEMONIC_PSUBS_SB,
-+  AVR32_MNEMONIC_PSUBS_SH,
-+  AVR32_MNEMONIC_PSUBS_UB,
-+  AVR32_MNEMONIC_PSUBS_UH,
-+  AVR32_MNEMONIC_PSUBX_H,
-+  AVR32_MNEMONIC_PSUBXH_SH,
-+  AVR32_MNEMONIC_PSUBXS_SH,
-+  AVR32_MNEMONIC_PSUBXS_UH,
-+  AVR32_MNEMONIC_PUNPCKSB_H,
-+  AVR32_MNEMONIC_PUNPCKUB_H,
-+  AVR32_MNEMONIC_PUSHJC,
-+  AVR32_MNEMONIC_PUSHM,
-+  AVR32_MNEMONIC_RCALL,
-+  AVR32_MNEMONIC_RETEQ,
-+  AVR32_MNEMONIC_RETNE,
-+  AVR32_MNEMONIC_RETCC,
-+  AVR32_MNEMONIC_RETCS,
-+  AVR32_MNEMONIC_RETGE,
-+  AVR32_MNEMONIC_RETLT,
-+  AVR32_MNEMONIC_RETMI,
-+  AVR32_MNEMONIC_RETPL,
-+  AVR32_MNEMONIC_RETLS,
-+  AVR32_MNEMONIC_RETGT,
-+  AVR32_MNEMONIC_RETLE,
-+  AVR32_MNEMONIC_RETHI,
-+  AVR32_MNEMONIC_RETVS,
-+  AVR32_MNEMONIC_RETVC,
-+  AVR32_MNEMONIC_RETQS,
-+  AVR32_MNEMONIC_RETAL,
-+  AVR32_MNEMONIC_RETHS,
-+  AVR32_MNEMONIC_RETLO,
-+  AVR32_MNEMONIC_RET,
-+  AVR32_MNEMONIC_RETD,
-+  AVR32_MNEMONIC_RETE,
-+  AVR32_MNEMONIC_RETJ,
-+  AVR32_MNEMONIC_RETS,
-+  AVR32_MNEMONIC_RJMP,
-+  AVR32_MNEMONIC_ROL,
-+  AVR32_MNEMONIC_ROR,
-+  AVR32_MNEMONIC_RSUB,
-+  AVR32_MNEMONIC_SATADD_H,
-+  AVR32_MNEMONIC_SATADD_W,
-+  AVR32_MNEMONIC_SATRNDS,
-+  AVR32_MNEMONIC_SATRNDU,
-+  AVR32_MNEMONIC_SATS,
-+  AVR32_MNEMONIC_SATSUB_H,
-+  AVR32_MNEMONIC_SATSUB_W,
-+  AVR32_MNEMONIC_SATU,
-+  AVR32_MNEMONIC_SBC,
-+  AVR32_MNEMONIC_SBR,
-+  AVR32_MNEMONIC_SCALL,
-+  AVR32_MNEMONIC_SCR,
-+  AVR32_MNEMONIC_SLEEP,
-+  AVR32_MNEMONIC_SREQ,
-+  AVR32_MNEMONIC_SRNE,
-+  AVR32_MNEMONIC_SRCC,
-+  AVR32_MNEMONIC_SRCS,
-+  AVR32_MNEMONIC_SRGE,
-+  AVR32_MNEMONIC_SRLT,
-+  AVR32_MNEMONIC_SRMI,
-+  AVR32_MNEMONIC_SRPL,
-+  AVR32_MNEMONIC_SRLS,
-+  AVR32_MNEMONIC_SRGT,
-+  AVR32_MNEMONIC_SRLE,
-+  AVR32_MNEMONIC_SRHI,
-+  AVR32_MNEMONIC_SRVS,
-+  AVR32_MNEMONIC_SRVC,
-+  AVR32_MNEMONIC_SRQS,
-+  AVR32_MNEMONIC_SRAL,
-+  AVR32_MNEMONIC_SRHS,
-+  AVR32_MNEMONIC_SRLO,
-+  AVR32_MNEMONIC_SSRF,
-+  AVR32_MNEMONIC_ST_B,
-+  AVR32_MNEMONIC_ST_D,
-+  AVR32_MNEMONIC_ST_H,
-+  AVR32_MNEMONIC_ST_W,
-+  AVR32_MNEMONIC_STC_D,
-+  AVR32_MNEMONIC_STC_W,
-+  AVR32_MNEMONIC_STC0_D,
-+  AVR32_MNEMONIC_STC0_W,
-+  AVR32_MNEMONIC_STCM_D,
-+  AVR32_MNEMONIC_STCM_W,
-+  AVR32_MNEMONIC_STCOND,
-+  AVR32_MNEMONIC_STDSP,
-+  AVR32_MNEMONIC_STHH_W,
-+  AVR32_MNEMONIC_STM,
-+  AVR32_MNEMONIC_STMTS,
-+  AVR32_MNEMONIC_STSWP_H,
-+  AVR32_MNEMONIC_STSWP_W,
-+  AVR32_MNEMONIC_SUB,
-+  AVR32_MNEMONIC_SUBEQ,
-+  AVR32_MNEMONIC_SUBNE,
-+  AVR32_MNEMONIC_SUBCC,
-+  AVR32_MNEMONIC_SUBCS,
-+  AVR32_MNEMONIC_SUBGE,
-+  AVR32_MNEMONIC_SUBLT,
-+  AVR32_MNEMONIC_SUBMI,
-+  AVR32_MNEMONIC_SUBPL,
-+  AVR32_MNEMONIC_SUBLS,
-+  AVR32_MNEMONIC_SUBGT,
-+  AVR32_MNEMONIC_SUBLE,
-+  AVR32_MNEMONIC_SUBHI,
-+  AVR32_MNEMONIC_SUBVS,
-+  AVR32_MNEMONIC_SUBVC,
-+  AVR32_MNEMONIC_SUBQS,
-+  AVR32_MNEMONIC_SUBAL,
-+  AVR32_MNEMONIC_SUBHS,
-+  AVR32_MNEMONIC_SUBLO,
-+  AVR32_MNEMONIC_SUBFEQ,
-+  AVR32_MNEMONIC_SUBFNE,
-+  AVR32_MNEMONIC_SUBFCC,
-+  AVR32_MNEMONIC_SUBFCS,
-+  AVR32_MNEMONIC_SUBFGE,
-+  AVR32_MNEMONIC_SUBFLT,
-+  AVR32_MNEMONIC_SUBFMI,
-+  AVR32_MNEMONIC_SUBFPL,
-+  AVR32_MNEMONIC_SUBFLS,
-+  AVR32_MNEMONIC_SUBFGT,
-+  AVR32_MNEMONIC_SUBFLE,
-+  AVR32_MNEMONIC_SUBFHI,
-+  AVR32_MNEMONIC_SUBFVS,
-+  AVR32_MNEMONIC_SUBFVC,
-+  AVR32_MNEMONIC_SUBFQS,
-+  AVR32_MNEMONIC_SUBFAL,
-+  AVR32_MNEMONIC_SUBFHS,
-+  AVR32_MNEMONIC_SUBFLO,
-+  AVR32_MNEMONIC_SUBHH_W,
-+  AVR32_MNEMONIC_SWAP_B,
-+  AVR32_MNEMONIC_SWAP_BH,
-+  AVR32_MNEMONIC_SWAP_H,
-+  AVR32_MNEMONIC_SYNC,
-+  AVR32_MNEMONIC_TLBR,
-+  AVR32_MNEMONIC_TLBS,
-+  AVR32_MNEMONIC_TLBW,
-+  AVR32_MNEMONIC_TNBZ,
-+  AVR32_MNEMONIC_TST,
-+  AVR32_MNEMONIC_XCHG,
-+  AVR32_MNEMONIC_MEMC,
-+  AVR32_MNEMONIC_MEMS,
-+  AVR32_MNEMONIC_MEMT,
-+  AVR32_MNEMONIC_FMAC_S,
-+  AVR32_MNEMONIC_FNMAC_S,
-+  AVR32_MNEMONIC_FMSC_S,
-+  AVR32_MNEMONIC_FNMSC_S,
-+  AVR32_MNEMONIC_FMUL_S,
-+  AVR32_MNEMONIC_FNMUL_S,
-+  AVR32_MNEMONIC_FADD_S,
-+  AVR32_MNEMONIC_FSUB_S,
-+  AVR32_MNEMONIC_FCASTRS_SW,
-+  AVR32_MNEMONIC_FCASTRS_UW,
-+  AVR32_MNEMONIC_FCASTSW_S,
-+  AVR32_MNEMONIC_FCASTUW_S,
-+  AVR32_MNEMONIC_FCMP_S,
-+  AVR32_MNEMONIC_FCHK_S,
-+  AVR32_MNEMONIC_FRCPA_S,
-+  AVR32_MNEMONIC_FRSQRTA_S,
-+  /* AVR32_MNEMONIC_FLD_S,
-+     AVR32_MNEMONIC_FLD_D,
-+     AVR32_MNEMONIC_FST_S,
-+     AVR32_MNEMONIC_FST_D, */
-+  AVR32_MNEMONIC_LDA_W,
-+  AVR32_MNEMONIC_CALL,
-+  AVR32_MNEMONIC_PICOSVMAC,
-+  AVR32_MNEMONIC_PICOSVMUL,
-+  AVR32_MNEMONIC_PICOVMAC,
-+  AVR32_MNEMONIC_PICOVMUL,
-+  AVR32_MNEMONIC_PICOLD_D,
-+  AVR32_MNEMONIC_PICOLD_W,
-+  AVR32_MNEMONIC_PICOLDM_D,
-+  AVR32_MNEMONIC_PICOLDM_W,
-+  AVR32_MNEMONIC_PICOMV_D,
-+  AVR32_MNEMONIC_PICOMV_W,
-+  AVR32_MNEMONIC_PICOST_D,
-+  AVR32_MNEMONIC_PICOST_W,
-+  AVR32_MNEMONIC_PICOSTM_D,
-+  AVR32_MNEMONIC_PICOSTM_W,
-+  AVR32_MNEMONIC_RSUBEQ,
-+  AVR32_MNEMONIC_RSUBNE,
-+  AVR32_MNEMONIC_RSUBCC,
-+  AVR32_MNEMONIC_RSUBCS,
-+  AVR32_MNEMONIC_RSUBGE,
-+  AVR32_MNEMONIC_RSUBLT,
-+  AVR32_MNEMONIC_RSUBMI,
-+  AVR32_MNEMONIC_RSUBPL,
-+  AVR32_MNEMONIC_RSUBLS,
-+  AVR32_MNEMONIC_RSUBGT,
-+  AVR32_MNEMONIC_RSUBLE,
-+  AVR32_MNEMONIC_RSUBHI,
-+  AVR32_MNEMONIC_RSUBVS,
-+  AVR32_MNEMONIC_RSUBVC,
-+  AVR32_MNEMONIC_RSUBQS,
-+  AVR32_MNEMONIC_RSUBAL,
-+  AVR32_MNEMONIC_RSUBHS,
-+  AVR32_MNEMONIC_RSUBLO,
-+  AVR32_MNEMONIC_ADDEQ,
-+  AVR32_MNEMONIC_ADDNE,
-+  AVR32_MNEMONIC_ADDCC,
-+  AVR32_MNEMONIC_ADDCS,
-+  AVR32_MNEMONIC_ADDGE,
-+  AVR32_MNEMONIC_ADDLT,
-+  AVR32_MNEMONIC_ADDMI,
-+  AVR32_MNEMONIC_ADDPL,
-+  AVR32_MNEMONIC_ADDLS,
-+  AVR32_MNEMONIC_ADDGT,
-+  AVR32_MNEMONIC_ADDLE,
-+  AVR32_MNEMONIC_ADDHI,
-+  AVR32_MNEMONIC_ADDVS,
-+  AVR32_MNEMONIC_ADDVC,
-+  AVR32_MNEMONIC_ADDQS,
-+  AVR32_MNEMONIC_ADDAL,
-+  AVR32_MNEMONIC_ADDHS,
-+  AVR32_MNEMONIC_ADDLO,
-+  AVR32_MNEMONIC_ANDEQ,
-+  AVR32_MNEMONIC_ANDNE,
-+  AVR32_MNEMONIC_ANDCC,
-+  AVR32_MNEMONIC_ANDCS,
-+  AVR32_MNEMONIC_ANDGE,
-+  AVR32_MNEMONIC_ANDLT,
-+  AVR32_MNEMONIC_ANDMI,
-+  AVR32_MNEMONIC_ANDPL,
-+  AVR32_MNEMONIC_ANDLS,
-+  AVR32_MNEMONIC_ANDGT,
-+  AVR32_MNEMONIC_ANDLE,
-+  AVR32_MNEMONIC_ANDHI,
-+  AVR32_MNEMONIC_ANDVS,
-+  AVR32_MNEMONIC_ANDVC,
-+  AVR32_MNEMONIC_ANDQS,
-+  AVR32_MNEMONIC_ANDAL,
-+  AVR32_MNEMONIC_ANDHS,
-+  AVR32_MNEMONIC_ANDLO,
-+  AVR32_MNEMONIC_OREQ,
-+  AVR32_MNEMONIC_ORNE,
-+  AVR32_MNEMONIC_ORCC,
-+  AVR32_MNEMONIC_ORCS,
-+  AVR32_MNEMONIC_ORGE,
-+  AVR32_MNEMONIC_ORLT,
-+  AVR32_MNEMONIC_ORMI,
-+  AVR32_MNEMONIC_ORPL,
-+  AVR32_MNEMONIC_ORLS,
-+  AVR32_MNEMONIC_ORGT,
-+  AVR32_MNEMONIC_ORLE,
-+  AVR32_MNEMONIC_ORHI,
-+  AVR32_MNEMONIC_ORVS,
-+  AVR32_MNEMONIC_ORVC,
-+  AVR32_MNEMONIC_ORQS,
-+  AVR32_MNEMONIC_ORAL,
-+  AVR32_MNEMONIC_ORHS,
-+  AVR32_MNEMONIC_ORLO,
-+  AVR32_MNEMONIC_EOREQ,
-+  AVR32_MNEMONIC_EORNE,
-+  AVR32_MNEMONIC_EORCC,
-+  AVR32_MNEMONIC_EORCS,
-+  AVR32_MNEMONIC_EORGE,
-+  AVR32_MNEMONIC_EORLT,
-+  AVR32_MNEMONIC_EORMI,
-+  AVR32_MNEMONIC_EORPL,
-+  AVR32_MNEMONIC_EORLS,
-+  AVR32_MNEMONIC_EORGT,
-+  AVR32_MNEMONIC_EORLE,
-+  AVR32_MNEMONIC_EORHI,
-+  AVR32_MNEMONIC_EORVS,
-+  AVR32_MNEMONIC_EORVC,
-+  AVR32_MNEMONIC_EORQS,
-+  AVR32_MNEMONIC_EORAL,
-+  AVR32_MNEMONIC_EORHS,
-+  AVR32_MNEMONIC_EORLO,
-+  AVR32_MNEMONIC_LD_WEQ,
-+  AVR32_MNEMONIC_LD_WNE,
-+  AVR32_MNEMONIC_LD_WCC,
-+  AVR32_MNEMONIC_LD_WCS,
-+  AVR32_MNEMONIC_LD_WGE,
-+  AVR32_MNEMONIC_LD_WLT,
-+  AVR32_MNEMONIC_LD_WMI,
-+  AVR32_MNEMONIC_LD_WPL,
-+  AVR32_MNEMONIC_LD_WLS,
-+  AVR32_MNEMONIC_LD_WGT,
-+  AVR32_MNEMONIC_LD_WLE,
-+  AVR32_MNEMONIC_LD_WHI,
-+  AVR32_MNEMONIC_LD_WVS,
-+  AVR32_MNEMONIC_LD_WVC,
-+  AVR32_MNEMONIC_LD_WQS,
-+  AVR32_MNEMONIC_LD_WAL,
-+  AVR32_MNEMONIC_LD_WHS,
-+  AVR32_MNEMONIC_LD_WLO,
-+  AVR32_MNEMONIC_LD_SHEQ,
-+  AVR32_MNEMONIC_LD_SHNE,
-+  AVR32_MNEMONIC_LD_SHCC,
-+  AVR32_MNEMONIC_LD_SHCS,
-+  AVR32_MNEMONIC_LD_SHGE,
-+  AVR32_MNEMONIC_LD_SHLT,
-+  AVR32_MNEMONIC_LD_SHMI,
-+  AVR32_MNEMONIC_LD_SHPL,
-+  AVR32_MNEMONIC_LD_SHLS,
-+  AVR32_MNEMONIC_LD_SHGT,
-+  AVR32_MNEMONIC_LD_SHLE,
-+  AVR32_MNEMONIC_LD_SHHI,
-+  AVR32_MNEMONIC_LD_SHVS,
-+  AVR32_MNEMONIC_LD_SHVC,
-+  AVR32_MNEMONIC_LD_SHQS,
-+  AVR32_MNEMONIC_LD_SHAL,
-+  AVR32_MNEMONIC_LD_SHHS,
-+  AVR32_MNEMONIC_LD_SHLO,
-+  AVR32_MNEMONIC_LD_UHEQ,
-+  AVR32_MNEMONIC_LD_UHNE,
-+  AVR32_MNEMONIC_LD_UHCC,
-+  AVR32_MNEMONIC_LD_UHCS,
-+  AVR32_MNEMONIC_LD_UHGE,
-+  AVR32_MNEMONIC_LD_UHLT,
-+  AVR32_MNEMONIC_LD_UHMI,
-+  AVR32_MNEMONIC_LD_UHPL,
-+  AVR32_MNEMONIC_LD_UHLS,
-+  AVR32_MNEMONIC_LD_UHGT,
-+  AVR32_MNEMONIC_LD_UHLE,
-+  AVR32_MNEMONIC_LD_UHHI,
-+  AVR32_MNEMONIC_LD_UHVS,
-+  AVR32_MNEMONIC_LD_UHVC,
-+  AVR32_MNEMONIC_LD_UHQS,
-+  AVR32_MNEMONIC_LD_UHAL,
-+  AVR32_MNEMONIC_LD_UHHS,
-+  AVR32_MNEMONIC_LD_UHLO,
-+  AVR32_MNEMONIC_LD_SBEQ,
-+  AVR32_MNEMONIC_LD_SBNE,
-+  AVR32_MNEMONIC_LD_SBCC,
-+  AVR32_MNEMONIC_LD_SBCS,
-+  AVR32_MNEMONIC_LD_SBGE,
-+  AVR32_MNEMONIC_LD_SBLT,
-+  AVR32_MNEMONIC_LD_SBMI,
-+  AVR32_MNEMONIC_LD_SBPL,
-+  AVR32_MNEMONIC_LD_SBLS,
-+  AVR32_MNEMONIC_LD_SBGT,
-+  AVR32_MNEMONIC_LD_SBLE,
-+  AVR32_MNEMONIC_LD_SBHI,
-+  AVR32_MNEMONIC_LD_SBVS,
-+  AVR32_MNEMONIC_LD_SBVC,
-+  AVR32_MNEMONIC_LD_SBQS,
-+  AVR32_MNEMONIC_LD_SBAL,
-+  AVR32_MNEMONIC_LD_SBHS,
-+  AVR32_MNEMONIC_LD_SBLO,
-+  AVR32_MNEMONIC_LD_UBEQ,
-+  AVR32_MNEMONIC_LD_UBNE,
-+  AVR32_MNEMONIC_LD_UBCC,
-+  AVR32_MNEMONIC_LD_UBCS,
-+  AVR32_MNEMONIC_LD_UBGE,
-+  AVR32_MNEMONIC_LD_UBLT,
-+  AVR32_MNEMONIC_LD_UBMI,
-+  AVR32_MNEMONIC_LD_UBPL,
-+  AVR32_MNEMONIC_LD_UBLS,
-+  AVR32_MNEMONIC_LD_UBGT,
-+  AVR32_MNEMONIC_LD_UBLE,
-+  AVR32_MNEMONIC_LD_UBHI,
-+  AVR32_MNEMONIC_LD_UBVS,
-+  AVR32_MNEMONIC_LD_UBVC,
-+  AVR32_MNEMONIC_LD_UBQS,
-+  AVR32_MNEMONIC_LD_UBAL,
-+  AVR32_MNEMONIC_LD_UBHS,
-+  AVR32_MNEMONIC_LD_UBLO,
-+  AVR32_MNEMONIC_ST_WEQ,
-+  AVR32_MNEMONIC_ST_WNE,
-+  AVR32_MNEMONIC_ST_WCC,
-+  AVR32_MNEMONIC_ST_WCS,
-+  AVR32_MNEMONIC_ST_WGE,
-+  AVR32_MNEMONIC_ST_WLT,
-+  AVR32_MNEMONIC_ST_WMI,
-+  AVR32_MNEMONIC_ST_WPL,
-+  AVR32_MNEMONIC_ST_WLS,
-+  AVR32_MNEMONIC_ST_WGT,
-+  AVR32_MNEMONIC_ST_WLE,
-+  AVR32_MNEMONIC_ST_WHI,
-+  AVR32_MNEMONIC_ST_WVS,
-+  AVR32_MNEMONIC_ST_WVC,
-+  AVR32_MNEMONIC_ST_WQS,
-+  AVR32_MNEMONIC_ST_WAL,
-+  AVR32_MNEMONIC_ST_WHS,
-+  AVR32_MNEMONIC_ST_WLO,
-+  AVR32_MNEMONIC_ST_HEQ,
-+  AVR32_MNEMONIC_ST_HNE,
-+  AVR32_MNEMONIC_ST_HCC,
-+  AVR32_MNEMONIC_ST_HCS,
-+  AVR32_MNEMONIC_ST_HGE,
-+  AVR32_MNEMONIC_ST_HLT,
-+  AVR32_MNEMONIC_ST_HMI,
-+  AVR32_MNEMONIC_ST_HPL,
-+  AVR32_MNEMONIC_ST_HLS,
-+  AVR32_MNEMONIC_ST_HGT,
-+  AVR32_MNEMONIC_ST_HLE,
-+  AVR32_MNEMONIC_ST_HHI,
-+  AVR32_MNEMONIC_ST_HVS,
-+  AVR32_MNEMONIC_ST_HVC,
-+  AVR32_MNEMONIC_ST_HQS,
-+  AVR32_MNEMONIC_ST_HAL,
-+  AVR32_MNEMONIC_ST_HHS,
-+  AVR32_MNEMONIC_ST_HLO,
-+  AVR32_MNEMONIC_ST_BEQ,
-+  AVR32_MNEMONIC_ST_BNE,
-+  AVR32_MNEMONIC_ST_BCC,
-+  AVR32_MNEMONIC_ST_BCS,
-+  AVR32_MNEMONIC_ST_BGE,
-+  AVR32_MNEMONIC_ST_BLT,
-+  AVR32_MNEMONIC_ST_BMI,
-+  AVR32_MNEMONIC_ST_BPL,
-+  AVR32_MNEMONIC_ST_BLS,
-+  AVR32_MNEMONIC_ST_BGT,
-+  AVR32_MNEMONIC_ST_BLE,
-+  AVR32_MNEMONIC_ST_BHI,
-+  AVR32_MNEMONIC_ST_BVS,
-+  AVR32_MNEMONIC_ST_BVC,
-+  AVR32_MNEMONIC_ST_BQS,
-+  AVR32_MNEMONIC_ST_BAL,
-+  AVR32_MNEMONIC_ST_BHS,
-+  AVR32_MNEMONIC_ST_BLO,
-+  AVR32_MNEMONIC_MOVH,
-+  AVR32_MNEMONIC__END_
-+};
-+#define AVR32_NR_MNEMONICS AVR32_MNEMONIC__END_
-+
-+enum avr32_syntax_parser
-+  {
-+    AVR32_PARSER_NORMAL,
-+    AVR32_PARSER_ALIAS,
-+    AVR32_PARSER_LDA,
-+    AVR32_PARSER_CALL,
-+    AVR32_PARSER__END_
-+  };
-+#define AVR32_NR_PARSERS AVR32_PARSER__END_
-diff -Nur binutils-2.21.orig/opcodes/configure binutils-2.21/opcodes/configure
---- binutils-2.21.orig/opcodes/configure	2010-11-05 11:32:32.000000000 +0100
-+++ binutils-2.21/opcodes/configure	2011-08-28 14:56:23.407984199 +0200
-@@ -12417,6 +12417,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" ;;
-+	bfd_avr32_arch)		ta="$ta avr32-asm.lo avr32-dis.lo avr32-opc.lo" ;;
- 	bfd_bfin_arch)		ta="$ta bfin-dis.lo" ;;
- 	bfd_cr16_arch)    	ta="$ta cr16-dis.lo cr16-opc.lo" ;;
- 	bfd_cris_arch)		ta="$ta cris-dis.lo cris-opc.lo cgen-bitset.lo" ;;
-diff -Nur binutils-2.21.orig/opcodes/configure.in binutils-2.21/opcodes/configure.in
---- binutils-2.21.orig/opcodes/configure.in	2010-06-29 06:17:33.000000000 +0200
-+++ binutils-2.21/opcodes/configure.in	2011-08-28 14:56:23.467990930 +0200
-@@ -223,6 +223,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" ;;
-+	bfd_avr32_arch)		ta="$ta avr32-asm.lo avr32-dis.lo avr32-opc.lo" ;;
- 	bfd_bfin_arch)		ta="$ta bfin-dis.lo" ;;
- 	bfd_cr16_arch)    	ta="$ta cr16-dis.lo cr16-opc.lo" ;;
- 	bfd_cris_arch)		ta="$ta cris-dis.lo cris-opc.lo cgen-bitset.lo" ;;
-@@ -285,7 +286,7 @@
- 				ta="$ta sh64-dis.lo sh64-opc.lo"
- 				archdefs="$archdefs -DINCLUDE_SHMEDIA"
- 				break;;
--	    esac;
-+	    esac
- 	  done
- 				ta="$ta sh-dis.lo cgen-bitset.lo" ;;
- 	bfd_sparc_arch)		ta="$ta sparc-dis.lo sparc-opc.lo" ;;
-diff -Nur binutils-2.21.orig/opcodes/disassemble.c binutils-2.21/opcodes/disassemble.c
---- binutils-2.21.orig/opcodes/disassemble.c	2010-08-06 05:59:49.000000000 +0200
-+++ binutils-2.21/opcodes/disassemble.c	2011-08-28 14:56:23.537981600 +0200
-@@ -27,6 +27,7 @@
- #define ARCH_arc
- #define ARCH_arm
- #define ARCH_avr
-+#define ARCH_avr32
- #define ARCH_bfin
- #define ARCH_cr16
- #define ARCH_cris
-@@ -130,6 +131,11 @@
-       disassemble = print_insn_avr;
-       break;
- #endif
-+#ifdef ARCH_avr32
-+    case bfd_arch_avr32:
-+      disassemble = print_insn_avr32;
-+      break;
-+#endif
- #ifdef ARCH_bfin
-     case bfd_arch_bfin:
-       disassemble = print_insn_bfin;
-@@ -489,6 +495,9 @@
- #ifdef ARCH_i386
-   print_i386_disassembler_options (stream);
- #endif
-+#ifdef ARCH_avr32
-+  print_avr32_disassembler_options (stream);
-+#endif
- #ifdef ARCH_s390
-   print_s390_disassembler_options (stream);
- #endif
diff --git a/toolchain/binutils/patches/2.22/musl-cross.patch b/toolchain/binutils/patches/2.22/musl-cross.patch
deleted file mode 100644
index 47af7bbb8..000000000
--- a/toolchain/binutils/patches/2.22/musl-cross.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff -Nur binutils-2.22.orig/bfd/elf32-ppc.c binutils-2.22/bfd/elf32-ppc.c
---- binutils-2.22.orig/bfd/elf32-ppc.c	2011-11-21 10:29:21.000000000 +0100
-+++ binutils-2.22/bfd/elf32-ppc.c	2013-09-14 12:51:24.000000000 +0200
-@@ -2987,10 +2987,6 @@
-   edir->elf.needs_plt |= eind->elf.needs_plt;
-   edir->elf.pointer_equality_needed |= eind->elf.pointer_equality_needed;
- 
--  /* If we were called to copy over info for a weak sym, that's all.  */
--  if (eind->elf.root.type != bfd_link_hash_indirect)
--    return;
--
-   if (eind->dyn_relocs != NULL)
-     {
-       if (edir->dyn_relocs != NULL)
-@@ -3022,6 +3018,16 @@
-       eind->dyn_relocs = NULL;
-     }
- 
-+  /* If we were called to copy over info for a weak sym, that's all.
-+     You might think dyn_relocs need not be copied over;  After all,
-+     both syms will be dynamic or both non-dynamic so we're just
-+     moving reloc accounting around.  However, ELIMINATE_COPY_RELOCS 
-+     code in ppc_elf_adjust_dynamic_symbol needs to check for
-+     dyn_relocs in read-only sections, and it does so on what is the
-+     DIR sym here.  */
-+  if (eind->elf.root.type != bfd_link_hash_indirect)
-+    return;
-+
-   /* Copy over the GOT refcount entries that we may have already seen to
-      the symbol which just became indirect.  */
-   edir->elf.got.refcount += eind->elf.got.refcount;
-diff -Nur binutils-2.22.orig/bfd/elf64-ppc.c binutils-2.22/bfd/elf64-ppc.c
---- binutils-2.22.orig/bfd/elf64-ppc.c	2011-11-21 10:29:24.000000000 +0100
-+++ binutils-2.22/bfd/elf64-ppc.c	2013-09-14 12:51:24.000000000 +0200
-@@ -4435,10 +4435,6 @@
-   edir->elf.ref_regular_nonweak |= eind->elf.ref_regular_nonweak;
-   edir->elf.needs_plt |= eind->elf.needs_plt;
- 
--  /* If we were called to copy over info for a weak sym, that's all.  */
--  if (eind->elf.root.type != bfd_link_hash_indirect)
--    return;
--
-   /* Copy over any dynamic relocs we may have on the indirect sym.  */
-   if (eind->dyn_relocs != NULL)
-     {
-@@ -4471,6 +4467,16 @@
-       eind->dyn_relocs = NULL;
-     }
- 
-+  /* If we were called to copy over info for a weak sym, that's all.
-+     You might think dyn_relocs need not be copied over;  After all,
-+     both syms will be dynamic or both non-dynamic so we're just
-+     moving reloc accounting around.  However, ELIMINATE_COPY_RELOCS 
-+     code in ppc64_elf_adjust_dynamic_symbol needs to check for
-+     dyn_relocs in read-only sections, and it does so on what is the
-+     DIR sym here.  */
-+  if (eind->elf.root.type != bfd_link_hash_indirect)
-+    return;
-+
-   /* Copy over got entries that we may have already seen to the
-      symbol which just became indirect.  */
-   if (eind->elf.got.glist != NULL)
-diff -Nur binutils-2.22.orig/config.sub binutils-2.22/config.sub
---- binutils-2.22.orig/config.sub	2011-06-06 12:36:06.000000000 +0200
-+++ binutils-2.22/config.sub	2013-09-14 12:51:24.000000000 +0200
-@@ -125,6 +125,7 @@
- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
- case $maybe_os in
-   nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-+  linux-musl* | \
-   linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-   knetbsd*-gnu* | netbsd*-gnu* | \
-   kopensolaris*-gnu* | \
-@@ -1335,6 +1336,7 @@
- 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- 	      | -mingw32* | -linux-gnu* | -linux-android* \
- 	      | -linux-newlib* | -linux-uclibc* \
-+	      | -linux-musl* \
- 	      | -uxpv* | -beos* | -mpeix* | -udk* \
- 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
diff --git a/toolchain/binutils/patches/2.23.2/arm-whitespace.patch b/toolchain/binutils/patches/2.23.2/arm-whitespace.patch
deleted file mode 100644
index 0bc560166..000000000
--- a/toolchain/binutils/patches/2.23.2/arm-whitespace.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Nur binutils-2.23.2.orig/gas/config/tc-arm.c binutils-2.23.2/gas/config/tc-arm.c
---- binutils-2.23.2.orig/gas/config/tc-arm.c	2013-03-25 09:06:21.000000000 +0100
-+++ binutils-2.23.2/gas/config/tc-arm.c	2013-09-24 13:26:32.000000000 +0200
-@@ -885,6 +885,9 @@
- static inline int
- skip_past_char (char ** str, char c)
- {
-+  /* PR gas/14987: Allow for whitespace before the expected character.  */
-+  skip_whitespace (*str);
-+
-   if (**str == c)
-     {
-       (*str)++;
-@@ -5168,6 +5171,9 @@
-       return PARSE_OPERAND_SUCCESS;
-     }
- 
-+  /* PR gas/14887: Allow for whitespace after the opening bracket.  */
-+  skip_whitespace (p);
-+
-   if ((reg = arm_reg_parse (&p, REG_TYPE_RN)) == FAIL)
-     {
-       inst.error = _(reg_expected_msgs[REG_TYPE_RN]);
diff --git a/toolchain/binutils/patches/2.23.2/musl-cross.patch b/toolchain/binutils/patches/2.23.2/musl-cross.patch
deleted file mode 100644
index c1a4fbfec..000000000
--- a/toolchain/binutils/patches/2.23.2/musl-cross.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Nur binutils-2.23.2.orig/config.sub binutils-2.23.2/config.sub
---- binutils-2.23.2.orig/config.sub	2012-04-25 17:53:25.000000000 +0200
-+++ binutils-2.23.2/config.sub	2013-09-15 15:10:00.000000000 +0200
-@@ -123,6 +123,7 @@
- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
- case $maybe_os in
-   nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-+  linux-musl* | \
-   linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-   knetbsd*-gnu* | netbsd*-gnu* | \
-   kopensolaris*-gnu* | \
-@@ -1361,6 +1362,7 @@
- 	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- 	      | -mingw32* | -linux-gnu* | -linux-android* \
- 	      | -linux-newlib* | -linux-uclibc* \
-+	      | -linux-musl* \
- 	      | -uxpv* | -beos* | -mpeix* | -udk* \
- 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index f82332702..4044ead03 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -61,21 +61,13 @@ endif
 
 ifeq ($(ARCH),m68k)
 GCC_CONFOPTS+=		--disable-tls
-else 
-ifeq ($(ARCH),cris)
-GCC_CONFOPTS+=		--disable-tls
 else
 GCC_CONFOPTS+=		--enable-tls
 endif
-endif
 
 ifeq ($(ARCH),powerpc)
-ifeq ($(ADK_TARGET_LIBC),musl)
 GCC_CONFOPTS+=		--disable-target-optspace --with-long-double-64 --enable-secureplt
 else
-GCC_CONFOPTS+=		--disable-target-optspace --with-long-double-128 --enable-secureplt
-endif
-else
 GCC_CONFOPTS+=		--enable-target-optspace
 endif
 
diff --git a/toolchain/gcc/Makefile.inc b/toolchain/gcc/Makefile.inc
index a3dc0f748..689de3b63 100644
--- a/toolchain/gcc/Makefile.inc
+++ b/toolchain/gcc/Makefile.inc
@@ -3,10 +3,6 @@
 
 PKG_NAME:=		gcc
 
-ifeq ($(ADK_LINUX_AVR32),y)
-PKG_VERSION:=		4.4.6
-PKG_MD5SUM:=		ab525d429ee4425050a554bc9247d6c4
-else
 ifeq ($(ADK_LINUX_MICROBLAZE),y)
 PKG_VERSION:=		4.8.2
 PKG_MD5SUM:=		a3d7d63b9cb6b6ea049469a0c4a43c9d
@@ -14,7 +10,6 @@ else
 PKG_VERSION:=		4.7.3
 PKG_MD5SUM:=		86f428a30379bdee0224e353ee2f999e
 endif
-endif
 
 PKG_RELEASE:=		1
 PKG_SITES:=		${MASTER_SITE_GNU:=gcc/gcc-${PKG_VERSION}/}
diff --git a/toolchain/gcc/patches/4.4.6/cflags.patch b/toolchain/gcc/patches/4.4.6/cflags.patch
deleted file mode 100644
index 1b17e983e..000000000
--- a/toolchain/gcc/patches/4.4.6/cflags.patch
+++ /dev/null
@@ -1,269 +0,0 @@
-
-	This patch brings over a few features from MirBSD:
-	* -fhonour-copts
-	  If this option is not given, it's warned (depending
-	  on environment variables). This is to catch errors
-	  of misbuilt packages which override CFLAGS themselves.
-	* -Werror-maybe-reset
-	  Has the effect of -Wno-error if GCC_NO_WERROR is
-	  set and not '0', a no-operation otherwise. This is
-	  to be able to use -Werror in "make" but prevent
-	  GNU autoconf generated configure scripts from
-	  freaking out.
-	* Make -fno-strict-aliasing and -fno-delete-null-pointer-checks
-	  the default for -O2/-Os, because they trigger gcc bugs
-	  and can delete code with security implications.
-
-	This patch was authored by Thorsten Glaser <tg at mirbsd.de>
-	with copyright assignment to the FSF in effect.
-
---- a/gcc/c-opts.c
-+++ b/gcc/c-opts.c
-@@ -105,6 +105,9 @@ static size_t deferred_count;
- /* Number of deferred options scanned for -include.  */
- static size_t include_cursor;
- 
-+/* Check if a port honours COPTS.  */
-+static int honour_copts = 0;
-+
- static void set_Wimplicit (int);
- static void handle_OPT_d (const char *);
- static void set_std_cxx98 (int);
-@@ -454,6 +457,14 @@ c_common_handle_option (size_t scode, co
-       enable_warning_as_error ("implicit-function-declaration", value, CL_C | CL_ObjC); 
-       break;
- 
-+    case OPT_Werror_maybe_reset:
-+      {
-+	char *ev = getenv ("GCC_NO_WERROR");
-+	if ((ev != NULL) && (*ev != '0'))
-+	  cpp_opts->warnings_are_errors = 0;
-+      }
-+      break;
-+
-     case OPT_Wformat:
-       set_Wformat (value);
-       break;
-@@ -690,6 +701,12 @@ c_common_handle_option (size_t scode, co
-       flag_exceptions = value;
-       break;
- 
-+    case OPT_fhonour_copts:
-+      if (c_language == clk_c) {
-+	honour_copts++;
-+      }
-+      break;
-+
-     case OPT_fimplement_inlines:
-       flag_implement_inlines = value;
-       break;
-@@ -1209,6 +1226,47 @@ c_common_init (void)
-       return false;
-     }
- 
-+  if (c_language == clk_c) {
-+    char *ev = getenv ("GCC_HONOUR_COPTS");
-+    int evv;
-+    if (ev == NULL)
-+      evv = -1;
-+    else if ((*ev == '0') || (*ev == '\0'))
-+      evv = 0;
-+    else if (*ev == '1')
-+      evv = 1;
-+    else if (*ev == '2')
-+      evv = 2;
-+    else if (*ev == 's')
-+      evv = -1;
-+    else {
-+      warning (0, "unknown GCC_HONOUR_COPTS value, assuming 1");
-+      evv = 1; /* maybe depend this on something like MIRBSD_NATIVE?  */
-+    }
-+    if (evv == 1) {
-+      if (honour_copts == 0) {
-+	error ("someone does not honour COPTS at all in lenient mode");
-+	return false;
-+      } else if (honour_copts != 1) {
-+	warning (0, "someone does not honour COPTS correctly, passed %d times",
-+	 honour_copts);
-+      }
-+    } else if (evv == 2) {
-+      if (honour_copts == 0) {
-+	error ("someone does not honour COPTS at all in strict mode");
-+	return false;
-+      } else if (honour_copts != 1) {
-+	error ("someone does not honour COPTS correctly, passed %d times",
-+	 honour_copts);
-+	return false;
-+      }
-+    } else if (evv == 0) {
-+      if (honour_copts != 1)
-+	inform (0, "someone does not honour COPTS correctly, passed %d times",
-+	 honour_copts);
-+    }
-+  }
-+
-   return true;
- }
- 
---- a/gcc/c.opt
-+++ b/gcc/c.opt
-@@ -215,6 +215,10 @@ Werror-implicit-function-declaration
- C ObjC RejectNegative Warning
- This switch is deprecated; use -Werror=implicit-function-declaration instead
- 
-+Werror-maybe-reset
-+C ObjC C++ ObjC++
-+; Documented in common.opt
-+
- Wfloat-equal
- C ObjC C++ ObjC++ Var(warn_float_equal) Warning
- Warn if testing floating point numbers for equality
-@@ -613,6 +617,9 @@ C++ ObjC++ Optimization
- fhonor-std
- C++ ObjC++
- 
-+fhonour-copts
-+C ObjC C++ ObjC++ RejectNegative
-+
- fhosted
- C ObjC
- Assume normal C execution environment
---- a/gcc/common.opt
-+++ b/gcc/common.opt
-@@ -102,6 +102,10 @@ Werror=
- Common Joined
- Treat specified warning as error
- 
-+Werror-maybe-reset
-+Common
-+If environment variable GCC_NO_WERROR is set, act as -Wno-error
-+
- Wextra
- Common Warning
- Print extra (possibly unwanted) warnings
-@@ -573,6 +577,9 @@ fguess-branch-probability
- Common Report Var(flag_guess_branch_prob) Optimization
- Enable guessing of branch probabilities
- 
-+fhonour-copts
-+Common RejectNegative
-+
- ; Nonzero means ignore `#ident' directives.  0 means handle them.
- ; Generate position-independent code for executables if possible
- ; On SVR4 targets, it also controls whether or not to emit a
---- a/gcc/opts.c
-+++ b/gcc/opts.c
-@@ -898,9 +898,6 @@ decode_options (unsigned int argc, const
-   flag_schedule_insns_after_reload = opt2;
- #endif
-   flag_regmove = opt2;
--  flag_strict_aliasing = opt2;
--  flag_strict_overflow = opt2;
--  flag_delete_null_pointer_checks = opt2;
-   flag_reorder_blocks = opt2;
-   flag_reorder_functions = opt2;
-   flag_tree_vrp = opt2;
-@@ -924,6 +921,9 @@ decode_options (unsigned int argc, const
- 
-   /* -O3 optimizations.  */
-   opt3 = (optimize >= 3);
-+  flag_strict_aliasing = opt3;
-+  flag_strict_overflow = opt3;
-+  flag_delete_null_pointer_checks = opt3;
-   flag_predictive_commoning = opt3;
-   flag_inline_functions = opt3;
-   flag_unswitch_loops = opt3;
-@@ -1603,6 +1603,17 @@ common_handle_option (size_t scode, cons
-       enable_warning_as_error (arg, value, lang_mask);
-       break;
- 
-+    case OPT_Werror_maybe_reset:
-+      {
-+	char *ev = getenv ("GCC_NO_WERROR");
-+	if ((ev != NULL) && (*ev != '0'))
-+	  warnings_are_errors = 0;
-+      }
-+      break;
-+
-+    case OPT_fhonour_copts:
-+      break;
-+
-     case OPT_Wextra:
-       set_Wextra (value);
-       break;
---- a/gcc/doc/cppopts.texi
-+++ b/gcc/doc/cppopts.texi
-@@ -164,6 +164,11 @@ in older programs.  This warning is on b
- Make all warnings into hard errors.  Source code which triggers warnings
- will be rejected.
- 
-+ at item -Werror-maybe-reset
-+ at opindex Werror-maybe-reset
-+Act like @samp{-Wno-error} if the @env{GCC_NO_WERROR} environment
-+variable is set to anything other than 0 or empty.
-+
- @item -Wsystem-headers
- @opindex Wsystem-headers
- Issue warnings for code in system headers.  These are normally unhelpful
---- a/gcc/doc/invoke.texi
-+++ b/gcc/doc/invoke.texi
-@@ -234,7 +234,7 @@ Objective-C and Objective-C++ Dialects}.
- -Wconversion  -Wcoverage-mismatch  -Wno-deprecated  @gol
- -Wno-deprecated-declarations -Wdisabled-optimization  @gol
- -Wno-div-by-zero -Wempty-body  -Wenum-compare -Wno-endif-labels @gol
---Werror  -Werror=* @gol
-+-Werror  -Werror=* -Werror-maybe-reset @gol
- -Wfatal-errors  -Wfloat-equal  -Wformat  -Wformat=2 @gol
- -Wno-format-contains-nul -Wno-format-extra-args -Wformat-nonliteral @gol
- -Wformat-security  -Wformat-y2k @gol
-@@ -4182,6 +4182,22 @@ This option is only supported for C and
- @option{-Wall} and by @option{-pedantic}, which can be disabled with
- @option{-Wno-pointer-sign}.
- 
-+ at item -Werror-maybe-reset
-+ at opindex Werror-maybe-reset
-+Act like @samp{-Wno-error} if the @env{GCC_NO_WERROR} environment
-+variable is set to anything other than 0 or empty.
-+
-+ at item -fhonour-copts
-+ at opindex fhonour-copts
-+If @env{GCC_HONOUR_COPTS} is set to 1, abort if this option is not
-+given at least once, and warn if it is given more than once.
-+If @env{GCC_HONOUR_COPTS} is set to 2, abort if this option is not
-+given exactly once.
-+If @env{GCC_HONOUR_COPTS} is set to 0 or unset, warn if this option
-+is not given exactly once.
-+The warning is quelled if @env{GCC_HONOUR_COPTS} is set to @samp{s}.
-+This flag and environment variable only affect the C language.
-+
- @item -Wstack-protector
- @opindex Wstack-protector
- @opindex Wno-stack-protector
-@@ -5721,7 +5737,7 @@ so, the first branch is redirected to ei
- second branch or a point immediately following it, depending on whether
- the condition is known to be true or false.
- 
--Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}.
-+Enabled at levels @option{-O3}.
- 
- @item -fsplit-wide-types
- @opindex fsplit-wide-types
-@@ -5866,7 +5882,7 @@ safely dereference null pointers.  Use
- @option{-fno-delete-null-pointer-checks} to disable this optimization
- for programs which depend on that behavior.
- 
--Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}.
-+Enabled at levels @option{-O3}.
- 
- @item -fexpensive-optimizations
- @opindex fexpensive-optimizations
---- a/gcc/java/jvspec.c
-+++ b/gcc/java/jvspec.c
-@@ -670,6 +670,7 @@ lang_specific_pre_link (void)
-      class name.  Append dummy `.c' that can be stripped by set_input so %b
-      is correct.  */ 
-   set_input (concat (main_class_name, "main.c", NULL));
-+  putenv ("GCC_HONOUR_COPTS=s"); /* XXX hack!  */
-   err = do_spec (jvgenmain_spec);
-   if (err == 0)
-     {
diff --git a/toolchain/gcc/patches/4.4.6/gcc-avr32.patch b/toolchain/gcc/patches/4.4.6/gcc-avr32.patch
deleted file mode 100644
index f348cba9c..000000000
--- a/toolchain/gcc/patches/4.4.6/gcc-avr32.patch
+++ /dev/null
@@ -1,25993 +0,0 @@
-diff -Nur gcc-4.4.6.orig/gcc/builtins.c gcc-4.4.6/gcc/builtins.c
---- gcc-4.4.6.orig/gcc/builtins.c	2010-12-07 19:56:56.000000000 +0100
-+++ gcc-4.4.6/gcc/builtins.c	2011-10-22 19:23:08.512581300 +0200
-@@ -11108,7 +11108,7 @@
- 
-   do
-     {
--      code = va_arg (ap, enum tree_code);
-+      code = va_arg (ap, int);
-       switch (code)
- 	{
- 	case 0:
-diff -Nur gcc-4.4.6.orig/gcc/calls.c gcc-4.4.6/gcc/calls.c
---- gcc-4.4.6.orig/gcc/calls.c	2010-09-24 17:07:36.000000000 +0200
-+++ gcc-4.4.6/gcc/calls.c	2011-10-22 19:23:08.512581300 +0200
-@@ -3447,7 +3447,7 @@
-   for (; count < nargs; count++)
-     {
-       rtx val = va_arg (p, rtx);
--      enum machine_mode mode = va_arg (p, enum machine_mode);
-+      enum machine_mode mode = va_arg (p, int);
- 
-       /* We cannot convert the arg value to the mode the library wants here;
- 	 must do it earlier where we know the signedness of the arg.  */
-diff -Nur gcc-4.4.6.orig/gcc/config/avr32/avr32-elf.h gcc-4.4.6/gcc/config/avr32/avr32-elf.h
---- gcc-4.4.6.orig/gcc/config/avr32/avr32-elf.h	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.4.6/gcc/config/avr32/avr32-elf.h	2011-10-22 19:23:08.516581300 +0200
-@@ -0,0 +1,91 @@
-+/*
-+   Elf specific definitions.
-+   Copyright 2003,2004,2005,2006,2007,2008,2009 Atmel Corporation.
-+
-+   This file is part of GCC.
-+
-+   This program is free software; you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; either version 2 of the License, or
-+   (at your option) any later version.
-+
-+   This program is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with this program; if not, write to the Free Software
-+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-+
-+
-+/*****************************************************************************
-+ * Controlling the Compiler Driver, 'gcc'
-+ *****************************************************************************/
-+
-+/* Run-time Target Specification.  */
-+#undef  TARGET_VERSION
-+#define TARGET_VERSION  fputs (" (AVR32 GNU with ELF)", stderr);
-+
-+/*
-+Another C string constant used much like LINK_SPEC.  The
-+difference between the two is that STARTFILE_SPEC is used at
-+the very beginning of the command given to the linker.
-+
-+If this macro is not defined, a default is provided that loads the
-+standard C startup file from the usual place.  See gcc.c.
-+*/
-+#if 0
-+#undef  STARTFILE_SPEC
-+#define STARTFILE_SPEC "crt0%O%s crti%O%s crtbegin%O%s"
-+#endif
-+#undef  STARTFILE_SPEC 
-+#define STARTFILE_SPEC "%{mflashvault: crtfv.o%s} %{!mflashvault: crt0.o%s} \
-+			crti.o%s crtbegin.o%s"
-+
-+#undef LINK_SPEC
-+#define LINK_SPEC "%{muse-oscall:--defsym __do_not_use_oscall_coproc__=0} %{mrelax|O*:%{mno-relax|O0|O1: ;:--relax}} %{mpart=uc3a3revd:-mavr32elf_uc3a3256s;:%{mpart=*:-mavr32elf_%*}} %{mcpu=*:-mavr32elf_%*}"
-+
-+
-+/*
-+Another C string constant used much like LINK_SPEC.  The
-+difference between the two is that ENDFILE_SPEC is used at
-+the very end of the command given to the linker.
-+
-+Do not define this macro if it does not need to do anything.
-+*/
-+#undef  ENDFILE_SPEC
-+#define ENDFILE_SPEC "crtend%O%s crtn%O%s"
-+
-+
-+/* Target CPU builtins.  */
-+#define TARGET_CPU_CPP_BUILTINS()								\
-+  do															\
-+    {															\
-+      builtin_define ("__avr32__");								\
-+      builtin_define ("__AVR32__");								\
-+      builtin_define ("__AVR32_ELF__");							\
-+      builtin_define (avr32_part->macro);						\
-+      builtin_define (avr32_arch->macro);						\
-+      if (avr32_arch->uarch_type == UARCH_TYPE_AVR32A)			\
-+        builtin_define ("__AVR32_AVR32A__");					\
-+      else														\
-+        builtin_define ("__AVR32_AVR32B__");					\
-+      if (TARGET_UNALIGNED_WORD)								\
-+        builtin_define ("__AVR32_HAS_UNALIGNED_WORD__");		\
-+      if (TARGET_SIMD)											\
-+        builtin_define ("__AVR32_HAS_SIMD__");					\
-+      if (TARGET_DSP)											\
-+        builtin_define ("__AVR32_HAS_DSP__");					\
-+      if (TARGET_RMW)											\
-+        builtin_define ("__AVR32_HAS_RMW__");					\
-+      if (TARGET_BRANCH_PRED)									\
-+        builtin_define ("__AVR32_HAS_BRANCH_PRED__");			\
-+      if (TARGET_FAST_FLOAT)                                    \
-+        builtin_define ("__AVR32_FAST_FLOAT__");                \
-+      if (TARGET_FLASHVAULT)                                    \
-+        builtin_define ("__AVR32_FLASHVAULT__");                \
-+      if (TARGET_NO_MUL_INSNS)                                  \
-+        builtin_define ("__AVR32_NO_MUL__");                    \
-+    }															\
-+  while (0)
-diff -Nur gcc-4.4.6.orig/gcc/config/avr32/avr32-modes.def gcc-4.4.6/gcc/config/avr32/avr32-modes.def
---- gcc-4.4.6.orig/gcc/config/avr32/avr32-modes.def	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.4.6/gcc/config/avr32/avr32-modes.def	2011-10-22 19:23:08.524581303 +0200
-@@ -0,0 +1 @@
-+VECTOR_MODES (INT, 4);        /*            V4QI V2HI */
-diff -Nur gcc-4.4.6.orig/gcc/config/avr32/avr32-protos.h gcc-4.4.6/gcc/config/avr32/avr32-protos.h
---- gcc-4.4.6.orig/gcc/config/avr32/avr32-protos.h	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.4.6/gcc/config/avr32/avr32-protos.h	2011-10-22 19:23:08.524581303 +0200
-@@ -0,0 +1,196 @@
-+/*
-+   Prototypes for exported functions defined in avr32.c
-+   Copyright 2003,2004,2005,2006,2007,2008,2009 Atmel Corporation.
-+
-+   This file is part of GCC.
-+
-+   This program is free software; you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; either version 2 of the License, or
-+   (at your option) any later version.
-+
-+   This program is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with this program; if not, write to the Free Software
-+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-+
-+
-+#ifndef AVR32_PROTOS_H
-+#define AVR32_PROTOS_H
-+
-+extern const int swap_reg[];
-+
-+extern int avr32_valid_macmac_bypass (rtx, rtx);
-+extern int avr32_valid_mulmac_bypass (rtx, rtx);
-+
-+extern int avr32_decode_lcomm_symbol_offset (rtx, int *);
-+extern void avr32_encode_lcomm_symbol_offset (tree, char *, int);
-+
-+extern const char *avr32_strip_name_encoding (const char *);
-+
-+extern rtx avr32_get_note_reg_equiv (rtx insn);
-+
-+extern int avr32_use_return_insn (int iscond);
-+
-+extern void avr32_make_reglist16 (int reglist16_vect, char *reglist16_string);
-+
-+extern void avr32_make_reglist8 (int reglist8_vect, char *reglist8_string);
-+extern void avr32_make_fp_reglist_w (int reglist_mask, char *reglist_string);
-+extern void avr32_make_fp_reglist_d (int reglist_mask, char *reglist_string);
-+
-+extern void avr32_output_return_instruction (int single_ret_inst,
-+					     int iscond, rtx cond,
-+					     rtx r12_imm);
-+extern void avr32_expand_prologue (void);
-+extern void avr32_set_return_address (rtx source, rtx scratch);
-+
-+extern int avr32_hard_regno_mode_ok (int regno, enum machine_mode mode);
-+extern int avr32_extra_constraint_s (rtx value, const int strict);
-+extern int avr32_eh_return_data_regno (const int n);
-+extern int avr32_initial_elimination_offset (const int from, const int to);
-+extern rtx avr32_function_arg (CUMULATIVE_ARGS * cum, enum machine_mode mode,
-+			       tree type, int named);
-+extern void avr32_init_cumulative_args (CUMULATIVE_ARGS * cum, tree fntype,
-+					rtx libname, tree fndecl);
-+extern void avr32_function_arg_advance (CUMULATIVE_ARGS * cum,
-+					enum machine_mode mode,
-+					tree type, int named);
-+#ifdef ARGS_SIZE_RTX
-+/* expr.h defines ARGS_SIZE_RTX and `enum direction'.  */
-+extern enum direction avr32_function_arg_padding (enum machine_mode mode,
-+						  tree type);
-+#endif /* ARGS_SIZE_RTX */
-+extern rtx avr32_function_value (tree valtype, tree func, bool outgoing);
-+extern rtx avr32_libcall_value (enum machine_mode mode);
-+extern int avr32_sched_use_dfa_pipeline_interface (void);
-+extern bool avr32_return_in_memory (tree type, tree fntype);
-+extern void avr32_regs_to_save (char *operand);
-+extern void avr32_target_asm_function_prologue (FILE * file,
-+						HOST_WIDE_INT size);
-+extern void avr32_target_asm_function_epilogue (FILE * file,
-+						HOST_WIDE_INT size);
-+extern void avr32_trampoline_template (FILE * file);
-+extern void avr32_initialize_trampoline (rtx addr, rtx fnaddr,
-+					 rtx static_chain);
-+extern int avr32_legitimate_address (enum machine_mode mode, rtx x,
-+				     int strict);
-+extern int avr32_legitimate_constant_p (rtx x);
-+
-+extern int avr32_legitimate_pic_operand_p (rtx x);
-+
-+extern rtx avr32_find_symbol (rtx x);
-+extern void avr32_select_section (rtx exp, int reloc, int align);
-+extern void avr32_encode_section_info (tree decl, rtx rtl, int first);
-+extern void avr32_asm_file_end (FILE * stream);
-+extern void avr32_asm_output_ascii (FILE * stream, char *ptr, int len);
-+extern void avr32_asm_output_common (FILE * stream, const char *name,
-+				     int size, int rounded);
-+extern void avr32_asm_output_label (FILE * stream, const char *name);
-+extern void avr32_asm_declare_object_name (FILE * stream, char *name,
-+					   tree decl);
-+extern void avr32_asm_globalize_label (FILE * stream, const char *name);
-+extern void avr32_asm_weaken_label (FILE * stream, const char *name);
-+extern void avr32_asm_output_external (FILE * stream, tree decl,
-+				       const char *name);
-+extern void avr32_asm_output_external_libcall (FILE * stream, rtx symref);
-+extern void avr32_asm_output_labelref (FILE * stream, const char *name);
-+extern void avr32_notice_update_cc (rtx exp, rtx insn);
-+extern void avr32_print_operand (FILE * stream, rtx x, int code);
-+extern void avr32_print_operand_address (FILE * stream, rtx x);
-+
-+extern int avr32_symbol (rtx x);
-+
-+extern void avr32_select_rtx_section (enum machine_mode mode, rtx x,
-+				      unsigned HOST_WIDE_INT align);
-+
-+extern int avr32_load_multiple_operation (rtx op, enum machine_mode mode);
-+extern int avr32_store_multiple_operation (rtx op, enum machine_mode mode);
-+
-+extern int avr32_const_ok_for_constraint_p (HOST_WIDE_INT value, char c,
-+					    const char *str);
-+
-+extern bool avr32_cannot_force_const_mem (rtx x);
-+
-+extern void avr32_init_builtins (void);
-+
-+extern rtx avr32_expand_builtin (tree exp, rtx target, rtx subtarget,
-+				 enum machine_mode mode, int ignore);
-+
-+extern bool avr32_must_pass_in_stack (enum machine_mode mode, tree type);
-+
-+extern bool avr32_strict_argument_naming (CUMULATIVE_ARGS * ca);
-+
-+extern bool avr32_pass_by_reference (CUMULATIVE_ARGS * cum,
-+				     enum machine_mode mode,
-+				     tree type, bool named);
-+
-+extern rtx avr32_gen_load_multiple (rtx * regs, int count, rtx from,
-+				    int write_back, int in_struct_p,
-+				    int scalar_p);
-+extern rtx avr32_gen_store_multiple (rtx * regs, int count, rtx to,
-+				     int in_struct_p, int scalar_p);
-+extern int avr32_gen_movmemsi (rtx * operands);
-+
-+extern int avr32_rnd_operands (rtx add, rtx shift);
-+extern int avr32_adjust_insn_length (rtx insn, int length);
-+
-+extern int symbol_mentioned_p (rtx x);
-+extern int label_mentioned_p (rtx x);
-+extern rtx legitimize_pic_address (rtx orig, enum machine_mode mode, rtx reg);
-+extern int avr32_address_register_rtx_p (rtx x, int strict_p);
-+extern int avr32_legitimate_index_p (enum machine_mode mode, rtx index,
-+				     int strict_p);
-+
-+extern int avr32_const_double_immediate (rtx value);
-+extern void avr32_init_expanders (void);
-+extern rtx avr32_return_addr (int count, rtx frame);
-+extern bool avr32_got_mentioned_p (rtx addr);
-+
-+extern void avr32_final_prescan_insn (rtx insn, rtx * opvec, int noperands);
-+
-+extern int avr32_expand_movcc (enum machine_mode mode, rtx operands[]);
-+extern int avr32_expand_addcc (enum machine_mode mode, rtx operands[]);
-+#ifdef RTX_CODE
-+extern int avr32_expand_scc (RTX_CODE cond, rtx * operands);
-+#endif
-+
-+extern int avr32_store_bypass (rtx insn_out, rtx insn_in);
-+extern int avr32_mul_waw_bypass (rtx insn_out, rtx insn_in);
-+extern int avr32_valid_load_double_bypass (rtx insn_out, rtx insn_in);
-+extern int avr32_valid_load_quad_bypass (rtx insn_out, rtx insn_in);
-+extern rtx avr32_output_cmp (rtx cond, enum machine_mode mode,
-+			     rtx op0, rtx op1);
-+
-+rtx get_next_insn_cond (rtx cur_insn);
-+int set_next_insn_cond (rtx cur_insn, rtx cond);
-+rtx next_insn_emits_cmp (rtx cur_insn);
-+void avr32_override_options (void);
-+void avr32_load_pic_register (void);
-+#ifdef GCC_BASIC_BLOCK_H
-+rtx avr32_ifcvt_modify_insn (ce_if_block_t *ce_info, rtx pattern, rtx insn, 
-+                             int *num_true_changes);
-+rtx avr32_ifcvt_modify_test (ce_if_block_t *ce_info, rtx test );
-+void avr32_ifcvt_modify_cancel ( ce_if_block_t *ce_info, int *num_true_changes);
-+#endif
-+void avr32_optimization_options (int level, int size);
-+int avr32_const_ok_for_move (HOST_WIDE_INT c);
-+
-+void avr32_split_const_expr (enum machine_mode mode,
-+                             enum machine_mode new_mode,
-+                             rtx expr, 
-+                             rtx *split_expr);
-+void avr32_get_intval (enum machine_mode mode,
-+                       rtx const_expr, 
-+                       HOST_WIDE_INT *val);
-+
-+int avr32_cond_imm_clobber_splittable (rtx insn, 
-+                                       rtx operands[]);
-+
-+bool avr32_flashvault_call(tree decl);
-+extern void avr32_emit_swdivsf (rtx, rtx, rtx);
-+
-+#endif /* AVR32_PROTOS_H */
-diff -Nur gcc-4.4.6.orig/gcc/config/avr32/avr32.c gcc-4.4.6/gcc/config/avr32/avr32.c
---- gcc-4.4.6.orig/gcc/config/avr32/avr32.c	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.4.6/gcc/config/avr32/avr32.c	2011-10-22 19:23:08.516581300 +0200
-@@ -0,0 +1,8087 @@
-+/*
-+   Target hooks and helper functions for AVR32.
-+   Copyright 2003,2004,2005,2006,2007,2008,2009,2010 Atmel Corporation.
-+
-+   This file is part of GCC.
-+
-+   This program is free software; you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; either version 2 of the License, or
-+   (at your option) any later version.
-+
-+   This program is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with this program; if not, write to the Free Software
-+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-+
-+#include "config.h"
-+#include "system.h"
-+#include "coretypes.h"
-+#include "tm.h"
-+#include "rtl.h"
-+#include "tree.h"
-+#include "obstack.h"
-+#include "regs.h"
-+#include "hard-reg-set.h"
-+#include "real.h"
-+#include "insn-config.h"
-+#include "conditions.h"
-+#include "output.h"
-+#include "insn-attr.h"
-+#include "flags.h"
-+#include "reload.h"
-+#include "function.h"
-+#include "expr.h"
-+#include "optabs.h"
-+#include "toplev.h"
-+#include "recog.h"
-+#include "ggc.h"
-+#include "except.h"
-+#include "c-pragma.h"
-+#include "integrate.h"
-+#include "tm_p.h"
-+#include "langhooks.h"
-+#include "hooks.h"
-+#include "df.h"
-+
-+#include "target.h"
-+#include "target-def.h"
-+
-+#include <ctype.h>
-+
-+
-+
-+/* Global variables.  */
-+typedef struct minipool_node Mnode;
-+typedef struct minipool_fixup Mfix;
-+
-+/* Obstack for minipool constant handling.  */
-+static struct obstack minipool_obstack;
-+static char *minipool_startobj;
-+static rtx minipool_vector_label;
-+
-+/* True if we are currently building a constant table.  */
-+int making_const_table;
-+
-+tree fndecl_attribute_args = NULL_TREE;
-+
-+
-+/* Function prototypes. */
-+static unsigned long avr32_isr_value (tree);
-+static unsigned long avr32_compute_func_type (void);
-+static tree avr32_handle_isr_attribute (tree *, tree, tree, int, bool *);
-+static tree avr32_handle_acall_attribute (tree *, tree, tree, int, bool *);
-+static tree avr32_handle_fndecl_attribute (tree * node, tree name, tree args,
-+					   int flags, bool * no_add_attrs);
-+static void avr32_reorg (void);
-+bool avr32_return_in_msb (tree type);
-+bool avr32_vector_mode_supported (enum machine_mode mode);
-+static void avr32_init_libfuncs (void);
-+static void avr32_file_end (void);
-+static void flashvault_decl_list_add (unsigned int vector_num, const char *name);
-+
-+
-+
-+static void
-+avr32_add_gc_roots (void)
-+{
-+  gcc_obstack_init (&minipool_obstack);
-+  minipool_startobj = (char *) obstack_alloc (&minipool_obstack, 0);
-+}
-+
-+
-+/* List of all known AVR32 parts  */
-+static const struct part_type_s avr32_part_types[] = {
-+  /* name, part_type, architecture type, macro */
-+  {"none",            PART_TYPE_AVR32_NONE,            ARCH_TYPE_AVR32_AP,        "__AVR32__"},
-+  {"ap7000",          PART_TYPE_AVR32_AP7000,          ARCH_TYPE_AVR32_AP,        "__AVR32_AP7000__"},
-+  {"ap7001",          PART_TYPE_AVR32_AP7001,          ARCH_TYPE_AVR32_AP,        "__AVR32_AP7001__"},
-+  {"ap7002",          PART_TYPE_AVR32_AP7002,          ARCH_TYPE_AVR32_AP,        "__AVR32_AP7002__"},
-+  {"ap7200",          PART_TYPE_AVR32_AP7200,          ARCH_TYPE_AVR32_AP,        "__AVR32_AP7200__"},
-+  {"uc3a0128",        PART_TYPE_AVR32_UC3A0128,        ARCH_TYPE_AVR32_UCR2,      "__AVR32_UC3A0128__"},
-+  {"uc3a0256",        PART_TYPE_AVR32_UC3A0256,        ARCH_TYPE_AVR32_UCR2,      "__AVR32_UC3A0256__"},
-+  {"uc3a0512",        PART_TYPE_AVR32_UC3A0512,        ARCH_TYPE_AVR32_UCR2,      "__AVR32_UC3A0512__"},
-+  {"uc3a0512es",      PART_TYPE_AVR32_UC3A0512ES,      ARCH_TYPE_AVR32_UCR1,      "__AVR32_UC3A0512ES__"},
-+  {"uc3a1128",        PART_TYPE_AVR32_UC3A1128,        ARCH_TYPE_AVR32_UCR2,      "__AVR32_UC3A1128__"},
-+  {"uc3a1256",        PART_TYPE_AVR32_UC3A1256,        ARCH_TYPE_AVR32_UCR2,      "__AVR32_UC3A1256__"},
-+  {"uc3a1512",        PART_TYPE_AVR32_UC3A1512,        ARCH_TYPE_AVR32_UCR2,      "__AVR32_UC3A1512__"},
-+  {"uc3a1512es",      PART_TYPE_AVR32_UC3A1512ES,      ARCH_TYPE_AVR32_UCR1,      "__AVR32_UC3A1512ES__"},
-+  {"uc3a3revd",       PART_TYPE_AVR32_UC3A3REVD,       ARCH_TYPE_AVR32_UCR2NOMUL, "__AVR32_UC3A3256S__"},
-+  {"uc3a364",         PART_TYPE_AVR32_UC3A364,         ARCH_TYPE_AVR32_UCR2,      "__AVR32_UC3A364__"},
-+  {"uc3a364s",        PART_TYPE_AVR32_UC3A364S,        ARCH_TYPE_AVR32_UCR2,      "__AVR32_UC3A364S__"},
-+  {"uc3a3128",        PART_TYPE_AVR32_UC3A3128,        ARCH_TYPE_AVR32_UCR2,      "__AVR32_UC3A3128__"},
-+  {"uc3a3128s",       PART_TYPE_AVR32_UC3A3128S,       ARCH_TYPE_AVR32_UCR2,      "__AVR32_UC3A3128S__"},
-+  {"uc3a3256",        PART_TYPE_AVR32_UC3A3256,        ARCH_TYPE_AVR32_UCR2,      "__AVR32_UC3A3256__"},
-+  {"uc3a3256s",       PART_TYPE_AVR32_UC3A3256S,       ARCH_TYPE_AVR32_UCR2,      "__AVR32_UC3A3256S__"},
-+  {"uc3a464",         PART_TYPE_AVR32_UC3A464,         ARCH_TYPE_AVR32_UCR2,      "__AVR32_UC3A464__"},
-+  {"uc3a464s",        PART_TYPE_AVR32_UC3A464S,        ARCH_TYPE_AVR32_UCR2,      "__AVR32_UC3A464S__"},
-+  {"uc3a4128",        PART_TYPE_AVR32_UC3A4128,        ARCH_TYPE_AVR32_UCR2,      "__AVR32_UC3A4128__"},
-+  {"uc3a4128s",       PART_TYPE_AVR32_UC3A4128S,       ARCH_TYPE_AVR32_UCR2,      "__AVR32_UC3A4128S__"},
-+  {"uc3a4256",        PART_TYPE_AVR32_UC3A4256,        ARCH_TYPE_AVR32_UCR2,      "__AVR32_UC3A4256__"},
-+  {"uc3a4256s",       PART_TYPE_AVR32_UC3A4256S,       ARCH_TYPE_AVR32_UCR2,      "__AVR32_UC3A4256S__"},
-+  {"uc3b064",         PART_TYPE_AVR32_UC3B064,         ARCH_TYPE_AVR32_UCR1,      "__AVR32_UC3B064__"},
-+  {"uc3b0128",        PART_TYPE_AVR32_UC3B0128,        ARCH_TYPE_AVR32_UCR1,      "__AVR32_UC3B0128__"},
-+  {"uc3b0256",        PART_TYPE_AVR32_UC3B0256,        ARCH_TYPE_AVR32_UCR1,      "__AVR32_UC3B0256__"},
-+  {"uc3b0256es",      PART_TYPE_AVR32_UC3B0256ES,      ARCH_TYPE_AVR32_UCR1,      "__AVR32_UC3B0256ES__"},
-+  {"uc3b0512",        PART_TYPE_AVR32_UC3B0512,        ARCH_TYPE_AVR32_UCR2,      "__AVR32_UC3B0512__"},
-+  {"uc3b0512revc",    PART_TYPE_AVR32_UC3B0512REVC,    ARCH_TYPE_AVR32_UCR2,      "__AVR32_UC3B0512REVC__"},
-+  {"uc3b164",         PART_TYPE_AVR32_UC3B164,         ARCH_TYPE_AVR32_UCR1,      "__AVR32_UC3B164__"},
-+  {"uc3b1128",        PART_TYPE_AVR32_UC3B1128,        ARCH_TYPE_AVR32_UCR1,      "__AVR32_UC3B1128__"},
-+  {"uc3b1256",        PART_TYPE_AVR32_UC3B1256,        ARCH_TYPE_AVR32_UCR1,      "__AVR32_UC3B1256__"},
-+  {"uc3b1256es",      PART_TYPE_AVR32_UC3B1256ES,      ARCH_TYPE_AVR32_UCR1,      "__AVR32_UC3B1256ES__"},
-+  {"uc3b1512",        PART_TYPE_AVR32_UC3B1512,        ARCH_TYPE_AVR32_UCR2,      "__AVR32_UC3B1512__"},
-+  {"uc3b1512revc",    PART_TYPE_AVR32_UC3B1512REVC,    ARCH_TYPE_AVR32_UCR2,      "__AVR32_UC3B1512REVC__"},
-+  {"uc64d3",          PART_TYPE_AVR32_UC64D3,          ARCH_TYPE_AVR32_UCR3,      "__AVR32_UC64D3__"},
-+  {"uc128d3",         PART_TYPE_AVR32_UC128D3,         ARCH_TYPE_AVR32_UCR3,      "__AVR32_UC128D3__"},
-+  {"uc64d4",          PART_TYPE_AVR32_UC64D4,          ARCH_TYPE_AVR32_UCR3,      "__AVR32_UC64D4__"},
-+  {"uc128d4",         PART_TYPE_AVR32_UC128D4,         ARCH_TYPE_AVR32_UCR3,      "__AVR32_UC128D4__"},
-+  {"uc3c0512crevc",   PART_TYPE_AVR32_UC3C0512CREVC,   ARCH_TYPE_AVR32_UCR3,      "__AVR32_UC3C0512CREVC__"},
-+  {"uc3c1512crevc",   PART_TYPE_AVR32_UC3C1512CREVC,   ARCH_TYPE_AVR32_UCR3,      "__AVR32_UC3C1512CREVC__"},
-+  {"uc3c2512crevc",   PART_TYPE_AVR32_UC3C2512CREVC,   ARCH_TYPE_AVR32_UCR3,      "__AVR32_UC3C2512CREVC__"},
-+  {"uc3l0256",        PART_TYPE_AVR32_UC3L0256,        ARCH_TYPE_AVR32_UCR3,      "__AVR32_UC3L0256__"},
-+  {"uc3l0128",        PART_TYPE_AVR32_UC3L0128,        ARCH_TYPE_AVR32_UCR3,      "__AVR32_UC3L0128__"},
-+  {"uc3l064",         PART_TYPE_AVR32_UC3L064,         ARCH_TYPE_AVR32_UCR3,      "__AVR32_UC3L064__"},
-+  {"uc3l032",         PART_TYPE_AVR32_UC3L032,         ARCH_TYPE_AVR32_UCR3,      "__AVR32_UC3L032__"},
-+  {"uc3l016",         PART_TYPE_AVR32_UC3L016,         ARCH_TYPE_AVR32_UCR3,      "__AVR32_UC3L016__"},
-+  {"uc3l064revb",     PART_TYPE_AVR32_UC3L064REVB,     ARCH_TYPE_AVR32_UCR3,      "__AVR32_UC3L064REVB__"},
-+  {"uc64l3u",         PART_TYPE_AVR32_UC64L3U,         ARCH_TYPE_AVR32_UCR3,      "__AVR32_UC64L3U__"},
-+  {"uc128l3u",        PART_TYPE_AVR32_UC128L3U,        ARCH_TYPE_AVR32_UCR3,      "__AVR32_UC128L3U__"},
-+  {"uc256l3u",        PART_TYPE_AVR32_UC256L3U,        ARCH_TYPE_AVR32_UCR3,      "__AVR32_UC256L3U__"},
-+  {"uc64l4u",         PART_TYPE_AVR32_UC64L4U,         ARCH_TYPE_AVR32_UCR3,      "__AVR32_UC64L4U__"},
-+  {"uc128l4u",        PART_TYPE_AVR32_UC128L4U,        ARCH_TYPE_AVR32_UCR3,      "__AVR32_UC128L4U__"},
-+  {"uc256l4u",        PART_TYPE_AVR32_UC256L4U,        ARCH_TYPE_AVR32_UCR3,      "__AVR32_UC256L4U__"},
-+  {"uc3c064c",        PART_TYPE_AVR32_UC3C064C,        ARCH_TYPE_AVR32_UCR3FP,    "__AVR32_UC3C064C__"},
-+  {"uc3c0128c",       PART_TYPE_AVR32_UC3C0128C,       ARCH_TYPE_AVR32_UCR3FP,    "__AVR32_UC3C0128C__"},
-+  {"uc3c0256c",       PART_TYPE_AVR32_UC3C0256C,       ARCH_TYPE_AVR32_UCR3FP,    "__AVR32_UC3C0256C__"},
-+  {"uc3c0512c",       PART_TYPE_AVR32_UC3C0512C,       ARCH_TYPE_AVR32_UCR3FP,    "__AVR32_UC3C0512C__"},
-+  {"uc3c164c",        PART_TYPE_AVR32_UC3C164C,        ARCH_TYPE_AVR32_UCR3FP,    "__AVR32_UC3C164C__"},
-+  {"uc3c1128c",       PART_TYPE_AVR32_UC3C1128C,       ARCH_TYPE_AVR32_UCR3FP,    "__AVR32_UC3C1128C__"},
-+  {"uc3c1256c",       PART_TYPE_AVR32_UC3C1256C,       ARCH_TYPE_AVR32_UCR3FP,    "__AVR32_UC3C1256C__"},
-+  {"uc3c1512c",       PART_TYPE_AVR32_UC3C1512C,       ARCH_TYPE_AVR32_UCR3FP,    "__AVR32_UC3C1512C__"},
-+  {"uc3c264c",        PART_TYPE_AVR32_UC3C264C,        ARCH_TYPE_AVR32_UCR3FP,    "__AVR32_UC3C264C__"},
-+  {"uc3c2128c",       PART_TYPE_AVR32_UC3C2128C,       ARCH_TYPE_AVR32_UCR3FP,    "__AVR32_UC3C2128C__"},
-+  {"uc3c2256c",       PART_TYPE_AVR32_UC3C2256C,       ARCH_TYPE_AVR32_UCR3FP,    "__AVR32_UC3C2256C__"},
-+  {"uc3c2512c",       PART_TYPE_AVR32_UC3C2512C,       ARCH_TYPE_AVR32_UCR3FP,    "__AVR32_UC3C2512C__"},
-+  {"mxt768e",         PART_TYPE_AVR32_MXT768E,         ARCH_TYPE_AVR32_UCR3,      "__AVR32_MXT768E__"},
-+  {NULL, 0, 0, NULL}
-+};
-+
-+/* List of all known AVR32 architectures  */
-+static const struct arch_type_s avr32_arch_types[] = {
-+  /* name, architecture type, microarchitecture type, feature flags, macro */
-+  {"ap", ARCH_TYPE_AVR32_AP, UARCH_TYPE_AVR32B,
-+   (FLAG_AVR32_HAS_DSP
-+    | FLAG_AVR32_HAS_SIMD
-+    | FLAG_AVR32_HAS_UNALIGNED_WORD
-+    | FLAG_AVR32_HAS_BRANCH_PRED | FLAG_AVR32_HAS_RETURN_STACK
-+    | FLAG_AVR32_HAS_CACHES),
-+   "__AVR32_AP__"},
-+  {"ucr1", ARCH_TYPE_AVR32_UCR1, UARCH_TYPE_AVR32A,
-+   (FLAG_AVR32_HAS_DSP | FLAG_AVR32_HAS_RMW),
-+   "__AVR32_UC__=1"},
-+  {"ucr2", ARCH_TYPE_AVR32_UCR2, UARCH_TYPE_AVR32A,
-+   (FLAG_AVR32_HAS_DSP | FLAG_AVR32_HAS_RMW
-+    | FLAG_AVR32_HAS_V2_INSNS),
-+   "__AVR32_UC__=2"},
-+  {"ucr2nomul", ARCH_TYPE_AVR32_UCR2NOMUL, UARCH_TYPE_AVR32A,
-+   (FLAG_AVR32_HAS_DSP | FLAG_AVR32_HAS_RMW
-+    | FLAG_AVR32_HAS_V2_INSNS | FLAG_AVR32_HAS_NO_MUL_INSNS),
-+   "__AVR32_UC__=2"},
-+  {"ucr3", ARCH_TYPE_AVR32_UCR3, UARCH_TYPE_AVR32A,
-+   (FLAG_AVR32_HAS_DSP | FLAG_AVR32_HAS_RMW
-+    | FLAG_AVR32_HAS_V2_INSNS),
-+   "__AVR32_UC__=3"},
-+  {"ucr3fp", ARCH_TYPE_AVR32_UCR3FP, UARCH_TYPE_AVR32A,
-+   (FLAG_AVR32_HAS_DSP | FLAG_AVR32_HAS_RMW | FLAG_AVR32_HAS_FPU
-+    | FLAG_AVR32_HAS_V2_INSNS),
-+   "__AVR32_UC__=3"},
-+  {NULL, 0, 0, 0, NULL}
-+};
-+
-+/* Default arch name */
-+const char *avr32_arch_name = "none";
-+const char *avr32_part_name = "none";
-+
-+const struct part_type_s *avr32_part;
-+const struct arch_type_s *avr32_arch;
-+
-+
-+/* FIXME: needs to use GC.  */
-+struct flashvault_decl_list
-+{
-+  struct flashvault_decl_list *next;
-+  unsigned int vector_num;
-+  const char *name;
-+};
-+
-+static struct flashvault_decl_list *flashvault_decl_list_head = NULL;
-+
-+
-+/* Set default target_flags. */
-+#undef TARGET_DEFAULT_TARGET_FLAGS
-+#define TARGET_DEFAULT_TARGET_FLAGS \
-+  (MASK_HAS_ASM_ADDR_PSEUDOS | MASK_MD_REORG_OPTIMIZATION | MASK_COND_EXEC_BEFORE_RELOAD)
-+
-+void
-+avr32_optimization_options (int level, int size)
-+{
-+  if (AVR32_ALWAYS_PIC)
-+    flag_pic = 1;
-+
-+  /* Enable section anchors if optimization is enabled. */
-+  if (level > 0 || size)
-+    flag_section_anchors = 2;
-+}
-+
-+
-+/* Override command line options */
-+void
-+avr32_override_options (void)
-+{
-+  const struct part_type_s *part;
-+  const struct arch_type_s *arch, *part_arch;
-+
-+  /*Add backward compability*/
-+  if (strcmp ("uc", avr32_arch_name)== 0)
-+    {
-+      fprintf (stderr, "Warning: Deprecated arch `%s' specified. "
-+                       "Please use '-march=ucr1' instead. "
-+                       "Using arch 'ucr1'\n",
-+               avr32_arch_name);
-+      avr32_arch_name="ucr1";
-+    }
-+
-+  /* Check if arch type is set. */
-+  for (arch = avr32_arch_types; arch->name; arch++)
-+    {
-+      if (strcmp (arch->name, avr32_arch_name) == 0)
-+        break;
-+    }
-+  avr32_arch = arch;
-+
-+  if (!arch->name && strcmp("none", avr32_arch_name) != 0)
-+    {
-+      fprintf (stderr, "Unknown arch `%s' specified\n"
-+                       "Known arch names:\n"
-+                       "\tuc (deprecated)\n",
-+               avr32_arch_name);
-+      for (arch = avr32_arch_types; arch->name; arch++)
-+        fprintf (stderr, "\t%s\n", arch->name);
-+      avr32_arch = &avr32_arch_types[ARCH_TYPE_AVR32_AP];
-+    }
-+
-+  /* Check if part type is set. */
-+  for (part = avr32_part_types; part->name; part++)
-+    if (strcmp (part->name, avr32_part_name) == 0)
-+      break;
-+
-+  avr32_part = part;
-+  if (!part->name)
-+    {
-+      fprintf (stderr, "Unknown part `%s' specified\nKnown part names:\n",
-+               avr32_part_name);
-+      for (part = avr32_part_types; part->name; part++)
-+        {
-+          if (strcmp("none", part->name) != 0)
-+            fprintf (stderr, "\t%s\n", part->name);
-+        }
-+      /* Set default to NONE*/
-+      avr32_part = &avr32_part_types[PART_TYPE_AVR32_NONE];
-+    }
-+
-+  /* NB! option -march= overrides option -mpart
-+   * if both are used at the same time */
-+  if (!arch->name)
-+    avr32_arch = &avr32_arch_types[avr32_part->arch_type];
-+
-+   /* When architecture implied by -mpart and one passed in -march are 
-+    * conflicting, issue an error message */
-+   part_arch = &avr32_arch_types[avr32_part->arch_type];
-+   if (strcmp("none",avr32_part_name) && strcmp("none", avr32_arch_name) && strcmp(avr32_arch_name,part_arch->name))
-+     error ("Conflicting architectures implied by -mpart and -march\n");
-+
-+  /* If optimization level is two or greater, then align start of loops to a
-+     word boundary since this will allow folding the first insn of the loop.
-+     Do this only for targets supporting branch prediction. */
-+  if (optimize >= 2 && TARGET_BRANCH_PRED)
-+    align_loops = 2;
-+
-+
-+  /* Enable fast-float library if unsafe math optimizations
-+     are used. */
-+  if (flag_unsafe_math_optimizations)
-+    target_flags |= MASK_FAST_FLOAT;
-+
-+  /* Check if we should set avr32_imm_in_const_pool
-+     based on if caches are present or not. */
-+  if ( avr32_imm_in_const_pool == -1 )
-+    {
-+      if ( TARGET_CACHES )
-+        avr32_imm_in_const_pool = 1;
-+      else
-+        avr32_imm_in_const_pool = 0;
-+    }
-+
-+  if (TARGET_NO_PIC)
-+    flag_pic = 0;
-+  avr32_add_gc_roots ();
-+}
-+
-+
-+/*
-+If defined, a function that outputs the assembler code for entry to a
-+function.  The prologue is responsible for setting up the stack frame,
-+initializing the frame pointer register, saving registers that must be
-+saved, and allocating size additional bytes of storage for the
-+local variables.  size is an integer.  file is a stdio
-+stream to which the assembler code should be output.
-+
-+The label for the beginning of the function need not be output by this
-+macro.  That has already been done when the macro is run.
-+
-+To determine which registers to save, the macro can refer to the array
-+regs_ever_live: element r is nonzero if hard register
-+r is used anywhere within the function.  This implies the function
-+prologue should save register r, provided it is not one of the
-+call-used registers.  (TARGET_ASM_FUNCTION_EPILOGUE must likewise use
-+regs_ever_live.)
-+
-+On machines that have ``register windows'', the function entry code does
-+not save on the stack the registers that are in the windows, even if
-+they are supposed to be preserved by function calls; instead it takes
-+appropriate steps to ``push'' the register stack, if any non-call-used
-+registers are used in the function.
-+
-+On machines where functions may or may not have frame-pointers, the
-+function entry code must vary accordingly; it must set up the frame
-+pointer if one is wanted, and not otherwise.  To determine whether a
-+frame pointer is in wanted, the macro can refer to the variable
-+frame_pointer_needed.  The variable's value will be 1 at run
-+time in a function that needs a frame pointer.  (see Elimination).
-+
-+The function entry code is responsible for allocating any stack space
-+required for the function.  This stack space consists of the regions
-+listed below.  In most cases, these regions are allocated in the
-+order listed, with the last listed region closest to the top of the
-+stack (the lowest address if STACK_GROWS_DOWNWARD is defined, and
-+the highest address if it is not defined).  You can use a different order
-+for a machine if doing so is more convenient or required for
-+compatibility reasons.  Except in cases where required by standard
-+or by a debugger, there is no reason why the stack layout used by GCC
-+need agree with that used by other compilers for a machine.
-+*/
-+
-+#undef TARGET_ASM_FUNCTION_PROLOGUE
-+#define TARGET_ASM_FUNCTION_PROLOGUE avr32_target_asm_function_prologue
-+
-+#undef TARGET_ASM_FILE_END
-+#define TARGET_ASM_FILE_END avr32_file_end
-+
-+#undef TARGET_DEFAULT_SHORT_ENUMS
-+#define TARGET_DEFAULT_SHORT_ENUMS hook_bool_void_false
-+
-+#undef TARGET_PROMOTE_FUNCTION_ARGS
-+#define TARGET_PROMOTE_FUNCTION_ARGS hook_bool_tree_true
-+
-+#undef TARGET_PROMOTE_FUNCTION_RETURN
-+#define TARGET_PROMOTE_FUNCTION_RETURN hook_bool_tree_true
-+
-+#undef TARGET_PROMOTE_PROTOTYPES
-+#define TARGET_PROMOTE_PROTOTYPES hook_bool_tree_true
-+
-+#undef TARGET_MUST_PASS_IN_STACK
-+#define TARGET_MUST_PASS_IN_STACK avr32_must_pass_in_stack
-+
-+#undef TARGET_PASS_BY_REFERENCE
-+#define TARGET_PASS_BY_REFERENCE avr32_pass_by_reference
-+
-+#undef TARGET_STRICT_ARGUMENT_NAMING
-+#define TARGET_STRICT_ARGUMENT_NAMING avr32_strict_argument_naming
-+
-+#undef TARGET_VECTOR_MODE_SUPPORTED_P
-+#define TARGET_VECTOR_MODE_SUPPORTED_P avr32_vector_mode_supported
-+
-+#undef TARGET_RETURN_IN_MEMORY
-+#define TARGET_RETURN_IN_MEMORY avr32_return_in_memory
-+
-+#undef TARGET_RETURN_IN_MSB
-+#define TARGET_RETURN_IN_MSB avr32_return_in_msb
-+
-+#undef TARGET_ENCODE_SECTION_INFO
-+#define TARGET_ENCODE_SECTION_INFO avr32_encode_section_info
-+
-+#undef TARGET_ARG_PARTIAL_BYTES
-+#define TARGET_ARG_PARTIAL_BYTES avr32_arg_partial_bytes
-+
-+#undef TARGET_STRIP_NAME_ENCODING
-+#define TARGET_STRIP_NAME_ENCODING avr32_strip_name_encoding
-+
-+#define streq(string1, string2) (strcmp (string1, string2) == 0)
-+
-+#undef  TARGET_NARROW_VOLATILE_BITFIELD
-+#define TARGET_NARROW_VOLATILE_BITFIELD hook_bool_void_false
-+
-+#undef  TARGET_ATTRIBUTE_TABLE
-+#define TARGET_ATTRIBUTE_TABLE avr32_attribute_table
-+
-+#undef  TARGET_COMP_TYPE_ATTRIBUTES
-+#define TARGET_COMP_TYPE_ATTRIBUTES avr32_comp_type_attributes
-+
-+
-+#undef  TARGET_RTX_COSTS
-+#define TARGET_RTX_COSTS avr32_rtx_costs
-+
-+#undef  TARGET_CANNOT_FORCE_CONST_MEM
-+#define  TARGET_CANNOT_FORCE_CONST_MEM avr32_cannot_force_const_mem
-+
-+#undef  TARGET_ASM_INTEGER
-+#define TARGET_ASM_INTEGER avr32_assemble_integer
-+
-+#undef  TARGET_FUNCTION_VALUE
-+#define TARGET_FUNCTION_VALUE avr32_function_value
-+
-+#undef  TARGET_MIN_ANCHOR_OFFSET
-+#define TARGET_MIN_ANCHOR_OFFSET (0)
-+
-+#undef  TARGET_MAX_ANCHOR_OFFSET
-+#define TARGET_MAX_ANCHOR_OFFSET ((1 << 15) - 1)
-+#undef TARGET_SECONDARY_RELOAD
-+#define TARGET_SECONDARY_RELOAD avr32_secondary_reload
-+
-+
-+/*
-+ * Defining the option, -mlist-devices to list the devices supported by gcc.
-+ * This option should be used while printing target-help to list all the 
-+ * supported devices.
-+ */
-+#undef TARGET_HELP
-+#define TARGET_HELP avr32_target_help
-+
-+void avr32_target_help ()
-+{
-+  if (avr32_list_supported_parts)
-+    {
-+      const struct part_type_s *list;
-+      fprintf (stdout, "List of parts supported by avr32-gcc:\n");
-+      for (list = avr32_part_types; list->name; list++)
-+        {
-+          if (strcmp("none", list->name) != 0)
-+            fprintf (stdout, "%-20s%s\n", list->name, list->macro);
-+        }
-+      fprintf (stdout, "\n\n");
-+    }
-+}
-+
-+enum reg_class
-+avr32_secondary_reload (bool in_p, rtx x, enum reg_class class,
-+                        enum machine_mode mode, secondary_reload_info *sri)
-+{
-+
-+  if ( avr32_rmw_memory_operand (x, mode) )
-+    {
-+      if (!in_p)
-+        sri->icode = CODE_FOR_reload_out_rmw_memory_operand;
-+      else
-+        sri->icode = CODE_FOR_reload_in_rmw_memory_operand;
-+    }
-+  return NO_REGS;
-+
-+}
-+/*
-+ * Switches to the appropriate section for output of constant pool
-+ * entry x in mode. You can assume that x is some kind of constant in
-+ * RTL. The argument mode is redundant except in the case of a
-+ * const_int rtx. Select the section by calling readonly_data_ section
-+ * or one of the alternatives for other sections. align is the
-+ * constant alignment in bits.
-+ *
-+ * The default version of this function takes care of putting symbolic
-+ * constants in flag_ pic mode in data_section and everything else in
-+ * readonly_data_section.
-+ */
-+//#undef TARGET_ASM_SELECT_RTX_SECTION
-+//#define TARGET_ASM_SELECT_RTX_SECTION avr32_select_rtx_section
-+
-+
-+/*
-+ * If non-null, this hook performs a target-specific pass over the
-+ * instruction stream. The compiler will run it at all optimization
-+ * levels, just before the point at which it normally does
-+ * delayed-branch scheduling.
-+ *
-+ * The exact purpose of the hook varies from target to target. Some
-+ * use it to do transformations that are necessary for correctness,
-+ * such as laying out in-function constant pools or avoiding hardware
-+ * hazards. Others use it as an opportunity to do some
-+ * machine-dependent optimizations.
-+ *
-+ * You need not implement the hook if it has nothing to do. The
-+ * default definition is null.
-+ */
-+#undef TARGET_MACHINE_DEPENDENT_REORG
-+#define TARGET_MACHINE_DEPENDENT_REORG avr32_reorg
-+
-+/* Target hook for assembling integer objects.
-+   Need to handle integer vectors */
-+static bool
-+avr32_assemble_integer (rtx x, unsigned int size, int aligned_p)
-+{
-+  if (avr32_vector_mode_supported (GET_MODE (x)))
-+    {
-+      int i, units;
-+
-+      if (GET_CODE (x) != CONST_VECTOR)
-+	abort ();
-+
-+      units = CONST_VECTOR_NUNITS (x);
-+
-+      switch (GET_MODE (x))
-+	{
-+	case V2HImode:
-+	  size = 2;
-+	  break;
-+	case V4QImode:
-+	  size = 1;
-+	  break;
-+	default:
-+	  abort ();
-+	}
-+
-+      for (i = 0; i < units; i++)
-+	{
-+	  rtx elt;
-+
-+	  elt = CONST_VECTOR_ELT (x, i);
-+	  assemble_integer (elt, size, i == 0 ? 32 : size * BITS_PER_UNIT, 1);
-+	}
-+
-+      return true;
-+    }
-+
-+  return default_assemble_integer (x, size, aligned_p);
-+}
-+
-+
-+/*
-+ * This target hook describes the relative costs of RTL expressions.
-+ *
-+ * The cost may depend on the precise form of the expression, which is
-+ * available for examination in x, and the rtx code of the expression
-+ * in which it is contained, found in outer_code. code is the
-+ * expression code--redundant, since it can be obtained with GET_CODE
-+ * (x).
-+ *
-+ * In implementing this hook, you can use the construct COSTS_N_INSNS
-+ * (n) to specify a cost equal to n fast instructions.
-+ *
-+ * On entry to the hook, *total contains a default estimate for the
-+ * cost of the expression. The hook should modify this value as
-+ * necessary. Traditionally, the default costs are COSTS_N_INSNS (5)
-+ * for multiplications, COSTS_N_INSNS (7) for division and modulus
-+ * operations, and COSTS_N_INSNS (1) for all other operations.
-+ *
-+ * When optimizing for code size, i.e. when optimize_size is non-zero,
-+ * this target hook should be used to estimate the relative size cost
-+ * of an expression, again relative to COSTS_N_INSNS.
-+ *
-+ * The hook returns true when all subexpressions of x have been
-+ * processed, and false when rtx_cost should recurse.
-+ */
-+
-+/* Worker routine for avr32_rtx_costs.  */
-+static inline int
-+avr32_rtx_costs_1 (rtx x, enum rtx_code code ATTRIBUTE_UNUSED,
-+		   enum rtx_code outer ATTRIBUTE_UNUSED)
-+{
-+  enum machine_mode mode = GET_MODE (x);
-+
-+  switch (GET_CODE (x))
-+    {
-+    case MEM:
-+      /* Using pre decrement / post increment memory operations on the
-+         avr32_uc architecture means that two writebacks must be performed
-+         and hence two cycles are needed. */
-+      if (!optimize_size
-+	  && GET_MODE_SIZE (mode) <= 2 * UNITS_PER_WORD
-+	  && TARGET_ARCH_UC
-+	  && (GET_CODE (XEXP (x, 0)) == PRE_DEC
-+	      || GET_CODE (XEXP (x, 0)) == POST_INC))
-+	return COSTS_N_INSNS (5);
-+
-+      /* Memory costs quite a lot for the first word, but subsequent words
-+         load at the equivalent of a single insn each.  */
-+      if (GET_MODE_SIZE (mode) > UNITS_PER_WORD)
-+	return COSTS_N_INSNS (3 + (GET_MODE_SIZE (mode) / UNITS_PER_WORD));
-+
-+      return COSTS_N_INSNS (4);
-+    case SYMBOL_REF:
-+    case CONST:
-+      /* These are valid for the pseudo insns: lda.w and call which operates
-+         on direct addresses. We assume that the cost of a lda.w is the same
-+         as the cost of a ld.w insn. */
-+      return (outer == SET) ? COSTS_N_INSNS (4) : COSTS_N_INSNS (1);
-+    case DIV:
-+    case MOD:
-+    case UDIV:
-+    case UMOD:
-+      return optimize_size ? COSTS_N_INSNS (1) : COSTS_N_INSNS (16);
-+
-+    case ROTATE:
-+    case ROTATERT:
-+      if (mode == TImode)
-+	return COSTS_N_INSNS (100);
-+
-+      if (mode == DImode)
-+	return COSTS_N_INSNS (10);
-+      return COSTS_N_INSNS (4);
-+    case ASHIFT:
-+    case LSHIFTRT:
-+    case ASHIFTRT:
-+    case NOT:
-+      if (mode == TImode)
-+	return COSTS_N_INSNS (10);
-+
-+      if (mode == DImode)
-+	return COSTS_N_INSNS (4);
-+      return COSTS_N_INSNS (1);
-+    case PLUS:
-+    case MINUS:
-+    case NEG:
-+    case COMPARE:
-+    case ABS:
-+      if (GET_MODE_CLASS (mode) == MODE_FLOAT)
-+	return COSTS_N_INSNS (100);
-+
-+      if (mode == TImode)
-+	return COSTS_N_INSNS (50);
-+
-+      if (mode == DImode)
-+	return COSTS_N_INSNS (2);
-+      return COSTS_N_INSNS (1);
-+
-+    case MULT:
-+      {
-+	if (GET_MODE_CLASS (mode) == MODE_FLOAT)
-+	  return COSTS_N_INSNS (300);
-+
-+	if (mode == TImode)
-+	  return COSTS_N_INSNS (16);
-+
-+	if (mode == DImode)
-+	  return COSTS_N_INSNS (4);
-+
-+	if (mode == HImode)
-+	  return COSTS_N_INSNS (2);
-+
-+	return COSTS_N_INSNS (3);
-+      }
-+    case IF_THEN_ELSE:
-+      if (GET_CODE (XEXP (x, 1)) == PC || GET_CODE (XEXP (x, 2)) == PC)
-+	return COSTS_N_INSNS (4);
-+      return COSTS_N_INSNS (1);
-+    case SIGN_EXTEND:
-+    case ZERO_EXTEND:
-+      /* Sign/Zero extensions of registers cost quite much since these
-+         instrcutions only take one register operand which means that gcc
-+         often must insert some move instrcutions */
-+      if (mode == QImode || mode == HImode)
-+	return (COSTS_N_INSNS (GET_CODE (XEXP (x, 0)) == MEM ? 0 : 1));
-+      return COSTS_N_INSNS (4);
-+    case UNSPEC:
-+      /* divmod operations */
-+      if (XINT (x, 1) == UNSPEC_UDIVMODSI4_INTERNAL
-+	  || XINT (x, 1) == UNSPEC_DIVMODSI4_INTERNAL)
-+	{
-+	  return optimize_size ? COSTS_N_INSNS (1) : COSTS_N_INSNS (16);
-+	}
-+      /* Fallthrough */
-+    default:
-+      return COSTS_N_INSNS (1);
-+    }
-+}
-+
-+
-+static bool
-+avr32_rtx_costs (rtx x, int code, int outer_code, int *total)
-+{
-+  *total = avr32_rtx_costs_1 (x, code, outer_code);
-+  return true;
-+}
-+
-+
-+bool
-+avr32_cannot_force_const_mem (rtx x ATTRIBUTE_UNUSED)
-+{
-+  /* Do not want symbols in the constant pool when compiling pic or if using
-+     address pseudo instructions. */
-+  return ((flag_pic || TARGET_HAS_ASM_ADDR_PSEUDOS)
-+	  && avr32_find_symbol (x) != NULL_RTX);
-+}
-+
-+
-+/* Table of machine attributes.  */
-+const struct attribute_spec avr32_attribute_table[] = {
-+  /* { name, min_len, max_len, decl_req, type_req, fn_type_req, handler } */
-+  /* Interrupt Service Routines have special prologue and epilogue
-+     requirements.  */
-+  {"isr", 0, 1, false, false, false, avr32_handle_isr_attribute},
-+  {"interrupt", 0, 1, false, false, false, avr32_handle_isr_attribute},
-+  {"acall", 0, 1, false, true, true, avr32_handle_acall_attribute},
-+  {"naked", 0, 0, true, false, false, avr32_handle_fndecl_attribute},
-+  {"rmw_addressable", 0, 0, true, false, false, NULL},
-+  {"flashvault", 0, 1, true, false, false, avr32_handle_fndecl_attribute},
-+  {"flashvault_impl", 0, 1, true, false, false, avr32_handle_fndecl_attribute},
-+  {NULL, 0, 0, false, false, false, NULL}
-+};
-+
-+
-+typedef struct
-+{
-+  const char *const arg;
-+  const unsigned long return_value;
-+}
-+isr_attribute_arg;
-+
-+
-+static const isr_attribute_arg isr_attribute_args[] = {
-+  {"FULL", AVR32_FT_ISR_FULL},
-+  {"full", AVR32_FT_ISR_FULL},
-+  {"HALF", AVR32_FT_ISR_HALF},
-+  {"half", AVR32_FT_ISR_HALF},
-+  {"NONE", AVR32_FT_ISR_NONE},
-+  {"none", AVR32_FT_ISR_NONE},
-+  {"UNDEF", AVR32_FT_ISR_NONE},
-+  {"undef", AVR32_FT_ISR_NONE},
-+  {"SWI", AVR32_FT_ISR_NONE},
-+  {"swi", AVR32_FT_ISR_NONE},
-+  {NULL, AVR32_FT_ISR_NONE}
-+};
-+
-+
-+/* Returns the (interrupt) function type of the current
-+   function, or AVR32_FT_UNKNOWN if the type cannot be determined.  */
-+static unsigned long
-+avr32_isr_value (tree argument)
-+{
-+  const isr_attribute_arg *ptr;
-+  const char *arg;
-+
-+  /* No argument - default to ISR_NONE.  */
-+  if (argument == NULL_TREE)
-+    return AVR32_FT_ISR_NONE;
-+
-+  /* Get the value of the argument.  */
-+  if (TREE_VALUE (argument) == NULL_TREE
-+      || TREE_CODE (TREE_VALUE (argument)) != STRING_CST)
-+    return AVR32_FT_UNKNOWN;
-+
-+  arg = TREE_STRING_POINTER (TREE_VALUE (argument));
-+
-+  /* Check it against the list of known arguments.  */
-+  for (ptr = isr_attribute_args; ptr->arg != NULL; ptr++)
-+    if (streq (arg, ptr->arg))
-+      return ptr->return_value;
-+
-+  /* An unrecognized interrupt type.  */
-+  return AVR32_FT_UNKNOWN;
-+}
-+
-+
-+/*
-+These hooks specify assembly directives for creating certain kinds
-+of integer object.  The TARGET_ASM_BYTE_OP directive creates a
-+byte-sized object, the TARGET_ASM_ALIGNED_HI_OP one creates an
-+aligned two-byte object, and so on.  Any of the hooks may be
-+NULL, indicating that no suitable directive is available.
-+
-+The compiler will print these strings at the start of a new line,
-+followed immediately by the object's initial value.  In most cases,
-+the string should contain a tab, a pseudo-op, and then another tab.
-+*/
-+#undef  TARGET_ASM_BYTE_OP
-+#define TARGET_ASM_BYTE_OP "\t.byte\t"
-+#undef  TARGET_ASM_ALIGNED_HI_OP
-+#define TARGET_ASM_ALIGNED_HI_OP "\t.align 1\n\t.short\t"
-+#undef  TARGET_ASM_ALIGNED_SI_OP
-+#define TARGET_ASM_ALIGNED_SI_OP "\t.align 2\n\t.int\t"
-+#undef  TARGET_ASM_ALIGNED_DI_OP
-+#define TARGET_ASM_ALIGNED_DI_OP NULL
-+#undef  TARGET_ASM_ALIGNED_TI_OP
-+#define TARGET_ASM_ALIGNED_TI_OP NULL
-+#undef  TARGET_ASM_UNALIGNED_HI_OP
-+#define TARGET_ASM_UNALIGNED_HI_OP "\t.short\t"
-+#undef  TARGET_ASM_UNALIGNED_SI_OP
-+#define TARGET_ASM_UNALIGNED_SI_OP "\t.int\t"
-+#undef  TARGET_ASM_UNALIGNED_DI_OP
-+#define TARGET_ASM_UNALIGNED_DI_OP NULL
-+#undef  TARGET_ASM_UNALIGNED_TI_OP
-+#define TARGET_ASM_UNALIGNED_TI_OP NULL
-+
-+#undef TARGET_ASM_OUTPUT_MI_THUNK
-+#define TARGET_ASM_OUTPUT_MI_THUNK avr32_output_mi_thunk
-+
-+#undef TARGET_ASM_CAN_OUTPUT_MI_THUNK
-+#define TARGET_ASM_CAN_OUTPUT_MI_THUNK hook_bool_const_tree_hwi_hwi_const_tree_true
-+
-+
-+static void
-+avr32_output_mi_thunk (FILE * file,
-+    tree thunk ATTRIBUTE_UNUSED,
-+    HOST_WIDE_INT delta,
-+    HOST_WIDE_INT vcall_offset, tree function)
-+  {
-+    int mi_delta = delta;
-+    int this_regno =
-+      (aggregate_value_p (TREE_TYPE (TREE_TYPE (function)), function) ?
-+       INTERNAL_REGNUM (11) : INTERNAL_REGNUM (12));
-+
-+
-+    if (!avr32_const_ok_for_constraint_p (mi_delta, 'I', "Is21")
-+        || vcall_offset)
-+      {
-+        fputs ("\tpushm\tlr\n", file);
-+      }
-+
-+
-+    if (mi_delta != 0)
-+      {
-+        if (avr32_const_ok_for_constraint_p (mi_delta, 'I', "Is21"))
-+          {
-+            fprintf (file, "\tsub\t%s, %d\n", reg_names[this_regno], -mi_delta);
-+          }
-+        else
-+          {
-+            /* Immediate is larger than k21 we must make us a temp register by
-+	     pushing a register to the stack. */
-+            fprintf (file, "\tmov\tlr, lo(%d)\n", mi_delta);
-+            fprintf (file, "\torh\tlr, hi(%d)\n", mi_delta);
-+            fprintf (file, "\tadd\t%s, lr\n", reg_names[this_regno]);
-+          }
-+      }
-+
-+
-+    if (vcall_offset != 0)
-+      {
-+        fprintf (file, "\tld.w\tlr, %s[0]\n", reg_names[this_regno]);
-+        fprintf (file, "\tld.w\tlr, lr[%i]\n", (int) vcall_offset);
-+        fprintf (file, "\tadd\t%s, lr\n", reg_names[this_regno]);
-+      }
-+
-+
-+    if (!avr32_const_ok_for_constraint_p (mi_delta, 'I', "Is21")
-+        || vcall_offset)
-+      {
-+        fputs ("\tpopm\tlr\n", file);
-+      }
-+
-+    /* Jump to the function. We assume that we can use an rjmp since the
-+       function to jump to is local and probably not too far away from
-+       the thunk. If this assumption proves to be wrong we could implement
-+       this jump by calculating the offset between the jump source and destination
-+       and put this in the constant pool and then perform an add to pc.
-+       This would also be legitimate PIC code. But for now we hope that an rjmp
-+       will be sufficient...
-+    */
-+    fputs ("\trjmp\t", file);
-+    assemble_name (file, XSTR (XEXP (DECL_RTL (function), 0), 0));
-+    fputc ('\n', file);
-+  }
-+
-+
-+/* Implements target hook vector_mode_supported.  */
-+bool
-+avr32_vector_mode_supported (enum machine_mode mode)
-+{
-+  if ((mode == V2HImode) || (mode == V4QImode))
-+    return true;
-+
-+  return false;
-+}
-+
-+
-+#undef TARGET_INIT_LIBFUNCS
-+#define TARGET_INIT_LIBFUNCS avr32_init_libfuncs
-+
-+#undef  TARGET_INIT_BUILTINS
-+#define TARGET_INIT_BUILTINS avr32_init_builtins
-+
-+#undef  TARGET_EXPAND_BUILTIN
-+#define TARGET_EXPAND_BUILTIN avr32_expand_builtin
-+
-+tree int_ftype_int, int_ftype_void, short_ftype_short, void_ftype_int_int,
-+  void_ftype_ptr_int;
-+tree void_ftype_int, void_ftype_ulong, void_ftype_void, int_ftype_ptr_int;
-+tree short_ftype_short, int_ftype_int_short, int_ftype_short_short,
-+  short_ftype_short_short;
-+tree int_ftype_int_int, longlong_ftype_int_short, longlong_ftype_short_short;
-+tree void_ftype_int_int_int_int_int, void_ftype_int_int_int;
-+tree longlong_ftype_int_int, void_ftype_int_int_longlong;
-+tree int_ftype_int_int_int, longlong_ftype_longlong_int_short;
-+tree longlong_ftype_longlong_short_short, int_ftype_int_short_short;
-+
-+#define def_builtin(NAME, TYPE, CODE)					\
-+  add_builtin_function ((NAME), (TYPE), (CODE),                          \
-+                       BUILT_IN_MD, NULL, NULL_TREE)
-+
-+#define def_mbuiltin(MASK, NAME, TYPE, CODE)				\
-+  do									\
-+    {									\
-+      if ((MASK))							\
-+	add_builtin_function ((NAME), (TYPE), (CODE),                   \
-+                              BUILT_IN_MD, NULL, NULL_TREE);            \
-+    }									\
-+  while (0)
-+
-+struct builtin_description
-+{
-+  const unsigned int mask;
-+  const enum insn_code icode;
-+  const char *const name;
-+  const int code;
-+  const enum rtx_code comparison;
-+  const unsigned int flag;
-+  const tree *ftype;
-+};
-+
-+static const struct builtin_description bdesc_2arg[] = {
-+
-+#define DSP_BUILTIN(code, builtin, ftype) \
-+  { 1, CODE_FOR_##code, "__builtin_" #code , \
-+  AVR32_BUILTIN_##builtin, 0, 0, ftype }
-+
-+  DSP_BUILTIN (mulsathh_h,    MULSATHH_H,    &short_ftype_short_short),
-+  DSP_BUILTIN (mulsathh_w,    MULSATHH_W,    &int_ftype_short_short),
-+  DSP_BUILTIN (mulsatrndhh_h, MULSATRNDHH_H, &short_ftype_short_short),
-+  DSP_BUILTIN (mulsatrndwh_w, MULSATRNDWH_W, &int_ftype_int_short),
-+  DSP_BUILTIN (mulsatwh_w,    MULSATWH_W,    &int_ftype_int_short),
-+  DSP_BUILTIN (satadd_h,      SATADD_H,      &short_ftype_short_short),
-+  DSP_BUILTIN (satsub_h,      SATSUB_H,      &short_ftype_short_short),
-+  DSP_BUILTIN (satadd_w,      SATADD_W,      &int_ftype_int_int),
-+  DSP_BUILTIN (satsub_w,      SATSUB_W,      &int_ftype_int_int),
-+  DSP_BUILTIN (mulwh_d,       MULWH_D,       &longlong_ftype_int_short),
-+  DSP_BUILTIN (mulnwh_d,      MULNWH_D,      &longlong_ftype_int_short)
-+};
-+
-+
-+void
-+avr32_init_builtins (void)
-+{
-+  unsigned int i;
-+  const struct builtin_description *d;
-+  tree endlink = void_list_node;
-+  tree int_endlink = tree_cons (NULL_TREE, integer_type_node, endlink);
-+  tree longlong_endlink =
-+    tree_cons (NULL_TREE, long_long_integer_type_node, endlink);
-+  tree short_endlink =
-+    tree_cons (NULL_TREE, short_integer_type_node, endlink);
-+  tree void_endlink = tree_cons (NULL_TREE, void_type_node, endlink);
-+
-+  /* int func (int) */
-+  int_ftype_int = build_function_type (integer_type_node, int_endlink);
-+
-+  /* short func (short) */
-+  short_ftype_short
-+    = build_function_type (short_integer_type_node, short_endlink);
-+
-+  /* short func (short, short) */
-+  short_ftype_short_short
-+    = build_function_type (short_integer_type_node,
-+			   tree_cons (NULL_TREE, short_integer_type_node,
-+				      short_endlink));
-+
-+  /* long long func (long long, short, short) */
-+  longlong_ftype_longlong_short_short
-+    = build_function_type (long_long_integer_type_node,
-+			   tree_cons (NULL_TREE, long_long_integer_type_node,
-+				      tree_cons (NULL_TREE,
-+						 short_integer_type_node,
-+						 short_endlink)));
-+
-+  /* long long func (short, short) */
-+  longlong_ftype_short_short
-+    = build_function_type (long_long_integer_type_node,
-+			   tree_cons (NULL_TREE, short_integer_type_node,
-+				      short_endlink));
-+
-+  /* int func (int, int) */
-+  int_ftype_int_int
-+    = build_function_type (integer_type_node,
-+			   tree_cons (NULL_TREE, integer_type_node,
-+				      int_endlink));
-+
-+  /* long long func (int, int) */
-+  longlong_ftype_int_int
-+    = build_function_type (long_long_integer_type_node,
-+			   tree_cons (NULL_TREE, integer_type_node,
-+				      int_endlink));
-+
-+  /* long long int func (long long, int, short) */
-+  longlong_ftype_longlong_int_short
-+    = build_function_type (long_long_integer_type_node,
-+			   tree_cons (NULL_TREE, long_long_integer_type_node,
-+				      tree_cons (NULL_TREE, integer_type_node,
-+						 short_endlink)));
-+
-+  /* long long int func (int, short) */
-+  longlong_ftype_int_short
-+    = build_function_type (long_long_integer_type_node,
-+			   tree_cons (NULL_TREE, integer_type_node,
-+				      short_endlink));
-+
-+  /* int func (int, short, short) */
-+  int_ftype_int_short_short
-+    = build_function_type (integer_type_node,
-+			   tree_cons (NULL_TREE, integer_type_node,
-+				      tree_cons (NULL_TREE,
-+						 short_integer_type_node,
-+						 short_endlink)));
-+
-+  /* int func (short, short) */
-+  int_ftype_short_short
-+    = build_function_type (integer_type_node,
-+			   tree_cons (NULL_TREE, short_integer_type_node,
-+				      short_endlink));
-+
-+  /* int func (int, short) */
-+  int_ftype_int_short
-+    = build_function_type (integer_type_node,
-+			   tree_cons (NULL_TREE, integer_type_node,
-+				      short_endlink));
-+
-+  /* void func (int, int) */
-+  void_ftype_int_int
-+    = build_function_type (void_type_node,
-+			   tree_cons (NULL_TREE, integer_type_node,
-+				      int_endlink));
-+
-+  /* void func (int, int, int) */
-+  void_ftype_int_int_int
-+    = build_function_type (void_type_node,
-+			   tree_cons (NULL_TREE, integer_type_node,
-+				      tree_cons (NULL_TREE, integer_type_node,
-+						 int_endlink)));
-+
-+  /* void func (int, int, long long) */
-+  void_ftype_int_int_longlong
-+    = build_function_type (void_type_node,
-+			   tree_cons (NULL_TREE, integer_type_node,
-+				      tree_cons (NULL_TREE, integer_type_node,
-+						 longlong_endlink)));
-+
-+  /* void func (int, int, int, int, int) */
-+  void_ftype_int_int_int_int_int
-+    = build_function_type (void_type_node,
-+			   tree_cons (NULL_TREE, integer_type_node,
-+				      tree_cons (NULL_TREE, integer_type_node,
-+						 tree_cons (NULL_TREE,
-+							    integer_type_node,
-+							    tree_cons
-+							    (NULL_TREE,
-+							     integer_type_node,
-+							     int_endlink)))));
-+
-+  /* void func (void *, int) */
-+  void_ftype_ptr_int
-+    = build_function_type (void_type_node,
-+			   tree_cons (NULL_TREE, ptr_type_node, int_endlink));
-+
-+  /* void func (int) */
-+  void_ftype_int = build_function_type (void_type_node, int_endlink);
-+
-+  /* void func (ulong) */
-+  void_ftype_ulong = build_function_type_list (void_type_node,
-+                           long_unsigned_type_node, NULL_TREE);
-+
-+  /* void func (void) */
-+  void_ftype_void = build_function_type (void_type_node, void_endlink);
-+
-+  /* int func (void) */
-+  int_ftype_void = build_function_type (integer_type_node, void_endlink);
-+
-+  /* int func (void *, int) */
-+  int_ftype_ptr_int
-+    = build_function_type (integer_type_node,
-+			   tree_cons (NULL_TREE, ptr_type_node, int_endlink));
-+
-+  /* int func (int, int, int) */
-+  int_ftype_int_int_int
-+    = build_function_type (integer_type_node,
-+			   tree_cons (NULL_TREE, integer_type_node,
-+				      tree_cons (NULL_TREE, integer_type_node,
-+						 int_endlink)));
-+
-+  /* Initialize avr32 builtins.  */
-+  def_builtin ("__builtin_mfsr", int_ftype_int, AVR32_BUILTIN_MFSR);
-+  def_builtin ("__builtin_mtsr", void_ftype_int_int, AVR32_BUILTIN_MTSR);
-+  def_builtin ("__builtin_mfdr", int_ftype_int, AVR32_BUILTIN_MFDR);
-+  def_builtin ("__builtin_mtdr", void_ftype_int_int, AVR32_BUILTIN_MTDR);
-+  def_builtin ("__builtin_cache", void_ftype_ptr_int, AVR32_BUILTIN_CACHE);
-+  def_builtin ("__builtin_sync", void_ftype_int, AVR32_BUILTIN_SYNC);
-+  def_builtin ("__builtin_ssrf", void_ftype_int, AVR32_BUILTIN_SSRF);
-+  def_builtin ("__builtin_csrf", void_ftype_int, AVR32_BUILTIN_CSRF);
-+  def_builtin ("__builtin_tlbr", void_ftype_void, AVR32_BUILTIN_TLBR);
-+  def_builtin ("__builtin_tlbs", void_ftype_void, AVR32_BUILTIN_TLBS);
-+  def_builtin ("__builtin_tlbw", void_ftype_void, AVR32_BUILTIN_TLBW);
-+  def_builtin ("__builtin_breakpoint", void_ftype_void,
-+	       AVR32_BUILTIN_BREAKPOINT);
-+  def_builtin ("__builtin_xchg", int_ftype_ptr_int, AVR32_BUILTIN_XCHG);
-+  def_builtin ("__builtin_ldxi", int_ftype_ptr_int, AVR32_BUILTIN_LDXI);
-+  def_builtin ("__builtin_bswap_16", short_ftype_short,
-+	       AVR32_BUILTIN_BSWAP16);
-+  def_builtin ("__builtin_bswap_32", int_ftype_int, AVR32_BUILTIN_BSWAP32);
-+  def_builtin ("__builtin_cop", void_ftype_int_int_int_int_int,
-+	       AVR32_BUILTIN_COP);
-+  def_builtin ("__builtin_mvcr_w", int_ftype_int_int, AVR32_BUILTIN_MVCR_W);
-+  def_builtin ("__builtin_mvrc_w", void_ftype_int_int_int,
-+	       AVR32_BUILTIN_MVRC_W);
-+  def_builtin ("__builtin_mvcr_d", longlong_ftype_int_int,
-+	       AVR32_BUILTIN_MVCR_D);
-+  def_builtin ("__builtin_mvrc_d", void_ftype_int_int_longlong,
-+	       AVR32_BUILTIN_MVRC_D);
-+  def_builtin ("__builtin_sats", int_ftype_int_int_int, AVR32_BUILTIN_SATS);
-+  def_builtin ("__builtin_satu", int_ftype_int_int_int, AVR32_BUILTIN_SATU);
-+  def_builtin ("__builtin_satrnds", int_ftype_int_int_int,
-+	       AVR32_BUILTIN_SATRNDS);
-+  def_builtin ("__builtin_satrndu", int_ftype_int_int_int,
-+	       AVR32_BUILTIN_SATRNDU);
-+  def_builtin ("__builtin_musfr", void_ftype_int, AVR32_BUILTIN_MUSFR);
-+  def_builtin ("__builtin_mustr", int_ftype_void, AVR32_BUILTIN_MUSTR);
-+  def_builtin ("__builtin_macsathh_w", int_ftype_int_short_short,
-+	       AVR32_BUILTIN_MACSATHH_W);
-+  def_builtin ("__builtin_macwh_d", longlong_ftype_longlong_int_short,
-+	       AVR32_BUILTIN_MACWH_D);
-+  def_builtin ("__builtin_machh_d", longlong_ftype_longlong_short_short,
-+	       AVR32_BUILTIN_MACHH_D);
-+  def_builtin ("__builtin_mems", void_ftype_ptr_int, AVR32_BUILTIN_MEMS);
-+  def_builtin ("__builtin_memt", void_ftype_ptr_int, AVR32_BUILTIN_MEMT);
-+  def_builtin ("__builtin_memc", void_ftype_ptr_int, AVR32_BUILTIN_MEMC);
-+  def_builtin ("__builtin_sleep", void_ftype_int, AVR32_BUILTIN_SLEEP);
-+  def_builtin ("__builtin_avr32_delay_cycles", void_ftype_int, AVR32_BUILTIN_DELAY_CYCLES);
-+
-+  /* Add all builtins that are more or less simple operations on two
-+     operands.  */
-+  for (i = 0, d = bdesc_2arg; i < ARRAY_SIZE (bdesc_2arg); i++, d++)
-+    {
-+      /* Use one of the operands; the target can have a different mode for
-+         mask-generating compares.  */
-+
-+      if (d->name == 0)
-+	continue;
-+
-+      def_mbuiltin (d->mask, d->name, *(d->ftype), d->code);
-+    }
-+}
-+
-+
-+/* Subroutine of avr32_expand_builtin to take care of binop insns. */
-+static rtx
-+avr32_expand_binop_builtin (enum insn_code icode, tree exp, rtx target)
-+{
-+  rtx pat;
-+  tree arg0 = CALL_EXPR_ARG (exp,0);
-+  tree arg1 = CALL_EXPR_ARG (exp,1);
-+  rtx op0 = expand_normal (arg0);
-+  rtx op1 = expand_normal (arg1);
-+  enum machine_mode tmode = insn_data[icode].operand[0].mode;
-+  enum machine_mode mode0 = insn_data[icode].operand[1].mode;
-+  enum machine_mode mode1 = insn_data[icode].operand[2].mode;
-+
-+  if (!target
-+      || GET_MODE (target) != tmode
-+      || !(*insn_data[icode].operand[0].predicate) (target, tmode))
-+    target = gen_reg_rtx (tmode);
-+
-+  /* In case the insn wants input operands in modes different from the
-+     result, abort.  */
-+  if (!(*insn_data[icode].operand[1].predicate) (op0, mode0))
-+    {
-+      /* If op0 is already a reg we must cast it to the correct mode. */
-+      if (REG_P (op0))
-+	op0 = convert_to_mode (mode0, op0, 1);
-+      else
-+	op0 = copy_to_mode_reg (mode0, op0);
-+    }
-+  if (!(*insn_data[icode].operand[2].predicate) (op1, mode1))
-+    {
-+      /* If op1 is already a reg we must cast it to the correct mode. */
-+      if (REG_P (op1))
-+	op1 = convert_to_mode (mode1, op1, 1);
-+      else
-+	op1 = copy_to_mode_reg (mode1, op1);
-+    }
-+  pat = GEN_FCN (icode) (target, op0, op1);
-+  if (!pat)
-+    return 0;
-+  emit_insn (pat);
-+  return target;
-+}
-+
-+
-+/* Expand an expression EXP that calls a built-in function,
-+   with result going to TARGET if that's convenient
-+   (and in mode MODE if that's convenient).
-+   SUBTARGET may be used as the target for computing one of EXP's operands.
-+   IGNORE is nonzero if the value is to be ignored.  */
-+rtx
-+avr32_expand_builtin (tree exp,
-+		      rtx target,
-+		      rtx subtarget ATTRIBUTE_UNUSED,
-+		      enum machine_mode mode ATTRIBUTE_UNUSED,
-+		      int ignore ATTRIBUTE_UNUSED)
-+{
-+  const struct builtin_description *d;
-+  unsigned int i;
-+  enum insn_code icode = 0;
-+  tree fndecl = TREE_OPERAND (CALL_EXPR_FN (exp), 0);
-+  tree arg0, arg1, arg2;
-+  rtx op0, op1, op2, pat;
-+  enum machine_mode tmode, mode0, mode1;
-+  enum machine_mode arg0_mode;
-+  int fcode = DECL_FUNCTION_CODE (fndecl);
-+
-+  switch (fcode)
-+    {
-+    default:
-+      break;
-+
-+    case AVR32_BUILTIN_SATS:
-+    case AVR32_BUILTIN_SATU:
-+    case AVR32_BUILTIN_SATRNDS:
-+    case AVR32_BUILTIN_SATRNDU:
-+      {
-+	const char *fname;
-+	switch (fcode)
-+	  {
-+	  default:
-+	  case AVR32_BUILTIN_SATS:
-+	    icode = CODE_FOR_sats;
-+	    fname = "sats";
-+	    break;
-+	  case AVR32_BUILTIN_SATU:
-+	    icode = CODE_FOR_satu;
-+	    fname = "satu";
-+	    break;
-+	  case AVR32_BUILTIN_SATRNDS:
-+	    icode = CODE_FOR_satrnds;
-+	    fname = "satrnds";
-+	    break;
-+	  case AVR32_BUILTIN_SATRNDU:
-+	    icode = CODE_FOR_satrndu;
-+	    fname = "satrndu";
-+	    break;
-+	  }
-+
-+	arg0 = CALL_EXPR_ARG (exp,0);
-+	arg1 = CALL_EXPR_ARG (exp,1);
-+	arg2 = CALL_EXPR_ARG (exp,2);
-+	op0 = expand_normal (arg0);
-+	op1 = expand_normal (arg1);
-+	op2 = expand_normal (arg2);
-+
-+	tmode = insn_data[icode].operand[0].mode;
-+
-+
-+	if (target == 0
-+	    || GET_MODE (target) != tmode
-+	    || !(*insn_data[icode].operand[0].predicate) (target, tmode))
-+	  target = gen_reg_rtx (tmode);
-+
-+
-+	if (!(*insn_data[icode].operand[0].predicate) (op0, GET_MODE (op0)))
-+	  {
-+	    op0 = copy_to_mode_reg (insn_data[icode].operand[0].mode, op0);
-+	  }
-+
-+	if (!(*insn_data[icode].operand[1].predicate) (op1, SImode))
-+	  {
-+	    error ("Parameter 2 to __builtin_%s should be a constant number.",
-+		   fname);
-+	    return NULL_RTX;
-+	  }
-+
-+	if (!(*insn_data[icode].operand[1].predicate) (op2, SImode))
-+	  {
-+	    error ("Parameter 3 to __builtin_%s should be a constant number.",
-+		   fname);
-+	    return NULL_RTX;
-+	  }
-+
-+	emit_move_insn (target, op0);
-+	pat = GEN_FCN (icode) (target, op1, op2);
-+	if (!pat)
-+	  return 0;
-+	emit_insn (pat);
-+
-+	return target;
-+      }
-+    case AVR32_BUILTIN_MUSTR:
-+      icode = CODE_FOR_mustr;
-+      tmode = insn_data[icode].operand[0].mode;
-+
-+      if (target == 0
-+	  || GET_MODE (target) != tmode
-+	  || !(*insn_data[icode].operand[0].predicate) (target, tmode))
-+	target = gen_reg_rtx (tmode);
-+      pat = GEN_FCN (icode) (target);
-+      if (!pat)
-+	return 0;
-+      emit_insn (pat);
-+      return target;
-+
-+    case AVR32_BUILTIN_MFSR:
-+      icode = CODE_FOR_mfsr;
-+      arg0 = CALL_EXPR_ARG (exp,0);
-+      op0 = expand_normal (arg0);
-+      tmode = insn_data[icode].operand[0].mode;
-+      mode0 = insn_data[icode].operand[1].mode;
-+
-+      if (!(*insn_data[icode].operand[1].predicate) (op0, mode0))
-+	{
-+	  error ("Parameter 1 to __builtin_mfsr must be a constant number");
-+	}
-+
-+      if (target == 0
-+	  || GET_MODE (target) != tmode
-+	  || !(*insn_data[icode].operand[0].predicate) (target, tmode))
-+	target = gen_reg_rtx (tmode);
-+      pat = GEN_FCN (icode) (target, op0);
-+      if (!pat)
-+	return 0;
-+      emit_insn (pat);
-+      return target;
-+    case AVR32_BUILTIN_MTSR:
-+      icode = CODE_FOR_mtsr;
-+      arg0 = CALL_EXPR_ARG (exp,0);
-+      arg1 = CALL_EXPR_ARG (exp,1);
-+      op0 = expand_normal (arg0);
-+      op1 = expand_normal (arg1);
-+      mode0 = insn_data[icode].operand[0].mode;
-+      mode1 = insn_data[icode].operand[1].mode;
-+
-+      if (!(*insn_data[icode].operand[0].predicate) (op0, mode0))
-+	{
-+	  error ("Parameter 1 to __builtin_mtsr must be a constant number");
-+	  return gen_reg_rtx (mode0);
-+	}
-+      if (!(*insn_data[icode].operand[1].predicate) (op1, mode1))
-+	op1 = copy_to_mode_reg (mode1, op1);
-+      pat = GEN_FCN (icode) (op0, op1);
-+      if (!pat)
-+	return 0;
-+      emit_insn (pat);
-+      return NULL_RTX;
-+    case AVR32_BUILTIN_MFDR:
-+      icode = CODE_FOR_mfdr;
-+      arg0 = CALL_EXPR_ARG (exp,0);
-+      op0 = expand_normal (arg0);
-+      tmode = insn_data[icode].operand[0].mode;
-+      mode0 = insn_data[icode].operand[1].mode;
-+
-+      if (!(*insn_data[icode].operand[1].predicate) (op0, mode0))
-+	{
-+	  error ("Parameter 1 to __builtin_mfdr must be a constant number");
-+	}
-+
-+      if (target == 0
-+	  || GET_MODE (target) != tmode
-+	  || !(*insn_data[icode].operand[0].predicate) (target, tmode))
-+	target = gen_reg_rtx (tmode);
-+      pat = GEN_FCN (icode) (target, op0);
-+      if (!pat)
-+	return 0;
-+      emit_insn (pat);
-+      return target;
-+    case AVR32_BUILTIN_MTDR:
-+      icode = CODE_FOR_mtdr;
-+      arg0 = CALL_EXPR_ARG (exp,0);
-+      arg1 = CALL_EXPR_ARG (exp,1);
-+      op0 = expand_normal (arg0);
-+      op1 = expand_normal (arg1);
-+      mode0 = insn_data[icode].operand[0].mode;
-+      mode1 = insn_data[icode].operand[1].mode;
-+
-+      if (!(*insn_data[icode].operand[0].predicate) (op0, mode0))
-+	{
-+	  error ("Parameter 1 to __builtin_mtdr must be a constant number");
-+	  return gen_reg_rtx (mode0);
-+	}
-+      if (!(*insn_data[icode].operand[1].predicate) (op1, mode1))
-+	op1 = copy_to_mode_reg (mode1, op1);
-+      pat = GEN_FCN (icode) (op0, op1);
-+      if (!pat)
-+	return 0;
-+      emit_insn (pat);
-+      return NULL_RTX;
-+    case AVR32_BUILTIN_CACHE:
-+      icode = CODE_FOR_cache;
-+      arg0 = CALL_EXPR_ARG (exp,0);
-+      arg1 = CALL_EXPR_ARG (exp,1);
-+      op0 = expand_normal (arg0);
-+      op1 = expand_normal (arg1);
-+      mode0 = insn_data[icode].operand[0].mode;
-+      mode1 = insn_data[icode].operand[1].mode;
-+
-+      if (!(*insn_data[icode].operand[1].predicate) (op1, mode1))
-+	{
-+	  error ("Parameter 2 to __builtin_cache must be a constant number");
-+	  return gen_reg_rtx (mode1);
-+	}
-+
-+      if (!(*insn_data[icode].operand[0].predicate) (op0, mode0))
-+	op0 = copy_to_mode_reg (mode0, op0);
-+
-+      pat = GEN_FCN (icode) (op0, op1);
-+      if (!pat)
-+	return 0;
-+      emit_insn (pat);
-+      return NULL_RTX;
-+    case AVR32_BUILTIN_SYNC:
-+    case AVR32_BUILTIN_MUSFR:
-+    case AVR32_BUILTIN_SSRF:
-+    case AVR32_BUILTIN_CSRF:
-+      {
-+	const char *fname;
-+	switch (fcode)
-+	  {
-+	  default:
-+	  case AVR32_BUILTIN_SYNC:
-+	    icode = CODE_FOR_sync;
-+	    fname = "sync";
-+	    break;
-+	  case AVR32_BUILTIN_MUSFR:
-+	    icode = CODE_FOR_musfr;
-+	    fname = "musfr";
-+	    break;
-+	  case AVR32_BUILTIN_SSRF:
-+	    icode = CODE_FOR_ssrf;
-+	    fname = "ssrf";
-+	    break;
-+	  case AVR32_BUILTIN_CSRF:
-+	    icode = CODE_FOR_csrf;
-+	    fname = "csrf";
-+	    break;
-+	  }
-+
-+	arg0 = CALL_EXPR_ARG (exp,0);
-+	op0 = expand_normal (arg0);
-+	mode0 = insn_data[icode].operand[0].mode;
-+
-+	if (!(*insn_data[icode].operand[0].predicate) (op0, mode0))
-+	  {
-+	    if (icode == CODE_FOR_musfr)
-+	      op0 = copy_to_mode_reg (mode0, op0);
-+	    else
-+	      {
-+		error ("Parameter to __builtin_%s is illegal.", fname);
-+		return gen_reg_rtx (mode0);
-+	      }
-+	  }
-+	pat = GEN_FCN (icode) (op0);
-+	if (!pat)
-+	  return 0;
-+	emit_insn (pat);
-+	return NULL_RTX;
-+      }
-+    case AVR32_BUILTIN_TLBR:
-+      icode = CODE_FOR_tlbr;
-+      pat = GEN_FCN (icode) (NULL_RTX);
-+      if (!pat)
-+	return 0;
-+      emit_insn (pat);
-+      return NULL_RTX;
-+    case AVR32_BUILTIN_TLBS:
-+      icode = CODE_FOR_tlbs;
-+      pat = GEN_FCN (icode) (NULL_RTX);
-+      if (!pat)
-+	return 0;
-+      emit_insn (pat);
-+      return NULL_RTX;
-+    case AVR32_BUILTIN_TLBW:
-+      icode = CODE_FOR_tlbw;
-+      pat = GEN_FCN (icode) (NULL_RTX);
-+      if (!pat)
-+	return 0;
-+      emit_insn (pat);
-+      return NULL_RTX;
-+    case AVR32_BUILTIN_BREAKPOINT:
-+      icode = CODE_FOR_breakpoint;
-+      pat = GEN_FCN (icode) (NULL_RTX);
-+      if (!pat)
-+	return 0;
-+      emit_insn (pat);
-+      return NULL_RTX;
-+    case AVR32_BUILTIN_XCHG:
-+      icode = CODE_FOR_sync_lock_test_and_setsi;
-+      arg0 = CALL_EXPR_ARG (exp,0);
-+      arg1 = CALL_EXPR_ARG (exp,1);
-+      op0 = expand_normal (arg0);
-+      op1 = expand_normal (arg1);
-+      tmode = insn_data[icode].operand[0].mode;
-+      mode0 = insn_data[icode].operand[1].mode;
-+      mode1 = insn_data[icode].operand[2].mode;
-+
-+      if (!(*insn_data[icode].operand[2].predicate) (op1, mode1))
-+	{
-+	  op1 = copy_to_mode_reg (mode1, op1);
-+	}
-+
-+      op0 = force_reg (GET_MODE (op0), op0);
-+      op0 = gen_rtx_MEM (GET_MODE (op0), op0);
-+      if (!(*insn_data[icode].operand[1].predicate) (op0, mode0))
-+	{
-+	  error
-+	    ("Parameter 1 to __builtin_xchg must be a pointer to an integer.");
-+	}
-+
-+      if (target == 0
-+	  || GET_MODE (target) != tmode
-+	  || !(*insn_data[icode].operand[0].predicate) (target, tmode))
-+	target = gen_reg_rtx (tmode);
-+      pat = GEN_FCN (icode) (target, op0, op1);
-+      if (!pat)
-+	return 0;
-+      emit_insn (pat);
-+      return target;
-+    case AVR32_BUILTIN_LDXI:
-+      icode = CODE_FOR_ldxi;
-+      arg0 = CALL_EXPR_ARG (exp,0);
-+      arg1 = CALL_EXPR_ARG (exp,1);
-+      arg2 = CALL_EXPR_ARG (exp,2);
-+      op0 = expand_normal (arg0);
-+      op1 = expand_normal (arg1);
-+      op2 = expand_normal (arg2);
-+      tmode = insn_data[icode].operand[0].mode;
-+      mode0 = insn_data[icode].operand[1].mode;
-+      mode1 = insn_data[icode].operand[2].mode;
-+
-+      if (!(*insn_data[icode].operand[1].predicate) (op0, mode0))
-+	{
-+	  op0 = copy_to_mode_reg (mode0, op0);
-+	}
-+
-+      if (!(*insn_data[icode].operand[2].predicate) (op1, mode1))
-+	{
-+	  op1 = copy_to_mode_reg (mode1, op1);
-+	}
-+
-+      if (!(*insn_data[icode].operand[3].predicate) (op2, SImode))
-+	{
-+	  error
-+	    ("Parameter 3 to __builtin_ldxi must be a valid extract shift operand: (0|8|16|24)");
-+	  return gen_reg_rtx (mode0);
-+	}
-+
-+      if (target == 0
-+	  || GET_MODE (target) != tmode
-+	  || !(*insn_data[icode].operand[0].predicate) (target, tmode))
-+	target = gen_reg_rtx (tmode);
-+      pat = GEN_FCN (icode) (target, op0, op1, op2);
-+      if (!pat)
-+	return 0;
-+      emit_insn (pat);
-+      return target;
-+    case AVR32_BUILTIN_BSWAP16:
-+      {
-+	icode = CODE_FOR_bswap_16;
-+	arg0 = CALL_EXPR_ARG (exp,0);
-+	arg0_mode = TYPE_MODE (TREE_TYPE (arg0));
-+	mode0 = insn_data[icode].operand[1].mode;
-+	if (arg0_mode != mode0)
-+	  arg0 = build1 (NOP_EXPR,
-+			 (*lang_hooks.types.type_for_mode) (mode0, 0), arg0);
-+
-+	op0 = expand_expr (arg0, NULL_RTX, HImode, 0);
-+	tmode = insn_data[icode].operand[0].mode;
-+
-+
-+	if (!(*insn_data[icode].operand[1].predicate) (op0, mode0))
-+	  {
-+            if ( CONST_INT_P (op0) )
-+              {
-+                HOST_WIDE_INT val = ( ((INTVAL (op0)&0x00ff) << 8) |
-+                                      ((INTVAL (op0)&0xff00) >> 8) );
-+                /* Sign extend 16-bit value to host wide int */
-+                val <<= (HOST_BITS_PER_WIDE_INT - 16);
-+                val >>= (HOST_BITS_PER_WIDE_INT - 16);
-+                op0 = GEN_INT(val);
-+                if (target == 0
-+                    || GET_MODE (target) != tmode
-+                    || !(*insn_data[icode].operand[0].predicate) (target, tmode))
-+                  target = gen_reg_rtx (tmode);
-+                emit_move_insn(target, op0);
-+                return target;
-+              }
-+            else
-+              op0 = copy_to_mode_reg (mode0, op0);
-+	  }
-+
-+	if (target == 0
-+	    || GET_MODE (target) != tmode
-+	    || !(*insn_data[icode].operand[0].predicate) (target, tmode))
-+	  {
-+	    target = gen_reg_rtx (tmode);
-+	  }
-+
-+
-+	pat = GEN_FCN (icode) (target, op0);
-+	if (!pat)
-+	  return 0;
-+	emit_insn (pat);
-+
-+	return target;
-+      }
-+    case AVR32_BUILTIN_BSWAP32:
-+      {
-+	icode = CODE_FOR_bswap_32;
-+	arg0 = CALL_EXPR_ARG (exp,0);
-+	op0 = expand_normal (arg0);
-+	tmode = insn_data[icode].operand[0].mode;
-+	mode0 = insn_data[icode].operand[1].mode;
-+
-+	if (!(*insn_data[icode].operand[1].predicate) (op0, mode0))
-+	  {
-+            if ( CONST_INT_P (op0) )
-+              {
-+                HOST_WIDE_INT val = ( ((INTVAL (op0)&0x000000ff) << 24) |
-+                                      ((INTVAL (op0)&0x0000ff00) << 8) |
-+                                      ((INTVAL (op0)&0x00ff0000) >> 8) |
-+                                      ((INTVAL (op0)&0xff000000) >> 24) );
-+                /* Sign extend 32-bit value to host wide int */
-+                val <<= (HOST_BITS_PER_WIDE_INT - 32);
-+                val >>= (HOST_BITS_PER_WIDE_INT - 32);
-+                op0 = GEN_INT(val);
-+                if (target == 0
-+                    || GET_MODE (target) != tmode
-+                    || !(*insn_data[icode].operand[0].predicate) (target, tmode))
-+                  target = gen_reg_rtx (tmode);
-+                emit_move_insn(target, op0);
-+                return target;
-+              }
-+            else
-+              op0 = copy_to_mode_reg (mode0, op0);
-+	  }
-+
-+	if (target == 0
-+	    || GET_MODE (target) != tmode
-+	    || !(*insn_data[icode].operand[0].predicate) (target, tmode))
-+	  target = gen_reg_rtx (tmode);
-+
-+
-+	pat = GEN_FCN (icode) (target, op0);
-+	if (!pat)
-+	  return 0;
-+	emit_insn (pat);
-+
-+	return target;
-+      }
-+    case AVR32_BUILTIN_MVCR_W:
-+    case AVR32_BUILTIN_MVCR_D:
-+      {
-+	arg0 = CALL_EXPR_ARG (exp,0);
-+	arg1 = CALL_EXPR_ARG (exp,1);
-+	op0 = expand_normal (arg0);
-+	op1 = expand_normal (arg1);
-+
-+	if (fcode == AVR32_BUILTIN_MVCR_W)
-+	  icode = CODE_FOR_mvcrsi;
-+	else
-+	  icode = CODE_FOR_mvcrdi;
-+
-+	tmode = insn_data[icode].operand[0].mode;
-+
-+	if (target == 0
-+	    || GET_MODE (target) != tmode
-+	    || !(*insn_data[icode].operand[0].predicate) (target, tmode))
-+	  target = gen_reg_rtx (tmode);
-+
-+	if (!(*insn_data[icode].operand[1].predicate) (op0, SImode))
-+	  {
-+	    error
-+	      ("Parameter 1 to __builtin_cop is not a valid coprocessor number.");
-+	    error ("Number should be between 0 and 7.");
-+	    return NULL_RTX;
-+	  }
-+
-+	if (!(*insn_data[icode].operand[2].predicate) (op1, SImode))
-+	  {
-+	    error
-+	      ("Parameter 2 to __builtin_cop is not a valid coprocessor register number.");
-+	    error ("Number should be between 0 and 15.");
-+	    return NULL_RTX;
-+	  }
-+
-+	pat = GEN_FCN (icode) (target, op0, op1);
-+	if (!pat)
-+	  return 0;
-+	emit_insn (pat);
-+
-+	return target;
-+      }
-+    case AVR32_BUILTIN_MACSATHH_W:
-+    case AVR32_BUILTIN_MACWH_D:
-+    case AVR32_BUILTIN_MACHH_D:
-+      {
-+	arg0 = CALL_EXPR_ARG (exp,0);
-+	arg1 = CALL_EXPR_ARG (exp,1);
-+	arg2 = CALL_EXPR_ARG (exp,2);
-+	op0 = expand_normal (arg0);
-+	op1 = expand_normal (arg1);
-+	op2 = expand_normal (arg2);
-+
-+	icode = ((fcode == AVR32_BUILTIN_MACSATHH_W) ? CODE_FOR_macsathh_w :
-+		 (fcode == AVR32_BUILTIN_MACWH_D) ? CODE_FOR_macwh_d :
-+		 CODE_FOR_machh_d);
-+
-+	tmode = insn_data[icode].operand[0].mode;
-+	mode0 = insn_data[icode].operand[1].mode;
-+	mode1 = insn_data[icode].operand[2].mode;
-+
-+
-+	if (!target
-+	    || GET_MODE (target) != tmode
-+	    || !(*insn_data[icode].operand[0].predicate) (target, tmode))
-+	  target = gen_reg_rtx (tmode);
-+
-+	if (!(*insn_data[icode].operand[0].predicate) (op0, tmode))
-+	  {
-+	    /* If op0 is already a reg we must cast it to the correct mode. */
-+	    if (REG_P (op0))
-+	      op0 = convert_to_mode (tmode, op0, 1);
-+	    else
-+	      op0 = copy_to_mode_reg (tmode, op0);
-+	  }
-+
-+	if (!(*insn_data[icode].operand[1].predicate) (op1, mode0))
-+	  {
-+	    /* If op1 is already a reg we must cast it to the correct mode. */
-+	    if (REG_P (op1))
-+	      op1 = convert_to_mode (mode0, op1, 1);
-+	    else
-+	      op1 = copy_to_mode_reg (mode0, op1);
-+	  }
-+
-+	if (!(*insn_data[icode].operand[2].predicate) (op2, mode1))
-+	  {
-+	    /* If op1 is already a reg we must cast it to the correct mode. */
-+	    if (REG_P (op2))
-+	      op2 = convert_to_mode (mode1, op2, 1);
-+	    else
-+	      op2 = copy_to_mode_reg (mode1, op2);
-+	  }
-+
-+	emit_move_insn (target, op0);
-+
-+	pat = GEN_FCN (icode) (target, op1, op2);
-+	if (!pat)
-+	  return 0;
-+	emit_insn (pat);
-+	return target;
-+      }
-+    case AVR32_BUILTIN_MVRC_W:
-+    case AVR32_BUILTIN_MVRC_D:
-+      {
-+	arg0 = CALL_EXPR_ARG (exp,0);
-+	arg1 = CALL_EXPR_ARG (exp,1);
-+	arg2 = CALL_EXPR_ARG (exp,2);
-+	op0 = expand_normal (arg0);
-+	op1 = expand_normal (arg1);
-+	op2 = expand_normal (arg2);
-+
-+	if (fcode == AVR32_BUILTIN_MVRC_W)
-+	  icode = CODE_FOR_mvrcsi;
-+	else
-+	  icode = CODE_FOR_mvrcdi;
-+
-+	if (!(*insn_data[icode].operand[0].predicate) (op0, SImode))
-+	  {
-+	    error ("Parameter 1 is not a valid coprocessor number.");
-+	    error ("Number should be between 0 and 7.");
-+	    return NULL_RTX;
-+	  }
-+
-+	if (!(*insn_data[icode].operand[1].predicate) (op1, SImode))
-+	  {
-+	    error ("Parameter 2 is not a valid coprocessor register number.");
-+	    error ("Number should be between 0 and 15.");
-+	    return NULL_RTX;
-+	  }
-+
-+	if (GET_CODE (op2) == CONST_INT
-+	    || GET_CODE (op2) == CONST
-+	    || GET_CODE (op2) == SYMBOL_REF || GET_CODE (op2) == LABEL_REF)
-+	  {
-+	    op2 = force_const_mem (insn_data[icode].operand[2].mode, op2);
-+	  }
-+
-+	if (!(*insn_data[icode].operand[2].predicate) (op2, GET_MODE (op2)))
-+	  op2 = copy_to_mode_reg (insn_data[icode].operand[2].mode, op2);
-+
-+
-+	pat = GEN_FCN (icode) (op0, op1, op2);
-+	if (!pat)
-+	  return 0;
-+	emit_insn (pat);
-+
-+	return NULL_RTX;
-+      }
-+    case AVR32_BUILTIN_COP:
-+      {
-+	rtx op3, op4;
-+	tree arg3, arg4;
-+	icode = CODE_FOR_cop;
-+	arg0 = CALL_EXPR_ARG (exp,0);
-+	arg1 = CALL_EXPR_ARG (exp,1);
-+	arg2 = CALL_EXPR_ARG (exp,2);
-+	arg3 = CALL_EXPR_ARG (exp,3);
-+	arg4 = CALL_EXPR_ARG (exp,4);
-+	op0 = expand_normal (arg0);
-+	op1 = expand_normal (arg1);
-+	op2 = expand_normal (arg2);
-+	op3 = expand_normal (arg3);
-+	op4 = expand_normal (arg4);
-+
-+	if (!(*insn_data[icode].operand[0].predicate) (op0, SImode))
-+	  {
-+	    error
-+	      ("Parameter 1 to __builtin_cop is not a valid coprocessor number.");
-+	    error ("Number should be between 0 and 7.");
-+	    return NULL_RTX;
-+	  }
-+
-+	if (!(*insn_data[icode].operand[1].predicate) (op1, SImode))
-+	  {
-+	    error
-+	      ("Parameter 2 to __builtin_cop is not a valid coprocessor register number.");
-+	    error ("Number should be between 0 and 15.");
-+	    return NULL_RTX;
-+	  }
-+
-+	if (!(*insn_data[icode].operand[2].predicate) (op2, SImode))
-+	  {
-+	    error
-+	      ("Parameter 3 to __builtin_cop is not a valid coprocessor register number.");
-+	    error ("Number should be between 0 and 15.");
-+	    return NULL_RTX;
-+	  }
-+
-+	if (!(*insn_data[icode].operand[3].predicate) (op3, SImode))
-+	  {
-+	    error
-+	      ("Parameter 4 to __builtin_cop is not a valid coprocessor register number.");
-+	    error ("Number should be between 0 and 15.");
-+	    return NULL_RTX;
-+	  }
-+
-+	if (!(*insn_data[icode].operand[4].predicate) (op4, SImode))
-+	  {
-+	    error
-+	      ("Parameter 5 to __builtin_cop is not a valid coprocessor operation.");
-+	    error ("Number should be between 0 and 127.");
-+	    return NULL_RTX;
-+	  }
-+
-+	pat = GEN_FCN (icode) (op0, op1, op2, op3, op4);
-+	if (!pat)
-+	  return 0;
-+	emit_insn (pat);
-+
-+	return target;
-+      }
-+
-+     case AVR32_BUILTIN_MEMS:
-+     case AVR32_BUILTIN_MEMC:
-+     case AVR32_BUILTIN_MEMT:
-+       {
-+         if (!TARGET_RMW)
-+           error ("Trying to use __builtin_mem(s/c/t) when target does not support RMW insns.");
-+         
-+         switch (fcode) {
-+         case AVR32_BUILTIN_MEMS:
-+           icode = CODE_FOR_iorsi3;
-+           break;
-+         case AVR32_BUILTIN_MEMC:
-+           icode = CODE_FOR_andsi3;
-+           break;
-+         case AVR32_BUILTIN_MEMT:
-+           icode = CODE_FOR_xorsi3;
-+           break;
-+         }
-+			arg0 = CALL_EXPR_ARG (exp,0);
-+			arg1 = CALL_EXPR_ARG (exp,1);
-+         op0 = expand_expr (arg0, NULL_RTX, VOIDmode, 0);
-+         if ( GET_CODE (op0) == SYMBOL_REF )
-+           // This symbol must be RMW addressable
-+           SYMBOL_REF_FLAGS (op0) |= (1 << SYMBOL_FLAG_RMW_ADDR_SHIFT);
-+         op0 = gen_rtx_MEM(SImode, op0);
-+         op1 = expand_expr (arg1, NULL_RTX, VOIDmode, 0);
-+         mode0 = insn_data[icode].operand[1].mode;
-+         
-+         
-+         if (!(*insn_data[icode].operand[1].predicate) (op0, mode0))
-+           {
-+             error ("Parameter 1 to __builtin_mem(s/c/t) must be a Ks15<<2 address or a rmw addressable symbol.");
-+           }
-+         
-+         if ( !CONST_INT_P (op1)
-+              || INTVAL (op1) > 31
-+              || INTVAL (op1) < 0 )
-+           error ("Parameter 2 to __builtin_mem(s/c/t) must be a constant between 0 and 31.");
-+ 
-+         if ( fcode == AVR32_BUILTIN_MEMC )
-+           op1 = GEN_INT((~(1 << INTVAL(op1)))&0xffffffff);
-+         else
-+           op1 = GEN_INT((1 << INTVAL(op1))&0xffffffff);
-+         pat = GEN_FCN (icode) (op0, op0, op1);
-+         if (!pat)
-+           return 0;
-+         emit_insn (pat);
-+         return op0;
-+       }
-+       
-+     case AVR32_BUILTIN_SLEEP:
-+       {
-+ 	arg0 = CALL_EXPR_ARG (exp, 0);
-+ 	op0  = expand_normal (arg0);
-+ 	int intval = INTVAL(op0);
-+ 
-+ 	/* Check if the argument if integer and if the value of integer
-+ 	   is greater than 0. */ 
-+ 	 
-+ 	if (!CONSTANT_P (op0))
-+         error ("Parameter 1 to __builtin_sleep() is not a valid integer.");
-+ 	if (intval < 0 )
-+ 	     error ("Parameter 1 to __builtin_sleep() should be an integer greater than 0.");
-+ 
-+         int strncmpval = strncmp (avr32_part_name,"uc3l", 4);
-+  
-+ 	/* Check if op0 is less than 7 for uc3l* and less than 6 for other
-+ 	   devices. By this check we are avoiding if operand is less than  
-+ 	   256. For more devices, add more such checks. */
-+ 	 
-+ 	if ( strncmpval == 0 && intval >= 7)  
-+        error ("Parameter 1 to __builtin_sleep() should be less than or equal to 7.");
-+ 	else if ( strncmp != 0 && intval >= 6)
-+ 	    error ("Parameter 1 to __builtin_sleep() should be less than or equal to 6.");
-+ 
-+ 	emit_insn (gen_sleep(op0));
-+ 	return target;
-+ 
-+       }	
-+     case AVR32_BUILTIN_DELAY_CYCLES: 
-+       {
-+       arg0 = CALL_EXPR_ARG (exp, 0);
-+       op0 = expand_expr (arg0, NULL_RTX, VOIDmode, 0);
-+ 
-+       if (TARGET_ARCH_AP)
-+         error (" __builtin_avr32_delay_cycles() not supported for \'%s\' architecture.", avr32_arch_name);
-+       if (!CONSTANT_P (op0))
-+        error ("Parameter 1 to __builtin_avr32_delay_cycles() should be an integer.");
-+       emit_insn (gen_delay_cycles (op0));
-+       return 0;
-+ 
-+       }       
-+
-+    }
-+
-+  for (i = 0, d = bdesc_2arg; i < ARRAY_SIZE (bdesc_2arg); i++, d++)
-+    if (d->code == fcode)
-+      return avr32_expand_binop_builtin (d->icode, exp, target);
-+
-+
-+  /* @@@ Should really do something sensible here.  */
-+  return NULL_RTX;
-+}
-+
-+
-+/* Handle an "interrupt" or "isr" attribute;
-+   arguments as in struct attribute_spec.handler.  */
-+static tree
-+avr32_handle_isr_attribute (tree * node, tree name, tree args,
-+			    int flags, bool * no_add_attrs)
-+{
-+  if (DECL_P (*node))
-+    {
-+      if (TREE_CODE (*node) != FUNCTION_DECL)
-+	{
-+	  warning (OPT_Wattributes,"`%s' attribute only applies to functions",
-+		   IDENTIFIER_POINTER (name));
-+	  *no_add_attrs = true;
-+	}
-+      /* FIXME: the argument if any is checked for type attributes; should it
-+         be checked for decl ones? */
-+    }
-+  else
-+    {
-+      if (TREE_CODE (*node) == FUNCTION_TYPE
-+	  || TREE_CODE (*node) == METHOD_TYPE)
-+	{
-+	  if (avr32_isr_value (args) == AVR32_FT_UNKNOWN)
-+	    {
-+	      warning (OPT_Wattributes,"`%s' attribute ignored", IDENTIFIER_POINTER (name));
-+	      *no_add_attrs = true;
-+	    }
-+	}
-+      else if (TREE_CODE (*node) == POINTER_TYPE
-+	       && (TREE_CODE (TREE_TYPE (*node)) == FUNCTION_TYPE
-+		   || TREE_CODE (TREE_TYPE (*node)) == METHOD_TYPE)
-+	       && avr32_isr_value (args) != AVR32_FT_UNKNOWN)
-+	{
-+	  *node = build_variant_type_copy (*node);
-+	  TREE_TYPE (*node) = build_type_attribute_variant
-+	    (TREE_TYPE (*node),
-+	     tree_cons (name, args, TYPE_ATTRIBUTES (TREE_TYPE (*node))));
-+	  *no_add_attrs = true;
-+	}
-+      else
-+	{
-+	  /* Possibly pass this attribute on from the type to a decl.  */
-+	  if (flags & ((int) ATTR_FLAG_DECL_NEXT
-+		       | (int) ATTR_FLAG_FUNCTION_NEXT
-+		       | (int) ATTR_FLAG_ARRAY_NEXT))
-+	    {
-+	      *no_add_attrs = true;
-+	      return tree_cons (name, args, NULL_TREE);
-+	    }
-+	  else
-+	    {
-+	      warning (OPT_Wattributes,"`%s' attribute ignored", IDENTIFIER_POINTER (name));
-+	    }
-+	}
-+    }
-+
-+  return NULL_TREE;
-+}
-+
-+
-+/* Handle an attribute requiring a FUNCTION_DECL;
-+   arguments as in struct attribute_spec.handler.  */
-+static tree
-+avr32_handle_fndecl_attribute (tree * node, tree name,
-+			       tree args,
-+			       int flags ATTRIBUTE_UNUSED,
-+			       bool * no_add_attrs)
-+{
-+  if (TREE_CODE (*node) != FUNCTION_DECL)
-+    {
-+      warning (OPT_Wattributes,"%qs attribute only applies to functions",
-+	       IDENTIFIER_POINTER (name));
-+      *no_add_attrs = true;
-+      return NULL_TREE;
-+    }
-+
-+  fndecl_attribute_args = args;
-+  if (args == NULL_TREE)
-+	  return NULL_TREE;
-+
-+  tree value = TREE_VALUE (args);
-+  if (TREE_CODE (value) != INTEGER_CST)
-+    {
-+      warning (OPT_Wattributes,
-+	       "argument of %qs attribute is not an integer constant",
-+	       IDENTIFIER_POINTER (name));
-+      *no_add_attrs = true;
-+    }
-+
-+  return NULL_TREE;
-+}
-+
-+
-+/* Handle an acall attribute;
-+   arguments as in struct attribute_spec.handler.  */
-+
-+static tree
-+avr32_handle_acall_attribute (tree * node, tree name,
-+			      tree args ATTRIBUTE_UNUSED,
-+			      int flags ATTRIBUTE_UNUSED, bool * no_add_attrs)
-+{
-+  if (TREE_CODE (*node) == FUNCTION_TYPE || TREE_CODE (*node) == METHOD_TYPE)
-+    {
-+      warning (OPT_Wattributes,"`%s' attribute not yet supported...",
-+	       IDENTIFIER_POINTER (name));
-+      *no_add_attrs = true;
-+      return NULL_TREE;
-+    }
-+
-+  warning (OPT_Wattributes,"`%s' attribute only applies to functions",
-+	   IDENTIFIER_POINTER (name));
-+  *no_add_attrs = true;
-+  return NULL_TREE;
-+}
-+
-+
-+bool
-+avr32_flashvault_call(tree decl)
-+{
-+  tree attributes;
-+  tree fv_attribute;
-+  tree vector_tree;
-+  unsigned int vector;
-+
-+  if (decl && TREE_CODE (decl) == FUNCTION_DECL) 
-+    {
-+      attributes = DECL_ATTRIBUTES(decl);
-+      fv_attribute = lookup_attribute ("flashvault", attributes);
-+      if (fv_attribute != NULL_TREE)
-+        {
-+          /* Get attribute parameter, for the function vector number. */
-+          /* 
-+          There is probably an easier, standard way to retrieve the
-+          attribute parameter which needs to be done here.
-+          */
-+          vector_tree = TREE_VALUE(fv_attribute);
-+          if (vector_tree != NULL_TREE)
-+            {
-+              vector = (unsigned int)TREE_INT_CST_LOW(TREE_VALUE(vector_tree));
-+              fprintf (asm_out_file,
-+                       "\tmov\tr8, lo(%i)\t# Load vector number for sscall.\n",
-+                       vector);
-+            }
-+
-+          fprintf (asm_out_file,
-+                   "\tsscall\t# Secure system call.\n");
-+
-+          return true;
-+        }
-+    }
-+  
-+  return false;
-+}
-+
-+
-+static bool has_attribute_p (tree decl, const char *name)
-+{
-+  if (decl && TREE_CODE (decl) == FUNCTION_DECL) 
-+    {
-+      return (lookup_attribute (name, DECL_ATTRIBUTES(decl)) != NULL_TREE);
-+    }
-+  return NULL_TREE;    
-+}
-+
-+
-+/* Return 0 if the attributes for two types are incompatible, 1 if they
-+   are compatible, and 2 if they are nearly compatible (which causes a
-+   warning to be generated).  */
-+static int
-+avr32_comp_type_attributes (tree type1, tree type2)
-+{
-+  bool acall1, acall2, isr1, isr2, naked1, naked2, fv1, fv2, fvimpl1, fvimpl2;
-+
-+  /* Check for mismatch of non-default calling convention.  */
-+  if (TREE_CODE (type1) != FUNCTION_TYPE)
-+    return 1;
-+
-+  /* Check for mismatched call attributes.  */
-+  acall1 = lookup_attribute ("acall", TYPE_ATTRIBUTES (type1)) != NULL;
-+  acall2 = lookup_attribute ("acall", TYPE_ATTRIBUTES (type2)) != NULL;
-+  naked1 = lookup_attribute ("naked", TYPE_ATTRIBUTES (type1)) != NULL;
-+  naked2 = lookup_attribute ("naked", TYPE_ATTRIBUTES (type2)) != NULL;
-+  fv1 = lookup_attribute ("flashvault", TYPE_ATTRIBUTES (type1)) != NULL;
-+  fv2 = lookup_attribute ("flashvault", TYPE_ATTRIBUTES (type2)) != NULL;
-+  fvimpl1 = lookup_attribute ("flashvault_impl", TYPE_ATTRIBUTES (type1)) != NULL;
-+  fvimpl2 = lookup_attribute ("flashvault_impl", TYPE_ATTRIBUTES (type2)) != NULL;
-+  isr1 = lookup_attribute ("isr", TYPE_ATTRIBUTES (type1)) != NULL;
-+  if (!isr1)
-+    isr1 = lookup_attribute ("interrupt", TYPE_ATTRIBUTES (type1)) != NULL;
-+
-+  isr2 = lookup_attribute ("isr", TYPE_ATTRIBUTES (type2)) != NULL;
-+  if (!isr2)
-+    isr2 = lookup_attribute ("interrupt", TYPE_ATTRIBUTES (type2)) != NULL;
-+
-+  if ((acall1 && isr2)
-+      || (acall2 && isr1)
-+      || (naked1 && isr2)
-+      || (naked2 && isr1)
-+      || (fv1 && isr2)
-+      || (fv2 && isr1)
-+      || (fvimpl1 && isr2)
-+      || (fvimpl2 && isr1)
-+      || (fv1 && fvimpl2)
-+      || (fv2 && fvimpl1)
-+      )
-+    return 0;
-+
-+  return 1;
-+}
-+
-+
-+/* Computes the type of the current function.  */
-+static unsigned long
-+avr32_compute_func_type (void)
-+{
-+  unsigned long type = AVR32_FT_UNKNOWN;
-+  tree a;
-+  tree attr;
-+
-+  if (TREE_CODE (current_function_decl) != FUNCTION_DECL)
-+    abort ();
-+
-+  /* Decide if the current function is volatile.  Such functions never
-+     return, and many memory cycles can be saved by not storing register
-+     values that will never be needed again.  This optimization was added to
-+     speed up context switching in a kernel application.  */
-+  if (optimize > 0
-+      && TREE_NOTHROW (current_function_decl)
-+      && TREE_THIS_VOLATILE (current_function_decl))
-+    type |= AVR32_FT_VOLATILE;
-+
-+  if (cfun->static_chain_decl != NULL)
-+    type |= AVR32_FT_NESTED;
-+
-+  attr = DECL_ATTRIBUTES (current_function_decl);
-+
-+  a = lookup_attribute ("isr", attr);
-+  if (a == NULL_TREE)
-+    a = lookup_attribute ("interrupt", attr);
-+
-+  if (a == NULL_TREE)
-+    type |= AVR32_FT_NORMAL;
-+  else
-+    type |= avr32_isr_value (TREE_VALUE (a));
-+
-+
-+  a = lookup_attribute ("acall", attr);
-+  if (a != NULL_TREE)
-+    type |= AVR32_FT_ACALL;
-+
-+  a = lookup_attribute ("naked", attr);
-+  if (a != NULL_TREE)
-+    type |= AVR32_FT_NAKED;
-+
-+  a = lookup_attribute ("flashvault", attr);
-+  if (a != NULL_TREE)
-+    type |= AVR32_FT_FLASHVAULT;
-+
-+  a = lookup_attribute ("flashvault_impl", attr);
-+  if (a != NULL_TREE)
-+    type |= AVR32_FT_FLASHVAULT_IMPL;
-+
-+  return type;
-+}
-+
-+
-+/* Returns the type of the current function.  */
-+static unsigned long
-+avr32_current_func_type (void)
-+{
-+  if (AVR32_FUNC_TYPE (cfun->machine->func_type) == AVR32_FT_UNKNOWN)
-+    cfun->machine->func_type = avr32_compute_func_type ();
-+
-+  return cfun->machine->func_type;
-+}
-+
-+
-+/*
-+This target hook should return true if we should not pass type solely
-+in registers. The file expr.h defines a definition that is usually appropriate,
-+refer to expr.h for additional documentation.
-+*/
-+bool
-+avr32_must_pass_in_stack (enum machine_mode mode ATTRIBUTE_UNUSED, tree type)
-+{
-+  if (type && AGGREGATE_TYPE_P (type)
-+      /* If the alignment is less than the size then pass in the struct on
-+         the stack. */
-+      && ((unsigned int) TYPE_ALIGN_UNIT (type) <
-+	  (unsigned int) int_size_in_bytes (type))
-+      /* If we support unaligned word accesses then structs of size 4 and 8
-+         can have any alignment and still be passed in registers. */
-+      && !(TARGET_UNALIGNED_WORD
-+	   && (int_size_in_bytes (type) == 4
-+	       || int_size_in_bytes (type) == 8))
-+      /* Double word structs need only a word alignment. */
-+      && !(int_size_in_bytes (type) == 8 && TYPE_ALIGN_UNIT (type) >= 4))
-+    return true;
-+
-+  if (type && AGGREGATE_TYPE_P (type)
-+      /* Structs of size 3,5,6,7 are always passed in registers. */
-+      && (int_size_in_bytes (type) == 3
-+	  || int_size_in_bytes (type) == 5
-+	  || int_size_in_bytes (type) == 6 || int_size_in_bytes (type) == 7))
-+    return true;
-+
-+
-+  return (type && TREE_ADDRESSABLE (type));
-+}
-+
-+
-+bool
-+avr32_strict_argument_naming (CUMULATIVE_ARGS * ca ATTRIBUTE_UNUSED)
-+{
-+  return true;
-+}
-+
-+
-+/*
-+   This target hook should return true if an argument at the position indicated
-+   by cum should be passed by reference. This predicate is queried after target
-+   independent reasons for being passed by reference, such as TREE_ADDRESSABLE (type).
-+
-+   If the hook returns true, a copy of that argument is made in memory and a
-+   pointer to the argument is passed instead of the argument itself. The pointer
-+   is passed in whatever way is appropriate for passing a pointer to that type.
-+*/
-+bool
-+avr32_pass_by_reference (CUMULATIVE_ARGS * cum ATTRIBUTE_UNUSED,
-+			 enum machine_mode mode ATTRIBUTE_UNUSED,
-+			 tree type, bool named ATTRIBUTE_UNUSED)
-+{
-+  return (type && (TREE_CODE (TYPE_SIZE (type)) != INTEGER_CST));
-+}
-+
-+
-+static int
-+avr32_arg_partial_bytes (CUMULATIVE_ARGS * pcum ATTRIBUTE_UNUSED,
-+			 enum machine_mode mode ATTRIBUTE_UNUSED,
-+			 tree type ATTRIBUTE_UNUSED,
-+			 bool named ATTRIBUTE_UNUSED)
-+{
-+  return 0;
-+}
-+
-+
-+struct gcc_target targetm = TARGET_INITIALIZER;
-+
-+/*
-+  Table used to convert from register number in the assembler instructions and
-+  the register numbers used in gcc.
-+*/
-+const int avr32_function_arg_reglist[] = {
-+  INTERNAL_REGNUM (12),
-+  INTERNAL_REGNUM (11),
-+  INTERNAL_REGNUM (10),
-+  INTERNAL_REGNUM (9),
-+  INTERNAL_REGNUM (8)
-+};
-+
-+
-+rtx avr32_compare_op0 = NULL_RTX;
-+rtx avr32_compare_op1 = NULL_RTX;
-+rtx avr32_compare_operator = NULL_RTX;
-+rtx avr32_acc_cache = NULL_RTX;
-+/* type of branch to use */
-+enum avr32_cmp_type avr32_branch_type;
-+
-+
-+/*
-+  Returns nonzero if it is allowed to store a value of mode mode in hard
-+  register number regno.
-+*/
-+int
-+avr32_hard_regno_mode_ok (int regnr, enum machine_mode mode)
-+{
-+  switch (mode)
-+    {
-+      case DImode:		/* long long */
-+      case DFmode:		/* double */
-+      case SCmode:		/* __complex__ float */
-+      case CSImode:		/* __complex__ int */
-+        if (regnr < 4)
-+	  {		/* long long int not supported in r12, sp, lr or pc. */
-+	    return 0;
-+	  }
-+        else
-+	  {
-+	    /* long long int has to be referred in even registers. */
-+            if (regnr % 2)
-+	      return 0;
-+	    else
-+	      return 1;
-+	  }
-+      case CDImode:		/* __complex__ long long */
-+      case DCmode:		/* __complex__ double */
-+      case TImode:		/* 16 bytes */
-+        if (regnr < 7)
-+	  return 0;
-+        else if (regnr % 2)
-+	  return 0;
-+        else
-+	  return 1;
-+      default:
-+        return 1;
-+    }
-+}
-+
-+
-+int
-+avr32_rnd_operands (rtx add, rtx shift)
-+{
-+  if (GET_CODE (shift) == CONST_INT &&
-+      GET_CODE (add) == CONST_INT && INTVAL (shift) > 0)
-+    {
-+      if ((1 << (INTVAL (shift) - 1)) == INTVAL (add))
-+	return TRUE;
-+    }
-+
-+  return FALSE;
-+}
-+
-+
-+int
-+avr32_const_ok_for_constraint_p (HOST_WIDE_INT value, char c, const char *str)
-+{
-+  switch (c)
-+    {
-+    case 'K':
-+    case 'I':
-+      {
-+	HOST_WIDE_INT min_value = 0, max_value = 0;
-+	char size_str[3];
-+	int const_size;
-+
-+	size_str[0] = str[2];
-+	size_str[1] = str[3];
-+	size_str[2] = '\0';
-+	const_size = atoi (size_str);
-+
-+	if (TOUPPER (str[1]) == 'U')
-+	  {
-+	    min_value = 0;
-+	    max_value = (1 << const_size) - 1;
-+	  }
-+	else if (TOUPPER (str[1]) == 'S')
-+	  {
-+	    min_value = -(1 << (const_size - 1));
-+	    max_value = (1 << (const_size - 1)) - 1;
-+	  }
-+
-+	if (c == 'I')
-+	  {
-+	    value = -value;
-+	  }
-+
-+	if (value >= min_value && value <= max_value)
-+	  {
-+	    return 1;
-+	  }
-+	break;
-+      }
-+    case 'M':
-+      return avr32_mask_upper_bits_operand (GEN_INT (value), VOIDmode);
-+    case 'J':
-+      return avr32_hi16_immediate_operand (GEN_INT (value), VOIDmode);
-+    case 'O':
-+      return one_bit_set_operand (GEN_INT (value), VOIDmode);
-+    case 'N':
-+      return one_bit_cleared_operand (GEN_INT (value), VOIDmode);
-+    case 'L':
-+      /* The lower 16-bits are set. */
-+      return ((value & 0xffff) == 0xffff) ;
-+    }
-+
-+  return 0;
-+}
-+
-+
-+/* Compute mask of registers which needs saving upon function entry. */
-+static unsigned long
-+avr32_compute_save_reg_mask (int push)
-+{
-+  unsigned long func_type;
-+  unsigned int save_reg_mask = 0;
-+  unsigned int reg;
-+
-+  func_type = avr32_current_func_type ();
-+
-+  if (IS_INTERRUPT (func_type))
-+    {
-+      unsigned int max_reg = 12;
-+
-+      /* Get the banking scheme for the interrupt */
-+      switch (func_type)
-+	{
-+	case AVR32_FT_ISR_FULL:
-+	  max_reg = 0;
-+	  break;
-+	case AVR32_FT_ISR_HALF:
-+	  max_reg = 7;
-+	  break;
-+	case AVR32_FT_ISR_NONE:
-+	  max_reg = 12;
-+	  break;
-+	}
-+
-+      /* Interrupt functions must not corrupt any registers, even call
-+         clobbered ones.  If this is a leaf function we can just examine the
-+         registers used by the RTL, but otherwise we have to assume that
-+         whatever function is called might clobber anything, and so we have
-+         to save all the call-clobbered registers as well.  */
-+
-+      /* Need not push the registers r8-r12 for AVR32A architectures, as this
-+         is automatially done in hardware. We also do not have any shadow
-+         registers. */
-+      if (TARGET_UARCH_AVR32A)
-+	{
-+	  max_reg = 7;
-+	  func_type = AVR32_FT_ISR_NONE;
-+	}
-+
-+      /* All registers which are used and are not shadowed must be saved. */
-+      for (reg = 0; reg <= max_reg; reg++)
-+	if (df_regs_ever_live_p (INTERNAL_REGNUM (reg))
-+	    || (!current_function_is_leaf
-+		&& call_used_regs[INTERNAL_REGNUM (reg)]))
-+	  save_reg_mask |= (1 << reg);
-+
-+      /* Check LR */
-+      if ((df_regs_ever_live_p (LR_REGNUM)
-+	   || !current_function_is_leaf || frame_pointer_needed)
-+	  /* Only non-shadowed register models */
-+	  && (func_type == AVR32_FT_ISR_NONE))
-+	save_reg_mask |= (1 << ASM_REGNUM (LR_REGNUM));
-+
-+      /* Make sure that the GOT register is pushed. */
-+      if (max_reg >= ASM_REGNUM (PIC_OFFSET_TABLE_REGNUM)
-+	  && crtl->uses_pic_offset_table)
-+	save_reg_mask |= (1 << ASM_REGNUM (PIC_OFFSET_TABLE_REGNUM));
-+
-+    }
-+  else
-+    {
-+      int use_pushm = optimize_size;
-+
-+      /* In the normal case we only need to save those registers which are
-+         call saved and which are used by this function.  */
-+      for (reg = 0; reg <= 7; reg++)
-+	if (df_regs_ever_live_p (INTERNAL_REGNUM (reg))
-+	    && !call_used_regs[INTERNAL_REGNUM (reg)])
-+	  save_reg_mask |= (1 << reg);
-+
-+      /* Make sure that the GOT register is pushed. */
-+      if (crtl->uses_pic_offset_table)
-+	save_reg_mask |= (1 << ASM_REGNUM (PIC_OFFSET_TABLE_REGNUM));
-+
-+
-+      /* If we optimize for size and do not have anonymous arguments: use
-+         pushm/popm always. */
-+      if (use_pushm)
-+	{
-+	  if ((save_reg_mask & (1 << 0))
-+	      || (save_reg_mask & (1 << 1))
-+	      || (save_reg_mask & (1 << 2)) || (save_reg_mask & (1 << 3)))
-+	    save_reg_mask |= 0xf;
-+
-+	  if ((save_reg_mask & (1 << 4))
-+	      || (save_reg_mask & (1 << 5))
-+	      || (save_reg_mask & (1 << 6)) || (save_reg_mask & (1 << 7)))
-+	    save_reg_mask |= 0xf0;
-+
-+	  if ((save_reg_mask & (1 << 8)) || (save_reg_mask & (1 << 9)))
-+	    save_reg_mask |= 0x300;
-+	}
-+
-+
-+        /* Check LR */
-+        if ((df_regs_ever_live_p (LR_REGNUM)
-+        || !current_function_is_leaf
-+        || (optimize_size
-+        && save_reg_mask
-+        && !crtl->calls_eh_return)
-+          || frame_pointer_needed)
-+          && !IS_FLASHVAULT (func_type))
-+	{
-+	  if (push
-+	      /* Never pop LR into PC for functions which
-+	         calls __builtin_eh_return, since we need to
-+	         fix the SP after the restoring of the registers
-+	         and before returning. */
-+	      || crtl->calls_eh_return)
-+	    {
-+	      /* Push/Pop LR */
-+	      save_reg_mask |= (1 << ASM_REGNUM (LR_REGNUM));
-+	    }
-+	  else
-+	    {
-+	      /* Pop PC */
-+	      save_reg_mask |= (1 << ASM_REGNUM (PC_REGNUM));
-+	    }
-+	}
-+    }
-+
-+
-+  /* Save registers so the exception handler can modify them.  */
-+  if (crtl->calls_eh_return)
-+    {
-+      unsigned int i;
-+
-+      for (i = 0;; i++)
-+	{
-+	  reg = EH_RETURN_DATA_REGNO (i);
-+	  if (reg == INVALID_REGNUM)
-+	    break;
-+	  save_reg_mask |= 1 << ASM_REGNUM (reg);
-+	}
-+    }
-+
-+  return save_reg_mask;
-+}
-+
-+
-+/* Compute total size in bytes of all saved registers. */
-+static int
-+avr32_get_reg_mask_size (int reg_mask)
-+{
-+  int reg, size;
-+  size = 0;
-+
-+  for (reg = 0; reg <= 15; reg++)
-+    if (reg_mask & (1 << reg))
-+      size += 4;
-+
-+  return size;
-+}
-+
-+
-+/* Get a register from one of the registers which are saved onto the stack
-+  upon function entry. */
-+static int
-+avr32_get_saved_reg (int save_reg_mask)
-+{
-+  unsigned int reg;
-+
-+  /* Find the first register which is saved in the saved_reg_mask */
-+  for (reg = 0; reg <= 15; reg++)
-+    if (save_reg_mask & (1 << reg))
-+      return reg;
-+
-+  return -1;
-+}
-+
-+
-+/* Return 1 if it is possible to return using a single instruction. */
-+int
-+avr32_use_return_insn (int iscond)
-+{
-+  unsigned int func_type = avr32_current_func_type ();
-+  unsigned long saved_int_regs;
-+
-+  /* Never use a return instruction before reload has run. */
-+  if (!reload_completed)
-+    return 0;
-+
-+  /* Must adjust the stack for vararg functions. */
-+  if (crtl->args.info.uses_anonymous_args)
-+    return 0;
-+
-+  /* If there a stack adjstment.  */
-+  if (get_frame_size ())
-+    return 0;
-+
-+  saved_int_regs = avr32_compute_save_reg_mask (TRUE);
-+
-+  /* Conditional returns can not be performed in one instruction if we need
-+     to restore registers from the stack */
-+  if (iscond && saved_int_regs)
-+    return 0;
-+
-+  /* Conditional return can not be used for interrupt handlers. */
-+  if (iscond && IS_INTERRUPT (func_type))
-+    return 0;
-+
-+  /* For interrupt handlers which needs to pop registers */
-+  if (saved_int_regs && IS_INTERRUPT (func_type))
-+    return 0;
-+
-+
-+  /* If there are saved registers but the LR isn't saved, then we need two
-+     instructions for the return.  */
-+  if (saved_int_regs && !(saved_int_regs & (1 << ASM_REGNUM (LR_REGNUM))))
-+    return 0;
-+
-+
-+  return 1;
-+}
-+
-+
-+/* Generate some function prologue info in the assembly file. */
-+void
-+avr32_target_asm_function_prologue (FILE * f, HOST_WIDE_INT frame_size)
-+{
-+  unsigned long func_type = avr32_current_func_type ();
-+
-+  if (IS_NAKED (func_type))
-+    fprintf (f,
-+      "\t# Function is naked: Prologue and epilogue provided by programmer\n");
-+
-+  if (IS_FLASHVAULT (func_type))
-+  {
-+    fprintf(f, 
-+      "\t.ident \"flashvault\"\n\t# Function is defined with flashvault attribute.\n");
-+  }
-+
-+  if (IS_FLASHVAULT_IMPL (func_type))
-+  {
-+    fprintf(f, 
-+      "\t.ident \"flashvault\"\n\t# Function is defined with flashvault_impl attribute.\n");
-+
-+    /* Save information on flashvault function declaration. */
-+    tree fv_attribute = lookup_attribute ("flashvault_impl", DECL_ATTRIBUTES(current_function_decl));
-+    if (fv_attribute != NULL_TREE)
-+      {
-+        tree vector_tree = TREE_VALUE(fv_attribute);
-+        if (vector_tree != NULL_TREE)
-+          {
-+            unsigned int vector_num;
-+            const char * name;
-+
-+            vector_num = (unsigned int) TREE_INT_CST_LOW (TREE_VALUE (vector_tree));
-+
-+            name = XSTR  (XEXP (DECL_RTL (current_function_decl), 0), 0);
-+
-+            flashvault_decl_list_add (vector_num, name);
-+          }
-+      }
-+  }
-+
-+  if (IS_INTERRUPT (func_type))
-+    {
-+      switch (func_type)
-+        {
-+          case AVR32_FT_ISR_FULL:
-+            fprintf (f,
-+                     "\t# Interrupt Function: Fully shadowed register file\n");
-+            break;
-+          case AVR32_FT_ISR_HALF:
-+            fprintf (f,
-+                     "\t# Interrupt Function: Half shadowed register file\n");
-+            break;
-+          default:
-+          case AVR32_FT_ISR_NONE:
-+            fprintf (f, "\t# Interrupt Function: No shadowed register file\n");
-+            break;
-+        }
-+    }
-+
-+
-+  fprintf (f, "\t# args = %i, frame = %li, pretend = %i\n",
-+           crtl->args.size, frame_size,
-+           crtl->args.pretend_args_size);
-+
-+  fprintf (f, "\t# frame_needed = %i, leaf_function = %i\n",
-+           frame_pointer_needed, current_function_is_leaf);
-+
-+  fprintf (f, "\t# uses_anonymous_args = %i\n",
-+           crtl->args.info.uses_anonymous_args);
-+
-+  if (crtl->calls_eh_return)
-+    fprintf (f, "\t# Calls __builtin_eh_return.\n");
-+
-+}
-+
-+
-+/* Generate and emit an insn that we will recognize as a pushm or stm.
-+   Unfortunately, since this insn does not reflect very well the actual
-+   semantics of the operation, we need to annotate the insn for the benefit
-+   of DWARF2 frame unwind information.  */
-+
-+int avr32_convert_to_reglist16 (int reglist8_vect);
-+
-+static rtx
-+emit_multi_reg_push (int reglist, int usePUSHM)
-+{
-+  rtx insn;
-+  rtx dwarf;
-+  rtx tmp;
-+  rtx reg;
-+  int i;
-+  int nr_regs;
-+  int index = 0;
-+
-+  if (usePUSHM)
-+    {
-+      insn = emit_insn (gen_pushm (gen_rtx_CONST_INT (SImode, reglist)));
-+      reglist = avr32_convert_to_reglist16 (reglist);
-+    }
-+  else
-+    {
-+      insn = emit_insn (gen_stm (stack_pointer_rtx,
-+				 gen_rtx_CONST_INT (SImode, reglist),
-+				 gen_rtx_CONST_INT (SImode, 1)));
-+    }
-+
-+  nr_regs = avr32_get_reg_mask_size (reglist) / 4;
-+  dwarf = gen_rtx_SEQUENCE (VOIDmode, rtvec_alloc (nr_regs + 1));
-+
-+  for (i = 15; i >= 0; i--)
-+    {
-+      if (reglist & (1 << i))
-+	{
-+	  reg = gen_rtx_REG (SImode, INTERNAL_REGNUM (i));
-+	  tmp = gen_rtx_SET (VOIDmode,
-+			     gen_rtx_MEM (SImode,
-+					  plus_constant (stack_pointer_rtx,
-+							 4 * index)), reg);
-+	  RTX_FRAME_RELATED_P (tmp) = 1;
-+	  XVECEXP (dwarf, 0, 1 + index++) = tmp;
-+	}
-+    }
-+
-+  tmp = gen_rtx_SET (SImode,
-+		     stack_pointer_rtx,
-+		     gen_rtx_PLUS (SImode,
-+				   stack_pointer_rtx,
-+				   GEN_INT (-4 * nr_regs)));
-+  RTX_FRAME_RELATED_P (tmp) = 1;
-+  XVECEXP (dwarf, 0, 0) = tmp;
-+  REG_NOTES (insn) = gen_rtx_EXPR_LIST (REG_FRAME_RELATED_EXPR, dwarf,
-+					REG_NOTES (insn));
-+  return insn;
-+}
-+
-+rtx
-+avr32_gen_load_multiple (rtx * regs, int count, rtx from,
-+			 int write_back, int in_struct_p, int scalar_p)
-+{
-+
-+  rtx result;
-+  int i = 0, j;
-+
-+  result =
-+    gen_rtx_PARALLEL (VOIDmode, rtvec_alloc (count + (write_back ? 1 : 0)));
-+
-+  if (write_back)
-+    {
-+      XVECEXP (result, 0, 0)
-+	= gen_rtx_SET (GET_MODE (from), from,
-+		       plus_constant (from, count * 4));
-+      i = 1;
-+      count++;
-+    }
-+
-+
-+  for (j = 0; i < count; i++, j++)
-+    {
-+      rtx unspec;
-+      rtx mem = gen_rtx_MEM (SImode, plus_constant (from, j * 4));
-+      MEM_IN_STRUCT_P (mem) = in_struct_p;
-+      MEM_SCALAR_P (mem) = scalar_p;
-+      unspec = gen_rtx_UNSPEC (VOIDmode, gen_rtvec (1, mem), UNSPEC_LDM);
-+      XVECEXP (result, 0, i) = gen_rtx_SET (VOIDmode, regs[j], unspec);
-+    }
-+
-+  return result;
-+}
-+
-+
-+rtx
-+avr32_gen_store_multiple (rtx * regs, int count, rtx to,
-+			  int in_struct_p, int scalar_p)
-+{
-+  rtx result;
-+  int i = 0, j;
-+
-+  result = gen_rtx_PARALLEL (VOIDmode, rtvec_alloc (count));
-+
-+  for (j = 0; i < count; i++, j++)
-+    {
-+      rtx mem = gen_rtx_MEM (SImode, plus_constant (to, j * 4));
-+      MEM_IN_STRUCT_P (mem) = in_struct_p;
-+      MEM_SCALAR_P (mem) = scalar_p;
-+      XVECEXP (result, 0, i)
-+	= gen_rtx_SET (VOIDmode, mem,
-+		       gen_rtx_UNSPEC (VOIDmode,
-+				       gen_rtvec (1, regs[j]),
-+				       UNSPEC_STORE_MULTIPLE));
-+    }
-+
-+  return result;
-+}
-+
-+
-+/* Move a block of memory if it is word aligned or we support unaligned
-+   word memory accesses. The size must be maximum 64 bytes. */
-+int
-+avr32_gen_movmemsi (rtx * operands)
-+{
-+  HOST_WIDE_INT bytes_to_go;
-+  rtx src, dst;
-+  rtx st_src, st_dst;
-+  int src_offset = 0, dst_offset = 0;
-+  int block_size;
-+  int dst_in_struct_p, src_in_struct_p;
-+  int dst_scalar_p, src_scalar_p;
-+  int unaligned;
-+
-+  if (GET_CODE (operands[2]) != CONST_INT
-+      || GET_CODE (operands[3]) != CONST_INT
-+      || INTVAL (operands[2]) > 64
-+      || ((INTVAL (operands[3]) & 3) && !TARGET_UNALIGNED_WORD))
-+    return 0;
-+
-+  unaligned = (INTVAL (operands[3]) & 3) != 0;
-+
-+  block_size = 4;
-+
-+  st_dst = XEXP (operands[0], 0);
-+  st_src = XEXP (operands[1], 0);
-+
-+  dst_in_struct_p = MEM_IN_STRUCT_P (operands[0]);
-+  dst_scalar_p = MEM_SCALAR_P (operands[0]);
-+  src_in_struct_p = MEM_IN_STRUCT_P (operands[1]);
-+  src_scalar_p = MEM_SCALAR_P (operands[1]);
-+
-+  dst = copy_to_mode_reg (SImode, st_dst);
-+  src = copy_to_mode_reg (SImode, st_src);
-+
-+  bytes_to_go = INTVAL (operands[2]);
-+
-+  while (bytes_to_go)
-+    {
-+      enum machine_mode move_mode;
-+      /* (Seems to be a problem with reloads for the movti pattern so this is
-+         disabled until that problem is resolved)
-+         UPDATE: Problem seems to be solved now.... */
-+      if (bytes_to_go >= GET_MODE_SIZE (TImode) && !unaligned
-+	  /* Do not emit ldm/stm for UC3 as ld.d/st.d is more optimal. */
-+	  && !TARGET_ARCH_UC)
-+	move_mode = TImode;
-+      else if ((bytes_to_go >= GET_MODE_SIZE (DImode)) && !unaligned)
-+	move_mode = DImode;
-+      else if (bytes_to_go >= GET_MODE_SIZE (SImode))
-+	move_mode = SImode;
-+      else
-+	move_mode = QImode;
-+
-+      {
-+        rtx src_mem;
-+	rtx dst_mem = gen_rtx_MEM (move_mode,
-+				   gen_rtx_PLUS (SImode, dst,
-+						 GEN_INT (dst_offset)));
-+        dst_offset += GET_MODE_SIZE (move_mode);
-+        if ( 0 /* This causes an error in GCC. Think there is
-+                  something wrong in the gcse pass which causes REQ_EQUIV notes
-+                  to be wrong so disabling it for now. */
-+             && move_mode == TImode
-+             && INTVAL (operands[2]) > GET_MODE_SIZE (TImode) )
-+          {
-+            src_mem = gen_rtx_MEM (move_mode,
-+				   gen_rtx_POST_INC (SImode, src));
-+          }
-+        else
-+          {
-+            src_mem = gen_rtx_MEM (move_mode,
-+				   gen_rtx_PLUS (SImode, src,
-+						 GEN_INT (src_offset)));
-+            src_offset += GET_MODE_SIZE (move_mode);
-+          }
-+
-+	bytes_to_go -= GET_MODE_SIZE (move_mode);
-+
-+	MEM_IN_STRUCT_P (dst_mem) = dst_in_struct_p;
-+	MEM_SCALAR_P (dst_mem) = dst_scalar_p;
-+
-+	MEM_IN_STRUCT_P (src_mem) = src_in_struct_p;
-+	MEM_SCALAR_P (src_mem) = src_scalar_p;
-+	emit_move_insn (dst_mem, src_mem);
-+
-+      }
-+    }
-+
-+  return 1;
-+}
-+
-+
-+/* Expand the prologue instruction. */
-+void
-+avr32_expand_prologue (void)
-+{
-+  rtx insn, dwarf;
-+  unsigned long saved_reg_mask;
-+  int reglist8 = 0;
-+
-+  /* Naked functions do not have a prologue. */
-+  if (IS_NAKED (avr32_current_func_type ()))
-+    return;
-+
-+  saved_reg_mask = avr32_compute_save_reg_mask (TRUE);
-+
-+  if (saved_reg_mask)
-+    {
-+      /* Must push used registers. */
-+
-+      /* Should we use POPM or LDM? */
-+      int usePUSHM = TRUE;
-+      reglist8 = 0;
-+      if (((saved_reg_mask & (1 << 0)) ||
-+	   (saved_reg_mask & (1 << 1)) ||
-+	   (saved_reg_mask & (1 << 2)) || (saved_reg_mask & (1 << 3))))
-+	{
-+	  /* One of R0-R3 should at least be pushed. */
-+	  if (((saved_reg_mask & (1 << 0)) &&
-+	       (saved_reg_mask & (1 << 1)) &&
-+	       (saved_reg_mask & (1 << 2)) && (saved_reg_mask & (1 << 3))))
-+	    {
-+	      /* All should be pushed. */
-+	      reglist8 |= 0x01;
-+	    }
-+	  else
-+	    {
-+	      usePUSHM = FALSE;
-+	    }
-+	}
-+
-+      if (((saved_reg_mask & (1 << 4)) ||
-+	   (saved_reg_mask & (1 << 5)) ||
-+	   (saved_reg_mask & (1 << 6)) || (saved_reg_mask & (1 << 7))))
-+	{
-+	  /* One of R4-R7 should at least be pushed */
-+	  if (((saved_reg_mask & (1 << 4)) &&
-+	       (saved_reg_mask & (1 << 5)) &&
-+	       (saved_reg_mask & (1 << 6)) && (saved_reg_mask & (1 << 7))))
-+	    {
-+	      if (usePUSHM)
-+		/* All should be pushed */
-+		reglist8 |= 0x02;
-+	    }
-+	  else
-+	    {
-+	      usePUSHM = FALSE;
-+	    }
-+	}
-+
-+      if (((saved_reg_mask & (1 << 8)) || (saved_reg_mask & (1 << 9))))
-+	{
-+	  /* One of R8-R9 should at least be pushed. */
-+	  if (((saved_reg_mask & (1 << 8)) && (saved_reg_mask & (1 << 9))))
-+	    {
-+	      if (usePUSHM)
-+		/* All should be pushed. */
-+		reglist8 |= 0x04;
-+	    }
-+	  else
-+	    {
-+	      usePUSHM = FALSE;
-+	    }
-+	}
-+
-+      if (saved_reg_mask & (1 << 10))
-+	reglist8 |= 0x08;
-+
-+      if (saved_reg_mask & (1 << 11))
-+	reglist8 |= 0x10;
-+
-+      if (saved_reg_mask & (1 << 12))
-+	reglist8 |= 0x20;
-+
-+      if ((saved_reg_mask & (1 << ASM_REGNUM (LR_REGNUM)))
-+           && !IS_FLASHVAULT (avr32_current_func_type ()))
-+	{
-+	  /* Push LR */
-+	  reglist8 |= 0x40;
-+	}
-+
-+      if (usePUSHM)
-+	{
-+	  insn = emit_multi_reg_push (reglist8, TRUE);
-+	}
-+      else
-+	{
-+	  insn = emit_multi_reg_push (saved_reg_mask, FALSE);
-+	}
-+      RTX_FRAME_RELATED_P (insn) = 1;
-+
-+      /* Prevent this instruction from being scheduled after any other
-+         instructions.  */
-+      emit_insn (gen_blockage ());
-+    }
-+
-+  /* Set frame pointer */
-+  if (frame_pointer_needed)
-+    {
-+      insn = emit_move_insn (frame_pointer_rtx, stack_pointer_rtx);
-+      RTX_FRAME_RELATED_P (insn) = 1;
-+    }
-+
-+  if (get_frame_size () > 0)
-+    {
-+      if (avr32_const_ok_for_constraint_p (get_frame_size (), 'K', "Ks21"))
-+	{
-+	  insn = emit_insn (gen_rtx_SET (SImode,
-+					 stack_pointer_rtx,
-+					 gen_rtx_PLUS (SImode,
-+						       stack_pointer_rtx,
-+						       gen_rtx_CONST_INT
-+						       (SImode,
-+							-get_frame_size
-+							()))));
-+	  RTX_FRAME_RELATED_P (insn) = 1;
-+	}
-+      else
-+	{
-+	  /* Immediate is larger than k21 We must either check if we can use
-+	     one of the pushed reegisters as temporary storage or we must
-+	     make us a temp register by pushing a register to the stack. */
-+	  rtx temp_reg, const_pool_entry, insn;
-+	  if (saved_reg_mask)
-+	    {
-+	      temp_reg =
-+		gen_rtx_REG (SImode,
-+			     INTERNAL_REGNUM (avr32_get_saved_reg
-+					      (saved_reg_mask)));
-+	    }
-+	  else
-+	    {
-+	      temp_reg = gen_rtx_REG (SImode, INTERNAL_REGNUM (7));
-+	      emit_move_insn (gen_rtx_MEM
-+			      (SImode,
-+			       gen_rtx_PRE_DEC (SImode, stack_pointer_rtx)),
-+			      temp_reg);
-+	    }
-+
-+	  const_pool_entry =
-+	    force_const_mem (SImode,
-+			     gen_rtx_CONST_INT (SImode, get_frame_size ()));
-+	  emit_move_insn (temp_reg, const_pool_entry);
-+
-+	  insn = emit_insn (gen_rtx_SET (SImode,
-+					 stack_pointer_rtx,
-+					 gen_rtx_MINUS (SImode,
-+							stack_pointer_rtx,
-+							temp_reg)));
-+
-+	  dwarf = gen_rtx_SET (VOIDmode, stack_pointer_rtx,
-+			       gen_rtx_PLUS (SImode, stack_pointer_rtx,
-+					     GEN_INT (-get_frame_size ())));
-+	  REG_NOTES (insn) = gen_rtx_EXPR_LIST (REG_FRAME_RELATED_EXPR,
-+						dwarf, REG_NOTES (insn));
-+	  RTX_FRAME_RELATED_P (insn) = 1;
-+
-+	  if (!saved_reg_mask)
-+	    {
-+	      insn =
-+		emit_move_insn (temp_reg,
-+				gen_rtx_MEM (SImode,
-+					     gen_rtx_POST_INC (SImode,
-+							       gen_rtx_REG
-+							       (SImode,
-+								13))));
-+	    }
-+
-+	  /* Mark the temp register as dead */
-+	  REG_NOTES (insn) = gen_rtx_EXPR_LIST (REG_DEAD, temp_reg,
-+						REG_NOTES (insn));
-+
-+
-+	}
-+
-+      /* Prevent the the stack adjustment to be scheduled after any
-+         instructions using the frame pointer.  */
-+      emit_insn (gen_blockage ());
-+    }
-+
-+  /* Load GOT */
-+  if (flag_pic)
-+    {
-+      avr32_load_pic_register ();
-+
-+      /* gcc does not know that load or call instructions might use the pic
-+         register so it might schedule these instructions before the loading
-+         of the pic register. To avoid this emit a barrier for now. TODO!
-+         Find out a better way to let gcc know which instructions might use
-+         the pic register. */
-+      emit_insn (gen_blockage ());
-+    }
-+  return;
-+}
-+
-+
-+void
-+avr32_set_return_address (rtx source, rtx scratch)
-+{
-+  rtx addr;
-+  unsigned long saved_regs;
-+
-+  saved_regs = avr32_compute_save_reg_mask (TRUE);
-+
-+  if (!(saved_regs & (1 << ASM_REGNUM (LR_REGNUM))))
-+    emit_move_insn (gen_rtx_REG (Pmode, LR_REGNUM), source);
-+  else
-+    {
-+      if (frame_pointer_needed)
-+	addr = gen_rtx_REG (Pmode, FRAME_POINTER_REGNUM);
-+      else
-+	if (avr32_const_ok_for_constraint_p (get_frame_size (), 'K', "Ks16"))
-+	{
-+	  addr = plus_constant (stack_pointer_rtx, get_frame_size ());
-+	}
-+      else
-+	{
-+	  emit_insn (gen_movsi (scratch, GEN_INT (get_frame_size ())));
-+	  addr = scratch;
-+	}
-+      emit_move_insn (gen_rtx_MEM (Pmode, addr), source);
-+    }
-+}
-+
-+
-+/* Return the length of INSN.  LENGTH is the initial length computed by
-+   attributes in the machine-description file.  */
-+int
-+avr32_adjust_insn_length (rtx insn ATTRIBUTE_UNUSED,
-+			  int length ATTRIBUTE_UNUSED)
-+{
-+  return length;
-+}
-+
-+
-+void
-+avr32_output_return_instruction (int single_ret_inst ATTRIBUTE_UNUSED,
-+				 int iscond ATTRIBUTE_UNUSED,
-+				 rtx cond ATTRIBUTE_UNUSED, rtx r12_imm)
-+{
-+
-+  unsigned long saved_reg_mask;
-+  int insert_ret = TRUE;
-+  int reglist8 = 0;
-+  int stack_adjustment = get_frame_size ();
-+  unsigned int func_type = avr32_current_func_type ();
-+  FILE *f = asm_out_file;
-+
-+  /* Naked functions does not have an epilogue */
-+  if (IS_NAKED (func_type))
-+    return;
-+
-+  saved_reg_mask = avr32_compute_save_reg_mask (FALSE);
-+
-+  /* Reset frame pointer */
-+  if (stack_adjustment > 0)
-+    {
-+      if (avr32_const_ok_for_constraint_p (stack_adjustment, 'I', "Is21"))
-+	{
-+	  fprintf (f, "\tsub\tsp, %i # Reset Frame Pointer\n",
-+		   -stack_adjustment);
-+	}
-+      else
-+	{
-+	  /* TODO! Is it safe to use r8 as scratch?? */
-+	  fprintf (f, "\tmov\tr8, lo(%i) # Reset Frame Pointer\n",
-+		   -stack_adjustment);
-+	  fprintf (f, "\torh\tr8, hi(%i) # Reset Frame Pointer\n",
-+		   -stack_adjustment);
-+	  fprintf (f, "\tadd\tsp, r8  # Reset Frame Pointer\n");
-+	}
-+    }
-+
-+  if (saved_reg_mask)
-+    {
-+      /* Must pop used registers */
-+
-+      /* Should we use POPM or LDM? */
-+      int usePOPM = TRUE;
-+      if (((saved_reg_mask & (1 << 0)) ||
-+	   (saved_reg_mask & (1 << 1)) ||
-+	   (saved_reg_mask & (1 << 2)) || (saved_reg_mask & (1 << 3))))
-+	{
-+	  /* One of R0-R3 should at least be popped */
-+	  if (((saved_reg_mask & (1 << 0)) &&
-+	       (saved_reg_mask & (1 << 1)) &&
-+	       (saved_reg_mask & (1 << 2)) && (saved_reg_mask & (1 << 3))))
-+	    {
-+	      /* All should be popped */
-+	      reglist8 |= 0x01;
-+	    }
-+	  else
-+	    {
-+	      usePOPM = FALSE;
-+	    }
-+	}
-+
-+      if (((saved_reg_mask & (1 << 4)) ||
-+	   (saved_reg_mask & (1 << 5)) ||
-+	   (saved_reg_mask & (1 << 6)) || (saved_reg_mask & (1 << 7))))
-+	{
-+	  /* One of R0-R3 should at least be popped */
-+	  if (((saved_reg_mask & (1 << 4)) &&
-+	       (saved_reg_mask & (1 << 5)) &&
-+	       (saved_reg_mask & (1 << 6)) && (saved_reg_mask & (1 << 7))))
-+	    {
-+	      if (usePOPM)
-+		/* All should be popped */
-+		reglist8 |= 0x02;
-+	    }
-+	  else
-+	    {
-+	      usePOPM = FALSE;
-+	    }
-+	}
-+
-+      if (((saved_reg_mask & (1 << 8)) || (saved_reg_mask & (1 << 9))))
-+	{
-+	  /* One of R8-R9 should at least be pushed */
-+	  if (((saved_reg_mask & (1 << 8)) && (saved_reg_mask & (1 << 9))))
-+	    {
-+	      if (usePOPM)
-+		/* All should be pushed */
-+		reglist8 |= 0x04;
-+	    }
-+	  else
-+	    {
-+	      usePOPM = FALSE;
-+	    }
-+	}
-+
-+      if (saved_reg_mask & (1 << 10))
-+	reglist8 |= 0x08;
-+
-+      if (saved_reg_mask & (1 << 11))
-+	reglist8 |= 0x10;
-+
-+      if (saved_reg_mask & (1 << 12))
-+	reglist8 |= 0x20;
-+
-+      if (saved_reg_mask & (1 << ASM_REGNUM (LR_REGNUM)))
-+	/* Pop LR */
-+	reglist8 |= 0x40;
-+
-+      if ((saved_reg_mask & (1 << ASM_REGNUM (PC_REGNUM))) 
-+           && !IS_FLASHVAULT_IMPL (func_type))
-+	/* Pop LR into PC. */
-+	reglist8 |= 0x80;
-+
-+      if (usePOPM)
-+	{
-+	  char reglist[64];	/* 64 bytes should be enough... */
-+	  avr32_make_reglist8 (reglist8, (char *) reglist);
-+
-+	  if (reglist8 & 0x80)
-+	    /* This instruction is also a return */
-+	    insert_ret = FALSE;
-+
-+	  if (r12_imm && !insert_ret)
-+	    fprintf (f, "\tpopm\t%s, r12=%li\n", reglist, INTVAL (r12_imm));
-+	  else
-+	    fprintf (f, "\tpopm\t%s\n", reglist);
-+
-+	}
-+      else
-+	{
-+	  char reglist[64];	/* 64 bytes should be enough... */
-+	  avr32_make_reglist16 (saved_reg_mask, (char *) reglist);
-+	  if (saved_reg_mask & (1 << ASM_REGNUM (PC_REGNUM)))
-+	    /* This instruction is also a return */
-+	    insert_ret = FALSE;
-+
-+	  if (r12_imm && !insert_ret)
-+	    fprintf (f, "\tldm\tsp++, %s, r12=%li\n", reglist,
-+		     INTVAL (r12_imm));
-+	  else
-+	    fprintf (f, "\tldm\tsp++, %s\n", reglist);
-+
-+	}
-+
-+    }
-+
-+  /* Stack adjustment for exception handler.  */
-+  if (crtl->calls_eh_return)
-+    fprintf (f, "\tadd\tsp, r%d\n", ASM_REGNUM (EH_RETURN_STACKADJ_REGNO));
-+
-+
-+  if (IS_INTERRUPT (func_type))
-+    {
-+      fprintf (f, "\trete\n");
-+    }
-+  else if (IS_FLASHVAULT (func_type))
-+    {
-+      /* Normal return from Secure System call, increment SS_RAR before
-+      returning. Use R8 as scratch. */
-+      fprintf (f,
-+               "\t# Normal return from sscall.\n"
-+               "\t# Increment SS_RAR before returning.\n"
-+               "\t# Use R8 as scratch.\n"
-+               "\tmfsr\tr8,  440\n"
-+               "\tsub\tr8,  -2\n"
-+               "\tmtsr\t440, r8\n"
-+               "\tretss\n");
-+    }
-+  else if (insert_ret)
-+    {
-+      if (r12_imm)
-+	fprintf (f, "\tretal\t%li\n", INTVAL (r12_imm));
-+      else
-+	fprintf (f, "\tretal\tr12\n");
-+    }
-+}
-+
-+void
-+avr32_make_reglist16 (int reglist16_vect, char *reglist16_string)
-+{
-+  int i;
-+  bool first_reg = true;
-+  /* Make sure reglist16_string is empty. */
-+  reglist16_string[0] = '\0';
-+
-+  for (i = 0; i < 16; ++i)
-+    {
-+      if (reglist16_vect & (1 << i))
-+	{
-+          first_reg == true ?  first_reg = false : strcat(reglist16_string,", ");
-+	  strcat (reglist16_string, reg_names[INTERNAL_REGNUM (i)]);
-+	}
-+    }
-+}
-+
-+int
-+avr32_convert_to_reglist16 (int reglist8_vect)
-+{
-+  int reglist16_vect = 0;
-+  if (reglist8_vect & 0x1)
-+    reglist16_vect |= 0xF;
-+  if (reglist8_vect & 0x2)
-+    reglist16_vect |= 0xF0;
-+  if (reglist8_vect & 0x4)
-+    reglist16_vect |= 0x300;
-+  if (reglist8_vect & 0x8)
-+    reglist16_vect |= 0x400;
-+  if (reglist8_vect & 0x10)
-+    reglist16_vect |= 0x800;
-+  if (reglist8_vect & 0x20)
-+    reglist16_vect |= 0x1000;
-+  if (reglist8_vect & 0x40)
-+    reglist16_vect |= 0x4000;
-+  if (reglist8_vect & 0x80)
-+    reglist16_vect |= 0x8000;
-+
-+  return reglist16_vect;
-+}
-+
-+void
-+avr32_make_reglist8 (int reglist8_vect, char *reglist8_string)
-+{
-+  /* Make sure reglist8_string is empty. */
-+  reglist8_string[0] = '\0';
-+
-+  if (reglist8_vect & 0x1)
-+    strcpy (reglist8_string, "r0-r3");
-+  if (reglist8_vect & 0x2)
-+    strlen (reglist8_string) ? strcat (reglist8_string, ", r4-r7") :
-+      strcpy (reglist8_string, "r4-r7");
-+  if (reglist8_vect & 0x4)
-+    strlen (reglist8_string) ? strcat (reglist8_string, ", r8-r9") :
-+      strcpy (reglist8_string, "r8-r9");
-+  if (reglist8_vect & 0x8)
-+    strlen (reglist8_string) ? strcat (reglist8_string, ", r10") :
-+      strcpy (reglist8_string, "r10");
-+  if (reglist8_vect & 0x10)
-+    strlen (reglist8_string) ? strcat (reglist8_string, ", r11") :
-+      strcpy (reglist8_string, "r11");
-+  if (reglist8_vect & 0x20)
-+    strlen (reglist8_string) ? strcat (reglist8_string, ", r12") :
-+      strcpy (reglist8_string, "r12");
-+  if (reglist8_vect & 0x40)
-+    strlen (reglist8_string) ? strcat (reglist8_string, ", lr") :
-+      strcpy (reglist8_string, "lr");
-+  if (reglist8_vect & 0x80)
-+    strlen (reglist8_string) ? strcat (reglist8_string, ", pc") :
-+      strcpy (reglist8_string, "pc");
-+}
-+
-+
-+int
-+avr32_eh_return_data_regno (int n)
-+{
-+  if (n >= 0 && n <= 3)
-+    return 8 + n;
-+  else
-+    return INVALID_REGNUM;
-+}
-+
-+
-+/* Compute the distance from register FROM to register TO.
-+   These can be the arg pointer, the frame pointer or
-+   the stack pointer.
-+   Typical stack layout looks like this:
-+
-+       old stack pointer -> |    |
-+			     ----
-+			    |    | \
-+			    |    |   saved arguments for
-+			    |    |   vararg functions
-+ arg_pointer	->	    |    | /
-+			      --
-+			    |    | \
-+			    |    |   call saved
-+			    |    |   registers
-+			    |    | /
-+  frame ptr	 ->	--
-+			    |    | \
-+			    |    |   local
-+			    |    |   variables
-+  stack ptr -->	     |    | /
-+			      --
-+			    |    | \
-+			    |    |   outgoing
-+			    |    |   arguments
-+			    |    | /
-+			      --
-+
-+  For a given funciton some or all of these stack compomnents
-+  may not be needed, giving rise to the possibility of
-+  eliminating some of the registers.
-+
-+  The values returned by this function must reflect the behaviour
-+  of avr32_expand_prologue() and avr32_compute_save_reg_mask().
-+
-+  The sign of the number returned reflects the direction of stack
-+  growth, so the values are positive for all eliminations except
-+  from the soft frame pointer to the hard frame pointer.  */
-+int
-+avr32_initial_elimination_offset (int from, int to)
-+{
-+  int i;
-+  int call_saved_regs = 0;
-+  unsigned long saved_reg_mask;
-+  unsigned int local_vars = get_frame_size ();
-+
-+  saved_reg_mask = avr32_compute_save_reg_mask (TRUE);
-+
-+  for (i = 0; i < 16; ++i)
-+    {
-+      if (saved_reg_mask & (1 << i))
-+	call_saved_regs += 4;
-+    }
-+
-+  switch (from)
-+    {
-+    case ARG_POINTER_REGNUM:
-+      switch (to)
-+	{
-+	case STACK_POINTER_REGNUM:
-+	  return call_saved_regs + local_vars;
-+	case FRAME_POINTER_REGNUM:
-+	  return call_saved_regs;
-+	default:
-+	  abort ();
-+	}
-+    case FRAME_POINTER_REGNUM:
-+      switch (to)
-+	{
-+	case STACK_POINTER_REGNUM:
-+	  return local_vars;
-+	default:
-+	  abort ();
-+	}
-+    default:
-+      abort ();
-+    }
-+}
-+
-+
-+/*
-+  Returns a rtx used when passing the next argument to a function.
-+  avr32_init_cumulative_args() and avr32_function_arg_advance() sets which
-+  register to use.
-+*/
-+rtx
-+avr32_function_arg (CUMULATIVE_ARGS * cum, enum machine_mode mode,
-+		    tree type, int named)
-+{
-+  int index = -1;
-+  //unsigned long func_type = avr32_current_func_type ();
-+  //int last_reg_index = (IS_FLASHVAULT(func_type) || IS_FLASHVAULT_IMPL(func_type) || cum->flashvault_func ? LAST_CUM_REG_INDEX - 1 : LAST_CUM_REG_INDEX);
-+  int last_reg_index = (cum->flashvault_func ? LAST_CUM_REG_INDEX - 1 : LAST_CUM_REG_INDEX);
-+
-+  HOST_WIDE_INT arg_size, arg_rsize;
-+  if (type)
-+    {
-+      arg_size = int_size_in_bytes (type);
-+    }
-+  else
-+    {
-+      arg_size = GET_MODE_SIZE (mode);
-+    }
-+  arg_rsize = PUSH_ROUNDING (arg_size);
-+
-+  /*
-+     The last time this macro is called, it is called with mode == VOIDmode,
-+     and its result is passed to the call or call_value pattern as operands 2
-+     and 3 respectively. */
-+  if (mode == VOIDmode)
-+    {
-+      return gen_rtx_CONST_INT (SImode, 22);	/* ToDo: fixme. */
-+    }
-+
-+  if ((*targetm.calls.must_pass_in_stack) (mode, type) || !named)
-+    {
-+      return NULL_RTX;
-+    }
-+
-+  if (arg_rsize == 8)
-+    {
-+      /* use r11:r10 or r9:r8. */
-+      if (!(GET_USED_INDEX (cum, 1) || GET_USED_INDEX (cum, 2)))
-+	index = 1;
-+      else if ((last_reg_index == 4) && 
-+               !(GET_USED_INDEX (cum, 3) || GET_USED_INDEX (cum, 4)))
-+	index = 3;
-+      else
-+	index = -1;
-+    }
-+  else if (arg_rsize == 4)
-+    {				/* Use first available register */
-+      index = 0;
-+      while (index <= last_reg_index && GET_USED_INDEX (cum, index))
-+	index++;
-+      if (index > last_reg_index)
-+	index = -1;
-+    }
-+
-+  SET_REG_INDEX (cum, index);
-+
-+  if (GET_REG_INDEX (cum) >= 0)
-+    return gen_rtx_REG (mode, avr32_function_arg_reglist[GET_REG_INDEX (cum)]);
-+
-+  return NULL_RTX;
-+}
-+
-+
-+/* Set the register used for passing the first argument to a function. */
-+void
-+avr32_init_cumulative_args (CUMULATIVE_ARGS * cum,
-+                            tree fntype ATTRIBUTE_UNUSED,
-+                            rtx libname ATTRIBUTE_UNUSED,
-+                            tree fndecl)
-+{
-+  /* Set all registers as unused. */
-+  SET_INDEXES_UNUSED (cum);
-+
-+  /* Reset uses_anonymous_args */
-+  cum->uses_anonymous_args = 0;
-+
-+  /* Reset size of stack pushed arguments */
-+  cum->stack_pushed_args_size = 0;
-+  
-+  cum->flashvault_func = (fndecl && (has_attribute_p (fndecl,"flashvault") || has_attribute_p (fndecl,"flashvault_impl")));
-+}
-+
-+
-+/*
-+  Set register used for passing the next argument to a function. Only the
-+  Scratch Registers are used.
-+
-+		number  name
-+		   15   r15  PC
-+		   14   r14  LR
-+		   13   r13 _SP_________
-+     FIRST_CUM_REG 12   r12 _||_
-+		   10   r11  ||
-+		   11   r10 _||_  Scratch Registers
-+		    8   r9   ||
-+  LAST_SCRATCH_REG  9   r8  _\/_________
-+		    6   r7   /\
-+		    7   r6   ||
-+		    4   r5   ||
-+		    5   r4   ||
-+		    2   r3   ||
-+		    3   r2   ||
-+		    0   r1   ||
-+		    1   r0  _||_________
-+
-+*/
-+void
-+avr32_function_arg_advance (CUMULATIVE_ARGS * cum, enum machine_mode mode,
-+			    tree type, int named ATTRIBUTE_UNUSED)
-+{
-+  HOST_WIDE_INT arg_size, arg_rsize;
-+
-+  if (type)
-+    {
-+      arg_size = int_size_in_bytes (type);
-+    }
-+  else
-+    {
-+      arg_size = GET_MODE_SIZE (mode);
-+    }
-+  arg_rsize = PUSH_ROUNDING (arg_size);
-+
-+  /* If the argument had to be passed in stack, no register is used. */
-+  if ((*targetm.calls.must_pass_in_stack) (mode, type))
-+    {
-+      cum->stack_pushed_args_size += PUSH_ROUNDING (int_size_in_bytes (type));
-+      return;
-+    }
-+
-+  /* Mark the used registers as "used". */
-+  if (GET_REG_INDEX (cum) >= 0)
-+    {
-+      SET_USED_INDEX (cum, GET_REG_INDEX (cum));
-+      if (arg_rsize == 8)
-+	{
-+	  SET_USED_INDEX (cum, (GET_REG_INDEX (cum) + 1));
-+	}
-+    }
-+  else
-+    {
-+      /* Had to use stack */
-+      cum->stack_pushed_args_size += arg_rsize;
-+    }
-+}
-+
-+
-+/*
-+  Defines witch direction to go to find the next register to use if the
-+  argument is larger then one register or for arguments shorter than an
-+  int which is not promoted, such as the last part of structures with
-+  size not a multiple of 4. */
-+enum direction
-+avr32_function_arg_padding (enum machine_mode mode ATTRIBUTE_UNUSED,
-+			    tree type)
-+{
-+  /* Pad upward for all aggregates except byte and halfword sized aggregates
-+     which can be passed in registers. */
-+  if (type
-+      && AGGREGATE_TYPE_P (type)
-+      && (int_size_in_bytes (type) != 1)
-+      && !((int_size_in_bytes (type) == 2)
-+	   && TYPE_ALIGN_UNIT (type) >= 2)
-+      && (int_size_in_bytes (type) & 0x3))
-+    {
-+      return upward;
-+    }
-+
-+  return downward;
-+}
-+
-+
-+/* Return a rtx used for the return value from a function call. */
-+rtx
-+avr32_function_value (tree type, tree func, bool outgoing ATTRIBUTE_UNUSED)
-+{
-+  if (avr32_return_in_memory (type, func))
-+    return NULL_RTX;
-+
-+  if (int_size_in_bytes (type) <= 4)
-+    {
-+      enum machine_mode mode = TYPE_MODE (type);
-+      int unsignedp = 0;
-+      PROMOTE_FUNCTION_MODE (mode, unsignedp, type);
-+      return gen_rtx_REG (mode, RET_REGISTER);
-+    }
-+  else if (int_size_in_bytes (type) <= 8)
-+    return gen_rtx_REG (TYPE_MODE (type), INTERNAL_REGNUM (11));
-+
-+  return NULL_RTX;
-+}
-+
-+
-+/* Return a rtx used for the return value from a library function call. */
-+rtx
-+avr32_libcall_value (enum machine_mode mode)
-+{
-+
-+  if (GET_MODE_SIZE (mode) <= 4)
-+    return gen_rtx_REG (mode, RET_REGISTER);
-+  else if (GET_MODE_SIZE (mode) <= 8)
-+    return gen_rtx_REG (mode, INTERNAL_REGNUM (11));
-+  else
-+    return NULL_RTX;
-+}
-+
-+
-+/* Return TRUE if X references a SYMBOL_REF.  */
-+int
-+symbol_mentioned_p (rtx x)
-+{
-+  const char *fmt;
-+  int i;
-+
-+  if (GET_CODE (x) == SYMBOL_REF)
-+    return 1;
-+
-+  fmt = GET_RTX_FORMAT (GET_CODE (x));
-+
-+  for (i = GET_RTX_LENGTH (GET_CODE (x)) - 1; i >= 0; i--)
-+    {
-+      if (fmt[i] == 'E')
-+	{
-+	  int j;
-+
-+	  for (j = XVECLEN (x, i) - 1; j >= 0; j--)
-+	    if (symbol_mentioned_p (XVECEXP (x, i, j)))
-+	      return 1;
-+	}
-+      else if (fmt[i] == 'e' && symbol_mentioned_p (XEXP (x, i)))
-+	return 1;
-+    }
-+
-+  return 0;
-+}
-+
-+
-+/* Return TRUE if X references a LABEL_REF.  */
-+int
-+label_mentioned_p (rtx x)
-+{
-+  const char *fmt;
-+  int i;
-+
-+  if (GET_CODE (x) == LABEL_REF)
-+    return 1;
-+
-+  fmt = GET_RTX_FORMAT (GET_CODE (x));
-+  for (i = GET_RTX_LENGTH (GET_CODE (x)) - 1; i >= 0; i--)
-+    {
-+      if (fmt[i] == 'E')
-+	{
-+	  int j;
-+
-+	  for (j = XVECLEN (x, i) - 1; j >= 0; j--)
-+	    if (label_mentioned_p (XVECEXP (x, i, j)))
-+	      return 1;
-+	}
-+      else if (fmt[i] == 'e' && label_mentioned_p (XEXP (x, i)))
-+	return 1;
-+    }
-+
-+  return 0;
-+}
-+
-+
-+/* Return TRUE if X contains a MEM expression.  */
-+int
-+mem_mentioned_p (rtx x)
-+{
-+  const char *fmt;
-+  int i;
-+
-+  if (MEM_P (x))
-+    return 1;
-+
-+  fmt = GET_RTX_FORMAT (GET_CODE (x));
-+  for (i = GET_RTX_LENGTH (GET_CODE (x)) - 1; i >= 0; i--)
-+    {
-+      if (fmt[i] == 'E')
-+	{
-+	  int j;
-+
-+	  for (j = XVECLEN (x, i) - 1; j >= 0; j--)
-+	    if (mem_mentioned_p (XVECEXP (x, i, j)))
-+	      return 1;
-+	}
-+      else if (fmt[i] == 'e' && mem_mentioned_p (XEXP (x, i)))
-+	return 1;
-+    }
-+
-+  return 0;
-+}
-+
-+
-+int
-+avr32_legitimate_pic_operand_p (rtx x)
-+{
-+
-+  /* We can't have const, this must be broken down to a symbol. */
-+  if (GET_CODE (x) == CONST)
-+    return FALSE;
-+
-+  /* Can't access symbols or labels via the constant pool either */
-+  if ((GET_CODE (x) == SYMBOL_REF
-+       && CONSTANT_POOL_ADDRESS_P (x)
-+       && (symbol_mentioned_p (get_pool_constant (x))
-+	   || label_mentioned_p (get_pool_constant (x)))))
-+    return FALSE;
-+
-+  return TRUE;
-+}
-+
-+
-+rtx
-+legitimize_pic_address (rtx orig, enum machine_mode mode ATTRIBUTE_UNUSED,
-+			rtx reg)
-+{
-+
-+  if (GET_CODE (orig) == SYMBOL_REF || GET_CODE (orig) == LABEL_REF)
-+    {
-+      int subregs = 0;
-+
-+      if (reg == 0)
-+	{
-+	  if (!can_create_pseudo_p ())
-+	    abort ();
-+	  else
-+	    reg = gen_reg_rtx (Pmode);
-+
-+	  subregs = 1;
-+	}
-+
-+      emit_move_insn (reg, orig);
-+
-+      /* Only set current function as using pic offset table if flag_pic is
-+         set. This is because this function is also used if
-+         TARGET_HAS_ASM_ADDR_PSEUDOS is set. */
-+      if (flag_pic)
-+	crtl->uses_pic_offset_table = 1;
-+
-+      /* Put a REG_EQUAL note on this insn, so that it can be optimized by
-+         loop.  */
-+      return reg;
-+    }
-+  else if (GET_CODE (orig) == CONST)
-+    {
-+      rtx base, offset;
-+
-+      if (flag_pic
-+	  && GET_CODE (XEXP (orig, 0)) == PLUS
-+	  && XEXP (XEXP (orig, 0), 0) == pic_offset_table_rtx)
-+	return orig;
-+
-+      if (reg == 0)
-+	{
-+	  if (!can_create_pseudo_p ())
-+	    abort ();
-+	  else
-+	    reg = gen_reg_rtx (Pmode);
-+	}
-+
-+      if (GET_CODE (XEXP (orig, 0)) == PLUS)
-+	{
-+	  base =
-+	    legitimize_pic_address (XEXP (XEXP (orig, 0), 0), Pmode, reg);
-+	  offset =
-+	    legitimize_pic_address (XEXP (XEXP (orig, 0), 1), Pmode,
-+				    base == reg ? 0 : reg);
-+	}
-+      else
-+	abort ();
-+
-+      if (GET_CODE (offset) == CONST_INT)
-+	{
-+	  /* The base register doesn't really matter, we only want to test
-+	     the index for the appropriate mode.  */
-+	  if (!avr32_const_ok_for_constraint_p (INTVAL (offset), 'I', "Is21"))
-+	    {
-+	      if (can_create_pseudo_p ())
-+		offset = force_reg (Pmode, offset);
-+	      else
-+		abort ();
-+	    }
-+
-+	  if (GET_CODE (offset) == CONST_INT)
-+	    return plus_constant (base, INTVAL (offset));
-+	}
-+
-+      return gen_rtx_PLUS (Pmode, base, offset);
-+    }
-+
-+  return orig;
-+}
-+
-+
-+/* Generate code to load the PIC register.  */
-+void
-+avr32_load_pic_register (void)
-+{
-+  rtx l1, pic_tmp;
-+  rtx global_offset_table;
-+
-+  if ((crtl->uses_pic_offset_table == 0) || TARGET_NO_INIT_GOT)
-+    return;
-+
-+  if (!flag_pic)
-+    abort ();
-+
-+  l1 = gen_label_rtx ();
-+
-+  global_offset_table = gen_rtx_SYMBOL_REF (Pmode, "_GLOBAL_OFFSET_TABLE_");
-+  pic_tmp =
-+    gen_rtx_CONST (Pmode,
-+		   gen_rtx_MINUS (SImode, gen_rtx_LABEL_REF (Pmode, l1),
-+				  global_offset_table));
-+  emit_insn (gen_pic_load_addr
-+	     (pic_offset_table_rtx, force_const_mem (SImode, pic_tmp)));
-+  emit_insn (gen_pic_compute_got_from_pc (pic_offset_table_rtx, l1));
-+
-+  /* Need to emit this whether or not we obey regdecls, since setjmp/longjmp
-+     can cause life info to screw up.  */
-+  emit_insn (gen_rtx_USE (VOIDmode, pic_offset_table_rtx));
-+}
-+
-+
-+/* This hook should return true if values of type type are returned at the most
-+   significant end of a register (in other words, if they are padded at the
-+   least significant end). You can assume that type is returned in a register;
-+   the caller is required to check this.  Note that the register provided by
-+   FUNCTION_VALUE must be able to hold the complete return value. For example,
-+   if a 1-, 2- or 3-byte structure is returned at the most significant end of a
-+   4-byte register, FUNCTION_VALUE should provide an SImode rtx. */
-+bool
-+avr32_return_in_msb (tree type ATTRIBUTE_UNUSED)
-+{
-+  /* if ( AGGREGATE_TYPE_P (type) ) if ((int_size_in_bytes(type) == 1) ||
-+     ((int_size_in_bytes(type) == 2) && TYPE_ALIGN_UNIT(type) >= 2)) return
-+     false; else return true; */
-+
-+  return false;
-+}
-+
-+
-+/*
-+  Returns one if a certain function value is going to be returned in memory
-+  and zero if it is going to be returned in a register.
-+
-+  BLKmode and all other modes that is larger than 64 bits are returned in
-+  memory.
-+*/
-+bool
-+avr32_return_in_memory (tree type, tree fntype ATTRIBUTE_UNUSED)
-+{
-+  if (TYPE_MODE (type) == VOIDmode)
-+    return false;
-+
-+  if (int_size_in_bytes (type) > (2 * UNITS_PER_WORD)
-+      || int_size_in_bytes (type) == -1)
-+    {
-+      return true;
-+    }
-+
-+  /* If we have an aggregate then use the same mechanism as when checking if
-+     it should be passed on the stack. */
-+  if (type
-+      && AGGREGATE_TYPE_P (type)
-+      && (*targetm.calls.must_pass_in_stack) (TYPE_MODE (type), type))
-+    return true;
-+
-+  return false;
-+}
-+
-+
-+/* Output the constant part of the trampoline.
-+   lddpc    r0, pc[0x8:e] ; load static chain register
-+   lddpc    pc, pc[0x8:e] ; jump to subrutine
-+   .long    0		 ; Address to static chain,
-+			 ; filled in by avr32_initialize_trampoline()
-+   .long    0		 ; Address to subrutine,
-+			 ; filled in by avr32_initialize_trampoline()
-+*/
-+void
-+avr32_trampoline_template (FILE * file)
-+{
-+  fprintf (file, "\tlddpc    r0, pc[8]\n");
-+  fprintf (file, "\tlddpc    pc, pc[8]\n");
-+  /* make room for the address of the static chain. */
-+  fprintf (file, "\t.long\t0\n");
-+  /* make room for the address to the subrutine. */
-+  fprintf (file, "\t.long\t0\n");
-+}
-+
-+
-+/* Initialize the variable parts of a trampoline. */
-+void
-+avr32_initialize_trampoline (rtx addr, rtx fnaddr, rtx static_chain)
-+{
-+  /* Store the address to the static chain. */
-+  emit_move_insn (gen_rtx_MEM
-+		  (SImode, plus_constant (addr, TRAMPOLINE_SIZE - 4)),
-+		  static_chain);
-+
-+  /* Store the address to the function. */
-+  emit_move_insn (gen_rtx_MEM (SImode, plus_constant (addr, TRAMPOLINE_SIZE)),
-+		  fnaddr);
-+
-+  emit_insn (gen_cache (gen_rtx_REG (SImode, 13),
-+			gen_rtx_CONST_INT (SImode,
-+					   AVR32_CACHE_INVALIDATE_ICACHE)));
-+}
-+
-+
-+/* Return nonzero if X is valid as an addressing register.  */
-+int
-+avr32_address_register_rtx_p (rtx x, int strict_p)
-+{
-+  int regno;
-+
-+  if (!register_operand(x, GET_MODE(x)))
-+    return 0;
-+
-+  /* If strict we require the register to be a hard register. */
-+  if (strict_p
-+      && !REG_P(x))
-+    return 0;
-+
-+  regno = REGNO (x);
-+
-+  if (strict_p)
-+    return REGNO_OK_FOR_BASE_P (regno);
-+
-+  return (regno <= LAST_REGNUM || regno >= FIRST_PSEUDO_REGISTER);
-+}
-+
-+
-+/* Return nonzero if INDEX is valid for an address index operand.  */
-+int
-+avr32_legitimate_index_p (enum machine_mode mode, rtx index, int strict_p)
-+{
-+  enum rtx_code code = GET_CODE (index);
-+
-+  if (GET_MODE_SIZE (mode) > 8)
-+    return 0;
-+
-+  /* Standard coprocessor addressing modes.  */
-+  if (code == CONST_INT)
-+    {
-+	return CONST_OK_FOR_CONSTRAINT_P (INTVAL (index), 'K', "Ks16");
-+    }
-+
-+  if (avr32_address_register_rtx_p (index, strict_p))
-+    return 1;
-+
-+  if (code == MULT)
-+    {
-+      rtx xiop0 = XEXP (index, 0);
-+      rtx xiop1 = XEXP (index, 1);
-+      return ((avr32_address_register_rtx_p (xiop0, strict_p)
-+	       && power_of_two_operand (xiop1, SImode)
-+	       && (INTVAL (xiop1) <= 8))
-+	      || (avr32_address_register_rtx_p (xiop1, strict_p)
-+		  && power_of_two_operand (xiop0, SImode)
-+		  && (INTVAL (xiop0) <= 8)));
-+    }
-+  else if (code == ASHIFT)
-+    {
-+      rtx op = XEXP (index, 1);
-+
-+      return (avr32_address_register_rtx_p (XEXP (index, 0), strict_p)
-+	      && GET_CODE (op) == CONST_INT
-+	      && INTVAL (op) > 0 && INTVAL (op) <= 3);
-+    }
-+
-+  return 0;
-+}
-+
-+
-+/*
-+  Used in the GO_IF_LEGITIMATE_ADDRESS macro. Returns a nonzero value if
-+  the RTX x is a legitimate memory address.
-+
-+  Returns NO_REGS if the address is not legatime, GENERAL_REGS or ALL_REGS
-+  if it is.
-+*/
-+
-+
-+/* Forward declaration */
-+int is_minipool_label (rtx label);
-+
-+int
-+avr32_legitimate_address (enum machine_mode mode, rtx x, int strict)
-+{
-+
-+  switch (GET_CODE (x))
-+    {
-+    case REG:
-+      return avr32_address_register_rtx_p (x, strict);
-+    case CONST_INT:
-+      return ((mode==SImode) && TARGET_RMW_ADDRESSABLE_DATA
-+              && CONST_OK_FOR_CONSTRAINT_P(INTVAL(x), 'K', "Ks17"));
-+    case CONST:
-+      {
-+	rtx label = avr32_find_symbol (x);
-+	if (label
-+	    &&
-+	    (/*
-+               If we enable (const (plus (symbol_ref ...))) type constant
-+               pool entries we must add support for it in the predicates and
-+               in the minipool generation in avr32_reorg().
-+               (CONSTANT_POOL_ADDRESS_P (label)
-+               && !(flag_pic
-+               && (symbol_mentioned_p (get_pool_constant (label))
-+               || label_mentioned_p (get_pool_constant (label)))))
-+               ||*/
-+             ((GET_CODE (label) == LABEL_REF)
-+              && GET_CODE (XEXP (label, 0)) == CODE_LABEL
-+    		  && is_minipool_label (XEXP (label, 0)))
-+              /*|| ((GET_CODE (label) == SYMBOL_REF) 
-+                  && mode == SImode
-+                  && SYMBOL_REF_RMW_ADDR(label))*/))
-+	  {
-+	    return TRUE;
-+	  }
-+      }
-+      break;
-+    case LABEL_REF:
-+      if (GET_CODE (XEXP (x, 0)) == CODE_LABEL
-+	  && is_minipool_label (XEXP (x, 0)))
-+	{
-+	  return TRUE;
-+	}
-+      break;
-+    case SYMBOL_REF:
-+      {
-+	if (CONSTANT_POOL_ADDRESS_P (x)
-+	    && !(flag_pic
-+		 && (symbol_mentioned_p (get_pool_constant (x))
-+		     || label_mentioned_p (get_pool_constant (x)))))
-+	  return TRUE;
-+	else if (SYMBOL_REF_RCALL_FUNCTION_P (x)
-+                 || (mode == SImode
-+                     && SYMBOL_REF_RMW_ADDR (x)))
-+	  return TRUE;
-+	break;
-+      }
-+    case PRE_DEC:		/* (pre_dec (...)) */
-+    case POST_INC:		/* (post_inc (...)) */
-+      return avr32_address_register_rtx_p (XEXP (x, 0), strict);
-+    case PLUS:			/* (plus (...) (...)) */
-+      {
-+	rtx xop0 = XEXP (x, 0);
-+	rtx xop1 = XEXP (x, 1);
-+
-+	return ((avr32_address_register_rtx_p (xop0, strict)
-+		 && avr32_legitimate_index_p (mode, xop1, strict))
-+		|| (avr32_address_register_rtx_p (xop1, strict)
-+		    && avr32_legitimate_index_p (mode, xop0, strict)));
-+      }
-+    default:
-+      break;
-+    }
-+
-+  return FALSE;
-+}
-+
-+
-+int
-+avr32_const_ok_for_move (HOST_WIDE_INT c)
-+{
-+  if ( TARGET_V2_INSNS )
-+    return ( avr32_const_ok_for_constraint_p (c, 'K', "Ks21")
-+             /* movh instruction */
-+             || avr32_hi16_immediate_operand (GEN_INT(c), VOIDmode) );
-+  else
-+    return avr32_const_ok_for_constraint_p (c, 'K', "Ks21");
-+}
-+
-+
-+int
-+avr32_const_double_immediate (rtx value)
-+{
-+  HOST_WIDE_INT hi, lo;
-+
-+  if (GET_CODE (value) != CONST_DOUBLE)
-+    return FALSE;
-+
-+  if (SCALAR_FLOAT_MODE_P (GET_MODE (value)))
-+    {
-+      HOST_WIDE_INT target_float[2];
-+      hi = lo = 0;
-+      real_to_target (target_float, CONST_DOUBLE_REAL_VALUE (value),
-+		      GET_MODE (value));
-+      lo = target_float[0];
-+      hi = target_float[1];
-+    }
-+  else
-+    {
-+      hi = CONST_DOUBLE_HIGH (value);
-+      lo = CONST_DOUBLE_LOW (value);
-+    }
-+
-+  if (avr32_const_ok_for_constraint_p (lo, 'K', "Ks21")
-+      && (GET_MODE (value) == SFmode
-+	  || avr32_const_ok_for_constraint_p (hi, 'K', "Ks21")))
-+    {
-+      return TRUE;
-+    }
-+
-+  return FALSE;
-+}
-+
-+
-+int
-+avr32_legitimate_constant_p (rtx x)
-+{
-+  switch (GET_CODE (x))
-+    {
-+    case CONST_INT:
-+      /* Check if we should put large immediate into constant pool
-+       or load them directly with mov/orh.*/
-+      if (!avr32_imm_in_const_pool)
-+	return 1;
-+
-+      return avr32_const_ok_for_move (INTVAL (x));
-+    case CONST_DOUBLE:
-+      /* Check if we should put large immediate into constant pool
-+         or load them directly with mov/orh.*/
-+      if (!avr32_imm_in_const_pool)
-+	return 1;
-+
-+      if (GET_MODE (x) == SFmode
-+	  || GET_MODE (x) == DFmode || GET_MODE (x) == DImode)
-+	return avr32_const_double_immediate (x);
-+      else
-+	return 0;
-+    case LABEL_REF:
-+    case SYMBOL_REF:
-+      return avr32_find_symbol (x) && (flag_pic || TARGET_HAS_ASM_ADDR_PSEUDOS);
-+    case CONST:
-+    case HIGH:
-+    case CONST_VECTOR:
-+      return 0;
-+    default:
-+      printf ("%s():\n", __FUNCTION__);
-+      debug_rtx (x);
-+      return 1;
-+    }
-+}
-+
-+
-+/* Strip any special encoding from labels */
-+const char *
-+avr32_strip_name_encoding (const char *name)
-+{
-+  const char *stripped = name;
-+
-+  while (1)
-+    {
-+      switch (stripped[0])
-+	{
-+	case '#':
-+	  stripped = strchr (name + 1, '#') + 1;
-+	  break;
-+	case '*':
-+	  stripped = &stripped[1];
-+	  break;
-+	default:
-+	  return stripped;
-+	}
-+    }
-+}
-+
-+
-+
-+/* Do anything needed before RTL is emitted for each function.  */
-+static struct machine_function *
-+avr32_init_machine_status (void)
-+{
-+  struct machine_function *machine;
-+  machine =
-+    (machine_function *) ggc_alloc_cleared (sizeof (machine_function));
-+
-+#if AVR32_FT_UNKNOWN != 0
-+  machine->func_type = AVR32_FT_UNKNOWN;
-+#endif
-+
-+  machine->minipool_label_head = 0;
-+  machine->minipool_label_tail = 0;
-+  machine->ifcvt_after_reload = 0;
-+  return machine;
-+}
-+
-+
-+void
-+avr32_init_expanders (void)
-+{
-+  /* Arrange to initialize and mark the machine per-function status.  */
-+  init_machine_status = avr32_init_machine_status;
-+}
-+
-+
-+/* Return an RTX indicating where the return address to the
-+   calling function can be found.  */
-+rtx
-+avr32_return_addr (int count, rtx frame ATTRIBUTE_UNUSED)
-+{
-+  if (count != 0)
-+    return NULL_RTX;
-+
-+  return get_hard_reg_initial_val (Pmode, LR_REGNUM);
-+}
-+
-+
-+void
-+avr32_encode_section_info (tree decl, rtx rtl, int first)
-+{
-+   default_encode_section_info(decl, rtl, first);
-+
-+   if ( TREE_CODE (decl) == VAR_DECL
-+        && (GET_CODE (XEXP (rtl, 0)) == SYMBOL_REF)
-+        && (lookup_attribute ("rmw_addressable", DECL_ATTRIBUTES (decl))
-+            || TARGET_RMW_ADDRESSABLE_DATA) ){
-+     if ( !TARGET_RMW || flag_pic )
-+       return;
-+     //  {
-+     //    warning ("Using RMW addressable data with an arch that does not support RMW instructions.");
-+     //    return;
-+     //  } 
-+     //
-+     //if ( flag_pic )
-+     //  {
-+     //    warning ("Using RMW addressable data with together with -fpic switch. Can not use RMW instruction when compiling with -fpic.");
-+     //    return;
-+     //  } 
-+     SYMBOL_REF_FLAGS (XEXP (rtl, 0)) |= (1 << SYMBOL_FLAG_RMW_ADDR_SHIFT);
-+  }
-+}
-+
-+
-+void
-+avr32_asm_output_label (FILE * stream, const char *name)
-+{
-+  name = avr32_strip_name_encoding (name);
-+
-+  /* Print the label. */
-+  assemble_name (stream, name);
-+  fprintf (stream, ":\n");
-+}
-+
-+
-+void
-+avr32_asm_weaken_label (FILE * stream, const char *name)
-+{
-+  fprintf (stream, "\t.weak ");
-+  assemble_name (stream, name);
-+  fprintf (stream, "\n");
-+}
-+
-+
-+/*
-+  Checks if a labelref is equal to a reserved word in the assembler. If it is,
-+  insert a '_' before the label name.
-+*/
-+void
-+avr32_asm_output_labelref (FILE * stream, const char *name)
-+{
-+  int verbatim = FALSE;
-+  const char *stripped = name;
-+  int strip_finished = FALSE;
-+
-+  while (!strip_finished)
-+    {
-+      switch (stripped[0])
-+	{
-+	case '#':
-+	  stripped = strchr (name + 1, '#') + 1;
-+	  break;
-+	case '*':
-+	  stripped = &stripped[1];
-+	  verbatim = TRUE;
-+	  break;
-+	default:
-+	  strip_finished = TRUE;
-+	  break;
-+	}
-+    }
-+
-+  if (verbatim)
-+    fputs (stripped, stream);
-+  else
-+    asm_fprintf (stream, "%U%s", stripped);
-+}
-+
-+
-+/*
-+   Check if the comparison in compare_exp is redundant
-+   for the condition given in next_cond given that the
-+   needed flags are already set by an earlier instruction.
-+   Uses cc_prev_status to check this.
-+
-+   Returns NULL_RTX if the compare is not redundant
-+   or the new condition to use in the conditional
-+   instruction if the compare is redundant.
-+*/
-+static rtx
-+is_compare_redundant (rtx compare_exp, rtx next_cond)
-+{
-+  int z_flag_valid = FALSE;
-+  int n_flag_valid = FALSE;
-+  rtx new_cond;
-+
-+  if (GET_CODE (compare_exp) != COMPARE
-+      && GET_CODE (compare_exp) != AND)
-+    return NULL_RTX;
-+
-+
-+  if (rtx_equal_p (cc_prev_status.mdep.value, compare_exp))
-+    {
-+      /* cc0 already contains the correct comparison -> delete cmp insn */
-+      return next_cond;
-+    }
-+
-+  if (GET_MODE (compare_exp) != SImode)
-+    return NULL_RTX;
-+
-+  switch (cc_prev_status.mdep.flags)
-+    {
-+    case CC_SET_VNCZ:
-+    case CC_SET_NCZ:
-+      n_flag_valid = TRUE;
-+    case CC_SET_CZ:
-+    case CC_SET_Z:
-+      z_flag_valid = TRUE;
-+    }
-+
-+  if (cc_prev_status.mdep.value
-+      && GET_CODE (compare_exp) == COMPARE
-+      && REG_P (XEXP (compare_exp, 0))
-+      && REGNO (XEXP (compare_exp, 0)) == REGNO (cc_prev_status.mdep.value)
-+      && GET_CODE (XEXP (compare_exp, 1)) == CONST_INT
-+      && next_cond != NULL_RTX)
-+    {
-+      if (INTVAL (XEXP (compare_exp, 1)) == 0
-+	  && z_flag_valid
-+	  && (GET_CODE (next_cond) == EQ || GET_CODE (next_cond) == NE))
-+	/* We can skip comparison Z flag is already reflecting ops[0] */
-+	return next_cond;
-+      else if (n_flag_valid
-+	       && ((INTVAL (XEXP (compare_exp, 1)) == 0
-+		    && (GET_CODE (next_cond) == GE
-+			|| GET_CODE (next_cond) == LT))
-+		   || (INTVAL (XEXP (compare_exp, 1)) == -1
-+		       && (GET_CODE (next_cond) == GT
-+			   || GET_CODE (next_cond) == LE))))
-+	{
-+	  /* We can skip comparison N flag is already reflecting ops[0],
-+	     which means that we can use the mi/pl conditions to check if
-+	     ops[0] is GE or LT 0. */
-+	  if ((GET_CODE (next_cond) == GE) || (GET_CODE (next_cond) == GT))
-+	    new_cond =
-+	      gen_rtx_UNSPEC (GET_MODE (next_cond), gen_rtvec (2, cc0_rtx, const0_rtx),
-+			      UNSPEC_COND_PL);
-+	  else
-+	    new_cond =
-+	      gen_rtx_UNSPEC (GET_MODE (next_cond), gen_rtvec (2, cc0_rtx, const0_rtx),
-+			      UNSPEC_COND_MI);
-+	  return new_cond;
-+	}
-+    }
-+  return NULL_RTX;
-+}
-+
-+
-+/* Updates cc_status.  */
-+void
-+avr32_notice_update_cc (rtx exp, rtx insn)
-+{
-+  enum attr_cc attr_cc = get_attr_cc (insn);
-+
-+  if ( attr_cc == CC_SET_Z_IF_NOT_V2 )
-+    {
-+      if (TARGET_V2_INSNS)
-+        attr_cc = CC_NONE;
-+      else
-+        attr_cc = CC_SET_Z;
-+    }
-+
-+  switch (attr_cc)
-+    {
-+    case CC_CALL_SET:
-+      CC_STATUS_INIT;
-+      /* Check if the function call returns a value in r12 */
-+      if (REG_P (recog_data.operand[0])
-+	  && REGNO (recog_data.operand[0]) == RETVAL_REGNUM)
-+	{
-+	  cc_status.flags = 0;
-+	  cc_status.mdep.value =
-+	    gen_rtx_COMPARE (SImode, recog_data.operand[0], const0_rtx);
-+	  cc_status.mdep.flags = CC_SET_VNCZ;
-+          cc_status.mdep.cond_exec_cmp_clobbered = 0;
-+
-+	}
-+      break;
-+    case CC_COMPARE:
-+      {
-+        /* Check that compare will not be optimized away if so nothing should
-+           be done */
-+        rtx compare_exp = SET_SRC (exp);
-+        /* Check if we have a tst expression. If so convert it to a
-+           compare with 0. */
-+        if ( REG_P (SET_SRC (exp)) )
-+          compare_exp = gen_rtx_COMPARE (GET_MODE (SET_SRC (exp)),
-+                                         SET_SRC (exp),
-+                                         const0_rtx);
-+
-+        if (!next_insn_emits_cmp (insn)
-+            && (is_compare_redundant (compare_exp, get_next_insn_cond (insn)) == NULL_RTX))
-+          {
-+
-+            /* Reset the nonstandard flag */
-+            CC_STATUS_INIT;
-+            cc_status.flags = 0;
-+            cc_status.mdep.value = compare_exp;
-+            cc_status.mdep.flags = CC_SET_VNCZ;
-+            cc_status.mdep.cond_exec_cmp_clobbered = 0;
-+         }
-+      }
-+      break;
-+    case CC_CMP_COND_INSN:
-+      {
-+	/* Conditional insn that emit the compare itself. */
-+        rtx cmp;
-+        rtx cmp_op0, cmp_op1;
-+        rtx cond;
-+        rtx dest;
-+        rtx next_insn = next_nonnote_insn (insn);
-+
-+        if ( GET_CODE (exp) == COND_EXEC )
-+          {
-+            cmp_op0 = XEXP (COND_EXEC_TEST (exp), 0);
-+            cmp_op1 = XEXP (COND_EXEC_TEST (exp), 1);
-+            cond = COND_EXEC_TEST (exp);
-+            dest = SET_DEST (COND_EXEC_CODE (exp));
-+          }
-+        else
-+          {
-+            /* If then else conditional. compare operands are in operands
-+               4 and 5. */
-+            cmp_op0 = recog_data.operand[4];
-+            cmp_op1 = recog_data.operand[5];
-+            cond = recog_data.operand[1];
-+            dest = SET_DEST (exp);
-+          }
-+
-+        if ( GET_CODE (cmp_op0) == AND )
-+          cmp = cmp_op0;
-+        else
-+          cmp = gen_rtx_COMPARE (GET_MODE (cmp_op0),
-+                                 cmp_op0,
-+                                 cmp_op1);
-+
-+        /* Check if the conditional insns updates a register present
-+           in the comparison, if so then we must reset the cc_status. */
-+        if (REG_P (dest)
-+            && (reg_mentioned_p (dest, cmp_op0)
-+                || reg_mentioned_p (dest, cmp_op1))
-+            && GET_CODE (exp) != COND_EXEC )
-+          {
-+            CC_STATUS_INIT;
-+          }
-+	else if (is_compare_redundant (cmp, cond) == NULL_RTX)
-+	  {
-+	    /* Reset the nonstandard flag */
-+	    CC_STATUS_INIT;
-+            if ( GET_CODE (cmp_op0) == AND )
-+              {
-+                cc_status.flags = CC_INVERTED;
-+                cc_status.mdep.flags = CC_SET_Z;
-+              }
-+            else
-+              {
-+                cc_status.flags = 0;
-+                cc_status.mdep.flags = CC_SET_VNCZ;
-+              }
-+	    cc_status.mdep.value = cmp;
-+            cc_status.mdep.cond_exec_cmp_clobbered = 0;
-+	  }
-+
-+
-+        /* Check if we have a COND_EXEC insn which updates one
-+           of the registers in the compare status. */
-+        if (REG_P (dest)
-+            && (reg_mentioned_p (dest, cmp_op0)
-+                || reg_mentioned_p (dest, cmp_op1))
-+            && GET_CODE (exp) == COND_EXEC )
-+          cc_status.mdep.cond_exec_cmp_clobbered = 1;
-+
-+        if ( cc_status.mdep.cond_exec_cmp_clobbered
-+             && GET_CODE (exp) == COND_EXEC
-+             && next_insn != NULL
-+             && INSN_P (next_insn)
-+             && !(GET_CODE (PATTERN (next_insn)) == COND_EXEC
-+                  && rtx_equal_p (XEXP (COND_EXEC_TEST (PATTERN (next_insn)), 0), cmp_op0)
-+                  && rtx_equal_p (XEXP (COND_EXEC_TEST (PATTERN (next_insn)), 1), cmp_op1)
-+                  && (GET_CODE (COND_EXEC_TEST (PATTERN (next_insn))) == GET_CODE (cond)
-+                      || GET_CODE (COND_EXEC_TEST (PATTERN (next_insn))) == reverse_condition (GET_CODE (cond)))) )
-+          {
-+            /* We have a sequence of conditional insns where the compare status has been clobbered
-+               since the compare no longer reflects the content of the values to compare. */
-+            CC_STATUS_INIT;
-+            cc_status.mdep.cond_exec_cmp_clobbered = 1;
-+          }
-+
-+      }
-+      break;
-+    case CC_BLD:
-+      /* Bit load is kind of like an inverted testsi, because the Z flag is
-+         inverted */
-+      CC_STATUS_INIT;
-+      cc_status.flags = CC_INVERTED;
-+      cc_status.mdep.value = SET_SRC (exp);
-+      cc_status.mdep.flags = CC_SET_Z;
-+      cc_status.mdep.cond_exec_cmp_clobbered = 0;
-+      break;
-+    case CC_NONE:
-+      /* Insn does not affect CC at all. Check if the instruction updates
-+         some of the register currently reflected in cc0 */
-+
-+      if ((GET_CODE (exp) == SET)
-+	  && (cc_status.value1 || cc_status.value2 || cc_status.mdep.value)
-+	  && (reg_mentioned_p (SET_DEST (exp), cc_status.value1)
-+	      || reg_mentioned_p (SET_DEST (exp), cc_status.value2)
-+	      || reg_mentioned_p (SET_DEST (exp), cc_status.mdep.value)))
-+	{
-+	  CC_STATUS_INIT;
-+	}
-+
-+      /* If this is a parallel we must step through each of the parallel
-+         expressions */
-+      if (GET_CODE (exp) == PARALLEL)
-+	{
-+	  int i;
-+	  for (i = 0; i < XVECLEN (exp, 0); ++i)
-+	    {
-+	      rtx vec_exp = XVECEXP (exp, 0, i);
-+	      if ((GET_CODE (vec_exp) == SET)
-+		  && (cc_status.value1 || cc_status.value2
-+		      || cc_status.mdep.value)
-+		  && (reg_mentioned_p (SET_DEST (vec_exp), cc_status.value1)
-+		      || reg_mentioned_p (SET_DEST (vec_exp),
-+					  cc_status.value2)
-+		      || reg_mentioned_p (SET_DEST (vec_exp),
-+					  cc_status.mdep.value)))
-+		{
-+		  CC_STATUS_INIT;
-+		}
-+	    }
-+	}
-+
-+      /* Check if we have memory opartions with post_inc or pre_dec on the
-+         register currently reflected in cc0 */
-+      if (GET_CODE (exp) == SET
-+	  && GET_CODE (SET_SRC (exp)) == MEM
-+	  && (GET_CODE (XEXP (SET_SRC (exp), 0)) == POST_INC
-+	      || GET_CODE (XEXP (SET_SRC (exp), 0)) == PRE_DEC)
-+	  &&
-+	  (reg_mentioned_p
-+	   (XEXP (XEXP (SET_SRC (exp), 0), 0), cc_status.value1)
-+	   || reg_mentioned_p (XEXP (XEXP (SET_SRC (exp), 0), 0),
-+			       cc_status.value2)
-+	   || reg_mentioned_p (XEXP (XEXP (SET_SRC (exp), 0), 0),
-+			       cc_status.mdep.value)))
-+	CC_STATUS_INIT;
-+
-+      if (GET_CODE (exp) == SET
-+	  && GET_CODE (SET_DEST (exp)) == MEM
-+	  && (GET_CODE (XEXP (SET_DEST (exp), 0)) == POST_INC
-+	      || GET_CODE (XEXP (SET_DEST (exp), 0)) == PRE_DEC)
-+	  &&
-+	  (reg_mentioned_p
-+	   (XEXP (XEXP (SET_DEST (exp), 0), 0), cc_status.value1)
-+	   || reg_mentioned_p (XEXP (XEXP (SET_DEST (exp), 0), 0),
-+			       cc_status.value2)
-+	   || reg_mentioned_p (XEXP (XEXP (SET_DEST (exp), 0), 0),
-+			       cc_status.mdep.value)))
-+	CC_STATUS_INIT;
-+      break;
-+
-+    case CC_SET_VNCZ:
-+      CC_STATUS_INIT;
-+      cc_status.mdep.value = recog_data.operand[0];
-+      cc_status.mdep.flags = CC_SET_VNCZ;
-+      cc_status.mdep.cond_exec_cmp_clobbered = 0;
-+      break;
-+
-+    case CC_SET_NCZ:
-+      CC_STATUS_INIT;
-+      cc_status.mdep.value = recog_data.operand[0];
-+      cc_status.mdep.flags = CC_SET_NCZ;
-+      cc_status.mdep.cond_exec_cmp_clobbered = 0;
-+      break;
-+
-+    case CC_SET_CZ:
-+      CC_STATUS_INIT;
-+      cc_status.mdep.value = recog_data.operand[0];
-+      cc_status.mdep.flags = CC_SET_CZ;
-+      cc_status.mdep.cond_exec_cmp_clobbered = 0;
-+      break;
-+
-+    case CC_SET_Z:
-+      CC_STATUS_INIT;
-+      cc_status.mdep.value = recog_data.operand[0];
-+      cc_status.mdep.flags = CC_SET_Z;
-+      cc_status.mdep.cond_exec_cmp_clobbered = 0;
-+      break;
-+
-+    case CC_CLOBBER:
-+      CC_STATUS_INIT;
-+      break;
-+
-+    default:
-+      CC_STATUS_INIT;
-+    }
-+}
-+
-+
-+/*
-+  Outputs to stdio stream stream the assembler syntax for an instruction
-+  operand x. x is an RTL expression.
-+*/
-+void
-+avr32_print_operand (FILE * stream, rtx x, int code)
-+{
-+  int error = 0;
-+
-+  if ( code == '?' )
-+    {
-+      /* Predicable instruction, print condition code */
-+
-+      /* If the insn should not be conditional then do nothing. */
-+      if ( current_insn_predicate == NULL_RTX )
-+        return;
-+
-+      /* Set x to the predicate to force printing
-+         the condition later on. */
-+      x = current_insn_predicate;
-+
-+      /* Reverse condition if useing bld insn. */
-+      if ( GET_CODE (XEXP(current_insn_predicate,0)) == AND )
-+        x = reversed_condition (current_insn_predicate);
-+    }
-+  else if ( code == '!' )
-+    {
-+      /* Output compare for conditional insn if needed. */
-+      rtx new_cond;
-+      gcc_assert ( current_insn_predicate != NULL_RTX );
-+      new_cond = avr32_output_cmp(current_insn_predicate,
-+                                  GET_MODE(XEXP(current_insn_predicate,0)),
-+                                  XEXP(current_insn_predicate,0),
-+                                  XEXP(current_insn_predicate,1));
-+
-+      /* Check if the new condition is a special avr32 condition
-+         specified using UNSPECs. If so we must handle it differently. */
-+      if ( GET_CODE (new_cond) == UNSPEC )
-+        {
-+          current_insn_predicate =
-+            gen_rtx_UNSPEC (CCmode,
-+                            gen_rtvec (2,
-+                                       XEXP(current_insn_predicate,0),
-+                                       XEXP(current_insn_predicate,1)),
-+                            XINT (new_cond, 1));
-+        }
-+      else
-+        {
-+          PUT_CODE(current_insn_predicate, GET_CODE(new_cond));
-+        }
-+      return;
-+    }
-+
-+  switch (GET_CODE (x))
-+    {
-+    case UNSPEC:
-+      switch (XINT (x, 1))
-+	{
-+	case UNSPEC_COND_PL:
-+	  if (code == 'i')
-+	    fputs ("mi", stream);
-+	  else
-+	    fputs ("pl", stream);
-+	  break;
-+	case UNSPEC_COND_MI:
-+	  if (code == 'i')
-+	    fputs ("pl", stream);
-+	  else
-+	    fputs ("mi", stream);
-+	  break;
-+	default:
-+	  error = 1;
-+	}
-+      break;
-+    case EQ:
-+      if (code == 'i')
-+	fputs ("ne", stream);
-+      else
-+	fputs ("eq", stream);
-+      break;
-+    case NE:
-+      if (code == 'i')
-+	fputs ("eq", stream);
-+      else
-+	fputs ("ne", stream);
-+      break;
-+    case GT:
-+      if (code == 'i')
-+	fputs ("le", stream);
-+      else
-+	fputs ("gt", stream);
-+      break;
-+    case GTU:
-+      if (code == 'i')
-+	fputs ("ls", stream);
-+      else
-+	fputs ("hi", stream);
-+      break;
-+    case LT:
-+      if (code == 'i')
-+	fputs ("ge", stream);
-+      else
-+	fputs ("lt", stream);
-+      break;
-+    case LTU:
-+      if (code == 'i')
-+	fputs ("hs", stream);
-+      else
-+	fputs ("lo", stream);
-+      break;
-+    case GE:
-+      if (code == 'i')
-+	fputs ("lt", stream);
-+      else
-+	fputs ("ge", stream);
-+      break;
-+    case GEU:
-+      if (code == 'i')
-+	fputs ("lo", stream);
-+      else
-+	fputs ("hs", stream);
-+      break;
-+    case LE:
-+      if (code == 'i')
-+	fputs ("gt", stream);
-+      else
-+	fputs ("le", stream);
-+      break;
-+    case LEU:
-+      if (code == 'i')
-+	fputs ("hi", stream);
-+      else
-+	fputs ("ls", stream);
-+      break;
-+    case CONST_INT:
-+      {
-+        HOST_WIDE_INT value = INTVAL (x);
-+
-+        switch (code)
-+          {
-+          case 'm':
-+            if ( HOST_BITS_PER_WIDE_INT > BITS_PER_WORD )
-+              {
-+                /* A const_int can be used to represent DImode constants. */
-+                value >>= BITS_PER_WORD;
-+              }
-+            /* We might get a const_int immediate for setting a DI register,
-+               we then must then return the correct sign extended DI. The most
-+               significant word is just a sign extension. */
-+            else if (value < 0)
-+              value = -1;
-+            else
-+              value = 0;
-+            break;
-+          case 'i':
-+            value++;
-+            break;
-+          case 'p':
-+            {
-+              /* Set to bit position of first bit set in immediate */
-+              int i, bitpos = 32;
-+              for (i = 0; i < 32; i++)
-+                if (value & (1 << i))
-+                  {
-+                    bitpos = i;
-+                    break;
-+                  }
-+              value = bitpos;
-+            }
-+            break;
-+          case 'z':
-+            {
-+              /* Set to bit position of first bit cleared in immediate */
-+              int i, bitpos = 32;
-+              for (i = 0; i < 32; i++)
-+                if (!(value & (1 << i)))
-+                  {
-+                    bitpos = i;
-+                    break;
-+                  }
-+              value = bitpos;
-+            }
-+            break;
-+          case 'r':
-+            {
-+              /* Reglist 8 */
-+              char op[50];
-+              op[0] = '\0';
-+
-+              if (value & 0x01)
-+                strcpy (op, "r0-r3");
-+              if (value & 0x02)
-+                strlen (op) ? strcat (op, ", r4-r7") : strcpy (op,"r4-r7");
-+              if (value & 0x04)
-+                strlen (op) ? strcat (op, ", r8-r9") : strcpy (op,"r8-r9");
-+              if (value & 0x08)
-+                strlen (op) ? strcat (op, ", r10") : strcpy (op,"r10");
-+              if (value & 0x10)
-+                strlen (op) ? strcat (op, ", r11") : strcpy (op,"r11");
-+              if (value & 0x20)
-+                strlen (op) ? strcat (op, ", r12") : strcpy (op,"r12");
-+              if (value & 0x40)
-+                strlen (op) ? strcat (op, ", lr") : strcpy (op, "lr");
-+              if (value & 0x80)
-+                strlen (op) ? strcat (op, ", pc") : strcpy (op, "pc");
-+
-+              fputs (op, stream);
-+              return;
-+            }
-+          case 's':
-+            {
-+              /* Reglist 16 */
-+              char reglist16_string[100];
-+              int i;
-+	      bool first_reg = true;
-+              reglist16_string[0] = '\0';
-+
-+	      for (i = 0; i < 16; ++i)
-+		{
-+		  if (value & (1 << i))
-+		    {
-+			first_reg == true ?  first_reg = false : strcat(reglist16_string,", ");
-+			strcat(reglist16_string,reg_names[INTERNAL_REGNUM(i)]);		      
-+		    }
-+		}
-+	      fputs (reglist16_string, stream);
-+	      return;
-+	    }
-+	  case 'h':
-+	    /* Print halfword part of word */
-+	    fputs (value ? "b" : "t", stream);
-+	    return;
-+	  }
-+
-+	/* Print Value */
-+	fprintf (stream, "%d", value);
-+	break;
-+      }
-+    case CONST_DOUBLE:
-+      {
-+	HOST_WIDE_INT hi, lo;
-+	if (SCALAR_FLOAT_MODE_P (GET_MODE (x)))
-+	  {
-+	    HOST_WIDE_INT target_float[2];
-+	    hi = lo = 0;
-+	    real_to_target (target_float, CONST_DOUBLE_REAL_VALUE (x),
-+			    GET_MODE (x));
-+	    /* For doubles the most significant part starts at index 0. */
-+	    if (GET_MODE_SIZE (GET_MODE (x)) > UNITS_PER_WORD)
-+	      {
-+		hi = target_float[0];
-+		lo = target_float[1];
-+	      }
-+	    else
-+	      {
-+		lo = target_float[0];
-+	      }
-+	  }
-+	else
-+	  {
-+	    hi = CONST_DOUBLE_HIGH (x);
-+	    lo = CONST_DOUBLE_LOW (x);
-+	  }
-+
-+	if (code == 'm')
-+	  fprintf (stream, "%ld", hi);
-+	else
-+	  fprintf (stream, "%ld", lo);
-+
-+	break;
-+      }
-+    case CONST:
-+      output_addr_const (stream, XEXP (XEXP (x, 0), 0));
-+      fprintf (stream, "+%ld", INTVAL (XEXP (XEXP (x, 0), 1)));
-+      break;
-+    case REG:
-+      /* Swap register name if the register is DImode or DFmode. */
-+      if (GET_MODE (x) == DImode || GET_MODE (x) == DFmode)
-+	{
-+	  /* Double register must have an even numbered address */
-+	  gcc_assert (!(REGNO (x) % 2));
-+	  if (code == 'm')
-+	    fputs (reg_names[true_regnum (x)], stream);
-+	  else
-+	    fputs (reg_names[true_regnum (x) + 1], stream);
-+	}
-+      else if (GET_MODE (x) == TImode)
-+	{
-+	  switch (code)
-+	    {
-+	    case 'T':
-+	      fputs (reg_names[true_regnum (x)], stream);
-+	      break;
-+	    case 'U':
-+	      fputs (reg_names[true_regnum (x) + 1], stream);
-+	      break;
-+	    case 'L':
-+	      fputs (reg_names[true_regnum (x) + 2], stream);
-+	      break;
-+	    case 'B':
-+	      fputs (reg_names[true_regnum (x) + 3], stream);
-+	      break;
-+	    default:
-+	      fprintf (stream, "%s, %s, %s, %s",
-+		       reg_names[true_regnum (x) + 3],
-+		       reg_names[true_regnum (x) + 2],
-+		       reg_names[true_regnum (x) + 1],
-+		       reg_names[true_regnum (x)]);
-+	      break;
-+	    }
-+	}
-+      else
-+	{
-+	  fputs (reg_names[true_regnum (x)], stream);
-+	}
-+      break;
-+    case CODE_LABEL:
-+    case LABEL_REF:
-+    case SYMBOL_REF:
-+      output_addr_const (stream, x);
-+      break;
-+    case MEM:
-+      switch (GET_CODE (XEXP (x, 0)))
-+	{
-+	case LABEL_REF:
-+	case SYMBOL_REF:
-+	  output_addr_const (stream, XEXP (x, 0));
-+	  break;
-+	case MEM:
-+	  switch (GET_CODE (XEXP (XEXP (x, 0), 0)))
-+	    {
-+	    case SYMBOL_REF:
-+	      output_addr_const (stream, XEXP (XEXP (x, 0), 0));
-+	      break;
-+	    default:
-+	      error = 1;
-+	      break;
-+	    }
-+	  break;
-+	case REG:
-+	  avr32_print_operand (stream, XEXP (x, 0), 0);
-+	  if (code != 'p')
-+	    fputs ("[0]", stream);
-+	  break;
-+	case PRE_DEC:
-+	  fputs ("--", stream);
-+	  avr32_print_operand (stream, XEXP (XEXP (x, 0), 0), 0);
-+	  break;
-+	case POST_INC:
-+	  avr32_print_operand (stream, XEXP (XEXP (x, 0), 0), 0);
-+	  fputs ("++", stream);
-+	  break;
-+	case PLUS:
-+	  {
-+	    rtx op0 = XEXP (XEXP (x, 0), 0);
-+	    rtx op1 = XEXP (XEXP (x, 0), 1);
-+	    rtx base = NULL_RTX, offset = NULL_RTX;
-+
-+	    if (avr32_address_register_rtx_p (op0, 1))
-+	      {
-+		base = op0;
-+		offset = op1;
-+	      }
-+	    else if (avr32_address_register_rtx_p (op1, 1))
-+	      {
-+		/* Operands are switched. */
-+		base = op1;
-+		offset = op0;
-+	      }
-+
-+	    gcc_assert (base && offset
-+			&& avr32_address_register_rtx_p (base, 1)
-+			&& avr32_legitimate_index_p (GET_MODE (x), offset,
-+						     1));
-+
-+	    avr32_print_operand (stream, base, 0);
-+	    fputs ("[", stream);
-+	    avr32_print_operand (stream, offset, 0);
-+	    fputs ("]", stream);
-+	    break;
-+	  }
-+	case CONST:
-+	  output_addr_const (stream, XEXP (XEXP (XEXP (x, 0), 0), 0));
-+	  fprintf (stream, " + %ld",
-+		   INTVAL (XEXP (XEXP (XEXP (x, 0), 0), 1)));
-+	  break;
-+        case CONST_INT:
-+	  avr32_print_operand (stream, XEXP (x, 0), 0);
-+          break;
-+	default:
-+	  error = 1;
-+	}
-+      break;
-+    case MULT:
-+      {
-+	int value = INTVAL (XEXP (x, 1));
-+
-+	/* Convert immediate in multiplication into a shift immediate */
-+	switch (value)
-+	  {
-+	  case 2:
-+	    value = 1;
-+	    break;
-+	  case 4:
-+	    value = 2;
-+	    break;
-+	  case 8:
-+	    value = 3;
-+	    break;
-+	  default:
-+	    value = 0;
-+	  }
-+	fprintf (stream, "%s << %i", reg_names[true_regnum (XEXP (x, 0))],
-+		 value);
-+	break;
-+      }
-+    case ASHIFT:
-+      if (GET_CODE (XEXP (x, 1)) == CONST_INT)
-+	fprintf (stream, "%s << %i", reg_names[true_regnum (XEXP (x, 0))],
-+		 (int) INTVAL (XEXP (x, 1)));
-+      else if (REG_P (XEXP (x, 1)))
-+	fprintf (stream, "%s << %s", reg_names[true_regnum (XEXP (x, 0))],
-+		 reg_names[true_regnum (XEXP (x, 1))]);
-+      else
-+	{
-+	  error = 1;
-+	}
-+      break;
-+    case LSHIFTRT:
-+      if (GET_CODE (XEXP (x, 1)) == CONST_INT)
-+	fprintf (stream, "%s >> %i", reg_names[true_regnum (XEXP (x, 0))],
-+		 (int) INTVAL (XEXP (x, 1)));
-+      else if (REG_P (XEXP (x, 1)))
-+	fprintf (stream, "%s >> %s", reg_names[true_regnum (XEXP (x, 0))],
-+		 reg_names[true_regnum (XEXP (x, 1))]);
-+      else
-+	{
-+	  error = 1;
-+	}
-+      fprintf (stream, ">>");
-+      break;
-+    case PARALLEL:
-+      {
-+	/* Load store multiple */
-+	int i;
-+	int count = XVECLEN (x, 0);
-+	int reglist16 = 0;
-+	char reglist16_string[100];
-+
-+	for (i = 0; i < count; ++i)
-+	  {
-+	    rtx vec_elm = XVECEXP (x, 0, i);
-+	    if (GET_MODE (vec_elm) != SET)
-+	      {
-+		debug_rtx (vec_elm);
-+		internal_error ("Unknown element in parallel expression!");
-+	      }
-+	    if (GET_MODE (XEXP (vec_elm, 0)) == REG)
-+	      {
-+		/* Load multiple */
-+		reglist16 |= 1 << ASM_REGNUM (REGNO (XEXP (vec_elm, 0)));
-+	      }
-+	    else
-+	      {
-+		/* Store multiple */
-+		reglist16 |= 1 << ASM_REGNUM (REGNO (XEXP (vec_elm, 1)));
-+	      }
-+	  }
-+
-+	avr32_make_reglist16 (reglist16, reglist16_string);
-+	fputs (reglist16_string, stream);
-+
-+	break;
-+      }
-+
-+    case PLUS:
-+      {
-+        rtx op0 = XEXP (x, 0);
-+        rtx op1 = XEXP (x, 1);
-+        rtx base = NULL_RTX, offset = NULL_RTX;
-+
-+        if (avr32_address_register_rtx_p (op0, 1))
-+          {
-+            base = op0;
-+            offset = op1;
-+          }
-+        else if (avr32_address_register_rtx_p (op1, 1))
-+          {
-+            /* Operands are switched. */
-+            base = op1;
-+            offset = op0;
-+          }
-+
-+        gcc_assert (base && offset
-+                    && avr32_address_register_rtx_p (base, 1)
-+                    && avr32_legitimate_index_p (GET_MODE (x), offset, 1));
-+
-+        avr32_print_operand (stream, base, 0);
-+        fputs ("[", stream);
-+        avr32_print_operand (stream, offset, 0);
-+        fputs ("]", stream);
-+        break;
-+      }
-+
-+    default:
-+      error = 1;
-+    }
-+
-+  if (error)
-+    {
-+      debug_rtx (x);
-+      internal_error ("Illegal expression for avr32_print_operand");
-+    }
-+}
-+
-+rtx
-+avr32_get_note_reg_equiv (rtx insn)
-+{
-+  rtx note;
-+
-+  note = find_reg_note (insn, REG_EQUIV, NULL_RTX);
-+
-+  if (note != NULL_RTX)
-+    return XEXP (note, 0);
-+  else
-+    return NULL_RTX;
-+}
-+
-+
-+/*
-+  Outputs to stdio stream stream the assembler syntax for an instruction
-+  operand that is a memory reference whose address is x. x is an RTL
-+  expression.
-+
-+  ToDo: fixme.
-+*/
-+void
-+avr32_print_operand_address (FILE * stream, rtx x)
-+{
-+  fprintf (stream, "(%d) /* address */", REGNO (x));
-+}
-+
-+
-+/* Return true if _GLOBAL_OFFSET_TABLE_ symbol is mentioned.  */
-+bool
-+avr32_got_mentioned_p (rtx addr)
-+{
-+  if (GET_CODE (addr) == MEM)
-+    addr = XEXP (addr, 0);
-+  while (GET_CODE (addr) == CONST)
-+    addr = XEXP (addr, 0);
-+  if (GET_CODE (addr) == SYMBOL_REF)
-+    {
-+      return streq (XSTR (addr, 0), "_GLOBAL_OFFSET_TABLE_");
-+    }
-+  if (GET_CODE (addr) == PLUS || GET_CODE (addr) == MINUS)
-+    {
-+      bool l1, l2;
-+
-+      l1 = avr32_got_mentioned_p (XEXP (addr, 0));
-+      l2 = avr32_got_mentioned_p (XEXP (addr, 1));
-+      return l1 || l2;
-+    }
-+  return false;
-+}
-+
-+
-+/* Find the symbol in an address expression.  */
-+rtx
-+avr32_find_symbol (rtx addr)
-+{
-+  if (GET_CODE (addr) == MEM)
-+    addr = XEXP (addr, 0);
-+
-+  while (GET_CODE (addr) == CONST)
-+    addr = XEXP (addr, 0);
-+
-+  if (GET_CODE (addr) == SYMBOL_REF || GET_CODE (addr) == LABEL_REF)
-+    return addr;
-+  if (GET_CODE (addr) == PLUS)
-+    {
-+      rtx l1, l2;
-+
-+      l1 = avr32_find_symbol (XEXP (addr, 0));
-+      l2 = avr32_find_symbol (XEXP (addr, 1));
-+      if (l1 != NULL_RTX && l2 == NULL_RTX)
-+	return l1;
-+      else if (l1 == NULL_RTX && l2 != NULL_RTX)
-+	return l2;
-+    }
-+
-+  return NULL_RTX;
-+}
-+
-+
-+/* Routines for manipulation of the constant pool.  */
-+
-+/* AVR32 instructions cannot load a large constant directly into a
-+   register; they have to come from a pc relative load.  The constant
-+   must therefore be placed in the addressable range of the pc
-+   relative load.  Depending on the precise pc relative load
-+   instruction the range is somewhere between 256 bytes and 4k.  This
-+   means that we often have to dump a constant inside a function, and
-+   generate code to branch around it.
-+
-+   It is important to minimize this, since the branches will slow
-+   things down and make the code larger.
-+
-+   Normally we can hide the table after an existing unconditional
-+   branch so that there is no interruption of the flow, but in the
-+   worst case the code looks like this:
-+
-+	lddpc	rn, L1
-+	...
-+	rjmp	L2
-+	align
-+	L1:	.long value
-+	L2:
-+	...
-+
-+	lddpc	rn, L3
-+	...
-+	rjmp	L4
-+	align
-+	L3:	.long value
-+	L4:
-+	...
-+
-+   We fix this by performing a scan after scheduling, which notices
-+   which instructions need to have their operands fetched from the
-+   constant table and builds the table.
-+
-+   The algorithm starts by building a table of all the constants that
-+   need fixing up and all the natural barriers in the function (places
-+   where a constant table can be dropped without breaking the flow).
-+   For each fixup we note how far the pc-relative replacement will be
-+   able to reach and the offset of the instruction into the function.
-+
-+   Having built the table we then group the fixes together to form
-+   tables that are as large as possible (subject to addressing
-+   constraints) and emit each table of constants after the last
-+   barrier that is within range of all the instructions in the group.
-+   If a group does not contain a barrier, then we forcibly create one
-+   by inserting a jump instruction into the flow.  Once the table has
-+   been inserted, the insns are then modified to reference the
-+   relevant entry in the pool.
-+
-+   Possible enhancements to the algorithm (not implemented) are:
-+
-+   1) For some processors and object formats, there may be benefit in
-+   aligning the pools to the start of cache lines; this alignment
-+   would need to be taken into account when calculating addressability
-+   of a pool.  */
-+
-+/* These typedefs are located at the start of this file, so that
-+   they can be used in the prototypes there.  This comment is to
-+   remind readers of that fact so that the following structures
-+   can be understood more easily.
-+
-+     typedef struct minipool_node    Mnode;
-+     typedef struct minipool_fixup   Mfix;  */
-+
-+struct minipool_node
-+{
-+  /* Doubly linked chain of entries.  */
-+  Mnode *next;
-+  Mnode *prev;
-+  /* The maximum offset into the code that this entry can be placed.  While
-+     pushing fixes for forward references, all entries are sorted in order of
-+     increasing max_address.  */
-+  HOST_WIDE_INT max_address;
-+  /* Similarly for an entry inserted for a backwards ref.  */
-+  HOST_WIDE_INT min_address;
-+  /* The number of fixes referencing this entry.  This can become zero if we
-+     "unpush" an entry.  In this case we ignore the entry when we come to
-+     emit the code.  */
-+  int refcount;
-+  /* The offset from the start of the minipool.  */
-+  HOST_WIDE_INT offset;
-+  /* The value in table.  */
-+  rtx value;
-+  /* The mode of value.  */
-+  enum machine_mode mode;
-+  /* The size of the value.  */
-+  int fix_size;
-+};
-+
-+
-+struct minipool_fixup
-+{
-+  Mfix *next;
-+  rtx insn;
-+  HOST_WIDE_INT address;
-+  rtx *loc;
-+  enum machine_mode mode;
-+  int fix_size;
-+  rtx value;
-+  Mnode *minipool;
-+  HOST_WIDE_INT forwards;
-+  HOST_WIDE_INT backwards;
-+};
-+
-+
-+/* Fixes less than a word need padding out to a word boundary.  */
-+#define MINIPOOL_FIX_SIZE(mode, value)                          \
-+  (IS_FORCE_MINIPOOL(value) ? 0 :                               \
-+   (GET_MODE_SIZE ((mode)) >= 4 ? GET_MODE_SIZE ((mode)) : 4))
-+
-+#define IS_FORCE_MINIPOOL(x)                    \
-+  (GET_CODE(x) == UNSPEC &&                     \
-+   XINT(x, 1) == UNSPEC_FORCE_MINIPOOL)
-+
-+static Mnode *minipool_vector_head;
-+static Mnode *minipool_vector_tail;
-+
-+/* The linked list of all minipool fixes required for this function.  */
-+Mfix *minipool_fix_head;
-+Mfix *minipool_fix_tail;
-+/* The fix entry for the current minipool, once it has been placed.  */
-+Mfix *minipool_barrier;
-+
-+
-+/* Determines if INSN is the start of a jump table.  Returns the end
-+   of the TABLE or NULL_RTX.  */
-+static rtx
-+is_jump_table (rtx insn)
-+{
-+  rtx table;
-+
-+  if (GET_CODE (insn) == JUMP_INSN
-+      && JUMP_LABEL (insn) != NULL
-+      && ((table = next_real_insn (JUMP_LABEL (insn)))
-+	  == next_real_insn (insn))
-+      && table != NULL
-+      && GET_CODE (table) == JUMP_INSN
-+      && (GET_CODE (PATTERN (table)) == ADDR_VEC
-+	  || GET_CODE (PATTERN (table)) == ADDR_DIFF_VEC))
-+    return table;
-+
-+  return NULL_RTX;
-+}
-+
-+
-+static HOST_WIDE_INT
-+get_jump_table_size (rtx insn)
-+{
-+  /* ADDR_VECs only take room if read-only data does into the text section.  */
-+  if (JUMP_TABLES_IN_TEXT_SECTION
-+#if !defined(READONLY_DATA_SECTION_ASM_OP)
-+      || 1
-+#endif
-+    )
-+    {
-+      rtx body = PATTERN (insn);
-+      int elt = GET_CODE (body) == ADDR_DIFF_VEC ? 1 : 0;
-+
-+      return GET_MODE_SIZE (GET_MODE (body)) * XVECLEN (body, elt);
-+    }
-+
-+  return 0;
-+}
-+
-+
-+/* Move a minipool fix MP from its current location to before MAX_MP.
-+   If MAX_MP is NULL, then MP doesn't need moving, but the addressing
-+   constraints may need updating.  */
-+static Mnode *
-+move_minipool_fix_forward_ref (Mnode * mp, Mnode * max_mp,
-+			       HOST_WIDE_INT max_address)
-+{
-+  /* This should never be true and the code below assumes these are
-+     different.  */
-+  if (mp == max_mp)
-+    abort ();
-+
-+  if (max_mp == NULL)
-+    {
-+      if (max_address < mp->max_address)
-+	mp->max_address = max_address;
-+    }
-+  else
-+    {
-+      if (max_address > max_mp->max_address - mp->fix_size)
-+	mp->max_address = max_mp->max_address - mp->fix_size;
-+      else
-+	mp->max_address = max_address;
-+
-+      /* Unlink MP from its current position.  Since max_mp is non-null,
-+         mp->prev must be non-null.  */
-+      mp->prev->next = mp->next;
-+      if (mp->next != NULL)
-+	mp->next->prev = mp->prev;
-+      else
-+	minipool_vector_tail = mp->prev;
-+
-+      /* Re-insert it before MAX_MP.  */
-+      mp->next = max_mp;
-+      mp->prev = max_mp->prev;
-+      max_mp->prev = mp;
-+
-+      if (mp->prev != NULL)
-+	mp->prev->next = mp;
-+      else
-+	minipool_vector_head = mp;
-+    }
-+
-+  /* Save the new entry.  */
-+  max_mp = mp;
-+
-+  /* Scan over the preceding entries and adjust their addresses as required.
-+   */
-+  while (mp->prev != NULL
-+	 && mp->prev->max_address > mp->max_address - mp->prev->fix_size)
-+    {
-+      mp->prev->max_address = mp->max_address - mp->prev->fix_size;
-+      mp = mp->prev;
-+    }
-+
-+  return max_mp;
-+}
-+
-+
-+/* Add a constant to the minipool for a forward reference.  Returns the
-+   node added or NULL if the constant will not fit in this pool.  */
-+static Mnode *
-+add_minipool_forward_ref (Mfix * fix)
-+{
-+  /* If set, max_mp is the first pool_entry that has a lower constraint than
-+     the one we are trying to add.  */
-+  Mnode *max_mp = NULL;
-+  HOST_WIDE_INT max_address = fix->address + fix->forwards;
-+  Mnode *mp;
-+
-+  /* If this fix's address is greater than the address of the first entry,
-+     then we can't put the fix in this pool.  We subtract the size of the
-+     current fix to ensure that if the table is fully packed we still have
-+     enough room to insert this value by suffling the other fixes forwards.  */
-+  if (minipool_vector_head &&
-+      fix->address >= minipool_vector_head->max_address - fix->fix_size)
-+    return NULL;
-+
-+  /* Scan the pool to see if a constant with the same value has already been
-+     added.  While we are doing this, also note the location where we must
-+     insert the constant if it doesn't already exist.  */
-+  for (mp = minipool_vector_head; mp != NULL; mp = mp->next)
-+    {
-+      if (GET_CODE (fix->value) == GET_CODE (mp->value)
-+	  && fix->mode == mp->mode
-+	  && (GET_CODE (fix->value) != CODE_LABEL
-+	      || (CODE_LABEL_NUMBER (fix->value)
-+		  == CODE_LABEL_NUMBER (mp->value)))
-+	  && rtx_equal_p (fix->value, mp->value))
-+	{
-+	  /* More than one fix references this entry.  */
-+	  mp->refcount++;
-+	  return move_minipool_fix_forward_ref (mp, max_mp, max_address);
-+	}
-+
-+      /* Note the insertion point if necessary.  */
-+      if (max_mp == NULL && mp->max_address > max_address)
-+	max_mp = mp;
-+
-+    }
-+
-+  /* The value is not currently in the minipool, so we need to create a new
-+     entry for it.  If MAX_MP is NULL, the entry will be put on the end of
-+     the list since the placement is less constrained than any existing
-+     entry.  Otherwise, we insert the new fix before MAX_MP and, if
-+     necessary, adjust the constraints on the other entries.  */
-+  mp = xmalloc (sizeof (*mp));
-+  mp->fix_size = fix->fix_size;
-+  mp->mode = fix->mode;
-+  mp->value = fix->value;
-+  mp->refcount = 1;
-+  /* Not yet required for a backwards ref.  */
-+  mp->min_address = -65536;
-+
-+  if (max_mp == NULL)
-+    {
-+      mp->max_address = max_address;
-+      mp->next = NULL;
-+      mp->prev = minipool_vector_tail;
-+
-+      if (mp->prev == NULL)
-+	{
-+	  minipool_vector_head = mp;
-+	  minipool_vector_label = gen_label_rtx ();
-+	}
-+      else
-+	mp->prev->next = mp;
-+
-+      minipool_vector_tail = mp;
-+    }
-+  else
-+    {
-+      if (max_address > max_mp->max_address - mp->fix_size)
-+	mp->max_address = max_mp->max_address - mp->fix_size;
-+      else
-+	mp->max_address = max_address;
-+
-+      mp->next = max_mp;
-+      mp->prev = max_mp->prev;
-+      max_mp->prev = mp;
-+      if (mp->prev != NULL)
-+	mp->prev->next = mp;
-+      else
-+	minipool_vector_head = mp;
-+    }
-+
-+  /* Save the new entry.  */
-+  max_mp = mp;
-+
-+  /* Scan over the preceding entries and adjust their addresses as required.
-+   */
-+  while (mp->prev != NULL
-+	 && mp->prev->max_address > mp->max_address - mp->prev->fix_size)
-+    {
-+      mp->prev->max_address = mp->max_address - mp->prev->fix_size;
-+      mp = mp->prev;
-+    }
-+
-+  return max_mp;
-+}
-+
-+
-+static Mnode *
-+move_minipool_fix_backward_ref (Mnode * mp, Mnode * min_mp,
-+				HOST_WIDE_INT min_address)
-+{
-+  HOST_WIDE_INT offset;
-+
-+  /* This should never be true, and the code below assumes these are
-+     different.  */
-+  if (mp == min_mp)
-+    abort ();
-+
-+  if (min_mp == NULL)
-+    {
-+      if (min_address > mp->min_address)
-+	mp->min_address = min_address;
-+    }
-+  else
-+    {
-+      /* We will adjust this below if it is too loose.  */
-+      mp->min_address = min_address;
-+
-+      /* Unlink MP from its current position.  Since min_mp is non-null,
-+         mp->next must be non-null.  */
-+      mp->next->prev = mp->prev;
-+      if (mp->prev != NULL)
-+	mp->prev->next = mp->next;
-+      else
-+	minipool_vector_head = mp->next;
-+
-+      /* Reinsert it after MIN_MP.  */
-+      mp->prev = min_mp;
-+      mp->next = min_mp->next;
-+      min_mp->next = mp;
-+      if (mp->next != NULL)
-+	mp->next->prev = mp;
-+      else
-+	minipool_vector_tail = mp;
-+    }
-+
-+  min_mp = mp;
-+
-+  offset = 0;
-+  for (mp = minipool_vector_head; mp != NULL; mp = mp->next)
-+    {
-+      mp->offset = offset;
-+      if (mp->refcount > 0)
-+	offset += mp->fix_size;
-+
-+      if (mp->next && mp->next->min_address < mp->min_address + mp->fix_size)
-+	mp->next->min_address = mp->min_address + mp->fix_size;
-+    }
-+
-+  return min_mp;
-+}
-+
-+
-+/* Add a constant to the minipool for a backward reference.  Returns the
-+   node added or NULL if the constant will not fit in this pool.
-+
-+   Note that the code for insertion for a backwards reference can be
-+   somewhat confusing because the calculated offsets for each fix do
-+   not take into account the size of the pool (which is still under
-+   construction.  */
-+static Mnode *
-+add_minipool_backward_ref (Mfix * fix)
-+{
-+  /* If set, min_mp is the last pool_entry that has a lower constraint than
-+     the one we are trying to add.  */
-+  Mnode *min_mp = NULL;
-+  /* This can be negative, since it is only a constraint.  */
-+  HOST_WIDE_INT min_address = fix->address - fix->backwards;
-+  Mnode *mp;
-+
-+  /* If we can't reach the current pool from this insn, or if we can't insert
-+     this entry at the end of the pool without pushing other fixes out of
-+     range, then we don't try.  This ensures that we can't fail later on.  */
-+  if (min_address >= minipool_barrier->address
-+      || (minipool_vector_tail->min_address + fix->fix_size
-+	  >= minipool_barrier->address))
-+    return NULL;
-+
-+  /* Scan the pool to see if a constant with the same value has already been
-+     added.  While we are doing this, also note the location where we must
-+     insert the constant if it doesn't already exist.  */
-+  for (mp = minipool_vector_tail; mp != NULL; mp = mp->prev)
-+    {
-+      if (GET_CODE (fix->value) == GET_CODE (mp->value)
-+	  && fix->mode == mp->mode
-+	  && (GET_CODE (fix->value) != CODE_LABEL
-+	      || (CODE_LABEL_NUMBER (fix->value)
-+		  == CODE_LABEL_NUMBER (mp->value)))
-+	  && rtx_equal_p (fix->value, mp->value)
-+	  /* Check that there is enough slack to move this entry to the end
-+	     of the table (this is conservative).  */
-+	  && (mp->max_address
-+	      > (minipool_barrier->address
-+		 + minipool_vector_tail->offset
-+		 + minipool_vector_tail->fix_size)))
-+	{
-+	  mp->refcount++;
-+	  return move_minipool_fix_backward_ref (mp, min_mp, min_address);
-+	}
-+
-+      if (min_mp != NULL)
-+	mp->min_address += fix->fix_size;
-+      else
-+	{
-+	  /* Note the insertion point if necessary.  */
-+	  if (mp->min_address < min_address)
-+	    {
-+	      min_mp = mp;
-+	    }
-+	  else if (mp->max_address
-+		   < minipool_barrier->address + mp->offset + fix->fix_size)
-+	    {
-+	      /* Inserting before this entry would push the fix beyond its
-+	         maximum address (which can happen if we have re-located a
-+	         forwards fix); force the new fix to come after it.  */
-+	      min_mp = mp;
-+	      min_address = mp->min_address + fix->fix_size;
-+	    }
-+	}
-+    }
-+
-+  /* We need to create a new entry.  */
-+  mp = xmalloc (sizeof (*mp));
-+  mp->fix_size = fix->fix_size;
-+  mp->mode = fix->mode;
-+  mp->value = fix->value;
-+  mp->refcount = 1;
-+  mp->max_address = minipool_barrier->address + 65536;
-+
-+  mp->min_address = min_address;
-+
-+  if (min_mp == NULL)
-+    {
-+      mp->prev = NULL;
-+      mp->next = minipool_vector_head;
-+
-+      if (mp->next == NULL)
-+	{
-+	  minipool_vector_tail = mp;
-+	  minipool_vector_label = gen_label_rtx ();
-+	}
-+      else
-+	mp->next->prev = mp;
-+
-+      minipool_vector_head = mp;
-+    }
-+  else
-+    {
-+      mp->next = min_mp->next;
-+      mp->prev = min_mp;
-+      min_mp->next = mp;
-+
-+      if (mp->next != NULL)
-+	mp->next->prev = mp;
-+      else
-+	minipool_vector_tail = mp;
-+    }
-+
-+  /* Save the new entry.  */
-+  min_mp = mp;
-+
-+  if (mp->prev)
-+    mp = mp->prev;
-+  else
-+    mp->offset = 0;
-+
-+  /* Scan over the following entries and adjust their offsets.  */
-+  while (mp->next != NULL)
-+    {
-+      if (mp->next->min_address < mp->min_address + mp->fix_size)
-+	mp->next->min_address = mp->min_address + mp->fix_size;
-+
-+      if (mp->refcount)
-+	mp->next->offset = mp->offset + mp->fix_size;
-+      else
-+	mp->next->offset = mp->offset;
-+
-+      mp = mp->next;
-+    }
-+
-+  return min_mp;
-+}
-+
-+
-+static void
-+assign_minipool_offsets (Mfix * barrier)
-+{
-+  HOST_WIDE_INT offset = 0;
-+  Mnode *mp;
-+
-+  minipool_barrier = barrier;
-+
-+  for (mp = minipool_vector_head; mp != NULL; mp = mp->next)
-+    {
-+      mp->offset = offset;
-+
-+      if (mp->refcount > 0)
-+	offset += mp->fix_size;
-+    }
-+}
-+
-+
-+/* Print a symbolic form of X to the debug file, F.  */
-+static void
-+avr32_print_value (FILE * f, rtx x)
-+{
-+  switch (GET_CODE (x))
-+    {
-+    case CONST_INT:
-+      fprintf (f, "0x%x", (int) INTVAL (x));
-+      return;
-+
-+    case CONST_DOUBLE:
-+      fprintf (f, "<0x%lx,0x%lx>", (long) XWINT (x, 2), (long) XWINT (x, 3));
-+      return;
-+
-+    case CONST_VECTOR:
-+      {
-+	int i;
-+
-+	fprintf (f, "<");
-+	for (i = 0; i < CONST_VECTOR_NUNITS (x); i++)
-+	  {
-+	    fprintf (f, "0x%x", (int) INTVAL (CONST_VECTOR_ELT (x, i)));
-+	    if (i < (CONST_VECTOR_NUNITS (x) - 1))
-+	      fputc (',', f);
-+	  }
-+	fprintf (f, ">");
-+      }
-+      return;
-+
-+    case CONST_STRING:
-+      fprintf (f, "\"%s\"", XSTR (x, 0));
-+      return;
-+
-+    case SYMBOL_REF:
-+      fprintf (f, "`%s'", XSTR (x, 0));
-+      return;
-+
-+    case LABEL_REF:
-+      fprintf (f, "L%d", INSN_UID (XEXP (x, 0)));
-+      return;
-+
-+    case CONST:
-+      avr32_print_value (f, XEXP (x, 0));
-+      return;
-+
-+    case PLUS:
-+      avr32_print_value (f, XEXP (x, 0));
-+      fprintf (f, "+");
-+      avr32_print_value (f, XEXP (x, 1));
-+      return;
-+
-+    case PC:
-+      fprintf (f, "pc");
-+      return;
-+
-+    default:
-+      fprintf (f, "????");
-+      return;
-+    }
-+}
-+
-+
-+int
-+is_minipool_label (rtx label)
-+{
-+  minipool_labels *cur_mp_label = cfun->machine->minipool_label_head;
-+
-+  if (GET_CODE (label) != CODE_LABEL)
-+    return FALSE;
-+
-+  while (cur_mp_label)
-+    {
-+      if (CODE_LABEL_NUMBER (label)
-+	  == CODE_LABEL_NUMBER (cur_mp_label->label))
-+	return TRUE;
-+      cur_mp_label = cur_mp_label->next;
-+    }
-+  return FALSE;
-+}
-+
-+
-+static void
-+new_minipool_label (rtx label)
-+{
-+  if (!cfun->machine->minipool_label_head)
-+    {
-+      cfun->machine->minipool_label_head =
-+	ggc_alloc (sizeof (minipool_labels));
-+      cfun->machine->minipool_label_tail = cfun->machine->minipool_label_head;
-+      cfun->machine->minipool_label_head->label = label;
-+      cfun->machine->minipool_label_head->next = 0;
-+      cfun->machine->minipool_label_head->prev = 0;
-+    }
-+  else
-+    {
-+      cfun->machine->minipool_label_tail->next =
-+	ggc_alloc (sizeof (minipool_labels));
-+      cfun->machine->minipool_label_tail->next->label = label;
-+      cfun->machine->minipool_label_tail->next->next = 0;
-+      cfun->machine->minipool_label_tail->next->prev =
-+	cfun->machine->minipool_label_tail;
-+      cfun->machine->minipool_label_tail =
-+	cfun->machine->minipool_label_tail->next;
-+    }
-+}
-+
-+
-+/* Output the literal table */
-+static void
-+dump_minipool (rtx scan)
-+{
-+  Mnode *mp;
-+  Mnode *nmp;
-+
-+  if (dump_file)
-+    fprintf (dump_file,
-+	     ";; Emitting minipool after insn %u; address %ld; align %d (bytes)\n",
-+	     INSN_UID (scan), (unsigned long) minipool_barrier->address, 4);
-+
-+  scan = emit_insn_after (gen_consttable_start (), scan);
-+  scan = emit_insn_after (gen_align_4 (), scan);
-+  scan = emit_label_after (minipool_vector_label, scan);
-+  new_minipool_label (minipool_vector_label);
-+
-+  for (mp = minipool_vector_head; mp != NULL; mp = nmp)
-+    {
-+      if (mp->refcount > 0)
-+	{
-+	  if (dump_file)
-+	    {
-+	      fprintf (dump_file,
-+		       ";;  Offset %u, min %ld, max %ld ",
-+		       (unsigned) mp->offset, (unsigned long) mp->min_address,
-+		       (unsigned long) mp->max_address);
-+	      avr32_print_value (dump_file, mp->value);
-+	      fputc ('\n', dump_file);
-+	    }
-+
-+	  switch (mp->fix_size)
-+	    {
-+#ifdef HAVE_consttable_4
-+	    case 4:
-+	      scan = emit_insn_after (gen_consttable_4 (mp->value), scan);
-+	      break;
-+
-+#endif
-+#ifdef HAVE_consttable_8
-+	    case 8:
-+	      scan = emit_insn_after (gen_consttable_8 (mp->value), scan);
-+	      break;
-+
-+#endif
-+#ifdef HAVE_consttable_16
-+            case 16:
-+              scan = emit_insn_after (gen_consttable_16 (mp->value), scan);
-+              break;
-+
-+#endif
-+            case 0:
-+              /* This can happen for force-minipool entries which just are
-+	         there to force the minipool to be generate. */
-+	      break;
-+	    default:
-+	      abort ();
-+	      break;
-+	    }
-+	}
-+
-+      nmp = mp->next;
-+      free (mp);
-+    }
-+
-+  minipool_vector_head = minipool_vector_tail = NULL;
-+  scan = emit_insn_after (gen_consttable_end (), scan);
-+  scan = emit_barrier_after (scan);
-+}
-+
-+
-+/* Return the cost of forcibly inserting a barrier after INSN.  */
-+static int
-+avr32_barrier_cost (rtx insn)
-+{
-+  /* Basing the location of the pool on the loop depth is preferable, but at
-+     the moment, the basic block information seems to be corrupt by this
-+     stage of the compilation.  */
-+  int base_cost = 50;
-+  rtx next = next_nonnote_insn (insn);
-+
-+  if (next != NULL && GET_CODE (next) == CODE_LABEL)
-+    base_cost -= 20;
-+
-+  switch (GET_CODE (insn))
-+    {
-+    case CODE_LABEL:
-+      /* It will always be better to place the table before the label, rather
-+         than after it.  */
-+      return 50;
-+
-+    case INSN:
-+    case CALL_INSN:
-+      return base_cost;
-+
-+    case JUMP_INSN:
-+      return base_cost - 10;
-+
-+    default:
-+      return base_cost + 10;
-+    }
-+}
-+
-+
-+/* Find the best place in the insn stream in the range
-+   (FIX->address,MAX_ADDRESS) to forcibly insert a minipool barrier.
-+   Create the barrier by inserting a jump and add a new fix entry for
-+   it.  */
-+static Mfix *
-+create_fix_barrier (Mfix * fix, HOST_WIDE_INT max_address)
-+{
-+  HOST_WIDE_INT count = 0;
-+  rtx barrier;
-+  rtx from = fix->insn;
-+  rtx selected = from;
-+  int selected_cost;
-+  HOST_WIDE_INT selected_address;
-+  Mfix *new_fix;
-+  HOST_WIDE_INT max_count = max_address - fix->address;
-+  rtx label = gen_label_rtx ();
-+
-+  selected_cost = avr32_barrier_cost (from);
-+  selected_address = fix->address;
-+
-+  while (from && count < max_count)
-+    {
-+      rtx tmp;
-+      int new_cost;
-+
-+      /* This code shouldn't have been called if there was a natural barrier
-+         within range.  */
-+      if (GET_CODE (from) == BARRIER)
-+	abort ();
-+
-+      /* Count the length of this insn.  */
-+      count += get_attr_length (from);
-+
-+      /* If there is a jump table, add its length.  */
-+      tmp = is_jump_table (from);
-+      if (tmp != NULL)
-+	{
-+	  count += get_jump_table_size (tmp);
-+
-+	  /* Jump tables aren't in a basic block, so base the cost on the
-+	     dispatch insn.  If we select this location, we will still put
-+	     the pool after the table.  */
-+	  new_cost = avr32_barrier_cost (from);
-+
-+	  if (count < max_count && new_cost <= selected_cost)
-+	    {
-+	      selected = tmp;
-+	      selected_cost = new_cost;
-+	      selected_address = fix->address + count;
-+	    }
-+
-+	  /* Continue after the dispatch table.  */
-+	  from = NEXT_INSN (tmp);
-+	  continue;
-+	}
-+
-+      new_cost = avr32_barrier_cost (from);
-+
-+      if (count < max_count && new_cost <= selected_cost)
-+	{
-+	  selected = from;
-+	  selected_cost = new_cost;
-+	  selected_address = fix->address + count;
-+	}
-+
-+      from = NEXT_INSN (from);
-+    }
-+
-+  /* Create a new JUMP_INSN that branches around a barrier.  */
-+  from = emit_jump_insn_after (gen_jump (label), selected);
-+  JUMP_LABEL (from) = label;
-+  barrier = emit_barrier_after (from);
-+  emit_label_after (label, barrier);
-+
-+  /* Create a minipool barrier entry for the new barrier.  */
-+  new_fix = (Mfix *) obstack_alloc (&minipool_obstack, sizeof (*new_fix));
-+  new_fix->insn = barrier;
-+  new_fix->address = selected_address;
-+  new_fix->next = fix->next;
-+  fix->next = new_fix;
-+
-+  return new_fix;
-+}
-+
-+
-+/* Record that there is a natural barrier in the insn stream at
-+   ADDRESS.  */
-+static void
-+push_minipool_barrier (rtx insn, HOST_WIDE_INT address)
-+{
-+  Mfix *fix = (Mfix *) obstack_alloc (&minipool_obstack, sizeof (*fix));
-+
-+  fix->insn = insn;
-+  fix->address = address;
-+
-+  fix->next = NULL;
-+  if (minipool_fix_head != NULL)
-+    minipool_fix_tail->next = fix;
-+  else
-+    minipool_fix_head = fix;
-+
-+  minipool_fix_tail = fix;
-+}
-+
-+
-+/* Record INSN, which will need fixing up to load a value from the
-+   minipool.  ADDRESS is the offset of the insn since the start of the
-+   function; LOC is a pointer to the part of the insn which requires
-+   fixing; VALUE is the constant that must be loaded, which is of type
-+   MODE.  */
-+static void
-+push_minipool_fix (rtx insn, HOST_WIDE_INT address, rtx * loc,
-+		   enum machine_mode mode, rtx value)
-+{
-+  Mfix *fix = (Mfix *) obstack_alloc (&minipool_obstack, sizeof (*fix));
-+  rtx body = PATTERN (insn);
-+
-+  fix->insn = insn;
-+  fix->address = address;
-+  fix->loc = loc;
-+  fix->mode = mode;
-+  fix->fix_size = MINIPOOL_FIX_SIZE (mode, value);
-+  fix->value = value;
-+
-+  if (GET_CODE (body) == PARALLEL)
-+    {
-+      /* Mcall : Ks16 << 2 */
-+      fix->forwards = ((1 << 15) - 1) << 2;
-+      fix->backwards = (1 << 15) << 2;
-+    }
-+  else if (GET_CODE (body) == SET
-+           && GET_MODE_SIZE (GET_MODE (SET_DEST (body))) == 4)
-+    {
-+          if (optimize_size)
-+            {
-+              /* Lddpc : Ku7 << 2 */
-+              fix->forwards = ((1 << 7) - 1) << 2;
-+              fix->backwards = 0;
-+            }
-+          else
-+            {
-+              /* Ld.w : Ks16 */
-+              fix->forwards = ((1 << 15) - 4);
-+              fix->backwards = (1 << 15);
-+            }
-+        }
-+  else if (GET_CODE (body) == SET
-+           && GET_MODE_SIZE (GET_MODE (SET_DEST (body))) == 8)
-+    {
-+          /* Ld.d : Ks16 */
-+          fix->forwards = ((1 << 15) - 4);
-+          fix->backwards = (1 << 15);
-+        }
-+  else if (GET_CODE (body) == UNSPEC_VOLATILE
-+           && XINT (body, 1) == VUNSPEC_MVRC)
-+    {
-+      /* Coprocessor load */
-+      /* Ldc : Ku8 << 2 */
-+      fix->forwards = ((1 << 8) - 1) << 2;
-+      fix->backwards = 0;
-+    }
-+  else
-+    {
-+      /* Assume worst case which is lddpc insn. */
-+      fix->forwards = ((1 << 7) - 1) << 2;
-+      fix->backwards = 0;
-+    }
-+
-+  fix->minipool = NULL;
-+
-+  /* If an insn doesn't have a range defined for it, then it isn't expecting
-+     to be reworked by this code.  Better to abort now than to generate duff
-+     assembly code.  */
-+  if (fix->forwards == 0 && fix->backwards == 0)
-+    abort ();
-+
-+  if (dump_file)
-+    {
-+      fprintf (dump_file,
-+	       ";; %smode fixup for i%d; addr %lu, range (%ld,%ld): ",
-+	       GET_MODE_NAME (mode),
-+	       INSN_UID (insn), (unsigned long) address,
-+	       -1 * (long) fix->backwards, (long) fix->forwards);
-+      avr32_print_value (dump_file, fix->value);
-+      fprintf (dump_file, "\n");
-+    }
-+
-+  /* Add it to the chain of fixes.  */
-+  fix->next = NULL;
-+
-+  if (minipool_fix_head != NULL)
-+    minipool_fix_tail->next = fix;
-+  else
-+    minipool_fix_head = fix;
-+
-+  minipool_fix_tail = fix;
-+}
-+
-+
-+/* Scan INSN and note any of its operands that need fixing.
-+   If DO_PUSHES is false we do not actually push any of the fixups
-+   needed.  The function returns TRUE is any fixups were needed/pushed.
-+   This is used by avr32_memory_load_p() which needs to know about loads
-+   of constants that will be converted into minipool loads.  */
-+static bool
-+note_invalid_constants (rtx insn, HOST_WIDE_INT address, int do_pushes)
-+{
-+  bool result = false;
-+  int opno;
-+
-+  extract_insn (insn);
-+
-+  if (!constrain_operands (1))
-+    fatal_insn_not_found (insn);
-+
-+  if (recog_data.n_alternatives == 0)
-+    return false;
-+
-+  /* Fill in recog_op_alt with information about the constraints of this
-+     insn.  */
-+  preprocess_constraints ();
-+
-+  for (opno = 0; opno < recog_data.n_operands; opno++)
-+    {
-+      rtx op;
-+
-+      /* Things we need to fix can only occur in inputs.  */
-+      if (recog_data.operand_type[opno] != OP_IN)
-+	continue;
-+
-+      op = recog_data.operand[opno];
-+
-+      if (avr32_const_pool_ref_operand (op, GET_MODE (op)))
-+	{
-+	  if (do_pushes)
-+	    {
-+	      rtx cop = avoid_constant_pool_reference (op);
-+
-+	      /* Casting the address of something to a mode narrower than a
-+	         word can cause avoid_constant_pool_reference() to return the
-+	         pool reference itself.  That's no good to us here.  Lets
-+	         just hope that we can use the constant pool value directly.
-+	       */
-+	      if (op == cop)
-+		cop = get_pool_constant (XEXP (op, 0));
-+
-+	      push_minipool_fix (insn, address,
-+				 recog_data.operand_loc[opno],
-+				 recog_data.operand_mode[opno], cop);
-+	    }
-+
-+	  result = true;
-+	}
-+      else if (TARGET_HAS_ASM_ADDR_PSEUDOS
-+	       && avr32_address_operand (op, GET_MODE (op)))
-+	{
-+	  /* Handle pseudo instructions using a direct address. These pseudo
-+	     instructions might need entries in the constant pool and we must
-+	     therefor create a constant pool for them, in case the
-+	     assembler/linker needs to insert entries. */
-+	  if (do_pushes)
-+	    {
-+	      /* Push a dummy constant pool entry so that the .cpool
-+	         directive should be inserted on the appropriate place in the
-+	         code even if there are no real constant pool entries. This
-+	         is used by the assembler and linker to know where to put
-+	         generated constant pool entries. */
-+	      push_minipool_fix (insn, address,
-+				 recog_data.operand_loc[opno],
-+				 recog_data.operand_mode[opno],
-+				 gen_rtx_UNSPEC (VOIDmode,
-+						 gen_rtvec (1, const0_rtx),
-+						 UNSPEC_FORCE_MINIPOOL));
-+	      result = true;
-+	    }
-+	}
-+    }
-+  return result;
-+}
-+
-+
-+static int
-+avr32_insn_is_cast (rtx insn)
-+{
-+
-+  if (NONJUMP_INSN_P (insn)
-+      && GET_CODE (PATTERN (insn)) == SET
-+      && (GET_CODE (SET_SRC (PATTERN (insn))) == ZERO_EXTEND
-+	  || GET_CODE (SET_SRC (PATTERN (insn))) == SIGN_EXTEND)
-+      && REG_P (XEXP (SET_SRC (PATTERN (insn)), 0))
-+      && REG_P (SET_DEST (PATTERN (insn))))
-+    return true;
-+  return false;
-+}
-+
-+
-+/* Replace all occurances of reg FROM with reg TO in X. */
-+rtx
-+avr32_replace_reg (rtx x, rtx from, rtx to)
-+{
-+  int i, j;
-+  const char *fmt;
-+
-+  gcc_assert ( REG_P (from) && REG_P (to) );
-+
-+  /* Allow this function to make replacements in EXPR_LISTs.  */
-+  if (x == 0)
-+    return 0;
-+
-+  if (rtx_equal_p (x, from))
-+    return to;
-+
-+  if (GET_CODE (x) == SUBREG)
-+    {
-+      rtx new = avr32_replace_reg (SUBREG_REG (x), from, to);
-+
-+      if (GET_CODE (new) == CONST_INT)
-+	{
-+	  x = simplify_subreg (GET_MODE (x), new,
-+			       GET_MODE (SUBREG_REG (x)),
-+			       SUBREG_BYTE (x));
-+	  gcc_assert (x);
-+	}
-+      else
-+	SUBREG_REG (x) = new;
-+
-+      return x;
-+    }
-+  else if (GET_CODE (x) == ZERO_EXTEND)
-+    {
-+      rtx new = avr32_replace_reg (XEXP (x, 0), from, to);
-+
-+      if (GET_CODE (new) == CONST_INT)
-+	{
-+	  x = simplify_unary_operation (ZERO_EXTEND, GET_MODE (x),
-+					new, GET_MODE (XEXP (x, 0)));
-+	  gcc_assert (x);
-+	}
-+      else
-+	XEXP (x, 0) = new;
-+
-+      return x;
-+    }
-+
-+  fmt = GET_RTX_FORMAT (GET_CODE (x));
-+  for (i = GET_RTX_LENGTH (GET_CODE (x)) - 1; i >= 0; i--)
-+    {
-+      if (fmt[i] == 'e')
-+	XEXP (x, i) = avr32_replace_reg (XEXP (x, i), from, to);
-+      else if (fmt[i] == 'E')
-+	for (j = XVECLEN (x, i) - 1; j >= 0; j--)
-+	  XVECEXP (x, i, j) = avr32_replace_reg (XVECEXP (x, i, j), from, to);
-+    }
-+
-+  return x;
-+}
-+
-+
-+/* FIXME: The level of nesting in this function is way too deep. It needs to be
-+   torn apart.  */
-+static void
-+avr32_reorg_optimization (void)
-+{
-+  rtx first = get_first_nonnote_insn ();
-+  rtx insn;
-+
-+  if (TARGET_MD_REORG_OPTIMIZATION && (optimize_size || (optimize > 0)))
-+    {
-+
-+      /* Scan through all insns looking for cast operations. */
-+      if (dump_file)
-+	{
-+	  fprintf (dump_file, ";; Deleting redundant cast operations:\n");
-+	}
-+      for (insn = first; insn; insn = NEXT_INSN (insn))
-+	{
-+	  rtx reg, src_reg, scan;
-+	  enum machine_mode mode;
-+	  int unused_cast;
-+	  rtx label_ref;
-+
-+	  if (avr32_insn_is_cast (insn)
-+	      && (GET_MODE (XEXP (SET_SRC (PATTERN (insn)), 0)) == QImode
-+		  || GET_MODE (XEXP (SET_SRC (PATTERN (insn)), 0)) == HImode))
-+	    {
-+	      mode = GET_MODE (XEXP (SET_SRC (PATTERN (insn)), 0));
-+	      reg = SET_DEST (PATTERN (insn));
-+	      src_reg = XEXP (SET_SRC (PATTERN (insn)), 0);
-+	    }
-+	  else
-+	    {
-+	      continue;
-+	    }
-+
-+	  unused_cast = false;
-+	  label_ref = NULL_RTX;
-+	  for (scan = NEXT_INSN (insn); scan; scan = NEXT_INSN (scan))
-+	    {
-+	      /* Check if we have reached the destination of a simple
-+	         conditional jump which we have already scanned past. If so,
-+	         we can safely continue scanning. */
-+	      if (LABEL_P (scan) && label_ref != NULL_RTX)
-+		{
-+		  if (CODE_LABEL_NUMBER (scan) ==
-+		      CODE_LABEL_NUMBER (XEXP (label_ref, 0)))
-+		    label_ref = NULL_RTX;
-+		  else
-+		    break;
-+		}
-+
-+	      if (!INSN_P (scan))
-+		continue;
-+
-+	      /* For conditional jumps we can manage to keep on scanning if
-+	         we meet the destination label later on before any new jump
-+	         insns occure. */
-+	      if (GET_CODE (scan) == JUMP_INSN)
-+		{
-+		  if (any_condjump_p (scan) && label_ref == NULL_RTX)
-+		    label_ref = condjump_label (scan);
-+		  else
-+		    break;
-+		}
-+
-+              /* Check if we have a call and the register is used as an argument. */
-+              if (CALL_P (scan)
-+                  && find_reg_fusage (scan, USE, reg) )
-+                break;
-+
-+	      if (!reg_mentioned_p (reg, PATTERN (scan)))
-+		continue;
-+
-+	      /* Check if casted register is used in this insn */
-+	      if ((regno_use_in (REGNO (reg), PATTERN (scan)) != NULL_RTX)
-+		  && (GET_MODE (regno_use_in (REGNO (reg), PATTERN (scan))) ==
-+		      GET_MODE (reg)))
-+		{
-+		  /* If not used in the source to the set or in a memory
-+		     expression in the destiantion then the register is used
-+		     as a destination and is really dead. */
-+		  if (single_set (scan)
-+		      && GET_CODE (PATTERN (scan)) == SET
-+		      && REG_P (SET_DEST (PATTERN (scan)))
-+		      && !regno_use_in (REGNO (reg), SET_SRC (PATTERN (scan)))
-+		      && label_ref == NULL_RTX)
-+		    {
-+		      unused_cast = true;
-+		    }
-+		  break;
-+		}
-+
-+	      /* Check if register is dead or set in this insn */
-+	      if (dead_or_set_p (scan, reg))
-+		{
-+		  unused_cast = true;
-+		  break;
-+		}
-+	    }
-+
-+	  /* Check if we have unresolved conditional jumps */
-+	  if (label_ref != NULL_RTX)
-+	    continue;
-+
-+	  if (unused_cast)
-+	    {
-+	      if (REGNO (reg) == REGNO (XEXP (SET_SRC (PATTERN (insn)), 0)))
-+		{
-+		  /* One operand cast, safe to delete */
-+		  if (dump_file)
-+		    {
-+		      fprintf (dump_file,
-+			       ";;  INSN %i removed, casted register %i value not used.\n",
-+			       INSN_UID (insn), REGNO (reg));
-+		    }
-+		  SET_INSN_DELETED (insn);
-+		  /* Force the instruction to be recognized again */
-+		  INSN_CODE (insn) = -1;
-+		}
-+	      else
-+		{
-+		  /* Two operand cast, which really could be substituted with
-+		     a move, if the source register is dead after the cast
-+		     insn and then the insn which sets the source register
-+		     could instead directly set the destination register for
-+		     the cast. As long as there are no insns in between which
-+		     uses the register. */
-+		  rtx link = NULL_RTX;
-+		  rtx set;
-+		  rtx src_reg = XEXP (SET_SRC (PATTERN (insn)), 0);
-+		  unused_cast = false;
-+
-+		  if (!find_reg_note (insn, REG_DEAD, src_reg))
-+		    continue;
-+
-+		  /* Search for the insn which sets the source register */
-+                  for (scan = PREV_INSN (insn);
-+                       scan && GET_CODE (scan) != CODE_LABEL;
-+                       scan = PREV_INSN (scan))
-+                    {
-+                      if (! INSN_P (scan))
-+                        continue;
-+
-+		      set = single_set (scan);
-+                      // Fix for bug #11763 : the following if condition
-+                      // has been modified and else part is included to 
-+                      // set the link to NULL_RTX. 
-+                      // if (set && rtx_equal_p (src_reg, SET_DEST (set)))
-+                      if (set && (REGNO(src_reg) == REGNO(SET_DEST(set))))
-+                       {
-+                         if (rtx_equal_p (src_reg, SET_DEST (set)))
-+			  {
-+			    link = scan;
-+			    break;
-+                          }
-+                         else
-+                          {
-+                            link = NULL_RTX;
-+                            break;
-+                          }
-+                       }
-+                    }
-+
-+
-+		  /* Found no link or link is a call insn where we can not
-+		     change the destination register */
-+		  if (link == NULL_RTX || CALL_P (link))
-+		    continue;
-+
-+		  /* Scan through all insn between link and insn */
-+		  for (scan = NEXT_INSN (link); scan; scan = NEXT_INSN (scan))
-+		    {
-+		      /* Don't try to trace forward past a CODE_LABEL if we
-+		         haven't seen INSN yet.  Ordinarily, we will only
-+		         find the setting insn in LOG_LINKS if it is in the
-+		         same basic block.  However, cross-jumping can insert
-+		         code labels in between the load and the call, and
-+		         can result in situations where a single call insn
-+		         may have two targets depending on where we came
-+		         from.  */
-+
-+		      if (GET_CODE (scan) == CODE_LABEL)
-+			break;
-+
-+		      if (!INSN_P (scan))
-+			continue;
-+
-+		      /* Don't try to trace forward past a JUMP.  To optimize
-+		         safely, we would have to check that all the
-+		         instructions at the jump destination did not use REG.
-+		       */
-+
-+		      if (GET_CODE (scan) == JUMP_INSN)
-+			{
-+			  break;
-+			}
-+
-+		      if (!reg_mentioned_p (src_reg, PATTERN (scan)))
-+			continue;
-+
-+		      /* We have reached the cast insn */
-+		      if (scan == insn)
-+			{
-+			  /* We can remove cast and replace the destination
-+			     register of the link insn with the destination
-+			     of the cast */
-+			  if (dump_file)
-+			    {
-+			      fprintf (dump_file,
-+				       ";;  INSN %i removed, casted value unused. "
-+				       "Destination of removed cast operation: register %i,  folded into INSN %i.\n",
-+				       INSN_UID (insn), REGNO (reg),
-+				       INSN_UID (link));
-+			    }
-+			  /* Update link insn */
-+			  SET_DEST (PATTERN (link)) =
-+			    gen_rtx_REG (mode, REGNO (reg));
-+			  /* Force the instruction to be recognized again */
-+			  INSN_CODE (link) = -1;
-+
-+			  /* Delete insn */
-+			  SET_INSN_DELETED (insn);
-+			  /* Force the instruction to be recognized again */
-+			  INSN_CODE (insn) = -1;
-+			  break;
-+			}
-+		    }
-+		}
-+	    }
-+	}
-+    }
-+
-+  /* Disabled this optimization since it has a bug */
-+  /* In the case where the data instruction the shifted insn gets folded
-+   * into is a branch destination, this breaks, i.e.
-+   *
-+   *    add r8, r10, r8 << 2
-+   * 1:
-+   *    ld.w r11, r8[0]
-+   *    ...
-+   *    mov r8, sp
-+   *    rjmp 1b
-+   *
-+   * gets folded to:
-+   *
-+   * 1:
-+   *    ld.w r11, r10[r8 << 2]
-+   *    ...
-+   *    mov r8, sp
-+   *    rjmp 1b
-+   *
-+   * which is clearly wrong..
-+   */
-+  if (0 && TARGET_MD_REORG_OPTIMIZATION && (optimize_size || (optimize > 0)))
-+    {
-+
-+      /* Scan through all insns looking for shifted add operations */
-+      if (dump_file)
-+	{
-+	  fprintf (dump_file,
-+		   ";; Deleting redundant shifted add operations:\n");
-+	}
-+      for (insn = first; insn; insn = NEXT_INSN (insn))
-+	{
-+	  rtx reg, mem_expr, scan, op0, op1;
-+	  int add_only_used_as_pointer;
-+
-+	  if (INSN_P (insn)
-+	      && GET_CODE (PATTERN (insn)) == SET
-+	      && GET_CODE (SET_SRC (PATTERN (insn))) == PLUS
-+	      && (GET_CODE (XEXP (SET_SRC (PATTERN (insn)), 0)) == MULT
-+		  || GET_CODE (XEXP (SET_SRC (PATTERN (insn)), 0)) == ASHIFT)
-+	      && GET_CODE (XEXP (XEXP (SET_SRC (PATTERN (insn)), 0), 1)) ==
-+	      CONST_INT && REG_P (SET_DEST (PATTERN (insn)))
-+	      && REG_P (XEXP (SET_SRC (PATTERN (insn)), 1))
-+	      && REG_P (XEXP (XEXP (SET_SRC (PATTERN (insn)), 0), 0)))
-+	    {
-+	      reg = SET_DEST (PATTERN (insn));
-+	      mem_expr = SET_SRC (PATTERN (insn));
-+	      op0 = XEXP (XEXP (mem_expr, 0), 0);
-+	      op1 = XEXP (mem_expr, 1);
-+	    }
-+	  else
-+	    {
-+	      continue;
-+	    }
-+
-+	  /* Scan forward the check if the result of the shifted add
-+	     operation is only used as an address in memory operations and
-+	     that the operands to the shifted add are not clobbered. */
-+	  add_only_used_as_pointer = false;
-+	  for (scan = NEXT_INSN (insn); scan; scan = NEXT_INSN (scan))
-+	    {
-+	      if (!INSN_P (scan))
-+		continue;
-+
-+	      /* Don't try to trace forward past a JUMP or CALL.  To optimize
-+	         safely, we would have to check that all the instructions at
-+	         the jump destination did not use REG.  */
-+
-+	      if (GET_CODE (scan) == JUMP_INSN)
-+		{
-+		  break;
-+		}
-+
-+	      /* If used in a call insn then we cannot optimize it away */
-+	      if (CALL_P (scan) && find_regno_fusage (scan, USE, REGNO (reg)))
-+		break;
-+
-+	      /* If any of the operands of the shifted add are clobbered we
-+	         cannot optimize the shifted adda away */
-+	      if ((reg_set_p (op0, scan) && (REGNO (op0) != REGNO (reg)))
-+		  || (reg_set_p (op1, scan) && (REGNO (op1) != REGNO (reg))))
-+		break;
-+
-+	      if (!reg_mentioned_p (reg, PATTERN (scan)))
-+		continue;
-+
-+	      /* If used any other place than as a pointer or as the
-+	         destination register we failed */
-+              if (!(single_set (scan)
-+                    && GET_CODE (PATTERN (scan)) == SET
-+                    && ((MEM_P (SET_DEST (PATTERN (scan)))
-+                         && REG_P (XEXP (SET_DEST (PATTERN (scan)), 0))
-+                         && REGNO (XEXP (SET_DEST (PATTERN (scan)), 0)) == REGNO (reg))
-+                        || (MEM_P (SET_SRC (PATTERN (scan)))
-+                            && REG_P (XEXP (SET_SRC (PATTERN (scan)), 0))
-+                            && REGNO (XEXP
-+                                      (SET_SRC (PATTERN (scan)), 0)) == REGNO (reg))))
-+                  && !(GET_CODE (PATTERN (scan)) == SET
-+                       && REG_P (SET_DEST (PATTERN (scan)))
-+                       && !regno_use_in (REGNO (reg),
-+                                         SET_SRC (PATTERN (scan)))))
-+                break;
-+
-+              /* We cannot replace the pointer in TImode insns
-+                 as these has a differene addressing mode than the other
-+                 memory insns. */
-+              if ( GET_MODE (SET_DEST (PATTERN (scan))) == TImode )
-+                break;
-+
-+	      /* Check if register is dead or set in this insn */
-+	      if (dead_or_set_p (scan, reg))
-+		{
-+		  add_only_used_as_pointer = true;
-+		  break;
-+		}
-+	    }
-+
-+	  if (add_only_used_as_pointer)
-+	    {
-+	      /* Lets delete the add insn and replace all memory references
-+	         which uses the pointer with the full expression. */
-+	      if (dump_file)
-+		{
-+		  fprintf (dump_file,
-+			   ";; Deleting INSN %i since address expression can be folded into all "
-+			   "memory references using this expression\n",
-+			   INSN_UID (insn));
-+		}
-+	      SET_INSN_DELETED (insn);
-+	      /* Force the instruction to be recognized again */
-+	      INSN_CODE (insn) = -1;
-+
-+	      for (scan = NEXT_INSN (insn); scan; scan = NEXT_INSN (scan))
-+		{
-+		  if (!INSN_P (scan))
-+		    continue;
-+
-+		  if (!reg_mentioned_p (reg, PATTERN (scan)))
-+		    continue;
-+
-+		  /* If used any other place than as a pointer or as the
-+		     destination register we failed */
-+		  if ((single_set (scan)
-+		       && GET_CODE (PATTERN (scan)) == SET
-+		       && ((MEM_P (SET_DEST (PATTERN (scan)))
-+			    && REG_P (XEXP (SET_DEST (PATTERN (scan)), 0))
-+			    && REGNO (XEXP (SET_DEST (PATTERN (scan)), 0)) ==
-+			    REGNO (reg)) || (MEM_P (SET_SRC (PATTERN (scan)))
-+					     &&
-+					     REG_P (XEXP
-+						    (SET_SRC (PATTERN (scan)),
-+						     0))
-+					     &&
-+					     REGNO (XEXP
-+						    (SET_SRC (PATTERN (scan)),
-+						     0)) == REGNO (reg)))))
-+		    {
-+		      if (dump_file)
-+			{
-+			  fprintf (dump_file,
-+				   ";; Register %i replaced by indexed address in INSN %i\n",
-+				   REGNO (reg), INSN_UID (scan));
-+			}
-+		      if (MEM_P (SET_DEST (PATTERN (scan))))
-+			XEXP (SET_DEST (PATTERN (scan)), 0) = mem_expr;
-+		      else
-+			XEXP (SET_SRC (PATTERN (scan)), 0) = mem_expr;
-+		    }
-+
-+		  /* Check if register is dead or set in this insn */
-+		  if (dead_or_set_p (scan, reg))
-+		    {
-+		      break;
-+		    }
-+
-+		}
-+	    }
-+	}
-+    }
-+
-+
-+  if (TARGET_MD_REORG_OPTIMIZATION && (optimize_size || (optimize > 0)))
-+    {
-+
-+      /* Scan through all insns looking for conditional register to
-+         register move operations */
-+      if (dump_file)
-+	{
-+	  fprintf (dump_file,
-+		   ";; Folding redundant conditional move operations:\n");
-+	}
-+      for (insn = first; insn; insn = next_nonnote_insn (insn))
-+	{
-+	  rtx src_reg, dst_reg, scan, test;
-+
-+	  if (INSN_P (insn)
-+              && GET_CODE (PATTERN (insn)) == COND_EXEC
-+	      && GET_CODE (COND_EXEC_CODE (PATTERN (insn))) == SET
-+	      && REG_P (SET_SRC (COND_EXEC_CODE (PATTERN (insn))))
-+	      && REG_P (SET_DEST (COND_EXEC_CODE (PATTERN (insn))))
-+              && find_reg_note (insn, REG_DEAD, SET_SRC (COND_EXEC_CODE (PATTERN (insn)))))
-+	    {
-+	      src_reg = SET_SRC (COND_EXEC_CODE (PATTERN (insn)));
-+	      dst_reg = SET_DEST (COND_EXEC_CODE (PATTERN (insn)));
-+              test = COND_EXEC_TEST (PATTERN (insn));
-+	    }
-+	  else
-+	    {
-+	      continue;
-+	    }
-+
-+          /* Scan backward through the rest of insns in this if-then or if-else
-+             block and check if we can fold the move into another of the conditional
-+             insns in the same block. */
-+          scan = prev_nonnote_insn (insn);
-+          while (INSN_P (scan)
-+                 && GET_CODE (PATTERN (scan)) == COND_EXEC
-+                 && rtx_equal_p (COND_EXEC_TEST (PATTERN (scan)), test))
-+            {
-+              rtx pattern = COND_EXEC_CODE (PATTERN (scan));
-+              if ( GET_CODE (pattern) == PARALLEL )
-+                pattern = XVECEXP (pattern, 0, 0);
-+
-+              if ( reg_set_p (src_reg, pattern) )
-+                {
-+                  /* Fold in the destination register for the cond. move
-+                     into this insn. */
-+                  SET_DEST (pattern) = dst_reg;
-+                  if (dump_file)
-+                    {
-+                      fprintf (dump_file,
-+                               ";; Deleting INSN %i since this operation can be folded into INSN %i\n",
-+                               INSN_UID (insn), INSN_UID (scan));
-+                    }
-+
-+                  /* Scan and check if any of the insns in between uses the src_reg. We
-+                     must then replace it with the dst_reg. */
-+                  while ( (scan = next_nonnote_insn (scan)) != insn ){
-+                    avr32_replace_reg (scan, src_reg, dst_reg);
-+                  }
-+                  /* Delete the insn. */
-+                  SET_INSN_DELETED (insn);
-+
-+                  /* Force the instruction to be recognized again */
-+                  INSN_CODE (insn) = -1;
-+                  break;
-+                }
-+
-+              /* If the destination register is used but not set in this insn
-+                 we cannot fold. */
-+              if ( reg_mentioned_p (dst_reg, pattern) )
-+                break;
-+
-+              scan = prev_nonnote_insn (scan);
-+            }
-+        }
-+    }
-+
-+}
-+
-+
-+/* Exported to toplev.c.
-+
-+   Do a final pass over the function, just before delayed branch
-+   scheduling.  */
-+static void
-+avr32_reorg (void)
-+{
-+  rtx insn;
-+  HOST_WIDE_INT address = 0;
-+  Mfix *fix;
-+
-+  minipool_fix_head = minipool_fix_tail = NULL;
-+
-+  /* The first insn must always be a note, or the code below won't scan it
-+     properly.  */
-+  insn = get_insns ();
-+  if (GET_CODE (insn) != NOTE)
-+    abort ();
-+
-+  /* Scan all the insns and record the operands that will need fixing.  */
-+  for (insn = next_nonnote_insn (insn); insn; insn = next_nonnote_insn (insn))
-+    {
-+      if (GET_CODE (insn) == BARRIER)
-+	push_minipool_barrier (insn, address);
-+      else if (INSN_P (insn))
-+	{
-+	  rtx table;
-+
-+	  note_invalid_constants (insn, address, true);
-+	  address += get_attr_length (insn);
-+
-+	  /* If the insn is a vector jump, add the size of the table and skip
-+	     the table.  */
-+	  if ((table = is_jump_table (insn)) != NULL)
-+	    {
-+	      address += get_jump_table_size (table);
-+	      insn = table;
-+	    }
-+	}
-+    }
-+
-+  fix = minipool_fix_head;
-+
-+  /* Now scan the fixups and perform the required changes.  */
-+  while (fix)
-+    {
-+      Mfix *ftmp;
-+      Mfix *fdel;
-+      Mfix *last_added_fix;
-+      Mfix *last_barrier = NULL;
-+      Mfix *this_fix;
-+
-+      /* Skip any further barriers before the next fix.  */
-+      while (fix && GET_CODE (fix->insn) == BARRIER)
-+	fix = fix->next;
-+
-+      /* No more fixes.  */
-+      if (fix == NULL)
-+	break;
-+
-+      last_added_fix = NULL;
-+
-+      for (ftmp = fix; ftmp; ftmp = ftmp->next)
-+	{
-+	  if (GET_CODE (ftmp->insn) == BARRIER)
-+	    {
-+	      if (ftmp->address >= minipool_vector_head->max_address)
-+		break;
-+
-+	      last_barrier = ftmp;
-+	    }
-+	  else if ((ftmp->minipool = add_minipool_forward_ref (ftmp)) == NULL)
-+	    break;
-+
-+	  last_added_fix = ftmp;	/* Keep track of the last fix added.
-+					 */
-+	}
-+
-+      /* If we found a barrier, drop back to that; any fixes that we could
-+         have reached but come after the barrier will now go in the next
-+         mini-pool.  */
-+      if (last_barrier != NULL)
-+	{
-+	  /* Reduce the refcount for those fixes that won't go into this pool
-+	     after all.  */
-+	  for (fdel = last_barrier->next;
-+	       fdel && fdel != ftmp; fdel = fdel->next)
-+	    {
-+	      fdel->minipool->refcount--;
-+	      fdel->minipool = NULL;
-+	    }
-+
-+	  ftmp = last_barrier;
-+	}
-+      else
-+	{
-+	  /* ftmp is first fix that we can't fit into this pool and there no
-+	     natural barriers that we could use.  Insert a new barrier in the
-+	     code somewhere between the previous fix and this one, and
-+	     arrange to jump around it.  */
-+	  HOST_WIDE_INT max_address;
-+
-+	  /* The last item on the list of fixes must be a barrier, so we can
-+	     never run off the end of the list of fixes without last_barrier
-+	     being set.  */
-+	  if (ftmp == NULL)
-+	    abort ();
-+
-+	  max_address = minipool_vector_head->max_address;
-+	  /* Check that there isn't another fix that is in range that we
-+	     couldn't fit into this pool because the pool was already too
-+	     large: we need to put the pool before such an instruction.  */
-+	  if (ftmp->address < max_address)
-+	    max_address = ftmp->address;
-+
-+	  last_barrier = create_fix_barrier (last_added_fix, max_address);
-+	}
-+
-+      assign_minipool_offsets (last_barrier);
-+
-+      while (ftmp)
-+	{
-+	  if (GET_CODE (ftmp->insn) != BARRIER
-+	      && ((ftmp->minipool = add_minipool_backward_ref (ftmp))
-+		  == NULL))
-+	    break;
-+
-+	  ftmp = ftmp->next;
-+	}
-+
-+      /* Scan over the fixes we have identified for this pool, fixing them up
-+         and adding the constants to the pool itself.  */
-+        for (this_fix = fix; this_fix && ftmp != this_fix;
-+             this_fix = this_fix->next)
-+          if (GET_CODE (this_fix->insn) != BARRIER
-+              /* Do nothing for entries present just to force the insertion of
-+	       a minipool. */
-+	    && !IS_FORCE_MINIPOOL (this_fix->value))
-+	  {
-+	    rtx addr = plus_constant (gen_rtx_LABEL_REF (VOIDmode,
-+							 minipool_vector_label),
-+				      this_fix->minipool->offset);
-+	    *this_fix->loc = gen_rtx_MEM (this_fix->mode, addr);
-+	  }
-+
-+      dump_minipool (last_barrier->insn);
-+      fix = ftmp;
-+    }
-+
-+  /* Free the minipool memory.  */
-+  obstack_free (&minipool_obstack, minipool_startobj);
-+
-+  avr32_reorg_optimization ();
-+}
-+
-+
-+/* Hook for doing some final scanning of instructions. Does nothing yet...*/
-+void
-+avr32_final_prescan_insn (rtx insn ATTRIBUTE_UNUSED,
-+			  rtx * opvec ATTRIBUTE_UNUSED,
-+			  int noperands ATTRIBUTE_UNUSED)
-+{
-+  return;
-+}
-+
-+
-+/* Function for changing the condition on the next instruction,
-+   should be used when emmiting compare instructions and
-+   the condition of the next instruction needs to change.
-+*/
-+int
-+set_next_insn_cond (rtx cur_insn, rtx new_cond)
-+{
-+  rtx next_insn = next_nonnote_insn (cur_insn);
-+   if ((next_insn != NULL_RTX)
-+       && (INSN_P (next_insn)))
-+     {
-+       if ((GET_CODE (PATTERN (next_insn)) == SET)
-+           && (GET_CODE (SET_SRC (PATTERN (next_insn))) == IF_THEN_ELSE))
-+         {
-+           /* Branch instructions */
-+           XEXP (SET_SRC (PATTERN (next_insn)), 0) = new_cond;
-+           /* Force the instruction to be recognized again */
-+           INSN_CODE (next_insn) = -1;
-+           return TRUE;
-+         }
-+       else if ((GET_CODE (PATTERN (next_insn)) == SET)
-+                && avr32_comparison_operator (SET_SRC (PATTERN (next_insn)),
-+                                              GET_MODE (SET_SRC (PATTERN (next_insn)))))
-+         {
-+           /* scc with no compare */
-+           SET_SRC (PATTERN (next_insn)) = new_cond;
-+           /* Force the instruction to be recognized again */
-+           INSN_CODE (next_insn) = -1;
-+           return TRUE;
-+         }
-+       else if (GET_CODE (PATTERN (next_insn)) == COND_EXEC)
-+         {
-+           if ( GET_CODE (new_cond) == UNSPEC )
-+             {
-+               COND_EXEC_TEST (PATTERN (next_insn)) =
-+                 gen_rtx_UNSPEC (CCmode,
-+                                 gen_rtvec (2,
-+                                            XEXP (COND_EXEC_TEST (PATTERN (next_insn)), 0),
-+                                            XEXP (COND_EXEC_TEST (PATTERN (next_insn)), 1)),
-+                                 XINT (new_cond, 1));
-+             }
-+           else
-+             {
-+               PUT_CODE(COND_EXEC_TEST (PATTERN (next_insn)), GET_CODE(new_cond));
-+             }
-+         }
-+     }
-+
-+  return FALSE;
-+}
-+
-+
-+/* Function for obtaining the condition for the next instruction after cur_insn.
-+*/
-+rtx
-+get_next_insn_cond (rtx cur_insn)
-+{
-+  rtx next_insn = next_nonnote_insn (cur_insn);
-+  rtx cond = NULL_RTX;
-+  if (next_insn != NULL_RTX
-+      && INSN_P (next_insn))
-+    {
-+      if ((GET_CODE (PATTERN (next_insn)) == SET)
-+          && (GET_CODE (SET_SRC (PATTERN (next_insn))) == IF_THEN_ELSE))
-+        {
-+          /* Branch and cond if then else instructions */
-+          cond = XEXP (SET_SRC (PATTERN (next_insn)), 0);
-+        }
-+      else if ((GET_CODE (PATTERN (next_insn)) == SET)
-+               && avr32_comparison_operator (SET_SRC (PATTERN (next_insn)),
-+                                             GET_MODE (SET_SRC (PATTERN (next_insn)))))
-+        {
-+          /* scc with no compare */
-+          cond = SET_SRC (PATTERN (next_insn));
-+        }
-+      else if (GET_CODE (PATTERN (next_insn)) == COND_EXEC)
-+        {
-+          cond = COND_EXEC_TEST (PATTERN (next_insn));
-+        }
-+    }
-+  return cond;
-+}
-+
-+
-+/* Check if the next insn is a conditional insn that will emit a compare
-+   for itself.
-+*/
-+rtx
-+next_insn_emits_cmp (rtx cur_insn)
-+{
-+  rtx next_insn = next_nonnote_insn (cur_insn);
-+  rtx cond = NULL_RTX;
-+  if (next_insn != NULL_RTX
-+      && INSN_P (next_insn))
-+    {
-+      if ( ((GET_CODE (PATTERN (next_insn)) == SET)
-+            && (GET_CODE (SET_SRC (PATTERN (next_insn))) == IF_THEN_ELSE)
-+            && (XEXP (XEXP (SET_SRC (PATTERN (next_insn)), 0),0) != cc0_rtx))
-+           || GET_CODE (PATTERN (next_insn)) == COND_EXEC )
-+        return TRUE;
-+    }
-+  return FALSE;
-+}
-+
-+
-+rtx
-+avr32_output_cmp (rtx cond, enum machine_mode mode, rtx op0, rtx op1)
-+{
-+
-+  rtx new_cond = NULL_RTX;
-+  rtx ops[2];
-+  rtx compare_pattern;
-+  ops[0] = op0;
-+  ops[1] = op1;
-+
-+  if ( GET_CODE (op0) == AND )
-+    compare_pattern = op0;
-+  else
-+    compare_pattern = gen_rtx_COMPARE (mode, op0, op1);
-+
-+  new_cond = is_compare_redundant (compare_pattern, cond);
-+
-+  if (new_cond != NULL_RTX)
-+    return new_cond;
-+
-+  /* Check if we are inserting a bit-load instead of a compare. */
-+  if ( GET_CODE (op0) == AND )
-+    {
-+      ops[0] = XEXP (op0, 0);
-+      ops[1] = XEXP (op0, 1);
-+      output_asm_insn ("bld\t%0, %p1", ops);
-+      return cond;
-+    }
-+
-+  /* Insert compare */
-+  switch (mode)
-+    {
-+    case QImode:
-+      output_asm_insn ("cp.b\t%0, %1", ops);
-+      break;
-+    case HImode:
-+      output_asm_insn ("cp.h\t%0, %1", ops);
-+      break;
-+    case SImode:
-+      output_asm_insn ("cp.w\t%0, %1", ops);
-+      break;
-+    case DImode:
-+      if (GET_CODE (op1) != REG)
-+	output_asm_insn ("cp.w\t%0, %1\ncpc\t%m0", ops);
-+      else
-+	output_asm_insn ("cp.w\t%0, %1\ncpc\t%m0, %m1", ops);
-+      break;
-+    default:
-+      internal_error ("Unknown comparison mode");
-+      break;
-+    }
-+
-+  return cond;
-+}
-+
-+
-+int
-+avr32_load_multiple_operation (rtx op,
-+			       enum machine_mode mode ATTRIBUTE_UNUSED)
-+{
-+  int count = XVECLEN (op, 0);
-+  unsigned int dest_regno;
-+  rtx src_addr;
-+  rtx elt;
-+  int i = 1, base = 0;
-+
-+  if (count <= 1 || GET_CODE (XVECEXP (op, 0, 0)) != SET)
-+    return 0;
-+
-+  /* Check to see if this might be a write-back.  */
-+  if (GET_CODE (SET_SRC (elt = XVECEXP (op, 0, 0))) == PLUS)
-+    {
-+      i++;
-+      base = 1;
-+
-+      /* Now check it more carefully.  */
-+      if (GET_CODE (SET_DEST (elt)) != REG
-+	  || GET_CODE (XEXP (SET_SRC (elt), 0)) != REG
-+	  || GET_CODE (XEXP (SET_SRC (elt), 1)) != CONST_INT
-+	  || INTVAL (XEXP (SET_SRC (elt), 1)) != (count - 1) * 4)
-+	return 0;
-+    }
-+
-+  /* Perform a quick check so we don't blow up below.  */
-+  if (count <= 1
-+      || GET_CODE (XVECEXP (op, 0, i - 1)) != SET
-+      || GET_CODE (SET_DEST (XVECEXP (op, 0, i - 1))) != REG
-+      || GET_CODE (SET_SRC (XVECEXP (op, 0, i - 1))) != UNSPEC)
-+    return 0;
-+
-+  dest_regno = REGNO (SET_DEST (XVECEXP (op, 0, i - 1)));
-+  src_addr = XEXP (SET_SRC (XVECEXP (op, 0, i - 1)), 0);
-+
-+  for (; i < count; i++)
-+    {
-+      elt = XVECEXP (op, 0, i);
-+
-+      if (GET_CODE (elt) != SET
-+	  || GET_CODE (SET_DEST (elt)) != REG
-+	  || GET_MODE (SET_DEST (elt)) != SImode
-+	  || GET_CODE (SET_SRC (elt)) != UNSPEC)
-+	return 0;
-+    }
-+
-+  return 1;
-+}
-+
-+
-+int
-+avr32_store_multiple_operation (rtx op,
-+				enum machine_mode mode ATTRIBUTE_UNUSED)
-+{
-+  int count = XVECLEN (op, 0);
-+  int src_regno;
-+  rtx dest_addr;
-+  rtx elt;
-+  int i = 1;
-+
-+  if (count <= 1 || GET_CODE (XVECEXP (op, 0, 0)) != SET)
-+    return 0;
-+
-+  /* Perform a quick check so we don't blow up below.  */
-+  if (count <= i
-+      || GET_CODE (XVECEXP (op, 0, i - 1)) != SET
-+      || GET_CODE (SET_DEST (XVECEXP (op, 0, i - 1))) != MEM
-+      || GET_CODE (SET_SRC (XVECEXP (op, 0, i - 1))) != UNSPEC)
-+    return 0;
-+
-+  src_regno = REGNO (SET_SRC (XVECEXP (op, 0, i - 1)));
-+  dest_addr = XEXP (SET_DEST (XVECEXP (op, 0, i - 1)), 0);
-+
-+  for (; i < count; i++)
-+    {
-+      elt = XVECEXP (op, 0, i);
-+
-+      if (GET_CODE (elt) != SET
-+	  || GET_CODE (SET_DEST (elt)) != MEM
-+	  || GET_MODE (SET_DEST (elt)) != SImode
-+	  || GET_CODE (SET_SRC (elt)) != UNSPEC)
-+	return 0;
-+    }
-+
-+  return 1;
-+}
-+
-+
-+int
-+avr32_valid_macmac_bypass (rtx insn_out, rtx insn_in)
-+{
-+  /* Check if they use the same accumulator */
-+  if (rtx_equal_p
-+      (SET_DEST (PATTERN (insn_out)), SET_DEST (PATTERN (insn_in))))
-+    {
-+      return TRUE;
-+    }
-+
-+  return FALSE;
-+}
-+
-+
-+int
-+avr32_valid_mulmac_bypass (rtx insn_out, rtx insn_in)
-+{
-+  /*
-+     Check if the mul instruction produces the accumulator for the mac
-+     instruction. */
-+  if (rtx_equal_p
-+      (SET_DEST (PATTERN (insn_out)), SET_DEST (PATTERN (insn_in))))
-+    {
-+      return TRUE;
-+    }
-+  return FALSE;
-+}
-+
-+
-+int
-+avr32_store_bypass (rtx insn_out, rtx insn_in)
-+{
-+  /* Only valid bypass if the output result is used as an src in the store
-+     instruction, NOT if used as a pointer or base. */
-+  if (rtx_equal_p
-+      (SET_DEST (PATTERN (insn_out)), SET_SRC (PATTERN (insn_in))))
-+    {
-+      return TRUE;
-+    }
-+
-+  return FALSE;
-+}
-+
-+
-+int
-+avr32_mul_waw_bypass (rtx insn_out, rtx insn_in)
-+{
-+  /* Check if the register holding the result from the mul instruction is
-+     used as a result register in the input instruction. */
-+  if (rtx_equal_p
-+      (SET_DEST (PATTERN (insn_out)), SET_DEST (PATTERN (insn_in))))
-+    {
-+      return TRUE;
-+    }
-+
-+  return FALSE;
-+}
-+
-+
-+int
-+avr32_valid_load_double_bypass (rtx insn_out, rtx insn_in)
-+{
-+  /* Check if the first loaded word in insn_out is used in insn_in. */
-+  rtx dst_reg;
-+  rtx second_loaded_reg;
-+
-+  /* If this is a double alu operation then the bypass is not valid */
-+  if ((get_attr_type (insn_in) == TYPE_ALU
-+       || get_attr_type (insn_in) == TYPE_ALU2)
-+      && (GET_MODE_SIZE (GET_MODE (SET_DEST (PATTERN (insn_out)))) > 4))
-+    return FALSE;
-+
-+  /* Get the destination register in the load */
-+  if (!REG_P (SET_DEST (PATTERN (insn_out))))
-+    return FALSE;
-+
-+  dst_reg = SET_DEST (PATTERN (insn_out));
-+  second_loaded_reg = gen_rtx_REG (SImode, REGNO (dst_reg) + 1);
-+
-+  if (!reg_mentioned_p (second_loaded_reg, PATTERN (insn_in)))
-+    return TRUE;
-+
-+  return FALSE;
-+}
-+
-+
-+int
-+avr32_valid_load_quad_bypass (rtx insn_out, rtx insn_in)
-+{
-+  /*
-+     Check if the two first loaded word in insn_out are used in insn_in. */
-+  rtx dst_reg;
-+  rtx third_loaded_reg, fourth_loaded_reg;
-+
-+  /* Get the destination register in the load */
-+  if (!REG_P (SET_DEST (PATTERN (insn_out))))
-+    return FALSE;
-+
-+  dst_reg = SET_DEST (PATTERN (insn_out));
-+  third_loaded_reg = gen_rtx_REG (SImode, REGNO (dst_reg) + 2);
-+  fourth_loaded_reg = gen_rtx_REG (SImode, REGNO (dst_reg) + 3);
-+
-+  if (!reg_mentioned_p (third_loaded_reg, PATTERN (insn_in))
-+      && !reg_mentioned_p (fourth_loaded_reg, PATTERN (insn_in)))
-+    {
-+      return TRUE;
-+    }
-+
-+  return FALSE;
-+}
-+
-+
-+rtx
-+avr32_ifcvt_modify_test (ce_if_block_t *ce_info, rtx test )
-+{
-+  rtx branch_insn;
-+  rtx cmp_test;
-+  rtx compare_op0;
-+  rtx compare_op1;
-+
-+
-+  if ( !ce_info
-+       || test == NULL_RTX
-+       || !reg_mentioned_p (cc0_rtx, test))
-+    return test;
-+
-+  branch_insn = BB_END (ce_info->test_bb);
-+  cmp_test = PATTERN(prev_nonnote_insn (branch_insn));
-+
-+  if (GET_CODE(cmp_test) != SET
-+      || !CC0_P(XEXP(cmp_test, 0)) )
-+    return cmp_test;
-+
-+  if ( GET_CODE(SET_SRC(cmp_test)) == COMPARE ){
-+    compare_op0 = XEXP(SET_SRC(cmp_test), 0);
-+    compare_op1 = XEXP(SET_SRC(cmp_test), 1);
-+  } else {
-+    compare_op0 = SET_SRC(cmp_test);
-+    compare_op1 = const0_rtx;
-+  }
-+
-+  return gen_rtx_fmt_ee (GET_CODE(test), GET_MODE (compare_op0),
-+                         compare_op0, compare_op1);
-+}
-+
-+
-+rtx
-+avr32_ifcvt_modify_insn (ce_if_block_t *ce_info, rtx pattern, rtx insn,
-+                         int *num_true_changes)
-+{
-+  rtx test = COND_EXEC_TEST(pattern);
-+  rtx op = COND_EXEC_CODE(pattern);
-+  rtx cmp_insn;
-+  rtx cond_exec_insn;
-+  int inputs_set_outside_ifblock = 1;
-+  basic_block current_bb = BLOCK_FOR_INSN (insn);
-+  rtx bb_insn ;
-+  enum machine_mode mode = GET_MODE (XEXP (op, 0));
-+
-+  if (CC0_P(XEXP(test, 0)))
-+    test = avr32_ifcvt_modify_test (ce_info,
-+                                    test );
-+
-+  /* We do not support multiple tests. */
-+  if ( ce_info
-+       && ce_info->num_multiple_test_blocks > 0 )
-+    return NULL_RTX;
-+
-+  pattern = gen_rtx_COND_EXEC (VOIDmode, test, op);
-+
-+  if ( !reload_completed )
-+    {
-+      rtx start;
-+      int num_insns;
-+      int max_insns = MAX_CONDITIONAL_EXECUTE;
-+
-+      if ( !ce_info )
-+        return op;
-+
-+      /* Check if the insn is not suitable for conditional
-+         execution. */
-+      start_sequence ();
-+      cond_exec_insn = emit_insn (pattern);
-+      if ( recog_memoized (cond_exec_insn) < 0
-+           && can_create_pseudo_p () )
-+        {
-+          /* Insn is not suitable for conditional execution, try
-+             to fix it up by using an extra scratch register or
-+             by pulling the operation outside the if-then-else
-+             and then emiting a conditional move inside the if-then-else. */
-+          end_sequence ();
-+          if ( GET_CODE (op) != SET
-+               || !REG_P (SET_DEST (op))
-+               || GET_CODE (SET_SRC (op)) == IF_THEN_ELSE
-+               || GET_MODE_SIZE (mode) > UNITS_PER_WORD )
-+            return NULL_RTX;
-+
-+          /* Check if any of the input operands to the insn is set inside the
-+             current block. */
-+          if ( current_bb->index == ce_info->then_bb->index )
-+            start = PREV_INSN (BB_HEAD (ce_info->then_bb));
-+          else
-+            start = PREV_INSN (BB_HEAD (ce_info->else_bb));
-+
-+
-+          for ( bb_insn = next_nonnote_insn (start); bb_insn != insn; bb_insn = next_nonnote_insn (bb_insn) )
-+            {
-+              rtx set = single_set (bb_insn);
-+
-+              if ( set && reg_mentioned_p (SET_DEST (set), SET_SRC (op)))
-+                {
-+                  inputs_set_outside_ifblock = 0;
-+                  break;
-+                }
-+            }
-+
-+          cmp_insn = prev_nonnote_insn (BB_END (ce_info->test_bb));
-+
-+
-+          /* Check if we can insert more insns. */
-+          num_insns = ( ce_info->num_then_insns +
-+                        ce_info->num_else_insns +
-+                        ce_info->num_cond_clobber_insns +
-+                        ce_info->num_extra_move_insns );
-+
-+          if ( ce_info->num_else_insns != 0 )
-+            max_insns *=2;
-+
-+          if ( num_insns >= max_insns )
-+            return NULL_RTX;
-+
-+          /* Check if we have an instruction which might be converted to
-+             conditional form if we give it a scratch register to clobber. */
-+          {
-+            rtx clobber_insn;
-+            rtx scratch_reg = gen_reg_rtx (mode);
-+            rtx new_pattern = copy_rtx (pattern);
-+            rtx set_src = SET_SRC (COND_EXEC_CODE (new_pattern));
-+
-+            rtx clobber = gen_rtx_CLOBBER (mode, scratch_reg);
-+            rtx vec[2] = { COND_EXEC_CODE (new_pattern), clobber };
-+            COND_EXEC_CODE (new_pattern) = gen_rtx_PARALLEL (mode, gen_rtvec_v (2, vec));
-+
-+            start_sequence ();
-+            clobber_insn = emit_insn (new_pattern);
-+
-+            if ( recog_memoized (clobber_insn) >= 0
-+                 && ( ( GET_RTX_LENGTH (GET_CODE (set_src)) == 2
-+                        && CONST_INT_P (XEXP (set_src, 1))
-+                        && avr32_const_ok_for_constraint_p (INTVAL (XEXP (set_src, 1)), 'K', "Ks08") )
-+                      || !ce_info->else_bb
-+                      || current_bb->index == ce_info->else_bb->index ))
-+              {
-+                end_sequence ();
-+                /* Force the insn to be recognized again. */
-+                INSN_CODE (insn) = -1;
-+
-+                /* If this is the first change in this IF-block then
-+                   signal that we have made a change. */
-+                if ( ce_info->num_cond_clobber_insns == 0
-+                     && ce_info->num_extra_move_insns == 0 )
-+                  *num_true_changes += 1;
-+
-+                ce_info->num_cond_clobber_insns++;
-+
-+                if (dump_file)
-+                  fprintf (dump_file,
-+                           "\nReplacing INSN %d with an insn using a scratch register for later ifcvt passes...\n",
-+                           INSN_UID (insn));
-+
-+                return COND_EXEC_CODE (new_pattern);
-+              }
-+            end_sequence ();
-+          }
-+
-+          if ( inputs_set_outside_ifblock )
-+            {
-+              /* Check if the insn before the cmp is an and which used
-+                 together with the cmp can be optimized into a bld. If
-+                 so then we should try to put the insn before the and
-+                 so that we can catch the bld peephole. */
-+              rtx set;
-+              rtx insn_before_cmp_insn = prev_nonnote_insn (cmp_insn);
-+              if (insn_before_cmp_insn
-+                  && (set = single_set (insn_before_cmp_insn))
-+                  && GET_CODE (SET_SRC (set)) == AND
-+                  && one_bit_set_operand (XEXP (SET_SRC (set), 1), SImode)
-+                  /* Also make sure that the insn does not set any
-+                     of the input operands to the insn we are pulling out. */
-+                  && !reg_mentioned_p (SET_DEST (set), SET_SRC (op)) )
-+                cmp_insn = prev_nonnote_insn (cmp_insn);
-+
-+              /* We can try to put the operation outside the if-then-else
-+                 blocks and insert a move. */
-+              if ( !insn_invalid_p (insn)
-+                   /* Do not allow conditional insns to be moved outside the
-+                      if-then-else. */
-+                   && !reg_mentioned_p (cc0_rtx, insn)
-+                   /* We cannot move memory loads outside of the if-then-else
-+                      since the memory access should not be perfomed if the
-+                      condition is not met. */
-+                   && !mem_mentioned_p (SET_SRC (op)) )
-+                {
-+                  rtx scratch_reg = gen_reg_rtx (mode);
-+                  rtx op_pattern = copy_rtx (op);
-+                  rtx new_insn, seq;
-+                  rtx link, prev_link;
-+                  op = copy_rtx (op);
-+                  /* Emit the operation to a temp reg before the compare,
-+                     and emit a move inside the if-then-else, hoping that the
-+                     whole if-then-else can be converted to conditional
-+                     execution. */
-+                  SET_DEST (op_pattern) = scratch_reg;
-+                  start_sequence ();
-+                  new_insn = emit_insn (op_pattern);
-+                  seq = get_insns();
-+                  end_sequence ();
-+
-+                  /* Check again that the insn is valid. For some insns the insn might
-+                     become invalid if the destination register is changed. Ie. for mulacc
-+                     operations. */
-+                  if ( insn_invalid_p (new_insn) )
-+                    return NULL_RTX;
-+
-+                  emit_insn_before_setloc (seq, cmp_insn, INSN_LOCATOR (insn));
-+
-+                  if (dump_file)
-+                    fprintf (dump_file,
-+                             "\nMoving INSN %d out of IF-block by adding INSN %d...\n",
-+                             INSN_UID (insn), INSN_UID (new_insn));
-+
-+                  ce_info->extra_move_insns[ce_info->num_extra_move_insns] = insn;
-+                  ce_info->moved_insns[ce_info->num_extra_move_insns] = new_insn;
-+                  XEXP (op, 1) = scratch_reg;
-+                  /* Force the insn to be recognized again. */
-+                  INSN_CODE (insn) = -1;
-+
-+                  /* Move REG_DEAD notes to the moved insn. */
-+                  prev_link = NULL_RTX;
-+                  for (link = REG_NOTES (insn); link; link = XEXP (link, 1))
-+                    {
-+                      if (REG_NOTE_KIND (link) == REG_DEAD)
-+                        {
-+                          /* Add the REG_DEAD note to the new insn. */
-+                          rtx dead_reg = XEXP (link, 0);
-+                          REG_NOTES (new_insn) = gen_rtx_EXPR_LIST (REG_DEAD, dead_reg, REG_NOTES (new_insn));
-+                          /* Remove the REG_DEAD note from the insn we convert to a move. */
-+                          if ( prev_link )
-+                            XEXP (prev_link, 1) = XEXP (link, 1);
-+                          else
-+                            REG_NOTES (insn) = XEXP (link, 1);
-+                        }
-+                      else
-+                        {
-+                          prev_link = link;
-+                        }
-+                    }
-+                  /* Add a REG_DEAD note to signal that the scratch register is dead. */
-+                  REG_NOTES (insn) = gen_rtx_EXPR_LIST (REG_DEAD, scratch_reg, REG_NOTES (insn));
-+
-+                  /* If this is the first change in this IF-block then
-+                     signal that we have made a change. */
-+                  if ( ce_info->num_cond_clobber_insns == 0
-+                       && ce_info->num_extra_move_insns == 0 )
-+                    *num_true_changes += 1;
-+
-+                  ce_info->num_extra_move_insns++;
-+                  return op;
-+                }
-+            }
-+
-+          /* We failed to fixup the insns, so this if-then-else can not be made
-+             conditional. Just return NULL_RTX so that the if-then-else conversion
-+             for this if-then-else will be cancelled. */
-+          return NULL_RTX;
-+        }
-+      end_sequence ();
-+      return op;
-+    }
-+
-+  /* Signal that we have started if conversion after reload, which means
-+     that it should be safe to split all the predicable clobber insns which
-+     did not become cond_exec back into a simpler form if possible. */
-+  cfun->machine->ifcvt_after_reload = 1;
-+
-+  return pattern;
-+}
-+
-+
-+void
-+avr32_ifcvt_modify_cancel ( ce_if_block_t *ce_info, int *num_true_changes)
-+{
-+  int n;
-+
-+  if ( ce_info->num_extra_move_insns > 0
-+       && ce_info->num_cond_clobber_insns == 0)
-+    /* Signal that we did not do any changes after all. */
-+    *num_true_changes -= 1;
-+
-+  /* Remove any inserted move insns. */
-+  for ( n = 0; n < ce_info->num_extra_move_insns; n++ )
-+    {
-+      rtx link, prev_link;
-+
-+      /* Remove REG_DEAD note since we are not needing the scratch register anyway. */
-+      prev_link = NULL_RTX;
-+      for (link = REG_NOTES (ce_info->extra_move_insns[n]); link; link = XEXP (link, 1))
-+        {
-+          if (REG_NOTE_KIND (link) == REG_DEAD)
-+            {
-+              if ( prev_link )
-+                XEXP (prev_link, 1) = XEXP (link, 1);
-+              else
-+                REG_NOTES (ce_info->extra_move_insns[n]) = XEXP (link, 1);
-+            }
-+          else
-+            {
-+              prev_link = link;
-+            }
-+        }
-+
-+      /* Revert all reg_notes for the moved insn. */
-+      for (link = REG_NOTES (ce_info->moved_insns[n]); link; link = XEXP (link, 1))
-+        {
-+          REG_NOTES (ce_info->extra_move_insns[n]) = gen_rtx_EXPR_LIST (REG_NOTE_KIND (link),
-+                                                                        XEXP (link, 0),
-+                                                                        REG_NOTES (ce_info->extra_move_insns[n]));
-+        }
-+
-+      /* Remove the moved insn. */
-+      remove_insn ( ce_info->moved_insns[n] );
-+    }
-+}
-+
-+
-+/* Function returning TRUE if INSN with OPERANDS is a splittable
-+   conditional immediate clobber insn. We assume that the insn is
-+   already a conditional immediate clobber insns and do not check
-+   for that. */
-+int
-+avr32_cond_imm_clobber_splittable (rtx insn, rtx operands[])
-+{
-+  if ( REGNO (operands[0]) == REGNO (operands[1]) )
-+    {
-+      if ( (GET_CODE (SET_SRC (XVECEXP (PATTERN (insn),0,0))) == PLUS
-+            && !avr32_const_ok_for_constraint_p (INTVAL (operands[2]), 'I', "Is21"))
-+           || (GET_CODE (SET_SRC (XVECEXP (PATTERN (insn),0,0))) == MINUS
-+               && !avr32_const_ok_for_constraint_p (INTVAL (operands[2]), 'K', "Ks21")))
-+        return FALSE;
-+    }
-+  else if ( (logical_binary_operator (SET_SRC (XVECEXP (PATTERN (insn),0,0)), VOIDmode)
-+             || (GET_CODE (SET_SRC (XVECEXP (PATTERN (insn),0,0))) == PLUS
-+                 && !avr32_const_ok_for_constraint_p (INTVAL (operands[2]), 'I', "Is16"))
-+             || (GET_CODE (SET_SRC (XVECEXP (PATTERN (insn),0,0))) == MINUS
-+                 && !avr32_const_ok_for_constraint_p (INTVAL (operands[2]), 'K', "Ks16"))) )
-+    return FALSE;
-+
-+  return TRUE;
-+}
-+
-+
-+/* Function for getting an integer value from a const_int or const_double
-+   expression regardless of the HOST_WIDE_INT size. Each target cpu word
-+   will be put into the val array where the LSW will be stored at the lowest
-+   address and so forth. Assumes that const_expr is either a const_int or
-+   const_double. Only valid for modes which have sizes that are a multiple
-+   of the word size.
-+*/
-+void
-+avr32_get_intval (enum machine_mode mode, rtx const_expr, HOST_WIDE_INT *val)
-+{
-+  int words_in_mode = GET_MODE_SIZE (mode)/UNITS_PER_WORD;
-+  const int words_in_const_int = HOST_BITS_PER_WIDE_INT / BITS_PER_WORD;
-+
-+  if ( GET_CODE(const_expr) == CONST_DOUBLE ){
-+    HOST_WIDE_INT hi = CONST_DOUBLE_HIGH(const_expr);
-+    HOST_WIDE_INT lo = CONST_DOUBLE_LOW(const_expr);
-+    /* Evaluate hi and lo values of const_double. */
-+    avr32_get_intval (mode_for_size (HOST_BITS_PER_WIDE_INT, MODE_INT, 0),
-+                      GEN_INT (lo),
-+                      &val[0]);
-+    avr32_get_intval (mode_for_size (HOST_BITS_PER_WIDE_INT, MODE_INT, 0),
-+                      GEN_INT (hi),
-+                      &val[words_in_const_int]);
-+  } else if ( GET_CODE(const_expr) == CONST_INT ){
-+    HOST_WIDE_INT value = INTVAL(const_expr);
-+    int word;
-+    for ( word = 0; (word < words_in_mode) && (word < words_in_const_int); word++ ){
-+      /* Shift word up to the MSW and shift down again to extract the
-+         word and sign-extend. */
-+      int lshift = (words_in_const_int - word - 1) * BITS_PER_WORD;
-+      int rshift = (words_in_const_int-1) * BITS_PER_WORD;
-+      val[word] = (value << lshift) >> rshift;
-+    }
-+
-+    for ( ; word < words_in_mode; word++ ){
-+      /* Just put the sign bits in the remaining words. */
-+      val[word] = value < 0 ? -1 : 0;
-+    }
-+  }
-+}
-+
-+
-+void
-+avr32_split_const_expr (enum machine_mode mode, enum machine_mode new_mode,
-+                        rtx expr, rtx *split_expr)
-+{
-+  int i, word;
-+  int words_in_intval = GET_MODE_SIZE (mode)/UNITS_PER_WORD;
-+  int words_in_split_values = GET_MODE_SIZE (new_mode)/UNITS_PER_WORD;
-+  const int words_in_const_int = HOST_BITS_PER_WIDE_INT / BITS_PER_WORD;
-+  HOST_WIDE_INT *val = alloca (words_in_intval * UNITS_PER_WORD);
-+
-+  avr32_get_intval (mode, expr, val);
-+
-+  for ( i=0; i < (words_in_intval/words_in_split_values); i++ )
-+    {
-+      HOST_WIDE_INT value_lo = 0, value_hi = 0;
-+      for ( word = 0; word < words_in_split_values; word++ )
-+        {
-+          if ( word >= words_in_const_int )
-+            value_hi |= ((val[i * words_in_split_values + word] &
-+                          (((HOST_WIDE_INT)1 << BITS_PER_WORD)-1))
-+                         << (BITS_PER_WORD * (word - words_in_const_int)));
-+          else
-+            value_lo |= ((val[i * words_in_split_values + word] &
-+                          (((HOST_WIDE_INT)1 << BITS_PER_WORD)-1))
-+                         << (BITS_PER_WORD * word));
-+        }
-+      split_expr[i] = immed_double_const(value_lo, value_hi, new_mode);
-+    }
-+}
-+
-+
-+/* Set up library functions to comply to AVR32 ABI  */
-+static void
-+avr32_init_libfuncs (void)
-+{
-+  /* Convert gcc run-time function names to AVR32 ABI names */
-+
-+  /* Double-precision floating-point arithmetic. */
-+  set_optab_libfunc (neg_optab, DFmode, NULL);
-+
-+  /* Double-precision comparisons.  */
-+  set_optab_libfunc (eq_optab, DFmode, "__avr32_f64_cmp_eq");
-+  set_optab_libfunc (ne_optab, DFmode, NULL);
-+  set_optab_libfunc (lt_optab, DFmode, "__avr32_f64_cmp_lt");
-+  set_optab_libfunc (le_optab, DFmode, NULL);
-+  set_optab_libfunc (ge_optab, DFmode, "__avr32_f64_cmp_ge");
-+  set_optab_libfunc (gt_optab, DFmode, NULL);
-+
-+  /* Single-precision floating-point arithmetic. */
-+  set_optab_libfunc (smul_optab, SFmode, "__avr32_f32_mul");
-+  set_optab_libfunc (neg_optab, SFmode, NULL);
-+
-+  /* Single-precision comparisons.  */
-+  set_optab_libfunc (eq_optab, SFmode, "__avr32_f32_cmp_eq");
-+  set_optab_libfunc (ne_optab, SFmode, NULL);
-+  set_optab_libfunc (lt_optab, SFmode, "__avr32_f32_cmp_lt");
-+  set_optab_libfunc (le_optab, SFmode, NULL);
-+  set_optab_libfunc (ge_optab, SFmode, "__avr32_f32_cmp_ge");
-+  set_optab_libfunc (gt_optab, SFmode, NULL);
-+
-+  /* Floating-point to integer conversions. */
-+  set_conv_libfunc (sfix_optab, SImode, DFmode, "__avr32_f64_to_s32");
-+  set_conv_libfunc (ufix_optab, SImode, DFmode, "__avr32_f64_to_u32");
-+  set_conv_libfunc (sfix_optab, DImode, DFmode, "__avr32_f64_to_s64");
-+  set_conv_libfunc (ufix_optab, DImode, DFmode, "__avr32_f64_to_u64");
-+  set_conv_libfunc (sfix_optab, SImode, SFmode, "__avr32_f32_to_s32");
-+  set_conv_libfunc (ufix_optab, SImode, SFmode, "__avr32_f32_to_u32");
-+  set_conv_libfunc (sfix_optab, DImode, SFmode, "__avr32_f32_to_s64");
-+  set_conv_libfunc (ufix_optab, DImode, SFmode, "__avr32_f32_to_u64");
-+
-+  /* Conversions between floating types.  */
-+  set_conv_libfunc (trunc_optab, SFmode, DFmode, "__avr32_f64_to_f32");
-+  set_conv_libfunc (sext_optab, DFmode, SFmode, "__avr32_f32_to_f64");
-+
-+  /* Integer to floating-point conversions.  Table 8.  */
-+  set_conv_libfunc (sfloat_optab, DFmode, SImode, "__avr32_s32_to_f64");
-+  set_conv_libfunc (sfloat_optab, DFmode, DImode, "__avr32_s64_to_f64");
-+  set_conv_libfunc (sfloat_optab, SFmode, SImode, "__avr32_s32_to_f32");
-+  set_conv_libfunc (sfloat_optab, SFmode, DImode, "__avr32_s64_to_f32");
-+  set_conv_libfunc (ufloat_optab, DFmode, SImode, "__avr32_u32_to_f64");
-+  set_conv_libfunc (ufloat_optab, SFmode, SImode, "__avr32_u32_to_f32");
-+  /* TODO: Add these to gcc library functions */
-+  //set_conv_libfunc (ufloat_optab, DFmode, DImode, NULL);
-+  //set_conv_libfunc (ufloat_optab, SFmode, DImode, NULL);
-+
-+  /* Long long.  Table 9.  */
-+  set_optab_libfunc (smul_optab, DImode, "__avr32_mul64");
-+  set_optab_libfunc (sdiv_optab, DImode, "__avr32_sdiv64");
-+  set_optab_libfunc (udiv_optab, DImode, "__avr32_udiv64");
-+  set_optab_libfunc (smod_optab, DImode, "__avr32_smod64");
-+  set_optab_libfunc (umod_optab, DImode, "__avr32_umod64");
-+  set_optab_libfunc (ashl_optab, DImode, "__avr32_lsl64");
-+  set_optab_libfunc (lshr_optab, DImode, "__avr32_lsr64");
-+  set_optab_libfunc (ashr_optab, DImode, "__avr32_asr64");
-+
-+  /* Floating point library functions which have fast versions. */
-+  if ( TARGET_FAST_FLOAT )
-+    {
-+      set_optab_libfunc (sdiv_optab, DFmode, "__avr32_f64_div_fast");
-+      set_optab_libfunc (smul_optab, DFmode, "__avr32_f64_mul_fast");
-+      set_optab_libfunc (add_optab, DFmode, "__avr32_f64_add_fast");
-+      set_optab_libfunc (sub_optab, DFmode, "__avr32_f64_sub_fast");
-+      set_optab_libfunc (add_optab, SFmode, "__avr32_f32_add_fast");
-+      set_optab_libfunc (sub_optab, SFmode, "__avr32_f32_sub_fast");
-+      set_optab_libfunc (sdiv_optab, SFmode, "__avr32_f32_div_fast");
-+    }
-+  else
-+    {
-+      set_optab_libfunc (sdiv_optab, DFmode, "__avr32_f64_div");
-+      set_optab_libfunc (smul_optab, DFmode, "__avr32_f64_mul");
-+      set_optab_libfunc (add_optab, DFmode, "__avr32_f64_add");
-+      set_optab_libfunc (sub_optab, DFmode, "__avr32_f64_sub");
-+      set_optab_libfunc (add_optab, SFmode, "__avr32_f32_add");
-+      set_optab_libfunc (sub_optab, SFmode, "__avr32_f32_sub");
-+      set_optab_libfunc (sdiv_optab, SFmode, "__avr32_f32_div");
-+    }
-+}
-+
-+
-+/* Record a flashvault declaration.  */
-+static void
-+flashvault_decl_list_add (unsigned int vector_num, const char *name)
-+{
-+  struct flashvault_decl_list *p;
-+
-+  p = (struct flashvault_decl_list *)
-+       xmalloc (sizeof (struct flashvault_decl_list));
-+  p->next = flashvault_decl_list_head;
-+  p->name = name;
-+  p->vector_num = vector_num;
-+  flashvault_decl_list_head = p;
-+}
-+
-+
-+static void
-+avr32_file_end (void)
-+{
-+  struct flashvault_decl_list *p;
-+  unsigned int num_entries = 0;
-+
-+  /* Check if a list of flashvault declarations exists. */
-+  if (flashvault_decl_list_head != NULL)
-+    {
-+      /* Calculate the number of entries in the table. */
-+      for (p = flashvault_decl_list_head; p != NULL; p = p->next)
-+        {
-+           num_entries++;
-+        }
-+
-+      /* Generate the beginning of the flashvault data table. */
-+      fputs ("\t.global     __fv_table\n"
-+             "\t.data\n"
-+             "\t.align 2\n"
-+             "\t.set .LFVTABLE, . + 0\n"
-+             "\t.type __fv_table, @object\n", asm_out_file);
-+      /* Each table entry is 8 bytes. */
-+      fprintf (asm_out_file, "\t.size __fv_table, %u\n", (num_entries * 8));
-+
-+      fputs("__fv_table:\n", asm_out_file);
-+
-+      for (p = flashvault_decl_list_head; p != NULL; p = p->next)
-+        {
-+          /* Output table entry. */
-+          fprintf (asm_out_file, 
-+                   "\t.align 2\n"
-+                   "\t.int %u\n", p->vector_num);
-+          fprintf (asm_out_file, 
-+                   "\t.align 2\n"
-+                   "\t.int %s\n", p->name);
-+        }
-+    }
-+}
-diff -Nur gcc-4.4.6.orig/gcc/config/avr32/avr32.h gcc-4.4.6/gcc/config/avr32/avr32.h
---- gcc-4.4.6.orig/gcc/config/avr32/avr32.h	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.4.6/gcc/config/avr32/avr32.h	2011-10-22 19:23:08.520581302 +0200
-@@ -0,0 +1,3316 @@
-+/*
-+   Definitions of target machine for AVR32.
-+   Copyright 2003,2004,2005,2006,2007,2008,2009,2010 Atmel Corporation.
-+
-+   This file is part of GCC.
-+
-+   This program is free software; you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; either version 2 of the License, or
-+   (at your option) any later version.
-+
-+   This program is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with this program; if not, write to the Free Software
-+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-+
-+#ifndef GCC_AVR32_H
-+#define GCC_AVR32_H
-+
-+
-+#ifndef OBJECT_FORMAT_ELF
-+#error avr32.h included before elfos.h
-+#endif
-+
-+#ifndef LOCAL_LABEL_PREFIX
-+#define LOCAL_LABEL_PREFIX "."
-+#endif
-+
-+#ifndef SUBTARGET_CPP_SPEC
-+#define SUBTARGET_CPP_SPEC  "-D__ELF__"
-+#endif
-+
-+
-+extern struct rtx_def *avr32_compare_op0;
-+extern struct rtx_def *avr32_compare_op1;
-+
-+/* comparison type */
-+enum avr32_cmp_type {
-+  CMP_QI,				/* 1 byte ->char */
-+  CMP_HI,				/* 2 byte->half word */
-+  CMP_SI,				/* four byte->word*/
-+  CMP_DI,				/* eight byte->double word */
-+  CMP_SF,				/* single precision floats */
-+  CMP_MAX				/* max comparison type */
-+};
-+
-+extern enum avr32_cmp_type avr32_branch_type;	/* type of branch to use */
-+
-+
-+extern struct rtx_def *avr32_acc_cache;
-+
-+/* cache instruction op5 codes */
-+#define AVR32_CACHE_INVALIDATE_ICACHE 1
-+
-+/* 
-+These bits describe the different types of function supported by the AVR32
-+backend. They are exclusive, e.g. a function cannot be both a normal function
-+and an interworked function.  Knowing the type of a function is important for
-+determining its prologue and epilogue sequences. Note value 7 is currently 
-+unassigned.  Also note that the interrupt function types all have bit 2 set, 
-+so that they can be tested for easily. Note that 0 is deliberately chosen for
-+AVR32_FT_UNKNOWN so that when the machine_function structure is initialized
-+(to zero) func_type will default to unknown. This will force the first use of
-+avr32_current_func_type to call avr32_compute_func_type. 
-+*/
-+#define AVR32_FT_UNKNOWN           0  /* Type has not yet been determined. */
-+#define AVR32_FT_NORMAL            1  /* Normal function. */
-+#define AVR32_FT_ACALL             2  /* An acall function. */
-+#define AVR32_FT_EXCEPTION_HANDLER 3  /* A C++ exception handler. */
-+#define AVR32_FT_ISR_FULL          4  /* A fully shadowed interrupt mode. */
-+#define AVR32_FT_ISR_HALF          5  /* A half shadowed interrupt mode. */
-+#define AVR32_FT_ISR_NONE          6  /* No shadow registers. */
-+
-+#define AVR32_FT_TYPE_MASK	((1 << 3) - 1)
-+
-+/* In addition functions can have several type modifiers, outlined by these bit masks: */
-+#define AVR32_FT_INTERRUPT       (1 << 2)  /* Note overlap with FT_ISR and above. */
-+#define AVR32_FT_NAKED           (1 << 3)  /* No prologue or epilogue. */
-+#define AVR32_FT_VOLATILE        (1 << 4)  /* Does not return. */
-+#define AVR32_FT_NESTED          (1 << 5)  /* Embedded inside another func. */
-+#define AVR32_FT_FLASHVAULT      (1 << 6)  /* Flashvault function call. */
-+#define AVR32_FT_FLASHVAULT_IMPL (1 << 7)  /* Function definition in FlashVault. */
-+
-+
-+/* Some macros to test these flags.  */
-+#define AVR32_FUNC_TYPE(t)     (t & AVR32_FT_TYPE_MASK)
-+#define IS_INTERRUPT(t)        (t & AVR32_FT_INTERRUPT)
-+#define IS_NAKED(t)            (t & AVR32_FT_NAKED)
-+#define IS_VOLATILE(t)         (t & AVR32_FT_VOLATILE)
-+#define IS_NESTED(t)           (t & AVR32_FT_NESTED)
-+#define IS_FLASHVAULT(t)       (t & AVR32_FT_FLASHVAULT)
-+#define IS_FLASHVAULT_IMPL(t)  (t & AVR32_FT_FLASHVAULT_IMPL)
-+
-+#define SYMBOL_FLAG_RMW_ADDR_SHIFT    SYMBOL_FLAG_MACH_DEP_SHIFT
-+#define SYMBOL_REF_RMW_ADDR(RTX)                                        \
-+  ((SYMBOL_REF_FLAGS (RTX) & (1 << SYMBOL_FLAG_RMW_ADDR_SHIFT)) != 0)
-+
-+
-+typedef struct minipool_labels
-+GTY ((chain_next ("%h.next"), chain_prev ("%h.prev")))
-+{
-+  rtx label;
-+  struct minipool_labels *prev;
-+  struct minipool_labels *next;
-+} minipool_labels;
-+
-+/* A C structure for machine-specific, per-function data.
-+   This is added to the cfun structure.  */
-+
-+typedef struct machine_function
-+GTY (())
-+{
-+  /* Records the type of the current function.  */
-+  unsigned long func_type;
-+  /* List of minipool labels, use for checking if code label is valid in a
-+     memory expression */
-+  minipool_labels *minipool_label_head;
-+  minipool_labels *minipool_label_tail;
-+  int ifcvt_after_reload;
-+} machine_function;
-+
-+/* Initialize data used by insn expanders.  This is called from insn_emit,
-+   once for every function before code is generated.  */
-+#define INIT_EXPANDERS avr32_init_expanders ()
-+
-+/******************************************************************************
-+ * SPECS
-+ *****************************************************************************/
-+
-+#ifndef ASM_SPEC
-+#define ASM_SPEC "%{fpic:--pic} %{mrelax|O*:%{mno-relax|O0|O1: ;:--linkrelax}} %{march=ucr2nomul:-march=ucr2;:%{march=*:-march=%*}} %{mpart=uc3a3revd:-mpart=uc3a3256s;:%{mpart=*:-mpart=%*}}"
-+#endif
-+
-+#ifndef MULTILIB_DEFAULTS
-+#define MULTILIB_DEFAULTS { "march=ap", "" }
-+#endif
-+
-+/******************************************************************************
-+ * Run-time Target Specification
-+ *****************************************************************************/
-+#ifndef TARGET_VERSION
-+#define TARGET_VERSION fprintf(stderr, " (AVR32, GNU assembler syntax)");
-+#endif
-+
-+
-+/* Part types. Keep this in sync with the order of avr32_part_types in avr32.c*/
-+enum part_type
-+{
-+  PART_TYPE_AVR32_NONE,
-+  PART_TYPE_AVR32_AP7000,
-+  PART_TYPE_AVR32_AP7001,
-+  PART_TYPE_AVR32_AP7002,
-+  PART_TYPE_AVR32_AP7200,
-+  PART_TYPE_AVR32_UC3A0128,
-+  PART_TYPE_AVR32_UC3A0256,
-+  PART_TYPE_AVR32_UC3A0512,
-+  PART_TYPE_AVR32_UC3A0512ES,
-+  PART_TYPE_AVR32_UC3A1128,
-+  PART_TYPE_AVR32_UC3A1256,
-+  PART_TYPE_AVR32_UC3A1512,
-+  PART_TYPE_AVR32_UC3A1512ES,
-+  PART_TYPE_AVR32_UC3A3REVD,
-+  PART_TYPE_AVR32_UC3A364,
-+  PART_TYPE_AVR32_UC3A364S,
-+  PART_TYPE_AVR32_UC3A3128,
-+  PART_TYPE_AVR32_UC3A3128S,
-+  PART_TYPE_AVR32_UC3A3256,
-+  PART_TYPE_AVR32_UC3A3256S,
-+  PART_TYPE_AVR32_UC3A464,
-+  PART_TYPE_AVR32_UC3A464S,
-+  PART_TYPE_AVR32_UC3A4128,
-+  PART_TYPE_AVR32_UC3A4128S,
-+  PART_TYPE_AVR32_UC3A4256,
-+  PART_TYPE_AVR32_UC3A4256S,
-+  PART_TYPE_AVR32_UC3B064,
-+  PART_TYPE_AVR32_UC3B0128,
-+  PART_TYPE_AVR32_UC3B0256,
-+  PART_TYPE_AVR32_UC3B0256ES,
-+  PART_TYPE_AVR32_UC3B0512,
-+  PART_TYPE_AVR32_UC3B0512REVC,
-+  PART_TYPE_AVR32_UC3B164,
-+  PART_TYPE_AVR32_UC3B1128,
-+  PART_TYPE_AVR32_UC3B1256,
-+  PART_TYPE_AVR32_UC3B1256ES,
-+  PART_TYPE_AVR32_UC3B1512,
-+  PART_TYPE_AVR32_UC3B1512REVC,
-+  PART_TYPE_AVR32_UC64D3,
-+  PART_TYPE_AVR32_UC128D3,
-+  PART_TYPE_AVR32_UC64D4,
-+  PART_TYPE_AVR32_UC128D4,
-+  PART_TYPE_AVR32_UC3C0512CREVC,
-+  PART_TYPE_AVR32_UC3C1512CREVC,
-+  PART_TYPE_AVR32_UC3C2512CREVC,
-+  PART_TYPE_AVR32_UC3L0256,
-+  PART_TYPE_AVR32_UC3L0128,
-+  PART_TYPE_AVR32_UC3L064,
-+  PART_TYPE_AVR32_UC3L032,
-+  PART_TYPE_AVR32_UC3L016,
-+  PART_TYPE_AVR32_UC3L064REVB,
-+  PART_TYPE_AVR32_UC64L3U,
-+  PART_TYPE_AVR32_UC128L3U,
-+  PART_TYPE_AVR32_UC256L3U,
-+  PART_TYPE_AVR32_UC64L4U,
-+  PART_TYPE_AVR32_UC128L4U,
-+  PART_TYPE_AVR32_UC256L4U,
-+  PART_TYPE_AVR32_UC3C064C,
-+  PART_TYPE_AVR32_UC3C0128C,
-+  PART_TYPE_AVR32_UC3C0256C,
-+  PART_TYPE_AVR32_UC3C0512C,
-+  PART_TYPE_AVR32_UC3C164C,
-+  PART_TYPE_AVR32_UC3C1128C,
-+  PART_TYPE_AVR32_UC3C1256C,
-+  PART_TYPE_AVR32_UC3C1512C,
-+  PART_TYPE_AVR32_UC3C264C,
-+  PART_TYPE_AVR32_UC3C2128C,
-+  PART_TYPE_AVR32_UC3C2256C,
-+  PART_TYPE_AVR32_UC3C2512C,
-+  PART_TYPE_AVR32_MXT768E
-+};
-+
-+/* Microarchitectures. */
-+enum microarchitecture_type
-+{
-+  UARCH_TYPE_AVR32A,
-+  UARCH_TYPE_AVR32B,
-+  UARCH_TYPE_NONE
-+};
-+
-+/* Architectures types which specifies the pipeline.
-+ Keep this in sync with avr32_arch_types in avr32.c
-+ and the pipeline attribute in avr32.md */
-+enum architecture_type
-+{
-+  ARCH_TYPE_AVR32_AP,
-+  ARCH_TYPE_AVR32_UCR1,
-+  ARCH_TYPE_AVR32_UCR2,
-+  ARCH_TYPE_AVR32_UCR2NOMUL,
-+  ARCH_TYPE_AVR32_UCR3,
-+  ARCH_TYPE_AVR32_UCR3FP,
-+  ARCH_TYPE_AVR32_NONE
-+};
-+
-+/* Flag specifying if the cpu has support for DSP instructions.*/
-+#define FLAG_AVR32_HAS_DSP (1 << 0)
-+/* Flag specifying if the cpu has support for Read-Modify-Write
-+   instructions.*/
-+#define FLAG_AVR32_HAS_RMW (1 << 1)
-+/* Flag specifying if the cpu has support for SIMD instructions. */
-+#define FLAG_AVR32_HAS_SIMD (1 << 2)
-+/* Flag specifying if the cpu has support for unaligned memory word access. */
-+#define FLAG_AVR32_HAS_UNALIGNED_WORD (1 << 3)
-+/* Flag specifying if the cpu has support for branch prediction. */
-+#define FLAG_AVR32_HAS_BRANCH_PRED (1 << 4)
-+/* Flag specifying if the cpu has support for a return stack. */
-+#define FLAG_AVR32_HAS_RETURN_STACK (1 << 5)
-+/* Flag specifying if the cpu has caches. */
-+#define FLAG_AVR32_HAS_CACHES (1 << 6)
-+/* Flag specifying if the cpu has support for v2 insns. */
-+#define FLAG_AVR32_HAS_V2_INSNS (1 << 7)
-+/* Flag specifying that the cpu has buggy mul insns. */
-+#define FLAG_AVR32_HAS_NO_MUL_INSNS (1 << 8)
-+/* Flag specifying that the device has FPU instructions according 
-+   to AVR32002 specifications*/
-+#define FLAG_AVR32_HAS_FPU (1 << 9)
-+
-+/* Structure for holding information about different avr32 CPUs/parts */
-+struct part_type_s
-+{
-+  const char *const name;
-+  enum part_type part_type;
-+  enum architecture_type arch_type;
-+  /* Must lie outside user's namespace.  NULL == no macro.  */
-+  const char *const macro;
-+};
-+
-+/* Structure for holding information about different avr32 pipeline
-+ architectures. */
-+struct arch_type_s
-+{
-+  const char *const name;
-+  enum architecture_type arch_type;
-+  enum microarchitecture_type uarch_type;
-+  const unsigned long feature_flags;
-+  /* Must lie outside user's namespace.  NULL == no macro.  */
-+  const char *const macro;
-+};
-+
-+extern const struct part_type_s *avr32_part;
-+extern const struct arch_type_s *avr32_arch;
-+
-+#define TARGET_SIMD  (avr32_arch->feature_flags & FLAG_AVR32_HAS_SIMD)
-+#define TARGET_DSP  (avr32_arch->feature_flags & FLAG_AVR32_HAS_DSP)
-+#define TARGET_RMW  (avr32_arch->feature_flags & FLAG_AVR32_HAS_RMW)
-+#define TARGET_UNALIGNED_WORD  (avr32_arch->feature_flags & FLAG_AVR32_HAS_UNALIGNED_WORD)
-+#define TARGET_BRANCH_PRED  (avr32_arch->feature_flags & FLAG_AVR32_HAS_BRANCH_PRED)
-+#define TARGET_RETURN_STACK  (avr32_arch->feature_flags & FLAG_AVR32_HAS_RETURN_STACK)
-+#define TARGET_V2_INSNS  (avr32_arch->feature_flags & FLAG_AVR32_HAS_V2_INSNS)
-+#define TARGET_CACHES  (avr32_arch->feature_flags & FLAG_AVR32_HAS_CACHES)
-+#define TARGET_NO_MUL_INSNS  (avr32_arch->feature_flags & FLAG_AVR32_HAS_NO_MUL_INSNS)
-+#define TARGET_ARCH_AP (avr32_arch->arch_type == ARCH_TYPE_AVR32_AP)
-+#define TARGET_ARCH_UCR1 (avr32_arch->arch_type == ARCH_TYPE_AVR32_UCR1)
-+#define TARGET_ARCH_UCR2 (avr32_arch->arch_type == ARCH_TYPE_AVR32_UCR2)
-+#define TARGET_ARCH_UC (TARGET_ARCH_UCR1 || TARGET_ARCH_UCR2)
-+#define TARGET_UARCH_AVR32A (avr32_arch->uarch_type == UARCH_TYPE_AVR32A)
-+#define TARGET_UARCH_AVR32B (avr32_arch->uarch_type == UARCH_TYPE_AVR32B)
-+#define TARGET_ARCH_FPU (avr32_arch->feature_flags & FLAG_AVR32_HAS_FPU)
-+
-+#define CAN_DEBUG_WITHOUT_FP
-+
-+
-+
-+
-+/******************************************************************************
-+ * Storage Layout
-+ *****************************************************************************/
-+
-+/*
-+Define this macro to have the value 1 if the most significant bit in a
-+byte has the lowest number; otherwise define it to have the value zero.
-+This means that bit-field instructions count from the most significant
-+bit.  If the machine has no bit-field instructions, then this must still
-+be defined, but it doesn't matter which value it is defined to.  This
-+macro need not be a constant.
-+
-+This macro does not affect the way structure fields are packed into
-+bytes or words; that is controlled by BYTES_BIG_ENDIAN.
-+*/
-+#define BITS_BIG_ENDIAN 0
-+
-+/*
-+Define this macro to have the value 1 if the most significant byte in a
-+word has the lowest number. This macro need not be a constant.
-+*/
-+/*
-+  Data is stored in an big-endian way.
-+*/
-+#define BYTES_BIG_ENDIAN 1
-+
-+/*
-+Define this macro to have the value 1 if, in a multiword object, the
-+most significant word has the lowest number.  This applies to both
-+memory locations and registers; GCC fundamentally assumes that the
-+order of words in memory is the same as the order in registers.  This
-+macro need not be a constant.
-+*/
-+/*
-+  Data is stored in an bin-endian way.
-+*/
-+#define WORDS_BIG_ENDIAN 1
-+
-+/*
-+Define this macro if WORDS_BIG_ENDIAN is not constant.  This must be a
-+constant value with the same meaning as WORDS_BIG_ENDIAN, which will be
-+used only when compiling libgcc2.c.  Typically the value will be set
-+based on preprocessor defines.
-+*/
-+#define LIBGCC2_WORDS_BIG_ENDIAN WORDS_BIG_ENDIAN
-+
-+/*
-+Define this macro to have the value 1 if DFmode, XFmode or
-+TFmode floating point numbers are stored in memory with the word
-+containing the sign bit at the lowest address; otherwise define it to
-+have the value 0.  This macro need not be a constant.
-+
-+You need not define this macro if the ordering is the same as for
-+multi-word integers.
-+*/
-+/* #define FLOAT_WORDS_BIG_ENDIAN 1 */
-+
-+/*
-+Define this macro to be the number of bits in an addressable storage
-+unit (byte); normally 8.
-+*/
-+#define BITS_PER_UNIT 8
-+
-+/*
-+Number of bits in a word; normally 32.
-+*/
-+#define BITS_PER_WORD 32
-+
-+/*
-+Maximum number of bits in a word.  If this is undefined, the default is
-+BITS_PER_WORD.  Otherwise, it is the constant value that is the
-+largest value that BITS_PER_WORD can have at run-time.
-+*/
-+/* MAX_BITS_PER_WORD not defined*/
-+
-+/*
-+Number of storage units in a word; normally 4.
-+*/
-+#define UNITS_PER_WORD 4
-+
-+/*
-+Minimum number of units in a word.  If this is undefined, the default is
-+UNITS_PER_WORD.  Otherwise, it is the constant value that is the
-+smallest value that UNITS_PER_WORD can have at run-time.
-+*/
-+/* MIN_UNITS_PER_WORD not defined */
-+
-+/*
-+Width of a pointer, in bits.  You must specify a value no wider than the
-+width of Pmode.  If it is not equal to the width of Pmode,
-+you must define POINTERS_EXTEND_UNSIGNED.
-+*/
-+#define POINTER_SIZE 32
-+
-+/*
-+A C expression whose value is greater than zero if pointers that need to be
-+extended from being POINTER_SIZE bits wide to Pmode are to
-+be zero-extended and zero if they are to be sign-extended.  If the value
-+is less then zero then there must be an "ptr_extend" instruction that
-+extends a pointer from POINTER_SIZE to Pmode.
-+
-+You need not define this macro if the POINTER_SIZE is equal
-+to the width of Pmode.
-+*/
-+/* #define POINTERS_EXTEND_UNSIGNED */
-+
-+/*
-+A Macro to update M and UNSIGNEDP when an object whose type
-+is TYPE and which has the specified mode and signedness is to be
-+stored in a register.  This macro is only called when TYPE is a
-+scalar type.
-+
-+On most RISC machines, which only have operations that operate on a full
-+register, define this macro to set M to word_mode if
-+M is an integer mode narrower than BITS_PER_WORD.  In most
-+cases, only integer modes should be widened because wider-precision
-+floating-point operations are usually more expensive than their narrower
-+counterparts.
-+
-+For most machines, the macro definition does not change UNSIGNEDP.
-+However, some machines, have instructions that preferentially handle
-+either signed or unsigned quantities of certain modes.  For example, on
-+the DEC Alpha, 32-bit loads from memory and 32-bit add instructions
-+sign-extend the result to 64 bits.  On such machines, set
-+UNSIGNEDP according to which kind of extension is more efficient.
-+
-+Do not define this macro if it would never modify M.
-+*/
-+#define PROMOTE_MODE(M, UNSIGNEDP, TYPE)                                \
-+  {                                                                     \
-+    if (!AGGREGATE_TYPE_P (TYPE)                                        \
-+        && GET_MODE_CLASS (mode) == MODE_INT                            \
-+        && GET_MODE_SIZE (mode) < 4)                                    \
-+      {                                                                 \
-+        if (M == QImode)                                                \
-+          (UNSIGNEDP) = 1;                                              \
-+        else if (M == HImode)                                           \
-+          (UNSIGNEDP) = 0;                                              \
-+        (M) = SImode;                                                   \
-+      }                                                                 \
-+  }
-+
-+#define PROMOTE_FUNCTION_MODE(M, UNSIGNEDP, TYPE)  \
-+        PROMOTE_MODE(M, UNSIGNEDP, TYPE)
-+
-+/* Define if operations between registers always perform the operation
-+   on the full register even if a narrower mode is specified.  */
-+#define WORD_REGISTER_OPERATIONS
-+
-+/* Define if loading in MODE, an integral mode narrower than BITS_PER_WORD
-+   will either zero-extend or sign-extend.  The value of this macro should
-+   be the code that says which one of the two operations is implicitly
-+   done, UNKNOWN if not known.  */
-+#define LOAD_EXTEND_OP(MODE)				\
-+   (((MODE) == QImode) ? ZERO_EXTEND			\
-+   : ((MODE) == HImode) ? SIGN_EXTEND : UNKNOWN)
-+
-+
-+/*
-+Normal alignment required for function parameters on the stack, in
-+bits.  All stack parameters receive at least this much alignment
-+regardless of data type.  On most machines, this is the same as the
-+size of an integer.
-+*/
-+#define PARM_BOUNDARY 32
-+
-+/*
-+Define this macro to the minimum alignment enforced by hardware for the
-+stack pointer on this machine.  The definition is a C expression for the
-+desired alignment (measured in bits).  This value is used as a default
-+if PREFERRED_STACK_BOUNDARY is not defined.  On most machines,
-+this should be the same as PARM_BOUNDARY.
-+*/
-+#define STACK_BOUNDARY 32
-+
-+/*
-+Define this macro if you wish to preserve a certain alignment for the
-+stack pointer, greater than what the hardware enforces.  The definition
-+is a C expression for the desired alignment (measured in bits).  This
-+macro must evaluate to a value equal to or larger than
-+STACK_BOUNDARY.
-+*/
-+#define PREFERRED_STACK_BOUNDARY (TARGET_FORCE_DOUBLE_ALIGN ? 64 : 32 )
-+
-+/*
-+Alignment required for a function entry point, in bits.
-+*/
-+#define FUNCTION_BOUNDARY 16
-+
-+/*
-+Biggest alignment that any data type can require on this machine, in bits.
-+*/
-+#define BIGGEST_ALIGNMENT  (TARGET_FORCE_DOUBLE_ALIGN ? 64 : 32 )
-+
-+/*
-+If defined, the smallest alignment, in bits, that can be given to an
-+object that can be referenced in one operation, without disturbing any
-+nearby object.  Normally, this is BITS_PER_UNIT, but may be larger
-+on machines that don't have byte or half-word store operations.
-+*/
-+#define MINIMUM_ATOMIC_ALIGNMENT BITS_PER_UNIT
-+
-+
-+/*
-+An integer expression for the size in bits of the largest integer machine mode that
-+should actually be used. All integer machine modes of this size or smaller can be
-+used for structures and unions with the appropriate sizes. If this macro is undefined,
-+GET_MODE_BITSIZE (DImode) is assumed.*/
-+#define MAX_FIXED_MODE_SIZE  GET_MODE_BITSIZE (DImode)
-+
-+
-+/*
-+If defined, a C expression to compute the alignment given to a constant
-+that is being placed in memory.  CONSTANT is the constant and
-+BASIC_ALIGN is the alignment that the object would ordinarily
-+have.  The value of this macro is used instead of that alignment to
-+align the object.
-+
-+If this macro is not defined, then BASIC_ALIGN is used.
-+
-+The typical use of this macro is to increase alignment for string
-+constants to be word aligned so that strcpy calls that copy
-+constants can be done inline.
-+*/
-+#define CONSTANT_ALIGNMENT(CONSTANT, BASIC_ALIGN) \
-+ ((TREE_CODE(CONSTANT) == STRING_CST) ? BITS_PER_WORD : BASIC_ALIGN)
-+
-+/* Try to align string to a word. */
-+#define DATA_ALIGNMENT(TYPE, ALIGN)                                     \
-+  ({(TREE_CODE (TYPE) == ARRAY_TYPE                                     \
-+     && TYPE_MODE (TREE_TYPE (TYPE)) == QImode                          \
-+     && (ALIGN) < BITS_PER_WORD ? BITS_PER_WORD : (ALIGN));})
-+
-+/* Try to align local store strings to a word. */
-+#define LOCAL_ALIGNMENT(TYPE, ALIGN)                                    \
-+  ({(TREE_CODE (TYPE) == ARRAY_TYPE                                     \
-+     && TYPE_MODE (TREE_TYPE (TYPE)) == QImode                          \
-+     && (ALIGN) < BITS_PER_WORD ? BITS_PER_WORD : (ALIGN));})
-+
-+/*
-+Define this macro to be the value 1 if instructions will fail to work
-+if given data not on the nominal alignment.  If instructions will merely
-+go slower in that case, define this macro as 0.
-+*/
-+#define STRICT_ALIGNMENT 1
-+
-+/*
-+Define this if you wish to imitate the way many other C compilers handle
-+alignment of bit-fields and the structures that contain them.
-+
-+The behavior is that the type written for a bit-field (int,
-+short, or other integer type) imposes an alignment for the
-+entire structure, as if the structure really did contain an ordinary
-+field of that type.  In addition, the bit-field is placed within the
-+structure so that it would fit within such a field, not crossing a
-+boundary for it.
-+
-+Thus, on most machines, a bit-field whose type is written as int
-+would not cross a four-byte boundary, and would force four-byte
-+alignment for the whole structure.  (The alignment used may not be four
-+bytes; it is controlled by the other alignment parameters.)
-+
-+If the macro is defined, its definition should be a C expression;
-+a nonzero value for the expression enables this behavior.
-+
-+Note that if this macro is not defined, or its value is zero, some
-+bit-fields may cross more than one alignment boundary.  The compiler can
-+support such references if there are insv, extv, and
-+extzv insns that can directly reference memory.
-+
-+The other known way of making bit-fields work is to define
-+STRUCTURE_SIZE_BOUNDARY as large as BIGGEST_ALIGNMENT.
-+Then every structure can be accessed with fullwords.
-+
-+Unless the machine has bit-field instructions or you define
-+STRUCTURE_SIZE_BOUNDARY that way, you must define
-+PCC_BITFIELD_TYPE_MATTERS to have a nonzero value.
-+
-+If your aim is to make GCC use the same conventions for laying out
-+bit-fields as are used by another compiler, here is how to investigate
-+what the other compiler does.  Compile and run this program:
-+
-+struct foo1
-+{
-+  char x;
-+  char :0;
-+  char y;
-+};
-+
-+struct foo2
-+{
-+  char x;
-+  int :0;
-+  char y;
-+};
-+
-+main ()
-+{
-+  printf ("Size of foo1 is %d\n",
-+          sizeof (struct foo1));
-+  printf ("Size of foo2 is %d\n",
-+          sizeof (struct foo2));
-+  exit (0);
-+}
-+
-+If this prints 2 and 5, then the compiler's behavior is what you would
-+get from PCC_BITFIELD_TYPE_MATTERS.
-+*/
-+#define PCC_BITFIELD_TYPE_MATTERS 1
-+
-+
-+/******************************************************************************
-+ * Layout of Source Language Data Types
-+ *****************************************************************************/
-+
-+/*
-+A C expression for the size in bits of the type int on the
-+target machine.  If you don't define this, the default is one word.
-+*/
-+#define INT_TYPE_SIZE 32
-+
-+/*
-+A C expression for the size in bits of the type short on the
-+target machine.  If you don't define this, the default is half a word. (If
-+this would be less than one storage unit, it is rounded up to one unit.)
-+*/
-+#define SHORT_TYPE_SIZE 16
-+
-+/*
-+A C expression for the size in bits of the type long on the
-+target machine.  If you don't define this, the default is one word.
-+*/
-+#define LONG_TYPE_SIZE 32
-+
-+
-+/*
-+A C expression for the size in bits of the type long long on the
-+target machine.  If you don't define this, the default is two
-+words.  If you want to support GNU Ada on your machine, the value of this
-+macro must be at least 64.
-+*/
-+#define LONG_LONG_TYPE_SIZE 64
-+
-+/*
-+A C expression for the size in bits of the type char on the
-+target machine.  If you don't define this, the default is
-+BITS_PER_UNIT.
-+*/
-+#define CHAR_TYPE_SIZE 8
-+
-+
-+/*
-+A C expression for the size in bits of the C++ type bool and
-+C99 type _Bool on the target machine.  If you don't define
-+this, and you probably shouldn't, the default is CHAR_TYPE_SIZE.
-+*/
-+#define BOOL_TYPE_SIZE 8
-+
-+
-+/*
-+An expression whose value is 1 or 0, according to whether the type
-+char should be signed or unsigned by default.  The user can
-+always override this default with the options -fsigned-char
-+and -funsigned-char.
-+*/
-+/* We are using unsigned char */
-+#define DEFAULT_SIGNED_CHAR 0
-+
-+
-+/*
-+A C expression for a string describing the name of the data type to use
-+for size values.  The typedef name size_t is defined using the
-+contents of the string.
-+
-+The string can contain more than one keyword.  If so, separate them with
-+spaces, and write first any length keyword, then unsigned if
-+appropriate, and finally int.  The string must exactly match one
-+of the data type names defined in the function
-+init_decl_processing in the file c-decl.c.  You may not
-+omit int or change the order - that would cause the compiler to
-+crash on startup.
-+
-+If you don't define this macro, the default is "long unsigned int".
-+*/
-+#define SIZE_TYPE "long unsigned int"
-+
-+/*
-+A C expression for a string describing the name of the data type to use
-+for the result of subtracting two pointers.  The typedef name
-+ptrdiff_t is defined using the contents of the string.  See
-+SIZE_TYPE above for more information.
-+
-+If you don't define this macro, the default is "long int".
-+*/
-+#define PTRDIFF_TYPE "long int"
-+
-+
-+/*
-+A C expression for the size in bits of the data type for wide
-+characters.  This is used in cpp, which cannot make use of
-+WCHAR_TYPE.
-+*/
-+#define WCHAR_TYPE_SIZE 32
-+
-+
-+/*
-+A C expression for a string describing the name of the data type to
-+use for wide characters passed to printf and returned from
-+getwc.  The typedef name wint_t is defined using the
-+contents of the string.  See SIZE_TYPE above for more
-+information.
-+
-+If you don't define this macro, the default is "unsigned int".
-+*/
-+#define WINT_TYPE "unsigned int"
-+
-+/*
-+A C expression for a string describing the name of the data type that
-+can represent any value of any standard or extended signed integer type.
-+The typedef name intmax_t is defined using the contents of the
-+string.  See SIZE_TYPE above for more information.
-+
-+If you don't define this macro, the default is the first of
-+"int", "long int", or "long long int" that has as
-+much precision as long long int.
-+*/
-+#define INTMAX_TYPE "long long int"
-+
-+/*
-+A C expression for a string describing the name of the data type that
-+can represent any value of any standard or extended unsigned integer
-+type.  The typedef name uintmax_t is defined using the contents
-+of the string.  See SIZE_TYPE above for more information.
-+
-+If you don't define this macro, the default is the first of
-+"unsigned int", "long unsigned int", or "long long unsigned int"
-+that has as much precision as long long unsigned int.
-+*/
-+#define UINTMAX_TYPE "long long unsigned int"
-+
-+
-+/******************************************************************************
-+ * Register Usage
-+ *****************************************************************************/
-+
-+/* Convert from gcc internal register number to register number
-+   used in assembly code */
-+#define ASM_REGNUM(reg) (LAST_REGNUM - (reg))
-+
-+/* Convert between register number used in assembly to gcc
-+   internal register number  */
-+#define INTERNAL_REGNUM(reg) (LAST_REGNUM - (reg))
-+
-+/** Basic Characteristics of Registers **/
-+
-+/*
-+Number of hardware registers known to the compiler.  They receive
-+numbers 0 through FIRST_PSEUDO_REGISTER-1; thus, the first
-+pseudo register's number really is assigned the number
-+FIRST_PSEUDO_REGISTER.
-+*/
-+#define FIRST_PSEUDO_REGISTER (LAST_REGNUM + 1)
-+
-+#define FIRST_REGNUM 0
-+#define LAST_REGNUM 15
-+
-+/*
-+An initializer that says which registers are used for fixed purposes
-+all throughout the compiled code and are therefore not available for
-+general allocation.  These would include the stack pointer, the frame
-+pointer (except on machines where that can be used as a general
-+register when no frame pointer is needed), the program counter on
-+machines where that is considered one of the addressable registers,
-+and any other numbered register with a standard use.
-+
-+This information is expressed as a sequence of numbers, separated by
-+commas and surrounded by braces.  The nth number is 1 if
-+register n is fixed, 0 otherwise.
-+
-+The table initialized from this macro, and the table initialized by
-+the following one, may be overridden at run time either automatically,
-+by the actions of the macro CONDITIONAL_REGISTER_USAGE, or by
-+the user with the command options -ffixed-[reg],
-+-fcall-used-[reg] and -fcall-saved-[reg].
-+*/
-+
-+/* The internal gcc register numbers are reversed
-+   compared to the real register numbers since
-+   gcc expects data types stored over multiple
-+   registers in the register file to be big endian
-+   if the memory layout is big endian. But this
-+   is not the case for avr32 so we fake a big
-+   endian register file. */
-+
-+#define FIXED_REGISTERS {	\
-+  1, /* Program Counter */	\
-+  0, /* Link Register */	\
-+  1, /* Stack Pointer */	\
-+  0, /* r12 */			\
-+  0, /* r11 */			\
-+  0, /* r10 */			\
-+  0, /* r9 */			\
-+  0, /* r8 */			\
-+  0, /* r7 */			\
-+  0, /* r6 */			\
-+  0, /* r5 */			\
-+  0, /* r4 */			\
-+  0, /* r3 */			\
-+  0, /* r2 */			\
-+  0, /* r1 */			\
-+  0, /* r0 */			\
-+}
-+
-+/*
-+Like FIXED_REGISTERS but has 1 for each register that is
-+clobbered (in general) by function calls as well as for fixed
-+registers.  This macro therefore identifies the registers that are not
-+available for general allocation of values that must live across
-+function calls.
-+
-+If a register has 0 in CALL_USED_REGISTERS, the compiler
-+automatically saves it on function entry and restores it on function
-+exit, if the register is used within the function.
-+*/
-+#define CALL_USED_REGISTERS {	\
-+  1, /* Program Counter */	\
-+  0, /* Link Register */	\
-+  1, /* Stack Pointer */	\
-+  1, /* r12 */			\
-+  1, /* r11 */			\
-+  1, /* r10 */			\
-+  1, /* r9 */			\
-+  1, /* r8 */			\
-+  0, /* r7 */			\
-+  0, /* r6 */			\
-+  0, /* r5 */			\
-+  0, /* r4 */			\
-+  0, /* r3 */			\
-+  0, /* r2 */			\
-+  0, /* r1 */			\
-+  0, /* r0 */			\
-+}
-+
-+/* Interrupt functions can only use registers that have already been
-+   saved by the prologue, even if they would normally be
-+   call-clobbered.  */
-+#define HARD_REGNO_RENAME_OK(SRC, DST)					\
-+	(! IS_INTERRUPT (cfun->machine->func_type) ||			\
-+         df_regs_ever_live_p (DST))
-+
-+
-+/*
-+Zero or more C statements that may conditionally modify five variables
-+fixed_regs, call_used_regs, global_regs,
-+reg_names, and reg_class_contents, to take into account
-+any dependence of these register sets on target flags.  The first three
-+of these are of type char [] (interpreted as Boolean vectors).
-+global_regs is a const char *[], and
-+reg_class_contents is a HARD_REG_SET.  Before the macro is
-+called, fixed_regs, call_used_regs,
-+reg_class_contents, and reg_names have been initialized
-+from FIXED_REGISTERS, CALL_USED_REGISTERS,
-+REG_CLASS_CONTENTS, and REGISTER_NAMES, respectively.
-+global_regs has been cleared, and any -ffixed-[reg],
-+-fcall-used-[reg] and -fcall-saved-[reg]
-+command options have been applied.
-+
-+You need not define this macro if it has no work to do.
-+
-+If the usage of an entire class of registers depends on the target
-+flags, you may indicate this to GCC by using this macro to modify
-+fixed_regs and call_used_regs to 1 for each of the
-+registers in the classes which should not be used by GCC.  Also define
-+the macro REG_CLASS_FROM_LETTER to return NO_REGS if it
-+is called with a letter for a class that shouldn't be used.
-+
-+ (However, if this class is not included in GENERAL_REGS and all
-+of the insn patterns whose constraints permit this class are
-+controlled by target switches, then GCC will automatically avoid using
-+these registers when the target switches are opposed to them.)
-+*/
-+#define CONDITIONAL_REGISTER_USAGE                              \
-+  do								\
-+    {								\
-+      if (flag_pic)						\
-+	{							\
-+	  fixed_regs[PIC_OFFSET_TABLE_REGNUM] = 1;		\
-+	  call_used_regs[PIC_OFFSET_TABLE_REGNUM] = 1;		\
-+	}							\
-+    }								\
-+  while (0)
-+
-+
-+/*
-+If the program counter has a register number, define this as that
-+register number.  Otherwise, do not define it.
-+*/
-+
-+#define LAST_AVR32_REGNUM 16
-+
-+
-+/** Order of Allocation of Registers **/
-+
-+/*
-+If defined, an initializer for a vector of integers, containing the
-+numbers of hard registers in the order in which GCC should prefer
-+to use them (from most preferred to least).
-+
-+If this macro is not defined, registers are used lowest numbered first
-+(all else being equal).
-+
-+One use of this macro is on machines where the highest numbered
-+registers must always be saved and the save-multiple-registers
-+instruction supports only sequences of consecutive registers.  On such
-+machines, define REG_ALLOC_ORDER to be an initializer that lists
-+the highest numbered allocable register first.
-+*/
-+#define REG_ALLOC_ORDER 	\
-+{				\
-+  INTERNAL_REGNUM(8),		\
-+  INTERNAL_REGNUM(9),		\
-+  INTERNAL_REGNUM(10),		\
-+  INTERNAL_REGNUM(11),		\
-+  INTERNAL_REGNUM(12),		\
-+  LR_REGNUM,			\
-+  INTERNAL_REGNUM(7),		\
-+  INTERNAL_REGNUM(6),		\
-+  INTERNAL_REGNUM(5),		\
-+  INTERNAL_REGNUM(4),		\
-+  INTERNAL_REGNUM(3),		\
-+  INTERNAL_REGNUM(2),		\
-+  INTERNAL_REGNUM(1),		\
-+  INTERNAL_REGNUM(0),		\
-+  SP_REGNUM,           		\
-+  PC_REGNUM			\
-+}
-+
-+
-+/** How Values Fit in Registers **/
-+
-+/*
-+A C expression for the number of consecutive hard registers, starting
-+at register number REGNO, required to hold a value of mode
-+MODE.
-+
-+On a machine where all registers are exactly one word, a suitable
-+definition of this macro is
-+
-+#define HARD_REGNO_NREGS(REGNO, MODE)            \
-+   ((GET_MODE_SIZE (MODE) + UNITS_PER_WORD - 1)  \
-+    / UNITS_PER_WORD)
-+*/
-+#define HARD_REGNO_NREGS(REGNO, MODE) \
-+  ((unsigned int)((GET_MODE_SIZE(MODE) + UNITS_PER_WORD -1 ) / UNITS_PER_WORD))
-+
-+/*
-+A C expression that is nonzero if it is permissible to store a value
-+of mode MODE in hard register number REGNO (or in several
-+registers starting with that one).  For a machine where all registers
-+are equivalent, a suitable definition is
-+
-+  #define HARD_REGNO_MODE_OK(REGNO, MODE) 1
-+
-+You need not include code to check for the numbers of fixed registers,
-+because the allocation mechanism considers them to be always occupied.
-+
-+On some machines, double-precision values must be kept in even/odd
-+register pairs.  You can implement that by defining this macro to reject
-+odd register numbers for such modes.
-+
-+The minimum requirement for a mode to be OK in a register is that the
-+mov[mode] instruction pattern support moves between the
-+register and other hard register in the same class and that moving a
-+value into the register and back out not alter it.
-+
-+Since the same instruction used to move word_mode will work for
-+all narrower integer modes, it is not necessary on any machine for
-+HARD_REGNO_MODE_OK to distinguish between these modes, provided
-+you define patterns movhi, etc., to take advantage of this.  This
-+is useful because of the interaction between HARD_REGNO_MODE_OK
-+and MODES_TIEABLE_P; it is very desirable for all integer modes
-+to be tieable.
-+
-+Many machines have special registers for floating point arithmetic.
-+Often people assume that floating point machine modes are allowed only
-+in floating point registers.  This is not true.  Any registers that
-+can hold integers can safely hold a floating point machine
-+mode, whether or not floating arithmetic can be done on it in those
-+registers.  Integer move instructions can be used to move the values.
-+
-+On some machines, though, the converse is true: fixed-point machine
-+modes may not go in floating registers.  This is true if the floating
-+registers normalize any value stored in them, because storing a
-+non-floating value there would garble it.  In this case,
-+HARD_REGNO_MODE_OK should reject fixed-point machine modes in
-+floating registers.  But if the floating registers do not automatically
-+normalize, if you can store any bit pattern in one and retrieve it
-+unchanged without a trap, then any machine mode may go in a floating
-+register, so you can define this macro to say so.
-+
-+The primary significance of special floating registers is rather that
-+they are the registers acceptable in floating point arithmetic
-+instructions.  However, this is of no concern to
-+HARD_REGNO_MODE_OK.  You handle it by writing the proper
-+constraints for those instructions.
-+
-+On some machines, the floating registers are especially slow to access,
-+so that it is better to store a value in a stack frame than in such a
-+register if floating point arithmetic is not being done.  As long as the
-+floating registers are not in class GENERAL_REGS, they will not
-+be used unless some pattern's constraint asks for one.
-+*/
-+#define HARD_REGNO_MODE_OK(REGNO, MODE) avr32_hard_regno_mode_ok(REGNO, MODE)
-+
-+/*
-+A C expression that is nonzero if a value of mode
-+MODE1 is accessible in mode MODE2 without copying.
-+
-+If HARD_REGNO_MODE_OK(R, MODE1) and
-+HARD_REGNO_MODE_OK(R, MODE2) are always the same for
-+any R, then MODES_TIEABLE_P(MODE1, MODE2)
-+should be nonzero.  If they differ for any R, you should define
-+this macro to return zero unless some other mechanism ensures the
-+accessibility of the value in a narrower mode.
-+
-+You should define this macro to return nonzero in as many cases as
-+possible since doing so will allow GCC to perform better register
-+allocation.
-+*/
-+#define MODES_TIEABLE_P(MODE1, MODE2)  \
-+  (GET_MODE_CLASS (MODE1) == GET_MODE_CLASS (MODE2))
-+
-+
-+
-+/******************************************************************************
-+ * Register Classes
-+ *****************************************************************************/
-+
-+/*
-+An enumeral type that must be defined with all the register class names
-+as enumeral values.  NO_REGS must be first.  ALL_REGS
-+must be the last register class, followed by one more enumeral value,
-+LIM_REG_CLASSES, which is not a register class but rather
-+tells how many classes there are.
-+
-+Each register class has a number, which is the value of casting
-+the class name to type int.  The number serves as an index
-+in many of the tables described below.
-+*/
-+enum reg_class
-+{
-+  NO_REGS,
-+  GENERAL_REGS,
-+  ALL_REGS,
-+  LIM_REG_CLASSES
-+};
-+
-+/*
-+The number of distinct register classes, defined as follows:
-+  #define N_REG_CLASSES (int) LIM_REG_CLASSES
-+*/
-+#define N_REG_CLASSES (int)LIM_REG_CLASSES
-+
-+/*
-+An initializer containing the names of the register classes as C string
-+constants.  These names are used in writing some of the debugging dumps.
-+*/
-+#define REG_CLASS_NAMES		\
-+{				\
-+  "NO_REGS",			\
-+  "GENERAL_REGS",		\
-+  "ALL_REGS"			\
-+}
-+
-+/*
-+An initializer containing the contents of the register classes, as integers
-+which are bit masks.  The nth integer specifies the contents of class
-+n.  The way the integer mask is interpreted is that
-+register r is in the class if mask & (1 << r) is 1.
-+
-+When the machine has more than 32 registers, an integer does not suffice.
-+Then the integers are replaced by sub-initializers, braced groupings containing
-+several integers.  Each sub-initializer must be suitable as an initializer
-+for the type HARD_REG_SET which is defined in hard-reg-set.h.
-+In this situation, the first integer in each sub-initializer corresponds to
-+registers 0 through 31, the second integer to registers 32 through 63, and
-+so on.
-+*/
-+#define REG_CLASS_CONTENTS {		\
-+  {0x00000000}, /* NO_REGS */		\
-+  {0x0000FFFF}, /* GENERAL_REGS */	\
-+  {0x7FFFFFFF}, /* ALL_REGS */		\
-+}
-+
-+
-+/*
-+A C expression whose value is a register class containing hard register
-+REGNO.  In general there is more than one such class; choose a class
-+which is minimal, meaning that no smaller class also contains the
-+register.
-+*/
-+#define REGNO_REG_CLASS(REGNO) (GENERAL_REGS)
-+
-+/*
-+A macro whose definition is the name of the class to which a valid
-+base register must belong.  A base register is one used in an address
-+which is the register value plus a displacement.
-+*/
-+#define BASE_REG_CLASS GENERAL_REGS
-+
-+/*
-+This is a variation of the BASE_REG_CLASS macro which allows
-+the selection of a base register in a mode depenedent manner.  If
-+mode is VOIDmode then it should return the same value as
-+BASE_REG_CLASS.
-+*/
-+#define MODE_BASE_REG_CLASS(MODE) BASE_REG_CLASS
-+
-+/*
-+A macro whose definition is the name of the class to which a valid
-+index register must belong.  An index register is one used in an
-+address where its value is either multiplied by a scale factor or
-+added to another register (as well as added to a displacement).
-+*/
-+#define INDEX_REG_CLASS BASE_REG_CLASS
-+
-+/*
-+A C expression which defines the machine-dependent operand constraint
-+letters for register classes.  If CHAR is such a letter, the
-+value should be the register class corresponding to it.  Otherwise,
-+the value should be NO_REGS.  The register letter r,
-+corresponding to class GENERAL_REGS, will not be passed
-+to this macro; you do not need to handle it.
-+*/
-+#define REG_CLASS_FROM_LETTER(CHAR) NO_REGS
-+
-+/* These assume that REGNO is a hard or pseudo reg number.
-+   They give nonzero only if REGNO is a hard reg of the suitable class
-+   or a pseudo reg currently allocated to a suitable hard reg.
-+   Since they use reg_renumber, they are safe only once reg_renumber
-+   has been allocated, which happens in local-alloc.c.  */
-+#define TEST_REGNO(R, TEST, VALUE) \
-+  ((R TEST VALUE) || ((unsigned) reg_renumber[R] TEST VALUE))
-+
-+/*
-+A C expression which is nonzero if register number num is suitable for use as a base
-+register in operand addresses. It may be either a suitable hard register or a pseudo
-+register that has been allocated such a hard register.
-+*/
-+#define REGNO_OK_FOR_BASE_P(NUM)  TEST_REGNO(NUM, <=, LAST_REGNUM)
-+
-+/* The following macro defines cover classes for Integrated Register
-+   Allocator.  Cover classes is a set of non-intersected register
-+   classes covering all hard registers used for register allocation
-+   purpose.  Any move between two registers of a cover class should be
-+   cheaper than load or store of the registers.  The macro value is
-+   array of register classes with LIM_REG_CLASSES used as the end
-+   marker.  */
-+
-+#define IRA_COVER_CLASSES               \
-+{                                       \
-+  GENERAL_REGS, LIM_REG_CLASSES         \
-+}
-+
-+/*
-+A C expression which is nonzero if register number NUM is
-+suitable for use as an index register in operand addresses.  It may be
-+either a suitable hard register or a pseudo register that has been
-+allocated such a hard register.
-+
-+The difference between an index register and a base register is that
-+the index register may be scaled.  If an address involves the sum of
-+two registers, neither one of them scaled, then either one may be
-+labeled the ``base'' and the other the ``index''; but whichever
-+labeling is used must fit the machine's constraints of which registers
-+may serve in each capacity.  The compiler will try both labelings,
-+looking for one that is valid, and will reload one or both registers
-+only if neither labeling works.
-+*/
-+#define REGNO_OK_FOR_INDEX_P(NUM) TEST_REGNO(NUM, <=, LAST_REGNUM)
-+
-+/*
-+A C expression that places additional restrictions on the register class
-+to use when it is necessary to copy value X into a register in class
-+CLASS.  The value is a register class; perhaps CLASS, or perhaps
-+another, smaller class.  On many machines, the following definition is
-+safe: #define PREFERRED_RELOAD_CLASS(X,CLASS) CLASS
-+
-+Sometimes returning a more restrictive class makes better code.  For
-+example, on the 68000, when X is an integer constant that is in range
-+for a 'moveq' instruction, the value of this macro is always
-+DATA_REGS as long as CLASS includes the data registers.
-+Requiring a data register guarantees that a 'moveq' will be used.
-+
-+If X is a const_double, by returning NO_REGS
-+you can force X into a memory constant.  This is useful on
-+certain machines where immediate floating values cannot be loaded into
-+certain kinds of registers.
-+*/
-+#define PREFERRED_RELOAD_CLASS(X, CLASS)  CLASS
-+
-+
-+
-+/*
-+A C expression for the maximum number of consecutive registers
-+of class CLASS needed to hold a value of mode MODE.
-+
-+This is closely related to the macro HARD_REGNO_NREGS.  In fact,
-+the value of the macro CLASS_MAX_NREGS(CLASS, MODE)
-+should be the maximum value of HARD_REGNO_NREGS(REGNO, MODE)
-+for all REGNO values in the class CLASS.
-+
-+This macro helps control the handling of multiple-word values
-+in the reload pass.
-+*/
-+#define CLASS_MAX_NREGS(CLASS, MODE) /* ToDo:fixme */ \
-+  (unsigned int)((GET_MODE_SIZE(MODE) + UNITS_PER_WORD - 1) / UNITS_PER_WORD)
-+
-+
-+/*
-+  Using CONST_OK_FOR_CONSTRAINT_P instead of CONS_OK_FOR_LETTER_P
-+  in order to support constraints with more than one letter.
-+  Only two letters are then used for constant constraints,
-+  the letter 'K' and the letter 'I'. The constraint starting with
-+  these letters must consist of four characters. The character following
-+  'K' or 'I' must be either 'u' (unsigned) or 's' (signed) to specify
-+  if the constant is zero or sign extended. The last two characters specify
-+  the length in bits of the constant. The base constraint letter 'I' means
-+  that this is an negated constant, meaning that actually -VAL should be
-+  checked to lie withing the valid range instead of VAL which is used when
-+  'K' is the base constraint letter.
-+
-+*/
-+
-+#define CONSTRAINT_LEN(C, STR)				\
-+  ( ((C) == 'K' || (C) == 'I') ?  4 :			\
-+    ((C) == 'R') ?  5 :					\
-+    ((C) == 'P') ? -1 :                                 \
-+    DEFAULT_CONSTRAINT_LEN((C), (STR)) )
-+
-+#define CONST_OK_FOR_CONSTRAINT_P(VALUE, C, STR)	\
-+  avr32_const_ok_for_constraint_p(VALUE, C, STR)
-+
-+/*
-+A C expression that defines the machine-dependent operand constraint
-+letters that specify particular ranges of const_double values ('G' or 'H').
-+
-+If C is one of those letters, the expression should check that
-+VALUE, an RTX of code const_double, is in the appropriate
-+range and return 1 if so, 0 otherwise.  If C is not one of those
-+letters, the value should be 0 regardless of VALUE.
-+
-+const_double is used for all floating-point constants and for
-+DImode fixed-point constants.  A given letter can accept either
-+or both kinds of values.  It can use GET_MODE to distinguish
-+between these kinds.
-+*/
-+#define CONST_DOUBLE_OK_FOR_LETTER_P(OP, C) \
-+  ((C) == 'G' ? avr32_const_double_immediate(OP) : 0)
-+
-+/*
-+A C expression that defines the optional machine-dependent constraint
-+letters that can be used to segregate specific types of operands, usually
-+memory references, for the target machine.  Any letter that is not
-+elsewhere defined and not matched by REG_CLASS_FROM_LETTER
-+may be used.  Normally this macro will not be defined.
-+
-+If it is required for a particular target machine, it should return 1
-+if VALUE corresponds to the operand type represented by the
-+constraint letter C.  If C is not defined as an extra
-+constraint, the value returned should be 0 regardless of VALUE.
-+
-+For example, on the ROMP, load instructions cannot have their output
-+in r0 if the memory reference contains a symbolic address.  Constraint
-+letter 'Q' is defined as representing a memory address that does
-+not contain a symbolic address.  An alternative is specified with
-+a 'Q' constraint on the input and 'r' on the output.  The next
-+alternative specifies 'm' on the input and a register class that
-+does not include r0 on the output.
-+*/
-+#define EXTRA_CONSTRAINT_STR(OP, C, STR)				\
-+  ((C) == 'W' ? avr32_address_operand(OP, GET_MODE(OP)) :		\
-+   (C) == 'R' ? (avr32_indirect_register_operand(OP, GET_MODE(OP)) ||	\
-+                 (avr32_imm_disp_memory_operand(OP, GET_MODE(OP))	\
-+                  && avr32_const_ok_for_constraint_p(			\
-+				INTVAL(XEXP(XEXP(OP, 0), 1)),		\
-+				(STR)[1], &(STR)[1]))) :		\
-+   (C) == 'S' ? avr32_indexed_memory_operand(OP, GET_MODE(OP)) :	\
-+   (C) == 'T' ? avr32_const_pool_ref_operand(OP, GET_MODE(OP)) :	\
-+   (C) == 'U' ? SYMBOL_REF_RCALL_FUNCTION_P(OP) :			\
-+   (C) == 'Z' ? avr32_cop_memory_operand(OP, GET_MODE(OP)) :		\
-+   (C) == 'Q' ? avr32_non_rmw_memory_operand(OP, GET_MODE(OP)) :		\
-+   (C) == 'Y' ? avr32_rmw_memory_operand(OP, GET_MODE(OP)) :            \
-+   0)
-+
-+
-+#define EXTRA_MEMORY_CONSTRAINT(C, STR) ( ((C) == 'R') ||               \
-+                                          ((C) == 'Q') ||               \
-+                                          ((C) == 'S') ||               \
-+                                          ((C) == 'Y') ||               \
-+                                          ((C) == 'Z') )
-+
-+
-+/* Returns nonzero if op is a function SYMBOL_REF which
-+   can be called using an rcall instruction */
-+#define SYMBOL_REF_RCALL_FUNCTION_P(op)  \
-+  ( GET_CODE(op) == SYMBOL_REF           \
-+    && SYMBOL_REF_FUNCTION_P(op)         \
-+    && SYMBOL_REF_LOCAL_P(op)            \
-+    && !SYMBOL_REF_EXTERNAL_P(op)        \
-+    && !TARGET_HAS_ASM_ADDR_PSEUDOS )
-+
-+/******************************************************************************
-+ * Stack Layout and Calling Conventions
-+ *****************************************************************************/
-+
-+/** Basic Stack Layout **/
-+
-+/*
-+Define this macro if pushing a word onto the stack moves the stack
-+pointer to a smaller address.
-+
-+When we say, ``define this macro if ...,'' it means that the
-+compiler checks this macro only with #ifdef so the precise
-+definition used does not matter.
-+*/
-+/* pushm decrece SP: *(--SP) <-- Rx */
-+#define STACK_GROWS_DOWNWARD
-+
-+/*
-+This macro defines the operation used when something is pushed
-+on the stack.  In RTL, a push operation will be
-+(set (mem (STACK_PUSH_CODE (reg sp))) ...)
-+
-+The choices are PRE_DEC, POST_DEC, PRE_INC,
-+and POST_INC.  Which of these is correct depends on
-+the stack direction and on whether the stack pointer points
-+to the last item on the stack or whether it points to the
-+space for the next item on the stack.
-+
-+The default is PRE_DEC when STACK_GROWS_DOWNWARD is
-+defined, which is almost always right, and PRE_INC otherwise,
-+which is often wrong.
-+*/
-+/* pushm: *(--SP) <-- Rx */
-+#define STACK_PUSH_CODE PRE_DEC
-+
-+/* Define this to nonzero if the nominal address of the stack frame
-+   is at the high-address end of the local variables;
-+   that is, each additional local variable allocated
-+   goes at a more negative offset in the frame.  */
-+#define FRAME_GROWS_DOWNWARD 1
-+
-+
-+/*
-+Offset from the frame pointer to the first local variable slot to be allocated.
-+
-+If FRAME_GROWS_DOWNWARD, find the next slot's offset by
-+subtracting the first slot's length from STARTING_FRAME_OFFSET.
-+Otherwise, it is found by adding the length of the first slot to the
-+value STARTING_FRAME_OFFSET.
-+  (i'm not sure if the above is still correct.. had to change it to get
-+   rid of an overfull.  --mew 2feb93 )
-+*/
-+#define STARTING_FRAME_OFFSET 0
-+
-+/*
-+Offset from the stack pointer register to the first location at which
-+outgoing arguments are placed.  If not specified, the default value of
-+zero is used.  This is the proper value for most machines.
-+
-+If ARGS_GROW_DOWNWARD, this is the offset to the location above
-+the first location at which outgoing arguments are placed.
-+*/
-+#define STACK_POINTER_OFFSET 0
-+
-+/*
-+Offset from the argument pointer register to the first argument's
-+address.  On some machines it may depend on the data type of the
-+function.
-+
-+If ARGS_GROW_DOWNWARD, this is the offset to the location above
-+the first argument's address.
-+*/
-+#define FIRST_PARM_OFFSET(FUNDECL) 0
-+
-+
-+/*
-+A C expression whose value is RTL representing the address in a stack
-+frame where the pointer to the caller's frame is stored.  Assume that
-+FRAMEADDR is an RTL expression for the address of the stack frame
-+itself.
-+
-+If you don't define this macro, the default is to return the value
-+of FRAMEADDR - that is, the stack frame address is also the
-+address of the stack word that points to the previous frame.
-+*/
-+#define DYNAMIC_CHAIN_ADDRESS(FRAMEADDR) plus_constant ((FRAMEADDR), 4)
-+
-+
-+/*
-+A C expression whose value is RTL representing the value of the return
-+address for the frame COUNT steps up from the current frame, after
-+the prologue.  FRAMEADDR is the frame pointer of the COUNT
-+frame, or the frame pointer of the COUNT - 1 frame if
-+RETURN_ADDR_IN_PREVIOUS_FRAME is defined.
-+
-+The value of the expression must always be the correct address when
-+COUNT is zero, but may be NULL_RTX if there is not way to
-+determine the return address of other frames.
-+*/
-+#define RETURN_ADDR_RTX(COUNT, FRAMEADDR) avr32_return_addr(COUNT, FRAMEADDR)
-+
-+
-+/*
-+A C expression whose value is RTL representing the location of the
-+incoming return address at the beginning of any function, before the
-+prologue.  This RTL is either a REG, indicating that the return
-+value is saved in 'REG', or a MEM representing a location in
-+the stack.
-+
-+You only need to define this macro if you want to support call frame
-+debugging information like that provided by DWARF 2.
-+
-+If this RTL is a REG, you should also define
-+DWARF_FRAME_RETURN_COLUMN to DWARF_FRAME_REGNUM (REGNO).
-+*/
-+#define INCOMING_RETURN_ADDR_RTX gen_rtx_REG (Pmode, LR_REGNUM)
-+
-+/*
-+A C expression whose value is an integer giving the offset, in bytes,
-+from the value of the stack pointer register to the top of the stack
-+frame at the beginning of any function, before the prologue.  The top of
-+the frame is defined to be the value of the stack pointer in the
-+previous frame, just before the call instruction.
-+
-+You only need to define this macro if you want to support call frame
-+debugging information like that provided by DWARF 2.
-+*/
-+#define INCOMING_FRAME_SP_OFFSET 0
-+
-+
-+/** Exception Handling Support **/
-+
-+/* Use setjump/longjump for exception handling. */
-+#define DWARF2_UNWIND_INFO 0
-+#define MUST_USE_SJLJ_EXCEPTIONS 1
-+
-+/*
-+A C expression whose value is the Nth register number used for
-+data by exception handlers, or INVALID_REGNUM if fewer than
-+N registers are usable.
-+
-+The exception handling library routines communicate with the exception
-+handlers via a set of agreed upon registers.  Ideally these registers
-+should be call-clobbered; it is possible to use call-saved registers,
-+but may negatively impact code size.  The target must support at least
-+2 data registers, but should define 4 if there are enough free registers.
-+
-+You must define this macro if you want to support call frame exception
-+handling like that provided by DWARF 2.
-+*/
-+/*
-+  Use r9-r11
-+*/
-+#define EH_RETURN_DATA_REGNO(N)                                         \
-+  ((N<3) ? INTERNAL_REGNUM(N+9) : INVALID_REGNUM)
-+
-+/*
-+A C expression whose value is RTL representing a location in which
-+to store a stack adjustment to be applied before function return.
-+This is used to unwind the stack to an exception handler's call frame.
-+It will be assigned zero on code paths that return normally.
-+
-+Typically this is a call-clobbered hard register that is otherwise
-+untouched by the epilogue, but could also be a stack slot.
-+
-+You must define this macro if you want to support call frame exception
-+handling like that provided by DWARF 2.
-+*/
-+/*
-+  Use r8
-+*/
-+#define EH_RETURN_STACKADJ_REGNO INTERNAL_REGNUM(8)
-+#define EH_RETURN_STACKADJ_RTX gen_rtx_REG(SImode, EH_RETURN_STACKADJ_REGNO)
-+
-+/*
-+A C expression whose value is RTL representing a location in which
-+to store the address of an exception handler to which we should
-+return.  It will not be assigned on code paths that return normally.
-+
-+Typically this is the location in the call frame at which the normal
-+return address is stored.  For targets that return by popping an
-+address off the stack, this might be a memory address just below
-+the target call frame rather than inside the current call
-+frame.  EH_RETURN_STACKADJ_RTX will have already been assigned,
-+so it may be used to calculate the location of the target call frame.
-+
-+Some targets have more complex requirements than storing to an
-+address calculable during initial code generation.  In that case
-+the eh_return instruction pattern should be used instead.
-+
-+If you want to support call frame exception handling, you must
-+define either this macro or the eh_return instruction pattern.
-+*/
-+/*
-+  We define the eh_return instruction pattern, so this isn't needed.
-+*/
-+/* #define EH_RETURN_HANDLER_RTX gen_rtx_REG(Pmode, RET_REGISTER) */
-+
-+/*
-+  This macro chooses the encoding of pointers embedded in the
-+  exception handling sections. If at all possible, this should be
-+  defined such that the exception handling section will not require
-+  dynamic relocations, and so may be read-only.
-+
-+  code is 0 for data, 1 for code labels, 2 for function
-+  pointers. global is true if the symbol may be affected by dynamic
-+  relocations. The macro should return a combination of the DW_EH_PE_*
-+  defines as found in dwarf2.h.
-+
-+  If this macro is not defined, pointers will not be encoded but
-+  represented directly.
-+*/
-+#define ASM_PREFERRED_EH_DATA_FORMAT(CODE, GLOBAL)	\
-+  ((flag_pic && (GLOBAL) ? DW_EH_PE_indirect : 0)	\
-+   | (flag_pic ? DW_EH_PE_pcrel : DW_EH_PE_absptr)	\
-+   | DW_EH_PE_sdata4)
-+
-+/* ToDo: The rest of this subsection */
-+
-+/** Specifying How Stack Checking is Done **/
-+/* ToDo: All in this subsection */
-+
-+/** Registers That Address the Stack Frame **/
-+
-+/*
-+The register number of the stack pointer register, which must also be a
-+fixed register according to FIXED_REGISTERS.  On most machines,
-+the hardware determines which register this is.
-+*/
-+/* Using r13 as stack pointer. */
-+#define STACK_POINTER_REGNUM INTERNAL_REGNUM(13)
-+
-+/*
-+The register number of the frame pointer register, which is used to
-+access automatic variables in the stack frame.  On some machines, the
-+hardware determines which register this is.  On other machines, you can
-+choose any register you wish for this purpose.
-+*/
-+/* Use r7 */
-+#define FRAME_POINTER_REGNUM INTERNAL_REGNUM(7)
-+
-+/*
-+The register number of the arg pointer register, which is used to access
-+the function's argument list.  On some machines, this is the same as the
-+frame pointer register.  On some machines, the hardware determines which
-+register this is.  On other machines, you can choose any register you
-+wish for this purpose.  If this is not the same register as the frame
-+pointer register, then you must mark it as a fixed register according to
-+FIXED_REGISTERS, or arrange to be able to eliminate it (see Section
-+10.10.5 [Elimination], page 224).
-+*/
-+/* Using r5 */
-+#define ARG_POINTER_REGNUM INTERNAL_REGNUM(4)
-+
-+
-+/*
-+Register numbers used for passing a function's static chain pointer.  If
-+register windows are used, the register number as seen by the called
-+function is STATIC_CHAIN_INCOMING_REGNUM, while the register
-+number as seen by the calling function is STATIC_CHAIN_REGNUM.  If
-+these registers are the same, STATIC_CHAIN_INCOMING_REGNUM need
-+not be defined.
-+
-+The static chain register need not be a fixed register.
-+
-+If the static chain is passed in memory, these macros should not be
-+defined; instead, the next two macros should be defined.
-+*/
-+/* Using r0 */
-+#define STATIC_CHAIN_REGNUM INTERNAL_REGNUM(0)
-+
-+/** Eliminating Frame Pointer and Arg Pointer **/
-+
-+/*
-+A C expression which is nonzero if a function must have and use a frame
-+pointer.  This expression is evaluated  in the reload pass.  If its value is
-+nonzero the function will have a frame pointer.
-+
-+The expression can in principle examine the current function and decide
-+according to the facts, but on most machines the constant 0 or the
-+constant 1 suffices.  Use 0 when the machine allows code to be generated
-+with no frame pointer, and doing so saves some time or space.  Use 1
-+when there is no possible advantage to avoiding a frame pointer.
-+
-+In certain cases, the compiler does not know how to produce valid code
-+without a frame pointer.  The compiler recognizes those cases and
-+automatically gives the function a frame pointer regardless of what
-+FRAME_POINTER_REQUIRED says.  You don't need to worry about
-+them.
-+
-+In a function that does not require a frame pointer, the frame pointer
-+register can be allocated for ordinary usage, unless you mark it as a
-+fixed register.  See FIXED_REGISTERS for more information.
-+*/
-+/* We need the frame pointer when compiling for profiling */
-+#define FRAME_POINTER_REQUIRED (crtl->profile)
-+
-+/*
-+A C statement to store in the variable DEPTH_VAR the difference
-+between the frame pointer and the stack pointer values immediately after
-+the function prologue.  The value would be computed from information
-+such as the result of get_frame_size () and the tables of
-+registers regs_ever_live and call_used_regs.
-+
-+If ELIMINABLE_REGS is defined, this macro will be not be used and
-+need not be defined.  Otherwise, it must be defined even if
-+FRAME_POINTER_REQUIRED is defined to always be true; in that
-+case, you may set DEPTH_VAR to anything.
-+*/
-+#define INITIAL_FRAME_POINTER_OFFSET(DEPTH_VAR) ((DEPTH_VAR) = get_frame_size())
-+
-+/*
-+If defined, this macro specifies a table of register pairs used to
-+eliminate unneeded registers that point into the stack frame.  If it is not
-+defined, the only elimination attempted by the compiler is to replace
-+references to the frame pointer with references to the stack pointer.
-+
-+The definition of this macro is a list of structure initializations, each
-+of which specifies an original and replacement register.
-+
-+On some machines, the position of the argument pointer is not known until
-+the compilation is completed.  In such a case, a separate hard register
-+must be used for the argument pointer.  This register can be eliminated by
-+replacing it with either the frame pointer or the argument pointer,
-+depending on whether or not the frame pointer has been eliminated.
-+
-+In this case, you might specify:
-+  #define ELIMINABLE_REGS  \
-+  {{ARG_POINTER_REGNUM, STACK_POINTER_REGNUM}, \
-+   {ARG_POINTER_REGNUM, FRAME_POINTER_REGNUM}, \
-+   {FRAME_POINTER_REGNUM, STACK_POINTER_REGNUM}}
-+
-+Note that the elimination of the argument pointer with the stack pointer is
-+specified first since that is the preferred elimination.
-+*/
-+#define ELIMINABLE_REGS					\
-+{							\
-+  { FRAME_POINTER_REGNUM, STACK_POINTER_REGNUM },	\
-+  { ARG_POINTER_REGNUM, STACK_POINTER_REGNUM },		\
-+  { ARG_POINTER_REGNUM, FRAME_POINTER_REGNUM }		\
-+}
-+
-+/*
-+A C expression that returns nonzero if the compiler is allowed to try
-+to replace register number FROM with register number
-+TO.  This macro need only be defined if ELIMINABLE_REGS
-+is defined, and will usually be the constant 1, since most of the cases
-+preventing register elimination are things that the compiler already
-+knows about.
-+*/
-+#define CAN_ELIMINATE(FROM, TO) 1
-+
-+/*
-+This macro is similar to INITIAL_FRAME_POINTER_OFFSET.  It
-+specifies the initial difference between the specified pair of
-+registers.  This macro must be defined if ELIMINABLE_REGS is
-+defined.
-+*/
-+#define INITIAL_ELIMINATION_OFFSET(FROM, TO, OFFSET)		\
-+  ((OFFSET) = avr32_initial_elimination_offset(FROM, TO))
-+
-+/** Passing Function Arguments on the Stack **/
-+
-+
-+/*
-+A C expression.  If nonzero, push insns will be used to pass
-+outgoing arguments.
-+If the target machine does not have a push instruction, set it to zero.
-+That directs GCC to use an alternate strategy: to
-+allocate the entire argument block and then store the arguments into
-+it.  When PUSH_ARGS is nonzero, PUSH_ROUNDING must be defined too.
-+*/
-+#define PUSH_ARGS 1
-+
-+/*
-+A C expression that is the number of bytes actually pushed onto the
-+stack when an instruction attempts to push NPUSHED bytes.
-+
-+On some machines, the definition
-+
-+  #define PUSH_ROUNDING(BYTES) (BYTES)
-+
-+will suffice.  But on other machines, instructions that appear
-+to push one byte actually push two bytes in an attempt to maintain
-+alignment.  Then the definition should be
-+
-+  #define PUSH_ROUNDING(BYTES) (((BYTES) + 1) & ~1)
-+*/
-+/* Push 4 bytes at the time. */
-+#define PUSH_ROUNDING(NPUSHED) (((NPUSHED) + 3) & ~3)
-+
-+/*
-+A C expression.  If nonzero, the maximum amount of space required for
-+outgoing arguments will be computed and placed into the variable
-+current_function_outgoing_args_size.  No space will be pushed
-+onto the stack for each call; instead, the function prologue should
-+increase the stack frame size by this amount.
-+
-+Setting both PUSH_ARGS and ACCUMULATE_OUTGOING_ARGS is not proper.
-+*/
-+#define ACCUMULATE_OUTGOING_ARGS 0
-+
-+/*
-+A C expression that should indicate the number of bytes of its own
-+arguments that a function pops on returning, or 0 if the
-+function pops no arguments and the caller must therefore pop them all
-+after the function returns.
-+
-+FUNDECL is a C variable whose value is a tree node that describes
-+the function in question.  Normally it is a node of type
-+FUNCTION_DECL that describes the declaration of the function.
-+From this you can obtain the DECL_ATTRIBUTES of the function.
-+
-+FUNTYPE is a C variable whose value is a tree node that
-+describes the function in question.  Normally it is a node of type
-+FUNCTION_TYPE that describes the data type of the function.
-+From this it is possible to obtain the data types of the value and
-+arguments (if known).
-+
-+When a call to a library function is being considered, FUNDECL
-+will contain an identifier node for the library function.  Thus, if
-+you need to distinguish among various library functions, you can do so
-+by their names.  Note that ``library function'' in this context means
-+a function used to perform arithmetic, whose name is known specially
-+in the compiler and was not mentioned in the C code being compiled.
-+
-+STACK_SIZE is the number of bytes of arguments passed on the
-+stack.  If a variable number of bytes is passed, it is zero, and
-+argument popping will always be the responsibility of the calling function.
-+
-+On the VAX, all functions always pop their arguments, so the definition
-+of this macro is STACK_SIZE.  On the 68000, using the standard
-+calling convention, no functions pop their arguments, so the value of
-+the macro is always 0 in this case.  But an alternative calling
-+convention is available in which functions that take a fixed number of
-+arguments pop them but other functions (such as printf) pop
-+nothing (the caller pops all).  When this convention is in use,
-+FUNTYPE is examined to determine whether a function takes a fixed
-+number of arguments.
-+*/
-+#define RETURN_POPS_ARGS(FUNDECL, FUNTYPE, STACK_SIZE) 0
-+
-+
-+/*Return true if this function can we use a single return instruction*/
-+#define USE_RETURN_INSN(ISCOND) avr32_use_return_insn(ISCOND)
-+
-+/*
-+A C expression that should indicate the number of bytes a call sequence
-+pops off the stack.  It is added to the value of RETURN_POPS_ARGS
-+when compiling a function call.
-+
-+CUM is the variable in which all arguments to the called function
-+have been accumulated.
-+
-+On certain architectures, such as the SH5, a call trampoline is used
-+that pops certain registers off the stack, depending on the arguments
-+that have been passed to the function.  Since this is a property of the
-+call site, not of the called function, RETURN_POPS_ARGS is not
-+appropriate.
-+*/
-+#define CALL_POPS_ARGS(CUM) 0
-+
-+/* Passing Arguments in Registers */
-+
-+/*
-+A C expression that controls whether a function argument is passed
-+in a register, and which register.
-+
-+The arguments are CUM, which summarizes all the previous
-+arguments; MODE, the machine mode of the argument; TYPE,
-+the data type of the argument as a tree node or 0 if that is not known
-+(which happens for C support library functions); and NAMED,
-+which is 1 for an ordinary argument and 0 for nameless arguments that
-+correspond to '...' in the called function's prototype.
-+TYPE can be an incomplete type if a syntax error has previously
-+occurred.
-+
-+The value of the expression is usually either a reg RTX for the
-+hard register in which to pass the argument, or zero to pass the
-+argument on the stack.
-+
-+For machines like the VAX and 68000, where normally all arguments are
-+pushed, zero suffices as a definition.
-+
-+The value of the expression can also be a parallel RTX.  This is
-+used when an argument is passed in multiple locations.  The mode of the
-+of the parallel should be the mode of the entire argument.  The
-+parallel holds any number of expr_list pairs; each one
-+describes where part of the argument is passed.  In each
-+expr_list the first operand must be a reg RTX for the hard
-+register in which to pass this part of the argument, and the mode of the
-+register RTX indicates how large this part of the argument is.  The
-+second operand of the expr_list is a const_int which gives
-+the offset in bytes into the entire argument of where this part starts.
-+As a special exception the first expr_list in the parallel
-+RTX may have a first operand of zero.  This indicates that the entire
-+argument is also stored on the stack.
-+
-+The last time this macro is called, it is called with MODE == VOIDmode,
-+and its result is passed to the call or call_value
-+pattern as operands 2 and 3 respectively.
-+
-+The usual way to make the ISO library 'stdarg.h' work on a machine
-+where some arguments are usually passed in registers, is to cause
-+nameless arguments to be passed on the stack instead.  This is done
-+by making FUNCTION_ARG return 0 whenever NAMED is 0.
-+
-+You may use the macro MUST_PASS_IN_STACK (MODE, TYPE)
-+in the definition of this macro to determine if this argument is of a
-+type that must be passed in the stack.  If REG_PARM_STACK_SPACE
-+is not defined and FUNCTION_ARG returns nonzero for such an
-+argument, the compiler will abort.  If REG_PARM_STACK_SPACE is
-+defined, the argument will be computed in the stack and then loaded into
-+a register.  */
-+
-+#define FUNCTION_ARG(CUM, MODE, TYPE, NAMED) \
-+  avr32_function_arg(&(CUM), MODE, TYPE, NAMED)
-+
-+/*
-+A C type for declaring a variable that is used as the first argument of
-+FUNCTION_ARG and other related values.  For some target machines,
-+the type int suffices and can hold the number of bytes of
-+argument so far.
-+
-+There is no need to record in CUMULATIVE_ARGS anything about the
-+arguments that have been passed on the stack.  The compiler has other
-+variables to keep track of that.  For target machines on which all
-+arguments are passed on the stack, there is no need to store anything in
-+CUMULATIVE_ARGS; however, the data structure must exist and
-+should not be empty, so use int.
-+*/
-+typedef struct avr32_args
-+{
-+  /* Index representing the argument register the current function argument
-+     will occupy */
-+  int index;
-+  /* A mask with bits representing the argument registers: if a bit is set
-+     then this register is used for an argument */
-+  int used_index;
-+  /* TRUE if this function has anonymous arguments */
-+  int uses_anonymous_args;
-+  /* The size in bytes of the named arguments pushed on the stack */
-+  int stack_pushed_args_size;
-+  /* Set to true if this function needs a Return Value Pointer */
-+  int use_rvp;
-+  /* Set to true if function is a flashvault function. */
-+  int flashvault_func;
-+
-+} CUMULATIVE_ARGS;
-+
-+
-+#define FIRST_CUM_REG_INDEX 0
-+#define LAST_CUM_REG_INDEX 4
-+#define GET_REG_INDEX(CUM) ((CUM)->index)
-+#define SET_REG_INDEX(CUM, INDEX) ((CUM)->index = (INDEX));
-+#define GET_USED_INDEX(CUM, INDEX) ((CUM)->used_index & (1 << (INDEX)))
-+#define SET_USED_INDEX(CUM, INDEX)		\
-+  do						\
-+    {						\
-+      if (INDEX >= 0)				\
-+        (CUM)->used_index |= (1 << (INDEX));	\
-+    }						\
-+  while (0)
-+#define SET_INDEXES_UNUSED(CUM) ((CUM)->used_index = 0)
-+
-+/*
-+   A C statement (sans semicolon) for initializing the variable cum for the
-+   state at the beginning of the argument list. The variable has type
-+   CUMULATIVE_ARGS. The value of FNTYPE is the tree node for the data type of
-+   the function which will receive the args, or 0 if the args are to a compiler
-+   support library function. For direct calls that are not libcalls, FNDECL
-+   contain the declaration node of the function. FNDECL is also set when
-+   INIT_CUMULATIVE_ARGS is used to find arguments for the function being
-+   compiled.  N_NAMED_ARGS is set to the number of named arguments, including a
-+   structure return address if it is passed as a parameter, when making a call.
-+   When processing incoming arguments, N_NAMED_ARGS is set to -1.
-+
-+   When processing a call to a compiler support library function, LIBNAME
-+   identifies which one.  It is a symbol_ref rtx which contains the name of the
-+   function, as a string. LIBNAME is 0 when an ordinary C function call is
-+   being processed. Thus, each time this macro is called, either LIBNAME or
-+   FNTYPE is nonzero, but never both of them at once.
-+*/
-+#define INIT_CUMULATIVE_ARGS(CUM, FNTYPE, LIBNAME, FNDECL, N_NAMED_ARGS) \
-+  avr32_init_cumulative_args(&(CUM), FNTYPE, LIBNAME, FNDECL)
-+
-+/*
-+A C statement (sans semicolon) to update the summarizer variable
-+CUM to advance past an argument in the argument list.  The
-+values MODE, TYPE and NAMED describe that argument.
-+Once this is done, the variable CUM is suitable for analyzing
-+the following argument with FUNCTION_ARG, etc.
-+
-+This macro need not do anything if the argument in question was passed
-+on the stack.  The compiler knows how to track the amount of stack space
-+used for arguments without any special help.
-+*/
-+#define FUNCTION_ARG_ADVANCE(CUM, MODE, TYPE, NAMED) \
-+  avr32_function_arg_advance(&(CUM), MODE, TYPE, NAMED)
-+
-+/*
-+If defined, a C expression which determines whether, and in which direction,
-+to pad out an argument with extra space.  The value should be of type
-+enum direction: either 'upward' to pad above the argument,
-+'downward' to pad below, or 'none' to inhibit padding.
-+
-+The amount of padding is always just enough to reach the next
-+multiple of FUNCTION_ARG_BOUNDARY; this macro does not control
-+it.
-+
-+This macro has a default definition which is right for most systems.
-+For little-endian machines, the default is to pad upward.  For
-+big-endian machines, the default is to pad downward for an argument of
-+constant size shorter than an int, and upward otherwise.
-+*/
-+#define FUNCTION_ARG_PADDING(MODE, TYPE) \
-+  avr32_function_arg_padding(MODE, TYPE)
-+
-+/*
-+  Specify padding for the last element of a block move between registers
-+  and memory. First is nonzero if this is the only element. Defining
-+  this macro allows better control of register function parameters on
-+  big-endian machines, without using PARALLEL rtl. In particular,
-+  MUST_PASS_IN_STACK need not test padding and mode of types in registers,
-+  as there is no longer a "wrong" part of a register; For example, a three
-+  byte aggregate may be passed in the high part of a register if so required.
-+*/
-+#define BLOCK_REG_PADDING(MODE, TYPE, FIRST) \
-+  avr32_function_arg_padding(MODE, TYPE)
-+
-+/*
-+If defined, a C expression which determines whether the default
-+implementation of va_arg will attempt to pad down before reading the
-+next argument, if that argument is smaller than its aligned space as
-+controlled by PARM_BOUNDARY.  If this macro is not defined, all such
-+arguments are padded down if BYTES_BIG_ENDIAN is true.
-+*/
-+#define PAD_VARARGS_DOWN \
-+  (FUNCTION_ARG_PADDING (TYPE_MODE (type), type) == downward)
-+
-+/*
-+A C expression that is nonzero if REGNO is the number of a hard
-+register in which function arguments are sometimes passed.  This does
-+not include implicit arguments such as the static chain and
-+the structure-value address.  On many machines, no registers can be
-+used for this purpose since all function arguments are pushed on the
-+stack.
-+*/
-+/*
-+  Use r8 - r12 for function arguments.
-+*/
-+#define FUNCTION_ARG_REGNO_P(REGNO) \
-+  (REGNO >= 3 && REGNO <= 7)
-+
-+/* Number of registers used for passing function arguments */
-+#define NUM_ARG_REGS 5
-+
-+/*
-+If defined, the order in which arguments are loaded into their
-+respective argument registers is reversed so that the last
-+argument is loaded first.  This macro only affects arguments
-+passed in registers.
-+*/
-+/* #define LOAD_ARGS_REVERSED */
-+
-+/** How Scalar Function Values Are Returned **/
-+
-+/* AVR32 is using r12 as return register. */
-+#define RET_REGISTER (15 - 12)
-+
-+/*
-+A C expression to create an RTX representing the place where a library
-+function returns a value of mode MODE.  If the precise function
-+being called is known, FUNC is a tree node
-+(FUNCTION_DECL) for it; otherwise, func is a null
-+pointer.  This makes it possible to use a different value-returning
-+convention for specific functions when all their calls are
-+known.
-+
-+Note that "library function" in this context means a compiler
-+support routine, used to perform arithmetic, whose name is known
-+specially by the compiler and was not mentioned in the C code being
-+compiled.
-+
-+The definition of LIBRARY_VALUE need not be concerned aggregate
-+data types, because none of the library functions returns such types.
-+*/
-+#define LIBCALL_VALUE(MODE) avr32_libcall_value(MODE)
-+
-+/*
-+A C expression that is nonzero if REGNO is the number of a hard
-+register in which the values of called function may come back.
-+
-+A register whose use for returning values is limited to serving as the
-+second of a pair (for a value of type double, say) need not be
-+recognized by this macro.  So for most machines, this definition
-+suffices:
-+  #define FUNCTION_VALUE_REGNO_P(N) ((N) == 0)
-+
-+If the machine has register windows, so that the caller and the called
-+function use different registers for the return value, this macro
-+should recognize only the caller's register numbers.
-+*/
-+/*
-+  When returning a value of mode DImode, r11:r10 is used, else r12 is used.
-+*/
-+#define FUNCTION_VALUE_REGNO_P(REGNO) ((REGNO) == RET_REGISTER \
-+                                       || (REGNO) == INTERNAL_REGNUM(11))
-+
-+
-+/** How Large Values Are Returned **/
-+
-+
-+/*
-+Define this macro to be 1 if all structure and union return values must be
-+in memory.  Since this results in slower code, this should be defined
-+only if needed for compatibility with other compilers or with an ABI.
-+If you define this macro to be 0, then the conventions used for structure
-+and union return values are decided by the RETURN_IN_MEMORY macro.
-+
-+If not defined, this defaults to the value 1.
-+*/
-+#define DEFAULT_PCC_STRUCT_RETURN 0
-+
-+
-+
-+
-+/** Generating Code for Profiling **/
-+
-+/*
-+A C statement or compound statement to output to FILE some
-+assembler code to call the profiling subroutine mcount.
-+
-+The details of how mcount expects to be called are determined by
-+your operating system environment, not by GCC.  To figure them out,
-+compile a small program for profiling using the system's installed C
-+compiler and look at the assembler code that results.
-+
-+Older implementations of mcount expect the address of a counter
-+variable to be loaded into some register.  The name of this variable is
-+'LP' followed by the number LABELNO, so you would generate
-+the name using 'LP%d' in a fprintf.
-+*/
-+/* ToDo: fixme */
-+#ifndef FUNCTION_PROFILER
-+#define FUNCTION_PROFILER(FILE, LABELNO) \
-+  fprintf((FILE), "/* profiler %d */", (LABELNO))
-+#endif
-+
-+
-+/*****************************************************************************
-+ * Trampolines for Nested Functions                                          *
-+ *****************************************************************************/
-+
-+/*
-+A C statement to output, on the stream FILE, assembler code for a
-+block of data that contains the constant parts of a trampoline.  This
-+code should not include a label - the label is taken care of
-+automatically.
-+
-+If you do not define this macro, it means no template is needed
-+for the target.  Do not define this macro on systems where the block move
-+code to copy the trampoline into place would be larger than the code
-+to generate it on the spot.
-+*/
-+/* ToDo: correct? */
-+#define TRAMPOLINE_TEMPLATE(FILE) avr32_trampoline_template(FILE);
-+
-+
-+/*
-+A C expression for the size in bytes of the trampoline, as an integer.
-+*/
-+/* ToDo: fixme */
-+#define TRAMPOLINE_SIZE 0x0C
-+
-+/*
-+Alignment required for trampolines, in bits.
-+
-+If you don't define this macro, the value of BIGGEST_ALIGNMENT
-+is used for aligning trampolines.
-+*/
-+#define TRAMPOLINE_ALIGNMENT 16
-+
-+/*
-+A C statement to initialize the variable parts of a trampoline.
-+ADDR is an RTX for the address of the trampoline; FNADDR is
-+an RTX for the address of the nested function; STATIC_CHAIN is an
-+RTX for the static chain value that should be passed to the function
-+when it is called.
-+*/
-+#define INITIALIZE_TRAMPOLINE(ADDR, FNADDR, STATIC_CHAIN) \
-+  avr32_initialize_trampoline(ADDR, FNADDR, STATIC_CHAIN)
-+
-+
-+/******************************************************************************
-+ * Implicit Calls to Library Routines
-+ *****************************************************************************/
-+
-+/* Tail calling.  */
-+
-+/* A C expression that evaluates to true if it is ok to perform a sibling
-+   call to DECL.  */
-+#define FUNCTION_OK_FOR_SIBCALL(DECL) 0
-+
-+#define OVERRIDE_OPTIONS  avr32_override_options ()
-+
-+#define OPTIMIZATION_OPTIONS(LEVEL, SIZE) avr32_optimization_options (LEVEL, SIZE)
-+
-+/******************************************************************************
-+ * Addressing Modes
-+ *****************************************************************************/
-+
-+/*
-+A C expression that is nonzero if the machine supports pre-increment,
-+pre-decrement, post-increment, or post-decrement addressing respectively.
-+*/
-+/*
-+  AVR32 supports Rp++ and --Rp
-+*/
-+#define HAVE_PRE_INCREMENT 0
-+#define HAVE_PRE_DECREMENT 1
-+#define HAVE_POST_INCREMENT 1
-+#define HAVE_POST_DECREMENT 0
-+
-+/*
-+A C expression that is nonzero if the machine supports pre- or
-+post-address side-effect generation involving constants other than
-+the size of the memory operand.
-+*/
-+#define HAVE_PRE_MODIFY_DISP 0
-+#define HAVE_POST_MODIFY_DISP 0
-+
-+/*
-+A C expression that is nonzero if the machine supports pre- or
-+post-address side-effect generation involving a register displacement.
-+*/
-+#define HAVE_PRE_MODIFY_REG 0
-+#define HAVE_POST_MODIFY_REG 0
-+
-+/*
-+A C expression that is 1 if the RTX X is a constant which
-+is a valid address.  On most machines, this can be defined as
-+CONSTANT_P (X), but a few machines are more restrictive
-+in which constant addresses are supported.
-+
-+CONSTANT_P accepts integer-values expressions whose values are
-+not explicitly known, such as symbol_ref, label_ref, and
-+high expressions and const arithmetic expressions, in
-+addition to const_int and const_double expressions.
-+*/
-+#define CONSTANT_ADDRESS_P(X) CONSTANT_P(X)
-+
-+/*
-+A number, the maximum number of registers that can appear in a valid
-+memory address.  Note that it is up to you to specify a value equal to
-+the maximum number that GO_IF_LEGITIMATE_ADDRESS would ever
-+accept.
-+*/
-+#define MAX_REGS_PER_ADDRESS 2
-+
-+/*
-+A C compound statement with a conditional goto LABEL;
-+executed if X (an RTX) is a legitimate memory address on the
-+target machine for a memory operand of mode MODE.
-+
-+It usually pays to define several simpler macros to serve as
-+subroutines for this one.  Otherwise it may be too complicated to
-+understand.
-+
-+This macro must exist in two variants: a strict variant and a
-+non-strict one.  The strict variant is used in the reload pass.  It
-+must be defined so that any pseudo-register that has not been
-+allocated a hard register is considered a memory reference.  In
-+contexts where some kind of register is required, a pseudo-register
-+with no hard register must be rejected.
-+
-+The non-strict variant is used in other passes.  It must be defined to
-+accept all pseudo-registers in every context where some kind of
-+register is required.
-+
-+Compiler source files that want to use the strict variant of this
-+macro define the macro REG_OK_STRICT.  You should use an
-+#ifdef REG_OK_STRICT conditional to define the strict variant
-+in that case and the non-strict variant otherwise.
-+
-+Subroutines to check for acceptable registers for various purposes (one
-+for base registers, one for index registers, and so on) are typically
-+among the subroutines used to define GO_IF_LEGITIMATE_ADDRESS.
-+Then only these subroutine macros need have two variants; the higher
-+levels of macros may be the same whether strict or not.
-+
-+Normally, constant addresses which are the sum of a symbol_ref
-+and an integer are stored inside a const RTX to mark them as
-+constant.  Therefore, there is no need to recognize such sums
-+specifically as legitimate addresses.  Normally you would simply
-+recognize any const as legitimate.
-+
-+Usually PRINT_OPERAND_ADDRESS is not prepared to handle constant
-+sums that are not marked with  const.  It assumes that a naked
-+plus indicates indexing.  If so, then you must reject such
-+naked constant sums as illegitimate addresses, so that none of them will
-+be given to PRINT_OPERAND_ADDRESS.
-+
-+On some machines, whether a symbolic address is legitimate depends on
-+the section that the address refers to.  On these machines, define the
-+macro ENCODE_SECTION_INFO to store the information into the
-+symbol_ref, and then check for it here.  When you see a
-+const, you will have to look inside it to find the
-+symbol_ref in order to determine the section.
-+
-+The best way to modify the name string is by adding text to the
-+beginning, with suitable punctuation to prevent any ambiguity.  Allocate
-+the new name in saveable_obstack.  You will have to modify
-+ASM_OUTPUT_LABELREF to remove and decode the added text and
-+output the name accordingly, and define STRIP_NAME_ENCODING to
-+access the original name string.
-+
-+You can check the information stored here into the symbol_ref in
-+the definitions of the macros GO_IF_LEGITIMATE_ADDRESS and
-+PRINT_OPERAND_ADDRESS.
-+*/
-+#ifdef REG_OK_STRICT
-+#  define GO_IF_LEGITIMATE_ADDRESS(MODE, X, LABEL)	\
-+  do							\
-+    {							\
-+      if (avr32_legitimate_address(MODE, X, 1))		\
-+	goto LABEL;					\
-+    }							\
-+  while (0)
-+#else
-+#  define GO_IF_LEGITIMATE_ADDRESS(MODE, X, LABEL)	\
-+  do							\
-+    {							\
-+      if (avr32_legitimate_address(MODE, X, 0))		\
-+	goto LABEL;					\
-+    }							\
-+  while (0)
-+#endif
-+
-+
-+
-+/*
-+A C compound statement that attempts to replace X with a valid
-+memory address for an operand of mode MODE.  win will be a
-+C statement label elsewhere in the code; the macro definition may use
-+
-+  GO_IF_LEGITIMATE_ADDRESS (MODE, X, WIN);
-+
-+to avoid further processing if the address has become legitimate.
-+
-+X will always be the result of a call to break_out_memory_refs,
-+and OLDX will be the operand that was given to that function to produce
-+X.
-+
-+The code generated by this macro should not alter the substructure of
-+X.  If it transforms X into a more legitimate form, it
-+should assign X (which will always be a C variable) a new value.
-+
-+It is not necessary for this macro to come up with a legitimate
-+address.  The compiler has standard ways of doing so in all cases.  In
-+fact, it is safe for this macro to do nothing.  But often a
-+machine-dependent strategy can generate better code.
-+*/
-+#define LEGITIMIZE_ADDRESS(X, OLDX, MODE, WIN)			\
-+  do								\
-+    {								\
-+      if (GET_CODE(X) == PLUS					\
-+	  && GET_CODE(XEXP(X, 0)) == REG			\
-+	  && GET_CODE(XEXP(X, 1)) == CONST_INT			\
-+	  && !CONST_OK_FOR_CONSTRAINT_P(INTVAL(XEXP(X, 1)),	\
-+					'K', "Ks16"))		\
-+	{							\
-+	  rtx index = force_reg(SImode, XEXP(X, 1));		\
-+	  X = gen_rtx_PLUS( SImode, XEXP(X, 0), index);		\
-+	}							\
-+      GO_IF_LEGITIMATE_ADDRESS(MODE, X, WIN);			\
-+    }								\
-+  while(0)
-+
-+
-+/*
-+A C statement or compound statement with a conditional
-+goto LABEL; executed if memory address X (an RTX) can have
-+different meanings depending on the machine mode of the memory
-+reference it is used for or if the address is valid for some modes
-+but not others.
-+
-+Autoincrement and autodecrement addresses typically have mode-dependent
-+effects because the amount of the increment or decrement is the size
-+of the operand being addressed.  Some machines have other mode-dependent
-+addresses.  Many RISC machines have no mode-dependent addresses.
-+
-+You may assume that ADDR is a valid address for the machine.
-+*/
-+#define GO_IF_MODE_DEPENDENT_ADDRESS(ADDR, LABEL)	\
-+  do							\
-+    {							\
-+      if (GET_CODE (ADDR) == POST_INC			\
-+	  || GET_CODE (ADDR) == PRE_DEC)		\
-+	goto LABEL;					\
-+    }							\
-+  while (0)
-+
-+/*
-+A C expression that is nonzero if X is a legitimate constant for
-+an immediate operand on the target machine.  You can assume that
-+X satisfies CONSTANT_P, so you need not check this.  In fact,
-+'1' is a suitable definition for this macro on machines where
-+anything CONSTANT_P is valid.
-+*/
-+#define LEGITIMATE_CONSTANT_P(X) avr32_legitimate_constant_p(X)
-+
-+
-+/******************************************************************************
-+ * Condition Code Status
-+ *****************************************************************************/
-+
-+/*
-+C code for a data type which is used for declaring the mdep
-+component of cc_status.  It defaults to int.
-+
-+This macro is not used on machines that do not use cc0.
-+*/
-+
-+typedef struct
-+{
-+  int flags;
-+  rtx value;
-+  int cond_exec_cmp_clobbered;
-+} avr32_status_reg;
-+
-+
-+#define CC_STATUS_MDEP avr32_status_reg
-+
-+/*
-+A C expression to initialize the mdep field to "empty".
-+The default definition does nothing, since most machines don't use
-+the field anyway.  If you want to use the field, you should probably
-+define this macro to initialize it.
-+
-+This macro is not used on machines that do not use cc0.
-+*/
-+
-+#define CC_STATUS_MDEP_INIT  \
-+   (cc_status.mdep.flags = CC_NONE , cc_status.mdep.cond_exec_cmp_clobbered = 0, cc_status.mdep.value = 0)
-+
-+/*
-+A C compound statement to set the components of cc_status
-+appropriately for an insn INSN whose body is EXP.  It is
-+this macro's responsibility to recognize insns that set the condition
-+code as a byproduct of other activity as well as those that explicitly
-+set (cc0).
-+
-+This macro is not used on machines that do not use cc0.
-+
-+If there are insns that do not set the condition code but do alter
-+other machine registers, this macro must check to see whether they
-+invalidate the expressions that the condition code is recorded as
-+reflecting.  For example, on the 68000, insns that store in address
-+registers do not set the condition code, which means that usually
-+NOTICE_UPDATE_CC can leave cc_status unaltered for such
-+insns.  But suppose that the previous insn set the condition code
-+based on location 'a4@@(102)' and the current insn stores a new
-+value in 'a4'.  Although the condition code is not changed by
-+this, it will no longer be true that it reflects the contents of
-+'a4@@(102)'.  Therefore, NOTICE_UPDATE_CC must alter
-+cc_status in this case to say that nothing is known about the
-+condition code value.
-+
-+The definition of NOTICE_UPDATE_CC must be prepared to deal
-+with the results of peephole optimization: insns whose patterns are
-+parallel RTXs containing various reg, mem or
-+constants which are just the operands.  The RTL structure of these
-+insns is not sufficient to indicate what the insns actually do.  What
-+NOTICE_UPDATE_CC should do when it sees one is just to run
-+CC_STATUS_INIT.
-+
-+A possible definition of NOTICE_UPDATE_CC is to call a function
-+that looks at an attribute (see Insn Attributes) named, for example,
-+'cc'.  This avoids having detailed information about patterns in
-+two places, the 'md' file and in NOTICE_UPDATE_CC.
-+*/
-+
-+#define NOTICE_UPDATE_CC(EXP, INSN) avr32_notice_update_cc(EXP, INSN)
-+
-+
-+
-+
-+/******************************************************************************
-+ * Describing Relative Costs of Operations
-+ *****************************************************************************/
-+
-+
-+
-+/*
-+A C expression for the cost of moving data of mode MODE from a
-+register in class FROM to one in class TO.  The classes are
-+expressed using the enumeration values such as GENERAL_REGS.  A
-+value of 2 is the default; other values are interpreted relative to
-+that.
-+
-+It is not required that the cost always equal 2 when FROM is the
-+same as TO; on some machines it is expensive to move between
-+registers if they are not general registers.
-+
-+If reload sees an insn consisting of a single set between two
-+hard registers, and if REGISTER_MOVE_COST applied to their
-+classes returns a value of 2, reload does not check to ensure that the
-+constraints of the insn are met.  Setting a cost of other than 2 will
-+allow reload to verify that the constraints are met.  You should do this
-+if the movm pattern's constraints do not allow such copying.
-+*/
-+#define REGISTER_MOVE_COST(MODE, FROM, TO) \
-+  ((GET_MODE_SIZE(MODE) <= 4) ? 2:         \
-+   (GET_MODE_SIZE(MODE) <= 8) ? 3:         \
-+   4)
-+
-+/*
-+A C expression for the cost of moving data of mode MODE between a
-+register of class CLASS and memory; IN is zero if the value
-+is to be written to memory, nonzero if it is to be read in.  This cost
-+is relative to those in REGISTER_MOVE_COST.  If moving between
-+registers and memory is more expensive than between two registers, you
-+should define this macro to express the relative cost.
-+
-+If you do not define this macro, GCC uses a default cost of 4 plus
-+the cost of copying via a secondary reload register, if one is
-+needed.  If your machine requires a secondary reload register to copy
-+between memory and a register of CLASS but the reload mechanism is
-+more complex than copying via an intermediate, define this macro to
-+reflect the actual cost of the move.
-+
-+GCC defines the function memory_move_secondary_cost if
-+secondary reloads are needed.  It computes the costs due to copying via
-+a secondary register.  If your machine copies from memory using a
-+secondary register in the conventional way but the default base value of
-+4 is not correct for your machine, define this macro to add some other
-+value to the result of that function.  The arguments to that function
-+are the same as to this macro.
-+*/
-+/*
-+  Memory moves are costly
-+*/
-+#define MEMORY_MOVE_COST(MODE, CLASS, IN)            \
-+  (((IN) ? ((GET_MODE_SIZE(MODE) < 4) ? 4 :          \
-+            (GET_MODE_SIZE(MODE) > 8) ? 6 :          \
-+            3)                                       \
-+    : ((GET_MODE_SIZE(MODE) > 8) ? 6 : 3)))
-+
-+/*
-+A C expression for the cost of a branch instruction.  A value of 1 is
-+the default; other values are interpreted relative to that.
-+*/
-+  /* Try to use conditionals as much as possible */
-+#define BRANCH_COST(speed_p, predictable_p) (TARGET_BRANCH_PRED ? 3 : 4)
-+
-+/*A C expression for the maximum number of instructions to execute via conditional
-+  execution instructions instead of a branch. A value of BRANCH_COST+1 is the default
-+  if the machine does not use cc0, and 1 if it does use cc0.*/
-+#define MAX_CONDITIONAL_EXECUTE 4
-+
-+/*
-+Define this macro as a C expression which is nonzero if accessing less
-+than a word of memory (i.e.: a char or a short) is no
-+faster than accessing a word of memory, i.e., if such access
-+require more than one instruction or if there is no difference in cost
-+between byte and (aligned) word loads.
-+
-+When this macro is not defined, the compiler will access a field by
-+finding the smallest containing object; when it is defined, a fullword
-+load will be used if alignment permits.  Unless bytes accesses are
-+faster than word accesses, using word accesses is preferable since it
-+may eliminate subsequent memory access if subsequent accesses occur to
-+other fields in the same word of the structure, but to different bytes.
-+*/
-+#define SLOW_BYTE_ACCESS 1
-+
-+
-+/*
-+Define this macro if it is as good or better to call a constant
-+function address than to call an address kept in a register.
-+*/
-+#define NO_FUNCTION_CSE
-+
-+
-+/******************************************************************************
-+ * Adjusting the Instruction Scheduler
-+ *****************************************************************************/
-+
-+/*****************************************************************************
-+ * Dividing the Output into Sections (Texts, Data, ...)                      *
-+ *****************************************************************************/
-+
-+/*
-+A C expression whose value is a string, including spacing, containing the
-+assembler operation that should precede instructions and read-only data.
-+Normally "\t.text" is right.
-+*/
-+#define TEXT_SECTION_ASM_OP "\t.text"
-+/*
-+A C statement that switches to the default section containing instructions.
-+Normally this is not needed, as simply defining TEXT_SECTION_ASM_OP
-+is enough.  The MIPS port uses this to sort all functions after all data
-+declarations.
-+*/
-+/* #define TEXT_SECTION */
-+
-+/*
-+A C expression whose value is a string, including spacing, containing the
-+assembler operation to identify the following data as writable initialized
-+data.  Normally "\t.data" is right.
-+*/
-+#define DATA_SECTION_ASM_OP "\t.data"
-+
-+/*
-+If defined, a C expression whose value is a string, including spacing,
-+containing the assembler operation to identify the following data as
-+shared data.  If not defined, DATA_SECTION_ASM_OP will be used.
-+*/
-+
-+/*
-+A C expression whose value is a string, including spacing, containing
-+the assembler operation to identify the following data as read-only
-+initialized data.
-+*/
-+#undef READONLY_DATA_SECTION_ASM_OP
-+#define READONLY_DATA_SECTION_ASM_OP \
-+  ((TARGET_USE_RODATA_SECTION) ?  \
-+   "\t.section\t.rodata" :                \
-+   TEXT_SECTION_ASM_OP )
-+
-+
-+/*
-+If defined, a C expression whose value is a string, including spacing,
-+containing the assembler operation to identify the following data as
-+uninitialized global data.  If not defined, and neither
-+ASM_OUTPUT_BSS nor ASM_OUTPUT_ALIGNED_BSS are defined,
-+uninitialized global data will be output in the data section if
-+-fno-common is passed, otherwise ASM_OUTPUT_COMMON will be
-+used.
-+*/
-+#define BSS_SECTION_ASM_OP	"\t.section\t.bss"
-+
-+/*
-+If defined, a C expression whose value is a string, including spacing,
-+containing the assembler operation to identify the following data as
-+uninitialized global shared data.  If not defined, and
-+BSS_SECTION_ASM_OP is, the latter will be used.
-+*/
-+/*#define SHARED_BSS_SECTION_ASM_OP "\trseg\tshared_bbs_section:data:noroot(0)\n"*/
-+/*
-+If defined, a C expression whose value is a string, including spacing,
-+containing the assembler operation to identify the following data as
-+initialization code.  If not defined, GCC will assume such a section does
-+not exist.
-+*/
-+#undef  INIT_SECTION_ASM_OP
-+#define INIT_SECTION_ASM_OP "\t.section\t.init"
-+
-+/*
-+If defined, a C expression whose value is a string, including spacing,
-+containing the assembler operation to identify the following data as
-+finalization code.  If not defined, GCC will assume such a section does
-+not exist.
-+*/
-+#undef  FINI_SECTION_ASM_OP
-+#define FINI_SECTION_ASM_OP "\t.section\t.fini"
-+
-+/*
-+If defined, an ASM statement that switches to a different section
-+via SECTION_OP, calls FUNCTION, and switches back to
-+the text section.  This is used in crtstuff.c if
-+INIT_SECTION_ASM_OP or FINI_SECTION_ASM_OP to calls
-+to initialization and finalization functions from the init and fini
-+sections.  By default, this macro uses a simple function call.  Some
-+ports need hand-crafted assembly code to avoid dependencies on
-+registers initialized in the function prologue or to ensure that
-+constant pools don't end up too far way in the text section.
-+*/
-+#define CRT_CALL_STATIC_FUNCTION(SECTION_OP, FUNC)      \
-+   asm ( SECTION_OP "\n" \
-+         "mcall   r6[" USER_LABEL_PREFIX #FUNC "@got]\n" \
-+         TEXT_SECTION_ASM_OP);
-+
-+
-+/*
-+Define this macro to be an expression with a nonzero value if jump
-+tables (for tablejump insns) should be output in the text
-+section, along with the assembler instructions.  Otherwise, the
-+readonly data section is used.
-+
-+This macro is irrelevant if there is no separate readonly data section.
-+*/
-+/* Put jump tables in text section if we have caches. Otherwise assume that
-+   loading data from code memory is slow. */
-+#define JUMP_TABLES_IN_TEXT_SECTION    \
-+    (TARGET_CACHES ? 1 : 0)
-+
-+
-+/******************************************************************************
-+ * Position Independent Code (PIC)
-+ *****************************************************************************/
-+
-+#ifndef AVR32_ALWAYS_PIC
-+#define AVR32_ALWAYS_PIC 0
-+#endif
-+
-+/* GOT is set to r6 */
-+#define PIC_OFFSET_TABLE_REGNUM INTERNAL_REGNUM(6)
-+
-+/*
-+A C expression that is nonzero if X is a legitimate immediate
-+operand on the target machine when generating position independent code.
-+You can assume that X satisfies CONSTANT_P, so you need not
-+check this.  You can also assume flag_pic is true, so you need not
-+check it either.  You need not define this macro if all constants
-+(including SYMBOL_REF) can be immediate operands when generating
-+position independent code.
-+*/
-+/* We can't directly access anything that contains a symbol,
-+   nor can we indirect via the constant pool.  */
-+#define LEGITIMATE_PIC_OPERAND_P(X) avr32_legitimate_pic_operand_p(X)
-+
-+
-+/* We need to know when we are making a constant pool; this determines
-+   whether data needs to be in the GOT or can be referenced via a GOT
-+   offset.  */
-+extern int making_const_table;
-+
-+/******************************************************************************
-+ * Defining the Output Assembler Language
-+ *****************************************************************************/
-+
-+
-+/*
-+A C string constant describing how to begin a comment in the target
-+assembler language.  The compiler assumes that the comment will end at
-+the end of the line.
-+*/
-+#define ASM_COMMENT_START "# "
-+
-+/*
-+A C string constant for text to be output before each asm
-+statement or group of consecutive ones.  Normally this is
-+"#APP", which is a comment that has no effect on most
-+assemblers but tells the GNU assembler that it must check the lines
-+that follow for all valid assembler constructs.
-+*/
-+#undef ASM_APP_ON
-+#define ASM_APP_ON "#APP\n"
-+
-+/*
-+A C string constant for text to be output after each asm
-+statement or group of consecutive ones.  Normally this is
-+"#NO_APP", which tells the GNU assembler to resume making the
-+time-saving assumptions that are valid for ordinary compiler output.
-+*/
-+#undef ASM_APP_OFF
-+#define ASM_APP_OFF "#NO_APP\n"
-+
-+
-+
-+#define FILE_ASM_OP 		"\t.file\n"
-+#define IDENT_ASM_OP 		"\t.ident\t"
-+#define SET_ASM_OP		"\t.set\t"
-+
-+
-+/*
-+ * Output assembly directives to switch to section name. The section
-+ * should have attributes as specified by flags, which is a bit mask
-+ * of the SECTION_* flags defined in 'output.h'. If align is nonzero,
-+ * it contains an alignment in bytes to be used for the section,
-+ * otherwise some target default should be used. Only targets that
-+ * must specify an alignment within the section directive need pay
-+ * attention to align -- we will still use ASM_OUTPUT_ALIGN.
-+ *
-+ * NOTE: This one must not be moved to avr32.c
-+ */
-+#undef TARGET_ASM_NAMED_SECTION
-+#define TARGET_ASM_NAMED_SECTION default_elf_asm_named_section
-+
-+
-+/*
-+You may define this macro as a C expression.  You should define the
-+expression to have a nonzero value if GCC should output the constant
-+pool for a function before the code for the function, or a zero value if
-+GCC should output the constant pool after the function.  If you do
-+not define this macro, the usual case, GCC will output the constant
-+pool before the function.
-+*/
-+#define CONSTANT_POOL_BEFORE_FUNCTION 0
-+
-+
-+/*
-+Define this macro as a C expression which is nonzero if the constant
-+EXP, of type tree, should be output after the code for a
-+function.  The compiler will normally output all constants before the
-+function; you need not define this macro if this is OK.
-+*/
-+#define CONSTANT_AFTER_FUNCTION_P(EXP) 1
-+
-+
-+/*
-+Define this macro as a C expression which is nonzero if C is
-+as a logical line separator by the assembler.  STR points to the
-+position in the string where C was found; this can be used if a
-+line separator uses multiple characters.
-+
-+If you do not define this macro, the default is that only
-+the character ';' is treated as a logical line separator.
-+*/
-+#define IS_ASM_LOGICAL_LINE_SEPARATOR(C,STR) (((C) == '\n') || ((C) == ';'))
-+
-+
-+/** Output of Uninitialized Variables **/
-+
-+/*
-+A C statement (sans semicolon) to output to the stdio stream
-+STREAM the assembler definition of a common-label named
-+NAME whose size is SIZE bytes.  The variable ROUNDED
-+is the size rounded up to whatever alignment the caller wants.
-+
-+Use the expression assemble_name(STREAM, NAME) to
-+output the name itself; before and after that, output the additional
-+assembler syntax for defining the name, and a newline.
-+
-+This macro controls how the assembler definitions of uninitialized
-+common global variables are output.
-+*/
-+/*
-+#define ASM_OUTPUT_COMMON(STREAM, NAME, SIZE, ROUNDED) \
-+  avr32_asm_output_common(STREAM, NAME, SIZE, ROUNDED)
-+*/
-+
-+#define ASM_OUTPUT_COMMON(FILE, NAME, SIZE, ROUNDED)	\
-+  do							\
-+    {							\
-+      fputs ("\t.comm ", (FILE));			\
-+      assemble_name ((FILE), (NAME));			\
-+      fprintf ((FILE), ",%d\n", (SIZE));		\
-+    }							\
-+  while (0)
-+
-+/*
-+ * Like ASM_OUTPUT_BSS except takes the required alignment as a
-+ * separate, explicit argument.  If you define this macro, it is used
-+ * in place of ASM_OUTPUT_BSS, and gives you more flexibility in
-+ * handling the required alignment of the variable.  The alignment is
-+ * specified as the number of bits.
-+ *
-+ * Try to use function asm_output_aligned_bss defined in file varasm.c
-+ * when defining this macro.
-+ */
-+#define ASM_OUTPUT_ALIGNED_BSS(STREAM, DECL, NAME, SIZE, ALIGNMENT) \
-+  asm_output_aligned_bss (STREAM, DECL, NAME, SIZE, ALIGNMENT)
-+
-+/*
-+A C statement (sans semicolon) to output to the stdio stream
-+STREAM the assembler definition of a local-common-label named
-+NAME whose size is SIZE bytes.  The variable ROUNDED
-+is the size rounded up to whatever alignment the caller wants.
-+
-+Use the expression assemble_name(STREAM, NAME) to
-+output the name itself; before and after that, output the additional
-+assembler syntax for defining the name, and a newline.
-+
-+This macro controls how the assembler definitions of uninitialized
-+static variables are output.
-+*/
-+#define ASM_OUTPUT_LOCAL(FILE, NAME, SIZE, ROUNDED)	\
-+  do							\
-+    {							\
-+      fputs ("\t.lcomm ", (FILE));			\
-+      assemble_name ((FILE), (NAME));			\
-+      fprintf ((FILE), ",%d, %d\n", (SIZE), 2);		\
-+    }							\
-+  while (0)
-+
-+
-+/*
-+A C statement (sans semicolon) to output to the stdio stream
-+STREAM the assembler definition of a label named NAME.
-+Use the expression assemble_name(STREAM, NAME) to
-+output the name itself; before and after that, output the additional
-+assembler syntax for defining the name, and a newline.
-+*/
-+#define ASM_OUTPUT_LABEL(STREAM, NAME) avr32_asm_output_label(STREAM, NAME)
-+
-+/* A C string containing the appropriate assembler directive to
-+ * specify the size of a symbol, without any arguments. On systems
-+ * that use ELF, the default (in 'config/elfos.h') is '"\t.size\t"';
-+ * on other systems, the default is not to define this macro.
-+ *
-+ * Define this macro only if it is correct to use the default
-+ * definitions of ASM_ OUTPUT_SIZE_DIRECTIVE and
-+ * ASM_OUTPUT_MEASURED_SIZE for your system. If you need your own
-+ * custom definitions of those macros, or if you do not need explicit
-+ * symbol sizes at all, do not define this macro.
-+ */
-+#define SIZE_ASM_OP "\t.size\t"
-+
-+
-+/*
-+A C statement (sans semicolon) to output to the stdio stream
-+STREAM some commands that will make the label NAME global;
-+that is, available for reference from other files.  Use the expression
-+assemble_name(STREAM, NAME) to output the name
-+itself; before and after that, output the additional assembler syntax
-+for making that name global, and a newline.
-+*/
-+#define GLOBAL_ASM_OP "\t.global\t"
-+
-+
-+
-+/*
-+A C expression which evaluates to true if the target supports weak symbols.
-+
-+If you don't define this macro, defaults.h provides a default
-+definition.  If either ASM_WEAKEN_LABEL or ASM_WEAKEN_DECL
-+is defined, the default definition is '1'; otherwise, it is
-+'0'.  Define this macro if you want to control weak symbol support
-+with a compiler flag such as -melf.
-+*/
-+#define SUPPORTS_WEAK 1
-+
-+/*
-+A C statement (sans semicolon) to output to the stdio stream
-+STREAM a reference in assembler syntax to a label named
-+NAME.  This should add '_' to the front of the name, if that
-+is customary on your operating system, as it is in most Berkeley Unix
-+systems.  This macro is used in assemble_name.
-+*/
-+#define ASM_OUTPUT_LABELREF(STREAM, NAME) \
-+  avr32_asm_output_labelref(STREAM, NAME)
-+
-+
-+
-+/*
-+A C expression to assign to OUTVAR (which is a variable of type
-+char *) a newly allocated string made from the string
-+NAME and the number NUMBER, with some suitable punctuation
-+added.  Use alloca to get space for the string.
-+
-+The string will be used as an argument to ASM_OUTPUT_LABELREF to
-+produce an assembler label for an internal static variable whose name is
-+NAME.  Therefore, the string must be such as to result in valid
-+assembler code.  The argument NUMBER is different each time this
-+macro is executed; it prevents conflicts between similarly-named
-+internal static variables in different scopes.
-+
-+Ideally this string should not be a valid C identifier, to prevent any
-+conflict with the user's own symbols.  Most assemblers allow periods
-+or percent signs in assembler symbols; putting at least one of these
-+between the name and the number will suffice.
-+*/
-+#define ASM_FORMAT_PRIVATE_NAME(OUTVAR, NAME, NUMBER)		\
-+  do								\
-+    {								\
-+      (OUTVAR) = (char *) alloca (strlen ((NAME)) + 10);	\
-+      sprintf ((OUTVAR), "%s.%d", (NAME), (NUMBER));		\
-+    }								\
-+  while (0)
-+
-+
-+/** Macros Controlling Initialization Routines **/
-+
-+
-+/*
-+If defined, main will not call __main as described above.
-+This macro should be defined for systems that control start-up code
-+on a symbol-by-symbol basis, such as OSF/1, and should not
-+be defined explicitly for systems that support INIT_SECTION_ASM_OP.
-+*/
-+/*
-+  __main is not defined when debugging.
-+*/
-+#define HAS_INIT_SECTION
-+
-+
-+/** Output of Assembler Instructions **/
-+
-+/*
-+A C initializer containing the assembler's names for the machine
-+registers, each one as a C string constant.  This is what translates
-+register numbers in the compiler into assembler language.
-+*/
-+
-+#define REGISTER_NAMES	\
-+{			\
-+  "pc",  "lr",		\
-+  "sp",  "r12",		\
-+  "r11", "r10",		\
-+  "r9",  "r8",		\
-+  "r7",  "r6",		\
-+  "r5",  "r4",		\
-+  "r3",  "r2",		\
-+  "r1",  "r0",		\
-+}
-+
-+/*
-+A C compound statement to output to stdio stream STREAM the
-+assembler syntax for an instruction operand X.  X is an
-+RTL expression.
-+
-+CODE is a value that can be used to specify one of several ways
-+of printing the operand.  It is used when identical operands must be
-+printed differently depending on the context.  CODE comes from
-+the '%' specification that was used to request printing of the
-+operand.  If the specification was just '%digit' then
-+CODE is 0; if the specification was '%ltr digit'
-+then CODE is the ASCII code for ltr.
-+
-+If X is a register, this macro should print the register's name.
-+The names can be found in an array reg_names whose type is
-+char *[].  reg_names is initialized from REGISTER_NAMES.
-+
-+When the machine description has a specification '%punct'
-+(a '%' followed by a punctuation character), this macro is called
-+with a null pointer for X and the punctuation character for
-+CODE.
-+*/
-+#define PRINT_OPERAND(STREAM, X, CODE) avr32_print_operand(STREAM, X, CODE)
-+
-+/* A C statement to be executed just prior to the output of
-+   assembler code for INSN, to modify the extracted operands so
-+   they will be output differently.
-+
-+   Here the argument OPVEC is the vector containing the operands
-+   extracted from INSN, and NOPERANDS is the number of elements of
-+   the vector which contain meaningful data for this insn.
-+   The contents of this vector are what will be used to convert the insn
-+   template into assembler code, so you can change the assembler output
-+   by changing the contents of the vector.  */
-+#define FINAL_PRESCAN_INSN(INSN, OPVEC, NOPERANDS) \
-+  avr32_final_prescan_insn ((INSN), (OPVEC), (NOPERANDS))
-+
-+/*
-+A C expression which evaluates to true if CODE is a valid
-+punctuation character for use in the PRINT_OPERAND macro.  If
-+PRINT_OPERAND_PUNCT_VALID_P is not defined, it means that no
-+punctuation characters (except for the standard one, '%') are used
-+in this way.
-+*/
-+#define PRINT_OPERAND_PUNCT_VALID_P(CODE)                          \
-+  (((CODE) == '?')                                                 \
-+   || ((CODE) == '!'))
-+
-+/*
-+A C compound statement to output to stdio stream STREAM the
-+assembler syntax for an instruction operand that is a memory reference
-+whose address is X.  X is an RTL expression.
-+
-+On some machines, the syntax for a symbolic address depends on the
-+section that the address refers to.  On these machines, define the macro
-+ENCODE_SECTION_INFO to store the information into the
-+symbol_ref, and then check for it here.  (see Assembler Format.)
-+*/
-+#define PRINT_OPERAND_ADDRESS(STREAM, X) avr32_print_operand_address(STREAM, X)
-+
-+
-+/** Output of Dispatch Tables **/
-+
-+/*
-+ * A C statement to output to the stdio stream stream an assembler
-+ * pseudo-instruction to generate a difference between two
-+ * labels. value and rel are the numbers of two internal labels. The
-+ * definitions of these labels are output using
-+ * (*targetm.asm_out.internal_label), and they must be printed in the
-+ * same way here. For example,
-+ *
-+ *         fprintf (stream, "\t.word L%d-L%d\n",
-+ *                  value, rel)
-+ *
-+ * You must provide this macro on machines where the addresses in a
-+ * dispatch table are relative to the table's own address. If defined,
-+ * GCC will also use this macro on all machines when producing
-+ * PIC. body is the body of the ADDR_DIFF_VEC; it is provided so that
-+ * the mode and flags can be read.
-+ */
-+#define ASM_OUTPUT_ADDR_DIFF_ELT(STREAM, BODY, VALUE, REL)	    \
-+    fprintf(STREAM, "\tbral\t%sL%d\n", LOCAL_LABEL_PREFIX, VALUE)
-+
-+/*
-+This macro should be provided on machines where the addresses
-+in a dispatch table are absolute.
-+
-+The definition should be a C statement to output to the stdio stream
-+STREAM an assembler pseudo-instruction to generate a reference to
-+a label.  VALUE is the number of an internal label whose
-+definition is output using ASM_OUTPUT_INTERNAL_LABEL.
-+For example,
-+
-+fprintf(STREAM, "\t.word L%d\n", VALUE)
-+*/
-+
-+#define ASM_OUTPUT_ADDR_VEC_ELT(STREAM, VALUE)  \
-+  fprintf(STREAM, "\t.long %sL%d\n", LOCAL_LABEL_PREFIX, VALUE)
-+
-+/** Assembler Commands for Exception Regions */
-+
-+/* ToDo: All of this subsection */
-+
-+/** Assembler Commands for Alignment */
-+
-+
-+/*
-+A C statement to output to the stdio stream STREAM an assembler
-+command to advance the location counter to a multiple of 2 to the
-+POWER bytes.  POWER will be a C expression of type int.
-+*/
-+#define ASM_OUTPUT_ALIGN(STREAM, POWER)			\
-+  do							\
-+    {							\
-+      if ((POWER) != 0)					\
-+	fprintf(STREAM, "\t.align\t%d\n", POWER);	\
-+    }							\
-+  while (0)
-+
-+/*
-+Like ASM_OUTPUT_ALIGN, except that the \nop" instruction is used for padding, if
-+necessary.
-+*/
-+#define ASM_OUTPUT_ALIGN_WITH_NOP(STREAM, POWER) \
-+ fprintf(STREAM, "\t.balignw\t%d, 0xd703\n", (1 << POWER))
-+
-+
-+
-+/******************************************************************************
-+ * Controlling Debugging Information Format
-+ *****************************************************************************/
-+
-+/* How to renumber registers for dbx and gdb.  */
-+#define DBX_REGISTER_NUMBER(REGNO) ASM_REGNUM (REGNO)
-+
-+/* The DWARF 2 CFA column which tracks the return address.  */
-+#define DWARF_FRAME_RETURN_COLUMN DWARF_FRAME_REGNUM(LR_REGNUM)
-+
-+/*
-+Define this macro if GCC should produce dwarf version 2 format
-+debugging output in response to the -g option.
-+
-+To support optional call frame debugging information, you must also
-+define INCOMING_RETURN_ADDR_RTX and either set
-+RTX_FRAME_RELATED_P on the prologue insns if you use RTL for the
-+prologue, or call dwarf2out_def_cfa and dwarf2out_reg_save
-+as appropriate from TARGET_ASM_FUNCTION_PROLOGUE if you don't.
-+*/
-+#define DWARF2_DEBUGGING_INFO 1
-+
-+
-+#define DWARF2_ASM_LINE_DEBUG_INFO 1
-+#define DWARF2_FRAME_INFO 1
-+
-+
-+/******************************************************************************
-+ * Miscellaneous Parameters
-+ *****************************************************************************/
-+
-+/* ToDo: a lot */
-+
-+/*
-+An alias for a machine mode name.  This is the machine mode that
-+elements of a jump-table should have.
-+*/
-+#define CASE_VECTOR_MODE SImode
-+
-+/*
-+Define this macro to be a C expression to indicate when jump-tables
-+should contain relative addresses.  If jump-tables never contain
-+relative addresses, then you need not define this macro.
-+*/
-+#define CASE_VECTOR_PC_RELATIVE 0
-+
-+/* Increase the threshold for using table jumps on the UC arch. */
-+#define CASE_VALUES_THRESHOLD  (TARGET_BRANCH_PRED ? 4 : 7)
-+
-+/*
-+The maximum number of bytes that a single instruction can move quickly
-+between memory and registers or between two memory locations.
-+*/
-+#define MOVE_MAX (2*UNITS_PER_WORD)
-+
-+
-+/* A C expression that is nonzero if on this machine the number of bits actually used
-+   for the count of a shift operation is equal to the number of bits needed to represent
-+   the size of the object being shifted. When this macro is nonzero, the compiler will
-+   assume that it is safe to omit a sign-extend, zero-extend, and certain bitwise 'and'
-+   instructions that truncates the count of a shift operation. On machines that have
-+   instructions that act on bit-fields at variable positions, which may include 'bit test'
-+   378 GNU Compiler Collection (GCC) Internals
-+   instructions, a nonzero SHIFT_COUNT_TRUNCATED also enables deletion of truncations
-+   of the values that serve as arguments to bit-field instructions.
-+   If both types of instructions truncate the count (for shifts) and position (for bit-field
-+   operations), or if no variable-position bit-field instructions exist, you should define
-+   this macro.
-+   However, on some machines, such as the 80386 and the 680x0, truncation only applies
-+   to shift operations and not the (real or pretended) bit-field operations. Define SHIFT_
-+   COUNT_TRUNCATED to be zero on such machines. Instead, add patterns to the 'md' file
-+   that include the implied truncation of the shift instructions.
-+   You need not dene this macro if it would always have the value of zero. */
-+#define SHIFT_COUNT_TRUNCATED 1
-+
-+/*
-+A C expression which is nonzero if on this machine it is safe to
-+convert an integer of INPREC bits to one of OUTPREC
-+bits (where OUTPREC is smaller than INPREC) by merely
-+operating on it as if it had only OUTPREC bits.
-+
-+On many machines, this expression can be 1.
-+
-+When TRULY_NOOP_TRUNCATION returns 1 for a pair of sizes for
-+modes for which MODES_TIEABLE_P is 0, suboptimal code can result.
-+If this is the case, making TRULY_NOOP_TRUNCATION return 0 in
-+such cases may improve things.
-+*/
-+#define TRULY_NOOP_TRUNCATION(OUTPREC, INPREC) 1
-+
-+/*
-+An alias for the machine mode for pointers.  On most machines, define
-+this to be the integer mode corresponding to the width of a hardware
-+pointer; SImode on 32-bit machine or DImode on 64-bit machines.
-+On some machines you must define this to be one of the partial integer
-+modes, such as PSImode.
-+
-+The width of Pmode must be at least as large as the value of
-+POINTER_SIZE.  If it is not equal, you must define the macro
-+POINTERS_EXTEND_UNSIGNED to specify how pointers are extended
-+to Pmode.
-+*/
-+#define Pmode SImode
-+
-+/*
-+An alias for the machine mode used for memory references to functions
-+being called, in call RTL expressions.  On most machines this
-+should be QImode.
-+*/
-+#define FUNCTION_MODE SImode
-+
-+
-+#define REG_S_P(x) \
-+ (REG_P (x) || (GET_CODE (x) == SUBREG && REG_P (XEXP (x, 0))))
-+
-+
-+/* If defined, modifies the length assigned to instruction INSN as a
-+   function of the context in which it is used.  LENGTH is an lvalue
-+   that contains the initially computed length of the insn and should
-+   be updated with the correct length of the insn.  */
-+#define ADJUST_INSN_LENGTH(INSN, LENGTH) \
-+  ((LENGTH) = avr32_adjust_insn_length ((INSN), (LENGTH)))
-+
-+
-+#define CLZ_DEFINED_VALUE_AT_ZERO(mode, value) \
-+  (value = 32, (mode == SImode))
-+
-+#define CTZ_DEFINED_VALUE_AT_ZERO(mode, value) \
-+  (value = 32, (mode == SImode))
-+
-+#define UNITS_PER_SIMD_WORD(mode) UNITS_PER_WORD
-+
-+#define STORE_FLAG_VALUE 1
-+
-+
-+/* IF-conversion macros. */
-+#define IFCVT_MODIFY_INSN( CE_INFO, PATTERN, INSN )                     \
-+  {                                                                     \
-+    (PATTERN) = avr32_ifcvt_modify_insn (CE_INFO, PATTERN, INSN, &num_true_changes); \
-+  }
-+
-+#define IFCVT_EXTRA_FIELDS                              \
-+  int num_cond_clobber_insns;                           \
-+  int num_extra_move_insns;                             \
-+  rtx extra_move_insns[MAX_CONDITIONAL_EXECUTE];        \
-+  rtx moved_insns[MAX_CONDITIONAL_EXECUTE];
-+
-+#define IFCVT_INIT_EXTRA_FIELDS( CE_INFO )       \
-+  {                                              \
-+    (CE_INFO)->num_cond_clobber_insns = 0;       \
-+    (CE_INFO)->num_extra_move_insns = 0;         \
-+  }
-+
-+
-+#define IFCVT_MODIFY_CANCEL( CE_INFO )  avr32_ifcvt_modify_cancel (CE_INFO, &num_true_changes)
-+
-+#define IFCVT_ALLOW_MODIFY_TEST_IN_INSN 1
-+#define IFCVT_COND_EXEC_BEFORE_RELOAD (TARGET_COND_EXEC_BEFORE_RELOAD)
-+
-+enum avr32_builtins
-+{
-+  AVR32_BUILTIN_MTSR,
-+  AVR32_BUILTIN_MFSR,
-+  AVR32_BUILTIN_MTDR,
-+  AVR32_BUILTIN_MFDR,
-+  AVR32_BUILTIN_CACHE,
-+  AVR32_BUILTIN_SYNC,
-+  AVR32_BUILTIN_SSRF,
-+  AVR32_BUILTIN_CSRF,
-+  AVR32_BUILTIN_TLBR,
-+  AVR32_BUILTIN_TLBS,
-+  AVR32_BUILTIN_TLBW,
-+  AVR32_BUILTIN_BREAKPOINT,
-+  AVR32_BUILTIN_XCHG,
-+  AVR32_BUILTIN_LDXI,
-+  AVR32_BUILTIN_BSWAP16,
-+  AVR32_BUILTIN_BSWAP32,
-+  AVR32_BUILTIN_COP,
-+  AVR32_BUILTIN_MVCR_W,
-+  AVR32_BUILTIN_MVRC_W,
-+  AVR32_BUILTIN_MVCR_D,
-+  AVR32_BUILTIN_MVRC_D,
-+  AVR32_BUILTIN_MULSATHH_H,
-+  AVR32_BUILTIN_MULSATHH_W,
-+  AVR32_BUILTIN_MULSATRNDHH_H,
-+  AVR32_BUILTIN_MULSATRNDWH_W,
-+  AVR32_BUILTIN_MULSATWH_W,
-+  AVR32_BUILTIN_MACSATHH_W,
-+  AVR32_BUILTIN_SATADD_H,
-+  AVR32_BUILTIN_SATSUB_H,
-+  AVR32_BUILTIN_SATADD_W,
-+  AVR32_BUILTIN_SATSUB_W,
-+  AVR32_BUILTIN_MULWH_D,
-+  AVR32_BUILTIN_MULNWH_D,
-+  AVR32_BUILTIN_MACWH_D,
-+  AVR32_BUILTIN_MACHH_D,
-+  AVR32_BUILTIN_MUSFR,
-+  AVR32_BUILTIN_MUSTR,
-+  AVR32_BUILTIN_SATS,
-+  AVR32_BUILTIN_SATU,
-+  AVR32_BUILTIN_SATRNDS,
-+  AVR32_BUILTIN_SATRNDU,
-+  AVR32_BUILTIN_MEMS,
-+  AVR32_BUILTIN_MEMC,
-+  AVR32_BUILTIN_MEMT,
-+  AVR32_BUILTIN_SLEEP,
-+  AVR32_BUILTIN_DELAY_CYCLES
-+};
-+
-+
-+#define FLOAT_LIB_COMPARE_RETURNS_BOOL(MODE, COMPARISON) \
-+  ((MODE == SFmode) || (MODE == DFmode))
-+
-+#define RENAME_LIBRARY_SET ".set"
-+
-+/* Make ABI_NAME an alias for __GCC_NAME.  */
-+#define RENAME_LIBRARY(GCC_NAME, ABI_NAME)		\
-+  __asm__ (".globl\t__avr32_" #ABI_NAME "\n"		\
-+	   ".set\t__avr32_" #ABI_NAME 	\
-+	     ", __" #GCC_NAME "\n");
-+
-+/* Give libgcc functions avr32 ABI name.  */
-+#ifdef L_muldi3
-+#define DECLARE_LIBRARY_RENAMES RENAME_LIBRARY (muldi3, mul64)
-+#endif
-+#ifdef L_divdi3
-+#define DECLARE_LIBRARY_RENAMES RENAME_LIBRARY (divdi3, sdiv64)
-+#endif
-+#ifdef L_udivdi3
-+#define DECLARE_LIBRARY_RENAMES RENAME_LIBRARY (udivdi3, udiv64)
-+#endif
-+#ifdef L_moddi3
-+#define DECLARE_LIBRARY_RENAMES RENAME_LIBRARY (moddi3, smod64)
-+#endif
-+#ifdef L_umoddi3
-+#define DECLARE_LIBRARY_RENAMES RENAME_LIBRARY (umoddi3, umod64)
-+#endif
-+#ifdef L_ashldi3
-+#define DECLARE_LIBRARY_RENAMES RENAME_LIBRARY (ashldi3, lsl64)
-+#endif
-+#ifdef L_lshrdi3
-+#define DECLARE_LIBRARY_RENAMES RENAME_LIBRARY (lshrdi3, lsr64)
-+#endif
-+#ifdef L_ashrdi3
-+#define DECLARE_LIBRARY_RENAMES RENAME_LIBRARY (ashrdi3, asr64)
-+#endif
-+
-+#ifdef L_fixsfdi
-+#define DECLARE_LIBRARY_RENAMES RENAME_LIBRARY (fixsfdi, f32_to_s64)
-+#endif
-+#ifdef L_fixunssfdi
-+#define DECLARE_LIBRARY_RENAMES RENAME_LIBRARY (fixunssfdi, f32_to_u64)
-+#endif
-+#ifdef L_floatdidf
-+#define DECLARE_LIBRARY_RENAMES RENAME_LIBRARY (floatdidf, s64_to_f64)
-+#endif
-+#ifdef L_floatdisf
-+#define DECLARE_LIBRARY_RENAMES RENAME_LIBRARY (floatdisf, s64_to_f32)
-+#endif
-+
-+#endif
-diff -Nur gcc-4.4.6.orig/gcc/config/avr32/avr32.md gcc-4.4.6/gcc/config/avr32/avr32.md
---- gcc-4.4.6.orig/gcc/config/avr32/avr32.md	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.4.6/gcc/config/avr32/avr32.md	2011-10-22 19:23:08.524581303 +0200
-@@ -0,0 +1,5198 @@
-+;;   AVR32 machine description file.
-+;;   Copyright 2003,2004,2005,2006,2007,2008,2009 Atmel Corporation.
-+;;
-+;;   This file is part of GCC.
-+;;
-+;;   This program is free software; you can redistribute it and/or modify
-+;;   it under the terms of the GNU General Public License as published by
-+;;   the Free Software Foundation; either version 2 of the License, or
-+;;   (at your option) any later version.
-+;;
-+;;   This program is distributed in the hope that it will be useful,
-+;;   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+;;   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+;;   GNU General Public License for more details.
-+;;
-+;;   You should have received a copy of the GNU General Public License
-+;;   along with this program; if not, write to the Free Software
-+;;   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+
-+;; -*- Mode: Scheme -*-
-+
-+(define_attr "type" "alu,alu2,alu_sat,mulhh,mulwh,mulww_w,mulww_d,div,machh_w,macww_w,macww_d,branch,call,load,load_rm,store,load2,load4,store2,store4,fmul,fcmps,fcmpd,fcast,fmv,fmvcpu,fldd,fstd,flds,fsts,fstm"
-+  (const_string "alu"))
-+
-+
-+(define_attr "cc" "none,set_vncz,set_ncz,set_cz,set_z,set_z_if_not_v2,bld,compare,cmp_cond_insn,clobber,call_set,fpcompare,from_fpcc"
-+  (const_string "none"))
-+
-+
-+; NB! Keep this in sync with enum architecture_type in avr32.h
-+(define_attr "pipeline" "ap,ucr1,ucr2,ucr2nomul,ucr3,ucr3fp"
-+  (const (symbol_ref "avr32_arch->arch_type")))
-+
-+; Insn length in bytes
-+(define_attr "length" ""
-+  (const_int 4))
-+
-+; Signal if an insn is predicable and hence can be conditionally executed.
-+(define_attr "predicable" "no,yes" (const_string "no"))
-+
-+;; Uses of UNSPEC in this file:
-+(define_constants
-+  [(UNSPEC_PUSHM                0)
-+   (UNSPEC_POPM                 1)
-+   (UNSPEC_UDIVMODSI4_INTERNAL	2)
-+   (UNSPEC_DIVMODSI4_INTERNAL   3)
-+   (UNSPEC_STM                  4)
-+   (UNSPEC_LDM                  5)
-+   (UNSPEC_MOVSICC              6)
-+   (UNSPEC_ADDSICC              7)
-+   (UNSPEC_COND_MI              8)
-+   (UNSPEC_COND_PL              9)
-+   (UNSPEC_PIC_SYM              10)
-+   (UNSPEC_PIC_BASE             11)
-+   (UNSPEC_STORE_MULTIPLE       12)
-+   (UNSPEC_STMFP                13)
-+   (UNSPEC_FRCPA                14)
-+   (UNSPEC_REG_TO_CC            15)
-+   (UNSPEC_FORCE_MINIPOOL       16)
-+   (UNSPEC_SATS                 17)
-+   (UNSPEC_SATU                 18)
-+   (UNSPEC_SATRNDS              19)
-+   (UNSPEC_SATRNDU              20)
-+  ])
-+
-+(define_constants
-+  [(VUNSPEC_EPILOGUE                  0)
-+   (VUNSPEC_CACHE                     1)
-+   (VUNSPEC_MTSR                      2)
-+   (VUNSPEC_MFSR                      3)
-+   (VUNSPEC_BLOCKAGE                  4)
-+   (VUNSPEC_SYNC                      5)
-+   (VUNSPEC_TLBR                      6)
-+   (VUNSPEC_TLBW                      7)
-+   (VUNSPEC_TLBS                      8)
-+   (VUNSPEC_BREAKPOINT                9)
-+   (VUNSPEC_MTDR                      10)
-+   (VUNSPEC_MFDR                      11)
-+   (VUNSPEC_MVCR                      12)
-+   (VUNSPEC_MVRC                      13)
-+   (VUNSPEC_COP                       14)
-+   (VUNSPEC_ALIGN                     15)
-+   (VUNSPEC_POOL_START                16)
-+   (VUNSPEC_POOL_END                  17)
-+   (VUNSPEC_POOL_4                    18)
-+   (VUNSPEC_POOL_8                    19)
-+   (VUNSPEC_POOL_16                   20)
-+   (VUNSPEC_MUSFR                     21)
-+   (VUNSPEC_MUSTR                     22)
-+   (VUNSPEC_SYNC_CMPXCHG              23)
-+   (VUNSPEC_SYNC_SET_LOCK_AND_LOAD    24)
-+   (VUNSPEC_SYNC_STORE_IF_LOCK        25)
-+   (VUNSPEC_EH_RETURN                 26)
-+   (VUNSPEC_FRS                       27)
-+   (VUNSPEC_CSRF                      28)
-+   (VUNSPEC_SSRF                      29)
-+   (VUNSPEC_SLEEP                     30)
-+   (VUNSPEC_DELAY_CYCLES              31)
-+   (VUNSPEC_DELAY_CYCLES_1            32)
-+   (VUNSPEC_DELAY_CYCLES_2            33)
-+   (VUNSPEC_NOP		       34)
-+   (VUNSPEC_NOP3		       35)
-+   ])
-+
-+(define_constants
-+  [
-+   ;; R7 = 15-7 = 8
-+   (FP_REGNUM   8)
-+   ;; Return Register = R12 = 15 - 12 = 3
-+   (RETVAL_REGNUM   3)
-+   ;; SP = R13 = 15 - 13 = 2
-+   (SP_REGNUM   2)
-+   ;; LR = R14 = 15 - 14 = 1
-+   (LR_REGNUM   1)
-+   ;; PC = R15 = 15 - 15 = 0
-+   (PC_REGNUM   0)
-+   ;; FPSR = GENERAL_REGS + 1 = 17
-+   (FPCC_REGNUM 17)
-+   ])
-+
-+
-+
-+
-+;;******************************************************************************
-+;; Macros
-+;;******************************************************************************
-+
-+;; Integer Modes for basic alu insns
-+(define_mode_iterator INTM [SI HI QI])
-+(define_mode_attr  alu_cc_attr [(SI "set_vncz") (HI "clobber") (QI "clobber")])
-+
-+;; Move word modes
-+(define_mode_iterator MOVM [SI V2HI V4QI])
-+
-+;; For mov/addcc insns
-+(define_mode_iterator ADDCC [SI HI QI])
-+(define_mode_iterator MOVCC [SF SI HI QI])
-+(define_mode_iterator CMP [DI SI HI QI])
-+(define_mode_attr  store_postfix [(SF ".w") (SI ".w") (HI ".h") (QI ".b")])
-+(define_mode_attr  load_postfix [(SF ".w") (SI ".w") (HI ".sh") (QI ".ub")])
-+(define_mode_attr  load_postfix_s [(SI ".w") (HI ".sh") (QI ".sb")])
-+(define_mode_attr  load_postfix_u [(SI ".w") (HI ".uh") (QI ".ub")])
-+(define_mode_attr  pred_mem_constraint [(SF "RKu11") (SI "RKu11") (HI "RKu10") (QI "RKu09")])
-+(define_mode_attr  cmp_constraint [(DI "rKu20") (SI "rKs21") (HI "r") (QI "r")])
-+(define_mode_attr  cmp_predicate [(DI "register_immediate_operand")
-+                                  (SI "register_const_int_operand")
-+                                  (HI "register_operand")
-+                                  (QI "register_operand")])
-+(define_mode_attr  cmp_length [(DI "6")
-+                               (SI "4")
-+                               (HI "4")
-+                               (QI "4")])
-+
-+;; For all conditional insns
-+(define_code_iterator any_cond_b [ge lt geu ltu])
-+(define_code_iterator any_cond [gt ge lt le gtu geu ltu leu])
-+(define_code_iterator any_cond4 [gt le gtu leu])
-+(define_code_attr cond [(eq "eq") (ne "ne") (gt "gt") (ge "ge") (lt "lt") (le "le")
-+                        (gtu "hi") (geu "hs") (ltu "lo") (leu "ls")])
-+(define_code_attr invcond [(eq "ne") (ne "eq") (gt "le") (ge "lt") (lt "ge") (le "gt")
-+                           (gtu "ls") (geu "lo") (ltu "hs") (leu "hi")])
-+
-+;; For logical operations
-+(define_code_iterator logical [and ior xor])
-+(define_code_attr logical_insn [(and "and") (ior "or") (xor "eor")])
-+
-+;; Predicable operations with three register operands 
-+(define_code_iterator predicable_op3 [and ior xor plus minus])
-+(define_code_attr predicable_insn3 [(and "and") (ior "or") (xor "eor") (plus "add") (minus "sub")])
-+(define_code_attr predicable_commutative3 [(and "%") (ior "%") (xor "%") (plus "%") (minus "")])
-+
-+;; Load the predicates
-+(include "predicates.md")
-+
-+
-+;;******************************************************************************
-+;; Automaton pipeline description for avr32
-+;;******************************************************************************
-+
-+(define_automaton "avr32_ap")
-+
-+
-+(define_cpu_unit "is" "avr32_ap")
-+(define_cpu_unit "a1,m1,da" "avr32_ap")
-+(define_cpu_unit "a2,m2,d" "avr32_ap")
-+
-+;;Alu instructions
-+(define_insn_reservation "alu_op" 1
-+  (and (eq_attr "pipeline" "ap")
-+       (eq_attr "type" "alu"))
-+  "is,a1,a2")
-+
-+(define_insn_reservation "alu2_op" 2
-+  (and (eq_attr "pipeline" "ap")
-+       (eq_attr "type" "alu2"))
-+  "is,is+a1,a1+a2,a2")
-+
-+(define_insn_reservation "alu_sat_op" 2
-+  (and (eq_attr "pipeline" "ap")
-+       (eq_attr "type" "alu_sat"))
-+  "is,a1,a2")
-+
-+
-+;;Mul instructions
-+(define_insn_reservation "mulhh_op" 2
-+  (and (eq_attr "pipeline" "ap")
-+       (eq_attr "type" "mulhh,mulwh"))
-+  "is,m1,m2")
-+
-+(define_insn_reservation "mulww_w_op" 3
-+  (and (eq_attr "pipeline" "ap")
-+       (eq_attr "type" "mulww_w"))
-+  "is,m1,m1+m2,m2")
-+
-+(define_insn_reservation "mulww_d_op" 5
-+  (and (eq_attr "pipeline" "ap")
-+       (eq_attr "type" "mulww_d"))
-+  "is,m1,m1+m2,m1+m2,m2,m2")
-+
-+(define_insn_reservation "div_op" 33
-+  (and (eq_attr "pipeline" "ap")
-+       (eq_attr "type" "div"))
-+  "is,m1,m1*31 + m2*31,m2")
-+
-+(define_insn_reservation "machh_w_op" 3
-+  (and (eq_attr "pipeline" "ap")
-+       (eq_attr "type" "machh_w"))
-+  "is*2,m1,m2")
-+
-+
-+(define_insn_reservation "macww_w_op" 4
-+  (and (eq_attr "pipeline" "ap")
-+       (eq_attr "type" "macww_w"))
-+  "is*2,m1,m1,m2")
-+
-+
-+(define_insn_reservation "macww_d_op" 6
-+  (and (eq_attr "pipeline" "ap")
-+       (eq_attr "type" "macww_d"))
-+  "is*2,m1,m1+m2,m1+m2,m2")
-+
-+;;Bypasses for Mac instructions, because of accumulator cache.
-+;;Set latency as low as possible in order to let the compiler let
-+;;mul -> mac and mac -> mac combinations which use the same
-+;;accumulator cache be placed close together to avoid any
-+;;instructions which can ruin the accumulator cache come inbetween.
-+(define_bypass 4 "machh_w_op" "alu_op,alu2_op,alu_sat_op,load_op" "avr32_mul_waw_bypass")
-+(define_bypass 5 "macww_w_op" "alu_op,alu2_op,alu_sat_op,load_op" "avr32_mul_waw_bypass")
-+(define_bypass 7 "macww_d_op" "alu_op,alu2_op,alu_sat_op,load_op" "avr32_mul_waw_bypass")
-+
-+(define_bypass 3 "mulhh_op" "alu_op,alu2_op,alu_sat_op,load_op" "avr32_mul_waw_bypass")
-+(define_bypass 4 "mulww_w_op" "alu_op,alu2_op,alu_sat_op,load_op" "avr32_mul_waw_bypass")
-+(define_bypass 6 "mulww_d_op" "alu_op,alu2_op,alu_sat_op,load_op" "avr32_mul_waw_bypass")
-+
-+
-+;;Bypasses for all mul/mac instructions followed by an instruction
-+;;which reads the output AND writes the result to the same register.
-+;;This will generate an Write After Write hazard which gives an
-+;;extra cycle before the result is ready.
-+(define_bypass 0 "machh_w_op" "machh_w_op" "avr32_valid_macmac_bypass")
-+(define_bypass 0 "macww_w_op" "macww_w_op" "avr32_valid_macmac_bypass")
-+(define_bypass 0 "macww_d_op" "macww_d_op" "avr32_valid_macmac_bypass")
-+
-+(define_bypass 0 "mulhh_op" "machh_w_op" "avr32_valid_mulmac_bypass")
-+(define_bypass 0 "mulww_w_op" "macww_w_op" "avr32_valid_mulmac_bypass")
-+(define_bypass 0 "mulww_d_op" "macww_d_op" "avr32_valid_mulmac_bypass")
-+
-+;;Branch and call instructions
-+;;We assume that all branches and rcalls are predicted correctly :-)
-+;;while calls use a lot of cycles.
-+(define_insn_reservation "branch_op" 0
-+  (and (eq_attr "pipeline" "ap")
-+       (eq_attr "type" "branch"))
-+  "nothing")
-+
-+(define_insn_reservation "call_op" 10
-+  (and (eq_attr "pipeline" "ap")
-+       (eq_attr "type" "call"))
-+  "nothing")
-+
-+
-+;;Load store instructions
-+(define_insn_reservation "load_op" 2
-+  (and (eq_attr "pipeline" "ap")
-+       (eq_attr "type" "load"))
-+  "is,da,d")
-+
-+(define_insn_reservation "load_rm_op" 3
-+  (and (eq_attr "pipeline" "ap")
-+       (eq_attr "type" "load_rm"))
-+  "is,da,d")
-+
-+
-+(define_insn_reservation "store_op" 0
-+  (and (eq_attr "pipeline" "ap")
-+       (eq_attr "type" "store"))
-+  "is,da,d")
-+
-+
-+(define_insn_reservation "load_double_op" 3
-+  (and (eq_attr "pipeline" "ap")
-+       (eq_attr "type" "load2"))
-+  "is,da,da+d,d")
-+
-+(define_insn_reservation "load_quad_op" 4
-+  (and (eq_attr "pipeline" "ap")
-+       (eq_attr "type" "load4"))
-+  "is,da,da+d,da+d,d")
-+
-+(define_insn_reservation "store_double_op" 0
-+  (and (eq_attr "pipeline" "ap")
-+       (eq_attr "type" "store2"))
-+  "is,da,da+d,d")
-+
-+
-+(define_insn_reservation "store_quad_op" 0
-+  (and (eq_attr "pipeline" "ap")
-+       (eq_attr "type" "store4"))
-+  "is,da,da+d,da+d,d")
-+
-+;;For store the operand to write to memory is read in d and
-+;;the real latency between any instruction and a store is therefore
-+;;one less than for the instructions which reads the operands in the first
-+;;excecution stage
-+(define_bypass 2 "load_double_op" "store_double_op" "avr32_store_bypass")
-+(define_bypass 3 "load_quad_op" "store_quad_op" "avr32_store_bypass")
-+(define_bypass 1 "load_op" "store_op" "avr32_store_bypass")
-+(define_bypass 2 "load_rm_op" "store_op" "avr32_store_bypass")
-+(define_bypass 1 "alu_sat_op" "store_op" "avr32_store_bypass")
-+(define_bypass 1 "alu2_op" "store_op" "avr32_store_bypass")
-+(define_bypass 1 "mulhh_op" "store_op" "avr32_store_bypass")
-+(define_bypass 2 "mulww_w_op" "store_op" "avr32_store_bypass")
-+(define_bypass 4 "mulww_d_op" "store_op" "avr32_store_bypass" )
-+(define_bypass 2 "machh_w_op" "store_op" "avr32_store_bypass")
-+(define_bypass 3 "macww_w_op" "store_op" "avr32_store_bypass")
-+(define_bypass 5 "macww_d_op" "store_op" "avr32_store_bypass")
-+
-+
-+; Bypass for load double operation. If only the first loaded word is needed
-+; then the latency is 2
-+(define_bypass 2 "load_double_op"
-+                 "load_op,load_rm_op,alu_sat_op, alu2_op, alu_op, mulhh_op, mulww_w_op,
-+                  mulww_d_op, machh_w_op, macww_w_op, macww_d_op"
-+                 "avr32_valid_load_double_bypass")
-+
-+; Bypass for load quad operation. If only the first or second loaded word is needed
-+; we set the latency to 2
-+(define_bypass 2 "load_quad_op"
-+                 "load_op,load_rm_op,alu_sat_op, alu2_op, alu_op, mulhh_op, mulww_w_op,
-+                  mulww_d_op, machh_w_op, macww_w_op, macww_d_op"
-+                 "avr32_valid_load_quad_bypass")
-+
-+
-+;;******************************************************************************
-+;; End of Automaton pipeline description for avr32
-+;;******************************************************************************
-+
-+(define_cond_exec
-+  [(match_operator 0 "avr32_comparison_operator"
-+    [(match_operand:CMP 1 "register_operand" "r")         
-+     (match_operand:CMP 2 "<CMP:cmp_predicate>" "<CMP:cmp_constraint>")])]
-+  "TARGET_V2_INSNS" 
-+  "%!"
-+)
-+
-+(define_cond_exec
-+  [(match_operator 0 "avr32_comparison_operator"
-+     [(and:SI (match_operand:SI 1 "register_operand" "r")         
-+              (match_operand:SI 2 "one_bit_set_operand" "i"))
-+      (const_int 0)])]
-+  "TARGET_V2_INSNS" 
-+  "%!"
-+  )
-+
-+;;=============================================================================
-+;; move
-+;;-----------------------------------------------------------------------------
-+
-+
-+;;== char - 8 bits ============================================================
-+(define_expand "movqi"
-+  [(set (match_operand:QI 0 "nonimmediate_operand" "")
-+	(match_operand:QI 1 "general_operand" ""))]
-+  ""
-+  {
-+   if ( can_create_pseudo_p () ){
-+     if (GET_CODE (operands[1]) == MEM && optimize){
-+         rtx reg = gen_reg_rtx (SImode);
-+
-+         emit_insn (gen_zero_extendqisi2 (reg, operands[1]));
-+         operands[1] = gen_lowpart (QImode, reg);
-+     }
-+
-+     /* One of the ops has to be in a register.  */
-+     if (GET_CODE (operands[0]) == MEM)
-+       operands[1] = force_reg (QImode, operands[1]);
-+   }
-+
-+  })
-+
-+(define_insn "*movqi_internal"
-+  [(set (match_operand:QI 0 "nonimmediate_operand" "=r,r,m,r")
-+	(match_operand:QI 1 "general_operand"  "rKs08,m,r,i"))]
-+  "register_operand (operands[0], QImode)
-+   || register_operand (operands[1], QImode)"
-+  "@
-+   mov\t%0, %1
-+   ld.ub\t%0, %1
-+   st.b\t%0, %1
-+   mov\t%0, %1"
-+  [(set_attr "length" "2,4,4,4")
-+   (set_attr "type" "alu,load_rm,store,alu")])
-+
-+
-+
-+;;== short - 16 bits ==========================================================
-+(define_expand "movhi"
-+  [(set (match_operand:HI 0 "nonimmediate_operand" "")
-+	(match_operand:HI 1 "general_operand" ""))]
-+  ""
-+  {
-+   if ( can_create_pseudo_p () ){
-+     if (GET_CODE (operands[1]) == MEM && optimize){
-+         rtx reg = gen_reg_rtx (SImode);
-+
-+         emit_insn (gen_extendhisi2 (reg, operands[1]));
-+         operands[1] = gen_lowpart (HImode, reg);
-+     }
-+
-+     /* One of the ops has to be in a register.  */
-+     if (GET_CODE (operands[0]) == MEM)
-+       operands[1] = force_reg (HImode, operands[1]);
-+   }
-+
-+  })
-+
-+
-+(define_insn "*movhi_internal"
-+  [(set (match_operand:HI 0 "nonimmediate_operand" "=r,r,m,r")
-+	(match_operand:HI 1 "general_operand"  "rKs08,m,r,i"))]
-+  "register_operand (operands[0], HImode)
-+   || register_operand (operands[1], HImode)"
-+  "@
-+   mov\t%0, %1
-+   ld.sh\t%0, %1
-+   st.h\t%0, %1
-+   mov\t%0, %1"
-+  [(set_attr "length" "2,4,4,4")
-+   (set_attr "type" "alu,load_rm,store,alu")])
-+
-+
-+;;== int - 32 bits ============================================================
-+
-+(define_expand "movmisalignsi"
-+  [(set (match_operand:SI 0 "nonimmediate_operand" "")
-+	(match_operand:SI 1 "nonimmediate_operand" ""))]
-+  "TARGET_UNALIGNED_WORD"
-+  {
-+  }
-+)
-+
-+(define_expand "mov<mode>"
-+  [(set (match_operand:MOVM 0 "avr32_non_rmw_nonimmediate_operand" "")
-+	(match_operand:MOVM 1 "avr32_non_rmw_general_operand" ""))]
-+  ""
-+  {
-+
-+    /* One of the ops has to be in a register.  */
-+    if (GET_CODE (operands[0]) == MEM)
-+      operands[1] = force_reg (<MODE>mode, operands[1]);
-+
-+    /* Check for out of range immediate constants as these may
-+       occur during reloading, since it seems like reload does
-+       not check if the immediate is legitimate. Don't know if
-+       this is a bug? */
-+    if ( reload_in_progress
-+         && avr32_imm_in_const_pool
-+         && GET_CODE(operands[1]) == CONST_INT
-+         && !avr32_const_ok_for_constraint_p(INTVAL(operands[1]), 'K', "Ks21") ){
-+        operands[1] = force_const_mem(SImode, operands[1]);
-+    }
-+    /* Check for RMW memory operands. They are not allowed for mov operations
-+       only the atomic memc/s/t operations */
-+    if ( !reload_in_progress
-+         && avr32_rmw_memory_operand (operands[0], <MODE>mode) ){
-+       operands[0] = copy_rtx (operands[0]);                                                              
-+       XEXP(operands[0], 0) = force_reg (<MODE>mode, XEXP(operands[0], 0));
-+    }
-+
-+    if ( !reload_in_progress
-+         && avr32_rmw_memory_operand (operands[1], <MODE>mode) ){
-+       operands[1] = copy_rtx (operands[1]);                                                              
-+      XEXP(operands[1], 0) = force_reg (<MODE>mode, XEXP(operands[1], 0));
-+    }
-+    if ( (flag_pic || TARGET_HAS_ASM_ADDR_PSEUDOS)
-+         && !avr32_legitimate_pic_operand_p(operands[1]) )
-+      operands[1] = legitimize_pic_address (operands[1], <MODE>mode,
-+                                            (can_create_pseudo_p () ? 0: operands[0]));
-+    else if ( flag_pic && avr32_address_operand(operands[1], GET_MODE(operands[1])) )
-+      /* If we have an address operand then this function uses the pic register. */
-+      crtl->uses_pic_offset_table = 1;
-+  })
-+
-+
-+(define_insn "mov<mode>_internal"
-+  [(set (match_operand:MOVM 0 "avr32_non_rmw_nonimmediate_operand" "=r,   r,   r,r,r,Q,r")
-+	(match_operand:MOVM 1 "avr32_non_rmw_general_operand"      "rKs08,Ks21,J,n,Q,r,W"))]
-+  "(register_operand (operands[0], <MODE>mode)
-+    || register_operand (operands[1], <MODE>mode))
-+    && !avr32_rmw_memory_operand (operands[0], <MODE>mode) 
-+    && !avr32_rmw_memory_operand (operands[1], <MODE>mode)"
-+  {
-+    switch (which_alternative) {
-+      case 0:
-+      case 1: return "mov\t%0, %1";
-+      case 2:
-+        if ( TARGET_V2_INSNS )
-+           return "movh\t%0, hi(%1)";
-+        /* Fallthrough */
-+      case 3: return "mov\t%0, lo(%1)\;orh\t%0,hi(%1)";
-+      case 4:
-+        if ( (REG_P(XEXP(operands[1], 0))
-+              && REGNO(XEXP(operands[1], 0)) == SP_REGNUM)
-+             || (GET_CODE(XEXP(operands[1], 0)) == PLUS
-+                 && REGNO(XEXP(XEXP(operands[1], 0), 0)) == SP_REGNUM
-+	         && GET_CODE(XEXP(XEXP(operands[1], 0), 1)) == CONST_INT
-+	         && INTVAL(XEXP(XEXP(operands[1], 0), 1)) % 4 == 0
-+	         && INTVAL(XEXP(XEXP(operands[1], 0), 1)) <= 0x1FC) )
-+          return "lddsp\t%0, %1";
-+	else if ( avr32_const_pool_ref_operand(operands[1], GET_MODE(operands[1])) )
-+          return "lddpc\t%0, %1";
-+        else
-+          return "ld.w\t%0, %1";
-+      case 5:
-+        if ( (REG_P(XEXP(operands[0], 0))
-+              && REGNO(XEXP(operands[0], 0)) == SP_REGNUM)
-+             || (GET_CODE(XEXP(operands[0], 0)) == PLUS
-+                 && REGNO(XEXP(XEXP(operands[0], 0), 0)) == SP_REGNUM
-+	         && GET_CODE(XEXP(XEXP(operands[0], 0), 1)) == CONST_INT
-+	         && INTVAL(XEXP(XEXP(operands[0], 0), 1)) % 4 == 0
-+	         && INTVAL(XEXP(XEXP(operands[0], 0), 1)) <= 0x1FC) )
-+          return "stdsp\t%0, %1";
-+	else
-+          return "st.w\t%0, %1";
-+      case 6:
-+        if ( TARGET_HAS_ASM_ADDR_PSEUDOS )
-+          return "lda.w\t%0, %1";
-+        else
-+          return "ld.w\t%0, r6[%1@got]";
-+      default:
-+	abort();
-+    }
-+  }
-+  
-+  [(set_attr "length" "2,4,4,8,4,4,8")
-+   (set_attr "type" "alu,alu,alu,alu2,load,store,load")
-+   (set_attr "cc" "none,none,set_z_if_not_v2,set_z,none,none,clobber")])
-+
-+
-+(define_expand "reload_out_rmw_memory_operand"
-+  [(set (match_operand:SI 2 "register_operand" "=r")
-+        (match_operand:SI 0 "address_operand" ""))
-+   (set (mem:SI (match_dup 2))
-+        (match_operand:SI 1 "register_operand" ""))]
-+  ""
-+  {
-+   operands[0] = XEXP(operands[0], 0);
-+  }
-+)
-+
-+(define_expand "reload_in_rmw_memory_operand"
-+  [(set (match_operand:SI 2 "register_operand" "=r")
-+        (match_operand:SI 1 "address_operand" ""))
-+   (set (match_operand:SI 0 "register_operand" "")
-+        (mem:SI (match_dup 2)))]
-+  ""
-+  {
-+   operands[1] = XEXP(operands[1], 0);
-+  }
-+)
-+
-+
-+;; These instructions are for loading constants which cannot be loaded
-+;; directly from the constant pool because the offset is too large
-+;; high and lo_sum are used even tough for our case it should be
-+;; low and high sum :-)
-+(define_insn "mov_symbol_lo"
-+  [(set (match_operand:SI 0 "register_operand" "=r")
-+	(high:SI (match_operand:SI 1 "immediate_operand" "i" )))]
-+  ""
-+  "mov\t%0, lo(%1)"
-+  [(set_attr "type" "alu")
-+   (set_attr "length" "4")]
-+)
-+
-+(define_insn "add_symbol_hi"
-+  [(set (match_operand:SI 0 "register_operand" "=r")
-+	(lo_sum:SI (match_dup 0)
-+                   (match_operand:SI 1 "immediate_operand" "i" )))]
-+  ""
-+  "orh\t%0, hi(%1)"
-+  [(set_attr "type" "alu")
-+   (set_attr "length" "4")]
-+)
-+
-+
-+
-+;; When generating pic, we need to load the symbol offset into a register.
-+;; So that the optimizer does not confuse this with a normal symbol load
-+;; we use an unspec.  The offset will be loaded from a constant pool entry,
-+;; since that is the only type of relocation we can use.
-+(define_insn "pic_load_addr"
-+  [(set (match_operand:SI 0 "register_operand" "=r")
-+	(unspec:SI [(match_operand:SI 1 "" "")] UNSPEC_PIC_SYM))]
-+  "flag_pic && CONSTANT_POOL_ADDRESS_P(XEXP(operands[1], 0))"
-+  "lddpc\t%0, %1"
-+  [(set_attr "type" "load")
-+   (set_attr "length" "4")]
-+)
-+
-+(define_insn "pic_compute_got_from_pc"
-+  [(set (match_operand:SI 0 "register_operand" "+r")
-+	(unspec:SI [(minus:SI (pc)
-+                              (match_dup 0))] UNSPEC_PIC_BASE))
-+   (use (label_ref (match_operand 1 "" "")))]
-+  "flag_pic"
-+  {
-+   (*targetm.asm_out.internal_label) (asm_out_file, "L",
-+	 		     CODE_LABEL_NUMBER (operands[1]));
-+   return \"rsub\t%0, pc\";
-+  }
-+  [(set_attr "cc" "clobber")
-+   (set_attr "length" "2")]
-+)
-+
-+;;== long long int - 64 bits ==================================================
-+
-+(define_expand "movdi"
-+  [(set (match_operand:DI 0 "nonimmediate_operand" "")
-+	(match_operand:DI 1 "general_operand" ""))]
-+  ""
-+  {
-+
-+    /* One of the ops has to be in a register.  */
-+    if (GET_CODE (operands[0]) != REG)
-+      operands[1] = force_reg (DImode, operands[1]);
-+
-+  })
-+
-+
-+(define_insn_and_split "*movdi_internal"
-+  [(set (match_operand:DI 0 "nonimmediate_operand"     "=r,r,   r,   r,r,r,m")
-+	(match_operand:DI 1 "general_operand"          "r, Ks08,Ks21,G,n,m,r"))]
-+  "register_operand (operands[0], DImode)
-+   || register_operand (operands[1], DImode)"
-+  {
-+    switch (which_alternative ){
-+    case 0:
-+    case 1:
-+    case 2:
-+    case 3:
-+    case 4:
-+        return "#";
-+    case 5:
-+      if ( avr32_const_pool_ref_operand(operands[1], GET_MODE(operands[1])))
-+        return "ld.d\t%0, pc[%1 - .]";
-+      else
-+        return "ld.d\t%0, %1";
-+    case 6:
-+      return "st.d\t%0, %1";
-+    default:
-+      abort();
-+    }
-+  }
-+;; Lets split all reg->reg or imm->reg transfers into two SImode transfers 
-+  "reload_completed &&
-+   (REG_P (operands[0]) &&
-+   (REG_P (operands[1]) 
-+    || GET_CODE (operands[1]) == CONST_INT
-+    || GET_CODE (operands[1]) == CONST_DOUBLE))"
-+  [(set (match_dup 0) (match_dup 1))
-+   (set (match_dup 2) (match_dup 3))]
-+  {
-+    operands[2] = gen_highpart (SImode, operands[0]);
-+    operands[0] = gen_lowpart (SImode, operands[0]);
-+    if ( REG_P(operands[1]) ){
-+      operands[3] = gen_highpart(SImode, operands[1]);
-+      operands[1] = gen_lowpart(SImode, operands[1]);
-+    } else if ( GET_CODE(operands[1]) == CONST_DOUBLE 
-+                || GET_CODE(operands[1]) == CONST_INT ){
-+      rtx split_const[2];
-+      avr32_split_const_expr (DImode, SImode, operands[1], split_const);
-+      operands[3] = split_const[1];
-+      operands[1] = split_const[0];
-+    } else {
-+      internal_error("Illegal operand[1] for movdi split!");
-+    }
-+  }
-+
-+  [(set_attr "length" "*,*,*,*,*,4,4")
-+   (set_attr "type" "*,*,*,*,*,load2,store2")
-+   (set_attr "cc" "*,*,*,*,*,none,none")])
-+
-+
-+;;== 128 bits ==================================================
-+(define_expand "movti"
-+  [(set (match_operand:TI 0 "nonimmediate_operand" "")
-+	(match_operand:TI 1 "nonimmediate_operand" ""))]
-+  "TARGET_ARCH_AP"    
-+  {     
-+        
-+    /* One of the ops has to be in a register.  */
-+    if (GET_CODE (operands[0]) != REG)
-+      operands[1] = force_reg (TImode, operands[1]);
-+
-+    /* We must fix any pre_dec for loads and post_inc stores */
-+    if ( GET_CODE (operands[0]) == MEM
-+         && GET_CODE (XEXP(operands[0],0)) == POST_INC ){
-+       emit_move_insn(gen_rtx_MEM(TImode, XEXP(XEXP(operands[0],0),0)), operands[1]);
-+       emit_insn(gen_addsi3(XEXP(XEXP(operands[0],0),0), XEXP(XEXP(operands[0],0),0), GEN_INT(GET_MODE_SIZE(TImode))));
-+       DONE;
-+    }
-+
-+    if ( GET_CODE (operands[1]) == MEM
-+         && GET_CODE (XEXP(operands[1],0)) == PRE_DEC ){
-+       emit_insn(gen_addsi3(XEXP(XEXP(operands[1],0),0), XEXP(XEXP(operands[1],0),0), GEN_INT(-GET_MODE_SIZE(TImode))));
-+       emit_move_insn(operands[0], gen_rtx_MEM(TImode, XEXP(XEXP(operands[1],0),0)));
-+       DONE;
-+    }
-+  })
-+
-+
-+(define_insn_and_split "*movti_internal"
-+  [(set (match_operand:TI 0 "avr32_movti_dst_operand"  "=r,&r,    r,    <RKu00,r,r")
-+	(match_operand:TI 1 "avr32_movti_src_operand"  " r,RKu00>,RKu00,r,     n,T"))]
-+  "(register_operand (operands[0], TImode)
-+    || register_operand (operands[1], TImode))"
-+  {
-+    switch (which_alternative ){
-+    case 0:
-+    case 2:
-+    case 4:
-+        return "#";
-+    case 1:
-+        return "ldm\t%p1, %0";
-+    case 3:
-+        return "stm\t%p0, %1";
-+    case 5:
-+        return "ld.d\t%U0, pc[%1 - .]\;ld.d\t%B0, pc[%1 - . + 8]";
-+    }
-+  }
-+
-+  "reload_completed &&
-+   (REG_P (operands[0]) &&
-+   (REG_P (operands[1]) 
-+    /* If this is a load from the constant pool we split it into
-+       two double loads. */
-+    || (GET_CODE (operands[1]) == MEM
-+        && GET_CODE (XEXP (operands[1], 0)) == SYMBOL_REF
-+        && CONSTANT_POOL_ADDRESS_P (XEXP (operands[1], 0)))               
-+    /* If this is a load where the pointer register is a part
-+       of the register list, we must split it into two double
-+       loads in order for it to be exception safe. */
-+    || (GET_CODE (operands[1]) == MEM
-+        && register_operand (XEXP (operands[1], 0), SImode)
-+        && reg_overlap_mentioned_p (operands[0], XEXP (operands[1], 0)))               
-+    || GET_CODE (operands[1]) == CONST_INT
-+    || GET_CODE (operands[1]) == CONST_DOUBLE))"
-+  [(set (match_dup 0) (match_dup 1))
-+   (set (match_dup 2) (match_dup 3))]
-+  {
-+    operands[2] = simplify_gen_subreg ( DImode, operands[0], 
-+                                        TImode, 0 );
-+    operands[0] = simplify_gen_subreg ( DImode, operands[0], 
-+                                        TImode, 8 );
-+    if ( REG_P(operands[1]) ){
-+      operands[3] = simplify_gen_subreg ( DImode, operands[1], 
-+                                          TImode, 0 );
-+      operands[1] = simplify_gen_subreg ( DImode, operands[1], 
-+                                          TImode, 8 );
-+    } else if ( GET_CODE(operands[1]) == CONST_DOUBLE 
-+                || GET_CODE(operands[1]) == CONST_INT ){
-+      rtx split_const[2];
-+      avr32_split_const_expr (TImode, DImode, operands[1], split_const);
-+      operands[3] = split_const[1];
-+      operands[1] = split_const[0];
-+    } else if (avr32_const_pool_ref_operand (operands[1], GET_MODE(operands[1]))){
-+      rtx split_const[2];
-+      rtx cop = avoid_constant_pool_reference (operands[1]);
-+      if (operands[1] == cop)
-+        cop = get_pool_constant (XEXP (operands[1], 0));
-+      avr32_split_const_expr (TImode, DImode, cop, split_const);
-+      operands[3] = force_const_mem (DImode, split_const[1]); 
-+      operands[1] = force_const_mem (DImode, split_const[0]); 
-+   } else {
-+      rtx ptr_reg = XEXP (operands[1], 0);
-+      operands[1] = gen_rtx_MEM (DImode, 
-+                                 gen_rtx_PLUS ( SImode,
-+                                                ptr_reg,
-+                                                GEN_INT (8) ));
-+      operands[3] = gen_rtx_MEM (DImode,
-+                                 ptr_reg);
-+              
-+      /* Check if the first load will clobber the pointer.
-+         If so, we must switch the order of the operations. */
-+      if ( reg_overlap_mentioned_p (operands[0], ptr_reg) )
-+        {
-+          /* We need to switch the order of the operations
-+             so that the pointer register does not get clobbered
-+             after the first double word load. */
-+          rtx tmp;
-+          tmp = operands[0];
-+          operands[0] = operands[2];
-+          operands[2] = tmp;
-+          tmp = operands[1];
-+          operands[1] = operands[3];
-+          operands[3] = tmp;
-+        }
-+
-+
-+   }
-+  }
-+  [(set_attr "length" "*,*,4,4,*,8")
-+   (set_attr "type" "*,*,load4,store4,*,load4")])
-+
-+
-+;;== float - 32 bits ==========================================================
-+(define_expand "movsf"
-+  [(set (match_operand:SF 0 "nonimmediate_operand" "")
-+	(match_operand:SF 1 "general_operand" ""))]
-+  ""
-+  {
-+
-+
-+    /* One of the ops has to be in a register.  */
-+    if (GET_CODE (operands[0]) != REG)
-+      operands[1] = force_reg (SFmode, operands[1]);
-+
-+  })
-+
-+(define_insn "*movsf_internal"
-+  [(set (match_operand:SF 0 "nonimmediate_operand"     "=r,r,r,r,m")
-+	(match_operand:SF 1 "general_operand"          "r, G,F,m,r"))]
-+  "(register_operand (operands[0], SFmode)
-+    || register_operand (operands[1], SFmode))"
-+  {
-+    switch (which_alternative) {
-+      case 0:
-+      case 1: return "mov\t%0, %1";
-+      case 2: 
-+       {
-+        HOST_WIDE_INT target_float[2];
-+        real_to_target (target_float, CONST_DOUBLE_REAL_VALUE (operands[1]), SFmode);
-+        if ( TARGET_V2_INSNS 
-+             && avr32_hi16_immediate_operand (GEN_INT (target_float[0]), VOIDmode) )
-+           return "movh\t%0, hi(%1)";
-+        else
-+           return "mov\t%0, lo(%1)\;orh\t%0, hi(%1)";
-+       }
-+      case 3:
-+        if ( (REG_P(XEXP(operands[1], 0))
-+              && REGNO(XEXP(operands[1], 0)) == SP_REGNUM)
-+             || (GET_CODE(XEXP(operands[1], 0)) == PLUS
-+                 && REGNO(XEXP(XEXP(operands[1], 0), 0)) == SP_REGNUM
-+	         && GET_CODE(XEXP(XEXP(operands[1], 0), 1)) == CONST_INT
-+	         && INTVAL(XEXP(XEXP(operands[1], 0), 1)) % 4 == 0
-+	         && INTVAL(XEXP(XEXP(operands[1], 0), 1)) <= 0x1FC) )
-+          return "lddsp\t%0, %1";
-+          else if ( avr32_const_pool_ref_operand(operands[1], GET_MODE(operands[1])) )
-+          return "lddpc\t%0, %1";
-+        else
-+          return "ld.w\t%0, %1";
-+      case 4:
-+        if ( (REG_P(XEXP(operands[0], 0))
-+              && REGNO(XEXP(operands[0], 0)) == SP_REGNUM)
-+             || (GET_CODE(XEXP(operands[0], 0)) == PLUS
-+                 && REGNO(XEXP(XEXP(operands[0], 0), 0)) == SP_REGNUM
-+	         && GET_CODE(XEXP(XEXP(operands[0], 0), 1)) == CONST_INT
-+	         && INTVAL(XEXP(XEXP(operands[0], 0), 1)) % 4 == 0
-+	         && INTVAL(XEXP(XEXP(operands[0], 0), 1)) <= 0x1FC) )
-+          return "stdsp\t%0, %1";
-+	else
-+          return "st.w\t%0, %1";
-+      default:
-+	abort();
-+    }
-+  }
-+
-+  [(set_attr "length" "2,4,8,4,4")
-+   (set_attr "type" "alu,alu,alu2,load,store")
-+   (set_attr "cc" "none,none,clobber,none,none")])
-+
-+
-+
-+;;== double - 64 bits =========================================================
-+(define_expand "movdf"
-+  [(set (match_operand:DF 0 "nonimmediate_operand" "")
-+	(match_operand:DF 1 "general_operand" ""))]
-+  ""
-+  {
-+    /* One of the ops has to be in a register.  */
-+    if (GET_CODE (operands[0]) != REG){
-+      operands[1] = force_reg (DFmode, operands[1]);
-+    }
-+  })
-+
-+
-+(define_insn_and_split "*movdf_internal"
-+  [(set (match_operand:DF 0 "nonimmediate_operand"     "=r,r,r,r,m")
-+	(match_operand:DF 1 "general_operand"          " r,G,F,m,r"))]
-+  "(register_operand (operands[0], DFmode)
-+       || register_operand (operands[1], DFmode))"
-+  {
-+    switch (which_alternative ){
-+    case 0:
-+    case 1:
-+    case 2: 
-+        return "#";
-+    case 3:
-+      if ( avr32_const_pool_ref_operand(operands[1], GET_MODE(operands[1])))
-+        return "ld.d\t%0, pc[%1 - .]";
-+      else
-+        return "ld.d\t%0, %1";
-+    case 4:
-+      return "st.d\t%0, %1";
-+    default:
-+      abort();
-+    }
-+  }
-+  "reload_completed
-+   && (REG_P (operands[0]) 
-+        && (REG_P (operands[1])
-+            || GET_CODE (operands[1]) == CONST_DOUBLE))"
-+  [(set (match_dup 0) (match_dup 1))
-+   (set (match_dup 2) (match_dup 3))]
-+  "
-+   {
-+    operands[2] = gen_highpart (SImode, operands[0]);
-+    operands[0] = gen_lowpart (SImode, operands[0]);
-+    operands[3] = gen_highpart(SImode, operands[1]);
-+    operands[1] = gen_lowpart(SImode, operands[1]);
-+   }
-+  "
-+
-+  [(set_attr "length" "*,*,*,4,4")
-+   (set_attr "type" "*,*,*,load2,store2")
-+   (set_attr "cc" "*,*,*,none,none")])
-+
-+
-+;;=============================================================================
-+;; Conditional Moves
-+;;=============================================================================
-+(define_insn "ld<mode>_predicable"
-+  [(set (match_operand:MOVCC 0 "register_operand" "=r")
-+	(match_operand:MOVCC 1 "avr32_non_rmw_memory_operand" "<MOVCC:pred_mem_constraint>"))]
-+  "TARGET_V2_INSNS"
-+  "ld<MOVCC:load_postfix>%?\t%0, %1"
-+  [(set_attr "length" "4")
-+   (set_attr "cc" "cmp_cond_insn")
-+   (set_attr "type" "load")
-+   (set_attr "predicable" "yes")]
-+)
-+
-+
-+(define_insn "st<mode>_predicable"
-+  [(set (match_operand:MOVCC 0 "avr32_non_rmw_memory_operand" "=<MOVCC:pred_mem_constraint>")
-+	(match_operand:MOVCC 1 "register_operand" "r"))]
-+  "TARGET_V2_INSNS"
-+  "st<MOVCC:store_postfix>%?\t%0, %1"
-+  [(set_attr "length" "4")
-+   (set_attr "cc" "cmp_cond_insn")
-+   (set_attr "type" "store")
-+   (set_attr "predicable" "yes")]
-+)
-+
-+(define_insn "mov<mode>_predicable"
-+  [(set (match_operand:MOVCC 0 "register_operand" "=r")
-+	(match_operand:MOVCC 1 "avr32_cond_register_immediate_operand" "rKs08"))]
-+  ""
-+  "mov%?\t%0, %1"
-+  [(set_attr "length" "4")
-+   (set_attr "cc" "cmp_cond_insn")
-+   (set_attr "type" "alu")
-+   (set_attr "predicable" "yes")]
-+)
-+
-+
-+;;=============================================================================
-+;; Move chunks of memory
-+;;=============================================================================
-+
-+(define_expand "movmemsi"
-+  [(match_operand:BLK 0 "general_operand" "")
-+   (match_operand:BLK 1 "general_operand" "")
-+   (match_operand:SI 2 "const_int_operand" "")
-+   (match_operand:SI 3 "const_int_operand" "")]
-+  ""
-+  "
-+   if (avr32_gen_movmemsi (operands))
-+     DONE;
-+   FAIL;
-+  "
-+  )
-+
-+
-+
-+
-+;;=============================================================================
-+;; Bit field instructions
-+;;-----------------------------------------------------------------------------
-+;; Instructions to insert or extract bit-fields
-+;;=============================================================================
-+
-+(define_insn "insv"
-+  [ (set (zero_extract:SI (match_operand:SI 0 "register_operand" "+r")
-+                          (match_operand:SI 1 "immediate_operand" "Ku05")
-+                          (match_operand:SI 2 "immediate_operand" "Ku05"))
-+         (match_operand 3 "register_operand" "r"))]
-+  ""
-+  "bfins\t%0, %3, %2, %1"
-+  [(set_attr "type" "alu")
-+   (set_attr "length" "4")
-+   (set_attr "cc" "set_ncz")])
-+
-+
-+
-+(define_expand "extv"
-+  [ (set (match_operand:SI 0 "register_operand" "")
-+         (sign_extract:SI (match_operand:SI 1 "register_operand" "")
-+                          (match_operand:SI 2 "immediate_operand" "")
-+                          (match_operand:SI 3 "immediate_operand" "")))]
-+  ""
-+  {
-+   if ( INTVAL(operands[2]) >= 32 )
-+      FAIL;
-+  }
-+)
-+
-+(define_expand "extzv"
-+  [ (set (match_operand:SI 0 "register_operand" "")
-+         (zero_extract:SI (match_operand:SI 1 "register_operand" "")
-+                          (match_operand:SI 2 "immediate_operand" "")
-+                          (match_operand:SI 3 "immediate_operand" "")))]
-+  ""
-+  {
-+   if ( INTVAL(operands[2]) >= 32 )
-+      FAIL;
-+  }
-+)
-+
-+(define_insn "extv_internal"
-+  [ (set (match_operand:SI 0 "register_operand" "=r")
-+         (sign_extract:SI (match_operand:SI 1 "register_operand" "r")
-+                          (match_operand:SI 2 "immediate_operand" "Ku05")
-+                          (match_operand:SI 3 "immediate_operand" "Ku05")))]
-+  "INTVAL(operands[2]) < 32"
-+  "bfexts\t%0, %1, %3, %2"
-+  [(set_attr "type" "alu")
-+   (set_attr "length" "4")
-+   (set_attr "cc" "set_ncz")])
-+
-+
-+(define_insn "extzv_internal"
-+  [ (set (match_operand:SI 0 "register_operand" "=r")
-+         (zero_extract:SI (match_operand:SI 1 "register_operand" "r")
-+                          (match_operand:SI 2 "immediate_operand" "Ku05")
-+                          (match_operand:SI 3 "immediate_operand" "Ku05")))]
-+  "INTVAL(operands[2]) < 32"
-+  "bfextu\t%0, %1, %3, %2"
-+  [(set_attr "type" "alu")
-+   (set_attr "length" "4")
-+   (set_attr "cc" "set_ncz")])
-+
-+
-+
-+;;=============================================================================
-+;; Some peepholes for avoiding unnecessary cast instructions
-+;; followed by bfins.
-+;;-----------------------------------------------------------------------------
-+
-+(define_peephole2
-+  [(set (match_operand:SI 0 "register_operand" "")
-+        (zero_extend:SI (match_operand:QI 1 "register_operand" "")))
-+   (set (zero_extract:SI (match_operand 2 "register_operand" "")
-+                         (match_operand:SI 3 "immediate_operand" "")
-+                         (match_operand:SI 4 "immediate_operand" ""))
-+        (match_dup 0))]
-+  "((peep2_reg_dead_p(2, operands[0]) &&
-+    (INTVAL(operands[3]) <= 8)))"
-+  [(set (zero_extract:SI (match_dup 2)
-+                         (match_dup 3)
-+                         (match_dup 4))
-+        (match_dup 1))]
-+  )
-+
-+(define_peephole2
-+  [(set (match_operand:SI 0 "register_operand" "")
-+        (zero_extend:SI (match_operand:HI 1 "register_operand" "")))
-+   (set (zero_extract:SI (match_operand 2 "register_operand" "")
-+                         (match_operand:SI 3 "immediate_operand" "")
-+                         (match_operand:SI 4 "immediate_operand" ""))
-+        (match_dup 0))]
-+  "((peep2_reg_dead_p(2, operands[0]) &&
-+    (INTVAL(operands[3]) <= 16)))"
-+  [(set (zero_extract:SI (match_dup 2)
-+                         (match_dup 3)
-+                         (match_dup 4))
-+        (match_dup 1))]
-+  )
-+
-+;;=============================================================================
-+;; push bytes
-+;;-----------------------------------------------------------------------------
-+;; Implements the push instruction
-+;;=============================================================================
-+(define_insn "pushm"
-+  [(set (mem:BLK (pre_dec:BLK (reg:SI SP_REGNUM)))
-+        (unspec:BLK [(match_operand 0 "const_int_operand" "")]
-+                    UNSPEC_PUSHM))]
-+  ""
-+  {
-+    if (INTVAL(operands[0])) {
-+      return "pushm\t%r0";
-+    } else {
-+      return "";
-+    }
-+  }
-+  [(set_attr "type" "store")
-+   (set_attr "length" "2")
-+   (set_attr "cc" "none")])
-+
-+(define_insn "stm"
-+  [(unspec [(match_operand 0 "register_operand" "r")
-+            (match_operand 1 "const_int_operand" "")
-+            (match_operand 2 "const_int_operand" "")]
-+	   UNSPEC_STM)]
-+  ""
-+  {
-+    if (INTVAL(operands[1])) {
-+      if (INTVAL(operands[2]) != 0)
-+         return "stm\t--%0, %s1";
-+      else
-+         return "stm\t%0, %s1";
-+    } else {
-+      return "";
-+    }
-+  }
-+  [(set_attr "type" "store")
-+   (set_attr "length" "4")
-+   (set_attr "cc" "none")])
-+
-+
-+
-+(define_insn "popm"
-+  [(unspec [(match_operand 0 "const_int_operand" "")]
-+	   UNSPEC_POPM)]
-+  ""
-+  {
-+    if (INTVAL(operands[0])) {
-+      return "popm   %r0";
-+    } else {
-+      return "";
-+    }
-+  }
-+  [(set_attr "type" "load")
-+   (set_attr "length" "2")])
-+
-+
-+
-+;;=============================================================================
-+;; add
-+;;-----------------------------------------------------------------------------
-+;; Adds reg1 with reg2 and puts the result in reg0.
-+;;=============================================================================
-+(define_insn "add<mode>3"
-+  [(set (match_operand:INTM 0 "register_operand" "=r,r,r,r,r")
-+	(plus:INTM (match_operand:INTM 1 "register_operand" "%0,r,0,r,0")
-+                   (match_operand:INTM 2 "avr32_add_operand" "r,r,Is08,Is16,Is21")))]
-+  ""
-+  "@
-+   add     %0, %2
-+   add     %0, %1, %2
-+   sub     %0, %n2
-+   sub     %0, %1, %n2
-+   sub     %0, %n2"
-+
-+  [(set_attr "length" "2,4,2,4,4")
-+   (set_attr "cc" "<INTM:alu_cc_attr>")])
-+
-+(define_insn "add<mode>3_lsl"
-+  [(set (match_operand:INTM 0 "register_operand" "=r")
-+	(plus:INTM (ashift:INTM (match_operand:INTM 1 "register_operand" "r")
-+                                (match_operand:INTM 3 "avr32_add_shift_immediate_operand" "Ku02"))
-+                   (match_operand:INTM 2 "register_operand" "r")))]
-+  ""
-+  "add     %0, %2, %1 << %3"
-+  [(set_attr "length" "4")
-+   (set_attr "cc" "<INTM:alu_cc_attr>")])
-+
-+(define_insn "add<mode>3_lsl2"
-+  [(set (match_operand:INTM 0 "register_operand" "=r")
-+	(plus:INTM (match_operand:INTM 1 "register_operand" "r")
-+                   (ashift:INTM (match_operand:INTM 2 "register_operand" "r")
-+                                (match_operand:INTM 3 "avr32_add_shift_immediate_operand" "Ku02"))))]
-+  ""
-+  "add     %0, %1, %2 << %3"
-+  [(set_attr "length" "4")
-+   (set_attr "cc" "<INTM:alu_cc_attr>")])
-+
-+
-+(define_insn "add<mode>3_mul"
-+  [(set (match_operand:INTM 0 "register_operand" "=r")
-+	(plus:INTM (mult:INTM (match_operand:INTM 1 "register_operand" "r")
-+                              (match_operand:INTM 3 "immediate_operand" "Ku04" ))
-+                   (match_operand:INTM 2 "register_operand" "r")))]
-+  "(INTVAL(operands[3]) == 0) || (INTVAL(operands[3]) == 2) ||
-+   (INTVAL(operands[3]) == 4) || (INTVAL(operands[3]) == 8)"
-+  "add     %0, %2, %1 << %p3"
-+  [(set_attr "length" "4")
-+   (set_attr "cc" "<INTM:alu_cc_attr>")])
-+
-+(define_insn "add<mode>3_mul2"
-+  [(set (match_operand:INTM 0 "register_operand" "=r")
-+	(plus:INTM (match_operand:INTM 1 "register_operand" "r")
-+                   (mult:INTM (match_operand:INTM 2 "register_operand" "r")
-+                              (match_operand:INTM 3 "immediate_operand" "Ku04" ))))]
-+  "(INTVAL(operands[3]) == 0) || (INTVAL(operands[3]) == 2) ||
-+   (INTVAL(operands[3]) == 4) || (INTVAL(operands[3]) == 8)"
-+  "add     %0, %1, %2 << %p3"
-+  [(set_attr "length" "4")
-+   (set_attr "cc" "<INTM:alu_cc_attr>")])
-+
-+
-+(define_peephole2
-+  [(set (match_operand:SI 0 "register_operand" "")
-+        (ashift:SI (match_operand:SI 1 "register_operand" "")
-+                   (match_operand:SI 2 "immediate_operand" "")))
-+   (set (match_operand:SI 3 "register_operand" "")
-+	(plus:SI (match_dup 0)
-+                 (match_operand:SI 4 "register_operand" "")))]
-+  "(peep2_reg_dead_p(2, operands[0]) &&
-+    (INTVAL(operands[2]) < 4 && INTVAL(operands[2]) > 0))"
-+  [(set (match_dup 3)
-+	(plus:SI (ashift:SI (match_dup 1)
-+                            (match_dup 2))
-+                 (match_dup 4)))]
-+  )
-+
-+(define_peephole2
-+  [(set (match_operand:SI 0 "register_operand" "")
-+        (ashift:SI (match_operand:SI 1 "register_operand" "")
-+                   (match_operand:SI 2 "immediate_operand" "")))
-+   (set (match_operand:SI 3 "register_operand" "")
-+	(plus:SI (match_operand:SI 4 "register_operand" "")
-+                 (match_dup 0)))]
-+  "(peep2_reg_dead_p(2, operands[0]) &&
-+    (INTVAL(operands[2]) < 4 && INTVAL(operands[2]) > 0))"
-+  [(set (match_dup 3)
-+	(plus:SI (ashift:SI (match_dup 1)
-+                            (match_dup 2))
-+                 (match_dup 4)))]
-+  )
-+
-+(define_insn "adddi3"
-+  [(set (match_operand:DI 0 "register_operand" "=r,r")
-+	(plus:DI (match_operand:DI 1 "register_operand" "%0,r")
-+		 (match_operand:DI 2 "register_operand" "r,r")))]
-+  ""
-+  "@
-+   add     %0, %2\;adc    %m0, %m0, %m2
-+   add     %0, %1, %2\;adc    %m0, %m1, %m2"
-+  [(set_attr "length" "6,8")
-+   (set_attr "type" "alu2")
-+   (set_attr "cc" "set_vncz")])
-+
-+
-+(define_insn "add<mode>_imm_predicable"
-+  [(set (match_operand:INTM 0 "register_operand" "+r")
-+	(plus:INTM (match_dup 0)
-+                   (match_operand:INTM 1 "avr32_cond_immediate_operand" "%Is08")))]
-+  ""
-+  "sub%?\t%0, -%1"
-+  [(set_attr "length" "4")
-+   (set_attr "cc" "cmp_cond_insn")
-+   (set_attr "predicable" "yes")]
-+)
-+
-+;;=============================================================================
-+;; subtract
-+;;-----------------------------------------------------------------------------
-+;; Subtract reg2 or immediate value from reg0 and puts the result in reg0.
-+;;=============================================================================
-+
-+(define_insn "sub<mode>3"
-+  [(set (match_operand:INTM 0 "general_operand" "=r,r,r,r,r,r,r")
-+	(minus:INTM (match_operand:INTM 1 "register_const_int_operand" "0,r,0,r,0,r,Ks08")
-+		  (match_operand:INTM 2 "register_const_int_operand" "r,r,Ks08,Ks16,Ks21,0,r")))]
-+  ""
-+  "@
-+   sub     %0, %2
-+   sub     %0, %1, %2
-+   sub     %0, %2
-+   sub     %0, %1, %2
-+   sub     %0, %2
-+   rsub    %0, %1
-+   rsub    %0, %2, %1"
-+  [(set_attr "length" "2,4,2,4,4,2,4")
-+   (set_attr "cc" "<INTM:alu_cc_attr>")])
-+
-+(define_insn "*sub<mode>3_mul"
-+  [(set (match_operand:INTM 0 "register_operand" "=r")
-+	(minus:INTM (match_operand:INTM 1 "register_operand" "r")
-+                    (mult:INTM (match_operand:INTM 2 "register_operand" "r")
-+                               (match_operand:SI 3 "immediate_operand" "Ku04" ))))]
-+  "(INTVAL(operands[3]) == 0) || (INTVAL(operands[3]) == 2) ||
-+   (INTVAL(operands[3]) == 4) || (INTVAL(operands[3]) == 8)"
-+  "sub     %0, %1, %2 << %p3"
-+  [(set_attr "length" "4")
-+   (set_attr "cc" "<INTM:alu_cc_attr>")])
-+
-+(define_insn "*sub<mode>3_lsl"
-+  [(set (match_operand:INTM 0 "register_operand" "=r")
-+	(minus:INTM  (match_operand:INTM 1 "register_operand" "r")
-+                     (ashift:INTM (match_operand:INTM 2 "register_operand" "r")
-+                                  (match_operand:SI 3 "avr32_add_shift_immediate_operand" "Ku02"))))]
-+  ""
-+  "sub     %0, %1, %2 << %3"
-+  [(set_attr "length" "4")
-+   (set_attr "cc" "<INTM:alu_cc_attr>")])
-+
-+
-+(define_insn "subdi3"
-+  [(set (match_operand:DI 0 "register_operand" "=r,r")
-+	(minus:DI (match_operand:DI 1 "register_operand" "%0,r")
-+		 (match_operand:DI 2 "register_operand" "r,r")))]
-+  ""
-+  "@
-+   sub     %0, %2\;sbc    %m0, %m0, %m2
-+   sub     %0, %1, %2\;sbc    %m0, %m1, %m2"
-+  [(set_attr "length" "6,8")
-+   (set_attr "type" "alu2")
-+   (set_attr "cc" "set_vncz")])
-+
-+
-+(define_insn "sub<mode>_imm_predicable"
-+  [(set (match_operand:INTM 0 "register_operand" "+r")
-+	(minus:INTM (match_dup 0)
-+                    (match_operand:INTM 1 "avr32_cond_immediate_operand" "Ks08")))]
-+  ""
-+  "sub%?\t%0, %1"
-+  [(set_attr "length" "4")
-+   (set_attr "cc" "cmp_cond_insn")
-+   (set_attr "predicable" "yes")])
-+
-+(define_insn "rsub<mode>_imm_predicable"
-+  [(set (match_operand:INTM 0 "register_operand" "+r")
-+	(minus:INTM (match_operand:INTM 1 "avr32_cond_immediate_operand"  "Ks08")
-+                    (match_dup 0)))]
-+  ""
-+  "rsub%?\t%0, %1"
-+  [(set_attr "length" "4")
-+   (set_attr "cc" "cmp_cond_insn")
-+   (set_attr "predicable" "yes")])
-+
-+;;=============================================================================
-+;; multiply
-+;;-----------------------------------------------------------------------------
-+;; Multiply op1 and op2 and put the value in op0.
-+;;=============================================================================
-+
-+
-+(define_insn "mulqi3"
-+  [(set (match_operand:QI 0 "register_operand"         "=r,r,r")
-+	(mult:QI (match_operand:QI 1 "register_operand" "%0,r,r")
-+		 (match_operand:QI 2 "avr32_mul_operand" "r,r,Ks08")))]
-+  "!TARGET_NO_MUL_INSNS"
-+  {
-+   switch (which_alternative){
-+    case 0:
-+      return "mul     %0, %2";
-+    case 1:
-+      return "mul     %0, %1, %2";
-+    case 2:
-+      return "mul     %0, %1, %2";
-+    default:
-+      gcc_unreachable();
-+   }
-+  }
-+  [(set_attr "type" "mulww_w,mulww_w,mulwh")
-+   (set_attr "length" "2,4,4")
-+   (set_attr "cc" "none")])
-+
-+(define_insn "mulsi3"
-+  [(set (match_operand:SI 0 "register_operand"         "=r,r,r")
-+	(mult:SI (match_operand:SI 1 "register_operand" "%0,r,r")
-+		 (match_operand:SI 2 "avr32_mul_operand" "r,r,Ks08")))]
-+  "!TARGET_NO_MUL_INSNS"
-+  {
-+   switch (which_alternative){
-+    case 0:
-+      return "mul     %0, %2";
-+    case 1:
-+      return "mul     %0, %1, %2";
-+    case 2:
-+      return "mul     %0, %1, %2";
-+    default:
-+      gcc_unreachable();
-+   }
-+  }
-+  [(set_attr "type" "mulww_w,mulww_w,mulwh")
-+   (set_attr "length" "2,4,4")
-+   (set_attr "cc" "none")])
-+
-+
-+(define_insn "mulhisi3"
-+  [(set (match_operand:SI 0 "register_operand" "=r")
-+	(mult:SI
-+	 (sign_extend:SI (match_operand:HI 1 "register_operand" "%r"))
-+	 (sign_extend:SI (match_operand:HI 2 "register_operand" "r"))))]
-+  "!TARGET_NO_MUL_INSNS && TARGET_DSP"
-+  "mulhh.w %0, %1:b, %2:b"
-+  [(set_attr "type" "mulhh")
-+   (set_attr "length" "4")
-+   (set_attr "cc" "none")])
-+
-+(define_peephole2
-+  [(match_scratch:DI 6 "r")
-+   (set (match_operand:SI 0 "register_operand" "")
-+	(mult:SI
-+	 (sign_extend:SI (match_operand:HI 1 "register_operand" ""))
-+         (sign_extend:SI (match_operand:HI 2 "register_operand" ""))))
-+   (set (match_operand:SI 3 "register_operand" "")
-+        (ashiftrt:SI (match_dup 0)
-+                     (const_int 16)))]
-+  "!TARGET_NO_MUL_INSNS && TARGET_DSP
-+   && (peep2_reg_dead_p(1, operands[0]) || (REGNO(operands[0]) == REGNO(operands[3])))"
-+  [(set (match_dup 4) (sign_extend:SI (match_dup 1)))
-+   (set (match_dup 6)
-+        (ashift:DI (mult:DI (sign_extend:DI (match_dup 4))
-+                            (sign_extend:DI (match_dup 2)))
-+                   (const_int 16)))
-+   (set (match_dup 3) (match_dup 5))]
-+
-+  "{
-+     operands[4] = gen_rtx_REG(SImode, REGNO(operands[1]));
-+     operands[5] = gen_highpart (SImode, operands[4]);
-+   }"
-+  )
-+
-+(define_insn "mulnhisi3"
-+  [(set (match_operand:SI 0 "register_operand" "=r")
-+        (mult:SI
-+         (sign_extend:SI (neg:HI (match_operand:HI 1 "register_operand" "r")))
-+         (sign_extend:SI (match_operand:HI 2 "register_operand" "r"))))]
-+  "!TARGET_NO_MUL_INSNS && TARGET_DSP"
-+  "mulnhh.w %0, %1:b, %2:b"
-+  [(set_attr "type" "mulhh")
-+   (set_attr "length" "4")
-+   (set_attr "cc" "none")])
-+
-+(define_insn "machisi3"
-+  [(set (match_operand:SI 0 "register_operand" "+r")
-+	(plus:SI (mult:SI
-+                  (sign_extend:SI (match_operand:HI 1 "register_operand" "%r"))
-+                  (sign_extend:SI (match_operand:HI 2 "register_operand" "r")))
-+                 (match_dup 0)))]
-+  "!TARGET_NO_MUL_INSNS && TARGET_DSP"
-+  "machh.w %0, %1:b, %2:b"
-+  [(set_attr "type" "machh_w")
-+   (set_attr "length" "4")
-+   (set_attr "cc" "none")])
-+
-+
-+
-+(define_insn "mulsidi3"
-+  [(set (match_operand:DI 0 "register_operand" "=r")
-+	(mult:DI
-+	 (sign_extend:DI (match_operand:SI 1 "register_operand" "%r"))
-+	 (sign_extend:DI (match_operand:SI 2 "register_operand" "r"))))]
-+  "!TARGET_NO_MUL_INSNS"
-+  "muls.d  %0, %1, %2"
-+  [(set_attr "type" "mulww_d")
-+   (set_attr "length" "4")
-+   (set_attr "cc" "none")])
-+
-+(define_insn "umulsidi3"
-+  [(set (match_operand:DI 0 "register_operand" "=r")
-+	(mult:DI
-+	 (zero_extend:DI (match_operand:SI 1 "register_operand" "%r"))
-+	 (zero_extend:DI (match_operand:SI 2 "register_operand" "r"))))]
-+  "!TARGET_NO_MUL_INSNS"
-+  "mulu.d  %0, %1, %2"
-+  [(set_attr "type" "mulww_d")
-+   (set_attr "length" "4")
-+   (set_attr "cc" "none")])
-+
-+(define_insn "*mulaccsi3"
-+  [(set (match_operand:SI 0 "register_operand" "+r")
-+	(plus:SI (mult:SI (match_operand:SI 1 "register_operand" "%r")
-+			  (match_operand:SI 2 "register_operand" "r"))
-+		 (match_dup 0)))]
-+  "!TARGET_NO_MUL_INSNS"
-+  "mac     %0, %1, %2"
-+  [(set_attr "type" "macww_w")
-+   (set_attr "length" "4")
-+   (set_attr "cc" "none")])
-+
-+(define_insn "*mulaccsidi3"
-+  [(set (match_operand:DI 0 "register_operand" "+r")
-+	(plus:DI (mult:DI
-+		  (sign_extend:DI (match_operand:SI 1 "register_operand" "%r"))
-+		  (sign_extend:DI (match_operand:SI 2 "register_operand" "r")))
-+		 (match_dup 0)))]
-+  "!TARGET_NO_MUL_INSNS"
-+  "macs.d  %0, %1, %2"
-+  [(set_attr "type" "macww_d")
-+   (set_attr "length" "4")
-+   (set_attr "cc" "none")])
-+
-+(define_insn "*umulaccsidi3"
-+  [(set (match_operand:DI 0 "register_operand" "+r")
-+	(plus:DI (mult:DI
-+		  (zero_extend:DI (match_operand:SI 1 "register_operand" "%r"))
-+		  (zero_extend:DI (match_operand:SI 2 "register_operand" "r")))
-+		 (match_dup 0)))]
-+  "!TARGET_NO_MUL_INSNS"
-+  "macu.d  %0, %1, %2"
-+  [(set_attr "type" "macww_d")
-+   (set_attr "length" "4")
-+   (set_attr "cc" "none")])
-+
-+
-+
-+;; Try to avoid Write-After-Write hazards for mul operations
-+;; if it can be done
-+(define_peephole2
-+  [(set (match_operand:SI 0 "register_operand" "")
-+	(mult:SI
-+	 (sign_extend:SI (match_operand 1 "general_operand" ""))
-+         (sign_extend:SI (match_operand 2 "general_operand" ""))))
-+   (set (match_dup 0)
-+	(match_operator:SI 3 "alu_operator" [(match_dup 0)
-+                                             (match_operand 4 "general_operand" "")]))]
-+  "peep2_reg_dead_p(1, operands[2])"
-+  [(set (match_dup 5)
-+        (mult:SI
-+         (sign_extend:SI (match_dup 1))
-+         (sign_extend:SI (match_dup 2))))
-+   (set (match_dup 0)
-+	(match_op_dup 3 [(match_dup 5)
-+                         (match_dup 4)]))]
-+  "{operands[5] = gen_rtx_REG(SImode, REGNO(operands[2]));}"
-+  )
-+
-+
-+
-+;;=============================================================================
-+;; DSP instructions
-+;;=============================================================================
-+(define_insn "mulsathh_h"
-+  [(set (match_operand:HI 0 "register_operand" "=r")
-+        (ss_truncate:HI (ashiftrt:SI (mult:SI (sign_extend:SI (match_operand:HI 1 "register_operand" "%r"))
-+                                              (sign_extend:SI (match_operand:HI 2 "register_operand" "r")))
-+                                     (const_int 15))))]
-+  "!TARGET_NO_MUL_INSNS && TARGET_DSP"
-+  "mulsathh.h\t%0, %1:b, %2:b"
-+  [(set_attr "length" "4")
-+   (set_attr "cc" "none")
-+   (set_attr "type" "mulhh")])
-+
-+(define_insn "mulsatrndhh_h"
-+  [(set (match_operand:HI 0 "register_operand" "=r")
-+        (ss_truncate:HI (ashiftrt:SI
-+                         (plus:SI (mult:SI (sign_extend:SI (match_operand:HI 1 "register_operand" "%r"))
-+                                           (sign_extend:SI (match_operand:HI 2 "register_operand" "r")))
-+                                  (const_int 1073741824))
-+                         (const_int 15))))]
-+  "!TARGET_NO_MUL_INSNS && TARGET_DSP"
-+  "mulsatrndhh.h\t%0, %1:b, %2:b"
-+  [(set_attr "length" "4")
-+   (set_attr "cc" "none")
-+   (set_attr "type" "mulhh")])
-+
-+(define_insn "mulsathh_w"
-+  [(set (match_operand:SI 0 "register_operand" "=r")
-+        (ss_truncate:SI (ashift:DI (mult:DI (sign_extend:DI (match_operand:HI 1 "register_operand" "%r"))
-+                                            (sign_extend:DI (match_operand:HI 2 "register_operand" "r")))
-+                                   (const_int 1))))]
-+  "!TARGET_NO_MUL_INSNS && TARGET_DSP"
-+  "mulsathh.w\t%0, %1:b, %2:b"
-+  [(set_attr "length" "4")
-+   (set_attr "cc" "none")
-+   (set_attr "type" "mulhh")])
-+
-+(define_insn "mulsatwh_w"
-+  [(set (match_operand:SI 0 "register_operand" "=r")
-+        (ss_truncate:SI (ashiftrt:DI (mult:DI (sign_extend:DI (match_operand:SI 1 "register_operand" "r"))
-+                                              (sign_extend:DI (match_operand:HI 2 "register_operand" "r")))
-+                                     (const_int 15))))]
-+  "!TARGET_NO_MUL_INSNS && TARGET_DSP"
-+  "mulsatwh.w\t%0, %1, %2:b"
-+  [(set_attr "length" "4")
-+   (set_attr "cc" "none")
-+   (set_attr "type" "mulwh")])
-+
-+(define_insn "mulsatrndwh_w"
-+  [(set (match_operand:SI 0 "register_operand" "=r")
-+        (ss_truncate:SI (ashiftrt:DI (plus:DI (mult:DI (sign_extend:DI (match_operand:SI 1 "register_operand" "r"))
-+                                                       (sign_extend:DI (match_operand:HI 2 "register_operand" "r")))
-+                                              (const_int 1073741824))
-+                                     (const_int 15))))]
-+  "!TARGET_NO_MUL_INSNS && TARGET_DSP"
-+  "mulsatrndwh.w\t%0, %1, %2:b"
-+  [(set_attr "length" "4")
-+   (set_attr "cc" "none")
-+   (set_attr "type" "mulwh")])
-+
-+(define_insn "macsathh_w"
-+  [(set (match_operand:SI 0 "register_operand" "+r")
-+        (plus:SI (match_dup 0)
-+                 (ss_truncate:SI (ashift:DI (mult:DI (sign_extend:DI (match_operand:HI 1 "register_operand" "%r"))
-+                                                     (sign_extend:DI (match_operand:HI 2 "register_operand" "r")))
-+                                            (const_int 1)))))]
-+  "!TARGET_NO_MUL_INSNS && TARGET_DSP"
-+  "macsathh.w\t%0, %1:b, %2:b"
-+  [(set_attr "length" "4")
-+   (set_attr "cc" "none")
-+   (set_attr "type" "mulhh")])
-+
-+
-+(define_insn "mulwh_d"
-+  [(set (match_operand:DI 0 "register_operand" "=r")
-+        (ashift:DI (mult:DI (sign_extend:DI (match_operand:SI 1 "register_operand" "r"))
-+                            (sign_extend:DI (match_operand:HI 2 "register_operand" "r")))
-+                   (const_int 16)))]
-+  "!TARGET_NO_MUL_INSNS && TARGET_DSP"
-+  "mulwh.d\t%0, %1, %2:b"
-+  [(set_attr "length" "4")
-+   (set_attr "cc" "none")
-+   (set_attr "type" "mulwh")])
-+
-+
-+(define_insn "mulnwh_d"
-+  [(set (match_operand:DI 0 "register_operand" "=r")
-+        (ashift:DI (mult:DI (not:DI (sign_extend:DI (match_operand:SI 1 "register_operand" "r")))
-+                            (sign_extend:DI (match_operand:HI 2 "register_operand" "r")))
-+                   (const_int 16)))]
-+  "!TARGET_NO_MUL_INSNS && TARGET_DSP"
-+  "mulnwh.d\t%0, %1, %2:b"
-+  [(set_attr "length" "4")
-+   (set_attr "cc" "none")
-+   (set_attr "type" "mulwh")])
-+
-+(define_insn "macwh_d"
-+  [(set (match_operand:DI 0 "register_operand" "+r")
-+        (plus:DI (match_dup 0)
-+                 (ashift:DI (mult:DI (sign_extend:DI (match_operand:SI 1 "register_operand" "%r"))
-+                                     (sign_extend:DI (match_operand:HI 2 "register_operand" "r")))
-+                            (const_int 16))))]
-+  "!TARGET_NO_MUL_INSNS && TARGET_DSP"
-+  "macwh.d\t%0, %1, %2:b"
-+  [(set_attr "length" "4")
-+   (set_attr "cc" "none")
-+   (set_attr "type" "mulwh")])
-+
-+(define_insn "machh_d"
-+  [(set (match_operand:DI 0 "register_operand" "+r")
-+        (plus:DI (match_dup 0)
-+                 (mult:DI (sign_extend:DI (match_operand:HI 1 "register_operand" "%r"))
-+                          (sign_extend:DI (match_operand:HI 2 "register_operand" "r")))))]
-+  "!TARGET_NO_MUL_INSNS && TARGET_DSP"
-+  "machh.d\t%0, %1:b, %2:b"
-+  [(set_attr "length" "4")
-+   (set_attr "cc" "none")
-+   (set_attr "type" "mulwh")])
-+
-+(define_insn "satadd_w"
-+  [(set (match_operand:SI 0 "register_operand" "=r")
-+        (ss_plus:SI (match_operand:SI 1 "register_operand" "r")
-+                    (match_operand:SI 2 "register_operand" "r")))]
-+  "TARGET_DSP"
-+  "satadd.w\t%0, %1, %2"
-+  [(set_attr "length" "4")
-+   (set_attr "cc" "none")
-+   (set_attr "type" "alu_sat")])
-+
-+(define_insn "satsub_w"
-+  [(set (match_operand:SI 0 "register_operand" "=r")
-+        (ss_minus:SI (match_operand:SI 1 "register_operand" "r")
-+                     (match_operand:SI 2 "register_operand" "r")))]
-+  "TARGET_DSP"
-+  "satsub.w\t%0, %1, %2"
-+  [(set_attr "length" "4")
-+   (set_attr "cc" "none")
-+   (set_attr "type" "alu_sat")])
-+
-+(define_insn "satadd_h"
-+  [(set (match_operand:HI 0 "register_operand" "=r")
-+        (ss_plus:HI (match_operand:HI 1 "register_operand" "r")
-+                    (match_operand:HI 2 "register_operand" "r")))]
-+  "TARGET_DSP"
-+  "satadd.h\t%0, %1, %2"
-+  [(set_attr "length" "4")
-+   (set_attr "cc" "none")
-+   (set_attr "type" "alu_sat")])
-+
-+(define_insn "satsub_h"
-+  [(set (match_operand:HI 0 "register_operand" "=r")
-+        (ss_minus:HI (match_operand:HI 1 "register_operand" "r")
-+                     (match_operand:HI 2 "register_operand" "r")))]
-+  "TARGET_DSP"
-+  "satsub.h\t%0, %1, %2"
-+  [(set_attr "length" "4")
-+   (set_attr "cc" "none")
-+   (set_attr "type" "alu_sat")])
-+
-+
-+;;=============================================================================
-+;; smin
-+;;-----------------------------------------------------------------------------
-+;; Set reg0 to the smallest value of reg1 and reg2. It is used for signed
-+;; values in the registers.
-+;;=============================================================================
-+(define_insn "sminsi3"
-+  [(set (match_operand:SI 0 "register_operand" "=r")
-+	(smin:SI (match_operand:SI 1 "register_operand" "r")
-+		 (match_operand:SI 2 "register_operand" "r")))]
-+  ""
-+  "min     %0, %1, %2"
-+  [(set_attr "length" "4")
-+   (set_attr "cc" "none")])
-+
-+;;=============================================================================
-+;; smax
-+;;-----------------------------------------------------------------------------
-+;; Set reg0 to the largest value of reg1 and reg2. It is used for signed
-+;; values in the registers.
-+;;=============================================================================
-+(define_insn "smaxsi3"
-+  [(set (match_operand:SI 0 "register_operand" "=r")
-+	(smax:SI (match_operand:SI 1 "register_operand" "r")
-+		 (match_operand:SI 2 "register_operand" "r")))]
-+  ""
-+  "max     %0, %1, %2"
-+  [(set_attr "length" "4")
-+   (set_attr "cc" "none")])
-+
-+
-+
-+;;=============================================================================
-+;; Logical operations
-+;;-----------------------------------------------------------------------------
-+
-+
-+;; Split up simple DImode logical operations.  Simply perform the logical
-+;; operation on the upper and lower halves of the registers.
-+(define_split
-+  [(set (match_operand:DI 0 "register_operand" "")
-+	(match_operator:DI 6 "logical_binary_operator"
-+	  [(match_operand:DI 1 "register_operand" "")
-+	   (match_operand:DI 2 "register_operand" "")]))]
-+  "reload_completed"
-+  [(set (match_dup 0) (match_op_dup:SI 6 [(match_dup 1) (match_dup 2)]))
-+   (set (match_dup 3) (match_op_dup:SI 6 [(match_dup 4) (match_dup 5)]))]
-+  "
-+  {
-+    operands[3] = gen_highpart (SImode, operands[0]);
-+    operands[0] = gen_lowpart (SImode, operands[0]);
-+    operands[4] = gen_highpart (SImode, operands[1]);
-+    operands[1] = gen_lowpart (SImode, operands[1]);
-+    operands[5] = gen_highpart (SImode, operands[2]);
-+    operands[2] = gen_lowpart (SImode, operands[2]);
-+  }"
-+)
-+
-+;;=============================================================================
-+;; Logical operations with shifted operand
-+;;=============================================================================
-+(define_insn "<code>si_lshift"
-+  [(set (match_operand:SI 0 "register_operand" "=r")
-+        (logical:SI (match_operator:SI 4 "logical_shift_operator"
-+                                       [(match_operand:SI 2 "register_operand" "r")
-+                                        (match_operand:SI 3 "immediate_operand" "Ku05")])
-+                    (match_operand:SI 1 "register_operand" "r")))]
-+  ""
-+  {
-+   if ( GET_CODE(operands[4]) == ASHIFT )
-+      return "<logical_insn>\t%0, %1, %2 << %3";
-+   else
-+      return "<logical_insn>\t%0, %1, %2 >> %3";
-+      }
-+
-+  [(set_attr "cc" "set_z")]
-+)
-+
-+
-+;;************************************************
-+;; Peepholes for detecting logical operantions
-+;; with shifted operands
-+;;************************************************
-+
-+(define_peephole
-+  [(set (match_operand:SI 3 "register_operand" "")
-+        (match_operator:SI 5 "logical_shift_operator"
-+                           [(match_operand:SI 1 "register_operand" "")
-+                            (match_operand:SI 2 "immediate_operand" "")]))
-+   (set (match_operand:SI 0 "register_operand" "")
-+        (logical:SI (match_operand:SI 4 "register_operand" "")
-+                    (match_dup 3)))]
-+  "(dead_or_set_p(insn, operands[3])) || (REGNO(operands[3]) == REGNO(operands[0]))"
-+  {
-+   if ( GET_CODE(operands[5]) == ASHIFT )
-+      return "<logical_insn>\t%0, %4, %1 << %2";
-+   else
-+      return "<logical_insn>\t%0, %4, %1 >> %2";
-+  }
-+  [(set_attr "cc" "set_z")]
-+  )
-+
-+(define_peephole
-+  [(set (match_operand:SI 3 "register_operand" "")
-+        (match_operator:SI 5 "logical_shift_operator"
-+                           [(match_operand:SI 1 "register_operand" "")
-+                            (match_operand:SI 2 "immediate_operand" "")]))
-+   (set (match_operand:SI 0 "register_operand" "")
-+        (logical:SI (match_dup 3)
-+                    (match_operand:SI 4 "register_operand" "")))]
-+  "(dead_or_set_p(insn, operands[3])) || (REGNO(operands[3]) == REGNO(operands[0]))"
-+  {
-+   if ( GET_CODE(operands[5]) == ASHIFT )
-+      return "<logical_insn>\t%0, %4, %1 << %2";
-+   else
-+      return "<logical_insn>\t%0, %4, %1 >> %2";
-+  }
-+  [(set_attr "cc" "set_z")]
-+  )
-+
-+
-+(define_peephole2
-+  [(set (match_operand:SI 0 "register_operand" "")
-+        (match_operator:SI 5 "logical_shift_operator"
-+                           [(match_operand:SI 1 "register_operand" "")
-+                            (match_operand:SI 2 "immediate_operand" "")]))
-+   (set (match_operand:SI 3 "register_operand" "")
-+        (logical:SI (match_operand:SI 4 "register_operand" "")
-+                    (match_dup 0)))]
-+  "(peep2_reg_dead_p(2, operands[0])) || (REGNO(operands[3]) == REGNO(operands[0]))"
-+
-+  [(set (match_dup 3)
-+        (logical:SI  (match_op_dup:SI 5 [(match_dup 1) (match_dup 2)])
-+                     (match_dup 4)))]
-+
-+  ""
-+)
-+
-+(define_peephole2
-+  [(set (match_operand:SI 0 "register_operand" "")
-+        (match_operator:SI 5 "logical_shift_operator"
-+                           [(match_operand:SI 1 "register_operand" "")
-+                            (match_operand:SI 2 "immediate_operand" "")]))
-+   (set (match_operand:SI 3 "register_operand" "")
-+        (logical:SI (match_dup 0)
-+                    (match_operand:SI 4 "register_operand" "")))]
-+  "(peep2_reg_dead_p(2, operands[0])) || (REGNO(operands[3]) == REGNO(operands[0]))"
-+
-+  [(set (match_dup 3)
-+        (logical:SI (match_op_dup:SI 5 [(match_dup 1) (match_dup 2)])
-+                    (match_dup 4)))]
-+
-+  ""
-+)
-+
-+
-+;;=============================================================================
-+;; and
-+;;-----------------------------------------------------------------------------
-+;; Store the result after a bitwise logical-and between reg0 and reg2 in reg0.
-+;;=============================================================================
-+
-+(define_insn "andnsi"
-+  [(set (match_operand:SI 0 "register_operand" "+r")
-+        (and:SI (match_dup 0)
-+                (not:SI (match_operand:SI 1 "register_operand" "r"))))]
-+  ""
-+  "andn    %0, %1"
-+  [(set_attr "cc" "set_z")
-+   (set_attr "length" "2")]
-+)
-+
-+
-+(define_insn "andsi3"
-+   [(set (match_operand:SI 0 "avr32_rmw_memory_or_register_operand"          "=Y,r,r,r,   r,   r,r,r,r,r")
-+ 	(and:SI (match_operand:SI 1 "avr32_rmw_memory_or_register_operand"  "%0,r,0,0,   0,   0,0,0,0,r" )
-+ 		(match_operand:SI 2 "nonmemory_operand"                     " N,M,N,Ku16,Ks17,J,L,r,i,r")))]
-+  ""
-+   "@
-+    memc\t%0, %z2
-+    bfextu\t%0, %1, 0, %z2
-+    cbr\t%0, %z2
-+    andl\t%0, %2, COH
-+    andl\t%0, lo(%2)
-+    andh\t%0, hi(%2), COH
-+    andh\t%0, hi(%2)
-+    and\t%0, %2
-+    andh\t%0, hi(%2)\;andl\t%0, lo(%2)
-+    and\t%0, %1, %2"
-+
-+   [(set_attr "length" "4,4,2,4,4,4,4,2,8,4")
-+    (set_attr "cc" "none,set_z,set_z,set_z,set_z,set_z,set_z,set_z,set_z,set_z")])
-+
-+  
-+
-+(define_insn "anddi3"
-+  [(set (match_operand:DI 0 "register_operand" "=&r,&r")
-+	(and:DI (match_operand:DI 1 "register_operand" "%0,r")
-+                (match_operand:DI 2 "register_operand" "r,r")))]
-+  ""
-+  "#"
-+  [(set_attr "length" "8")
-+   (set_attr "cc" "clobber")]
-+)
-+
-+;;=============================================================================
-+;; or
-+;;-----------------------------------------------------------------------------
-+;; Store the result after a bitwise inclusive-or between reg0 and reg2 in reg0.
-+;;=============================================================================
-+
-+(define_insn "iorsi3"
-+  [(set (match_operand:SI 0 "avr32_rmw_memory_or_register_operand"          "=Y,r,r,   r,r,r,r")
-+	(ior:SI (match_operand:SI 1 "avr32_rmw_memory_or_register_operand"  "%0,0,0,   0,0,0,r" )
-+		(match_operand:SI 2 "nonmemory_operand"                     " O,O,Ku16,J,r,i,r")))]
-+  ""
-+  "@
-+   mems\t%0, %p2
-+   sbr\t%0, %p2
-+   orl\t%0, %2
-+   orh\t%0, hi(%2)
-+   or\t%0, %2
-+   orh\t%0, hi(%2)\;orl\t%0, lo(%2)
-+   or\t%0, %1, %2"
-+
-+  [(set_attr "length" "4,2,4,4,2,8,4")
-+   (set_attr "cc" "none,set_z,set_z,set_z,set_z,set_z,set_z")])
-+
-+
-+(define_insn "iordi3"
-+  [(set (match_operand:DI 0 "register_operand" "=&r,&r")
-+	(ior:DI (match_operand:DI 1 "register_operand" "%0,r")
-+                (match_operand:DI 2 "register_operand" "r,r")))]
-+  ""
-+  "#"
-+  [(set_attr "length" "8")
-+   (set_attr "cc" "clobber")]
-+)
-+
-+;;=============================================================================
-+;; xor bytes
-+;;-----------------------------------------------------------------------------
-+;; Store the result after a bitwise exclusive-or between reg0 and reg2 in reg0.
-+;;=============================================================================
-+
-+(define_insn "xorsi3"
-+   [(set (match_operand:SI 0 "avr32_rmw_memory_or_register_operand"          "=Y,r,   r,r,r,r")
-+ 	(xor:SI (match_operand:SI 1 "avr32_rmw_memory_or_register_operand"  "%0,0,   0,0,0,r" )
-+ 		(match_operand:SI 2 "nonmemory_operand"                     " O,Ku16,J,r,i,r")))]
-+  ""
-+   "@
-+    memt\t%0, %p2
-+    eorl\t%0, %2
-+    eorh\t%0, hi(%2)
-+    eor\t%0, %2
-+    eorh\t%0, hi(%2)\;eorl\t%0, lo(%2)
-+    eor\t%0, %1, %2"
-+
-+   [(set_attr "length" "4,4,4,2,8,4")
-+    (set_attr "cc" "none,set_z,set_z,set_z,set_z,set_z")])
-+
-+(define_insn "xordi3"
-+  [(set (match_operand:DI 0 "register_operand" "=&r,&r")
-+	(xor:DI (match_operand:DI 1 "register_operand" "%0,r")
-+                (match_operand:DI 2 "register_operand" "r,r")))]
-+  ""
-+  "#"
-+  [(set_attr "length" "8")
-+   (set_attr "cc" "clobber")]
-+)
-+
-+;;=============================================================================
-+;; Three operand predicable insns
-+;;=============================================================================
-+
-+(define_insn "<predicable_insn3><mode>_predicable"
-+  [(set (match_operand:INTM 0 "register_operand" "=r")
-+	(predicable_op3:INTM (match_operand:INTM 1 "register_operand" "<predicable_commutative3>r")
-+                             (match_operand:INTM 2 "register_operand" "r")))]
-+  "TARGET_V2_INSNS"
-+  "<predicable_insn3>%?\t%0, %1, %2"
-+  [(set_attr "length" "4")
-+   (set_attr "cc" "cmp_cond_insn")
-+   (set_attr "predicable" "yes")]
-+)
-+
-+(define_insn_and_split "<predicable_insn3><mode>_imm_clobber_predicable"
-+  [(parallel 
-+    [(set (match_operand:INTM 0 "register_operand" "=r")
-+          (predicable_op3:INTM (match_operand:INTM 1 "register_operand" "<predicable_commutative3>r")
-+                               (match_operand:INTM 2 "avr32_mov_immediate_operand" "JKs21")))
-+     (clobber (match_operand:INTM 3 "register_operand" "=&r"))])]
-+  "TARGET_V2_INSNS"
-+  {
-+   if ( current_insn_predicate != NULL_RTX ) 
-+      {
-+       if ( avr32_const_ok_for_constraint_p (INTVAL (operands[2]), 'K', "Ks08") )
-+          return "%! mov%?\t%3, %2\;<predicable_insn3>%?\t%0, %1, %3";
-+       else if ( avr32_const_ok_for_constraint_p (INTVAL (operands[2]), 'K', "Ks21") )
-+          return "%! mov\t%3, %2\;<predicable_insn3>%?\t%0, %1, %3";
-+       else
-+          return "%! movh\t%3, hi(%2)\;<predicable_insn3>%?\t%0, %1, %3";
-+       }
-+   else
-+      {
-+       if ( !avr32_cond_imm_clobber_splittable (insn, operands) )
-+          {
-+                if ( avr32_const_ok_for_constraint_p (INTVAL (operands[2]), 'K', "Ks08") )
-+                   return "mov%?\t%3, %2\;<predicable_insn3>%?\t%0, %1, %3";
-+                else if ( avr32_const_ok_for_constraint_p (INTVAL (operands[2]), 'K', "Ks21") )
-+                   return "mov\t%3, %2\;<predicable_insn3>%?\t%0, %1, %3";
-+                else
-+                   return "movh\t%3, hi(%2)\;<predicable_insn3>%?\t%0, %1, %3";
-+          }
-+       return "#";
-+      }
-+      
-+  }
-+  ;; If we find out that we could not actually do if-conversion on the block
-+  ;; containing this insn we convert it back to normal immediate format
-+  ;; to avoid outputing a redundant move insn
-+  ;; Do not split until after we have checked if we can make the insn 
-+  ;; conditional.
-+  "(GET_CODE (PATTERN (insn)) != COND_EXEC
-+    && cfun->machine->ifcvt_after_reload
-+    && avr32_cond_imm_clobber_splittable (insn, operands))"
-+  [(set (match_dup 0)
-+        (predicable_op3:INTM (match_dup 1)
-+                             (match_dup 2)))]
-+  ""
-+  [(set_attr "length" "8")
-+   (set_attr "cc" "cmp_cond_insn")
-+   (set_attr "predicable" "yes")]
-+  )
-+
-+
-+;;=============================================================================
-+;; Zero extend predicable insns
-+;;=============================================================================
-+(define_insn_and_split "zero_extendhisi_clobber_predicable"
-+  [(parallel 
-+    [(set (match_operand:SI 0 "register_operand" "=r")
-+          (zero_extend:SI (match_operand:HI 1 "register_operand" "r")))
-+     (clobber (match_operand:SI 2 "register_operand" "=&r"))])]
-+  "TARGET_V2_INSNS"
-+  {
-+   if ( current_insn_predicate != NULL_RTX ) 
-+      {
-+         return "%! mov\t%2, 0xffff\;and%?\t%0, %1, %2";
-+       }
-+   else
-+      {
-+       return "#";
-+      }
-+      
-+  }
-+  ;; If we find out that we could not actually do if-conversion on the block
-+  ;; containing this insn we convert it back to normal immediate format
-+  ;; to avoid outputing a redundant move insn
-+  ;; Do not split until after we have checked if we can make the insn 
-+  ;; conditional.
-+  "(GET_CODE (PATTERN (insn)) != COND_EXEC
-+    && cfun->machine->ifcvt_after_reload)"
-+  [(set (match_dup 0)
-+        (zero_extend:SI (match_dup 1)))]
-+  ""
-+  [(set_attr "length" "8")
-+   (set_attr "cc" "cmp_cond_insn")
-+   (set_attr "predicable" "yes")]
-+  )
-+
-+(define_insn_and_split "zero_extendqisi_clobber_predicable"
-+  [(parallel 
-+    [(set (match_operand:SI 0 "register_operand" "=r")
-+          (zero_extend:SI (match_operand:QI 1 "register_operand" "r")))
-+     (clobber (match_operand:SI 2 "register_operand" "=&r"))])]
-+  "TARGET_V2_INSNS"
-+  {
-+   if ( current_insn_predicate != NULL_RTX ) 
-+      {
-+         return "%! mov\t%2, 0xff\;and%?\t%0, %1, %2";
-+       }
-+   else
-+      {
-+       return "#";
-+      }
-+      
-+  }
-+  ;; If we find out that we could not actually do if-conversion on the block
-+  ;; containing this insn we convert it back to normal immediate format
-+  ;; to avoid outputing a redundant move insn
-+  ;; Do not split until after we have checked if we can make the insn 
-+  ;; conditional.
-+  "(GET_CODE (PATTERN (insn)) != COND_EXEC
-+    && cfun->machine->ifcvt_after_reload)"
-+  [(set (match_dup 0)
-+        (zero_extend:SI (match_dup 1)))]
-+  ""
-+  [(set_attr "length" "8")
-+   (set_attr "cc" "cmp_cond_insn")
-+   (set_attr "predicable" "yes")]
-+  )
-+
-+(define_insn_and_split "zero_extendqihi_clobber_predicable"
-+  [(parallel 
-+    [(set (match_operand:HI 0 "register_operand" "=r")
-+          (zero_extend:HI (match_operand:QI 1 "register_operand" "r")))
-+     (clobber (match_operand:SI 2 "register_operand" "=&r"))])]
-+  "TARGET_V2_INSNS"
-+  {
-+   if ( current_insn_predicate != NULL_RTX ) 
-+      {
-+         return "%! mov\t%2, 0xff\;and%?\t%0, %1, %2";
-+       }
-+   else
-+      {
-+       return "#";
-+      }
-+      
-+  }
-+  ;; If we find out that we could not actually do if-conversion on the block
-+  ;; containing this insn we convert it back to normal immediate format
-+  ;; to avoid outputing a redundant move insn
-+  ;; Do not split until after we have checked if we can make the insn 
-+  ;; conditional.
-+  "(GET_CODE (PATTERN (insn)) != COND_EXEC
-+    && cfun->machine->ifcvt_after_reload)"
-+  [(set (match_dup 0)
-+        (zero_extend:HI (match_dup 1)))]
-+  ""
-+  [(set_attr "length" "8")
-+   (set_attr "cc" "cmp_cond_insn")
-+   (set_attr "predicable" "yes")]
-+  )
-+;;=============================================================================
-+;; divmod
-+;;-----------------------------------------------------------------------------
-+;; Signed division that produces both a quotient and a remainder.
-+;;=============================================================================
-+
-+(define_expand "divmodsi4"
-+  [(parallel [
-+     (parallel [
-+       (set (match_operand:SI 0 "register_operand" "=r")
-+	    (div:SI (match_operand:SI 1 "register_operand" "r")
-+		    (match_operand:SI 2 "register_operand" "r")))
-+       (set (match_operand:SI 3 "register_operand" "=r")
-+	    (mod:SI (match_dup 1)
-+		    (match_dup 2)))])
-+     (use (match_dup 4))])]
-+  ""
-+  {
-+    if (can_create_pseudo_p ()) {
-+      operands[4] = gen_reg_rtx (DImode);
-+      emit_insn(gen_divmodsi4_internal(operands[4],operands[1],operands[2]));
-+      emit_move_insn(operands[0], gen_rtx_SUBREG( SImode, operands[4], 4));
-+      emit_move_insn(operands[3], gen_rtx_SUBREG( SImode, operands[4], 0));
-+      DONE;
-+    } else {
-+      FAIL;
-+    }
-+  })
-+
-+
-+(define_insn "divmodsi4_internal"
-+  [(set (match_operand:DI 0 "register_operand" "=r")
-+	(unspec:DI [(match_operand:SI 1 "register_operand" "r")
-+		    (match_operand:SI 2 "register_operand" "r")]
-+		   UNSPEC_DIVMODSI4_INTERNAL))]
-+  ""
-+  "divs    %0, %1, %2"
-+  [(set_attr "type" "div")
-+   (set_attr "cc" "none")])
-+
-+
-+;;=============================================================================
-+;; udivmod
-+;;-----------------------------------------------------------------------------
-+;; Unsigned division that produces both a quotient and a remainder.
-+;;=============================================================================
-+(define_expand "udivmodsi4"
-+ [(parallel [
-+    (parallel [
-+      (set (match_operand:SI 0 "register_operand" "=r")
-+	   (udiv:SI (match_operand:SI 1 "register_operand" "r")
-+		    (match_operand:SI 2 "register_operand" "r")))
-+      (set (match_operand:SI 3 "register_operand" "=r")
-+	   (umod:SI (match_dup 1)
-+		    (match_dup 2)))])
-+    (use (match_dup 4))])]
-+  ""
-+  {
-+    if (can_create_pseudo_p ()) {
-+      operands[4] = gen_reg_rtx (DImode);
-+
-+      emit_insn(gen_udivmodsi4_internal(operands[4],operands[1],operands[2]));
-+      emit_move_insn(operands[0], gen_rtx_SUBREG( SImode, operands[4], 4));
-+      emit_move_insn(operands[3], gen_rtx_SUBREG( SImode, operands[4], 0));
-+
-+      DONE;
-+    } else {
-+      FAIL;
-+    }
-+  })
-+
-+(define_insn "udivmodsi4_internal"
-+  [(set (match_operand:DI 0 "register_operand" "=r")
-+	(unspec:DI [(match_operand:SI 1 "register_operand" "r")
-+		    (match_operand:SI 2 "register_operand" "r")]
-+		   UNSPEC_UDIVMODSI4_INTERNAL))]
-+  ""
-+  "divu    %0, %1, %2"
-+  [(set_attr "type" "div")
-+   (set_attr "cc" "none")])
-+
-+
-+;;=============================================================================
-+;; Arithmetic-shift left
-+;;-----------------------------------------------------------------------------
-+;; Arithmetic-shift reg0 left by reg2 or immediate value.
-+;;=============================================================================
-+
-+(define_insn "ashlsi3"
-+  [(set (match_operand:SI 0 "register_operand"                      "=r,r,r")
-+	(ashift:SI (match_operand:SI 1 "register_operand"           "r,0,r")
-+		   (match_operand:SI 2 "register_const_int_operand" "r,Ku05,Ku05")))]
-+  ""
-+  "@
-+   lsl     %0, %1, %2
-+   lsl     %0, %2
-+   lsl     %0, %1, %2"
-+  [(set_attr "length" "4,2,4")
-+   (set_attr "cc" "set_ncz")])
-+
-+;;=============================================================================
-+;; Arithmetic-shift right
-+;;-----------------------------------------------------------------------------
-+;; Arithmetic-shift reg0 right by an immediate value.
-+;;=============================================================================
-+
-+(define_insn "ashrsi3"
-+  [(set (match_operand:SI 0 "register_operand"                        "=r,r,r")
-+	(ashiftrt:SI (match_operand:SI 1 "register_operand"           "r,0,r")
-+		     (match_operand:SI 2 "register_const_int_operand" "r,Ku05,Ku05")))]
-+  ""
-+  "@
-+   asr     %0, %1, %2
-+   asr     %0, %2
-+   asr     %0, %1, %2"
-+  [(set_attr "length" "4,2,4")
-+   (set_attr "cc" "set_ncz")])
-+
-+;;=============================================================================
-+;; Logical shift right
-+;;-----------------------------------------------------------------------------
-+;; Logical shift reg0 right by an immediate value.
-+;;=============================================================================
-+
-+(define_insn "lshrsi3"
-+  [(set (match_operand:SI 0 "register_operand"                        "=r,r,r")
-+	(lshiftrt:SI (match_operand:SI 1 "register_operand"           "r,0,r")
-+		     (match_operand:SI 2 "register_const_int_operand" "r,Ku05,Ku05")))]
-+  ""
-+  "@
-+   lsr     %0, %1, %2
-+   lsr     %0, %2
-+   lsr     %0, %1, %2"
-+  [(set_attr "length" "4,2,4")
-+   (set_attr "cc" "set_ncz")])
-+
-+
-+;;=============================================================================
-+;; neg
-+;;-----------------------------------------------------------------------------
-+;; Negate operand 1 and store the result in operand 0.
-+;;=============================================================================
-+(define_insn "negsi2"
-+  [(set (match_operand:SI 0 "register_operand" "=r,r")
-+	(neg:SI (match_operand:SI 1 "register_operand" "0,r")))]
-+  ""
-+  "@
-+   neg\t%0
-+   rsub\t%0, %1, 0"
-+  [(set_attr "length" "2,4")
-+   (set_attr "cc" "set_vncz")])
-+
-+(define_insn "negsi2_predicable"
-+  [(set (match_operand:SI 0 "register_operand" "+r")
-+	(neg:SI (match_dup 0)))]
-+  "TARGET_V2_INSNS"
-+  "rsub%?\t%0, 0"
-+  [(set_attr "length" "4")
-+   (set_attr "cc" "cmp_cond_insn")
-+   (set_attr "predicable" "yes")])
-+
-+;;=============================================================================
-+;; abs
-+;;-----------------------------------------------------------------------------
-+;; Store the absolute value of operand 1 into operand 0.
-+;;=============================================================================
-+(define_insn "abssi2"
-+  [(set (match_operand:SI 0 "register_operand" "=r")
-+	(abs:SI (match_operand:SI 1 "register_operand" "0")))]
-+  ""
-+  "abs\t%0"
-+  [(set_attr "length" "2")
-+   (set_attr "cc" "set_z")])
-+
-+
-+;;=============================================================================
-+;; one_cmpl
-+;;-----------------------------------------------------------------------------
-+;; Store the bitwise-complement of operand 1 into operand 0.
-+;;=============================================================================
-+
-+(define_insn "one_cmplsi2"
-+  [(set (match_operand:SI 0 "register_operand" "=r,r")
-+	(not:SI (match_operand:SI 1 "register_operand" "0,r")))]
-+  ""
-+  "@
-+   com\t%0
-+   rsub\t%0, %1, -1"
-+  [(set_attr "length" "2,4")
-+   (set_attr "cc" "set_z")])
-+
-+
-+(define_insn "one_cmplsi2_predicable"
-+  [(set (match_operand:SI 0 "register_operand" "+r")
-+	(not:SI (match_dup 0)))]
-+  "TARGET_V2_INSNS"
-+  "rsub%?\t%0, -1"
-+  [(set_attr "length" "4")
-+   (set_attr "cc" "cmp_cond_insn")
-+   (set_attr "predicable" "yes")])
-+
-+
-+;;=============================================================================
-+;; Bit load
-+;;-----------------------------------------------------------------------------
-+;; Load a bit into Z and C flags
-+;;=============================================================================
-+(define_insn "bldsi"
-+  [(set (cc0)
-+        (and:SI (match_operand:SI 0 "register_operand" "r")
-+                (match_operand:SI 1 "one_bit_set_operand" "i")))]
-+  ""
-+  "bld\t%0, %p1"
-+  [(set_attr "length" "4")
-+   (set_attr "cc" "bld")]
-+  )
-+
-+
-+;;=============================================================================
-+;; Compare
-+;;-----------------------------------------------------------------------------
-+;; Compare reg0 with reg1 or an immediate value.
-+;;=============================================================================
-+
-+(define_expand "cmp<mode>"
-+  [(set (cc0)
-+	(compare:CMP
-+	 (match_operand:CMP 0 "register_operand" "")
-+	 (match_operand:CMP 1 "<CMP:cmp_predicate>"  "")))]
-+  ""
-+  "{
-+   avr32_compare_op0 = operands[0];
-+   avr32_compare_op1 = operands[1];
-+  }"
-+)
-+
-+(define_insn "cmp<mode>_internal"
-+  [(set (cc0)
-+        (compare:CMP
-+         (match_operand:CMP 0 "register_operand" "r")
-+         (match_operand:CMP 1 "<CMP:cmp_predicate>" "<CMP:cmp_constraint>")))]
-+  ""
-+  {
-+switch(GET_MODE(operands[0]))
-+  {
-+  case QImode:
-+	avr32_branch_type = CMP_QI;
-+	break;
-+  case HImode:
-+	avr32_branch_type = CMP_HI;
-+	break;
-+  case SImode:
-+	avr32_branch_type = CMP_SI;
-+	break;
-+  case DImode:
-+	avr32_branch_type = CMP_DI;
-+	break;
-+  default:
-+	abort();
-+  }
-+   /* Check if the next insn already will output a compare. */
-+   if (!next_insn_emits_cmp (insn))  
-+     set_next_insn_cond(insn,
-+                        avr32_output_cmp(get_next_insn_cond(insn), GET_MODE (operands[0]), operands[0], operands[1]));
-+   return "";
-+  }
-+  [(set_attr "length" "4")
-+   (set_attr "cc" "compare")])
-+
-+(define_expand "cmpsf"
-+  [(set (cc0)
-+	(compare:SF
-+	 (match_operand:SF 0 "general_operand" "")
-+	 (match_operand:SF 1 "general_operand"  "")))]
-+  "TARGET_ARCH_FPU && TARGET_HARD_FLOAT"
-+  "{
-+   if ( !REG_P(operands[0]) )
-+     operands[0] = force_reg(SFmode, operands[0]);
-+
-+   if ( !REG_P(operands[1]) )
-+     operands[1] = force_reg(SFmode, operands[1]);
-+
-+   avr32_compare_op0 = operands[0];
-+   avr32_compare_op1 = operands[1];
-+   emit_insn(gen_cmpsf_internal_uc3fp(operands[0], operands[1]));
-+   DONE;
-+  }"
-+)
-+
-+;;;=============================================================================
-+;; Test if zero
-+;;-----------------------------------------------------------------------------
-+;; Compare reg against zero and set the condition codes.
-+;;=============================================================================
-+
-+
-+(define_expand "tstsi"
-+  [(set (cc0)
-+	(match_operand:SI 0 "register_operand" ""))]
-+  ""
-+  {
-+   avr32_compare_op0 = operands[0];
-+   avr32_compare_op1 = const0_rtx;
-+  }
-+)
-+
-+(define_insn "tstsi_internal"
-+  [(set (cc0)
-+	(match_operand:SI 0 "register_operand" "r"))]
-+  ""
-+  {
-+   /* Check if the next insn already will output a compare. */
-+   if (!next_insn_emits_cmp (insn))  
-+     set_next_insn_cond(insn,
-+                        avr32_output_cmp(get_next_insn_cond(insn), SImode, operands[0], const0_rtx));
-+
-+   return "";
-+  }
-+  [(set_attr "length" "2")
-+   (set_attr "cc" "compare")])
-+
-+
-+(define_expand "tstdi"
-+  [(set (cc0)
-+	(match_operand:DI 0 "register_operand" ""))]
-+  ""
-+  {
-+   avr32_compare_op0 = operands[0];
-+   avr32_compare_op1 = const0_rtx;
-+  }
-+)
-+
-+(define_insn "tstdi_internal"
-+  [(set (cc0)
-+	(match_operand:DI 0 "register_operand" "r"))]
-+  ""
-+  {
-+   /* Check if the next insn already will output a compare. */
-+   if (!next_insn_emits_cmp (insn))  
-+     set_next_insn_cond(insn,
-+                        avr32_output_cmp(get_next_insn_cond(insn), DImode, operands[0], const0_rtx));
-+   return "";
-+  }
-+  [(set_attr "length" "4")
-+   (set_attr "type" "alu2")
-+   (set_attr "cc" "compare")])
-+
-+
-+
-+;;=============================================================================
-+;; Convert operands
-+;;-----------------------------------------------------------------------------
-+;;
-+;;=============================================================================
-+(define_insn "truncdisi2"
-+  [(set (match_operand:SI 0 "general_operand" "")
-+	(truncate:SI (match_operand:DI 1 "general_operand" "")))]
-+  ""
-+  "truncdisi2")
-+
-+;;=============================================================================
-+;; Extend
-+;;-----------------------------------------------------------------------------
-+;;
-+;;=============================================================================
-+
-+
-+(define_insn "extendhisi2"
-+  [(set (match_operand:SI 0 "register_operand" "=r,r,r,r")
-+	(sign_extend:SI (match_operand:HI 1 "nonimmediate_operand" "0,r,<RKu00>,m")))]
-+  ""
-+  {
-+   switch ( which_alternative ){
-+     case 0:
-+       return    "casts.h\t%0";
-+     case 1:
-+       return    "bfexts\t%0, %1, 0, 16";
-+     case 2:
-+     case 3:
-+       return    "ld.sh\t%0, %1";
-+     default:
-+       abort();
-+   }
-+  }
-+  [(set_attr "length" "2,4,2,4")
-+   (set_attr "cc" "set_ncz,set_ncz,none,none")
-+   (set_attr "type" "alu,alu,load_rm,load_rm")])
-+
-+(define_insn "extendqisi2"
-+  [(set (match_operand:SI 0 "register_operand" "=r,r,r,r")
-+	(sign_extend:SI (match_operand:QI 1 "extendqi_operand" "0,r,RKu00,m")))]
-+  ""
-+  {
-+   switch ( which_alternative ){
-+     case 0:
-+       return    "casts.b\t%0";
-+     case 1:
-+       return    "bfexts\t%0, %1, 0, 8";
-+     case 2:
-+     case 3:
-+       return    "ld.sb\t%0, %1";
-+     default:
-+       abort();
-+   }
-+  }
-+  [(set_attr "length" "2,4,2,4")
-+   (set_attr "cc" "set_ncz,set_ncz,none,none")
-+   (set_attr "type" "alu,alu,load_rm,load_rm")])
-+
-+(define_insn "extendqihi2"
-+  [(set (match_operand:HI 0 "register_operand" "=r,r,r,r")
-+	(sign_extend:HI (match_operand:QI 1 "extendqi_operand" "0,r,RKu00,m")))]
-+  ""
-+  {
-+   switch ( which_alternative ){
-+     case 0:
-+       return    "casts.b\t%0";
-+     case 1:
-+       return    "bfexts\t%0, %1, 0, 8";
-+     case 2:
-+     case 3:
-+       return    "ld.sb\t%0, %1";
-+     default:
-+       abort();
-+   }
-+  }
-+  [(set_attr "length" "2,4,2,4")
-+   (set_attr "cc" "set_ncz,set_ncz,none,none")
-+   (set_attr "type" "alu,alu,load_rm,load_rm")])
-+
-+
-+;;=============================================================================
-+;; Zero-extend
-+;;-----------------------------------------------------------------------------
-+;;
-+;;=============================================================================
-+
-+(define_insn "zero_extendhisi2"
-+  [(set (match_operand:SI 0 "register_operand" "=r,r,r,r")
-+	(zero_extend:SI (match_operand:HI 1 "nonimmediate_operand" "0,r,<RKu00>,m")))]
-+  ""
-+  {
-+   switch ( which_alternative ){
-+     case 0:
-+       return    "castu.h\t%0";
-+     case 1:
-+       return    "bfextu\t%0, %1, 0, 16";
-+     case 2:
-+     case 3:
-+       return    "ld.uh\t%0, %1";
-+     default:
-+       abort();
-+   }
-+  }
-+
-+  [(set_attr "length" "2,4,2,4")
-+   (set_attr "cc" "set_ncz,set_ncz,none,none")
-+   (set_attr "type" "alu,alu,load_rm,load_rm")])
-+
-+(define_insn "zero_extendqisi2"
-+  [(set (match_operand:SI 0 "register_operand" "=r,r,r,r")
-+	(zero_extend:SI (match_operand:QI 1 "nonimmediate_operand" "0,r,<RKu00>,m")))]
-+  ""
-+  {
-+   switch ( which_alternative ){
-+     case 0:
-+       return    "castu.b\t%0";
-+     case 1:
-+       return    "bfextu\t%0, %1, 0, 8";
-+     case 2:
-+     case 3:
-+       return    "ld.ub\t%0, %1";
-+     default:
-+       abort();
-+   }
-+  }
-+  [(set_attr "length" "2,4,2,4")
-+   (set_attr "cc" "set_ncz, set_ncz, none, none")
-+   (set_attr "type" "alu, alu, load_rm, load_rm")])
-+
-+(define_insn "zero_extendqihi2"
-+  [(set (match_operand:HI 0 "register_operand" "=r,r,r,r")
-+	(zero_extend:HI (match_operand:QI 1 "nonimmediate_operand" "0,r,<RKu00>,m")))]
-+  ""
-+  {
-+   switch ( which_alternative ){
-+     case 0:
-+       return    "castu.b\t%0";
-+     case 1:
-+       return    "bfextu\t%0, %1, 0, 8";
-+     case 2:
-+     case 3:
-+       return    "ld.ub\t%0, %1";
-+     default:
-+       abort();
-+   }
-+  }
-+  [(set_attr "length" "2,4,2,4")
-+   (set_attr "cc" "set_ncz, set_ncz, none, none")
-+   (set_attr "type" "alu, alu, load_rm, load_rm")])
-+
-+
-+;;=============================================================================
-+;; Conditional load and extend insns
-+;;=============================================================================
-+(define_insn "ldsi<mode>_predicable_se"
-+  [(set (match_operand:SI 0 "register_operand" "=r")
-+        (sign_extend:SI 
-+         (match_operand:INTM 1 "memory_operand" "<INTM:pred_mem_constraint>")))]
-+  "TARGET_V2_INSNS"
-+  "ld<INTM:load_postfix_s>%?\t%0, %1"
-+  [(set_attr "length" "4")
-+   (set_attr "cc" "cmp_cond_insn")
-+   (set_attr "type" "load")
-+   (set_attr "predicable" "yes")]
-+)
-+
-+(define_insn "ldsi<mode>_predicable_ze"
-+  [(set (match_operand:SI 0 "register_operand" "=r")
-+        (zero_extend:SI 
-+         (match_operand:INTM 1 "memory_operand" "<INTM:pred_mem_constraint>")))]
-+  "TARGET_V2_INSNS"
-+  "ld<INTM:load_postfix_u>%?\t%0, %1"
-+  [(set_attr "length" "4")
-+   (set_attr "cc" "cmp_cond_insn")
-+   (set_attr "type" "load")
-+   (set_attr "predicable" "yes")]
-+)
-+
-+(define_insn "ldhi_predicable_ze"
-+  [(set (match_operand:HI 0 "register_operand" "=r")
-+        (zero_extend:HI 
-+         (match_operand:QI 1 "memory_operand" "RKs10")))]
-+  "TARGET_V2_INSNS"
-+  "ld.ub%?\t%0, %1"
-+  [(set_attr "length" "4")
-+   (set_attr "cc" "cmp_cond_insn")
-+   (set_attr "type" "load")
-+   (set_attr "predicable" "yes")]
-+)
-+
-+(define_insn "ldhi_predicable_se"
-+  [(set (match_operand:HI 0 "register_operand" "=r")
-+        (sign_extend:HI 
-+         (match_operand:QI 1 "memory_operand" "RKs10")))]
-+  "TARGET_V2_INSNS"
-+  "ld.sb%?\t%0, %1"
-+  [(set_attr "length" "4")
-+   (set_attr "cc" "cmp_cond_insn")
-+   (set_attr "type" "load")
-+   (set_attr "predicable" "yes")]
-+)
-+
-+;;=============================================================================
-+;; Conditional set register
-+;; sr{cond4}  rd
-+;;-----------------------------------------------------------------------------
-+
-+;;Because of the same issue as with conditional moves and adds we must
-+;;not separate the compare instrcution from the scc instruction as
-+;;they might be sheduled "badly".
-+
-+(define_expand "s<code>"
-+  [(set (match_operand:SI 0 "register_operand" "=r")
-+	(any_cond:SI (cc0)
-+                     (const_int 0)))]
-+""
-+{
-+  if(TARGET_HARD_FLOAT && TARGET_ARCH_FPU)
-+    FAIL;
-+})
-+
-+(define_insn "*s<code>"
-+  [(set (match_operand:SI 0 "register_operand" "=r")
-+	(any_cond:SI (cc0)
-+                     (const_int 0)))]
-+  ""
-+{
-+    return "sr<cond>\t%0";
-+}
-+[(set_attr "length" "2")
-+(set_attr "cc" "none")])
-+
-+(define_insn "seq"
-+[(set (match_operand:SI 0 "register_operand" "=r")
-+(eq:SI (cc0)
-+				 (const_int 0)))]
-+  ""
-+"sreq\t%0"
-+[(set_attr "length" "2")
-+(set_attr "cc" "none")])
-+
-+(define_insn "sne"
-+[(set (match_operand:SI 0 "register_operand" "=r")
-+(ne:SI (cc0)
-+				 (const_int 0)))]
-+  ""
-+"srne\t%0"
-+  [(set_attr "length" "2")
-+   (set_attr "cc" "none")])
-+
-+(define_insn "smi"
-+  [(set (match_operand:SI 0 "register_operand" "=r")
-+	(unspec:SI [(cc0)
-+                    (const_int 0)] UNSPEC_COND_MI))]
-+  ""
-+  "srmi\t%0"
-+  [(set_attr "length" "2")
-+   (set_attr "cc" "none")])
-+
-+(define_insn "spl"
-+  [(set (match_operand:SI 0 "register_operand" "=r")
-+	(unspec:SI [(cc0)
-+                    (const_int 0)] UNSPEC_COND_PL))]
-+  ""
-+  "srpl\t%0"
-+  [(set_attr "length" "2")
-+   (set_attr "cc" "none")])
-+
-+
-+;;=============================================================================
-+;; Conditional branch
-+;;-----------------------------------------------------------------------------
-+;; Branch to label if the specified condition codes are set.
-+;;=============================================================================
-+; branch if negative
-+(define_insn "bmi"
-+  [(set (pc)
-+	(if_then_else (unspec:CC [(cc0) (const_int 0)] UNSPEC_COND_MI)
-+		      (label_ref (match_operand 0 "" ""))
-+		      (pc)))]
-+  ""
-+  "brmi    %0"
-+  [(set_attr "type" "branch")
-+   (set (attr "length")
-+	(cond [(and (le (minus (match_dup 0) (pc)) (const_int 254))
-+		    (le (minus (pc) (match_dup 0)) (const_int 256)))
-+	       (const_int 2)] ; use compact branch
-+              (const_int 4))) ; use extended branch
-+   (set_attr "cc" "none")])
-+
-+(define_insn "*bmi-reverse"
-+  [(set (pc)
-+	(if_then_else (unspec:CC [(cc0) (const_int 0)] UNSPEC_COND_MI)
-+		      (pc)
-+		      (label_ref (match_operand 0 "" ""))))]
-+  ""
-+  "brpl    %0"
-+  [(set_attr "type" "branch")
-+   (set (attr "length")
-+	(cond [(and (le (minus (match_dup 0) (pc)) (const_int 254))
-+		    (le (minus (pc) (match_dup 0)) (const_int 256)))
-+	       (const_int 2)] ; use compact branch
-+              (const_int 4))) ; use extended branch
-+   (set_attr "cc" "none")])
-+
-+; branch if positive
-+(define_insn "bpl"
-+  [(set (pc)
-+	(if_then_else (unspec:CC [(cc0) (const_int 0)] UNSPEC_COND_PL)
-+		      (label_ref (match_operand 0 "" ""))
-+		      (pc)))]
-+  ""
-+  "brpl    %0"
-+  [(set_attr "type" "branch")
-+   (set (attr "length")
-+	(cond [(and (le (minus (match_dup 0) (pc)) (const_int 254))
-+		    (le (minus (pc) (match_dup 0)) (const_int 256)))
-+	       (const_int 2)] ; use compact branch
-+              (const_int 4))) ; use extended branch
-+   (set_attr "cc" "none")])
-+
-+(define_insn "*bpl-reverse"
-+  [(set (pc)
-+	(if_then_else (unspec:CC [(cc0) (const_int 0)] UNSPEC_COND_PL)
-+		      (pc)
-+		      (label_ref (match_operand 0 "" ""))))]
-+  ""
-+  "brmi    %0"
-+  [(set_attr "type" "branch")
-+   (set (attr "length")
-+	(cond [(and (le (minus (match_dup 0) (pc)) (const_int 254))
-+		    (le (minus (pc) (match_dup 0)) (const_int 256)))
-+	       (const_int 2)] ; use compact branch
-+              (const_int 4))) ; use extended branch
-+   (set_attr "cc" "none")])
-+
-+; branch if equal
-+(define_insn "b<code>"
-+  [(set (pc)
-+	(if_then_else (any_cond_b:CC (cc0)
-+			  (const_int 0))
-+		      (label_ref (match_operand 0 "" ""))
-+		      (pc)))]
-+  ""
-+  {
-+    if (TARGET_HARD_FLOAT && TARGET_ARCH_FPU && (avr32_branch_type == CMP_SF))
-+       return get_attr_length(insn) == 6 ? "brvs .+6\;br<cond> %0" : "brvs .+8\;br<cond> %0";
-+    else
-+       return "br<cond> %0";
-+  }
-+  [(set_attr "type" "branch")
-+   (set (attr "length")
-+	(if_then_else (eq (const_int 1)(symbol_ref "TARGET_HARD_FLOAT && TARGET_ARCH_FPU"))
-+		      (if_then_else 
-+			   (and (le (minus (match_dup 0) (pc)) (const_int 254))
-+		    (le (minus (pc) (match_dup 0)) (const_int 256)))
-+		                 (const_int 6)
-+		                 (const_int 8))
-+		      (if_then_else 
-+			   (and (le (minus (match_dup 0) (pc)) (const_int 254))
-+		    (le (minus (pc) (match_dup 0)) (const_int 256)))
-+				    (const_int 2)
-+				    (const_int 4))))
-+   (set_attr "cc" "none")])
-+
-+(define_insn "beq"
-+  [(set (pc)
-+	(if_then_else (eq:CC (cc0)
-+			  (const_int 0))
-+		      (label_ref (match_operand 0 "" ""))
-+		      (pc)))]
-+  ""
-+  "breq %0";
-+  [(set_attr "type" "branch")
-+   (set (attr "length")
-+	(cond [(and (le (minus (match_dup 0) (pc)) (const_int 254))
-+		    (le (minus (pc) (match_dup 0)) (const_int 256)))
-+	       (const_int 2)] ; use compact branch
-+              (const_int 4))) ; use extended branch
-+   (set_attr "cc" "none")])
-+
-+(define_insn "bne"
-+  [(set (pc)
-+	(if_then_else (ne:CC (cc0)
-+			  (const_int 0))
-+		      (label_ref (match_operand 0 "" ""))
-+		      (pc)))]
-+  ""
-+  "brne %0";
-+  [(set_attr "type" "branch")
-+   (set (attr "length")
-+	(cond [(and (le (minus (match_dup 0) (pc)) (const_int 254))
-+		    (le (minus (pc) (match_dup 0)) (const_int 256)))
-+	       (const_int 2)] ; use compact branch
-+              (const_int 4))) ; use extended branch
-+   (set_attr "cc" "none")])
-+
-+(define_insn "b<code>"
-+  [(set (pc)
-+	(if_then_else (any_cond4:CC (cc0)
-+			  (const_int 0))
-+		      (label_ref (match_operand 0 "" ""))
-+		      (pc)))]
-+  ""
-+  {
-+	if(TARGET_HARD_FLOAT && TARGET_ARCH_FPU && (avr32_branch_type == CMP_SF))
-+		return "brvs .+8\;br<cond> %l0";
-+	else
-+		return "br<cond> %l0";
-+  }
-+  [(set_attr "type" "branch")
-+   (set (attr "length") 
-+    (cond [(eq (const_int 1)(symbol_ref "TARGET_HARD_FLOAT && TARGET_ARCH_FPU"))
-+		       (const_int 8)]
-+               (const_int 4)))
-+   (set_attr "cc" "none")])
-+
-+(define_insn "*b<code>-reverse"
-+  [(set (pc)
-+	(if_then_else (any_cond_b:CC (cc0)
-+			  (const_int 0))
-+		      (pc)
-+		      (label_ref (match_operand 0 "" ""))))]
-+  ""
-+  {
-+    if (TARGET_HARD_FLOAT && TARGET_ARCH_FPU && (avr32_branch_type == CMP_SF))
-+       return "brvs %0\;br<invcond> %0";
-+    else
-+       return "br<invcond> %0";
-+  }
-+  [(set_attr "type" "branch")
-+   (set (attr "length")
-+	(if_then_else (eq (const_int 1)(symbol_ref "TARGET_HARD_FLOAT && TARGET_ARCH_FPU"))
-+		      (if_then_else 
-+			   (and (le (minus (match_dup 0) (pc)) (const_int 254))
-+		    (le (minus (pc) (match_dup 0)) (const_int 256)))
-+		                 (const_int 6)
-+		                 (const_int 8))
-+		      (if_then_else 
-+			   (and (le (minus (match_dup 0) (pc)) (const_int 254))
-+		    (le (minus (pc) (match_dup 0)) (const_int 256)))
-+				    (const_int 2)
-+				    (const_int 4))))
-+   (set_attr "cc" "none")])
-+
-+(define_insn "*beq-reverse"
-+  [(set (pc)
-+	(if_then_else (eq:CC (cc0)
-+			  (const_int 0))
-+		      (pc)
-+		      (label_ref (match_operand 0 "" ""))))]
-+  ""
-+  "brne %0";
-+  [(set_attr "type" "branch")
-+   (set (attr "length")
-+	(cond [(and (le (minus (match_dup 0) (pc)) (const_int 254))
-+		    (le (minus (pc) (match_dup 0)) (const_int 256)))
-+	       (const_int 2)] ; use compact branch
-+              (const_int 4))) ; use extended branch
-+   (set_attr "cc" "none")])
-+
-+(define_insn "*bne-reverse"
-+  [(set (pc)
-+	(if_then_else (ne:CC (cc0)
-+			  (const_int 0))
-+		      (pc)
-+		      (label_ref (match_operand 0 "" ""))))]
-+  ""
-+  "breq %0";
-+  [(set_attr "type" "branch")
-+   (set (attr "length")
-+	(cond [(and (le (minus (match_dup 0) (pc)) (const_int 254))
-+		    (le (minus (pc) (match_dup 0)) (const_int 256)))
-+	       (const_int 2)] ; use compact branch
-+              (const_int 4))) ; use extended branch
-+   (set_attr "cc" "none")])
-+
-+(define_insn "*b<code>-reverse"
-+  [(set (pc)
-+	(if_then_else (any_cond4:CC (cc0)
-+			  (const_int 0))
-+		      (pc)
-+		      (label_ref (match_operand 0 "" ""))))]
-+  ""
-+  {
-+    if (TARGET_HARD_FLOAT && TARGET_ARCH_FPU && (avr32_branch_type == CMP_SF))
-+       return "brvs %l0\;br<invcond> %l0";
-+    else
-+       return "br<invcond> %0";
-+  }
-+  [(set_attr "type" "branch")
-+   (set (attr "length") 
-+    (cond [(eq (const_int 1)(symbol_ref "TARGET_HARD_FLOAT && TARGET_ARCH_FPU"))
-+		       (const_int 8)]
-+               (const_int 4)))
-+   (set_attr "cc" "none")])
-+
-+;=============================================================================
-+; Conditional Add/Subtract
-+;-----------------------------------------------------------------------------
-+; sub{cond4}  Rd, imm
-+;=============================================================================
-+
-+
-+(define_expand "add<mode>cc"
-+  [(set (match_operand:ADDCC 0 "register_operand" "")
-+        (if_then_else:ADDCC (match_operator 1 "avr32_comparison_operator" 
-+                                            [(match_dup 4)
-+                                             (match_dup 5)])
-+                            (match_operand:ADDCC 2 "register_operand" "")
-+                            (plus:ADDCC 
-+                             (match_dup 2)
-+                             (match_operand:ADDCC 3 "" ""))))]
-+  ""
-+  {
-+   if ( !(GET_CODE (operands[3]) == CONST_INT
-+          || (TARGET_V2_INSNS && REG_P(operands[3]))) ){
-+      FAIL;
-+   }
-+
-+   /* Delete compare instruction as it is merged into this instruction */
-+   remove_insn (get_last_insn_anywhere ());
-+
-+   operands[4] = avr32_compare_op0;
-+   operands[5] = avr32_compare_op1;
-+   
-+   if ( TARGET_V2_INSNS 
-+        && REG_P(operands[3]) 
-+        && REGNO(operands[0]) != REGNO(operands[2]) ){
-+       emit_move_insn (operands[0], operands[2]);
-+       operands[2] = operands[0];
-+   }
-+  }
-+  )
-+
-+(define_insn "add<ADDCC:mode>cc_cmp<CMP:mode>_reg"
-+  [(set (match_operand:ADDCC 0 "register_operand" "=r")
-+        (if_then_else:ADDCC (match_operator 1 "avr32_comparison_operator" 
-+                                            [(match_operand:CMP 4 "register_operand" "r")
-+                                             (match_operand:CMP 5 "<CMP:cmp_predicate>" "<CMP:cmp_constraint>")])
-+                            (match_dup 0)
-+                            (plus:ADDCC 
-+                             (match_operand:ADDCC 2 "register_operand" "r")
-+                             (match_operand:ADDCC 3 "register_operand" "r"))))]
-+  "TARGET_V2_INSNS"
-+  {
-+   operands[1] = avr32_output_cmp(operands[1], GET_MODE(operands[4]), operands[4], operands[5]);
-+   return "add%i1\t%0, %2, %3";
-+  }
-+  [(set_attr "length" "8")
-+   (set_attr "cc" "cmp_cond_insn")])
-+
-+(define_insn "add<ADDCC:mode>cc_cmp<CMP:mode>"
-+  [(set (match_operand:ADDCC 0 "register_operand" "=r")
-+        (if_then_else:ADDCC (match_operator 1 "avr32_comparison_operator" 
-+                                            [(match_operand:CMP 4 "register_operand" "r")
-+                                             (match_operand:CMP 5 "<CMP:cmp_predicate>" "<CMP:cmp_constraint>")])
-+                            (match_operand:ADDCC 2 "register_operand" "0")
-+                            (plus:ADDCC 
-+                             (match_dup 2)
-+                             (match_operand:ADDCC 3 "avr32_cond_immediate_operand" "Is08"))))]
-+  ""
-+  {
-+   operands[1] = avr32_output_cmp(operands[1], GET_MODE(operands[4]), operands[4], operands[5]);
-+   return "sub%i1\t%0, -%3";
-+  }
-+  [(set_attr "length" "8")
-+   (set_attr "cc" "cmp_cond_insn")])
-+
-+;=============================================================================
-+; Conditional Move
-+;-----------------------------------------------------------------------------
-+; mov{cond4}  Rd, (Rs/imm)
-+;=============================================================================
-+(define_expand "mov<mode>cc"
-+  [(set (match_operand:MOVCC 0 "register_operand" "")
-+        (if_then_else:MOVCC (match_operator 1 "avr32_comparison_operator" 
-+                                            [(match_dup 4)
-+                                             (match_dup 5)])
-+                            (match_operand:MOVCC 2 "avr32_cond_register_immediate_operand" "")
-+                            (match_operand:MOVCC 3 "avr32_cond_register_immediate_operand" "")))]
-+  ""
-+  {
-+   /* Delete compare instruction as it is merged into this instruction */
-+   remove_insn (get_last_insn_anywhere ());
-+
-+   operands[4] = avr32_compare_op0;
-+   operands[5] = avr32_compare_op1;
-+  }
-+  )
-+
-+
-+(define_insn "mov<MOVCC:mode>cc_cmp<CMP:mode>"
-+  [(set (match_operand:MOVCC 0 "register_operand" "=r,r,r")
-+        (if_then_else:MOVCC (match_operator 1 "avr32_comparison_operator" 
-+                                            [(match_operand:CMP 4 "register_operand" "r,r,r")
-+                                             (match_operand:CMP 5 "<CMP:cmp_predicate>" "<CMP:cmp_constraint>,<CMP:cmp_constraint>,<CMP:cmp_constraint>")])
-+                            (match_operand:MOVCC 2 "avr32_cond_register_immediate_operand" "0, rKs08,rKs08")
-+                            (match_operand:MOVCC 3 "avr32_cond_register_immediate_operand" "rKs08,0,rKs08")))]
-+  ""
-+  {
-+   operands[1] = avr32_output_cmp(operands[1], GET_MODE(operands[4]), operands[4], operands[5]);
-+           
-+   switch( which_alternative ){
-+    case 0:
-+      return "mov%i1    %0, %3";
-+    case 1:
-+      return "mov%1    %0, %2";
-+    case 2:
-+      return "mov%1    %0, %2\;mov%i1    %0, %3";
-+    default:
-+      abort();
-+    }
-+
-+  }
-+  [(set_attr "length" "8,8,12")
-+   (set_attr "cc" "cmp_cond_insn")])
-+
-+  
-+
-+
-+;;=============================================================================
-+;; jump
-+;;-----------------------------------------------------------------------------
-+;; Jump inside a function; an unconditional branch to a label.
-+;;=============================================================================
-+(define_insn "jump"
-+  [(set (pc)
-+	(label_ref (match_operand 0 "" "")))]
-+  ""
-+  {
-+    if (get_attr_length(insn) > 4)
-+      return "Can't jump this far";
-+    return (get_attr_length(insn) == 2 ?
-+	    "rjmp    %0" : "bral    %0");
-+  }
-+  [(set_attr "type" "branch")
-+   (set (attr "length")
-+	(cond [(and (le (minus (match_dup 0) (pc)) (const_int 1022))
-+		    (le (minus (pc) (match_dup 0)) (const_int 1024)))
-+	       (const_int 2) ; use rjmp
-+	       (le (match_dup 0) (const_int 1048575))
-+	       (const_int 4)] ; use bral
-+	      (const_int 8))) ; do something else
-+   (set_attr "cc" "none")])
-+
-+;;=============================================================================
-+;; call
-+;;-----------------------------------------------------------------------------
-+;; Subroutine call instruction returning no value.
-+;;=============================================================================
-+(define_insn "call_internal"
-+  [(parallel [(call (mem:SI (match_operand:SI 0 "avr32_call_operand" "r,U,T,W"))
-+                    (match_operand 1 "" ""))
-+              (clobber (reg:SI LR_REGNUM))])]
-+  ""
-+  {
-+
-+    /* Check for a flashvault call. */
-+    if (avr32_flashvault_call (SYMBOL_REF_DECL (operands[0])))
-+      {
-+        /* Assembly is already emitted. */
-+        return "";
-+      }
-+
-+    switch (which_alternative) {
-+      case 0:
-+        return "icall\t%0";
-+      case 1:
-+        return "rcall\t%0";
-+      case 2:
-+        return "mcall\t%0";
-+      case 3:
-+        if (TARGET_HAS_ASM_ADDR_PSEUDOS)
-+          return "call\t%0";
-+        else
-+          return "mcall\tr6[%0@got]";
-+      default:
-+        abort();
-+    }
-+  }
-+  [(set_attr "type" "call")
-+   (set_attr "length" "2,4,4,10")
-+   (set_attr "cc" "clobber")])
-+
-+
-+(define_expand "call"
-+  [(parallel [(call (match_operand:SI 0 "" "")
-+                    (match_operand 1 "" ""))
-+              (clobber (reg:SI LR_REGNUM))])]
-+  ""
-+  {
-+    rtx call_address;
-+    if ( GET_CODE(operands[0]) != MEM )
-+      FAIL;
-+
-+    call_address = XEXP(operands[0], 0);
-+
-+   /* If assembler supports call pseudo insn and the call address is a symbol then nothing special needs to be done. */
-+    if (TARGET_HAS_ASM_ADDR_PSEUDOS && (GET_CODE(call_address) == SYMBOL_REF) )
-+    {
-+       /* We must however mark the function as using the GOT if flag_pic is set, since the call insn might turn into a mcall using the GOT ptr register. */
-+       if (flag_pic)
-+       {
-+          crtl->uses_pic_offset_table = 1;
-+          emit_call_insn(gen_call_internal(call_address, operands[1]));
-+          DONE;
-+       }
-+    } 
-+    else 
-+    {
-+      if (flag_pic && GET_CODE(call_address) == SYMBOL_REF )
-+      {
-+        crtl->uses_pic_offset_table = 1;
-+        emit_call_insn(gen_call_internal(call_address, operands[1]));
-+        DONE;
-+      }
-+
-+      if (!SYMBOL_REF_RCALL_FUNCTION_P(operands[0]) )
-+      {
-+        if (optimize_size && GET_CODE(call_address) == SYMBOL_REF )
-+        {
-+          call_address = force_const_mem(SImode, call_address);
-+        } 
-+        else 
-+        {
-+          call_address = force_reg(SImode, call_address);
-+        }
-+      }
-+    }
-+    emit_call_insn(gen_call_internal(call_address, operands[1]));
-+    DONE;
-+
-+  }
-+)
-+
-+;;=============================================================================
-+;; call_value
-+;;-----------------------------------------------------------------------------
-+;; Subroutine call instruction returning a value.
-+;;=============================================================================
-+(define_expand "call_value"
-+   [(parallel [(set (match_operand:SI 0 "" "")
-+                    (call (match_operand:SI 1 "" "")
-+                          (match_operand 2 "" "")))
-+               (clobber (reg:SI LR_REGNUM))])]
-+   ""
-+   {
-+    rtx call_address;
-+    if ( GET_CODE(operands[1]) != MEM )
-+      FAIL;
-+
-+    call_address = XEXP(operands[1], 0);
-+
-+   /* Check for a flashvault call. 
-+   if (GET_CODE (call_address) == SYMBOL_REF 
-+       && avr32_flashvault_call (SYMBOL_REF_DECL (call_address)))
-+     DONE;  
-+     
-+    */ 
-+
-+    /* If assembler supports call pseudo insn and the call
-+       address is a symbol then nothing special needs to be done. */
-+    if ( TARGET_HAS_ASM_ADDR_PSEUDOS
-+         && (GET_CODE(call_address) == SYMBOL_REF) ){
-+       /* We must however mark the function as using the GOT if
-+          flag_pic is set, since the call insn might turn into
-+          a mcall using the GOT ptr register. */
-+       if ( flag_pic ) {
-+          crtl->uses_pic_offset_table = 1;
-+          emit_call_insn(gen_call_value_internal(operands[0], call_address, operands[2]));
-+          DONE;
-+       }
-+    } else {
-+      if ( flag_pic &&
-+           GET_CODE(call_address) == SYMBOL_REF ){
-+        crtl->uses_pic_offset_table = 1;
-+        emit_call_insn(gen_call_value_internal(operands[0], call_address, operands[2]));
-+        DONE;
-+      }
-+
-+      if ( !SYMBOL_REF_RCALL_FUNCTION_P(operands[1]) ){
-+        if ( optimize_size &&
-+             GET_CODE(call_address) == SYMBOL_REF){
-+          call_address = force_const_mem(SImode, call_address);
-+        } else {
-+          call_address = force_reg(SImode, call_address);
-+        }
-+      }
-+    }
-+    emit_call_insn(gen_call_value_internal(operands[0], call_address,
-+                                           operands[2]));
-+    DONE;
-+
-+   })
-+
-+(define_insn "call_value_internal"
-+  [(parallel [(set (match_operand 0 "register_operand" "=r,r,r,r")
-+                   (call (mem:SI (match_operand:SI 1 "avr32_call_operand" "r,U,T,W"))
-+                         (match_operand 2 "" "")))
-+              (clobber (reg:SI LR_REGNUM))])]
-+  ;; Operand 2 not used on the AVR32.
-+  ""
-+  {
-+    /* Check for a flashvault call. */
-+    if (avr32_flashvault_call (SYMBOL_REF_DECL (operands[1])))
-+      {
-+        /* Assembly is already emitted. */
-+        return "";
-+      }
-+
-+
-+    switch (which_alternative) {
-+      case 0:
-+        return "icall\t%1";
-+      case 1:
-+        return "rcall\t%1";
-+      case 2:
-+        return "mcall\t%1";
-+      case 3:
-+        if ( TARGET_HAS_ASM_ADDR_PSEUDOS )
-+          return "call\t%1";
-+        else
-+          return "mcall\tr6[%1@got]";
-+      default:
-+        abort();
-+    }
-+  }
-+  [(set_attr "type" "call")
-+   (set_attr "length" "2,4,4,10")
-+   (set_attr "cc" "call_set")])
-+
-+
-+;;=============================================================================
-+;; untyped_call
-+;;-----------------------------------------------------------------------------
-+;; Subrutine call instruction returning a value of any type.
-+;; The code is copied from m68k.md (except gen_blockage is removed)
-+;; Fixme!
-+;;=============================================================================
-+(define_expand "untyped_call"
-+  [(parallel [(call (match_operand 0 "avr32_call_operand" "")
-+		    (const_int 0))
-+	      (match_operand 1 "" "")
-+	      (match_operand 2 "" "")])]
-+  ""
-+  {
-+    int i;
-+
-+    emit_call_insn (GEN_CALL (operands[0], const0_rtx, NULL, const0_rtx));
-+
-+    for (i = 0; i < XVECLEN (operands[2], 0); i++) {
-+      rtx set = XVECEXP (operands[2], 0, i);
-+      emit_move_insn (SET_DEST (set), SET_SRC (set));
-+    }
-+
-+    /* The optimizer does not know that the call sets the function value
-+       registers we stored in the result block.  We avoid problems by
-+       claiming that all hard registers are used and clobbered at this
-+       point.  */
-+    emit_insn (gen_blockage ());
-+
-+    DONE;
-+  })
-+
-+
-+;;=============================================================================
-+;; return
-+;;=============================================================================
-+
-+(define_insn "return"
-+  [(return)]
-+  "USE_RETURN_INSN (FALSE)"
-+  {
-+   avr32_output_return_instruction(TRUE, FALSE, NULL, NULL);
-+   return "";
-+  }
-+  [(set_attr "length" "4")
-+   (set_attr "type" "call")]
-+  )
-+
-+
-+(define_insn "return_cond"
-+  [(set (pc) 
-+        (if_then_else (match_operand 0 "avr32_comparison_operand" "")
-+                      (return)
-+                      (pc)))]
-+  "USE_RETURN_INSN (TRUE)"
-+  "ret%0\tr12";
-+  [(set_attr "type" "call")])
-+  
-+(define_insn "return_cond_predicable"
-+  [(return)]
-+  "USE_RETURN_INSN (TRUE)"
-+  "ret%?\tr12";
-+  [(set_attr "type" "call")
-+   (set_attr "predicable" "yes")])
-+
-+
-+(define_insn "return_imm"
-+  [(parallel [(set (reg RETVAL_REGNUM) (match_operand 0 "immediate_operand" "i"))
-+              (use (reg RETVAL_REGNUM))
-+              (return)])]
-+  "USE_RETURN_INSN (FALSE) &&
-+   ((INTVAL(operands[0]) == -1) || (INTVAL(operands[0]) == 0) || (INTVAL(operands[0]) == 1))"
-+  {
-+   avr32_output_return_instruction(TRUE, FALSE, NULL, operands[0]);
-+   return "";
-+  }
-+  [(set_attr "length" "4")
-+   (set_attr "type" "call")]
-+  )
-+
-+(define_insn "return_imm_cond"
-+  [(parallel [(set (reg RETVAL_REGNUM) (match_operand 0 "immediate_operand" "i"))
-+              (use (reg RETVAL_REGNUM))
-+              (set (pc) 
-+                   (if_then_else (match_operand 1 "avr32_comparison_operand" "")
-+                                 (return)
-+                                 (pc)))])]
-+  "USE_RETURN_INSN (TRUE) &&
-+   ((INTVAL(operands[0]) == -1) || (INTVAL(operands[0]) == 0) || (INTVAL(operands[0]) == 1))"
-+  "ret%1\t%0";
-+  [(set_attr "type" "call")]
-+  )
-+
-+(define_insn "return_imm_predicable"
-+  [(parallel [(set (reg RETVAL_REGNUM) (match_operand 0 "immediate_operand" "i"))
-+              (use (reg RETVAL_REGNUM))
-+              (return)])]
-+  "USE_RETURN_INSN (TRUE) &&
-+   ((INTVAL(operands[0]) == -1) || (INTVAL(operands[0]) == 0) || (INTVAL(operands[0]) == 1))"
-+  "ret%?\t%0";
-+  [(set_attr "type" "call")
-+   (set_attr "predicable" "yes")])
-+
-+(define_insn "return_<mode>reg"
-+  [(set (reg RETVAL_REGNUM) (match_operand:MOVM 0 "register_operand" "r"))
-+   (use (reg RETVAL_REGNUM))
-+   (return)]
-+  "USE_RETURN_INSN (TRUE)"
-+  "ret%?\t%0";
-+  [(set_attr "type" "call")
-+   (set_attr "predicable" "yes")])
-+
-+(define_insn "return_<mode>reg_cond"
-+  [(set (reg RETVAL_REGNUM) (match_operand:MOVM 0 "register_operand" "r"))
-+   (use (reg RETVAL_REGNUM))
-+   (set (pc) 
-+        (if_then_else (match_operator 1 "avr32_comparison_operator"
-+                                      [(cc0) (const_int 0)])
-+                      (return)
-+                      (pc)))]
-+  "USE_RETURN_INSN (TRUE)"
-+  "ret%1\t%0";
-+  [(set_attr "type" "call")])
-+  
-+;;=============================================================================
-+;; nonlocal_goto_receiver
-+;;-----------------------------------------------------------------------------
-+;; For targets with a return stack we must make sure to flush the return stack
-+;; since it will be corrupt after a nonlocal goto.
-+;;=============================================================================
-+(define_expand "nonlocal_goto_receiver"
-+  [(const_int 0)]
-+  "TARGET_RETURN_STACK"
-+  "
-+   {
-+    emit_insn ( gen_frs() );
-+    DONE;
-+   }
-+  "
-+  )
-+
-+
-+;;=============================================================================
-+;; builtin_setjmp_receiver
-+;;-----------------------------------------------------------------------------
-+;; For pic code we need to reload the pic register.
-+;; For targets with a return stack we must make sure to flush the return stack
-+;; since it will probably be corrupted.
-+;;=============================================================================
-+(define_expand "builtin_setjmp_receiver"
-+  [(label_ref (match_operand 0 "" ""))]
-+  "flag_pic"
-+  "
-+   {
-+    if ( TARGET_RETURN_STACK ) 
-+     emit_insn ( gen_frs() );
-+
-+    avr32_load_pic_register ();
-+    DONE;
-+   }
-+  "
-+)
-+
-+
-+;;=============================================================================
-+;; indirect_jump
-+;;-----------------------------------------------------------------------------
-+;; Jump to an address in reg or memory.
-+;;=============================================================================
-+(define_expand "indirect_jump"
-+  [(set (pc)
-+	(match_operand:SI 0 "general_operand" ""))]
-+  ""
-+  {
-+    /* One of the ops has to be in a register.  */
-+    if ( (flag_pic || TARGET_HAS_ASM_ADDR_PSEUDOS )
-+         && !avr32_legitimate_pic_operand_p(operands[0]) )
-+      operands[0] = legitimize_pic_address (operands[0], SImode, 0);
-+    else if ( flag_pic && avr32_address_operand(operands[0], GET_MODE(operands[0])) )
-+      /* If we have an address operand then this function uses the pic register. */
-+      crtl->uses_pic_offset_table = 1;
-+  })
-+
-+
-+(define_insn "indirect_jump_internal"
-+  [(set (pc)
-+	(match_operand:SI 0 "avr32_non_rmw_general_operand" "r,m,W"))]
-+  ""
-+  {
-+    switch( which_alternative ){
-+      case 0:
-+        return "mov\tpc, %0";
-+      case 1:
-+        if ( avr32_const_pool_ref_operand(operands[0], GET_MODE(operands[0])) )
-+          return "lddpc\tpc, %0";
-+        else
-+          return "ld.w\tpc, %0";
-+      case 2:
-+        if ( flag_pic )
-+          return "ld.w\tpc, r6[%0@got]";
-+        else
-+          return "lda.w\tpc, %0";
-+      default:
-+	abort();
-+    }
-+   }
-+  [(set_attr "length" "2,4,8")
-+   (set_attr "type" "call,call,call")
-+   (set_attr "cc" "none,none,clobber")])
-+
-+
-+
-+;;=============================================================================
-+;; casesi and tablejump
-+;;=============================================================================
-+(define_insn "tablejump_add"
-+  [(set (pc)
-+	(plus:SI (match_operand:SI 0 "register_operand" "r")
-+                 (mult:SI (match_operand:SI 1 "register_operand" "r")
-+                          (match_operand:SI 2 "immediate_operand" "Ku04" ))))
-+   (use (label_ref (match_operand 3 "" "")))]
-+  "flag_pic &&
-+   ((INTVAL(operands[2]) == 0) || (INTVAL(operands[2]) == 2) ||
-+    (INTVAL(operands[2]) == 4) || (INTVAL(operands[2]) == 8))"
-+  "add\tpc, %0, %1 << %p2"
-+  [(set_attr "length" "4")
-+   (set_attr "cc" "clobber")])
-+
-+(define_insn "tablejump_insn"
-+  [(set (pc) (match_operand:SI 0 "memory_operand" "m"))
-+   (use (label_ref (match_operand 1 "" "")))]
-+  "!flag_pic"
-+  "ld.w\tpc, %0"
-+  [(set_attr "length" "4")
-+   (set_attr "type" "call")
-+   (set_attr "cc" "none")])
-+
-+(define_expand "casesi"
-+  [(match_operand:SI 0 "register_operand" "")	; index to jump on
-+   (match_operand:SI 1 "const_int_operand" "")	; lower bound
-+   (match_operand:SI 2 "const_int_operand" "")	; total range
-+   (match_operand:SI 3 "" "")			; table label
-+   (match_operand:SI 4 "" "")]			; Out of range label
-+  ""
-+  "
-+  {
-+    rtx reg;
-+    rtx index = operands[0];
-+    rtx low_bound = operands[1];
-+    rtx range = operands[2];
-+    rtx table_label = operands[3];
-+    rtx oor_label = operands[4];
-+
-+    index = force_reg ( SImode, index );
-+    if (low_bound != const0_rtx)
-+      {
-+        if (!avr32_const_ok_for_constraint_p(INTVAL (low_bound), 'I', \"Is21\")){
-+          reg = force_reg(SImode, GEN_INT (INTVAL (low_bound)));
-+	  emit_insn (gen_subsi3 (reg, index,
-+			         reg));
-+        } else {
-+          reg = gen_reg_rtx (SImode);
-+          emit_insn (gen_addsi3 (reg, index,
-+		         	 GEN_INT (-INTVAL (low_bound))));
-+        }
-+	index = reg;
-+      }
-+
-+    if (!avr32_const_ok_for_constraint_p (INTVAL (range), 'K', \"Ks21\"))
-+      range = force_reg (SImode, range);
-+
-+    emit_cmp_and_jump_insns ( index, range, GTU, NULL_RTX, SImode, 1, oor_label );
-+    reg = gen_reg_rtx (SImode);
-+    emit_move_insn ( reg, gen_rtx_LABEL_REF (VOIDmode, table_label));
-+
-+    if ( flag_pic ) 
-+       emit_jump_insn ( gen_tablejump_add ( reg, index, GEN_INT(4), table_label));
-+    else
-+       emit_jump_insn ( 
-+           gen_tablejump_insn ( gen_rtx_MEM ( SImode, 
-+                                              gen_rtx_PLUS ( SImode, 
-+                                                             reg, 
-+                                                             gen_rtx_MULT ( SImode, 
-+                                                                            index, 
-+                                                                            GEN_INT(4)))),
-+                                table_label));
-+    DONE;
-+  }"
-+)
-+
-+
-+
-+(define_insn "prefetch"
-+  [(prefetch (match_operand:SI 0 "avr32_ks16_address_operand" "p")
-+	     (match_operand 1 "const_int_operand" "")
-+	     (match_operand 2 "const_int_operand" ""))]
-+  ""
-+  {
-+     return "pref\t%0";
-+  }
-+
-+  [(set_attr "length" "4")
-+   (set_attr "type" "load")
-+   (set_attr "cc" "none")])
-+
-+
-+
-+;;=============================================================================
-+;; prologue
-+;;-----------------------------------------------------------------------------
-+;; This pattern, if defined, emits RTL for entry to a function. The function
-+;; entry i responsible for setting up the stack frame, initializing the frame
-+;; pointer register, saving callee saved registers, etc.
-+;;=============================================================================
-+(define_expand "prologue"
-+  [(clobber (const_int 0))]
-+  ""
-+  "
-+  avr32_expand_prologue();
-+  DONE;
-+  "
-+  )
-+
-+;;=============================================================================
-+;; eh_return
-+;;-----------------------------------------------------------------------------
-+;; This pattern, if defined, affects the way __builtin_eh_return, and
-+;; thence the call frame exception handling library routines, are
-+;; built. It is intended to handle non-trivial actions needed along
-+;; the abnormal return path.
-+;;
-+;; The address of the exception handler to which the function should
-+;; return is passed as operand to this pattern. It will normally need
-+;; to copied by the pattern to some special register or memory
-+;; location. If the pattern needs to determine the location of the
-+;; target call frame in order to do so, it may use
-+;; EH_RETURN_STACKADJ_RTX, if defined; it will have already been
-+;; assigned.
-+;;
-+;; If this pattern is not defined, the default action will be to
-+;; simply copy the return address to EH_RETURN_HANDLER_RTX. Either
-+;; that macro or this pattern needs to be defined if call frame
-+;; exception handling is to be used.
-+
-+;; We can't expand this before we know where the link register is stored.
-+(define_insn_and_split "eh_return"
-+  [(unspec_volatile [(match_operand:SI 0 "register_operand" "r")]
-+		    VUNSPEC_EH_RETURN)
-+   (clobber (match_scratch:SI 1 "=&r"))]
-+  ""
-+  "#"
-+  "reload_completed"
-+  [(const_int 0)]
-+  "
-+  {
-+    avr32_set_return_address (operands[0], operands[1]);
-+    DONE;
-+  }"
-+  )
-+
-+
-+;;=============================================================================
-+;; ffssi2
-+;;-----------------------------------------------------------------------------
-+(define_insn "ffssi2"
-+  [ (set (match_operand:SI 0 "register_operand" "=r")
-+         (ffs:SI (match_operand:SI 1 "register_operand" "r"))) ]
-+  ""
-+  "mov    %0, %1
-+   brev   %0
-+   clz    %0, %0
-+   sub    %0, -1
-+   cp     %0, 33
-+   moveq  %0, 0"
-+  [(set_attr "length" "18")
-+   (set_attr "cc" "clobber")]
-+  )
-+
-+
-+
-+;;=============================================================================
-+;; swap_h
-+;;-----------------------------------------------------------------------------
-+(define_insn "*swap_h"
-+  [ (set (match_operand:SI 0 "register_operand" "=r")
-+         (ior:SI (ashift:SI (match_dup 0) (const_int 16))
-+                 (lshiftrt:SI (match_dup 0) (const_int 16))))]
-+  ""
-+  "swap.h    %0"
-+  [(set_attr "length" "2")]
-+  )
-+
-+(define_insn_and_split "bswap_16"
-+  [ (set (match_operand:HI 0 "avr32_bswap_operand" "=r,RKs13,r")
-+         (ior:HI (and:HI (lshiftrt:HI (match_operand:HI 1 "avr32_bswap_operand" "r,r,RKs13")
-+                                      (const_int 8))
-+                         (const_int 255))
-+                 (ashift:HI (and:HI (match_dup 1)
-+                                    (const_int 255))
-+                            (const_int 8))))]
-+  ""
-+  {
-+   switch ( which_alternative ){
-+     case 0:
-+       if ( REGNO(operands[0]) == REGNO(operands[1]))
-+         return "swap.bh\t%0";
-+       else
-+         return "mov\t%0, %1\;swap.bh\t%0";
-+     case 1:
-+       return "stswp.h\t%0, %1";
-+     case 2:
-+       return "ldswp.sh\t%0, %1";
-+     default:
-+       abort();
-+     }
-+  }
-+
-+  "(reload_completed &&
-+     REG_P(operands[0]) && REG_P(operands[1])
-+     && (REGNO(operands[0]) != REGNO(operands[1])))"
-+  [(set (match_dup 0) (match_dup 1))
-+   (set (match_dup 0)
-+        (ior:HI (and:HI (lshiftrt:HI (match_dup 0)
-+                                     (const_int 8))
-+                        (const_int 255))
-+                (ashift:HI (and:HI (match_dup 0)
-+                                   (const_int 255))
-+                           (const_int 8))))]
-+  ""
-+
-+  [(set_attr "length" "4,4,4")
-+   (set_attr "type" "alu,store,load_rm")]
-+  )
-+
-+(define_insn_and_split "bswap_32"
-+  [ (set (match_operand:SI 0 "avr32_bswap_operand" "=r,RKs14,r")
-+         (ior:SI (ior:SI (lshiftrt:SI (and:SI (match_operand:SI 1 "avr32_bswap_operand" "r,r,RKs14")
-+                                              (const_int -16777216))
-+                                      (const_int 24))
-+                         (lshiftrt:SI (and:SI (match_dup 1)
-+                                              (const_int 16711680))
-+                                      (const_int 8)))
-+                 (ior:SI (ashift:SI (and:SI (match_dup 1)
-+                                            (const_int 65280))
-+                                    (const_int 8))
-+                         (ashift:SI (and:SI (match_dup 1)
-+                                            (const_int 255))
-+                                    (const_int 24)))))]
-+  ""
-+  {
-+    switch ( which_alternative ){
-+     case 0:
-+       if ( REGNO(operands[0]) == REGNO(operands[1]))
-+         return "swap.b\t%0";
-+       else
-+         return "#";
-+     case 1:
-+       return "stswp.w\t%0, %1";
-+     case 2:
-+       return "ldswp.w\t%0, %1";
-+     default:
-+       abort();
-+    }
-+  }
-+  "(reload_completed &&
-+    REG_P(operands[0]) && REG_P(operands[1])
-+    && (REGNO(operands[0]) != REGNO(operands[1])))"
-+  [(set (match_dup 0) (match_dup 1))
-+   (set (match_dup 0)
-+        (ior:SI (ior:SI (lshiftrt:SI (and:SI (match_dup 0)
-+                                             (const_int -16777216))
-+                                     (const_int 24))
-+                        (lshiftrt:SI (and:SI (match_dup 0)
-+                                             (const_int 16711680))
-+                                     (const_int 8)))
-+                (ior:SI (ashift:SI (and:SI (match_dup 0)
-+                                           (const_int 65280))
-+                                   (const_int 8))
-+                        (ashift:SI (and:SI (match_dup 0)
-+                                           (const_int 255))
-+                                   (const_int 24)))))]
-+  ""
-+
-+  [(set_attr "length" "4,4,4")
-+   (set_attr "type" "alu,store,load_rm")]
-+  )
-+
-+
-+;;=============================================================================
-+;; blockage
-+;;-----------------------------------------------------------------------------
-+;; UNSPEC_VOLATILE is considered to use and clobber all hard registers and
-+;; all of memory.  This blocks insns from being moved across this point.
-+
-+(define_insn "blockage"
-+  [(unspec_volatile [(const_int 0)] VUNSPEC_BLOCKAGE)]
-+  ""
-+  ""
-+  [(set_attr "length" "0")]
-+)
-+
-+;;=============================================================================
-+;; clzsi2
-+;;-----------------------------------------------------------------------------
-+(define_insn "clzsi2"
-+  [ (set (match_operand:SI 0 "register_operand" "=r")
-+         (clz:SI (match_operand:SI 1 "register_operand" "r"))) ]
-+  ""
-+  "clz    %0, %1"
-+  [(set_attr "length" "4")
-+   (set_attr "cc" "set_z")]
-+  )
-+
-+;;=============================================================================
-+;; ctzsi2
-+;;-----------------------------------------------------------------------------
-+(define_insn "ctzsi2"
-+  [ (set (match_operand:SI 0 "register_operand" "=r,r")
-+         (ctz:SI (match_operand:SI 1 "register_operand" "0,r"))) ]
-+  ""
-+  "@
-+   brev\t%0\;clz\t%0, %0
-+   mov\t%0, %1\;brev\t%0\;clz\t%0, %0"
-+  [(set_attr "length" "8")
-+   (set_attr "cc" "set_z")]
-+  )
-+
-+;;=============================================================================
-+;; cache instructions
-+;;-----------------------------------------------------------------------------
-+(define_insn "cache"
-+  [ (unspec_volatile [(match_operand:SI 0 "avr32_ks11_address_operand" "p")
-+                      (match_operand:SI 1 "immediate_operand" "Ku05")] VUNSPEC_CACHE)]
-+  ""
-+  "cache    %0, %1"
-+  [(set_attr "length" "4")]
-+  )
-+
-+(define_insn "sync"
-+  [ (unspec_volatile [(match_operand:SI 0 "immediate_operand" "Ku08")] VUNSPEC_SYNC)]
-+  ""
-+  "sync    %0"
-+  [(set_attr "length" "4")]
-+  )
-+
-+;;=============================================================================
-+;; TLB instructions
-+;;-----------------------------------------------------------------------------
-+(define_insn "tlbr"
-+  [ (unspec_volatile [(const_int 0)] VUNSPEC_TLBR)]
-+  ""
-+  "tlbr"
-+  [(set_attr "length" "2")]
-+  )
-+
-+(define_insn "tlbw"
-+  [ (unspec_volatile [(const_int 0)] VUNSPEC_TLBW)]
-+  ""
-+  "tlbw"
-+  [(set_attr "length" "2")]
-+  )
-+
-+(define_insn "tlbs"
-+  [ (unspec_volatile [(const_int 0)] VUNSPEC_TLBS)]
-+  ""
-+  "tlbs"
-+  [(set_attr "length" "2")]
-+  )
-+
-+;;=============================================================================
-+;; Breakpoint instruction
-+;;-----------------------------------------------------------------------------
-+(define_insn "breakpoint"
-+  [ (unspec_volatile [(const_int 0)] VUNSPEC_BREAKPOINT)]
-+  ""
-+  "breakpoint"
-+  [(set_attr "length" "2")]
-+  )
-+
-+
-+;;=============================================================================
-+;; mtsr/mfsr instruction
-+;;-----------------------------------------------------------------------------
-+(define_insn "mtsr"
-+  [ (unspec_volatile [(match_operand 0 "immediate_operand" "i")
-+                      (match_operand:SI 1 "register_operand" "r")] VUNSPEC_MTSR)]
-+  ""
-+  "mtsr\t%0, %1"
-+  [(set_attr "length" "4")]
-+  )
-+
-+(define_insn "mfsr"
-+  [ (set (match_operand:SI 0 "register_operand" "=r")
-+         (unspec_volatile:SI [(match_operand 1 "immediate_operand" "i")] VUNSPEC_MFSR)) ]
-+  ""
-+  "mfsr\t%0, %1"
-+  [(set_attr "length" "4")]
-+  )
-+
-+;;=============================================================================
-+;; mtdr/mfdr instruction
-+;;-----------------------------------------------------------------------------
-+(define_insn "mtdr"
-+  [ (unspec_volatile [(match_operand 0 "immediate_operand" "i")
-+                      (match_operand:SI 1 "register_operand" "r")] VUNSPEC_MTDR)]
-+  ""
-+  "mtdr\t%0, %1"
-+  [(set_attr "length" "4")]
-+  )
-+
-+(define_insn "mfdr"
-+  [ (set (match_operand:SI 0 "register_operand" "=r")
-+         (unspec_volatile:SI [(match_operand 1 "immediate_operand" "i")] VUNSPEC_MFDR)) ]
-+  ""
-+  "mfdr\t%0, %1"
-+  [(set_attr "length" "4")]
-+  )
-+
-+;;=============================================================================
-+;; musfr
-+;;-----------------------------------------------------------------------------
-+(define_insn "musfr"
-+  [ (unspec_volatile [(match_operand:SI 0 "register_operand" "r")] VUNSPEC_MUSFR)]
-+  ""
-+  "musfr\t%0"
-+  [(set_attr "length" "2")
-+   (set_attr "cc" "clobber")]
-+  )
-+
-+(define_insn "mustr"
-+  [ (set (match_operand:SI 0 "register_operand" "=r")
-+         (unspec_volatile:SI [(const_int 0)] VUNSPEC_MUSTR)) ]
-+  ""
-+  "mustr\t%0"
-+  [(set_attr "length" "2")]
-+  )
-+
-+(define_insn "ssrf"
-+  [ (unspec_volatile [(match_operand:SI 0 "immediate_operand" "Ku05")] VUNSPEC_SSRF)]
-+  ""
-+  "ssrf    %0"
-+  [(set_attr "length" "2")
-+   (set_attr "cc" "clobber")]
-+  )
-+
-+(define_insn "csrf"
-+  [ (unspec_volatile [(match_operand:SI 0 "immediate_operand" "Ku05")] VUNSPEC_CSRF)]
-+  ""
-+  "csrf    %0"
-+  [(set_attr "length" "2")
-+   (set_attr "cc" "clobber")]
-+  )
-+
-+;;=============================================================================
-+;; Flush Return Stack instruction
-+;;-----------------------------------------------------------------------------
-+(define_insn "frs"
-+  [ (unspec_volatile [(const_int 0)] VUNSPEC_FRS)]
-+  ""
-+  "frs"
-+  [(set_attr "length" "2")
-+   (set_attr "cc" "none")]
-+  )
-+
-+
-+;;=============================================================================
-+;; Saturation Round Scale instruction
-+;;-----------------------------------------------------------------------------
-+(define_insn "sats"
-+  [ (set (match_operand:SI 0 "register_operand" "+r")
-+         (unspec:SI [(match_dup 0)
-+                     (match_operand 1 "immediate_operand" "Ku05")
-+                     (match_operand 2 "immediate_operand" "Ku05")]
-+                    UNSPEC_SATS)) ]
-+  "TARGET_DSP"
-+  "sats\t%0 >> %1, %2"
-+  [(set_attr "type" "alu_sat")
-+   (set_attr "length" "4")]
-+  )
-+
-+(define_insn "satu"
-+  [ (set (match_operand:SI 0 "register_operand" "+r")
-+         (unspec:SI [(match_dup 0)
-+                     (match_operand 1 "immediate_operand" "Ku05")
-+                     (match_operand 2 "immediate_operand" "Ku05")]
-+                    UNSPEC_SATU)) ]
-+  "TARGET_DSP"
-+  "satu\t%0 >> %1, %2"
-+  [(set_attr "type" "alu_sat")
-+   (set_attr "length" "4")]
-+  )
-+
-+(define_insn "satrnds"
-+  [ (set (match_operand:SI 0 "register_operand" "+r")
-+         (unspec:SI [(match_dup 0)
-+                     (match_operand 1 "immediate_operand" "Ku05")
-+                     (match_operand 2 "immediate_operand" "Ku05")]
-+                    UNSPEC_SATRNDS)) ]
-+  "TARGET_DSP"
-+  "satrnds\t%0 >> %1, %2"
-+  [(set_attr "type" "alu_sat")
-+   (set_attr "length" "4")]
-+  )
-+
-+(define_insn "satrndu"
-+  [ (set (match_operand:SI 0 "register_operand" "+r")
-+         (unspec:SI [(match_dup 0)
-+                     (match_operand 1 "immediate_operand" "Ku05")
-+                     (match_operand 2 "immediate_operand" "Ku05")]
-+                    UNSPEC_SATRNDU)) ]
-+  "TARGET_DSP"
-+  "sats\t%0 >> %1, %2"
-+  [(set_attr "type" "alu_sat")
-+   (set_attr "length" "4")]
-+  )
-+
-+(define_insn "sleep"
-+  [(unspec_volatile [(const_int 0)] VUNSPEC_SLEEP)
-+  (match_operand:SI 0 "const_int_operand" "")]
-+  ""
-+  "sleep	%0"
-+  [(set_attr "length" "1")
-+   (set_attr "cc"  "none")
-+  ])
-+
-+(define_expand "delay_cycles"
-+  [(unspec_volatile [(match_operand:SI 0 "const_int_operand" "i")]
-+                    VUNSPEC_DELAY_CYCLES)]
-+  ""
-+  "
-+  unsigned int cycles = UINTVAL (operands[0]);
-+  if (IN_RANGE(cycles,0x10000 ,0xFFFFFFFF))
-+   {
-+     unsigned int msb = (cycles & 0xFFFF0000);
-+     unsigned int shift = 16;
-+     msb = (msb >> shift);
-+     unsigned int cycles_used = (msb*0x10000);
-+     emit_insn (gen_delay_cycles_2 (gen_int_mode (msb, SImode)));
-+     cycles -= cycles_used;
-+   }
-+  if (IN_RANGE(cycles, 4, 0xFFFF))
-+   {
-+     unsigned int loop_count = (cycles/ 4);
-+     unsigned int cycles_used = (loop_count*4);
-+     emit_insn (gen_delay_cycles_1 (gen_int_mode (loop_count, SImode)));
-+     cycles -= cycles_used;
-+   }
-+  while (cycles >= 3)
-+    {
-+      emit_insn (gen_nop3 ());
-+      cycles -= 3;
-+    }
-+  if (cycles == 1 || cycles == 2)
-+    {
-+      while (cycles--)
-+        emit_insn (gen_nop ());
-+    }
-+  DONE;
-+  ")
-+
-+(define_insn "delay_cycles_1"
-+[(unspec_volatile [(const_int 0)] VUNSPEC_DELAY_CYCLES_1)
-+  (match_operand:SI 0 "immediate_operand" "")
-+  (clobber (match_scratch:SI 1 "=&r"))]
-+  ""
-+  "mov\t%1, %0
-+    1:  sub\t%1, 1
-+        brne\t1b
-+        nop"
-+)
-+
-+(define_insn "delay_cycles_2"
-+[(unspec_volatile [(const_int 0)] VUNSPEC_DELAY_CYCLES_2)
-+  (match_operand:SI 0 "immediate_operand" "")
-+  (clobber (match_scratch:SI 1 "=&r"))
-+  (clobber (match_scratch:SI 2 "=&r"))]
-+  ""
-+  "mov\t%1, %0
-+    1:  mov\t%2, 16383 
-+    2:  sub\t%2, 1	
-+        brne\t2b
-+        nop
-+        sub\t%1, 1
-+        brne\t1b
-+        nop"
-+)
-+
-+;; CPU instructions
-+
-+;;=============================================================================
-+;; nop
-+;;-----------------------------------------------------------------------------
-+;; No-op instruction.
-+;;=============================================================================
-+(define_insn "nop"
-+  [(unspec_volatile [(const_int 0)] VUNSPEC_NOP)]
-+  ""
-+  "nop"
-+  [(set_attr "length" "1")
-+   (set_attr "type" "alu")
-+  (set_attr "cc" "none")])
-+
-+;; NOP3
-+(define_insn "nop3"
-+  [(unspec_volatile [(const_int 0)] VUNSPEC_NOP3)]
-+  ""
-+  "rjmp\t2"
-+  [(set_attr "length" "3")
-+   (set_attr "type" "alu")
-+  (set_attr "cc" "none")])
-+
-+;; Special patterns for dealing with the constant pool
-+
-+(define_insn "align_4"
-+  [(unspec_volatile [(const_int 0)] VUNSPEC_ALIGN)]
-+  ""
-+  {
-+   assemble_align (32);
-+   return "";
-+  }
-+  [(set_attr "length" "2")]
-+)
-+
-+
-+(define_insn "consttable_start"
-+  [(unspec_volatile [(const_int 0)] VUNSPEC_POOL_START)]
-+  ""
-+  {
-+   return ".cpool";
-+  }
-+  [(set_attr "length" "0")]
-+  )
-+
-+(define_insn "consttable_end"
-+  [(unspec_volatile [(const_int 0)] VUNSPEC_POOL_END)]
-+  ""
-+  {
-+   making_const_table = FALSE;
-+   return "";
-+  }
-+  [(set_attr "length" "0")]
-+)
-+
-+
-+(define_insn "consttable_4"
-+  [(unspec_volatile [(match_operand 0 "" "")] VUNSPEC_POOL_4)]
-+  ""
-+  {
-+    making_const_table = TRUE;
-+    switch (GET_MODE_CLASS (GET_MODE (operands[0])))
-+      {
-+      case MODE_FLOAT:
-+      {
-+        REAL_VALUE_TYPE r;
-+        char real_string[1024];
-+        REAL_VALUE_FROM_CONST_DOUBLE (r, operands[0]);
-+        real_to_decimal(real_string, &r, 1024, 0, 1);
-+        asm_fprintf (asm_out_file, "\t.float\t%s\n", real_string);
-+        break;
-+      }
-+      default:
-+        assemble_integer (operands[0], 4, 0, 1);
-+        break;
-+      }
-+    return "";
-+  }
-+  [(set_attr "length" "4")]
-+)
-+
-+(define_insn "consttable_8"
-+  [(unspec_volatile [(match_operand 0 "" "")] VUNSPEC_POOL_8)]
-+  ""
-+  {
-+    making_const_table = TRUE;
-+    switch (GET_MODE_CLASS (GET_MODE (operands[0])))
-+      {
-+       case MODE_FLOAT:
-+        {
-+         REAL_VALUE_TYPE r; 
-+         char real_string[1024];
-+         REAL_VALUE_FROM_CONST_DOUBLE (r, operands[0]);
-+         real_to_decimal(real_string, &r, 1024, 0, 1);
-+         asm_fprintf (asm_out_file, "\t.double\t%s\n", real_string);
-+         break;
-+        }
-+       default:
-+         assemble_integer(operands[0], 8, 0, 1);
-+        break;
-+     }
-+    return "";
-+  }
-+  [(set_attr "length" "8")]
-+)
-+
-+(define_insn "consttable_16"
-+  [(unspec_volatile [(match_operand 0 "" "")] VUNSPEC_POOL_16)]
-+  ""
-+  {
-+    making_const_table = TRUE;
-+    assemble_integer(operands[0], 16, 0, 1);
-+    return "";
-+  }
-+  [(set_attr "length" "16")]
-+)
-+
-+;;=============================================================================
-+;; coprocessor instructions
-+;;-----------------------------------------------------------------------------
-+(define_insn "cop"
-+  [ (unspec_volatile [(match_operand 0 "immediate_operand" "Ku03")
-+                      (match_operand 1 "immediate_operand" "Ku04")
-+                      (match_operand 2 "immediate_operand" "Ku04")
-+                      (match_operand 3 "immediate_operand" "Ku04")
-+                      (match_operand 4 "immediate_operand" "Ku07")] VUNSPEC_COP)]
-+  ""
-+  "cop\tcp%0, cr%1, cr%2, cr%3, %4"
-+  [(set_attr "length" "4")]
-+  )
-+
-+(define_insn "mvcrsi"
-+  [ (set (match_operand:SI 0 "avr32_cop_move_operand" "=r,<,Z")
-+         (unspec_volatile:SI [(match_operand 1 "immediate_operand" "Ku03,Ku03,Ku03")
-+                              (match_operand 2 "immediate_operand" "Ku04,Ku04,Ku04")]
-+                             VUNSPEC_MVCR)) ]
-+  ""
-+  "@
-+   mvcr.w\tcp%1, %0, cr%2
-+   stcm.w\tcp%1, %0, cr%2
-+   stc.w\tcp%1, %0, cr%2"
-+  [(set_attr "length" "4")]
-+  )
-+
-+(define_insn "mvcrdi"
-+  [ (set (match_operand:DI 0 "avr32_cop_move_operand" "=r,<,Z")
-+         (unspec_volatile:DI [(match_operand 1 "immediate_operand" "Ku03,Ku03,Ku03")
-+                              (match_operand 2 "immediate_operand" "Ku04,Ku04,Ku04")]
-+                             VUNSPEC_MVCR)) ]
-+  ""
-+  "@
-+   mvcr.d\tcp%1, %0, cr%2
-+   stcm.d\tcp%1, %0, cr%2-cr%i2
-+   stc.d\tcp%1, %0, cr%2"
-+  [(set_attr "length" "4")]
-+  )
-+
-+(define_insn "mvrcsi"
-+  [ (unspec_volatile:SI [(match_operand 0 "immediate_operand" "Ku03,Ku03,Ku03")
-+                         (match_operand 1 "immediate_operand" "Ku04,Ku04,Ku04")
-+                         (match_operand:SI 2 "avr32_cop_move_operand" "r,>,Z")]
-+                        VUNSPEC_MVRC)]
-+  ""
-+  {
-+   switch (which_alternative){
-+    case 0:
-+      return "mvrc.w\tcp%0, cr%1, %2";
-+    case 1:
-+      return "ldcm.w\tcp%0, %2, cr%1";
-+    case 2:
-+      return "ldc.w\tcp%0, cr%1, %2";
-+    default:
-+      abort();
-+   }
-+  }
-+  [(set_attr "length" "4")]
-+  )
-+
-+(define_insn "mvrcdi"
-+  [ (unspec_volatile:DI [(match_operand 0 "immediate_operand" "Ku03,Ku03,Ku03")
-+                         (match_operand 1 "immediate_operand" "Ku04,Ku04,Ku04")
-+                         (match_operand:DI 2 "avr32_cop_move_operand" "r,>,Z")]
-+                        VUNSPEC_MVRC)]
-+  ""
-+  {
-+   switch (which_alternative){
-+    case 0:
-+      return "mvrc.d\tcp%0, cr%1, %2";
-+    case 1:
-+      return "ldcm.d\tcp%0, %2, cr%1-cr%i1";
-+    case 2:
-+      return "ldc.d\tcp%0, cr%1, %2";
-+    default:
-+      abort();
-+   }
-+  }
-+  [(set_attr "length" "4")]
-+  )
-+
-+;;=============================================================================
-+;; epilogue
-+;;-----------------------------------------------------------------------------
-+;; This pattern emits RTL for exit from a function. The function exit is
-+;; responsible for deallocating the stack frame, restoring callee saved
-+;; registers and emitting the return instruction.
-+;; ToDo: using TARGET_ASM_FUNCTION_PROLOGUE instead.
-+;;=============================================================================
-+(define_expand "epilogue"
-+  [(unspec_volatile [(return)] VUNSPEC_EPILOGUE)]
-+  ""
-+  "
-+  if (USE_RETURN_INSN (FALSE)){
-+      emit_jump_insn (gen_return ());
-+      DONE;
-+  }
-+  emit_jump_insn (gen_rtx_UNSPEC_VOLATILE (VOIDmode,
-+	gen_rtvec (1,
-+		gen_rtx_RETURN (VOIDmode)),
-+	VUNSPEC_EPILOGUE));
-+  DONE;
-+  "
-+  )
-+
-+(define_insn "*epilogue_insns"
-+  [(unspec_volatile [(return)] VUNSPEC_EPILOGUE)]
-+  ""
-+  {
-+    avr32_output_return_instruction (FALSE, FALSE, NULL, NULL);
-+    return "";
-+  }
-+  ; Length is absolute worst case
-+  [(set_attr "type" "branch")
-+   (set_attr "length" "12")]
-+  )
-+
-+(define_insn "*epilogue_insns_ret_imm"
-+  [(parallel [(set (reg RETVAL_REGNUM) (match_operand 0 "immediate_operand" "i"))
-+              (use (reg RETVAL_REGNUM))
-+              (unspec_volatile [(return)] VUNSPEC_EPILOGUE)])]
-+  "((INTVAL(operands[0]) == -1) || (INTVAL(operands[0]) == 0) || (INTVAL(operands[0]) == 1))"
-+  {
-+    avr32_output_return_instruction (FALSE, FALSE, NULL, operands[0]);
-+    return "";
-+  }
-+  ; Length is absolute worst case
-+  [(set_attr "type" "branch")
-+   (set_attr "length" "12")]
-+  )
-+
-+(define_insn "sibcall_epilogue"
-+  [(unspec_volatile [(const_int 0)] VUNSPEC_EPILOGUE)]
-+  ""
-+  {
-+   avr32_output_return_instruction (FALSE, FALSE,  NULL, NULL);
-+   return "";
-+  }
-+;; Length is absolute worst case
-+  [(set_attr "type" "branch")
-+   (set_attr "length" "12")]
-+  )
-+
-+(define_insn "*sibcall_epilogue_insns_ret_imm"
-+  [(parallel [(set (reg RETVAL_REGNUM) (match_operand 0 "immediate_operand" "i"))
-+              (use (reg RETVAL_REGNUM))
-+              (unspec_volatile [(const_int 0)] VUNSPEC_EPILOGUE)])]
-+  "((INTVAL(operands[0]) == -1) || (INTVAL(operands[0]) == 0) || (INTVAL(operands[0]) == 1))"
-+  {
-+    avr32_output_return_instruction (FALSE, FALSE, NULL, operands[0]);
-+    return "";
-+  }
-+  ; Length is absolute worst case
-+  [(set_attr "type" "branch")
-+   (set_attr "length" "12")]
-+  )
-+
-+(define_insn "ldxi"
-+  [(set (match_operand:SI 0 "register_operand" "=r")
-+	(mem:SI (plus:SI
-+                 (match_operand:SI 1 "register_operand" "r")
-+                 (mult:SI (zero_extract:SI (match_operand:SI 2 "register_operand" "r")
-+                                           (const_int 8)
-+                                           (match_operand:SI 3 "immediate_operand" "Ku05"))
-+                          (const_int 4)))))]
-+  "(INTVAL(operands[3]) == 24 || INTVAL(operands[3]) == 16 || INTVAL(operands[3]) == 8
-+   || INTVAL(operands[3]) == 0)"
-+  {
-+   switch ( INTVAL(operands[3]) ){
-+    case 0:
-+         return "ld.w    %0, %1[%2:b << 2]";
-+    case 8:
-+         return "ld.w    %0, %1[%2:l << 2]";
-+    case 16:
-+         return "ld.w    %0, %1[%2:u << 2]";
-+    case 24:
-+         return "ld.w    %0, %1[%2:t << 2]";
-+    default:
-+         internal_error("illegal operand for ldxi");
-+   }
-+  }
-+  [(set_attr "type" "load")
-+   (set_attr "length" "4")
-+   (set_attr "cc" "none")])
-+
-+
-+
-+
-+
-+
-+;;=============================================================================
-+;; Peephole optimizing
-+;;-----------------------------------------------------------------------------
-+;; Changing
-+;;   sub     r8, r7, 8
-+;;   st.w    r8[0x0], r12
-+;; to
-+;;   sub     r8, r7, 8
-+;;   st.w    r7[-0x8], r12
-+;;=============================================================================
-+; (set (reg:SI 9 r8)
-+;      (plus:SI (reg/f:SI 6 r7)
-+;               (const_int ...)))
-+; (set (mem:SI (reg:SI 9 r8))
-+;      (reg:SI 12 r12))
-+(define_peephole2
-+  [(set (match_operand:SI 0 "register_operand" "")
-+	(plus:SI (match_operand:SI 1 "register_operand" "")
-+		 (match_operand:SI 2 "immediate_operand" "")))
-+   (set (mem:SI (match_dup 0))
-+	(match_operand:SI 3 "register_operand" ""))]
-+  "REGNO(operands[0]) != REGNO(operands[1]) && avr32_const_ok_for_constraint_p(INTVAL(operands[2]), 'K', \"Ks16\")"
-+  [(set (match_dup 0)
-+	(plus:SI (match_dup 1)
-+		 (match_dup 2)))
-+   (set (mem:SI (plus:SI (match_dup 1)
-+			 (match_dup 2)))
-+	(match_dup 3))]
-+  "")
-+
-+;;=============================================================================
-+;; Peephole optimizing
-+;;-----------------------------------------------------------------------------
-+;; Changing
-+;;   sub     r6, r7, 4
-+;;   ld.w    r6, r6[0x0]
-+;; to
-+;;   sub     r6, r7, 4
-+;;   ld.w    r6, r7[-0x4]
-+;;=============================================================================
-+; (set (reg:SI 7 r6)
-+;      (plus:SI (reg/f:SI 6 r7)
-+;               (const_int -4 [0xfffffffc])))
-+; (set (reg:SI 7 r6)
-+;      (mem:SI (reg:SI 7 r6)))
-+(define_peephole2
-+  [(set (match_operand:SI 0 "register_operand" "")
-+	(plus:SI (match_operand:SI 1 "register_operand" "")
-+		 (match_operand:SI 2 "immediate_operand" "")))
-+   (set (match_operand:SI 3 "register_operand" "")
-+	(mem:SI (match_dup 0)))]
-+  "REGNO(operands[0]) != REGNO(operands[1]) && avr32_const_ok_for_constraint_p(INTVAL(operands[2]), 'K', \"Ks16\")"
-+  [(set (match_dup 0)
-+	(plus:SI (match_dup 1)
-+		 (match_dup 2)))
-+   (set (match_dup 3)
-+	(mem:SI (plus:SI (match_dup 1)
-+			 (match_dup 2))))]
-+  "")
-+
-+;;=============================================================================
-+;; Peephole optimizing
-+;;-----------------------------------------------------------------------------
-+;; Changing
-+;;   ld.sb   r0, r7[-0x6]
-+;;   cashs.b r0
-+;; to
-+;;   ld.sb   r0, r7[-0x6]
-+;;=============================================================================
-+(define_peephole2
-+  [(set (match_operand:QI 0 "register_operand" "")
-+	(match_operand:QI 1 "load_sb_memory_operand" ""))
-+   (set (match_operand:SI 2 "register_operand" "")
-+	(sign_extend:SI (match_dup 0)))]
-+  "(REGNO(operands[0]) == REGNO(operands[2]) || peep2_reg_dead_p(2, operands[0]))"
-+  [(set (match_dup 2)
-+	(sign_extend:SI (match_dup 1)))]
-+  "")
-+
-+;;=============================================================================
-+;; Peephole optimizing
-+;;-----------------------------------------------------------------------------
-+;; Changing
-+;;   ld.ub   r0, r7[-0x6]
-+;;   cashu.b r0
-+;; to
-+;;   ld.ub   r0, r7[-0x6]
-+;;=============================================================================
-+(define_peephole2
-+  [(set (match_operand:QI 0 "register_operand" "")
-+	(match_operand:QI 1 "memory_operand" ""))
-+   (set (match_operand:SI 2 "register_operand" "")
-+	(zero_extend:SI (match_dup 0)))]
-+  "(REGNO(operands[0]) == REGNO(operands[2])) || peep2_reg_dead_p(2, operands[0])"
-+  [(set (match_dup 2)
-+	(zero_extend:SI (match_dup 1)))]
-+  "")
-+
-+;;=============================================================================
-+;; Peephole optimizing
-+;;-----------------------------------------------------------------------------
-+;; Changing
-+;;   ld.sh   r0, r7[-0x6]
-+;;   casts.h r0
-+;; to
-+;;   ld.sh   r0, r7[-0x6]
-+;;=============================================================================
-+(define_peephole2
-+  [(set (match_operand:HI 0 "register_operand" "")
-+	(match_operand:HI 1 "memory_operand" ""))
-+   (set (match_operand:SI 2 "register_operand" "")
-+	(sign_extend:SI (match_dup 0)))]
-+  "(REGNO(operands[0]) == REGNO(operands[2])) || peep2_reg_dead_p(2, operands[0])"
-+  [(set (match_dup 2)
-+	(sign_extend:SI (match_dup 1)))]
-+  "")
-+
-+;;=============================================================================
-+;; Peephole optimizing
-+;;-----------------------------------------------------------------------------
-+;; Changing
-+;;   ld.uh   r0, r7[-0x6]
-+;;   castu.h r0
-+;; to
-+;;   ld.uh   r0, r7[-0x6]
-+;;=============================================================================
-+(define_peephole2
-+  [(set (match_operand:HI 0 "register_operand" "")
-+	(match_operand:HI 1 "memory_operand" ""))
-+   (set (match_operand:SI 2 "register_operand" "")
-+	(zero_extend:SI (match_dup 0)))]
-+  "(REGNO(operands[0]) == REGNO(operands[2])) || peep2_reg_dead_p(2, operands[0])"
-+  [(set (match_dup 2)
-+	(zero_extend:SI (match_dup 1)))]
-+  "")
-+
-+;;=============================================================================
-+;; Peephole optimizing
-+;;-----------------------------------------------------------------------------
-+;; Changing
-+;;   mul     rd, rx, ry
-+;;   add     rd2, rd  
-+;; or
-+;;   add     rd2, rd, rd2  
-+;; to
-+;;   mac     rd2, rx, ry
-+;;=============================================================================
-+(define_peephole2
-+  [(set (match_operand:SI 0 "register_operand" "")
-+        (mult:SI (match_operand:SI 1 "register_operand" "")
-+                (match_operand:SI 2 "register_operand" "")))
-+   (set (match_operand:SI 3 "register_operand" "")
-+        (plus:SI (match_dup 3)
-+                 (match_dup 0)))]
-+  "peep2_reg_dead_p(2, operands[0])"
-+  [(set (match_dup 3)
-+	(plus:SI (mult:SI (match_dup 1)
-+			  (match_dup 2))
-+		 (match_dup 3)))]
-+  "")
-+
-+(define_peephole2
-+  [(set (match_operand:SI 0 "register_operand" "")
-+        (mult:SI (match_operand:SI 1 "register_operand" "")
-+                (match_operand:SI 2 "register_operand" "")))
-+   (set (match_operand:SI 3 "register_operand" "")
-+        (plus:SI (match_dup 0)
-+                 (match_dup 3)))]
-+  "peep2_reg_dead_p(2, operands[0])"
-+  [(set (match_dup 3)
-+	(plus:SI (mult:SI (match_dup 1)
-+			  (match_dup 2))
-+		 (match_dup 3)))]
-+  "")
-+
-+
-+;;=============================================================================
-+;; Peephole optimizing
-+;;-----------------------------------------------------------------------------
-+;; Changing
-+;;   bfextu  rd, rs, k5, 1 or and(h/l) rd, one_bit_set_mask
-+;; to
-+;;   bld     rs, k5
-+;;
-+;; If rd is dead after the operation.
-+;;=============================================================================
-+(define_peephole2
-+  [ (set (match_operand:SI 0 "register_operand" "")
-+         (zero_extract:SI (match_operand:SI 1 "register_operand" "")
-+                          (const_int 1)
-+                          (match_operand:SI 2 "immediate_operand" "")))
-+    (set (cc0)
-+         (match_dup 0))]
-+  "peep2_reg_dead_p(2, operands[0])"
-+  [(set (cc0)
-+        (and:SI (match_dup 1)
-+                (match_dup 2)))]
-+  "operands[2] = GEN_INT(1 << INTVAL(operands[2]));")
-+
-+(define_peephole2
-+  [ (set (match_operand:SI 0 "register_operand" "")
-+         (and:SI (match_operand:SI 1 "register_operand" "")
-+                 (match_operand:SI 2 "one_bit_set_operand" "")))
-+    (set (cc0)
-+         (match_dup 0))]
-+  "peep2_reg_dead_p(2, operands[0])"
-+  [(set (cc0)
-+        (and:SI (match_dup 1)
-+                (match_dup 2)))]
-+  "")
-+
-+;;=============================================================================
-+;; Peephole optimizing
-+;;-----------------------------------------------------------------------------
-+;; Load with extracted index: ld.w  Rd, Rb[Ri:{t/u/b/l} << 2]
-+;;
-+;;=============================================================================
-+
-+
-+(define_peephole
-+  [(set (match_operand:SI 0 "register_operand" "")
-+        (zero_extract:SI (match_operand:SI 1 "register_operand" "")
-+                         (const_int 8)
-+                         (match_operand:SI 2 "avr32_extract_shift_operand" "")))
-+   (set (match_operand:SI 3 "register_operand" "")
-+        (mem:SI (plus:SI (mult:SI (match_dup 0) (const_int 4))
-+                         (match_operand:SI 4 "register_operand" ""))))]
-+
-+  "(dead_or_set_p(insn, operands[0]))"
-+  {
-+   switch ( INTVAL(operands[2]) ){
-+    case 0:
-+         return "ld.w    %3, %4[%1:b << 2]";
-+    case 8:
-+         return "ld.w    %3, %4[%1:l << 2]";
-+    case 16:
-+         return "ld.w    %3, %4[%1:u << 2]";
-+    case 24:
-+         return "ld.w    %3, %4[%1:t << 2]";
-+    default:
-+         internal_error("illegal operand for ldxi");
-+   }
-+  }
-+  [(set_attr "type" "load")
-+   (set_attr "length" "4")
-+   (set_attr "cc" "clobber")]
-+  )
-+
-+
-+
-+(define_peephole
-+  [(set (match_operand:SI 0 "register_operand" "")
-+        (and:SI (match_operand:SI 1 "register_operand" "") (const_int 255)))
-+   (set (match_operand:SI 2 "register_operand" "")
-+        (mem:SI (plus:SI (mult:SI (match_dup 0) (const_int 4))
-+                         (match_operand:SI 3 "register_operand" ""))))]
-+
-+  "(dead_or_set_p(insn, operands[0]))"
-+
-+  "ld.w    %2, %3[%1:b << 2]"
-+  [(set_attr "type" "load")
-+   (set_attr "length" "4")
-+   (set_attr "cc" "clobber")]
-+  )
-+
-+
-+(define_peephole2
-+  [(set (match_operand:SI 0 "register_operand" "")
-+        (zero_extract:SI (match_operand:SI 1 "register_operand" "")
-+                         (const_int 8)
-+                         (match_operand:SI 2 "avr32_extract_shift_operand" "")))
-+   (set (match_operand:SI 3 "register_operand" "")
-+        (mem:SI (plus:SI (mult:SI (match_dup 0) (const_int 4))
-+                         (match_operand:SI 4 "register_operand" ""))))]
-+
-+  "(peep2_reg_dead_p(2, operands[0]))
-+   || (REGNO(operands[0]) == REGNO(operands[3]))"
-+  [(set (match_dup 3)
-+	(mem:SI (plus:SI
-+                 (match_dup 4)
-+                 (mult:SI (zero_extract:SI (match_dup 1)
-+                                           (const_int 8)
-+                                           (match_dup 2))
-+                          (const_int 4)))))]
-+  )
-+
-+(define_peephole2
-+  [(set (match_operand:SI 0 "register_operand" "")
-+        (zero_extend:SI (match_operand:QI 1 "register_operand" "")))
-+   (set (match_operand:SI 2 "register_operand" "")
-+        (mem:SI (plus:SI (mult:SI (match_dup 0) (const_int 4))
-+                         (match_operand:SI 3 "register_operand" ""))))]
-+
-+  "(peep2_reg_dead_p(2, operands[0]))
-+   || (REGNO(operands[0]) == REGNO(operands[2]))"
-+  [(set (match_dup 2)
-+	(mem:SI (plus:SI
-+                 (match_dup 3)
-+                 (mult:SI (zero_extract:SI (match_dup 1)
-+                                           (const_int 8)
-+                                           (const_int 0))
-+                          (const_int 4)))))]
-+  "operands[1] = gen_rtx_REG(SImode, REGNO(operands[1]));"
-+  )
-+
-+
-+(define_peephole2
-+  [(set (match_operand:SI 0 "register_operand" "")
-+        (and:SI (match_operand:SI 1 "register_operand" "")
-+                (const_int 255)))
-+   (set (match_operand:SI 2 "register_operand" "")
-+        (mem:SI (plus:SI (mult:SI (match_dup 0) (const_int 4))
-+                         (match_operand:SI 3 "register_operand" ""))))]
-+
-+  "(peep2_reg_dead_p(2, operands[0]))
-+   || (REGNO(operands[0]) == REGNO(operands[2]))"
-+  [(set (match_dup 2)
-+	(mem:SI (plus:SI
-+                 (match_dup 3)
-+                 (mult:SI (zero_extract:SI (match_dup 1)
-+                                           (const_int 8)
-+                                           (const_int 0))
-+                          (const_int 4)))))]
-+  ""
-+  )
-+
-+
-+
-+(define_peephole2
-+  [(set (match_operand:SI 0 "register_operand" "")
-+        (lshiftrt:SI (match_operand:SI 1 "register_operand" "")
-+                     (const_int 24)))
-+   (set (match_operand:SI 2 "register_operand" "")
-+        (mem:SI (plus:SI (mult:SI (match_dup 0) (const_int 4))
-+                         (match_operand:SI 3 "register_operand" ""))))]
-+
-+  "(peep2_reg_dead_p(2, operands[0]))
-+   || (REGNO(operands[0]) == REGNO(operands[2]))"
-+  [(set (match_dup 2)
-+	(mem:SI (plus:SI
-+                 (match_dup 3)
-+                 (mult:SI (zero_extract:SI (match_dup 1)
-+                                           (const_int 8)
-+                                           (const_int 24))
-+                          (const_int 4)))))]
-+  ""
-+  )
-+
-+
-+;;************************************************
-+;; ANDN
-+;;
-+;;************************************************
-+
-+
-+(define_peephole2
-+  [(set (match_operand:SI 0 "register_operand" "")
-+        (not:SI (match_operand:SI 1 "register_operand" "")))
-+   (set (match_operand:SI 2 "register_operand" "")
-+        (and:SI (match_dup 2)
-+                (match_dup 0)))]
-+  "peep2_reg_dead_p(2, operands[0])"
-+
-+  [(set (match_dup 2)
-+        (and:SI  (match_dup 2)
-+                 (not:SI (match_dup 1))
-+                 ))]
-+  ""
-+)
-+
-+(define_peephole2
-+  [(set (match_operand:SI 0 "register_operand" "")
-+        (not:SI (match_operand:SI 1 "register_operand" "")))
-+   (set (match_operand:SI 2 "register_operand" "")
-+        (and:SI (match_dup 0)
-+                (match_dup 2)
-+                ))]
-+  "peep2_reg_dead_p(2, operands[0])"
-+
-+  [(set (match_dup 2)
-+        (and:SI  (match_dup 2)
-+                 (not:SI (match_dup 1))
-+                 ))]
-+
-+  ""
-+)
-+
-+
-+;;=================================================================
-+;; Addabs peephole
-+;;=================================================================
-+
-+(define_peephole
-+  [(set (match_operand:SI 2 "register_operand" "=r")
-+ 	(abs:SI (match_operand:SI 1 "register_operand" "r")))
-+   (set (match_operand:SI 0 "register_operand" "=r")
-+ 	(plus:SI (match_operand:SI 3 "register_operand" "r")
-+ 		 (match_dup 2)))]
-+  "dead_or_set_p(insn, operands[2])"
-+  "addabs  %0, %3, %1"
-+  [(set_attr "length" "4")
-+   (set_attr "cc" "set_z")])
-+
-+(define_peephole
-+  [(set (match_operand:SI 2 "register_operand" "=r")
-+ 	(abs:SI (match_operand:SI 1 "register_operand" "r")))
-+   (set (match_operand:SI 0 "register_operand" "=r")
-+ 	(plus:SI (match_dup 2)
-+                 (match_operand:SI 3 "register_operand" "r")))]
-+  "dead_or_set_p(insn, operands[2])"
-+  "addabs  %0, %3, %1"
-+  [(set_attr "length" "4")
-+   (set_attr "cc" "set_z")])
-+
-+
-+;;=================================================================
-+;; Detect roundings
-+;;=================================================================
-+
-+(define_insn "*round"
-+  [(set (match_operand:SI 0 "register_operand" "+r")
-+        (ashiftrt:SI (plus:SI (match_dup 0)
-+                              (match_operand:SI 1 "immediate_operand" "i"))
-+                     (match_operand:SI 2 "immediate_operand" "i")))]
-+  "avr32_rnd_operands(operands[1], operands[2])"
-+
-+  "satrnds    %0 >> %2, 31"
-+
-+  [(set_attr "type" "alu_sat")
-+   (set_attr "length" "4")]
-+
-+  )
-+
-+
-+(define_peephole2
-+  [(set (match_operand:SI 0 "register_operand" "")
-+	(plus:SI (match_dup 0)
-+                 (match_operand:SI 1 "immediate_operand" "")))
-+   (set (match_dup 0)
-+	(ashiftrt:SI (match_dup 0)
-+                     (match_operand:SI 2 "immediate_operand" "")))]
-+  "avr32_rnd_operands(operands[1], operands[2])"
-+
-+  [(set (match_dup 0)
-+        (ashiftrt:SI (plus:SI (match_dup 0)
-+                              (match_dup 1))
-+                     (match_dup 2)))]
-+  )
-+
-+(define_peephole
-+  [(set (match_operand:SI 0 "register_operand" "r")
-+	(plus:SI (match_dup 0)
-+                 (match_operand:SI 1 "immediate_operand" "i")))
-+   (set (match_dup 0)
-+	(ashiftrt:SI (match_dup 0)
-+                     (match_operand:SI 2 "immediate_operand" "i")))]
-+  "avr32_rnd_operands(operands[1], operands[2])"
-+
-+  "satrnds    %0 >> %2, 31"
-+
-+  [(set_attr "type" "alu_sat")
-+   (set_attr "length" "4")
-+   (set_attr "cc" "clobber")]
-+
-+  )
-+
-+
-+;;=================================================================
-+;; mcall
-+;;=================================================================
-+(define_peephole
-+  [(set (match_operand:SI 0 "register_operand"        "")
-+	(match_operand 1 "avr32_const_pool_ref_operand"  ""))
-+   (parallel [(call (mem:SI (match_dup 0))
-+                    (match_operand 2 "" ""))
-+              (clobber (reg:SI LR_REGNUM))])]
-+  "dead_or_set_p(insn, operands[0])"
-+  "mcall    %1"
-+  [(set_attr "type" "call")
-+   (set_attr "length" "4")
-+   (set_attr "cc" "clobber")]
-+)
-+
-+(define_peephole
-+  [(set (match_operand:SI 2 "register_operand"        "")
-+	(match_operand 1 "avr32_const_pool_ref_operand"  ""))
-+   (parallel [(set (match_operand 0 "register_operand" "")
-+                   (call (mem:SI (match_dup 2))
-+                         (match_operand 3 "" "")))
-+              (clobber (reg:SI LR_REGNUM))])]
-+  "dead_or_set_p(insn, operands[2])"
-+  "mcall    %1"
-+  [(set_attr "type" "call")
-+   (set_attr "length" "4")
-+   (set_attr "cc" "call_set")]
-+)
-+
-+
-+(define_peephole2
-+  [(set (match_operand:SI 0 "register_operand"    "")
-+	(match_operand 1 "avr32_const_pool_ref_operand"  ""))
-+   (parallel [(call (mem:SI (match_dup 0))
-+                    (match_operand 2 "" ""))
-+              (clobber (reg:SI LR_REGNUM))])]
-+  "peep2_reg_dead_p(2, operands[0])"
-+  [(parallel [(call (mem:SI (match_dup 1))
-+                    (match_dup 2))
-+              (clobber (reg:SI LR_REGNUM))])]
-+  ""
-+)
-+
-+(define_peephole2
-+  [(set (match_operand:SI 0 "register_operand"        "")
-+	(match_operand 1 "avr32_const_pool_ref_operand"  ""))
-+   (parallel [(set (match_operand 2 "register_operand" "")
-+                   (call (mem:SI (match_dup 0))
-+                         (match_operand 3 "" "")))
-+              (clobber (reg:SI LR_REGNUM))])]
-+  "(peep2_reg_dead_p(2, operands[0]) || (REGNO(operands[2]) == REGNO(operands[0])))"
-+  [(parallel [(set (match_dup 2)
-+                   (call (mem:SI (match_dup 1))
-+                         (match_dup 3)))
-+              (clobber (reg:SI LR_REGNUM))])]
-+  ""
-+)
-+
-+;;=================================================================
-+;; Returning a value
-+;;=================================================================
-+
-+
-+(define_peephole
-+  [(set (match_operand 0 "register_operand" "")
-+        (match_operand 1 "register_operand" ""))
-+   (return)]
-+  "USE_RETURN_INSN (TRUE) && (REGNO(operands[0]) == RETVAL_REGNUM)
-+   && (REGNO(operands[1]) != LR_REGNUM)
-+   && (REGNO_REG_CLASS(REGNO(operands[1])) == GENERAL_REGS)"
-+  "retal    %1"
-+  [(set_attr "type" "call")
-+   (set_attr "length" "2")]
-+  )
-+
-+
-+(define_peephole
-+  [(set (match_operand 0 "register_operand" "r")
-+        (match_operand 1 "immediate_operand" "i"))
-+   (return)]
-+  "(USE_RETURN_INSN (FALSE) && (REGNO(operands[0]) == RETVAL_REGNUM) &&
-+   ((INTVAL(operands[1]) == -1) || (INTVAL(operands[1]) == 0) || (INTVAL(operands[1]) == 1)))"
-+  {
-+    avr32_output_return_instruction (TRUE, FALSE, NULL, operands[1]);
-+    return "";
-+  }
-+  [(set_attr "type" "call")
-+   (set_attr "length" "4")]
-+  )
-+
-+(define_peephole
-+  [(set (match_operand 0 "register_operand" "r")
-+        (match_operand 1 "immediate_operand" "i"))
-+   (unspec_volatile [(return)] VUNSPEC_EPILOGUE)]
-+  "(REGNO(operands[0]) == RETVAL_REGNUM) &&
-+   ((INTVAL(operands[1]) == -1) || (INTVAL(operands[1]) == 0) || (INTVAL(operands[1]) == 1))"
-+  {
-+    avr32_output_return_instruction (FALSE, FALSE, NULL, operands[1]);
-+    return "";
-+  }
-+  ; Length is absolute worst case
-+  [(set_attr "type" "branch")
-+   (set_attr "length" "12")]
-+  )
-+
-+(define_peephole
-+  [(set (match_operand 0 "register_operand" "=r")
-+        (if_then_else (match_operator 1 "avr32_comparison_operator"
-+                                      [(match_operand 4 "register_operand" "r")
-+                                       (match_operand 5 "register_immediate_operand" "rKs21")])
-+                      (match_operand 2 "avr32_cond_register_immediate_operand" "rKs08")
-+                      (match_operand 3 "avr32_cond_register_immediate_operand" "rKs08")))
-+   (return)]
-+  "USE_RETURN_INSN (TRUE) && (REGNO(operands[0]) == RETVAL_REGNUM)"
-+  {
-+   operands[1] = avr32_output_cmp(operands[1], GET_MODE(operands[4]), operands[4], operands[5]);
-+
-+   if ( GET_CODE(operands[2]) == REG
-+        && GET_CODE(operands[3]) == REG
-+        && REGNO(operands[2]) != LR_REGNUM
-+        && REGNO(operands[3]) != LR_REGNUM ){
-+      return "ret%1    %2\;ret%i1    %3";
-+   } else if ( GET_CODE(operands[2]) == REG
-+               && GET_CODE(operands[3]) == CONST_INT ){
-+      if ( INTVAL(operands[3]) == -1
-+           || INTVAL(operands[3]) == 0
-+           || INTVAL(operands[3]) == 1 ){
-+        return "ret%1    %2\;ret%i1    %d3";
-+      } else {
-+        return "mov%1    r12, %2\;mov%i1    r12, %3\;retal    r12";
-+      }
-+   } else if ( GET_CODE(operands[2]) == CONST_INT
-+               && GET_CODE(operands[3]) == REG ){
-+      if ( INTVAL(operands[2]) == -1
-+           || INTVAL(operands[2]) == 0
-+           || INTVAL(operands[2]) == 1 ){
-+        return "ret%1    %d2\;ret%i1    %3";
-+      } else {
-+        return "mov%1    r12, %2\;mov%i1    r12, %3\;retal    r12";
-+      }
-+   } else {
-+      if ( (INTVAL(operands[2]) == -1
-+            || INTVAL(operands[2]) == 0
-+            || INTVAL(operands[2]) == 1 )
-+           && (INTVAL(operands[3]) == -1
-+               || INTVAL(operands[3]) == 0
-+               || INTVAL(operands[3]) == 1 )){
-+        return "ret%1    %d2\;ret%i1    %d3";
-+      } else {
-+        return "mov%1    r12, %2\;mov%i1    r12, %3\;retal    r12";
-+      }
-+   }
-+  }
-+
-+  [(set_attr "length" "10")
-+   (set_attr "cc" "none")
-+   (set_attr "type" "call")])
-+  
-+
-+
-+;;=================================================================
-+;; mulnhh.w
-+;;=================================================================
-+
-+(define_peephole2
-+  [(set (match_operand:HI 0 "register_operand" "")
-+        (neg:HI (match_operand:HI 1 "register_operand" "")))
-+   (set (match_operand:SI 2 "register_operand" "")
-+        (mult:SI
-+         (sign_extend:SI (match_dup 0))
-+         (sign_extend:SI (match_operand:HI 3 "register_operand" ""))))]
-+  "(peep2_reg_dead_p(2, operands[0])) || (REGNO(operands[2]) == REGNO(operands[0]))"
-+  [ (set (match_dup 2)
-+         (mult:SI
-+          (sign_extend:SI (neg:HI (match_dup 1)))
-+          (sign_extend:SI (match_dup 3))))]
-+  ""
-+  )
-+
-+(define_peephole2
-+  [(set (match_operand:HI 0 "register_operand" "")
-+        (neg:HI (match_operand:HI 1 "register_operand" "")))
-+   (set (match_operand:SI 2 "register_operand" "")
-+        (mult:SI
-+         (sign_extend:SI (match_operand:HI 3 "register_operand" ""))
-+         (sign_extend:SI (match_dup 0))))]
-+  "(peep2_reg_dead_p(2, operands[0])) || (REGNO(operands[2]) == REGNO(operands[0]))"
-+  [ (set (match_dup 2)
-+         (mult:SI
-+          (sign_extend:SI (neg:HI (match_dup 1)))
-+          (sign_extend:SI (match_dup 3))))]
-+  ""
-+  )
-+
-+
-+
-+;;=================================================================
-+;; Vector set and extract operations
-+;;=================================================================
-+(define_insn "vec_setv2hi_hi"
-+  [(set (match_operand:V2HI 0 "register_operand" "=r")
-+        (vec_merge:V2HI
-+         (match_dup 0)
-+         (vec_duplicate:V2HI
-+          (match_operand:HI 1 "register_operand" "r"))
-+         (const_int 1)))]
-+  ""
-+  "bfins\t%0, %1, 16, 16"
-+  [(set_attr "type" "alu")
-+   (set_attr "length" "4")
-+   (set_attr "cc" "clobber")])
-+
-+(define_insn "vec_setv2hi_lo"
-+  [(set (match_operand:V2HI 0 "register_operand" "+r")
-+        (vec_merge:V2HI
-+         (match_dup 0)
-+         (vec_duplicate:V2HI
-+          (match_operand:HI 1 "register_operand" "r"))
-+         (const_int 2)))]
-+  ""
-+  "bfins\t%0, %1, 0, 16"
-+  [(set_attr "type" "alu")
-+   (set_attr "length" "4")
-+   (set_attr "cc" "clobber")])
-+
-+(define_expand "vec_setv2hi"
-+  [(set (match_operand:V2HI 0 "register_operand" "")
-+        (vec_merge:V2HI
-+         (match_dup 0)
-+         (vec_duplicate:V2HI
-+          (match_operand:HI 1 "register_operand" ""))
-+         (match_operand 2 "immediate_operand" "")))]
-+  ""
-+  { operands[2] = GEN_INT(INTVAL(operands[2]) + 1); }
-+  )
-+
-+(define_insn "vec_extractv2hi"
-+  [(set (match_operand:HI 0 "register_operand" "=r")
-+        (vec_select:HI
-+         (match_operand:V2HI 1 "register_operand" "r")
-+         (parallel [(match_operand:SI 2 "immediate_operand" "i")])))]
-+  ""
-+  {
-+   if ( INTVAL(operands[2]) == 0 )
-+      return "bfextu\t%0, %1, 16, 16";
-+   else
-+      return "bfextu\t%0, %1, 0, 16";
-+  }
-+  [(set_attr "type" "alu")
-+   (set_attr "length" "4")
-+   (set_attr "cc" "clobber")])
-+
-+(define_insn "vec_extractv4qi"
-+  [(set (match_operand:QI 0 "register_operand" "=r")
-+        (vec_select:QI
-+         (match_operand:V4QI 1 "register_operand" "r")
-+         (parallel [(match_operand:SI 2 "immediate_operand" "i")])))]
-+  ""
-+  {
-+   switch ( INTVAL(operands[2]) ){
-+     case 0:
-+       return "bfextu\t%0, %1, 24, 8";
-+     case 1:
-+       return "bfextu\t%0, %1, 16, 8";
-+     case 2:
-+       return "bfextu\t%0, %1, 8, 8";
-+     case 3:
-+       return "bfextu\t%0, %1, 0, 8";
-+     default:
-+       abort();
-+   }
-+  }
-+  [(set_attr "type" "alu")
-+   (set_attr "length" "4")
-+   (set_attr "cc" "clobber")])
-+
-+
-+(define_insn "concatv2hi"
-+  [(set (match_operand:V2HI 0 "register_operand" "=r, r, r")
-+        (vec_concat:V2HI
-+         (match_operand:HI 1 "register_operand" "r, r, 0")
-+         (match_operand:HI 2 "register_operand" "r, 0, r")))]
-+  ""
-+  "@
-+   mov\t%0, %1\;bfins\t%0, %2, 0, 16
-+   bfins\t%0, %2, 0, 16
-+   bfins\t%0, %1, 16, 16"
-+  [(set_attr "length" "6, 4, 4")
-+   (set_attr "type" "alu")])
-+
-+
-+;; Load the atomic operation description
-+(include "sync.md")
-+
-+;; Load the SIMD description
-+(include "simd.md")
-+
-+;; Include the FPU for uc3
-+(include "uc3fpu.md")
-diff -Nur gcc-4.4.6.orig/gcc/config/avr32/avr32.opt gcc-4.4.6/gcc/config/avr32/avr32.opt
---- gcc-4.4.6.orig/gcc/config/avr32/avr32.opt	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.4.6/gcc/config/avr32/avr32.opt	2011-10-22 19:23:08.524581303 +0200
-@@ -0,0 +1,93 @@
-+; Options for the ATMEL AVR32 port of the compiler.
-+
-+; Copyright 2007 Atmel Corporation.
-+;
-+; This file is part of GCC.
-+;
-+; GCC is free software; you can redistribute it and/or modify it under
-+; the terms of the GNU General Public License as published by the Free
-+; Software Foundation; either version 2, or (at your option) any later
-+; version.
-+;
-+; GCC is distributed in the hope that it will be useful, but WITHOUT ANY
-+; WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+; FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-+; for more details.
-+;
-+; You should have received a copy of the GNU General Public License
-+; along with GCC; see the file COPYING.  If not, write to the Free
-+; Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-+; 02110-1301, USA.
-+
-+muse-rodata-section
-+Target Report Mask(USE_RODATA_SECTION)
-+Use section .rodata for read-only data instead of .text.
-+
-+mhard-float
-+Target Report Mask(HARD_FLOAT)
-+Use FPU instructions instead of floating point emulation.
-+
-+msoft-float
-+Target Report InverseMask(HARD_FLOAT, SOFT_FLOAT)
-+Use floating point emulation for floating point operations.
-+
-+mforce-double-align
-+Target Report RejectNegative Mask(FORCE_DOUBLE_ALIGN)
-+Force double-word alignment for double-word memory accesses.
-+
-+mno-init-got
-+Target Report RejectNegative Mask(NO_INIT_GOT)
-+Do not initialize GOT register before using it when compiling PIC code.
-+
-+mrelax
-+Target Report Mask(RELAX)
-+Let invoked assembler and linker do relaxing (Enabled by default when optimization level is >1).
-+
-+mmd-reorg-opt
-+Target Report Undocumented Mask(MD_REORG_OPTIMIZATION)
-+Perform machine dependent optimizations in reorg stage.
-+
-+masm-addr-pseudos
-+Target Report Mask(HAS_ASM_ADDR_PSEUDOS) 
-+Use assembler pseudo-instructions lda.w and call for handling direct addresses. (Enabled by default)
-+
-+mpart=
-+Target Report RejectNegative Joined Var(avr32_part_name)
-+Specify the AVR32 part name
-+
-+mcpu=
-+Target Report RejectNegative Joined Undocumented Var(avr32_part_name)
-+Specify the AVR32 part name (deprecated)
-+
-+march=
-+Target Report RejectNegative Joined Var(avr32_arch_name)
-+Specify the AVR32 architecture name
-+
-+mfast-float
-+Target Report Mask(FAST_FLOAT)
-+Enable fast floating-point library. Enabled by default if the -funsafe-math-optimizations switch is specified.
-+
-+mimm-in-const-pool
-+Target Report Var(avr32_imm_in_const_pool) Init(-1)
-+Put large immediates in constant pool. This is enabled by default for archs with insn-cache.
-+
-+mno-pic
-+Target Report RejectNegative Mask(NO_PIC)
-+Do not generate position-independent code. (deprecated, use -fno-pic instead)
-+
-+mcond-exec-before-reload
-+Target Report Undocumented Mask(COND_EXEC_BEFORE_RELOAD) 
-+Enable experimental conditional execution preparation before the reload stage. 
-+
-+mrmw-addressable-data
-+Target Report Mask(RMW_ADDRESSABLE_DATA)
-+Signal that all data is in range for the Atomic Read-Modify-Write memory instructions, and that
-+gcc can safely generate these whenever possible. 
-+
-+mflashvault
-+Target Var(TARGET_FLASHVAULT)
-+Generate code for flashvault
-+
-+mlist-devices
-+Target RejectNegative Var(avr32_list_supported_parts)
-+Print the list of parts supported while printing --target-help.
-diff -Nur gcc-4.4.6.orig/gcc/config/avr32/crti.asm gcc-4.4.6/gcc/config/avr32/crti.asm
---- gcc-4.4.6.orig/gcc/config/avr32/crti.asm	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.4.6/gcc/config/avr32/crti.asm	2011-10-22 19:23:08.524581303 +0200
-@@ -0,0 +1,64 @@
-+/*
-+   Init/fini stuff for AVR32.
-+   Copyright 2003-2006 Atmel Corporation.
-+
-+   Written by Ronny Pedersen, Atmel Norway, <rpedersen@atmel.com>
-+
-+   This file is part of GCC.
-+
-+   This program is free software; you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; either version 2 of the License, or
-+   (at your option) any later version.
-+
-+   This program is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with this program; if not, write to the Free Software
-+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-+
-+	
-+/* The code in sections .init and .fini is supposed to be a single
-+   regular function.  The function in .init is called directly from
-+   start in crt1.asm.  The function in .fini is atexit()ed in crt1.asm
-+   too.
-+
-+   crti.asm contributes the prologue of a function to these sections,
-+   and crtn.asm comes up the epilogue.  STARTFILE_SPEC should list
-+   crti.o before any other object files that might add code to .init
-+   or .fini sections, and ENDFILE_SPEC should list crtn.o after any
-+   such object files.  */
-+		
-+	.file		"crti.asm"
-+
-+	.section	".init"
-+/* Just load the GOT */
-+	.align 2
-+	.global	_init
-+_init:
-+	stm	--sp, r6, lr
-+	lddpc	r6, 1f		
-+0:	
-+	rsub	r6, pc
-+	rjmp	2f
-+	.align	2
-+1:	.long	0b - _GLOBAL_OFFSET_TABLE_		
-+2:	
-+				
-+	.section	".fini"
-+/* Just load the GOT */
-+	.align	2
-+	.global	_fini
-+_fini:
-+	stm	--sp, r6, lr
-+	lddpc	r6, 1f		
-+0:	
-+	rsub	r6, pc
-+	rjmp	2f
-+	.align	2
-+1:	.long	0b - _GLOBAL_OFFSET_TABLE_		
-+2:	
-+
-diff -Nur gcc-4.4.6.orig/gcc/config/avr32/crtn.asm gcc-4.4.6/gcc/config/avr32/crtn.asm
---- gcc-4.4.6.orig/gcc/config/avr32/crtn.asm	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.4.6/gcc/config/avr32/crtn.asm	2011-10-22 19:23:08.524581303 +0200
-@@ -0,0 +1,44 @@
-+/*   Copyright (C) 2001 Free Software Foundation, Inc.
-+    Written By Nick Clifton
-+
-+  This file is free software; you can redistribute it and/or modify it
-+  under the terms of the GNU General Public License as published by the
-+  Free Software Foundation; either version 2, or (at your option) any
-+  later version.
-+
-+  In addition to the permissions in the GNU General Public License, the
-+  Free Software Foundation gives you unlimited permission to link the
-+  compiled version of this file with other programs, and to distribute
-+  those programs without any restriction coming from the use of this
-+  file.  (The General Public License restrictions do apply in other
-+  respects; for example, they cover modification of the file, and
-+  distribution when not linked into another program.)
-+
-+  This file is distributed in the hope that it will be useful, but
-+  WITHOUT ANY WARRANTY; without even the implied warranty of
-+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+  General Public License for more details.
-+
-+  You should have received a copy of the GNU General Public License
-+  along with this program; see the file COPYING.  If not, write to
-+  the Free Software Foundation, 59 Temple Place - Suite 330,
-+  Boston, MA 02111-1307, USA.
-+
-+     As a special exception, if you link this library with files
-+     compiled with GCC to produce an executable, this does not cause
-+     the resulting executable to be covered by the GNU General Public License.
-+     This exception does not however invalidate any other reasons why
-+     the executable file might be covered by the GNU General Public License.
-+*/
-+
-+
-+
-+	
-+	.file		"crtn.asm"
-+
-+	.section	".init"
-+	ldm	sp++, r6, pc
-+			
-+	.section	".fini"
-+	ldm	sp++, r6, pc
-+		
-diff -Nur gcc-4.4.6.orig/gcc/config/avr32/lib1funcs.S gcc-4.4.6/gcc/config/avr32/lib1funcs.S
---- gcc-4.4.6.orig/gcc/config/avr32/lib1funcs.S	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.4.6/gcc/config/avr32/lib1funcs.S	2011-10-22 19:23:08.524581303 +0200
-@@ -0,0 +1,2902 @@
-+/* Macro for moving immediate value to register. */	
-+.macro mov_imm	reg, imm
-+.if	(((\imm & 0xfffff) == \imm) || ((\imm | 0xfff00000) == \imm))
-+	mov	\reg, \imm
-+#if __AVR32_UC__ >= 2
-+.elseif	((\imm & 0xffff) == 0)
-+	movh	\reg, hi(\imm)
-+
-+#endif
-+.else
-+	mov	\reg, lo(\imm)
-+	orh	\reg, hi(\imm)
-+.endif
-+.endm
-+	
-+	
-+	 
-+/* Adjust the unpacked double number if it is a subnormal number.
-+   The exponent and mantissa pair are stored
-+   in [mant_hi,mant_lo] and [exp]. A register with the correct sign bit in
-+   the MSB is passed in [sign]. Needs two scratch
-+   registers [scratch1] and [scratch2]. An adjusted and packed double float
-+   is present in [mant_hi,mant_lo] after macro has executed */
-+.macro  adjust_subnormal_df     exp, mant_lo, mant_hi, sign, scratch1, scratch2 
-+        /* We have an exponent which is <=0 indicating a subnormal number
-+           As it should be stored as if the exponent was 1 (although the
-+           exponent field is all zeros to indicate a subnormal number)
-+           we have to shift down the mantissa to its correct position. */
-+        neg     \exp
-+        sub     \exp,-1                   /* amount to shift down */
-+        cp.w    \exp,54
-+        brlo    50f                     /* if more than 53 shift steps, the
-+                                           entire mantissa will disappear
-+                                           without any rounding to occur */
-+        mov     \mant_hi, 0
-+        mov     \mant_lo, 0
-+        rjmp    52f
-+50:     
-+        sub     \exp,-10                /* do the shift to position the
-+                                           mantissa at the same time
-+                                           note! this does not include the
-+                                           final 1 step shift to add the sign */
-+ 
-+        /* when shifting, save all shifted out bits in [scratch2]. we may need to
-+           look at them to make correct rounding. */
-+ 
-+        rsub    \scratch1,\exp,32       /* get inverted shift count */
-+        cp.w    \exp,32                 /* handle shifts >= 32 separately */
-+        brhs    51f
-+ 
-+        /* small (<32) shift amount, both words are part of the shift */
-+        lsl     \scratch2,\mant_lo,\scratch1               /* save bits to shift out from lsw*/
-+        lsl     \scratch1,\mant_hi,\scratch1               /* get bits from msw destined for lsw*/
-+        lsr     \mant_lo,\mant_lo,\exp                     /* shift down lsw */
-+        lsr     \mant_hi,\mant_hi,\exp                     /* shift down msw */
-+        or      \mant_hi,\scratch1                         /* add bits from msw with prepared lsw */
-+        rjmp    50f
-+ 
-+        /* large (>=32) shift amount, only lsw will have bits left after shift.
-+           note that shift operations will use ((shift count) mod 32) so
-+           we do not need to subtract 32 from shift count. */
-+51:
-+        lsl     \scratch2,\mant_hi,\scratch1               /* save bits to shift out from msw */
-+        or      \scratch2,\mant_lo                         /* also save all bits from lsw */
-+        mov     \mant_lo,\mant_hi                          /* msw -> lsw (i.e. "shift 32 first") */
-+        mov     \mant_hi,0                                 /* clear msw */
-+        lsr     \mant_lo,\mant_lo,\exp                     /* make rest of shift inside lsw */
-+ 
-+50:
-+        /* result is almost ready to return, except that least significant bit
-+           and the part we already shifted out may cause the result to be
-+           rounded */
-+        bld     \mant_lo,0                   /* get bit to be shifted out */
-+        brcc    51f                          /* if bit was 0, no rounding */
-+ 
-+        /* msb of part to remove is 1, so rounding depends on rest of bits */
-+        tst     \scratch2,\scratch2                   /* get shifted out tail */
-+        brne    50f     /* if rest > 0, do round */
-+        bld     \mant_lo,1                   /* we have to look at lsb in result */
-+        brcc    51f   /* if lsb is 0, don't round */
-+ 
-+50:
-+        /* subnormal result requires rounding
-+           rounding may cause subnormal to become smallest normal number
-+           luckily, smallest normal number has exactly the representation
-+           we got by rippling a one bit up from mantissa into exponent field. */
-+        sub     \mant_lo,-1
-+        subcc   \mant_hi,-1
-+ 
-+51:
-+        /* shift and return packed double with correct sign */
-+        rol     \sign
-+        ror     \mant_hi
-+        ror     \mant_lo        
-+52:     
-+.endm
-+ 
-+ 
-+/* Adjust subnormal single float number with exponent [exp]
-+   and mantissa [mant] and round.    */
-+.macro  adjust_subnormal_sf     sf, exp, mant, sign, scratch
-+        /* subnormal number */
-+        rsub    \exp,\exp, 1            /* shift amount */
-+        cp.w    \exp, 25
-+        movhs   \mant, 0                
-+        brhs    90f                     /* Return zero */
-+        rsub    \scratch, \exp, 32
-+        lsl     \scratch, \mant,\scratch/* Check if there are any bits set
-+                                           in the bits discarded in the mantissa */
-+        srne    \scratch                /* If so set the lsb of the shifted mantissa */ 
-+        lsr     \mant,\mant,\exp        /* Shift the mantissa */
-+        or      \mant, \scratch         /* Round lsb if any bits were shifted out  */
-+        /* Rounding :   For explaination, see round_sf. */
-+        mov     \scratch, 0x7f          /* Set rounding constant */
-+        bld     \mant, 8                
-+        subeq   \scratch, -1            /* For odd numbers use rounding constant 0x80 */
-+        add     \mant, \scratch         /* Add rounding constant to mantissa */
-+        /* We can't overflow because mantissa is at least shifted one position
-+           to the right so the implicit bit is zero. We can however get the implicit
-+           bit set after rounding which means that we have the lowest normal number
-+           but this is ok since this bit has the same position as the LSB of the
-+           exponent */
-+        lsr     \sf, \mant, 7
-+        /* Rotate in sign */
-+        lsl     \sign, 1
-+        ror     \sf
-+90:     
-+.endm
-+ 
-+ 
-+/* Round the unpacked df number with exponent [exp] and
-+   mantissa [mant_hi, mant_lo]. Uses scratch register
-+   [scratch] */
-+.macro  round_df        exp, mant_lo, mant_hi, scratch
-+        mov     \scratch, 0x3ff         /* Rounding constant */
-+        bld     \mant_lo,11             /* Check if lsb in the final result is  
-+                                           set */
-+        subeq   \scratch, -1            /* Adjust rounding constant to 0x400
-+                                           if rounding 0.5 upwards */   
-+        add     \mant_lo, \scratch      /* Round */
-+        acr     \mant_hi                /* If overflowing we know that
-+                                           we have all zeros in the bits not
-+                                           scaled out so we can leave them
-+                                           but we must increase the exponent with
-+                                           two since we had an implicit bit
-+                                           which is lost + the extra overflow bit */
-+        subcs   \exp, -2                /* Update exponent */
-+.endm           
-+ 
-+/* Round single float number stored in [mant] and [exp] */
-+.macro  round_sf        exp, mant, scratch
-+        /* Round:       
-+                For 0.5 we round to nearest even integer
-+                for all other cases we round to nearest integer.
-+                This means that if the digit left of the "point" (.)
-+                is 1 we can add 0x80 to the mantissa since the
-+                corner case 0x180 will round up to 0x200. If the
-+                digit left of the "point" is 0 we will have to
-+                add 0x7f since this will give 0xff and hence a
-+                truncation/rounding downwards for the corner
-+                case when the 9 lowest bits are 0x080 */
-+        mov     \scratch, 0x7f  /* Set rounding constant */
-+        /* Check if the mantissa is even or odd */
-+        bld     \mant, 8
-+        subeq   \scratch, -1    /* Rounding constant should be 0x80 */
-+        add     \mant, \scratch
-+        subcs   \exp, -2        /* Adjust exponent if we overflowed */          
-+.endm
-+ 
-+                 
-+ 
-+/* Pack a single float number stored in [mant] and [exp]
-+   into a single float number in [sf]  */
-+.macro  pack_sf sf, exp, mant
-+        bld     \mant,31                  /* implicit bit to z */
-+        subne   \exp,1                   /* if subnormal (implicit bit 0)
-+                                          adjust exponent to storage format */
-+        
-+        lsr     \sf, \mant, 7
-+        bfins   \sf, \exp, 24, 8
-+.endm   
-+ 
-+/* Pack exponent [exp] and mantissa [mant_hi, mant_lo]
-+   into [df_hi, df_lo].  [df_hi] is shifted
-+   one bit up so the sign bit can be shifted into it */
-+        
-+.macro  pack_df         exp, mant_lo, mant_hi, df_lo, df_hi
-+        bld     \mant_hi,31                  /* implicit bit to z */
-+        subne   \exp,1                   /* if subnormal (implicit bit 0)
-+                                          adjust exponent to storage format */
-+ 
-+        lsr     \mant_lo,11                  /* shift back lsw */
-+        or      \df_lo,\mant_lo,\mant_hi<<21          /* combine with low bits from msw */
-+        lsl     \mant_hi,1                   /* get rid of implicit bit */
-+        lsr     \mant_hi,11                  /* shift back msw except for one step*/
-+        or      \df_hi,\mant_hi,\exp<<21          /* combine msw with exponent */
-+.endm
-+ 
-+/* Normalize single float number stored in [mant] and [exp]
-+   using scratch register [scratch] */
-+.macro  normalize_sf    exp, mant, scratch
-+        /* Adjust exponent and mantissa */
-+        clz     \scratch, \mant
-+        sub     \exp, \scratch
-+        lsl     \mant, \mant, \scratch
-+.endm
-+ 
-+/* Normalize the exponent and mantissa pair stored
-+   in [mant_hi,mant_lo] and [exp]. Needs two scratch
-+   registers [scratch1] and [scratch2]. */
-+.macro  normalize_df            exp, mant_lo, mant_hi, scratch1, scratch2
-+        clz     \scratch1,\mant_hi     /* Check if we have zeros in high bits */
-+        breq    80f                     /* No need for scaling if no zeros in high bits */
-+        brcs    81f                     /* Check for all zeros */           
-+ 
-+        /* shift amount is smaller than 32, and involves both msw and lsw*/
-+        rsub    \scratch2,\scratch1,32  /* shift mantissa */
-+        lsl     \mant_hi,\mant_hi,\scratch1
-+        lsr     \scratch2,\mant_lo,\scratch2
-+        or      \mant_hi,\scratch2
-+        lsl     \mant_lo,\mant_lo,\scratch1
-+        sub     \exp,\scratch1          /* adjust exponent */
-+        rjmp    80f                     /* Finished */  
-+81:
-+        /* shift amount is greater than 32 */
-+        clz     \scratch1,\mant_lo      /* shift mantissa */
-+        movcs   \scratch1, 0
-+        subcc   \scratch1,-32
-+        lsl     \mant_hi,\mant_lo,\scratch1
-+        mov     \mant_lo,0
-+        sub     \exp,\scratch1          /* adjust exponent */
-+80:     
-+.endm
-+        
-+ 
-+/* Fast but approximate multiply of two 64-bit numbers to give a 64 bit result.
-+   The multiplication of [al]x[bl] is discarded.
-+   Operands in [ah], [al], [bh], [bl].
-+   Scratch registers in [sh], [sl].
-+   Returns results in registers [rh], [rl].*/
-+.macro  mul_approx_df   ah, al, bh, bl, rh, rl, sh, sl
-+        mulu.d  \sl, \ah, \bl
-+        macu.d  \sl, \al, \bh
-+        mulu.d  \rl, \ah, \bh
-+        add     \rl, \sh
-+        acr     \rh
-+.endm           
-+ 
-+ 
-+        
-+#if defined(L_avr32_f64_mul) || defined(L_avr32_f64_mul_fast)
-+        .align  2
-+#if defined(L_avr32_f64_mul)
-+        .global __avr32_f64_mul
-+        .type  __avr32_f64_mul,@function
-+__avr32_f64_mul:
-+#else 
-+        .global __avr32_f64_mul_fast
-+        .type  __avr32_f64_mul_fast,@function
-+__avr32_f64_mul_fast:
-+#endif                
-+        or      r12, r10, r11 << 1 
-+        breq   __avr32_f64_mul_op1_zero        
-+
-+#if defined(L_avr32_f64_mul)
-+	pushm	r4-r7, lr
-+#else
-+        stm     --sp, r5,r6,r7,lr       
-+#endif
-+
-+#define AVR32_F64_MUL_OP1_INT_BITS 1
-+#define AVR32_F64_MUL_OP2_INT_BITS 10
-+#define AVR32_F64_MUL_RES_INT_BITS 11
-+	
-+        /* op1 in {r11,r10}*/
-+        /* op2 in {r9,r8}*/
-+        eor     lr, r11, r9             /* MSB(lr) = Sign(op1) ^ Sign(op2) */
-+ 
-+        /* Unpack op1 to 1.63 format*/        
-+        /* exp: r7 */
-+        /* sf:  r11, r10 */
-+	bfextu	r7, r11, 20, 11 /* Extract exponent */
-+
-+	mov	r5, 1
-+
-+        /* Check if normalization is needed */
-+        breq    __avr32_f64_mul_op1_subnormal /*If number is subnormal, normalize it */ 
-+
-+        lsl     r11, (12-AVR32_F64_MUL_OP1_INT_BITS-1) /* Extract mantissa, leave room for implicit bit */ 
-+        or      r11, r11, r10>>(32-(12-AVR32_F64_MUL_OP1_INT_BITS-1))
-+        lsl     r10, (12-AVR32_F64_MUL_OP1_INT_BITS-1)
-+	bfins	r11, r5, 32 - (1 + AVR32_F64_MUL_OP1_INT_BITS), 1 + AVR32_F64_MUL_OP1_INT_BITS /* Insert implicit bit */
-+
-+
-+22:     
-+        /* Unpack op2 to 10.54 format */
-+        /* exp: r6 */
-+        /* sf:  r9, r8 */
-+	bfextu	r6, r9, 20, 11 /* Extract exponent */
-+
-+        /* Check if normalization is needed */
-+        breq    __avr32_f64_mul_op2_subnormal /*If number is subnormal, normalize it */ 
-+
-+	lsl	r8, 1 /* Extract mantissa, leave room for implicit bit */
-+	rol	r9	
-+	bfins	r9, r5, 32 - (1 + AVR32_F64_MUL_OP2_INT_BITS), 1 + AVR32_F64_MUL_OP2_INT_BITS /* Insert implicit bit */
-+
-+23:     
-+ 
-+        /* Check if any operands are NaN or INF */
-+        cp      r7, 0x7ff
-+        breq    __avr32_f64_mul_op_nan_or_inf /* Check op1 for NaN or Inf */
-+        cp      r6, 0x7ff
-+        breq    __avr32_f64_mul_op_nan_or_inf  /* Check op2 for NaN or Inf */
-+ 
-+ 
-+        /* Calculate new exponent in r12*/
-+        add     r12, r7, r6
-+        sub     r12, (1023-1)
-+ 
-+#if defined(L_avr32_f64_mul)
-+	/* Do the multiplication.
-+           Place result in [r11, r10, r7, r6]. The result is in 11.117 format.  */
-+        mulu.d  r4, r11, r8
-+        macu.d  r4, r10, r9
-+        mulu.d  r6, r10, r8
-+        mulu.d  r10, r11, r9
-+	add	r7, r4
-+	adc	r10, r10, r5	
-+	acr	r11
-+#else
-+	/* Do the multiplication using approximate calculation. discard the al x bl
-+	   calculation.
-+           Place result in [r11, r10, r7]. The result is in 11.85 format.  */
-+
-+        /* Do the multiplication using approximate calculation.
-+         Place result in r11, r10. Use r7, r6 as scratch registers */
-+        mulu.d  r6, r11, r8
-+        macu.d  r6, r10, r9
-+        mulu.d  r10, r11, r9
-+        add     r10, r7
-+        acr     r11
-+#endif 
-+        /* Adjust exponent and mantissa */
-+        /* [r12]:exp, [r11, r10]:mant [r7, r6]:sticky bits */
-+        /* Mantissa may be of the format 00000000000.0xxx or 00000000000.1xxx. */
-+        /* In the first case, shift one pos to left.*/
-+        bld     r11, 32-AVR32_F64_MUL_RES_INT_BITS-1
-+	breq	0f	
-+	lsl	r7, 1
-+	rol	r10
-+	rol	r11
-+	sub	r12, 1
-+0:	
-+        cp      r12, 0  
-+        brle    __avr32_f64_mul_res_subnormal /*Result was subnormal.*/
-+ 
-+        /* Check for Inf. */
-+        cp.w    r12, 0x7ff
-+        brge    __avr32_f64_mul_res_inf
-+
-+	/* Insert exponent. */
-+	bfins	r11, r12, 20, 11  
-+
-+        /* Result was not subnormal. Perform rounding. */
-+        /* For the fast version we discard the sticky bits and always round
-+	   the halfwaycase up. */
-+24:	
-+#if defined(L_avr32_f64_mul)
-+	or	r6, r6, r10 << 31 /* Or in parity bit into stickybits */
-+	or	r7, r7, r6 >> 1   /* Or together sticky and still make the msb 
-+				     of r7 represent the halfway bit. */
-+	eorh	r7, 0x8000	  /* Toggle halfway bit. */
-+	/* We should now round up by adding one for the following cases:
-+
-+		halfway   sticky|parity  round-up
-+		   0            x           no
-+		   1            0           no
-+	           1            1           yes
-+
-+	   Since we have inverted the halfway bit we can use the satu instruction
-+           by saturating to 1 bit to implement this. 
-+	*/ 
-+	satu	r7 >> 0, 1
-+#else
-+	lsr	r7, 31
-+#endif	
-+	add	r10, r7
-+	acr	r11	
-+        
-+        /* Insert sign bit*/
-+        bld     lr, 31
-+        bst     r11, 31
-+        
-+        /* Return result in [r11,r10] */
-+#if defined(L_avr32_f64_mul)
-+	popm	r4-r7, pc
-+#else
-+        ldm     sp++, r5, r6, r7,pc
-+#endif
-+ 
-+ 
-+__avr32_f64_mul_op1_subnormal:
-+	andh	r11, 0x000f /* Remove sign bit and exponent */
-+        clz     r12, r10    /* Count leading zeros in lsw */
-+        clz     r6, r11     /* Count leading zeros in msw */
-+        subcs	r12, -32 + AVR32_F64_MUL_OP1_INT_BITS 
-+	movcs	r6, r12
-+	subcc	r6, AVR32_F64_MUL_OP1_INT_BITS
-+	cp.w	r6, 32
-+	brge	0f
-+		
-+        /* shifting involves both msw and lsw*/
-+        rsub    r12, r6, 32  /* shift mantissa */
-+        lsl     r11, r11, r6
-+        lsr     r12, r10, r12
-+        or      r11, r12
-+        lsl     r10, r10, r6
-+	sub	r6, 12-AVR32_F64_MUL_OP1_INT_BITS
-+        sub     r7, r6          /* adjust exponent */
-+        rjmp    22b             /* Finished */  
-+0:
-+        /* msw is zero so only need to consider lsw */
-+        lsl     r11, r10, r6
-+	breq	__avr32_f64_mul_res_zero
-+        mov     r10, 0
-+	sub	r6, 12-AVR32_F64_MUL_OP1_INT_BITS
-+        sub     r7, r6            /* adjust exponent */
-+        rjmp    22b
-+
-+ 
-+__avr32_f64_mul_op2_subnormal:
-+	andh	r9, 0x000f  /* Remove sign bit and exponent */
-+        clz     r12, r8    /* Count leading zeros in lsw */
-+        clz     r5, r9     /* Count leading zeros in msw */
-+        subcs	r12, -32 + AVR32_F64_MUL_OP2_INT_BITS 
-+	movcs	r5, r12
-+	subcc	r5, AVR32_F64_MUL_OP2_INT_BITS
-+	cp.w	r5, 32
-+	brge	0f
-+		
-+        /* shifting involves both msw and lsw*/
-+        rsub    r12, r5, 32  /* shift mantissa */
-+        lsl     r9, r9, r5
-+        lsr     r12, r8, r12
-+        or      r9, r12
-+        lsl     r8, r8, r5
-+	sub	r5, 12 - AVR32_F64_MUL_OP2_INT_BITS
-+        sub     r6, r5          /* adjust exponent */
-+        rjmp    23b             /* Finished */  
-+0:
-+        /* msw is zero so only need to consider lsw */
-+        lsl     r9, r8, r5
-+	breq	__avr32_f64_mul_res_zero
-+        mov     r8, 0
-+	sub	r5, 12 - AVR32_F64_MUL_OP2_INT_BITS
-+        sub     r6, r5            /* adjust exponent */
-+        rjmp    23b
-+                
-+ 
-+__avr32_f64_mul_op_nan_or_inf:
-+        /* Same code for OP1 and OP2*/
-+        /* Since we are here, at least one of the OPs were NaN or INF*/
-+	andh	r9, 0x000f  /* Remove sign bit and exponent */
-+	andh	r11, 0x000f  /* Remove sign bit and exponent */
-+        /* Merge the regs in each operand to check for zero*/
-+        or      r11, r10 /* op1 */
-+        or      r9, r8 /* op2 */
-+        /* Check if op1 is NaN or INF */
-+        cp      r7, 0x7ff
-+        brne    __avr32_f64_mul_op1_not_naninf
-+        /* op1 was NaN or INF.*/
-+        cp      r11, 0
-+        brne    __avr32_f64_mul_res_nan /* op1 was NaN. Result will be NaN*/
-+        /*op1 was INF. check if op2 is NaN or INF*/
-+        cp      r6, 0x7ff
-+        brne    __avr32_f64_mul_res_inf /*op1 was INF, op2 was neither NaN nor INF*/
-+        /* op1 is INF, op2 is either NaN or INF*/
-+        cp      r9, 0
-+        breq    __avr32_f64_mul_res_inf /*op2 was also INF*/
-+        rjmp    __avr32_f64_mul_res_nan /*op2 was NaN*/
-+ 
-+__avr32_f64_mul_op1_not_naninf:
-+        /* op1 was not NaN nor INF. Then op2 must be NaN or INF*/
-+        cp      r9, 0
-+        breq    __avr32_f64_mul_res_inf /*op2 was INF, return INF*/
-+        rjmp   __avr32_f64_mul_res_nan /*else return NaN*/
-+        
-+__avr32_f64_mul_res_subnormal:/* Multiply result was subnormal. */
-+#if defined(L_avr32_f64_mul)
-+	/* Check how much we must scale down the mantissa. */
-+	neg	r12
-+	sub	r12, -1     /* We do no longer have an implicit bit. */
-+	satu	r12 >> 0, 6 /* Saturate shift amount to max 63. */
-+	cp.w	r12, 32
-+	brge	0f
-+	/* Shift amount <32 */
-+	rsub	r8, r12, 32
-+	or	r6, r7 
-+	lsr	r7, r7, r12
-+	lsl	r9, r10, r8
-+	or	r7, r9
-+	lsr	r10, r10, r12
-+	lsl	r9, r11, r8
-+	or	r10, r9
-+	lsr	r11, r11, r12
-+	rjmp	24b
-+0:
-+	/* Shift amount >=32 */
-+	rsub	r8, r12, 32
-+	moveq	r9, 0
-+	breq	0f
-+	lsl	r9, r11, r8
-+0:	
-+	or	r6, r7
-+	or	r6, r6, r10 << 1 
-+	lsr	r10, r10, r12
-+	or	r7, r9, r10
-+	lsr	r10, r11, r12
-+	mov	r11, 0	
-+	rjmp	24b				
-+#else
-+	/* Flush to zero for the fast version. */
-+        mov     r11, lr /*Get correct sign*/
-+        andh    r11, 0x8000, COH
-+        mov     r10, 0
-+        ldm     sp++, r5, r6, r7,pc
-+#endif
-+
-+__avr32_f64_mul_res_zero:/* Multiply result is zero. */
-+        mov     r11, lr /*Get correct sign*/
-+        andh    r11, 0x8000, COH
-+        mov     r10, 0
-+#if defined(L_avr32_f64_mul)
-+	popm	r4-r7, pc
-+#else
-+        ldm     sp++, r5, r6, r7,pc
-+#endif
-+ 
-+__avr32_f64_mul_res_nan:        /* Return NaN. */
-+        mov     r11, -1
-+        mov     r10, -1
-+#if defined(L_avr32_f64_mul)
-+	popm	r4-r7, pc
-+#else
-+        ldm     sp++, r5, r6, r7,pc
-+#endif
-+        
-+__avr32_f64_mul_res_inf:        /* Return INF. */
-+	mov	r11, 0xfff00000
-+        bld     lr, 31
-+        bst     r11, 31
-+        mov     r10, 0
-+#if defined(L_avr32_f64_mul)
-+	popm	r4-r7, pc
-+#else
-+        ldm     sp++, r5, r6, r7,pc
-+#endif
-+
-+__avr32_f64_mul_op1_zero:
-+        /* Get sign */
-+        eor     r11, r11, r9
-+        andh    r11, 0x8000, COH  
-+        /* Check if op2 is Inf or NaN. */
-+        bfextu  r12, r9, 20, 11
-+        cp.w    r12, 0x7ff
-+        retne   r12     /* Return 0.0 */
-+        /* Return NaN */
-+        mov     r10, -1
-+        mov     r11, -1
-+        ret     r12
-+         
-+
-+ 
-+#endif
-+                
-+ 
-+#if  defined(L_avr32_f64_addsub) || defined(L_avr32_f64_addsub_fast)
-+        .align  2
-+
-+__avr32_f64_sub_from_add:
-+        /* Switch sign on op2 */
-+        eorh    r9, 0x8000
-+
-+#if  defined(L_avr32_f64_addsub_fast)
-+        .global __avr32_f64_sub_fast
-+        .type  __avr32_f64_sub_fast,@function
-+__avr32_f64_sub_fast:
-+#else	
-+        .global __avr32_f64_sub
-+        .type  __avr32_f64_sub,@function
-+__avr32_f64_sub:
-+#endif
-+        
-+        /* op1 in {r11,r10}*/
-+        /* op2 in {r9,r8}*/
-+
-+#if  defined(L_avr32_f64_addsub_fast)
-+        /* If op2 is zero just return op1 */
-+        or      r12, r8, r9 << 1
-+        reteq   r12 
-+#endif
-+ 
-+        /* Check signs */
-+        eor     r12, r11, r9
-+        /* Different signs, use addition. */
-+        brmi    __avr32_f64_add_from_sub
-+ 
-+        stm     --sp, r5, r6, r7, lr
-+ 
-+        /* Get sign of op1 into r12 */
-+        mov     r12, r11
-+        andh    r12, 0x8000, COH                
-+ 
-+        /* Remove sign from operands */
-+        cbr     r11, 31
-+        cbr     r9, 31
-+ 
-+        /* Put the largest number in [r11, r10]
-+           and the smallest number in [r9, r8] */
-+        cp      r10, r8
-+        cpc     r11, r9
-+        brhs    1f /* Skip swap if operands already correctly ordered*/
-+        /* Operands were not correctly ordered, swap them*/
-+        mov     r7, r11
-+        mov     r11, r9
-+        mov     r9, r7
-+        mov     r7, r10
-+        mov     r10, r8
-+        mov     r8, r7
-+        eorh    r12, 0x8000 /* Invert sign in r12*/
-+1:      
-+        /* Unpack largest operand - opH */      
-+        /* exp: r7 */
-+        /* sf:  r11, r10 */
-+        lsr     r7, r11, 20 /* Extract exponent */
-+        lsl     r11, 11 /* Extract mantissa, leave room for implicit bit */ 
-+        or      r11, r11, r10>>21
-+        lsl     r10, 11
-+        sbr     r11, 31 /* Insert implicit bit */
-+ 
-+        
-+        /* Unpack smallest operand - opL */
-+        /* exp: r6 */
-+        /* sf:  r9, r8 */
-+        lsr     r6, r9, 20 /* Extract exponent */
-+        breq    __avr32_f64_sub_opL_subnormal /* If either zero or subnormal */
-+        lsl     r9, 11 /* Extract mantissa, leave room for implicit bit */ 
-+        or      r9, r9, r8>>21
-+        lsl     r8, 11
-+        sbr     r9, 31 /* Insert implicit bit */
-+ 
-+
-+__avr32_f64_sub_opL_subnormal_done:     
-+        /* opH is NaN or Inf. */
-+        cp.w    r7, 0x7ff
-+        breq    __avr32_f64_sub_opH_nan_or_inf
-+
-+        /* Get shift amount to scale mantissa of op2. */
-+        rsub    r6, r7
-+        breq    __avr32_f64_sub_shift_done /* No need to shift, exponents are equal*/
-+ 
-+        /* Scale mantissa [r9, r8] with amount [r6].
-+        Uses scratch registers [r5] and [lr].
-+        In IEEE mode:Must not forget the sticky bits we intend to shift out. */
-+ 
-+        rsub    r5,r6,32 /* get (32 - shift count)
-+                            (if shift count > 32 we get a
-+                            negative value, but that will
-+                            work as well in the code below.) */
-+ 
-+        cp.w    r6,32       /* handle shifts >= 32 separately */
-+        brhs    __avr32_f64_sub_longshift
-+ 
-+        /* small (<32) shift amount, both words are part of the shift
-+           first remember whether part that is lost contains any 1 bits ... */
-+        lsl     lr,r8,r5  /* shift away bits that are part of
-+                             final mantissa. only part that goes
-+                             to lr are bits that will be lost */
-+ 
-+        /* ... and now to the actual shift */
-+        lsl     r5,r9,r5  /* get bits from msw destined for lsw*/
-+        lsr     r8,r8,r6  /* shift down lsw of mantissa */
-+        lsr     r9,r9,r6  /* shift down msw of mantissa */
-+        or      r8,r5     /* combine these bits with prepared lsw*/
-+#if  defined(L_avr32_f64_addsub)
-+        cp.w    lr,0      /* if any '1' bit in part we lost ...*/
-+        srne    lr
-+        or      r8, lr     /* ... we need to set sticky bit*/
-+#endif
-+        
-+__avr32_f64_sub_shift_done:     
-+        /* Now subtract the mantissas. */
-+        sub     r10, r8
-+        sbc     r11, r11, r9
-+ 
-+        /* Normalize the exponent and mantissa pair stored in
-+        [r11,r10] and exponent in [r7]. Needs two scratch registers [r6] and [lr]. */
-+        clz     r6,r11     /* Check if we have zeros in high bits */
-+        breq    __avr32_f64_sub_longnormalize_done  /* No need for scaling if no zeros in high bits */
-+        brcs    __avr32_f64_sub_longnormalize
-+ 
-+	
-+        /* shift amount is smaller than 32, and involves both msw and lsw*/
-+        rsub    lr,r6,32  /* shift mantissa */
-+        lsl     r11,r11,r6
-+        lsr     lr,r10,lr
-+        or      r11,lr
-+        lsl     r10,r10,r6
-+ 
-+        sub     r7,r6    /* adjust exponent */
-+        brle    __avr32_f64_sub_subnormal_result
-+__avr32_f64_sub_longnormalize_done:     
-+        
-+#if defined(L_avr32_f64_addsub)
-+        /* Insert the bits we will remove from the mantissa r9[31:21] */
-+        lsl     r9, r10, (32 - 11)
-+#else
-+        /* Keep the last bit shifted out. */
-+        bfextu  r9, r10, 10, 1
-+#endif
-+ 
-+        /* Pack final result*/
-+        /* Input: [r7]:exp, [r11, r10]:mant, [r12]:sign in MSB */
-+        /* Result in [r11,r10] */
-+        /* Insert mantissa */
-+        lsr     r10, 11
-+        or      r10, r10, r11<<21
-+        lsr     r11, 11
-+        /* Insert exponent and sign bit*/
-+	bfins	r11, r7, 20, 11
-+        or      r11, r12
-+        
-+        /* Round */     
-+__avr32_f64_sub_round:
-+#if defined(L_avr32_f64_addsub)
-+	mov_imm	r7, 0x80000000
-+        bld     r10, 0
-+        subne   r7, -1  
-+ 
-+        cp.w    r9, r7
-+        srhs    r9
-+#endif
-+        add     r10, r9
-+        acr     r11
-+        
-+        /* Return result in [r11,r10] */
-+        ldm     sp++, r5, r6, r7,pc
-+ 
-+ 
-+ 
-+__avr32_f64_sub_opL_subnormal:
-+        /* Extract the of mantissa */
-+        lsl     r9, 11 /* Extract mantissa, leave room for implicit bit */ 
-+        or      r9, r9, r8>>21
-+        lsl     r8, 11
-+ 
-+        /* Set exponent to 1 if we do not have a zero. */
-+        or      lr, r9, r8
-+        movne   r6,1
-+	
-+        /* Check if opH is also subnormal. If so, clear implicit bit in r11*/
-+        rsub    lr, r7, 0
-+        moveq   r7,1
-+        bst     r11, 31
-+	
-+        /* Check if op1 is zero, if so set exponent to 0. */
-+        or      lr, r11, r10
-+        moveq   r7,0
-+	                 
-+        rjmp    __avr32_f64_sub_opL_subnormal_done
-+ 
-+__avr32_f64_sub_opH_nan_or_inf: 
-+        /* Check if opH is NaN, if so return NaN */
-+        cbr     r11, 31
-+        or      lr, r11, r10
-+        brne    __avr32_f64_sub_return_nan
-+ 
-+        /* opH is Inf. */
-+        /* Check if opL is Inf. or NaN */
-+        cp.w    r6, 0x7ff
-+        breq    __avr32_f64_sub_return_nan
-+	/* Return infinity with correct sign. */	
-+	or      r11, r12, r7 << 20
-+        ldm     sp++, r5, r6, r7, pc/* opL not Inf or NaN, return opH */
-+__avr32_f64_sub_return_nan:     
-+        mov     r10, -1 /* Generate NaN in r11, r10 */
-+        mov     r11, -1
-+        ldm     sp++, r5, r6, r7, pc/* opL Inf or NaN, return NaN */
-+ 
-+ 
-+__avr32_f64_sub_subnormal_result:
-+#if defined(L_avr32_f64_addsub)
-+	/* Check how much we must scale down the mantissa. */
-+	neg	r7
-+	sub	r7, -1     /* We do no longer have an implicit bit. */
-+	satu	r7 >> 0, 6 /* Saturate shift amount to max 63. */
-+	cp.w	r7, 32
-+	brge	0f
-+	/* Shift amount <32 */
-+	rsub	r8, r7, 32
-+	lsl	r9, r10, r8
-+	srne	r6
-+	lsr	r10, r10, r7
-+	or	r10, r6		/* Sticky bit from the
-+				   part that was shifted out. */
-+	lsl	r9, r11, r8
-+	or	r10, r10, r9
-+	lsr	r11, r10, r7
-+	/* Set exponent */
-+	mov	r7, 0
-+	rjmp	__avr32_f64_sub_longnormalize_done
-+0:
-+	/* Shift amount >=32 */
-+	rsub	r8, r7, 64
-+	lsl	r9, r11, r8
-+	or	r9, r10
-+	srne	r6
-+	lsr	r10, r11, r7
-+	or	r10, r6		/* Sticky bit from the
-+				   part that was shifted out. */
-+	mov	r11, 0
-+	/* Set exponent */
-+	mov	r7, 0
-+	rjmp	__avr32_f64_sub_longnormalize_done
-+#else
-+        /* Just flush subnormals to zero. */
-+        mov     r10, 0
-+        mov     r11, 0
-+#endif
-+        ldm     sp++, r5, r6, r7, pc
-+ 
-+__avr32_f64_sub_longshift:
-+        /* large (>=32) shift amount, only lsw will have bits left after shift.
-+           note that shift operations will use ((shift count=r6) mod 32) so
-+           we do not need to subtract 32 from shift count. */
-+        /* Saturate the shift amount to 63. If the amount
-+           is any larger op2 is insignificant. */
-+        satu    r6 >> 0, 6
-+	
-+#if defined(L_avr32_f64_addsub)
-+        /* first remember whether part that is lost contains any 1 bits ... */
-+	moveq	lr, r8	   /* If shift amount is 32, no bits from msw are lost. */
-+	breq	0f
-+        lsl     lr,r9,r5   /* save all lost bits from msw */
-+        or      lr,r8      /* also save lost bits (all) from lsw
-+                              now lr != 0 if we lose any bits */
-+#endif  
-+0:	
-+        /* ... and now to the actual shift */
-+        lsr     r8,r9,r6   /* Move msw to lsw and shift. */
-+        mov     r9,0       /* clear msw */
-+#if defined(L_avr32_f64_addsub)
-+        cp.w    lr,0       /* if any '1' bit in part we lost ...*/
-+        srne    lr
-+        or      r8, lr      /* ... we need to set sticky bit*/
-+#endif
-+        rjmp    __avr32_f64_sub_shift_done
-+ 
-+__avr32_f64_sub_longnormalize:
-+        /* shift amount is greater than 32 */
-+        clz     r6,r10      /* shift mantissa */
-+        /* If the resulting mantissa is zero the result is 
-+           zero so force exponent to zero. */
-+        movcs   r7, 0
-+        movcs   r6, 0
-+        movcs   r12, 0  /* Also clear sign bit. A zero result from subtraction
-+			   always is +0.0 */
-+        subcc   r6,-32
-+        lsl     r11,r10,r6
-+        mov     r10,0
-+        sub     r7,r6          /* adjust exponent */
-+        brle    __avr32_f64_sub_subnormal_result
-+        rjmp    __avr32_f64_sub_longnormalize_done
-+        
-+ 
-+        
-+	 .align  2
-+__avr32_f64_add_from_sub:
-+        /* Switch sign on op2 */
-+        eorh    r9, 0x8000
-+
-+#if defined(L_avr32_f64_addsub_fast)
-+        .global __avr32_f64_add_fast
-+        .type  __avr32_f64_add_fast,@function
-+__avr32_f64_add_fast:
-+#else	
-+        .global __avr32_f64_add
-+        .type  __avr32_f64_add,@function
-+__avr32_f64_add:
-+#endif
-+        
-+        /* op1 in {r11,r10}*/
-+        /* op2 in {r9,r8}*/
-+ 
-+#if defined(L_avr32_f64_addsub_fast)
-+        /* If op2 is zero just return op1 */
-+        or      r12, r8, r9 << 1
-+        reteq   r12 
-+#endif
-+
-+        /* Check signs */
-+        eor     r12, r11, r9
-+        /* Different signs, use subtraction. */
-+        brmi    __avr32_f64_sub_from_add
-+ 
-+        stm     --sp, r5, r6, r7, lr
-+ 
-+        /* Get sign of op1 into r12 */
-+        mov     r12, r11
-+        andh    r12, 0x8000, COH                
-+ 
-+        /* Remove sign from operands */
-+        cbr     r11, 31
-+        cbr     r9, 31
-+ 
-+        /* Put the number with the largest exponent in [r11, r10]
-+           and the number with the smallest exponent in [r9, r8] */
-+        cp      r11, r9
-+        brhs    1f /* Skip swap if operands already correctly ordered */
-+        /* Operands were not correctly ordered, swap them */
-+        mov     r7, r11
-+        mov     r11, r9
-+        mov     r9, r7
-+        mov     r7, r10
-+        mov     r10, r8
-+        mov     r8, r7
-+1:      
-+	mov	lr, 0 /* Set sticky bits to zero */
-+        /* Unpack largest operand - opH */      
-+        /* exp: r7 */
-+        /* sf:  r11, r10 */
-+	bfextu	R7, R11, 20, 11 /* Extract exponent */
-+	bfextu	r11, r11, 0, 20 /* Extract mantissa */
-+        sbr     r11, 20 /* Insert implicit bit */
-+ 
-+        /* Unpack smallest operand - opL */
-+        /* exp: r6 */
-+        /* sf:  r9, r8 */
-+	bfextu	R6, R9, 20, 11	/* Extract exponent */
-+	breq	__avr32_f64_add_op2_subnormal
-+	bfextu	r9, r9, 0, 20   /* Extract mantissa */
-+        sbr     r9, 20		/* Insert implicit bit */
-+
-+2:		 
-+        /* opH is NaN or Inf. */
-+        cp.w    r7, 0x7ff
-+        breq    __avr32_f64_add_opH_nan_or_inf
-+
-+        /* Get shift amount to scale mantissa of op2. */
-+        rsub    r6, r7
-+        breq    __avr32_f64_add_shift_done /* No need to shift, exponents are equal*/
-+ 
-+        /* Scale mantissa [r9, r8] with amount [r6].
-+        Uses scratch registers [r5] and [lr].
-+        In IEEE mode:Must not forget the sticky bits we intend to shift out. */
-+        rsub    r5,r6,32 /* get (32 - shift count)
-+                            (if shift count > 32 we get a
-+                            negative value, but that will
-+                            work as well in the code below.) */
-+ 
-+        cp.w    r6,32       /* handle shifts >= 32 separately */
-+        brhs    __avr32_f64_add_longshift
-+ 
-+        /* small (<32) shift amount, both words are part of the shift
-+           first remember whether part that is lost contains any 1 bits ... */
-+        lsl     lr,r8,r5  /* shift away bits that are part of
-+                             final mantissa. only part that goes
-+                             to lr are bits that will be lost */
-+ 
-+        /* ... and now to the actual shift */
-+        lsl     r5,r9,r5  /* get bits from msw destined for lsw*/
-+        lsr     r8,r8,r6  /* shift down lsw of mantissa */
-+        lsr     r9,r9,r6  /* shift down msw of mantissa */
-+        or      r8,r5     /* combine these bits with prepared lsw*/
-+        
-+__avr32_f64_add_shift_done:     
-+        /* Now add the mantissas. */
-+        add     r10, r8
-+        adc     r11, r11, r9
-+
-+        /* Check if we overflowed. */
-+	bld	r11, 21 
-+        breq	__avr32_f64_add_res_of:
-+
-+__avr32_f64_add_res_of_done:    
-+        
-+        /* Pack final result*/
-+        /* Input: [r7]:exp, [r11, r10]:mant, [r12]:sign in MSB */
-+        /* Result in [r11,r10] */
-+        /* Insert exponent and sign bit*/
-+	bfins	r11, r7, 20, 11
-+	or	r11, r12
-+        
-+        /* Round */     
-+__avr32_f64_add_round:
-+#if defined(L_avr32_f64_addsub)
-+	bfextu	r12, r10, 0, 1 /* Extract parity bit.*/
-+	or	lr, r12	       /* or it together with the sticky bits. */	
-+	eorh	lr, 0x8000     /* Toggle round bit. */	
-+	/* We should now round up by adding one for the following cases:
-+
-+		halfway   sticky|parity  round-up
-+		   0            x           no
-+		   1            0           no
-+	           1            1           yes
-+
-+	   Since we have inverted the halfway bit we can use the satu instruction
-+           by saturating to 1 bit to implement this. 
-+	*/ 
-+	satu	lr >> 0, 1
-+#else
-+	lsr	lr, 31
-+#endif
-+        add     r10, lr
-+        acr     r11
-+        
-+        /* Return result in [r11,r10] */
-+        ldm     sp++, r5, r6, r7,pc
-+ 
-+  
-+__avr32_f64_add_opH_nan_or_inf: 
-+        /* Check if opH is NaN, if so return NaN */
-+        cbr     r11, 20
-+        or      lr, r11, r10
-+        brne    __avr32_f64_add_return_nan
-+ 
-+        /* opH is Inf. */
-+        /* Check if opL is Inf. or NaN */
-+        cp.w    r6, 0x7ff
-+        breq    __avr32_f64_add_opL_nan_or_inf
-+        ldm     sp++, r5, r6, r7, pc/* opL not Inf or NaN, return opH */
-+__avr32_f64_add_opL_nan_or_inf:
-+        cbr     r9, 20
-+        or      lr, r9, r8
-+        brne    __avr32_f64_add_return_nan
-+        mov     r10, 0  /* Generate Inf in r11, r10 */
-+	mov_imm r11, 0x7ff00000
-+        or      r11, r12 /* Put sign bit back */
-+        ldm     sp++, r5, r6, r7, pc/* opL Inf, return Inf */
-+__avr32_f64_add_return_nan:     
-+        mov     r10, -1 /* Generate NaN in r11, r10 */
-+        mov     r11, -1
-+        ldm     sp++, r5, r6, r7, pc/* opL Inf or NaN, return NaN */
-+ 
-+ 
-+__avr32_f64_add_longshift:
-+        /* large (>=32) shift amount, only lsw will have bits left after shift.
-+           note that shift operations will use ((shift count=r6) mod 32) so
-+           we do not need to subtract 32 from shift count. */
-+        /* Saturate the shift amount to 63. If the amount
-+           is any larger op2 is insignificant. */
-+        satu    r6 >> 0, 6
-+	/* If shift amount is 32 there are no bits from the msw that are lost. */
-+	moveq	lr, r8
-+	breq	0f	
-+        /* first remember whether part that is lost contains any 1 bits ... */
-+        lsl     lr,r9,r5   /* save all lost bits from msw */
-+#if defined(L_avr32_f64_addsub)
-+	cp.w	r8, 0
-+	srne	r8	
-+        or      lr,r8      /* also save lost bits (all) from lsw
-+                              now lr != 0 if we lose any bits */
-+#endif  
-+0:	
-+        /* ... and now to the actual shift */
-+        lsr     r8,r9,r6   /* msw -> lsw and make rest of shift inside lsw*/
-+        mov     r9,0       /* clear msw */
-+        rjmp    __avr32_f64_add_shift_done
-+ 
-+__avr32_f64_add_res_of:
-+	/* We overflowed. Scale down mantissa by shifting right one position. */
-+	or	lr, lr, lr << 1 /* Remember stickybits*/
-+	lsr	r11, 1
-+	ror	r10
-+	ror	lr
-+	sub	r7, -1	/* Increment exponent */
-+ 
-+        /* Clear mantissa to set result to Inf if the exponent is 255. */
-+        cp.w    r7, 0x7ff
-+        moveq   r10, 0
-+        moveq   r11, 0
-+        moveq   lr, 0
-+        rjmp    __avr32_f64_add_res_of_done
-+        
-+__avr32_f64_add_op2_subnormal:	
-+	/* Set epxponent to 1 */
-+	mov	r6, 1
-+
-+	/* Check if op2 is also subnormal. */
-+	cp.w	r7, 0
-+	brne	2b
-+
-+	cbr	r11, 20
-+	/* Both operands are subnormal. Just addd the mantissas
-+	   and the exponent will automatically be set to 1 if
-+	   we overflow into a normal number. */
-+	add	r10, r8
-+	adc	r11, r11, r9
-+
-+	/* Add sign bit */
-+	or	r11, r12
-+	
-+        /* Return result in [r11,r10] */
-+        ldm     sp++, r5, r6, r7,pc
-+	
-+			
-+	 
-+#endif
-+ 
-+#ifdef L_avr32_f64_to_u32
-+        /* This goes into L_fixdfsi */
-+#endif
-+        
-+ 
-+#ifdef L_avr32_f64_to_s32
-+        .global __avr32_f64_to_u32
-+        .type  __avr32_f64_to_u32,@function
-+__avr32_f64_to_u32:
-+        cp.w    r11, 0
-+        retmi   0       /* Negative returns 0 */
-+ 
-+        /* Fallthrough to df to signed si conversion */ 
-+        .global __avr32_f64_to_s32
-+        .type  __avr32_f64_to_s32,@function
-+__avr32_f64_to_s32:
-+        lsl     r12,r11,1
-+        lsr     r12,21                  /* extract exponent*/
-+        sub     r12,1023                /* convert to unbiased exponent.*/
-+        retlo   0                       /* too small exponent implies zero. */
-+ 
-+1:      
-+        rsub    r12,r12,31              /* shift count = 31 - exponent */
-+        mov     r9,r11                  /* save sign for later...*/
-+        lsl     r11,11                  /* remove exponent and sign*/
-+        sbr     r11,31                  /* add implicit bit*/
-+        or      r11,r11,r10>>21         /* get rest of bits from lsw of double */
-+        lsr     r11,r11,r12             /* shift down mantissa to final place */
-+        lsl     r9,1                    /* sign -> carry */
-+        retcc   r11                     /* if positive, we are done */
-+        neg     r11                     /* if negative float, negate result */
-+        ret     r11
-+ 
-+#endif  /* L_fixdfsi*/
-+ 
-+#ifdef L_avr32_f64_to_u64
-+        /* Actual function is in L_fixdfdi */
-+#endif
-+        
-+#ifdef L_avr32_f64_to_s64
-+        .global __avr32_f64_to_u64
-+        .type  __avr32_f64_to_u64,@function
-+__avr32_f64_to_u64:
-+        cp.w    r11,0
-+        /* Negative numbers return zero */
-+        movmi   r10, 0
-+        movmi   r11, 0
-+        retmi   r11
-+ 
-+        
-+ 
-+        /* Fallthrough */
-+        .global __avr32_f64_to_s64
-+        .type  __avr32_f64_to_s64,@function
-+__avr32_f64_to_s64:
-+        lsl     r9,r11,1
-+        lsr     r9,21                   /* get exponent*/
-+        sub     r9,1023                 /* convert to correct range*/
-+        /* Return zero if exponent to small */
-+        movlo   r10, 0
-+        movlo   r11, 0
-+        retlo   r11
-+ 
-+        mov     r8,r11                  /* save sign for later...*/
-+1:      
-+        lsl     r11,11                  /* remove exponent */
-+        sbr     r11,31                  /* add implicit bit*/
-+        or      r11,r11,r10>>21         /* get rest of bits from lsw of double*/
-+        lsl     r10,11                  /* align lsw correctly as well */
-+        rsub    r9,r9,63                /* shift count = 63 - exponent */
-+        breq    1f
-+ 
-+        cp.w    r9,32                   /* is shift count more than one reg? */
-+        brhs    0f
-+ 
-+        mov     r12,r11                 /* save msw */
-+        lsr     r10,r10,r9              /* small shift count, shift down lsw */
-+        lsr     r11,r11,r9              /* small shift count, shift down msw */
-+        rsub    r9,r9,32                /* get 32-size of shifted out tail */
-+        lsl     r12,r12,r9              /* align part to move from msw to lsw */
-+        or      r10,r12                 /* combine to get new lsw */
-+        rjmp    1f
-+ 
-+0:
-+        lsr     r10,r11,r9              /* large shift count,only lsw get bits
-+                                           note that shift count is modulo 32*/
-+        mov     r11,0                   /* msw will be 0 */
-+ 
-+1:
-+        lsl     r8,1                    /* sign -> carry */
-+        retcc   r11                     /* if positive, we are done */
-+ 
-+        neg     r11                     /* if negative float, negate result */
-+        neg     r10
-+        scr     r11
-+        ret     r11 
-+ 
-+#endif
-+ 
-+#ifdef L_avr32_u32_to_f64
-+        /* Code located in L_floatsidf */
-+#endif
-+        
-+#ifdef L_avr32_s32_to_f64
-+        .global __avr32_u32_to_f64
-+        .type  __avr32_u32_to_f64,@function
-+__avr32_u32_to_f64:
-+        sub     r11, r12, 0 /* Move to r11 and force Z flag to be updated */
-+        mov     r12, 0      /* always positive */
-+        rjmp    0f          /* Jump to common code for floatsidf */
-+        
-+        .global __avr32_s32_to_f64
-+        .type  __avr32_s32_to_f64,@function
-+__avr32_s32_to_f64:
-+        mov     r11, r12        /* Keep original value in r12 for sign */
-+        abs     r11             /* Absolute value if r12 */
-+0:      
-+        mov     r10,0           /* let remaining bits be zero */
-+        reteq   r11             /* zero long will return zero float */
-+ 
-+        pushm   lr
-+        mov     r9,31+1023              /* set exponent */
-+                
-+        normalize_df    r9 /*exp*/, r10, r11 /* mantissa */, r8, lr /* scratch */
-+ 
-+        /* Check if a subnormal result was created */
-+        cp.w    r9, 0
-+        brgt    0f
-+        
-+        adjust_subnormal_df     r9 /* exp */, r10, r11 /* Mantissa */, r12 /*sign*/, r8, lr /* scratch */
-+        popm    pc
-+0:
-+        
-+        /* Round result */
-+        round_df        r9 /*exp*/, r10, r11 /* Mantissa */, r8 /*scratch*/
-+        cp.w    r9,0x7ff
-+        brlt    0f
-+        /*Return infinity */
-+        mov     r10, 0
-+	mov_imm	r11, 0xffe00000
-+        rjmp    __floatsidf_return_op1
-+        
-+0:
-+ 
-+        /* Pack */
-+        pack_df r9 /*exp*/, r10, r11 /* mantissa */, r10, r11 /* Output df number*/
-+__floatsidf_return_op1: 
-+        lsl     r12,1                  /* shift in sign bit */
-+        ror     r11
-+ 
-+        popm    pc
-+#endif
-+ 
-+ 
-+#ifdef L_avr32_f32_cmp_eq
-+        .global __avr32_f32_cmp_eq
-+        .type  __avr32_f32_cmp_eq,@function
-+__avr32_f32_cmp_eq:     
-+        cp.w    r12, r11
-+        breq    0f      
-+        /* If not equal check for +/-0 */
-+        /* Or together the two values and shift out the sign bit.
-+           If the result is zero, then the two values are both zero. */
-+        or      r12, r11
-+        lsl     r12, 1
-+        reteq   1
-+        ret     0
-+0:                      
-+        /* Numbers were equal. Check for NaN or Inf */
-+	mov_imm	r11, 0xff000000
-+        lsl     r12, 1
-+        cp.w    r12, r11
-+        retls   1     /* 0 if NaN, 1 otherwise */
-+        ret     0     
-+#endif
-+        
-+#if defined(L_avr32_f32_cmp_ge) || defined(L_avr32_f32_cmp_lt)
-+#ifdef L_avr32_f32_cmp_ge
-+        .global __avr32_f32_cmp_ge
-+        .type  __avr32_f32_cmp_ge,@function
-+__avr32_f32_cmp_ge:
-+#endif  
-+#ifdef L_avr32_f32_cmp_lt
-+        .global __avr32_f32_cmp_lt
-+        .type  __avr32_f32_cmp_lt,@function
-+__avr32_f32_cmp_lt:
-+#endif  
-+        lsl     r10, r12, 1     /* Remove sign bits */
-+        lsl     r9, r11, 1
-+	subfeq	r10, 0
-+#ifdef L_avr32_f32_cmp_ge
-+	reteq	1		/* Both number are zero. Return true. */
-+#endif	
-+#ifdef L_avr32_f32_cmp_lt
-+	reteq	0		/* Both number are zero. Return false. */
-+#endif	
-+	mov_imm	r8, 0xff000000
-+        cp.w    r10, r8
-+        rethi   0               /* Op0 is NaN */                
-+        cp.w    r9, r8
-+        rethi   0               /* Op1 is Nan */
-+ 
-+        eor     r8, r11, r12
-+        bld     r12, 31
-+#ifdef L_avr32_f32_cmp_ge
-+        srcc    r8      /* Set result to true if op0 is positive*/
-+#endif
-+#ifdef L_avr32_f32_cmp_lt
-+        srcs    r8      /* Set result to true if op0 is negative*/
-+#endif
-+        retmi   r8      /* Return if signs are different */
-+        brcs    0f      /* Both signs negative? */
-+ 
-+        /* Both signs positive */
-+        cp.w    r12, r11
-+#ifdef L_avr32_f32_cmp_ge
-+        reths    1
-+        retlo    0
-+#endif
-+#ifdef L_avr32_f32_cmp_lt
-+        reths    0
-+        retlo    1
-+#endif
-+0:
-+        /* Both signs negative */
-+        cp.w    r11, r12
-+#ifdef L_avr32_f32_cmp_ge
-+        reths    1
-+        retlo    0
-+#endif
-+#ifdef L_avr32_f32_cmp_lt
-+        reths    0
-+        retlo    1
-+#endif
-+#endif
-+        
-+ 
-+#ifdef L_avr32_f64_cmp_eq
-+        .global __avr32_f64_cmp_eq
-+        .type  __avr32_f64_cmp_eq,@function
-+__avr32_f64_cmp_eq:     
-+        cp.w    r10,r8
-+        cpc     r11,r9
-+        breq    0f
-+        
-+        /* Args were not equal*/
-+        /* Both args could be zero with different sign bits */
-+        lsl     r11,1                   /* get rid of sign bits */
-+        lsl     r9,1
-+        or      r11,r10                 /* Check if all bits are zero */
-+        or      r11,r9
-+        or      r11,r8
-+        reteq   1                       /* If all zeros the arguments are equal
-+                                           so return 1 else return 0 */
-+        ret     0
-+0:      
-+        /* check for NaN */
-+        lsl     r11,1
-+	mov_imm	r12, 0xffe00000
-+        cp.w    r10,0
-+        cpc     r11,r12                 /* check if nan or inf */
-+        retls   1                       /* If Arg is NaN return 0 else 1*/
-+        ret     0                       /* Return  */
-+ 
-+#endif
-+ 
-+ 
-+#if   defined(L_avr32_f64_cmp_ge) || defined(L_avr32_f64_cmp_lt)
-+ 
-+#ifdef L_avr32_f64_cmp_ge
-+        .global __avr32_f64_cmp_ge
-+        .type  __avr32_f64_cmp_ge,@function
-+__avr32_f64_cmp_ge:
-+#endif  
-+#ifdef L_avr32_f64_cmp_lt
-+        .global __avr32_f64_cmp_lt
-+        .type  __avr32_f64_cmp_lt,@function
-+__avr32_f64_cmp_lt:
-+#endif  
-+ 
-+        /* compare magnitude of op1 and op2 */
-+        st.w    --sp, lr
-+        st.w    --sp, r7
-+        lsl     r11,1                   /* Remove sign bit of op1 */
-+        srcs    r12                     /* Sign op1 to lsb of r12*/
-+        lsl     r9,1                    /* Remove sign bit of op2 */
-+        srcs    r7
-+        rol     r12                     /* Sign op2 to lsb of lr, sign bit op1 bit 1 of r12*/
-+	
-+ 
-+        /* Check for Nan */
-+        mov_imm lr, 0xffe00000
-+        cp.w    r10,0
-+        cpc     r11,lr
-+        brhi    0f      /* We have NaN */
-+        cp.w    r8,0
-+        cpc     r9,lr
-+        brhi    0f      /* We have NaN */
-+
-+        cp.w    r11, 0
-+        subfeq  r10, 0
-+        breq    3f			/* op1 zero */
-+        ld.w    r7, sp++
-+        ld.w    lr, sp++
-+
-+        cp.w    r12,3                   /* both operands negative ?*/    
-+        breq    1f
-+ 
-+        cp.w    r12,1                   /* both operands positive? */
-+        brlo    2f
-+ 
-+        /* Different signs. If sign of op1 is negative the difference
-+           between op1 and op2 will always be negative, and if op1 is
-+           positive the difference will always be positive */           
-+#ifdef L_avr32_f64_cmp_ge
-+	reteq	1
-+	retne	0
-+#endif
-+#ifdef L_avr32_f64_cmp_lt
-+	reteq	0
-+	retne	1
-+#endif
-+  
-+2:
-+        /* Both operands positive. Just compute the difference */
-+        cp.w    r10,r8
-+        cpc     r11,r9
-+#ifdef L_avr32_f64_cmp_ge
-+	reths	1
-+	retlo	0
-+#endif
-+#ifdef L_avr32_f64_cmp_lt
-+	reths	0
-+	retlo	1
-+#endif
-+                
-+1:
-+        /* Both operands negative. Compute the difference with operands switched */
-+        cp     r8,r10
-+        cpc    r9,r11
-+#ifdef L_avr32_f64_cmp_ge
-+	reths	1
-+	retlo	0
-+#endif
-+#ifdef L_avr32_f64_cmp_lt
-+	reths	0
-+	retlo	1
-+#endif
-+
-+0:      
-+        ld.w    r7, sp++
-+        popm    pc, r12=0
-+ 
-+3:
-+        cp.w    r7, 1          /* Check sign bit from r9 */
-+#ifdef L_avr32_f64_cmp_ge
-+        sreq    r12		       /* If op2 is negative then op1 >= op2. */	
-+#endif
-+#ifdef L_avr32_f64_cmp_lt
-+        srne    r12		       /* If op2 is positve then op1 <= op2. */
-+#endif
-+        cp.w    r9, 0
-+        subfeq  r8, 0
-+        ld.w    r7, sp++
-+        ld.w    lr, sp++
-+#ifdef L_avr32_f64_cmp_ge
-+	reteq	1		       /* Both operands are zero. Return true. */
-+#endif
-+#ifdef L_avr32_f64_cmp_lt
-+	reteq	0		       /* Both operands are zero. Return false. */
-+#endif
-+	ret	r12
-+#endif
-+			        
-+#if defined(L_avr32_f64_div) || defined(L_avr32_f64_div_fast)
-+        .align  2
-+
-+#if defined(L_avr32_f64_div_fast)
-+        .global __avr32_f64_div_fast
-+        .type  __avr32_f64_div_fast,@function
-+__avr32_f64_div_fast:
-+#else
-+        .global __avr32_f64_div
-+        .type  __avr32_f64_div,@function
-+__avr32_f64_div:
-+#endif
-+        stm     --sp, r0, r1, r2, r3, r4, r5, r6, r7,lr 
-+        /* op1 in {r11,r10}*/
-+        /* op2 in {r9,r8}*/
-+        eor     lr, r11, r9             /* MSB(lr) = Sign(op1) ^ Sign(op2) */
-+ 
-+        
-+        /* Unpack op1 to 2.62 format*/  
-+        /* exp: r7 */
-+        /* sf:  r11, r10 */
-+        lsr     r7, r11, 20 /* Extract exponent */
-+                
-+        lsl     r11, 9 /* Extract mantissa, leave room for implicit bit */ 
-+        or      r11, r11, r10>>23
-+        lsl     r10, 9
-+        sbr     r11, 29 /* Insert implicit bit */
-+        andh    r11, 0x3fff /*Mask last part of exponent since we use 2.62 format*/
-+ 
-+        cbr     r7, 11       /* Clear sign bit */
-+        /* Check if normalization is needed */
-+        breq    11f /*If number is subnormal, normalize it */
-+22:     
-+        cp      r7, 0x7ff
-+        brge    2f  /* Check op1 for NaN or Inf */
-+
-+        /* Unpack op2 to 2.62 format*/
-+        /* exp: r6 */
-+        /* sf:  r9, r8 */
-+        lsr     r6, r9, 20 /* Extract exponent */
-+                
-+        lsl     r9, 9 /* Extract mantissa, leave room for implicit bit */ 
-+        or      r9, r9, r8>>23
-+        lsl     r8, 9
-+        sbr     r9, 29 /* Insert implicit bit */
-+        andh    r9, 0x3fff /*Mask last part of exponent since we use 2.62 format*/
-+ 
-+        cbr     r6, 11       /* Clear sign bit */
-+        /* Check if normalization is needed */
-+        breq    13f /*If number is subnormal, normalize it */
-+23:             
-+        cp      r6, 0x7ff
-+        brge    3f  /* Check op2 for NaN or Inf */
-+
-+        /* Calculate new exponent */
-+        sub     r7, r6
-+        sub     r7,-1023
-+ 
-+        /* Divide */
-+        /* Approximating 1/d with the following recurrence: */
-+        /* R[j+1] = R[j]*(2-R[j]*d) */
-+        /* Using 2.62 format */
-+        /* TWO:  r12 */
-+        /* d = op2 = divisor (2.62 format): r9,r8 */
-+        /* Multiply result :     r5, r4 */
-+        /* Initial guess :       r3, r2 */
-+        /* New approximations :  r3, r2 */
-+        /* op1 = Dividend (2.62 format) : r11, r10 */
-+ 
-+	mov_imm	r12, 0x80000000
-+         
-+        /* Load initial guess, using look-up table */
-+        /* Initial guess is of format 01.XY, where XY is constructed as follows: */
-+        /* Let d be of following format: 00.1xy....., then XY=~xy */
-+        /* For d=00.100 = 0,5   -> initial guess=01.11 = 1,75 */
-+        /* For d=00.101 = 0,625 -> initial guess=01.11 = 1,5  */
-+        /* For d=00.110 = 0,75  -> initial guess=01.11 = 1,25 */
-+        /* For d=00.111 = 0,875 -> initial guess=01.11 = 1,0  */
-+        /* r2 is also part of the reg pair forming initial guess, but it*/
-+        /* is kept uninitialized to save one cycle since it has so low significance*/
-+ 
-+        lsr     r3, r12, 1
-+        bfextu  r4, r9, 27, 2
-+        com     r4
-+        bfins   r3, r4, 28, 2
-+ 
-+        /* First approximation */
-+        /* Approximating to 32 bits */
-+        /* r5 = R[j]*d */
-+        mulu.d  r4, r3, r9
-+        /* r5 = 2-R[j]*d */
-+        sub    r5, r12, r5<<2
-+        /* r3 = R[j]*(2-R[j]*d) */
-+        mulu.d  r4, r3, r5
-+        lsl     r3, r5, 2
-+         
-+        /* Second approximation */
-+        /* Approximating to 32 bits */
-+        /* r5 = R[j]*d */
-+        mulu.d  r4, r3, r9
-+        /* r5 = 2-R[j]*d */
-+        sub    r5, r12, r5<<2
-+        /* r3 = R[j]*(2-R[j]*d) */
-+        mulu.d  r4, r3, r5
-+        lsl     r3, r5, 2
-+         
-+        /* Third approximation */
-+        /* Approximating to 32 bits */
-+        /* r5 = R[j]*d */
-+        mulu.d  r4, r3, r9
-+        /* r5 = 2-R[j]*d */
-+        sub    r5, r12, r5<<2
-+        /* r3 = R[j]*(2-R[j]*d) */
-+        mulu.d  r4, r3, r5
-+        lsl     r3, r5, 2
-+ 
-+        /* Fourth approximation */
-+        /* Approximating to 64 bits */
-+        /* r5,r4 = R[j]*d */
-+        mul_approx_df        r3 /*ah*/, r2 /*al*/, r9 /*bh*/, r8 /*bl*/, r5 /*rh*/, r4 /*rl*/, r1 /*sh*/, r0 /*sl*/
-+        lsl    r5, 2
-+        or     r5, r5, r4>>30
-+        lsl    r4, 2
-+        /* r5,r4 = 2-R[j]*d */
-+        neg    r4
-+        sbc    r5, r12, r5
-+        /* r3,r2 = R[j]*(2-R[j]*d) */
-+        mul_approx_df        r3 /*ah*/, r2 /*al*/, r5 /*bh*/, r4 /*bl*/, r5 /*rh*/, r4 /*rl*/, r1 /*sh*/, r0 /*sl*/
-+        lsl    r3, r5, 2
-+        or     r3, r3, r4>>30
-+        lsl    r2, r4, 2
-+ 
-+ 
-+        /* Fifth approximation */
-+        /* Approximating to 64 bits */
-+        /* r5,r4 = R[j]*d */
-+        mul_approx_df        r3 /*ah*/, r2 /*al*/, r9 /*bh*/, r8 /*bl*/, r5 /*rh*/, r4 /*rl*/, r1 /*sh*/, r0 /*sl*/
-+        lsl    r5, 2
-+        or     r5, r5, r4>>30
-+        lsl    r4, 2
-+        /* r5,r4 = 2-R[j]*d */
-+        neg    r4
-+        sbc    r5, r12, r5
-+        /* r3,r2 = R[j]*(2-R[j]*d) */
-+        mul_approx_df        r3 /*ah*/, r2 /*al*/, r5 /*bh*/, r4 /*bl*/, r5 /*rh*/, r4 /*rl*/, r1 /*sh*/, r0 /*sl*/
-+        lsl    r3, r5, 2
-+        or     r3, r3, r4>>30
-+        lsl    r2, r4, 2
-+ 
-+ 
-+        /* Multiply with dividend to get quotient */
-+        mul_approx_df        r3 /*ah*/, r2 /*al*/, r11 /*bh*/, r10 /*bl*/, r3 /*rh*/, r2 /*rl*/, r1 /*sh*/, r0 /*sl*/
-+ 
-+ 
-+        /* To increase speed, this result is not corrected before final rounding.*/
-+        /* This may give a difference to IEEE compliant code of 1 ULP.*/
-+		
-+ 
-+        /* Adjust exponent and mantissa */
-+        /* r7:exp, [r3, r2]:mant, [r5, r4]:scratch*/
-+        /* Mantissa may be of the format 0.xxxx or 1.xxxx. */
-+        /* In the first case, shift one pos to left.*/
-+        bld     r3, 31-3
-+	breq	0f
-+	lsl	r2, 1
-+	rol	r3
-+	sub	r7, 1
-+#if defined(L_avr32_f64_div)
-+	/* We must scale down the dividend to 5.59 format. */
-+	lsr	r10, 3
-+	or	r10, r10, r11 << 29
-+	lsr	r11, 3
-+	rjmp    1f
-+#endif	
-+0:	
-+#if defined(L_avr32_f64_div)
-+	/* We must scale down the dividend to 6.58 format. */
-+	lsr	r10, 4
-+	or	r10, r10, r11 << 28
-+	lsr	r11, 4
-+1:	
-+#endif
-+        cp      r7, 0   
-+        brle    __avr32_f64_div_res_subnormal /* Result was subnormal. */
-+ 
-+ 
-+#if defined(L_avr32_f64_div)
-+	/* In order to round correctly we calculate the remainder:	
-+	   Remainder = dividend[11:r10] - divisor[r9:r8]*quotient[r3:r2] 
-+	   for the case when the quotient is halfway between the round-up
-+	   value and the round down value. If the remainder then is negative
-+	   it means that the quotient was to big and that it should not be
-+           rounded up, if the remainder is positive the quotient was to small
-+	   and we need to round up. If the remainder is zero it means that the
-+	   quotient is exact but since we need to remove the guard bit we should
-+	   round to even. */
-+
-+	/* Truncate and add guard bit. */
-+	andl	r2, 0xff00
-+	orl	r2, 0x0080	
-+	
-+
-+	/* Now do the multiplication. The quotient has the format 4.60
-+	   while the divisor has the format 2.62 which gives a result
-+	   of 6.58 */
-+        mulu.d  r0, r3, r8
-+        macu.d  r0, r2, r9
-+        mulu.d  r4, r2, r8
-+        mulu.d  r8, r3, r9
-+	add	r5, r0
-+	adc	r8, r8, r1	
-+	acr	r9
-+
-+
-+	/* Check if remainder is positive, negative or equal. */
-+	bfextu	r12, r2, 8, 1  /* Get parity bit into bit 0 of r0 */ 
-+	cp	r4, 0
-+	cpc	r5
-+__avr32_f64_div_round_subnormal:	
-+	cpc	r8, r10
-+	cpc	r9, r11
-+	srlo	r6	/* Remainder positive:	 we need to round up.*/
-+	moveq	r6, r12  /* Remainder zero:	 round up if mantissa odd. */
-+#else
-+	bfextu	r6, r2, 7, 1  /* Get guard bit */ 	
-+#endif
-+	/* Final packing, scale down mantissa. */
-+	lsr	r10, r2, 8
-+        or      r10, r10, r3<<24
-+        lsr     r11, r3, 8
-+	/* Insert exponent and sign bit*/
-+	bfins	r11, r7, 20, 11
-+        bld     lr, 31
-+        bst     r11, 31
-+
-+	/* Final rounding */
-+	add	r10, r6
-+	acr	r11		
-+	        
-+        /* Return result in [r11,r10] */
-+        ldm     sp++, r0, r1, r2, r3, r4, r5, r6, r7,pc
-+ 
-+                
-+2:
-+        /* Op1 is NaN or inf */
-+        andh    r11, 0x000f /* Extract mantissa */
-+        or      r11, r10
-+        brne    16f     /* Return NaN if op1 is NaN */
-+        /* Op1 is inf check op2 */
-+        lsr     r6, r9, 20 /* Extract exponent */
-+        cbr     r6, 11      /* Clear sign bit */
-+        cp      r6, 0x7ff
-+        brne    17f     /* Inf/number gives inf, return inf */
-+        rjmp    16f     /* The rest gives NaN*/
-+        
-+3:      
-+        /* Op1 is a valid number. Op 2 is NaN or inf */
-+        andh    r9, 0x000f /* Extract mantissa */
-+        or      r9, r8
-+        brne    16f     /* Return NaN if op2 is NaN */
-+        rjmp    15f     /* Op2 was inf, return zero*/
-+                
-+11:     /* Op1 was denormal. Fix it. */
-+        lsl     r11, 3
-+        or      r11, r11, r10 >> 29
-+        lsl     r10, 3
-+        /* Check if op1 is zero. */
-+        or      r4, r10, r11
-+        breq    __avr32_f64_div_op1_zero
-+        normalize_df    r7 /*exp*/, r10, r11 /*Mantissa*/, r4, r5 /*scratch*/
-+        lsr     r10, 2
-+        or      r10, r10, r11 << 30
-+        lsr     r11, 2
-+        rjmp    22b
-+ 
-+ 
-+13:     /* Op2 was denormal. Fix it */
-+        lsl     r9, 3
-+        or      r9, r9, r8 >> 29
-+        lsl     r8, 3
-+        /* Check if op2 is zero. */
-+        or      r4, r9, r8
-+        breq    17f     /* Divisor is zero -> return Inf */
-+        normalize_df    r6 /*exp*/, r8, r9 /*Mantissa*/, r4, r5 /*scratch*/     
-+        lsr     r8, 2
-+        or      r8, r8, r9 << 30
-+        lsr     r9, 2
-+        rjmp    23b
-+        
-+ 
-+__avr32_f64_div_res_subnormal:/* Divide result was subnormal. */
-+#if defined(L_avr32_f64_div)
-+	/* Check how much we must scale down the mantissa. */
-+	neg	r7
-+	sub	r7, -1     /* We do no longer have an implicit bit. */
-+	satu	r7 >> 0, 6 /* Saturate shift amount to max 63. */
-+	cp.w	r7, 32
-+	brge	0f
-+	/* Shift amount <32 */
-+	/* Scale down quotient */
-+	rsub	r6, r7, 32
-+	lsr	r2, r2, r7
-+	lsl	r12, r3, r6
-+	or	r2, r12
-+	lsr	r3, r3, r7
-+	/* Scale down the dividend to match the scaling of the quotient. */
-+	lsl	r1, r10, r6
-+	lsr	r10, r10, r7
-+	lsl	r12, r11, r6
-+	or	r10, r12
-+	lsr	r11, r11, r7
-+	mov	r0, 0
-+	rjmp	1f
-+0:
-+	/* Shift amount >=32 */
-+	rsub	r6, r7, 32
-+	moveq	r0, 0
-+	moveq	r12, 0
-+	breq	0f
-+	lsl	r0, r10, r6
-+	lsl	r12, r11, r6
-+0:	
-+	lsr	r2, r3, r7
-+	mov	r3, 0
-+	/* Scale down the dividend to match the scaling of the quotient. */
-+	lsr	r1, r10, r7
-+	or	r1, r12
-+	lsr	r10, r11, r7
-+	mov	r11, 0
-+1:	
-+	/* Start performing the same rounding as done for normal numbers
-+	   but this time we have scaled the quotient and dividend and hence
-+	   need a little different comparison. */
-+	/* Truncate and add guard bit. */
-+	andl	r2, 0xff00
-+	orl	r2, 0x0080	
-+	
-+	/* Now do the multiplication. */
-+        mulu.d  r6, r3, r8
-+        macu.d  r6, r2, r9
-+        mulu.d  r4, r2, r8
-+        mulu.d  r8, r3, r9
-+	add	r5, r6
-+	adc	r8, r8, r7	
-+	acr	r9
-+
-+	/* Set exponent to 0 */
-+	mov	r7, 0	
-+
-+	/* Check if remainder is positive, negative or equal. */
-+	bfextu	r12, r2, 8, 1  /* Get parity bit into bit 0 of r0 */ 
-+	cp	r4, r0
-+	cpc	r5, r1
-+	/* Now the rest of the rounding is the same as for normals. */
-+	rjmp	__avr32_f64_div_round_subnormal
-+	
-+#endif
-+15:	
-+	/* Flush to zero for the fast version. */
-+        mov     r11, lr /*Get correct sign*/
-+        andh    r11, 0x8000, COH
-+        mov     r10, 0
-+        ldm     sp++, r0, r1, r2, r3, r4, r5, r6, r7,pc
-+	 
-+16:     /* Return NaN. */
-+        mov     r11, -1
-+        mov     r10, 0
-+        ldm     sp++, r0, r1, r2, r3, r4, r5, r6, r7,pc
-+        
-+17:     
-+        /* Check if op1 is zero. */
-+        or      r4, r10, r11
-+        breq    __avr32_f64_div_op1_zero
-+        /* Return INF. */
-+        mov     r11, lr /*Get correct sign*/
-+        andh    r11, 0x8000, COH
-+        orh     r11, 0x7ff0
-+        mov     r10, 0
-+        ldm     sp++, r0, r1, r2, r3, r4, r5, r6, r7,pc
-+
-+__avr32_f64_div_op1_zero:
-+        or      r5, r8, r9 << 1
-+        breq    16b             /* 0.0/0.0 -> NaN */
-+        bfextu  r4, r9, 20, 11
-+        cp      r4, 0x7ff
-+        brne    15b             /* Return zero */
-+        /* Check if divisor is Inf or NaN */
-+        or      r5, r8, r9 << 12
-+        breq    15b             /* Divisor is inf -> return zero */
-+        rjmp    16b             /* Return NaN */                
-+        
-+        
-+        
-+
-+#endif  
-+                
-+#if defined(L_avr32_f32_addsub) || defined(L_avr32_f32_addsub_fast)
-+
-+        .align  2
-+__avr32_f32_sub_from_add:
-+        /* Switch sign on op2 */
-+        eorh    r11, 0x8000
-+
-+#if defined(L_avr32_f32_addsub_fast)
-+        .global __avr32_f32_sub_fast
-+        .type  __avr32_f32_sub_fast,@function
-+__avr32_f32_sub_fast:
-+#else
-+        .global __avr32_f32_sub
-+        .type  __avr32_f32_sub,@function
-+__avr32_f32_sub:
-+#endif 
-+ 
-+        /* Check signs */
-+        eor     r8, r11, r12
-+        /* Different signs, use subtraction. */
-+        brmi    __avr32_f32_add_from_sub
-+ 
-+        /* Get sign of op1 */
-+        mov     r8, r12
-+        andh    r12, 0x8000, COH                
-+ 
-+        /* Remove sign from operands */
-+        cbr     r11, 31
-+#if defined(L_avr32_f32_addsub_fast)
-+        reteq   r8      /* If op2 is zero return op1 */
-+#endif
-+        cbr     r8, 31
-+ 
-+        /* Put the number with the largest exponent in r10
-+           and the number with the smallest exponent in r9 */
-+        max     r10, r8, r11
-+        min     r9, r8, r11
-+        cp      r10, r8 /*If largest operand (in R10) is not equal to op1*/
-+        subne   r12, 1 /* Subtract 1 from sign, which will invert MSB of r12*/
-+        andh    r12, 0x8000, COH /*Mask all but MSB*/
-+ 
-+        /* Unpack exponent and mantissa of op1 */
-+        lsl     r8, r10, 8
-+        sbr     r8, 31  /* Set implicit bit. */
-+        lsr     r10, 23 
-+                
-+        /* op1 is NaN or Inf. */
-+        cp.w    r10, 0xff
-+        breq    __avr32_f32_sub_op1_nan_or_inf
-+        
-+        /* Unpack exponent and mantissa of op2 */
-+        lsl     r11, r9, 8
-+        sbr     r11, 31  /* Set implicit bit. */
-+        lsr     r9, 23  
-+ 
-+#if defined(L_avr32_f32_addsub)
-+        /* Keep sticky bit for correct IEEE rounding */
-+        st.w    --sp, r12
-+ 
-+        /* op2 is either zero or subnormal. */
-+        breq    __avr32_f32_sub_op2_subnormal
-+0:      
-+        /* Get shift amount to scale mantissa of op2. */
-+        sub     r12, r10, r9                 
-+
-+	breq	__avr32_f32_sub_shift_done
-+ 
-+        /* Saturate the shift amount to 31. If the amount
-+           is any larger op2 is insignificant. */
-+        satu    r12 >> 0, 5      
-+
-+        /* Put the remaining bits into r9.*/
-+        rsub    r9, r12, 32
-+        lsl     r9, r11, r9
-+	
-+	/* If the remaining bits are non-zero then we must subtract one
-+	   more from opL.  */
-+	subne	r8, 1
-+	srne	r9	/* LSB of r9 represents sticky bits. */
-+
-+        /* Shift mantissa of op2 to same decimal point as the mantissa
-+           of op1. */
-+        lsr     r11, r11, r12
-+ 
-+
-+__avr32_f32_sub_shift_done:	
-+        /* Now subtract the mantissas. */
-+        sub     r8, r11
-+ 
-+        ld.w    r12, sp++
-+ 
-+        /* Normalize resulting mantissa. */
-+        clz     r11, r8
-+
-+	retcs	0
-+        lsl     r8, r8, r11
-+        sub     r10, r11
-+        brle    __avr32_f32_sub_subnormal_result
-+
-+        /* Insert the bits we will remove from the mantissa into r9[31:24] */
-+	or	r9, r9, r8 << 24
-+#else
-+        /* Ignore sticky bit to simplify and speed up rounding */
-+        /* op2 is either zero or subnormal. */
-+        breq    __avr32_f32_sub_op2_subnormal
-+0:      
-+        /* Get shift amount to scale mantissa of op2. */
-+        rsub    r9, r10                 
-+ 
-+        /* Saturate the shift amount to 31. If the amount
-+           is any larger op2 is insignificant. */
-+        satu    r9 >> 0, 5      
-+ 
-+        /* Shift mantissa of op2 to same decimal point as the mantissa
-+           of op1. */
-+        lsr     r11, r11, r9
-+ 
-+        /* Now subtract the mantissas. */
-+        sub     r8, r11
-+ 
-+        /* Normalize resulting mantissa. */
-+        clz     r9, r8
-+	retcs	0
-+        lsl     r8, r8, r9
-+        sub     r10, r9
-+        brle    __avr32_f32_sub_subnormal_result        
-+#endif
-+        
-+        /* Pack result. */
-+        or      r12, r12, r8 >> 8
-+        bfins   r12, r10, 23, 8         
-+ 
-+        /* Round */     
-+__avr32_f32_sub_round:
-+#if defined(L_avr32_f32_addsub)
-+	mov_imm	r10, 0x80000000
-+        bld     r12, 0
-+        subne   r10, -1 
-+        cp.w    r9, r10
-+        subhs   r12, -1
-+#else
-+        bld     r8, 7 
-+        acr     r12
-+#endif  
-+        
-+        ret     r12     
-+ 
-+ 
-+__avr32_f32_sub_op2_subnormal:
-+        /* Fix implicit bit and adjust exponent of subnormals. */
-+        cbr     r11, 31
-+        /* Set exponent to 1 if we do not have a zero. */
-+        movne   r9,1
-+ 
-+        /* Check if op1 is also subnormal. */
-+        cp.w    r10, 0
-+        brne    0b
-+ 
-+        cbr     r8, 31
-+         /* If op1 is not zero set exponent to 1. */
-+        movne   r10,1
-+                
-+        rjmp    0b
-+ 
-+__avr32_f32_sub_op1_nan_or_inf: 
-+        /* Check if op1 is NaN, if so return NaN */
-+        lsl     r11, r8, 1
-+        retne   -1
-+ 
-+        /* op1 is Inf. */
-+        bfins   r12, r10, 23, 8 /* Generate Inf in r12 */
-+ 
-+        /* Check if op2 is Inf. or NaN */
-+        lsr     r11, r9, 23
-+        cp.w    r11, 0xff
-+        retne   r12             /* op2 not Inf or NaN, return op1 */
-+ 
-+        ret     -1              /* op2 Inf or NaN, return NaN */
-+ 
-+__avr32_f32_sub_subnormal_result:
-+        /* Check if the number is so small that
-+           it will be represented with zero. */
-+        rsub    r10, r10, 9
-+        rsub    r11, r10, 32
-+        retcs   0
-+ 
-+        /* Shift the mantissa into the correct position.*/
-+        lsr     r10, r8, r10
-+        /* Add sign bit. */
-+        or      r12, r10
-+
-+        /* Put the shifted out bits in the most significant part
-+           of r8. */
-+        lsl     r8, r8, r11
-+ 
-+#if defined(L_avr32_f32_addsub)
-+        /* Add all the remainder bits used for rounding into r9 */
-+        or      r9, r8
-+#else
-+        lsr     r8, 24 
-+#endif
-+        rjmp    __avr32_f32_sub_round
-+ 
-+                                
-+        .align  2
-+
-+__avr32_f32_add_from_sub:
-+        /* Switch sign on op2 */
-+        eorh    r11, 0x8000
-+
-+#if defined(L_avr32_f32_addsub_fast)
-+        .global __avr32_f32_add_fast
-+        .type  __avr32_f32_add_fast,@function
-+__avr32_f32_add_fast:
-+#else
-+        .global __avr32_f32_add
-+        .type  __avr32_f32_add,@function
-+__avr32_f32_add:
-+#endif 
-+	
-+        /* Check signs */
-+        eor     r8, r11, r12
-+        /* Different signs, use subtraction. */
-+        brmi    __avr32_f32_sub_from_add
-+ 
-+        /* Get sign of op1 */
-+        mov     r8, r12
-+        andh    r12, 0x8000, COH                
-+ 
-+        /* Remove sign from operands */
-+        cbr     r11, 31
-+#if defined(L_avr32_f32_addsub_fast)
-+        reteq   r8      /* If op2 is zero return op1 */
-+#endif
-+        cbr     r8, 31
-+ 
-+        /* Put the number with the largest exponent in r10
-+           and the number with the smallest exponent in r9 */
-+        max     r10, r8, r11
-+        min     r9, r8, r11
-+ 
-+        /* Unpack exponent and mantissa of op1 */
-+        lsl     r8, r10, 8
-+        sbr     r8, 31  /* Set implicit bit. */
-+        lsr     r10, 23 
-+                
-+        /* op1 is NaN or Inf. */
-+        cp.w    r10, 0xff
-+        breq    __avr32_f32_add_op1_nan_or_inf
-+        
-+        /* Unpack exponent and mantissa of op2 */
-+        lsl     r11, r9, 8
-+        sbr     r11, 31  /* Set implicit bit. */
-+        lsr     r9, 23  
-+ 
-+#if defined(L_avr32_f32_addsub)
-+        /* op2 is either zero or subnormal. */
-+        breq    __avr32_f32_add_op2_subnormal
-+0:      
-+        /* Keep sticky bit for correct IEEE rounding */
-+        st.w    --sp, r12
-+ 
-+        /* Get shift amount to scale mantissa of op2. */
-+        rsub    r9, r10                 
-+ 
-+        /* Saturate the shift amount to 31. If the amount
-+           is any larger op2 is insignificant. */
-+        satu    r9 >> 0, 5      
-+ 
-+        /* Shift mantissa of op2 to same decimal point as the mantissa
-+           of op1. */
-+        lsr     r12, r11, r9
-+ 
-+        /* Put the remainding bits into r11[23:..].*/
-+        rsub    r9, r9, (32-8)
-+        lsl     r11, r11, r9
-+        /* Insert the bits we will remove from the mantissa into r11[31:24] */
-+        bfins   r11, r12, 24, 8
-+ 
-+        /* Now add the mantissas. */
-+        add     r8, r12
-+ 
-+        ld.w    r12, sp++
-+#else
-+        /* Ignore sticky bit to simplify and speed up rounding */
-+        /* op2 is either zero or subnormal. */
-+        breq    __avr32_f32_add_op2_subnormal
-+0:      
-+        /* Get shift amount to scale mantissa of op2. */
-+        rsub    r9, r10                 
-+ 
-+        /* Saturate the shift amount to 31. If the amount
-+           is any larger op2 is insignificant. */
-+        satu    r9 >> 0, 5      
-+ 
-+        /* Shift mantissa of op2 to same decimal point as the mantissa
-+           of op1. */
-+        lsr     r11, r11, r9
-+ 
-+        /* Now add the mantissas. */
-+        add     r8, r11
-+        
-+#endif
-+        /* Check if we overflowed. */
-+        brcs    __avr32_f32_add_res_of
-+1:      
-+        /* Pack result. */
-+        or      r12, r12, r8 >> 8
-+        bfins   r12, r10, 23, 8         
-+ 
-+        /* Round */     
-+#if defined(L_avr32_f32_addsub)
-+	mov_imm	r10, 0x80000000
-+        bld     r12, 0
-+        subne   r10, -1 
-+        cp.w    r11, r10
-+        subhs   r12, -1
-+#else
-+        bld     r8, 7 
-+        acr     r12
-+#endif  
-+
-+        ret     r12     
-+ 
-+__avr32_f32_add_op2_subnormal:
-+        /* Fix implicit bit and adjust exponent of subnormals. */
-+        cbr     r11, 31
-+        /* Set exponent to 1 if we do not have a zero. */
-+        movne   r9,1
-+ 
-+        /* Check if op1 is also subnormal. */
-+        cp.w    r10, 0
-+        brne    0b
-+	/* Both operands subnormal, just add the mantissas and 
-+	   pack. If the addition of the subnormal numbers results
-+	   in a normal number then the exponent will automatically
-+	   be set to 1 by the addition. */
-+        cbr     r8, 31
-+	add	r11, r8
-+	or	r12, r12, r11 >> 8
-+	ret	r12
-+ 
-+__avr32_f32_add_op1_nan_or_inf: 
-+        /* Check if op1 is NaN, if so return NaN */
-+        lsl     r11, r8, 1
-+        retne   -1
-+ 
-+        /* op1 is Inf. */
-+        bfins   r12, r10, 23, 8 /* Generate Inf in r12 */
-+ 
-+        /* Check if op2 is Inf. or NaN */
-+        lsr     r11, r9, 23
-+        cp.w    r11, 0xff
-+        retne   r12             /* op2 not Inf or NaN, return op1 */
-+ 
-+        lsl     r9, 9
-+        reteq   r12             /* op2 Inf return op1 */
-+        ret     -1              /* op2 is NaN, return NaN */ 
-+ 
-+__avr32_f32_add_res_of:
-+        /* We overflowed. Increase exponent and shift mantissa.*/
-+        lsr     r8, 1
-+        sub     r10, -1
-+ 
-+        /* Clear mantissa to set result to Inf if the exponent is 255. */
-+        cp.w    r10, 255
-+        moveq   r8, 0
-+        moveq   r11, 0
-+        rjmp    1b      
-+        
-+        
-+#endif
-+
-+	
-+#if defined(L_avr32_f32_div) || defined(L_avr32_f32_div_fast)
-+	.align	2
-+
-+#if defined(L_avr32_f32_div_fast)
-+        .global __avr32_f32_div_fast
-+        .type  __avr32_f32_div_fast,@function
-+__avr32_f32_div_fast:
-+#else
-+        .global __avr32_f32_div
-+        .type  __avr32_f32_div,@function
-+__avr32_f32_div:
-+#endif
-+	 
-+        eor     r8, r11, r12            /* MSB(r8) = Sign(op1) ^ Sign(op2) */
-+ 
-+        /* Unpack */
-+        lsl     r12,1
-+        lsl     r11,1
-+        breq    4f                      /* Check op2 for zero */
-+
-+        tst     r12, r12
-+        moveq   r9, 0
-+        breq    12f
-+
-+        /* Unpack op1*/ 
-+        /* exp: r9 */
-+        /* sf:  r12 */
-+        lsr     r9, r12, 24
-+        breq    11f /*If number is subnormal*/
-+        cp      r9, 0xff
-+        brhs    2f  /* Check op1 for NaN or Inf */      
-+        lsl     r12, 7
-+        sbr     r12, 31 /*Implicit bit*/
-+12:                     
-+ 
-+        /* Unpack op2*/
-+        /* exp: r10 */
-+        /* sf:  r11 */
-+        lsr     r10, r11, 24
-+        breq    13f /*If number is subnormal*/
-+        cp      r10, 0xff
-+        brhs    3f  /* Check op2 for NaN or Inf */      
-+        lsl     r11,7
-+        sbr     r11, 31 /*Implicit bit*/
-+
-+        cp.w    r9, 0
-+        subfeq  r12, 0
-+        reteq   0                       /* op1 is zero and op2 is not zero */
-+                                        /* or NaN so return zero */
-+
-+14:     
-+ 
-+        /* For UC3, store with predecrement is faster than stm */
-+        st.w    --sp, r5
-+        st.d    --sp, r6
-+ 
-+        /* Calculate new exponent */
-+        sub     r9, r10
-+        sub     r9,-127
-+ 
-+        /* Divide */
-+        /* Approximating 1/d with the following recurrence: */
-+        /* R[j+1] = R[j]*(2-R[j]*d) */
-+        /* Using 2.30 format */
-+        /* TWO:  r10 */
-+        /* d:    r5 */
-+        /* Multiply result :     r6, r7 */
-+        /* Initial guess :       r11 */
-+        /* New approximations :  r11 */
-+        /* Dividend :            r12 */
-+
-+	/* Load TWO */
-+	mov_imm	r10, 0x80000000 
-+         
-+        lsr     r12, 2     /* Get significand of Op1 in 2.30 format */
-+        lsr     r5, r11, 2 /* Get significand of Op2 (=d) in 2.30 format */
-+ 
-+        /* Load initial guess, using look-up table */
-+        /* Initial guess is of format 01.XY, where XY is constructed as follows: */
-+        /* Let d be of following format: 00.1xy....., then XY=~xy */
-+        /* For d=00.100 = 0,5   -> initial guess=01.11 = 1,75 */
-+        /* For d=00.101 = 0,625 -> initial guess=01.11 = 1,5  */
-+        /* For d=00.110 = 0,75  -> initial guess=01.11 = 1,25 */
-+        /* For d=00.111 = 0,875 -> initial guess=01.11 = 1,0  */
-+ 
-+        lsr     r11, r10, 1
-+        bfextu  r6, r5, 27, 2
-+        com     r6
-+        bfins   r11, r6, 28, 2
-+ 
-+        /* First approximation */
-+        /* r7 = R[j]*d */
-+        mulu.d  r6, r11, r5
-+        /* r7 = 2-R[j]*d */
-+        sub    r7, r10, r7<<2
-+        /* r11 = R[j]*(2-R[j]*d) */
-+        mulu.d  r6, r11, r7
-+        lsl     r11, r7, 2
-+         
-+        /* Second approximation */
-+        /* r7 = R[j]*d */
-+        mulu.d  r6, r11, r5
-+        /* r7 = 2-R[j]*d */
-+        sub    r7, r10, r7<<2
-+        /* r11 = R[j]*(2-R[j]*d) */
-+        mulu.d  r6, r11, r7
-+        lsl     r11, r7, 2
-+         
-+        /* Third approximation */
-+        /* r7 = R[j]*d */
-+        mulu.d  r6, r11, r5
-+        /* r7 = 2-R[j]*d */
-+        sub    r7, r10, r7<<2
-+        /* r11 = R[j]*(2-R[j]*d) */
-+        mulu.d  r6, r11, r7
-+        lsl     r11, r7, 2
-+ 
-+        /* Fourth approximation */
-+        /* r7 = R[j]*d */
-+        mulu.d  r6, r11, r5
-+        /* r7 = 2-R[j]*d */
-+        sub    r7, r10, r7<<2
-+        /* r11 = R[j]*(2-R[j]*d) */
-+        mulu.d  r6, r11, r7
-+        lsl     r11, r7, 2
-+ 
-+ 
-+        /* Multiply with dividend to get quotient, r7 = sf(op1)/sf(op2) */
-+        mulu.d  r6, r11, r12
-+ 
-+        /* Shift by 3 to get result in 1.31 format, as required by the exponent. */
-+        /* Note that 1.31 format is already used by the exponent in r9, since */
-+        /* a bias of 127 was added to the result exponent, even though the implicit */
-+        /* bit was inserted. This gives the exponent an additional bias of 1, which */
-+        /* supports 1.31 format. */
-+	//lsl     r10, r7, 3
-+
-+	/* Adjust exponent and mantissa in case the result is of format
-+	   0000.1xxx to 0001.xxx*/	
-+#if defined(L_avr32_f32_div)
-+	lsr	r12, 4	/* Scale dividend to 6.26 format to match the
-+			   result of the multiplication of the divisor and 
-+			   quotient to get the remainder. */
-+#endif
-+	bld	r7, 31-3
-+	breq	0f
-+	lsl	r7, 1	
-+	sub	r9, 1
-+#if defined(L_avr32_f32_div)
-+	lsl	r12, 1	/* Scale dividend to 5.27 format to match the
-+			   result of the multiplication of the divisor and 
-+			   quotient to get the remainder. */
-+#endif
-+0:		
-+        cp      r9, 0   
-+        brle    __avr32_f32_div_res_subnormal /* Result was subnormal. */
-+
-+		
-+#if defined(L_avr32_f32_div)
-+	/* In order to round correctly we calculate the remainder:	
-+	   Remainder = dividend[r12] - divisor[r5]*quotient[r7] 
-+	   for the case when the quotient is halfway between the round-up
-+	   value and the round down value. If the remainder then is negative
-+	   it means that the quotient was to big and that it should not be
-+           rounded up, if the remainder is positive the quotient was to small
-+	   and we need to round up. If the remainder is zero it means that the
-+	   quotient is exact but since we need to remove the guard bit we should
-+	   round to even. */
-+	andl	r7, 0xffe0
-+	orl	r7, 0x0010
-+
-+	/* Now do the multiplication. The quotient has the format 4.28
-+	   while the divisor has the format 2.30 which gives a result
-+	   of 6.26 */
-+	mulu.d	r10, r5, r7
-+
-+	/* Check if remainder is positive, negative or equal. */
-+	bfextu	r5, r7, 5, 1  /* Get parity bit into bit 0 of r5 */ 
-+	cp	r10, 0
-+__avr32_f32_div_round_subnormal:	
-+	cpc	r11, r12
-+	srlo	r11	/* Remainder positive:	 we need to round up.*/
-+	moveq	r11, r5  /* Remainder zero:	 round up if mantissa odd. */
-+#else
-+	bfextu	r11, r7, 4, 1  /* Get guard bit */ 	
-+#endif
-+                               
-+        /* Pack final result*/
-+        lsr     r12, r7, 5
-+        bfins   r12, r9, 23, 8
-+        /* For UC3, load with postincrement is faster than ldm */
-+        ld.d    r6, sp++
-+        ld.w    r5, sp++
-+        bld     r8, 31
-+        bst     r12, 31
-+	/* Rounding add. */
-+	add	r12, r11
-+        ret     r12
-+
-+__divsf_return_op1:     
-+        lsl     r8, 1
-+        ror     r12
-+        ret     r12
-+ 
-+ 
-+2:
-+        /* Op1 is NaN or inf */
-+        retne   -1      /* Return NaN if op1 is NaN */
-+        /* Op1 is inf check op2 */
-+	mov_imm	r9, 0xff000000
-+        cp      r11, r9
-+        brlo    __divsf_return_op1 /* inf/number gives inf */
-+        ret     -1      /* The rest gives NaN*/
-+3:      
-+        /* Op2 is NaN or inf */
-+        reteq   0       /* Return zero if number/inf*/
-+        ret     -1      /* Return NaN*/
-+4:
-+        /* Op1 is zero ? */
-+        tst     r12,r12
-+        reteq   -1      /* 0.0/0.0 is NaN */
-+        /* Op1 is Nan? */
-+        lsr     r9, r12, 24
-+        breq    11f /*If number is subnormal*/
-+        cp      r9, 0xff
-+        brhs    2b  /* Check op1 for NaN or Inf */
-+        /* Nonzero/0.0 is Inf. Sign bit will be shifted in before returning*/
-+	mov_imm	r12, 0xff000000
-+        rjmp    __divsf_return_op1
-+                
-+11:     /* Op1 was denormal. Fix it. */
-+        lsl     r12,7
-+        clz     r9,r12
-+        lsl     r12,r12,r9
-+        rsub    r9,r9,1
-+        rjmp    12b
-+ 
-+13:     /* Op2 was denormal. Fix it. */ 
-+        lsl     r11,7
-+        clz     r10,r11
-+        lsl     r11,r11,r10
-+        rsub    r10,r10,1
-+        rjmp    14b
-+        
-+ 
-+__avr32_f32_div_res_subnormal:     /* Divide result was subnormal */
-+#if defined(L_avr32_f32_div)
-+	/* Check how much we must scale down the mantissa. */
-+	neg	r9
-+	sub	r9, -1     /* We do no longer have an implicit bit. */
-+	satu	r9 >> 0, 5 /* Saturate shift amount to max 32. */
-+	/* Scale down quotient */
-+	rsub	r10, r9, 32
-+	lsr	r7, r7, r9
-+	/* Scale down the dividend to match the scaling of the quotient. */
-+	lsl	r6, r12, r10	/* Make the divident 64-bit and put the lsw in r6 */
-+	lsr	r12, r12, r9
-+
-+	/* Start performing the same rounding as done for normal numbers
-+	   but this time we have scaled the quotient and dividend and hence
-+	   need a little different comparison. */
-+	andl	r7, 0xffe0
-+	orl	r7, 0x0010
-+
-+	/* Now do the multiplication. The quotient has the format 4.28
-+	   while the divisor has the format 2.30 which gives a result
-+	   of 6.26 */
-+	mulu.d	r10, r5, r7
-+
-+	/* Set exponent to 0 */
-+	mov	r9, 0	
-+
-+	/* Check if remainder is positive, negative or equal. */
-+	bfextu	r5, r7, 5, 1  /* Get parity bit into bit 0 of r5 */ 
-+	cp	r10, r6
-+	rjmp	__avr32_f32_div_round_subnormal
-+
-+#else
-+        ld.d    r6, sp++
-+        ld.w    r5, sp++
-+        /*Flush to zero*/
-+	ret	0
-+#endif
-+#endif
-+ 
-+#ifdef L_avr32_f32_mul
-+        .global __avr32_f32_mul
-+        .type  __avr32_f32_mul,@function
-+ 
-+                
-+__avr32_f32_mul:
-+        mov     r8, r12
-+        eor     r12, r11                /* MSB(r8) = Sign(op1) ^ Sign(op2) */
-+        andh    r12, 0x8000, COH
-+        
-+        /* arrange operands so that that op1 >= op2 */
-+        cbr     r8, 31
-+        breq    __avr32_f32_mul_op1_zero
-+        cbr     r11, 31
-+ 
-+        /* Put the number with the largest exponent in r10
-+           and the number with the smallest exponent in r9 */
-+        max     r10, r8, r11
-+        min     r9, r8, r11
-+ 
-+        /* Unpack exponent and mantissa of op1 */
-+        lsl     r8, r10, 8
-+        sbr     r8, 31  /* Set implicit bit. */
-+        lsr     r10, 23 
-+                
-+        /* op1 is NaN or Inf. */
-+        cp.w    r10, 0xff
-+        breq    __avr32_f32_mul_op1_nan_or_inf
-+        
-+        /* Unpack exponent and mantissa of op2 */
-+        lsl     r11, r9, 8
-+        sbr     r11, 31  /* Set implicit bit. */
-+        lsr     r9, 23  
-+ 
-+        /* op2 is either zero or subnormal. */
-+        breq    __avr32_f32_mul_op2_subnormal
-+0:      
-+        /* Calculate new exponent */
-+        add     r9,r10
-+ 
-+        /* Do the multiplication */
-+        mulu.d  r10,r8,r11
-+ 
-+        /* We might need to scale up by two if the MSB of the result is
-+           zero. */
-+        lsl     r8, r11, 1
-+        movcc   r11, r8
-+        subcc   r9, 1
-+ 
-+        /* Put the shifted out bits of the mantissa into r10 */
-+        lsr     r10, 8
-+        bfins   r10, r11, 24, 8
-+                
-+        sub     r9,(127-1)              /* remove extra exponent bias */
-+        brle    __avr32_f32_mul_res_subnormal
-+ 
-+        /* Check for Inf. */
-+        cp.w    r9, 0xff
-+        brge    1f
-+ 
-+        /* Pack result. */
-+        or      r12, r12, r11 >> 8
-+        bfins   r12, r9, 23, 8          
-+ 
-+        /* Round */     
-+__avr32_f32_mul_round:
-+	mov_imm	r8, 0x80000000
-+        bld     r12, 0
-+        subne   r8, -1  
-+ 
-+        cp.w    r10, r8
-+        subhs   r12, -1
-+        
-+        ret     r12     
-+ 
-+1:      
-+        /* Return Inf */        
-+        orh     r12, 0x7f80
-+        ret     r12
-+ 
-+__avr32_f32_mul_op2_subnormal:
-+        cbr     r11, 31
-+        clz     r9, r11
-+        retcs   0       /* op2 is zero. Return 0 */
-+        sub     r9, 8
-+        lsl     r11, r11, r9
-+        rsub    r9, r9, 1
-+                
-+        /* Check if op2 is subnormal. */
-+        tst     r10, r10
-+        brne    0b
-+ 
-+        /* op2 is subnormal */  
-+        cbr     r8, 31
-+        clz     r10, r11
-+        retcs   0       /* op1 is zero. Return 0 */
-+        lsl     r8, r8, r10
-+        rsub    r10, r10, 1
-+                        
-+        rjmp    0b
-+                
-+ 
-+__avr32_f32_mul_op1_nan_or_inf:
-+        /* Check if op1 is NaN, if so return NaN */
-+        lsl     r11, r8, 1
-+        retne   -1
-+ 
-+        /* op1 is Inf. */
-+        tst     r9, r9
-+        reteq   -1      /* Inf * 0 -> NaN */
-+ 
-+        bfins   r12, r10, 23, 8 /* Generate Inf in r12 */
-+ 
-+        /* Check if op2 is Inf. or NaN */
-+        lsr     r11, r9, 23
-+        cp.w    r11, 0xff
-+        retne   r12             /* op2 not Inf or NaN, return Info */
-+ 
-+        lsl     r9, 9
-+        reteq   r12             /* op2 Inf return Inf */
-+        ret     -1              /* op2 is NaN, return NaN */ 
-+        
-+__avr32_f32_mul_res_subnormal:
-+        /* Check if the number is so small that
-+           it will be represented with zero. */
-+        rsub    r9, r9, 9
-+        rsub    r8, r9, 32
-+        retcs   0
-+ 
-+        /* Shift the mantissa into the correct position.*/
-+        lsr     r9, r11, r9
-+        /* Add sign bit. */
-+        or      r12, r9
-+        /* Put the shifted out bits in the most significant part
-+           of r8. */
-+        lsl     r11, r11, r8
-+ 
-+        /* Add all the remainder bits used for rounding into r11 */
-+        andh    r10, 0x00FF     
-+        or      r10, r11
-+        rjmp    __avr32_f32_mul_round
-+
-+__avr32_f32_mul_op1_zero:
-+        bfextu  r10, r11, 23, 8
-+        cp.w    r10, 0xff
-+        retne   r12
-+        reteq   -1        
-+ 
-+#endif  
-+ 
-+        
-+#ifdef L_avr32_s32_to_f32
-+        .global __avr32_s32_to_f32
-+        .type  __avr32_s32_to_f32,@function
-+__avr32_s32_to_f32:
-+        cp      r12, 0
-+        reteq   r12     /* If zero then return zero float */
-+        mov     r11, r12 /* Keep the sign */
-+        abs     r12     /* Compute the absolute value */
-+        mov     r10, 31 + 127   /* Set the correct exponent */
-+        
-+        /* Normalize */
-+        normalize_sf    r10 /*exp*/, r12 /*mant*/, r9 /*scratch*/       
-+ 
-+        /* Check for subnormal result */
-+        cp.w    r10, 0
-+        brle    __avr32_s32_to_f32_subnormal
-+ 
-+        round_sf        r10 /*exp*/, r12 /*mant*/, r9 /*scratch*/       
-+        pack_sf         r12 /*sf*/, r10 /*exp*/, r12 /*mant*/
-+        lsl     r11, 1
-+        ror     r12
-+        ret     r12             
-+ 
-+__avr32_s32_to_f32_subnormal:
-+        /* Adjust a subnormal result */
-+        adjust_subnormal_sf     r12/*sf*/, r10 /*exp*/, r12 /*mant*/, r11/*sign*/, r9 /*scratch*/
-+        ret     r12
-+        
-+#endif
-+ 
-+#ifdef L_avr32_u32_to_f32
-+        .global __avr32_u32_to_f32
-+        .type  __avr32_u32_to_f32,@function
-+__avr32_u32_to_f32:
-+        cp      r12, 0
-+        reteq   r12     /* If zero then return zero float */
-+        mov     r10, 31 + 127   /* Set the correct exponent */
-+        
-+        /* Normalize */
-+        normalize_sf    r10 /*exp*/, r12 /*mant*/, r9 /*scratch*/       
-+ 
-+        /* Check for subnormal result */
-+        cp.w    r10, 0
-+        brle    __avr32_u32_to_f32_subnormal
-+ 
-+        round_sf        r10 /*exp*/, r12 /*mant*/, r9 /*scratch*/       
-+        pack_sf         r12 /*sf*/, r10 /*exp*/, r12 /*mant*/
-+        lsr     r12,1   /* Sign bit is 0 for unsigned int */
-+        ret     r12             
-+ 
-+__avr32_u32_to_f32_subnormal:
-+        /* Adjust a subnormal result */
-+        mov     r8, 0
-+        adjust_subnormal_sf     r12/*sf*/,r10 /*exp*/, r12 /*mant*/,r8/*sign*/, r9 /*scratch*/
-+        ret     r12
-+        
-+        
-+#endif
-+        
-+ 
-+#ifdef L_avr32_f32_to_s32
-+        .global __avr32_f32_to_s32
-+        .type  __avr32_f32_to_s32,@function
-+__avr32_f32_to_s32:
-+        bfextu  r11, r12, 23, 8
-+        sub     r11,127                 /* Fix bias */
-+        retlo   0                       /* Negative exponent yields zero integer */
-+ 
-+        /* Shift mantissa into correct position */
-+        rsub    r11,r11,31      /* Shift amount */
-+        lsl     r10,r12,8       /* Get mantissa */
-+        sbr     r10,31          /* Add implicit bit */
-+        lsr     r10,r10,r11     /* Perform shift */
-+        lsl     r12,1           /* Check sign */
-+        retcc   r10             /* if positive, we are done */
-+        neg     r10             /* if negative float, negate result */
-+        ret     r10
-+ 
-+#endif  
-+        
-+#ifdef L_avr32_f32_to_u32
-+        .global __avr32_f32_to_u32
-+        .type  __avr32_f32_to_u32,@function
-+__avr32_f32_to_u32:
-+        cp      r12,0
-+        retmi   0                       /* Negative numbers gives 0 */
-+        bfextu  r11, r12, 23, 8         /* Extract exponent */
-+        sub     r11,127                 /* Fix bias */
-+        retlo   0                       /* Negative exponent yields zero integer */
-+ 
-+        /* Shift mantissa into correct position */
-+        rsub    r11,r11,31      /* Shift amount */
-+        lsl     r12,8           /* Get mantissa */
-+        sbr     r12,31          /* Add implicit bit */
-+        lsr     r12,r12,r11     /* Perform shift */
-+        ret     r12
-+ 
-+#endif  
-+ 
-+#ifdef L_avr32_f32_to_f64
-+        .global __avr32_f32_to_f64
-+        .type  __avr32_f32_to_f64,@function
-+ 
-+__avr32_f32_to_f64:
-+        lsl     r11,r12,1               /* Remove sign bit, keep original value in r12*/
-+        moveq   r10, 0
-+        reteq   r11                     /* Return zero if input is zero */
-+ 
-+        bfextu  r9,r11,24,8              /* Get exponent */
-+        cp.w    r9,0xff                 /* check for NaN or inf */
-+        breq    0f
-+ 
-+        lsl     r11,7                   /* Convert sf mantissa to df format */
-+        mov     r10,0
-+ 
-+        /* Check if implicit bit should be set */
-+        cp.w    r9, 0
-+        subeq   r9,-1                    /* Adjust exponent if it was 0 */
-+        srne    r8
-+        or      r11, r11, r8 << 31      /* Set implicit bit if needed */
-+        sub     r9,(127-0x3ff)          /* Convert exponent to df format exponent */
-+ 
-+        /*We know that low register of mantissa is 0, and will be unaffected by normalization.*/
-+        /*We can therefore use the faster normalize_sf function instead of normalize_df.*/
-+        normalize_sf    r9 /*exp*/, r11 /*mantissa*/, r8 /*scratch*/
-+        pack_df         r9 /*exp*/, r10, r11 /*mantissa*/, r10, r11 /*df*/
-+ 
-+__extendsfdf_return_op1:        
-+        /* Rotate in sign bit */
-+        lsl     r12, 1
-+        ror     r11
-+        ret     r11
-+                        
-+0:
-+        /* Inf or NaN*/
-+	mov_imm	r10, 0xffe00000
-+        lsl     r11,8                   /* check mantissa */
-+        movne   r11, -1                 /* Return NaN */
-+        moveq   r11, r10                /* Return inf */
-+        mov     r10, 0
-+        rjmp    __extendsfdf_return_op1
-+#endif                  
-+ 
-+ 
-+#ifdef L_avr32_f64_to_f32
-+        .global __avr32_f64_to_f32
-+        .type  __avr32_f64_to_f32,@function
-+ 
-+__avr32_f64_to_f32:
-+        /* Unpack */
-+        lsl     r9,r11,1                /* Unpack exponent */
-+        lsr     r9,21
-+ 
-+        reteq   0                       /* If exponent is 0 the number is so small
-+                                           that the conversion to single float gives
-+                                           zero */
-+ 
-+        lsl     r8,r11,10                  /* Adjust mantissa */
-+        or      r12,r8,r10>>22
-+ 
-+        lsl     r10,10                  /* Check if there are any remaining bits
-+                                           in the low part of the mantissa.*/
-+        neg     r10
-+        rol     r12                     /* If there were remaining bits then set lsb
-+                                           of mantissa to 1 */
-+ 
-+        cp      r9,0x7ff
-+        breq    2f                      /* Check for NaN or inf */
-+ 
-+        sub     r9,(0x3ff-127)          /* Adjust bias of exponent */
-+        sbr     r12,31                  /* set the implicit bit.*/
-+ 
-+        cp.w    r9, 0                   /* Check for subnormal number */
-+        brle    3f
-+ 
-+        round_sf        r9 /*exp*/, r12 /*mant*/, r10 /*scratch*/       
-+        pack_sf         r12 /*sf*/, r9 /*exp*/, r12 /*mant*/
-+__truncdfsf_return_op1: 
-+        /* Rotate in sign bit */
-+        lsl     r11, 1
-+        ror     r12
-+        ret     r12             
-+        
-+2:
-+        /* NaN or inf */
-+        cbr     r12,31                  /* clear implicit bit */
-+        retne   -1                      /* Return NaN if mantissa not zero */
-+	mov_imm	r12, 0x7f800000
-+        ret     r12                     /* Return inf */
-+ 
-+3:      /* Result is subnormal. Adjust it.*/
-+        adjust_subnormal_sf     r12/*sf*/,r9 /*exp*/, r12 /*mant*/, r11/*sign*/, r10 /*scratch*/
-+        ret     r12
-+        
-+                
-+#endif
-+ 
-+#if defined(L_mulsi3) && defined(__AVR32_NO_MUL__)
-+	.global __mulsi3
-+	.type __mulsi3,@function
-+
-+__mulsi3:
-+	mov r9, 0
-+0:
-+	lsr r11, 1
-+	addcs r9, r9, r12
-+	breq 1f
-+	lsl r12, 1
-+	rjmp 0b
-+1:
-+	ret r9
-+#endif
-diff -Nur gcc-4.4.6.orig/gcc/config/avr32/lib2funcs.S gcc-4.4.6/gcc/config/avr32/lib2funcs.S
---- gcc-4.4.6.orig/gcc/config/avr32/lib2funcs.S	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.4.6/gcc/config/avr32/lib2funcs.S	2011-10-22 19:23:08.524581303 +0200
-@@ -0,0 +1,21 @@
-+	.align	4
-+	.global __nonlocal_goto
-+	.type  __nonlocal_goto,@function
-+
-+/* __nonlocal_goto:	This function handles nonlocal_goto's in gcc.
-+
-+	parameter 0 (r12) = New Frame Pointer
-+	parameter 1 (r11) = Address to goto
-+	parameter 2 (r10) = New Stack Pointer
-+
-+	This function invalidates the return stack, since it returns from a
-+	function without using a return instruction.
-+*/
-+__nonlocal_goto:
-+	mov	r7, r12
-+	mov	sp, r10
-+	frs			# Flush return stack
-+	mov	pc, r11
-+
-+
-+		
-diff -Nur gcc-4.4.6.orig/gcc/config/avr32/linux-elf.h gcc-4.4.6/gcc/config/avr32/linux-elf.h
---- gcc-4.4.6.orig/gcc/config/avr32/linux-elf.h	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.4.6/gcc/config/avr32/linux-elf.h	2011-10-22 19:23:08.524581303 +0200
-@@ -0,0 +1,151 @@
-+/*
-+   Linux/Elf specific definitions.
-+   Copyright 2003-2006 Atmel Corporation.
-+
-+   Written by Ronny Pedersen, Atmel Norway, <rpedersen@atmel.com>
-+   and H�vard Skinnemoen, Atmel Norway, <hskinnemoen@atmel.com>
-+
-+   This file is part of GCC.
-+
-+   This program is free software; you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; either version 2 of the License, or
-+   (at your option) any later version.
-+
-+   This program is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with this program; if not, write to the Free Software
-+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-+
-+
-+
-+/* elfos.h should have already been included.  Now just override
-+   any conflicting definitions and add any extras.  */
-+
-+/* Run-time Target Specification.  */
-+#undef  TARGET_VERSION
-+#define TARGET_VERSION  fputs (" (AVR32 GNU/Linux with ELF)", stderr);
-+
-+/* Do not assume anything about header files.  */
-+#define NO_IMPLICIT_EXTERN_C
-+
-+/* The GNU C++ standard library requires that these macros be defined.  */
-+#undef CPLUSPLUS_CPP_SPEC
-+#define CPLUSPLUS_CPP_SPEC "-D_GNU_SOURCE %(cpp)"
-+
-+/* Now we define the strings used to build the spec file.  */
-+#undef  LIB_SPEC
-+#define LIB_SPEC \
-+  "%{pthread:-lpthread} \
-+   %{shared:-lc} \
-+   %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
-+
-+/* Provide a STARTFILE_SPEC appropriate for GNU/Linux.  Here we add
-+   the GNU/Linux magical crtbegin.o file (see crtstuff.c) which
-+   provides part of the support for getting C++ file-scope static
-+   object constructed before entering `main'.  */
-+
-+#undef  STARTFILE_SPEC
-+#define STARTFILE_SPEC \
-+  "%{!shared: \
-+     %{pg:gcrt1.o%s} %{!pg:%{p:gcrt1.o%s} \
-+		       %{!p:%{profile:gcrt1.o%s} \
-+			 %{!profile:crt1.o%s}}}} \
-+   crti.o%s %{!shared:crtbegin.o%s} %{shared:crtbeginS.o%s}"
-+
-+/* Provide a ENDFILE_SPEC appropriate for GNU/Linux.  Here we tack on
-+   the GNU/Linux magical crtend.o file (see crtstuff.c) which
-+   provides part of the support for getting C++ file-scope static
-+   object constructed before entering `main', followed by a normal
-+   GNU/Linux "finalizer" file, `crtn.o'.  */
-+
-+#undef  ENDFILE_SPEC
-+#define ENDFILE_SPEC \
-+  "%{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s"
-+
-+#undef ASM_SPEC
-+#define ASM_SPEC "%{!mno-pic:%{!fno-pic:--pic}} %{mrelax|O*:%{mno-relax|O0|O1: ;:--linkrelax}} %{mcpu=*:-mcpu=%*}"
-+ 
-+#undef  LINK_SPEC
-+#define LINK_SPEC "%{version:-v} \
-+   %{static:-Bstatic} \
-+   %{shared:-shared} \
-+   %{symbolic:-Bsymbolic} \
-+   %{rdynamic:-export-dynamic} \
-+   %{!dynamic-linker:-dynamic-linker /lib/ld-uClibc.so.0} \
-+   %{mrelax|O*:%{mno-relax|O0|O1: ;:--relax}}"
-+
-+#define TARGET_OS_CPP_BUILTINS() LINUX_TARGET_OS_CPP_BUILTINS()
-+
-+/* This is how we tell the assembler that two symbols have the same value.  */
-+#define ASM_OUTPUT_DEF(FILE, NAME1, NAME2) \
-+  do					   \
-+    {					   \
-+      assemble_name (FILE, NAME1); 	   \
-+      fputs (" = ", FILE);		   \
-+      assemble_name (FILE, NAME2);	   \
-+      fputc ('\n', FILE);		   \
-+    }					   \
-+  while (0)
-+
-+
-+
-+#undef  CC1_SPEC
-+#define CC1_SPEC "%{profile:-p}"
-+
-+/* Target CPU builtins.  */
-+#define TARGET_CPU_CPP_BUILTINS()				\
-+  do								\
-+    {								\
-+      builtin_define ("__avr32__");				\
-+      builtin_define ("__AVR32__");				\
-+      builtin_define ("__AVR32_LINUX__");			\
-+      builtin_define (avr32_part->macro);			\
-+      builtin_define (avr32_arch->macro);			\
-+      if (avr32_arch->uarch_type == UARCH_TYPE_AVR32A)		\
-+	builtin_define ("__AVR32_AVR32A__");			\
-+      else							\
-+	builtin_define ("__AVR32_AVR32B__");			\
-+      if (TARGET_UNALIGNED_WORD)				\
-+	builtin_define ("__AVR32_HAS_UNALIGNED_WORD__");	\
-+      if (TARGET_SIMD)						\
-+	builtin_define ("__AVR32_HAS_SIMD__");			\
-+      if (TARGET_DSP)						\
-+	builtin_define ("__AVR32_HAS_DSP__");			\
-+      if (TARGET_RMW)						\
-+	builtin_define ("__AVR32_HAS_RMW__");			\
-+      if (TARGET_BRANCH_PRED)					\
-+	builtin_define ("__AVR32_HAS_BRANCH_PRED__");		\
-+      if (TARGET_FAST_FLOAT)                                    \
-+        builtin_define ("__AVR32_FAST_FLOAT__");                \
-+    }								\
-+  while (0)
-+
-+
-+
-+/* Call the function profiler with a given profile label.  */
-+#undef  FUNCTION_PROFILER
-+#define FUNCTION_PROFILER(STREAM, LABELNO)				\
-+  do									\
-+    {									\
-+      fprintf (STREAM, "\tmov\tlr, lo(mcount)\n\torh\tlr, hi(mcount)\n"); \
-+      fprintf (STREAM, "\ticall lr\n");					\
-+    }									\
-+  while (0)
-+
-+#define NO_PROFILE_COUNTERS 1
-+
-+/* For dynamic libraries to work */
-+/* #define PLT_REG_CALL_CLOBBERED 1 */
-+#define AVR32_ALWAYS_PIC 1
-+
-+/* uclibc does not implement sinf, cosf etc. */
-+#undef TARGET_C99_FUNCTIONS
-+#define TARGET_C99_FUNCTIONS 0
-+
-+#define LINK_GCC_C_SEQUENCE_SPEC \
-+  "%{static:--start-group} %G %L %{static:--end-group}%{!static:%G}"
-diff -Nur gcc-4.4.6.orig/gcc/config/avr32/predicates.md gcc-4.4.6/gcc/config/avr32/predicates.md
---- gcc-4.4.6.orig/gcc/config/avr32/predicates.md	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.4.6/gcc/config/avr32/predicates.md	2011-10-22 19:23:08.524581303 +0200
-@@ -0,0 +1,422 @@
-+;;   AVR32 predicates file.
-+;;   Copyright 2003-2006 Atmel Corporation.
-+;;
-+;;   Written by Ronny Pedersen, Atmel Norway, <rpedersen@atmel.com>
-+;;
-+;;   This file is part of GCC.
-+;;
-+;;   This program is free software; you can redistribute it and/or modify
-+;;   it under the terms of the GNU General Public License as published by
-+;;   the Free Software Foundation; either version 2 of the License, or
-+;;   (at your option) any later version.
-+;;
-+;;   This program is distributed in the hope that it will be useful,
-+;;   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+;;   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+;;   GNU General Public License for more details.
-+;;
-+;;   You should have received a copy of the GNU General Public License
-+;;   along with this program; if not, write to the Free Software
-+;;   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+
-+
-+;; True if the operand is a memory reference which contains an
-+;; Address consisting of a single pointer register
-+(define_predicate "avr32_indirect_register_operand"
-+  (and (match_code "mem")
-+       (match_test "register_operand(XEXP(op, 0), SImode)")))
-+
-+
-+
-+;; Address expression with a base pointer offset with
-+;; a register displacement
-+(define_predicate "avr32_indexed_memory_operand"
-+  (and (match_code "mem")
-+       (match_test "GET_CODE(XEXP(op, 0)) == PLUS"))
-+  {
-+
-+   rtx op0 = XEXP(XEXP(op, 0), 0);
-+   rtx op1 = XEXP(XEXP(op, 0), 1);
-+
-+   return ((avr32_address_register_rtx_p (op0, 0)
-+            && avr32_legitimate_index_p (GET_MODE(op), op1, 0))
-+	   || (avr32_address_register_rtx_p (op1, 0)
-+            && avr32_legitimate_index_p (GET_MODE(op), op0, 0)));
-+
-+ })
-+
-+;; Operand suitable for the ld.sb instruction
-+(define_predicate "load_sb_memory_operand"
-+  (ior (match_operand 0 "avr32_indirect_register_operand")
-+       (match_operand 0 "avr32_indexed_memory_operand")))
-+
-+
-+;; Operand suitable as operand to insns sign extending QI values
-+(define_predicate "extendqi_operand"
-+  (ior (match_operand 0 "load_sb_memory_operand")
-+       (match_operand 0 "register_operand")))
-+
-+(define_predicate "post_inc_memory_operand"
-+  (and (match_code "mem")
-+       (match_test "(GET_CODE(XEXP(op, 0)) == POST_INC)
-+                     && REG_P(XEXP(XEXP(op, 0), 0))")))
-+
-+(define_predicate "pre_dec_memory_operand"
-+  (and (match_code "mem")
-+       (match_test "(GET_CODE(XEXP(op, 0)) == PRE_DEC)
-+                     && REG_P(XEXP(XEXP(op, 0), 0))")))
-+
-+;; Operand suitable for add instructions
-+(define_predicate "avr32_add_operand"
-+  (ior (match_operand 0 "register_operand")
-+       (and (match_operand 0 "immediate_operand")
-+            (match_test "CONST_OK_FOR_CONSTRAINT_P(INTVAL(op), 'I', \"Is21\")"))))
-+
-+;; Operand is a power of two immediate
-+(define_predicate "power_of_two_operand"
-+  (match_code "const_int")
-+{
-+  HOST_WIDE_INT value = INTVAL (op);
-+
-+  return value != 0 && (value & (value - 1)) == 0;
-+})
-+
-+;; Operand is a multiple of 8 immediate
-+(define_predicate "multiple_of_8_operand"
-+  (match_code "const_int")
-+{
-+  HOST_WIDE_INT value = INTVAL (op);
-+
-+  return (value & 0x7) == 0 ;
-+})
-+
-+;; Operand is a multiple of 16 immediate
-+(define_predicate "multiple_of_16_operand"
-+  (match_code "const_int")
-+{
-+  HOST_WIDE_INT value = INTVAL (op);
-+
-+  return (value & 0xf) == 0 ;
-+})
-+
-+;; Operand is a mask used for masking away upper bits of a reg
-+(define_predicate "avr32_mask_upper_bits_operand"
-+  (match_code "const_int")
-+{
-+  HOST_WIDE_INT value = INTVAL (op) + 1;
-+
-+  return value != 1 && value != 0 && (value & (value - 1)) == 0;
-+})
-+
-+
-+;; Operand suitable for mul instructions
-+(define_predicate "avr32_mul_operand"
-+  (ior (match_operand 0 "register_operand")
-+       (and (match_operand 0 "immediate_operand")
-+            (match_test "CONST_OK_FOR_CONSTRAINT_P(INTVAL(op), 'K', \"Ks08\")"))))
-+
-+;; True for logical binary operators.
-+(define_predicate "logical_binary_operator"
-+  (match_code "ior,xor,and"))
-+
-+;; True for logical shift operators
-+(define_predicate "logical_shift_operator"
-+  (match_code "ashift,lshiftrt"))
-+
-+;; True for shift operand for logical and, or and eor insns
-+(define_predicate "avr32_logical_shift_operand"
-+  (and (match_code "ashift,lshiftrt")
-+       (ior (and (match_test "GET_CODE(XEXP(op, 1)) == CONST_INT")
-+                 (match_test "register_operand(XEXP(op, 0), GET_MODE(XEXP(op, 0)))"))
-+            (and (match_test "GET_CODE(XEXP(op, 0)) == CONST_INT")
-+                 (match_test "register_operand(XEXP(op, 1), GET_MODE(XEXP(op, 1)))"))))
-+  )
-+
-+
-+;; Predicate for second operand to and, ior and xor insn patterns
-+(define_predicate "avr32_logical_insn_operand"
-+  (ior (match_operand 0 "register_operand")
-+       (match_operand 0 "avr32_logical_shift_operand"))
-+)
-+
-+
-+;; True for avr32 comparison operators
-+(define_predicate "avr32_comparison_operator"
-+  (ior (match_code "eq, ne, gt, ge, lt, le, gtu, geu, ltu, leu")
-+       (and (match_code "unspec")
-+            (match_test "(XINT(op, 1) == UNSPEC_COND_MI)
-+                         || (XINT(op, 1) == UNSPEC_COND_PL)"))))
-+
-+(define_predicate "avr32_cond3_comparison_operator"
-+  (ior (match_code "eq, ne, ge, lt, geu, ltu")
-+       (and (match_code "unspec")
-+            (match_test "(XINT(op, 1) == UNSPEC_COND_MI)
-+                         || (XINT(op, 1) == UNSPEC_COND_PL)"))))
-+
-+;; True for avr32 comparison operand
-+(define_predicate "avr32_comparison_operand"
-+  (ior (and (match_code "eq, ne, gt, ge, lt, le, gtu, geu, ltu, leu")
-+            (match_test "(CC0_P (XEXP(op,0)) && rtx_equal_p (XEXP(op,1), const0_rtx))"))
-+       (and (match_code "unspec")
-+            (match_test "(XINT(op, 1) == UNSPEC_COND_MI)
-+                         || (XINT(op, 1) == UNSPEC_COND_PL)"))))
-+
-+;; True if this is a const_int with one bit set
-+(define_predicate "one_bit_set_operand"
-+  (match_code "const_int")
-+  {
-+   int i;
-+   int value;
-+   int ones = 0;
-+
-+   value = INTVAL(op);
-+   for ( i = 0 ; i < 32; i++ ){
-+     if ( value & ( 1 << i ) ){
-+        ones++;
-+      }
-+   }
-+
-+   return ( ones == 1 );
-+  })
-+
-+
-+;; True if this is a const_int with one bit cleared
-+(define_predicate "one_bit_cleared_operand"
-+  (match_code "const_int")
-+  {
-+   int i;
-+   int value;
-+   int zeroes = 0;
-+
-+   value = INTVAL(op);
-+   for ( i = 0 ; i < 32; i++ ){
-+     if ( !(value & ( 1 << i )) ){
-+        zeroes++;
-+      }
-+   }
-+
-+   return ( zeroes == 1 );
-+  })
-+
-+
-+;; Immediate all the low 16-bits cleared
-+(define_predicate "avr32_hi16_immediate_operand"
-+  (match_code "const_int")
-+  {
-+   /* If the low 16-bits are zero then this
-+      is a hi16 immediate. */
-+   return ((INTVAL(op) & 0xffff) == 0);
-+   }
-+)
-+
-+;; True if this is a register or immediate operand
-+(define_predicate "register_immediate_operand"
-+  (ior (match_operand 0 "register_operand")
-+       (match_operand 0 "immediate_operand")))
-+
-+;; True if this is a register or const_int operand
-+(define_predicate "register_const_int_operand"
-+  (ior (match_operand 0 "register_operand")
-+       (and (match_operand 0 "const_int_operand")
-+            (match_operand 0 "immediate_operand"))))
-+
-+;; True if this is a register or const_double operand
-+(define_predicate "register_const_double_operand"
-+  (ior (match_operand 0 "register_operand")
-+       (match_operand 0 "const_double_operand")))
-+
-+;; True if this is an operand containing a label_ref.
-+(define_predicate "avr32_label_ref_operand"
-+  (and (match_code "mem")
-+       (match_test "avr32_find_symbol(op)
-+                    && (GET_CODE(avr32_find_symbol(op)) == LABEL_REF)")))
-+
-+;; True if this is a valid symbol pointing to the constant pool.
-+(define_predicate "avr32_const_pool_operand"
-+  (and (match_code "symbol_ref")
-+       (match_test "CONSTANT_POOL_ADDRESS_P(op)"))
-+  {
-+        return (flag_pic ? (!(symbol_mentioned_p (get_pool_constant (op))
-+                        || label_mentioned_p (get_pool_constant (op)))
-+                       || avr32_got_mentioned_p(get_pool_constant (op)))
-+                    : true);
-+  }
-+)
-+
-+;; True if this is a memory reference to the constant or mini pool.
-+(define_predicate "avr32_const_pool_ref_operand"
-+  (ior (match_operand 0 "avr32_label_ref_operand")
-+       (and (match_code "mem")
-+            (match_test "avr32_const_pool_operand(XEXP(op,0), GET_MODE(XEXP(op,0)))"))))
-+
-+
-+;; Legal source operand for movti insns
-+(define_predicate "avr32_movti_src_operand"
-+  (ior (match_operand 0 "avr32_const_pool_ref_operand")
-+       (ior (ior (match_operand 0 "register_immediate_operand")
-+                 (match_operand 0 "avr32_indirect_register_operand"))
-+            (match_operand 0 "post_inc_memory_operand"))))
-+  
-+;; Legal destination operand for movti insns
-+(define_predicate "avr32_movti_dst_operand"
-+  (ior (ior (match_operand 0 "register_operand")
-+            (match_operand 0 "avr32_indirect_register_operand"))
-+       (match_operand 0 "pre_dec_memory_operand")))
-+
-+
-+;; True if this is a k12 offseted memory operand.
-+(define_predicate "avr32_k12_memory_operand"
-+  (and (match_code "mem")
-+       (ior (match_test "REG_P(XEXP(op, 0))")
-+            (match_test "GET_CODE(XEXP(op, 0)) == PLUS
-+                         && REG_P(XEXP(XEXP(op, 0), 0))
-+                         && (GET_CODE(XEXP(XEXP(op, 0), 1)) == CONST_INT)
-+                         && (CONST_OK_FOR_CONSTRAINT_P(INTVAL(XEXP(XEXP(op, 0), 0)),
-+                                'K', (mode == SImode) ? \"Ks14\" : ((mode == HImode) ? \"Ks13\" : \"Ks12\")))"))))
-+
-+;; True if this is a memory operand with an immediate displacement.
-+(define_predicate "avr32_imm_disp_memory_operand"
-+  (and (match_code "mem")
-+       (match_test "GET_CODE(XEXP(op, 0)) == PLUS
-+                    && REG_P(XEXP(XEXP(op, 0), 0))
-+                    && (GET_CODE(XEXP(XEXP(op, 0), 1)) == CONST_INT)")))
-+
-+;; True if this is a bswap operand.
-+(define_predicate "avr32_bswap_operand"
-+  (ior (match_operand 0 "avr32_k12_memory_operand")
-+       (match_operand 0 "register_operand")))
-+
-+;; True if this is a valid coprocessor insn memory operand.
-+(define_predicate "avr32_cop_memory_operand"
-+  (and (match_operand 0 "memory_operand")
-+       (not (match_test "GET_CODE(XEXP(op, 0)) == PLUS
-+                         && REG_P(XEXP(XEXP(op, 0), 0))
-+                         && (GET_CODE(XEXP(XEXP(op, 0), 1)) == CONST_INT)
-+                         && !(CONST_OK_FOR_CONSTRAINT_P(INTVAL(XEXP(XEXP(op, 0), 0)), 'K', \"Ku10\"))"))))
-+
-+;; True if this is a valid source/destination operand.
-+;; for moving values to/from a coprocessor
-+(define_predicate "avr32_cop_move_operand"
-+  (ior (match_operand 0 "register_operand")
-+       (match_operand 0 "avr32_cop_memory_operand")))
-+
-+
-+;; True if this is a valid extract byte offset for use in
-+;; load extracted index insns.
-+(define_predicate "avr32_extract_shift_operand"
-+  (and (match_operand 0 "const_int_operand")
-+       (match_test "(INTVAL(op) == 0) || (INTVAL(op) == 8)
-+                    || (INTVAL(op) == 16) || (INTVAL(op) == 24)")))
-+
-+;; True if this is a valid avr32 symbol operand.
-+(define_predicate "avr32_symbol_operand"
-+   (and (match_code "label_ref, symbol_ref, const")
-+        (match_test "avr32_find_symbol(op)")))
-+
-+;; True if this is a valid operand for the lda.w and call pseudo insns.
-+(define_predicate "avr32_address_operand"
-+   (and (and (match_code "label_ref, symbol_ref")
-+             (match_test "avr32_find_symbol(op)"))
-+       (ior (match_test "TARGET_HAS_ASM_ADDR_PSEUDOS")
-+            (match_test "flag_pic")) ))
-+
-+;; An immediate k16 address operand
-+(define_predicate "avr32_ks16_address_operand"
-+  (and (match_operand 0 "address_operand")
-+       (ior (match_test "REG_P(op)")
-+            (match_test "GET_CODE(op) == PLUS
-+                         && ((GET_CODE(XEXP(op,0)) == CONST_INT)
-+                             || (GET_CODE(XEXP(op,1)) == CONST_INT))")) ))
-+
-+;; An offset k16 memory operand
-+(define_predicate "avr32_ks16_memory_operand"
-+  (and (match_code "mem")
-+       (match_test "avr32_ks16_address_operand (XEXP (op, 0), GET_MODE (XEXP (op, 0)))")))
-+
-+;; An immediate k11 address operand
-+(define_predicate "avr32_ks11_address_operand"
-+  (and (match_operand 0 "address_operand")
-+       (ior (match_test "REG_P(op)")
-+            (match_test "GET_CODE(op) == PLUS
-+                         && (((GET_CODE(XEXP(op,0)) == CONST_INT)
-+                              && avr32_const_ok_for_constraint_p(INTVAL(XEXP(op,0)), 'K', \"Ks11\"))
-+                             || ((GET_CODE(XEXP(op,1)) == CONST_INT)
-+                                 && avr32_const_ok_for_constraint_p(INTVAL(XEXP(op,1)), 'K', \"Ks11\")))")) ))
-+
-+;; True if this is a avr32 call operand
-+(define_predicate "avr32_call_operand"
-+  (ior (ior (match_operand 0 "register_operand")
-+            (ior (match_operand 0 "avr32_const_pool_ref_operand")
-+                 (match_operand 0 "avr32_address_operand")))
-+       (match_test "SYMBOL_REF_RCALL_FUNCTION_P(op)")))
-+
-+;; Return true for operators performing ALU operations
-+
-+(define_predicate "alu_operator"
-+  (match_code "ior, xor, and, plus, minus, ashift, lshiftrt, ashiftrt"))
-+
-+(define_predicate "avr32_add_shift_immediate_operand"
-+  (and (match_operand 0 "immediate_operand")
-+       (match_test "CONST_OK_FOR_CONSTRAINT_P(INTVAL(op), 'K', \"Ku02\")")))
-+
-+(define_predicate "avr32_cond_register_immediate_operand"
-+  (ior (match_operand 0 "register_operand")
-+       (and (match_operand 0 "immediate_operand")
-+            (match_test "CONST_OK_FOR_CONSTRAINT_P(INTVAL(op), 'K', \"Ks08\")"))))
-+
-+(define_predicate "avr32_cond_immediate_operand"
-+  (and (match_operand 0 "immediate_operand")
-+       (match_test "CONST_OK_FOR_CONSTRAINT_P(INTVAL(op), 'I', \"Is08\")")))
-+
-+
-+(define_predicate "avr32_cond_move_operand"
-+  (ior (ior (match_operand 0 "register_operand")
-+            (and (match_operand 0 "immediate_operand")
-+                 (match_test "CONST_OK_FOR_CONSTRAINT_P(INTVAL(op), 'K', \"Ks08\")")))
-+       (and (match_test "TARGET_V2_INSNS")
-+            (match_operand 0 "memory_operand"))))
-+
-+(define_predicate "avr32_mov_immediate_operand"
-+  (and (match_operand 0 "immediate_operand")
-+       (match_test "avr32_const_ok_for_move(INTVAL(op))")))
-+
-+
-+(define_predicate "avr32_rmw_address_operand"
-+  (ior (and (match_code "symbol_ref") 
-+            (match_test "({rtx symbol = avr32_find_symbol(op); \
-+                               symbol && (GET_CODE (symbol) == SYMBOL_REF) && SYMBOL_REF_RMW_ADDR(symbol);})"))
-+       (and (match_operand 0 "immediate_operand")
-+            (match_test "CONST_OK_FOR_CONSTRAINT_P(INTVAL(op), 'K', \"Ks17\")")))
-+  {
-+     return TARGET_RMW && !flag_pic;
-+  }
-+)
-+ 
-+(define_predicate "avr32_rmw_memory_operand"
-+  (and (match_code "mem") 
-+       (match_test "!volatile_refs_p(op) && (GET_MODE(op) == SImode) && 
-+                    avr32_rmw_address_operand(XEXP(op, 0), GET_MODE(XEXP(op, 0)))")))
-+
-+(define_predicate "avr32_rmw_memory_or_register_operand"
-+  (ior (match_operand 0 "avr32_rmw_memory_operand")
-+       (match_operand 0 "register_operand")))
-+
-+(define_predicate "avr32_non_rmw_memory_operand"
-+  (and (not (match_operand 0 "avr32_rmw_memory_operand"))
-+       (match_operand 0 "memory_operand")))
-+
-+(define_predicate "avr32_non_rmw_general_operand"
-+  (and (not (match_operand 0 "avr32_rmw_memory_operand"))
-+       (match_operand 0 "general_operand")))
-+
-+(define_predicate "avr32_non_rmw_nonimmediate_operand"
-+  (and (not (match_operand 0 "avr32_rmw_memory_operand"))
-+       (match_operand 0 "nonimmediate_operand")))
-+
-+;; Return true if the operand is the 1.0f constant.
-+
-+(define_predicate "const_1f_operand"
-+  (match_code "const_int,const_double")
-+{
-+  return (op == CONST1_RTX (SFmode));
-+})
-diff -Nur gcc-4.4.6.orig/gcc/config/avr32/simd.md gcc-4.4.6/gcc/config/avr32/simd.md
---- gcc-4.4.6.orig/gcc/config/avr32/simd.md	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.4.6/gcc/config/avr32/simd.md	2011-10-22 19:23:08.528581303 +0200
-@@ -0,0 +1,145 @@
-+;;   AVR32 machine description file for SIMD instructions.
-+;;   Copyright 2003-2006 Atmel Corporation.
-+;;
-+;;   Written by Ronny Pedersen, Atmel Norway, <rpedersen@atmel.com>
-+;;
-+;;   This file is part of GCC.
-+;;
-+;;   This program is free software; you can redistribute it and/or modify
-+;;   it under the terms of the GNU General Public License as published by
-+;;   the Free Software Foundation; either version 2 of the License, or
-+;;   (at your option) any later version.
-+;;
-+;;   This program is distributed in the hope that it will be useful,
-+;;   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+;;   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+;;   GNU General Public License for more details.
-+;;
-+;;   You should have received a copy of the GNU General Public License
-+;;   along with this program; if not, write to the Free Software
-+;;   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+
-+;; -*- Mode: Scheme -*-
-+
-+
-+;; Vector modes
-+(define_mode_iterator VECM [V2HI V4QI])
-+(define_mode_attr  size [(V2HI "h") (V4QI "b")])
-+
-+(define_insn "add<mode>3"
-+  [(set (match_operand:VECM 0 "register_operand" "=r")
-+	(plus:VECM (match_operand:VECM 1 "register_operand" "r")
-+                   (match_operand:VECM 2 "register_operand" "r")))]
-+  "TARGET_SIMD"
-+  "padd.<size>\t%0, %1, %2"
-+  [(set_attr "length" "4")
-+   (set_attr "type" "alu")])
-+
-+
-+(define_insn "sub<mode>3"
-+  [(set (match_operand:VECM 0 "register_operand" "=r")
-+	(minus:VECM (match_operand:VECM 1 "register_operand" "r")
-+                    (match_operand:VECM 2 "register_operand" "r")))]
-+  "TARGET_SIMD"
-+  "psub.<size>\t%0, %1, %2"
-+  [(set_attr "length" "4")
-+   (set_attr "type" "alu")])
-+
-+
-+(define_insn "abs<mode>2"
-+  [(set (match_operand:VECM 0 "register_operand" "=r")
-+	(abs:VECM (match_operand:VECM 1 "register_operand" "r")))]
-+  "TARGET_SIMD"
-+  "pabs.s<size>\t%0, %1"
-+  [(set_attr "length" "4")
-+   (set_attr "type" "alu")])
-+
-+(define_insn "ashl<mode>3"
-+  [(set (match_operand:VECM 0 "register_operand"           "=r")
-+	(ashift:VECM (match_operand:VECM 1 "register_operand" "r")
-+                     (match_operand:SI 2 "immediate_operand" "Ku04")))]
-+  "TARGET_SIMD"
-+  "plsl.<size>\t%0, %1, %2"
-+  [(set_attr "length" "4")
-+   (set_attr "type" "alu")])
-+
-+(define_insn "ashr<mode>3"
-+  [(set (match_operand:VECM 0 "register_operand"           "=r")
-+	(ashiftrt:VECM (match_operand:VECM 1 "register_operand" "r")
-+                       (match_operand:SI 2 "immediate_operand" "Ku04")))]
-+  "TARGET_SIMD"
-+  "pasr.<size>\t%0, %1, %2"
-+  [(set_attr "length" "4")
-+   (set_attr "type" "alu")])
-+
-+(define_insn "lshr<mode>3"
-+  [(set (match_operand:VECM 0 "register_operand"           "=r")
-+	(lshiftrt:VECM (match_operand:VECM 1 "register_operand" "r")
-+                       (match_operand:SI 2 "immediate_operand" "Ku04")))]
-+  "TARGET_SIMD"
-+  "plsr.<size>\t%0, %1, %2"
-+  [(set_attr "length" "4")
-+   (set_attr "type" "alu")])
-+
-+(define_insn "smaxv2hi3"
-+  [(set (match_operand:V2HI 0 "register_operand" "=r")
-+	(smax:V2HI (match_operand:V2HI 1 "register_operand" "r")
-+                        (match_operand:V2HI 2 "register_operand" "r")))]
-+
-+  "TARGET_SIMD"
-+  "pmax.sh\t%0, %1, %2"
-+  [(set_attr "length" "4")
-+   (set_attr "type" "alu")])
-+
-+(define_insn "sminv2hi3"
-+  [(set (match_operand:V2HI 0 "register_operand" "=r")
-+	(smin:V2HI (match_operand:V2HI 1 "register_operand" "r")
-+                        (match_operand:V2HI 2 "register_operand" "r")))]
-+
-+  "TARGET_SIMD"
-+  "pmin.sh\t%0, %1, %2"
-+  [(set_attr "length" "4")
-+   (set_attr "type" "alu")])
-+
-+(define_insn "umaxv4qi3"
-+  [(set (match_operand:V4QI 0 "register_operand" "=r")
-+	(umax:V4QI (match_operand:V4QI 1 "register_operand" "r")
-+                   (match_operand:V4QI 2 "register_operand" "r")))]
-+
-+  "TARGET_SIMD"
-+  "pmax.ub\t%0, %1, %2"
-+  [(set_attr "length" "4")
-+   (set_attr "type" "alu")])
-+
-+(define_insn "uminv4qi3"
-+  [(set (match_operand:V4QI 0 "register_operand" "=r")
-+	(umin:V4QI (match_operand:V4QI 1 "register_operand" "r")
-+                   (match_operand:V4QI 2 "register_operand" "r")))]
-+
-+  "TARGET_SIMD"
-+  "pmin.ub\t%0, %1, %2"
-+  [(set_attr "length" "4")
-+   (set_attr "type" "alu")])
-+
-+
-+(define_insn "addsubv2hi"
-+  [(set (match_operand:V2HI 0 "register_operand" "=r")
-+        (vec_concat:V2HI
-+         (plus:HI (match_operand:HI 1 "register_operand" "r")
-+                  (match_operand:HI 2 "register_operand" "r"))
-+         (minus:HI (match_dup 1) (match_dup 2))))]
-+  "TARGET_SIMD"
-+  "paddsub.h\t%0, %1:b, %2:b"
-+  [(set_attr "length" "4")
-+   (set_attr "type" "alu")])
-+
-+(define_insn "subaddv2hi"
-+  [(set (match_operand:V2HI 0 "register_operand" "=r")
-+        (vec_concat:V2HI
-+         (minus:HI (match_operand:HI 1 "register_operand" "r")
-+                  (match_operand:HI 2 "register_operand" "r"))
-+         (plus:HI (match_dup 1) (match_dup 2))))]
-+  "TARGET_SIMD"
-+  "psubadd.h\t%0, %1:b, %2:b"
-+  [(set_attr "length" "4")
-+   (set_attr "type" "alu")])
-diff -Nur gcc-4.4.6.orig/gcc/config/avr32/sync.md gcc-4.4.6/gcc/config/avr32/sync.md
---- gcc-4.4.6.orig/gcc/config/avr32/sync.md	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.4.6/gcc/config/avr32/sync.md	2011-10-22 19:23:08.528581303 +0200
-@@ -0,0 +1,244 @@
-+;;=================================================================
-+;; Atomic operations
-+;;=================================================================
-+
-+
-+(define_insn "sync_compare_and_swapsi"
-+  [(set (match_operand:SI 0 "register_operand" "=&r,&r")
-+	(match_operand:SI 1 "memory_operand" "+RKs16,+RKs16"))
-+   (set (match_dup 1)
-+	(unspec_volatile:SI
-+	  [(match_dup 1)
-+	   (match_operand:SI 2 "register_immediate_operand" "r,Ks21")
-+	   (match_operand:SI 3 "register_operand" "r,r")]
-+	  VUNSPEC_SYNC_CMPXCHG))   ]
-+  ""
-+  "0:
-+   ssrf\t5
-+   ld.w\t%0,%1
-+   cp.w\t%0,%2
-+   brne\t0f
-+   stcond\t%1, %3
-+   brne\t0b
-+   0:
-+  "
-+  [(set_attr "length" "16,18")
-+   (set_attr "cc" "clobber")]
-+  )
-+ 
-+
-+(define_code_iterator atomic_op [plus minus and ior xor])
-+(define_code_attr  atomic_asm_insn [(plus "add") (minus "sub") (and "and") (ior "or") (xor "eor")])
-+(define_code_attr  atomic_insn [(plus "add") (minus "sub") (and "and") (ior "ior") (xor "xor")])
-+
-+(define_insn "sync_loadsi"
-+  ; NB! Put an early clobber on the destination operand to 
-+  ; avoid gcc using the same register in the source and 
-+  ; destination. This is done in order to avoid gcc to 
-+  ; clobber the source operand since these instructions
-+  ; are actually inside a "loop".
-+  [(set (match_operand:SI 0 "register_operand" "=&r")
-+	(unspec_volatile:SI
-+         [(match_operand:SI 1 "avr32_ks16_memory_operand" "RKs16")
-+          (label_ref (match_operand 2 "" ""))]
-+         VUNSPEC_SYNC_SET_LOCK_AND_LOAD) )]
-+  ""
-+  "%2:
-+   ssrf\t5
-+   ld.w\t%0,%1"
-+  [(set_attr "length" "6")
-+   (set_attr "cc" "clobber")]
-+  )
-+  
-+(define_insn "sync_store_if_lock"
-+  [(set (match_operand:SI 0 "avr32_ks16_memory_operand" "=RKs16")
-+        (unspec_volatile:SI
-+         [(match_operand:SI 1 "register_operand" "r")
-+          (label_ref (match_operand 2 "" ""))]
-+         VUNSPEC_SYNC_STORE_IF_LOCK) )]
-+  ""
-+  "stcond\t%0, %1
-+   brne\t%2"
-+  [(set_attr "length" "6")
-+   (set_attr "cc" "clobber")]
-+  )
-+
-+
-+(define_expand "sync_<atomic_insn>si"
-+  [(set (match_dup 2)
-+	(unspec_volatile:SI
-+         [(match_operand:SI 0 "avr32_ks16_memory_operand" "")
-+          (match_dup 3)]
-+         VUNSPEC_SYNC_SET_LOCK_AND_LOAD))
-+   (set (match_dup 2) 
-+        (atomic_op:SI (match_dup 2)
-+                      (match_operand:SI 1 "register_immediate_operand" "")))
-+   (set (match_dup 0)
-+        (unspec_volatile:SI
-+         [(match_dup 2)
-+          (match_dup 3)]
-+         VUNSPEC_SYNC_STORE_IF_LOCK) )
-+   (use (match_dup 1))
-+   (use (match_dup 4))]
-+  ""
-+  {
-+   rtx *mem_expr = &operands[0];
-+   rtx ptr_reg;
-+   if ( !avr32_ks16_memory_operand (*mem_expr, GET_MODE (*mem_expr)) )
-+    {
-+      ptr_reg = force_reg (Pmode, XEXP (*mem_expr, 0));
-+      XEXP (*mem_expr, 0) = ptr_reg;
-+    } 
-+   else 
-+    {
-+      rtx address = XEXP (*mem_expr, 0);
-+      if ( REG_P (address) )
-+         ptr_reg = address;
-+      else if ( REG_P (XEXP (address, 0)) ) 
-+         ptr_reg = XEXP (address, 0);
-+      else 
-+         ptr_reg = XEXP (address, 1);
-+    }
-+
-+   operands[2] = gen_reg_rtx (SImode);
-+   operands[3] = gen_rtx_LABEL_REF(Pmode, gen_label_rtx ());
-+   operands[4] = ptr_reg;   
-+
-+  }
-+  )
-+
-+
-+
-+(define_expand "sync_old_<atomic_insn>si"
-+  [(set (match_operand:SI 0 "register_operand" "")
-+	(unspec_volatile:SI
-+         [(match_operand:SI 1 "avr32_ks16_memory_operand" "")
-+          (match_dup 4)]
-+         VUNSPEC_SYNC_SET_LOCK_AND_LOAD))
-+   (set (match_dup 3) 
-+        (atomic_op:SI (match_dup 0)
-+                      (match_operand:SI 2 "register_immediate_operand" "")))
-+   (set (match_dup 1)
-+        (unspec_volatile:SI
-+         [(match_dup 3)
-+          (match_dup 4)]
-+         VUNSPEC_SYNC_STORE_IF_LOCK) )
-+   (use (match_dup 2))
-+   (use (match_dup 5))]
-+  ""
-+  {
-+   rtx *mem_expr = &operands[1];
-+   rtx ptr_reg;
-+   if ( !avr32_ks16_memory_operand (*mem_expr, GET_MODE (*mem_expr)) )
-+    {
-+      ptr_reg = force_reg (Pmode, XEXP (*mem_expr, 0));
-+      XEXP (*mem_expr, 0) = ptr_reg;
-+    } 
-+   else 
-+    {
-+      rtx address = XEXP (*mem_expr, 0);
-+      if ( REG_P (address) )
-+         ptr_reg = address;
-+      else if ( REG_P (XEXP (address, 0)) ) 
-+         ptr_reg = XEXP (address, 0);
-+      else 
-+         ptr_reg = XEXP (address, 1);
-+    }
-+
-+   operands[3] = gen_reg_rtx (SImode);
-+   operands[4] = gen_rtx_LABEL_REF(Pmode, gen_label_rtx ());
-+   operands[5] = ptr_reg;
-+  }
-+  )
-+
-+(define_expand "sync_new_<atomic_insn>si"
-+  [(set (match_operand:SI 0 "register_operand" "")
-+	(unspec_volatile:SI
-+         [(match_operand:SI 1 "avr32_ks16_memory_operand" "")
-+          (match_dup 3)]
-+         VUNSPEC_SYNC_SET_LOCK_AND_LOAD))
-+   (set (match_dup 0) 
-+        (atomic_op:SI (match_dup 0)
-+                      (match_operand:SI 2 "register_immediate_operand" "")))
-+   (set (match_dup 1)
-+        (unspec_volatile:SI
-+         [(match_dup 0)
-+          (match_dup 3)]
-+         VUNSPEC_SYNC_STORE_IF_LOCK) )
-+   (use (match_dup 2))
-+   (use (match_dup 4))]
-+  ""
-+  {
-+   rtx *mem_expr = &operands[1];
-+   rtx ptr_reg;
-+   if ( !avr32_ks16_memory_operand (*mem_expr, GET_MODE (*mem_expr)) )
-+    {
-+      ptr_reg = force_reg (Pmode, XEXP (*mem_expr, 0));
-+      XEXP (*mem_expr, 0) = ptr_reg;
-+    } 
-+   else 
-+    {
-+      rtx address = XEXP (*mem_expr, 0);
-+      if ( REG_P (address) )
-+         ptr_reg = address;
-+      else if ( REG_P (XEXP (address, 0)) ) 
-+         ptr_reg = XEXP (address, 0);
-+      else 
-+         ptr_reg = XEXP (address, 1);
-+    }
-+
-+   operands[3] = gen_rtx_LABEL_REF(Pmode, gen_label_rtx ());
-+   operands[4] = ptr_reg;
-+  }
-+  )
-+
-+
-+;(define_insn "sync_<atomic_insn>si"
-+;  [(set (match_operand:SI 0 "memory_operand" "+RKs16")
-+;	(unspec_volatile:SI
-+;         [(atomic_op:SI (match_dup 0)
-+;                        (match_operand:SI 1 "register_operand" "r"))]
-+;         VUNSPEC_SYNC_CMPXCHG))
-+;   (clobber (match_scratch:SI 2 "=&r"))]
-+;  ""
-+;  "0:
-+;   ssrf\t5
-+;   ld.w\t%2,%0
-+;   <atomic_asm_insn>\t%2,%1
-+;   stcond\t%0, %2
-+;   brne\t0b
-+;  "
-+;  [(set_attr "length" "14")
-+;   (set_attr "cc" "clobber")]
-+;  )
-+;
-+;(define_insn "sync_new_<atomic_insn>si"
-+;  [(set (match_operand:SI 1 "memory_operand" "+RKs16")
-+;	(unspec_volatile:SI
-+;         [(atomic_op:SI (match_dup 1)
-+;                        (match_operand:SI 2 "register_operand" "r"))]
-+;         VUNSPEC_SYNC_CMPXCHG))
-+;   (set (match_operand:SI 0 "register_operand" "=&r")
-+;	(atomic_op:SI (match_dup 1)
-+;                      (match_dup 2)))]
-+;  ""
-+;  "0:
-+;   ssrf\t5
-+;   ld.w\t%0,%1
-+;   <atomic_asm_insn>\t%0,%2
-+;   stcond\t%1, %0
-+;   brne\t0b
-+;  "
-+;  [(set_attr "length" "14")
-+;   (set_attr "cc" "clobber")]
-+;  )
-+
-+(define_insn "sync_lock_test_and_setsi"
-+  [ (set (match_operand:SI 0 "register_operand" "=&r")
-+         (match_operand:SI 1 "memory_operand" "+RKu00"))
-+    (set (match_dup 1)
-+         (match_operand:SI 2 "register_operand" "r")) ]
-+  ""
-+  "xchg\t%0, %p1, %2"
-+  [(set_attr "length" "4")]
-+  )
-diff -Nur gcc-4.4.6.orig/gcc/config/avr32/t-avr32 gcc-4.4.6/gcc/config/avr32/t-avr32
---- gcc-4.4.6.orig/gcc/config/avr32/t-avr32	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.4.6/gcc/config/avr32/t-avr32	2011-10-22 19:23:08.528581303 +0200
-@@ -0,0 +1,118 @@
-+
-+MD_INCLUDES= 	$(srcdir)/config/avr32/avr32.md \
-+		$(srcdir)/config/avr32/sync.md \
-+		$(srcdir)/config/avr32/simd.md \
-+        $(srcdir)/config/avr32/predicates.md
-+
-+s-config s-conditions s-flags s-codes s-constants s-emit s-recog s-preds \
-+	s-opinit s-extract s-peep s-attr s-attrtab s-output: $(MD_INCLUDES)
-+
-+# We want fine grained libraries, so use the new code
-+# to build the floating point emulation libraries.
-+FPBIT = fp-bit.c
-+DPBIT = dp-bit.c
-+
-+LIB1ASMSRC = avr32/lib1funcs.S
-+LIB1ASMFUNCS =  _avr32_f64_mul _avr32_f64_mul_fast _avr32_f64_addsub _avr32_f64_addsub_fast  _avr32_f64_to_u32 \
-+                _avr32_f64_to_s32 _avr32_f64_to_u64 _avr32_f64_to_s64 _avr32_u32_to_f64 \
-+                _avr32_s32_to_f64 _avr32_f64_cmp_eq _avr32_f64_cmp_ge _avr32_f64_cmp_lt \
-+                _avr32_f32_cmp_eq _avr32_f32_cmp_ge _avr32_f32_cmp_lt _avr32_f64_div _avr32_f64_div_fast \
-+                _avr32_f32_div _avr32_f32_div_fast _avr32_f32_addsub _avr32_f32_addsub_fast \
-+                _avr32_f32_mul _avr32_s32_to_f32 _avr32_u32_to_f32 _avr32_f32_to_s32 \
-+                _avr32_f32_to_u32 _avr32_f32_to_f64 _avr32_f64_to_f32 _mulsi3
-+
-+#LIB2FUNCS_EXTRA += $(srcdir)/config/avr32/lib2funcs.S
-+
-+MULTILIB_OPTIONS     = march=ap/march=ucr1/march=ucr2/march=ucr2nomul/march=ucr3/march=ucr3fp
-+MULTILIB_DIRNAMES    = ap ucr1 ucr2 ucr2nomul ucr3 ucr3fp
-+MULTILIB_EXCEPTIONS  =
-+MULTILIB_MATCHES     += march?ap=mpart?ap7000
-+MULTILIB_MATCHES     += march?ap=mpart?ap7001
-+MULTILIB_MATCHES     += march?ap=mpart?ap7002
-+MULTILIB_MATCHES     += march?ap=mpart?ap7200
-+MULTILIB_MATCHES     += march?ucr1=march?uc
-+MULTILIB_MATCHES     += march?ucr1=mpart?uc3a0512es
-+MULTILIB_MATCHES     += march?ucr2=mpart?uc3a0128
-+MULTILIB_MATCHES     += march?ucr2=mpart?uc3a0256
-+MULTILIB_MATCHES     += march?ucr2=mpart?uc3a0512
-+MULTILIB_MATCHES     += march?ucr2=mpart?uc3a1128
-+MULTILIB_MATCHES     += march?ucr2=mpart?uc3a1256
-+MULTILIB_MATCHES     += march?ucr1=mpart?uc3a1512es
-+MULTILIB_MATCHES     += march?ucr2=mpart?uc3a1512
-+MULTILIB_MATCHES     += march?ucr2nomul=mpart?uc3a3revd
-+MULTILIB_MATCHES     += march?ucr2=mpart?uc3a364
-+MULTILIB_MATCHES     += march?ucr2=mpart?uc3a364s
-+MULTILIB_MATCHES     += march?ucr2=mpart?uc3a3128
-+MULTILIB_MATCHES     += march?ucr2=mpart?uc3a3128s
-+MULTILIB_MATCHES     += march?ucr2=mpart?uc3a3256
-+MULTILIB_MATCHES     += march?ucr2=mpart?uc3a3256s
-+MULTILIB_MATCHES     += march?ucr2=mpart?uc3a464
-+MULTILIB_MATCHES     += march?ucr2=mpart?uc3a464s
-+MULTILIB_MATCHES     += march?ucr2=mpart?uc3a4128
-+MULTILIB_MATCHES     += march?ucr2=mpart?uc3a4128s
-+MULTILIB_MATCHES     += march?ucr2=mpart?uc3a4256
-+MULTILIB_MATCHES     += march?ucr2=mpart?uc3a4256s
-+MULTILIB_MATCHES     += march?ucr1=mpart?uc3b064
-+MULTILIB_MATCHES     += march?ucr1=mpart?uc3b0128
-+MULTILIB_MATCHES     += march?ucr1=mpart?uc3b0256es
-+MULTILIB_MATCHES     += march?ucr1=mpart?uc3b0256
-+MULTILIB_MATCHES     += march?ucr2=mpart?uc3b0512
-+MULTILIB_MATCHES     += march?ucr2=mpart?uc3b0512revc
-+MULTILIB_MATCHES     += march?ucr1=mpart?uc3b164
-+MULTILIB_MATCHES     += march?ucr1=mpart?uc3b1128
-+MULTILIB_MATCHES     += march?ucr1=mpart?uc3b1256es
-+MULTILIB_MATCHES     += march?ucr1=mpart?uc3b1256
-+MULTILIB_MATCHES     += march?ucr2=mpart?uc3b1512
-+MULTILIB_MATCHES     += march?ucr2=mpart?uc3b1512revc
-+MULTILIB_MATCHES     += march?ucr3=mpart?uc64d3
-+MULTILIB_MATCHES     += march?ucr3=mpart?uc128d3
-+MULTILIB_MATCHES     += march?ucr3=mpart?uc64d4
-+MULTILIB_MATCHES     += march?ucr3=mpart?uc128d4
-+MULTILIB_MATCHES     += march?ucr3=mpart?uc3c0512crevc
-+MULTILIB_MATCHES     += march?ucr3=mpart?uc3c1512crevc
-+MULTILIB_MATCHES     += march?ucr3=mpart?uc3c2512crevc
-+MULTILIB_MATCHES     += march?ucr3=mpart?uc3l0256
-+MULTILIB_MATCHES     += march?ucr3=mpart?uc3l0128
-+MULTILIB_MATCHES     += march?ucr3=mpart?uc3l064
-+MULTILIB_MATCHES     += march?ucr3=mpart?uc3l032
-+MULTILIB_MATCHES     += march?ucr3=mpart?uc3l016
-+MULTILIB_MATCHES     += march?ucr3=mpart?uc3l064revb
-+MULTILIB_MATCHES     += march?ucr3=mpart?uc64l3u
-+MULTILIB_MATCHES     += march?ucr3=mpart?uc128l3u
-+MULTILIB_MATCHES     += march?ucr3=mpart?uc256l3u
-+MULTILIB_MATCHES     += march?ucr3=mpart?uc64l4u
-+MULTILIB_MATCHES     += march?ucr3=mpart?uc128l4u
-+MULTILIB_MATCHES     += march?ucr3=mpart?uc256l4u
-+MULTILIB_MATCHES     += march?ucr3fp=mpart?uc3c064c
-+MULTILIB_MATCHES     += march?ucr3fp=mpart?uc3c0128c
-+MULTILIB_MATCHES     += march?ucr3fp=mpart?uc3c0256c
-+MULTILIB_MATCHES     += march?ucr3fp=mpart?uc3c0512c
-+MULTILIB_MATCHES     += march?ucr3fp=mpart?uc3c164c
-+MULTILIB_MATCHES     += march?ucr3fp=mpart?uc3c1128c
-+MULTILIB_MATCHES     += march?ucr3fp=mpart?uc3c1256c
-+MULTILIB_MATCHES     += march?ucr3fp=mpart?uc3c1512c
-+MULTILIB_MATCHES     += march?ucr3fp=mpart?uc3c264c
-+MULTILIB_MATCHES     += march?ucr3fp=mpart?uc3c2128c
-+MULTILIB_MATCHES     += march?ucr3fp=mpart?uc3c2256c
-+MULTILIB_MATCHES     += march?ucr3fp=mpart?uc3c2512c
-+MULTILIB_MATCHES     += march?ucr3=mpart?mxt768e
-+
-+
-+EXTRA_MULTILIB_PARTS = crtbegin.o crtbeginS.o crtend.o crtendS.o crti.o crtn.o
-+
-+CRTSTUFF_T_CFLAGS = -mrelax
-+CRTSTUFF_T_CFLAGS_S = -mrelax -fPIC
-+TARGET_LIBGCC2_CFLAGS += -mrelax
-+
-+LIBGCC = stmp-multilib
-+INSTALL_LIBGCC = install-multilib
-+
-+fp-bit.c: $(srcdir)/config/fp-bit.c
-+	echo '#define FLOAT' > fp-bit.c
-+	cat $(srcdir)/config/fp-bit.c >> fp-bit.c
-+
-+dp-bit.c: $(srcdir)/config/fp-bit.c
-+	cat $(srcdir)/config/fp-bit.c > dp-bit.c
-+
-+
-+
-diff -Nur gcc-4.4.6.orig/gcc/config/avr32/t-avr32-linux gcc-4.4.6/gcc/config/avr32/t-avr32-linux
---- gcc-4.4.6.orig/gcc/config/avr32/t-avr32-linux	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.4.6/gcc/config/avr32/t-avr32-linux	2011-10-22 19:23:08.528581303 +0200
-@@ -0,0 +1,118 @@
-+
-+MD_INCLUDES= 	$(srcdir)/config/avr32/avr32.md \
-+		$(srcdir)/config/avr32/sync.md \
-+		$(srcdir)/config/avr32/simd.md \
-+		$(srcdir)/config/avr32/predicates.md
-+
-+s-config s-conditions s-flags s-codes s-constants s-emit s-recog s-preds \
-+	s-opinit s-extract s-peep s-attr s-attrtab s-output: $(MD_INCLUDES)
-+
-+# We want fine grained libraries, so use the new code
-+# to build the floating point emulation libraries.
-+FPBIT = fp-bit.c
-+DPBIT = dp-bit.c
-+
-+LIB1ASMSRC = avr32/lib1funcs.S
-+LIB1ASMFUNCS =  _avr32_f64_mul _avr32_f64_mul_fast _avr32_f64_addsub _avr32_f64_addsub_fast  _avr32_f64_to_u32 \
-+                _avr32_f64_to_s32 _avr32_f64_to_u64 _avr32_f64_to_s64 _avr32_u32_to_f64 \
-+                _avr32_s32_to_f64 _avr32_f64_cmp_eq _avr32_f64_cmp_ge _avr32_f64_cmp_lt \
-+                _avr32_f32_cmp_eq _avr32_f32_cmp_ge _avr32_f32_cmp_lt _avr32_f64_div _avr32_f64_div_fast \
-+                _avr32_f32_div _avr32_f32_div_fast _avr32_f32_addsub _avr32_f32_addsub_fast \
-+                _avr32_f32_mul _avr32_s32_to_f32 _avr32_u32_to_f32 _avr32_f32_to_s32 \
-+                _avr32_f32_to_u32 _avr32_f32_to_f64 _avr32_f64_to_f32 _mulsi3
-+
-+#LIB2FUNCS_EXTRA += $(srcdir)/config/avr32/lib2funcs.S
-+
-+MULTILIB_OPTIONS     = march=ap/march=ucr1/march=ucr2/march=ucr2nomul/march=ucr3/march=ucr3fp
-+MULTILIB_DIRNAMES    = ap ucr1 ucr2 ucr2nomul ucr3 ucr3fp
-+MULTILIB_EXCEPTIONS  =
-+MULTILIB_MATCHES     += march?ap=mpart?ap7000
-+MULTILIB_MATCHES     += march?ap=mpart?ap7001
-+MULTILIB_MATCHES     += march?ap=mpart?ap7002
-+MULTILIB_MATCHES     += march?ap=mpart?ap7200
-+MULTILIB_MATCHES     += march?ucr1=march?uc
-+MULTILIB_MATCHES     += march?ucr1=mpart?uc3a0512es
-+MULTILIB_MATCHES     += march?ucr2=mpart?uc3a0128
-+MULTILIB_MATCHES     += march?ucr2=mpart?uc3a0256
-+MULTILIB_MATCHES     += march?ucr2=mpart?uc3a0512
-+MULTILIB_MATCHES     += march?ucr2=mpart?uc3a1128
-+MULTILIB_MATCHES     += march?ucr2=mpart?uc3a1256
-+MULTILIB_MATCHES     += march?ucr1=mpart?uc3a1512es
-+MULTILIB_MATCHES     += march?ucr2=mpart?uc3a1512
-+MULTILIB_MATCHES     += march?ucr2nomul=mpart?uc3a3revd
-+MULTILIB_MATCHES     += march?ucr2=mpart?uc3a364
-+MULTILIB_MATCHES     += march?ucr2=mpart?uc3a364s
-+MULTILIB_MATCHES     += march?ucr2=mpart?uc3a3128
-+MULTILIB_MATCHES     += march?ucr2=mpart?uc3a3128s
-+MULTILIB_MATCHES     += march?ucr2=mpart?uc3a3256
-+MULTILIB_MATCHES     += march?ucr2=mpart?uc3a3256s
-+MULTILIB_MATCHES     += march?ucr2=mpart?uc3a464
-+MULTILIB_MATCHES     += march?ucr2=mpart?uc3a464s
-+MULTILIB_MATCHES     += march?ucr2=mpart?uc3a4128
-+MULTILIB_MATCHES     += march?ucr2=mpart?uc3a4128s
-+MULTILIB_MATCHES     += march?ucr2=mpart?uc3a4256
-+MULTILIB_MATCHES     += march?ucr2=mpart?uc3a4256s
-+MULTILIB_MATCHES     += march?ucr1=mpart?uc3b064
-+MULTILIB_MATCHES     += march?ucr1=mpart?uc3b0128
-+MULTILIB_MATCHES     += march?ucr1=mpart?uc3b0256es
-+MULTILIB_MATCHES     += march?ucr1=mpart?uc3b0256
-+MULTILIB_MATCHES     += march?ucr2=mpart?uc3b0512
-+MULTILIB_MATCHES     += march?ucr2=mpart?uc3b0512revc
-+MULTILIB_MATCHES     += march?ucr1=mpart?uc3b164
-+MULTILIB_MATCHES     += march?ucr1=mpart?uc3b1128
-+MULTILIB_MATCHES     += march?ucr1=mpart?uc3b1256es
-+MULTILIB_MATCHES     += march?ucr1=mpart?uc3b1256
-+MULTILIB_MATCHES     += march?ucr2=mpart?uc3b1512
-+MULTILIB_MATCHES     += march?ucr2=mpart?uc3b1512revc
-+MULTILIB_MATCHES     += march?ucr3=mpart?uc64d3
-+MULTILIB_MATCHES     += march?ucr3=mpart?uc128d3
-+MULTILIB_MATCHES     += march?ucr3=mpart?uc64d4
-+MULTILIB_MATCHES     += march?ucr3=mpart?uc128d4
-+MULTILIB_MATCHES     += march?ucr3=mpart?uc3c0512crevc
-+MULTILIB_MATCHES     += march?ucr3=mpart?uc3c1512crevc
-+MULTILIB_MATCHES     += march?ucr3=mpart?uc3c2512crevc
-+MULTILIB_MATCHES     += march?ucr3=mpart?uc3l0256
-+MULTILIB_MATCHES     += march?ucr3=mpart?uc3l0128
-+MULTILIB_MATCHES     += march?ucr3=mpart?uc3l064
-+MULTILIB_MATCHES     += march?ucr3=mpart?uc3l032
-+MULTILIB_MATCHES     += march?ucr3=mpart?uc3l016
-+MULTILIB_MATCHES     += march?ucr3=mpart?uc3l064revb
-+MULTILIB_MATCHES     += march?ucr3=mpart?uc64l3u
-+MULTILIB_MATCHES     += march?ucr3=mpart?uc128l3u
-+MULTILIB_MATCHES     += march?ucr3=mpart?uc256l3u
-+MULTILIB_MATCHES     += march?ucr3=mpart?uc64l4u
-+MULTILIB_MATCHES     += march?ucr3=mpart?uc128l4u
-+MULTILIB_MATCHES     += march?ucr3=mpart?uc256l4u
-+MULTILIB_MATCHES     += march?ucr3fp=mpart?uc3c064c
-+MULTILIB_MATCHES     += march?ucr3fp=mpart?uc3c0128c
-+MULTILIB_MATCHES     += march?ucr3fp=mpart?uc3c0256c
-+MULTILIB_MATCHES     += march?ucr3fp=mpart?uc3c0512c
-+MULTILIB_MATCHES     += march?ucr3fp=mpart?uc3c164c
-+MULTILIB_MATCHES     += march?ucr3fp=mpart?uc3c1128c
-+MULTILIB_MATCHES     += march?ucr3fp=mpart?uc3c1256c
-+MULTILIB_MATCHES     += march?ucr3fp=mpart?uc3c1512c
-+MULTILIB_MATCHES     += march?ucr3fp=mpart?uc3c264c
-+MULTILIB_MATCHES     += march?ucr3fp=mpart?uc3c2128c
-+MULTILIB_MATCHES     += march?ucr3fp=mpart?uc3c2256c
-+MULTILIB_MATCHES     += march?ucr3fp=mpart?uc3c2512c
-+MULTILIB_MATCHES     += march?ucr3=mpart?mxt768e
-+
-+
-+EXTRA_MULTILIB_PARTS = crtbegin.o crtbeginS.o crtend.o crtendS.o
-+
-+CRTSTUFF_T_CFLAGS = -mrelax
-+CRTSTUFF_T_CFLAGS_S = -mrelax -fPIC
-+TARGET_LIBGCC2_CFLAGS += -mrelax
-+
-+LIBGCC = stmp-multilib
-+INSTALL_LIBGCC = install-multilib
-+
-+fp-bit.c: $(srcdir)/config/fp-bit.c
-+	echo '#define FLOAT' > fp-bit.c
-+	cat $(srcdir)/config/fp-bit.c >> fp-bit.c
-+
-+dp-bit.c: $(srcdir)/config/fp-bit.c
-+	cat $(srcdir)/config/fp-bit.c > dp-bit.c
-+
-+
-+
-diff -Nur gcc-4.4.6.orig/gcc/config/avr32/t-elf gcc-4.4.6/gcc/config/avr32/t-elf
---- gcc-4.4.6.orig/gcc/config/avr32/t-elf	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.4.6/gcc/config/avr32/t-elf	2011-10-22 19:23:08.528581303 +0200
-@@ -0,0 +1,16 @@
-+
-+# Assemble startup files.
-+$(T)crti.o: $(srcdir)/config/avr32/crti.asm $(GCC_PASSES)
-+	$(GCC_FOR_TARGET) $(CRTSTUFF_CFLAGS) $(CRTSTUFF_T_CFLAGS) $(INCLUDES) \
-+	-c -o $(T)crti.o -x assembler-with-cpp $(srcdir)/config/avr32/crti.asm
-+
-+$(T)crtn.o: $(srcdir)/config/avr32/crtn.asm $(GCC_PASSES)
-+	$(GCC_FOR_TARGET) $(CRTSTUFF_CFLAGS) $(CRTSTUFF_T_CFLAGS) $(INCLUDES) \
-+	-c -o $(T)crtn.o -x assembler-with-cpp $(srcdir)/config/avr32/crtn.asm
-+
-+
-+# Build the libraries for both hard and soft floating point
-+EXTRA_MULTILIB_PARTS = crtbegin.o crtbeginS.o crtend.o crtendS.o crti.o crtn.o
-+
-+LIBGCC = stmp-multilib
-+INSTALL_LIBGCC = install-multilib
-diff -Nur gcc-4.4.6.orig/gcc/config/avr32/uc3fpu.md gcc-4.4.6/gcc/config/avr32/uc3fpu.md
---- gcc-4.4.6.orig/gcc/config/avr32/uc3fpu.md	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.4.6/gcc/config/avr32/uc3fpu.md	2011-10-22 19:23:08.528581303 +0200
-@@ -0,0 +1,199 @@
-+;;   AVR32 machine description file for Floating-Point instructions.
-+;;   Copyright 2003-2006 Atmel Corporation.
-+;;
-+;;
-+;;   This file is part of GCC.
-+;;
-+;;   This program is free software; you can redistribute it and/or modify
-+;;   it under the terms of the GNU General Public License as published by
-+;;   the Free Software Foundation; either version 2 of the License, or
-+;;   (at your option) any later version.
-+;;
-+;;   This program is distributed in the hope that it will be useful,
-+;;   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+;;   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+;;   GNU General Public License for more details.
-+;;
-+;;   You should have received a copy of the GNU General Public License
-+;;   along with this program; if not, write to the Free Software
-+;;   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+
-+(define_insn "*movsf_uc3fp"
-+  [(set (match_operand:SF 0 "nonimmediate_operand"     "=r,r,r,m")
-+	(match_operand:SF 1 "general_operand"          "r,G,m,r"))]
-+  "TARGET_ARCH_FPU && TARGET_HARD_FLOAT"
-+  "@
-+   mov\t%0, %1
-+   mov\t%0, %1
-+   ld.w\t%0, %1
-+   st.w\t%0, %1"
-+  [(set_attr "length" "2,4,4,4")
-+   (set_attr "type" "alu,alu,load,store")])
-+
-+(define_insn "mulsf3"
-+  [(set (match_operand:SF          0 "register_operand" "=r")
-+	(mult:SF (match_operand:SF 1 "register_operand" "r")
-+		 (match_operand:SF 2 "register_operand" "r")))]
-+  "TARGET_ARCH_FPU && TARGET_HARD_FLOAT"
-+  "fmul.s\t%0, %1, %2"
-+  [(set_attr "length" "4")
-+   (set_attr "type" "fmul")])
-+
-+(define_insn "nmulsf3"
-+  [(set (match_operand:SF          0 "register_operand" "=r")
-+	(neg:SF (mult:SF (match_operand:SF 1 "register_operand" "%r")
-+                         (match_operand:SF 2 "register_operand" "r"))))]
-+  "TARGET_ARCH_FPU && TARGET_HARD_FLOAT"
-+  "fnmul.s\t%0, %1, %2"
-+  [(set_attr "length" "4")
-+   (set_attr "type" "fmul")])
-+
-+(define_insn "macsf3"
-+  [(set (match_operand:SF          0 "register_operand" "=r")
-+	(plus:SF (mult:SF (match_operand:SF 1 "register_operand" "r")
-+                          (match_operand:SF 2 "register_operand" "r"))
-+                 (match_operand:SF 3 "register_operand" "r")))]
-+  "TARGET_ARCH_FPU && TARGET_HARD_FLOAT"
-+  "fmac.s\t%0, %3, %1, %2"
-+  [(set_attr "length" "4")
-+   (set_attr "type" "fmul")])
-+
-+;(define_insn "nmacsf3"
-+;  [(set (match_operand:SF          0 "register_operand" "=r")
-+;	(plus:SF  (neg:SF (match_operand:SF 1 "register_operand" "r"))
-+;                            (mult:SF(match_operand:SF 2 "register_operand" "r")
-+;                                    (match_operand:SF 3 "register_operand" "r"))))]
-+;  "TARGET_ARCH_FPU && TARGET_HARD_FLOAT"
-+;  "fnmac.s\t%0, %1, %2, %3"
-+;  [(set_attr "length" "4")
-+;   (set_attr "type" "fmul")])
-+
-+(define_insn "nmacsf3"
-+  [(set (match_operand:SF          0 "register_operand" "=r")
-+	(minus:SF  (mult:SF (match_operand:SF 2 "register_operand" "r")
-+                        (match_operand:SF 3 "register_operand" "r"))
-+	                    (match_operand:SF 1 "register_operand" "r")))]
-+  "TARGET_ARCH_FPU && TARGET_HARD_FLOAT"
-+  "fnmac.s\t%0, %1, %2, %3"
-+  [(set_attr "length" "4")
-+   (set_attr "type" "fmul")])
-+
-+(define_insn "msubacsf3"
-+  [(set (match_operand:SF          0 "register_operand" "=r")
-+	(minus:SF (match_operand:SF 3 "register_operand" "r")
-+	          (mult:SF (match_operand:SF 1 "register_operand" "r")
-+                       (match_operand:SF 2 "register_operand" "r"))))]
-+  "TARGET_ARCH_FPU && TARGET_HARD_FLOAT"
-+  "fmsc.s\t%0, %3, %1, %2"
-+  [(set_attr "length" "4")
-+   (set_attr "type" "fmul")])
-+
-+(define_insn "nmsubacsf3"
-+  [(set (match_operand:SF          0 "register_operand" "=r")
-+	(minus:SF  (neg:SF (mult:SF (match_operand:SF 1 "register_operand" "r")
-+                                    (match_operand:SF 2 "register_operand" "r")))
-+                   (match_operand:SF 3 "register_operand" "r")))]
-+  "TARGET_ARCH_FPU && TARGET_HARD_FLOAT"
-+  "fnmsc.s\t%0, %3, %1, %2"
-+  [(set_attr "length" "4")
-+   (set_attr "type" "fmul")])
-+
-+(define_insn "addsf3"
-+  [(set (match_operand:SF 0 "register_operand" "=r")
-+	(plus:SF (match_operand:SF 1 "register_operand" "%r")
-+                   (match_operand:SF 2 "register_operand" "r")))]
-+  "TARGET_ARCH_FPU && TARGET_HARD_FLOAT"
-+  "fadd.s\t%0, %1, %2"
-+  [(set_attr "length" "4")
-+   (set_attr "type" "fmul")])
-+
-+(define_insn "subsf3"
-+  [(set (match_operand:SF          0 "register_operand" "=r")
-+	(minus:SF (match_operand:SF 1 "register_operand" "r")
-+                  (match_operand:SF 2 "register_operand" "r")))]
-+  "TARGET_ARCH_FPU && TARGET_HARD_FLOAT"
-+  "fsub.s\t%0, %1, %2"
-+  [(set_attr "length" "4")
-+   (set_attr "type" "fmul")])
-+
-+(define_insn "fixuns_truncsfsi2"
-+  [(set (match_operand:SI 0 "register_operand" "=r")
-+	(unsigned_fix:SI (match_operand:SF 1 "register_operand" "r")))]
-+  "TARGET_ARCH_FPU && TARGET_HARD_FLOAT"
-+  "fcastrs.uw\t%0, %1"
-+  [(set_attr "length" "4")])
-+
-+(define_insn "fix_truncsfsi2"
-+  [(set (match_operand:SI 0 "register_operand" "=r")
-+	(fix:SI (match_operand:SF 1 "register_operand" "r")))]
-+  "TARGET_ARCH_FPU && TARGET_HARD_FLOAT"
-+  "fcastrs.sw\t%0, %1"
-+  [(set_attr "length" "4")])
-+
-+(define_insn "floatunssisf2"
-+  [(set (match_operand:SF 0 "register_operand" "=r")
-+        (unsigned_float:SF (match_operand:SI 1 "register_operand" "r")))]
-+  "TARGET_ARCH_FPU && TARGET_HARD_FLOAT"
-+  "fcastuw.s\t%0, %1"
-+  [(set_attr "length" "4")])
-+
-+(define_insn "floatsisf2"
-+  [(set (match_operand:SF 0 "register_operand" "=r")
-+        (float:SF (match_operand:SI 1 "register_operand" "r")))]
-+  "TARGET_ARCH_FPU && TARGET_HARD_FLOAT"
-+  "fcastsw.s\t%0, %1"
-+  [(set_attr "length" "4")])
-+
-+(define_insn "cmpsf_internal_uc3fp"
-+  [(set (cc0)
-+        (compare:CC
-+         (match_operand:SF 0 "register_operand" "r")
-+         (match_operand:SF 1 "register_operand" "r")))]
-+  "TARGET_ARCH_FPU && TARGET_HARD_FLOAT"
-+  {
-+        avr32_branch_type = CMP_SF;
-+   if (!rtx_equal_p(cc_prev_status.mdep.value, SET_SRC(PATTERN (insn))) )
-+      return "fcmp.s\t%0, %1";
-+   return "";
-+  }
-+  [(set_attr "length" "4")
-+   (set_attr "cc" "compare")])
-+
-+(define_expand "divsf3"
-+  [(set (match_operand:SF 0 "register_operand" "=r")
-+	(div:SF (match_operand:SF 1 "register_operand" "r")
-+		 (match_operand:SF 2 "register_operand" "r")))]
-+  "TARGET_ARCH_FPU && TARGET_HARD_FLOAT && flag_unsafe_math_optimizations"
-+  "{
-+    emit_insn(gen_frcpa_internal(operands[0],operands[2]));
-+    emit_insn(gen_mulsf3(operands[0],operands[0],operands[1]));
-+    DONE;
-+  }"  
-+)
-+
-+(define_insn "frcpa_internal"
-+  [(set (match_operand:SF 0 "register_operand" "=r")
-+	(unspec:SF [(match_operand:SF 1 "register_operand" "r")] UNSPEC_FRCPA))]
-+  "TARGET_ARCH_FPU && TARGET_HARD_FLOAT"
-+  "frcpa.s %0,%1"
-+  [(set_attr "length" "4")])
-+
-+(define_expand "sqrtsf2"
-+  [(set (match_operand:SF 0 "register_operand" "")
-+	(sqrt:SF (match_operand:SF 1 "register_operand" "")))]
-+  "TARGET_ARCH_FPU && TARGET_HARD_FLOAT && flag_unsafe_math_optimizations"
-+  "
-+{
-+  rtx scratch = gen_reg_rtx (SFmode);
-+  emit_insn (gen_rsqrtsf2 (scratch, operands[1], CONST1_RTX (SFmode)));
-+  emit_insn (gen_divsf3(operands[0], force_reg (SFmode, CONST1_RTX (SFmode)),
-+			 scratch));
-+  DONE;
-+}")
-+
-+(define_insn "rsqrtsf2"
-+  [(set (match_operand:SF 0 "register_operand" "=r")
-+	(div:SF (match_operand:SF 2 "const_1f_operand" "F")
-+		(sqrt:SF (match_operand:SF 1 "register_operand" "?r"))))]
-+  "TARGET_ARCH_FPU && TARGET_HARD_FLOAT"
-+  "frsqrta.s %1, %0")
-diff -Nur gcc-4.4.6.orig/gcc/config/avr32/uclinux-elf.h gcc-4.4.6/gcc/config/avr32/uclinux-elf.h
---- gcc-4.4.6.orig/gcc/config/avr32/uclinux-elf.h	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.4.6/gcc/config/avr32/uclinux-elf.h	2011-10-22 19:23:08.528581303 +0200
-@@ -0,0 +1,20 @@
-+
-+/* Run-time Target Specification.  */
-+#undef  TARGET_VERSION
-+#define TARGET_VERSION  fputs (" (AVR32 uClinux with ELF)", stderr)
-+
-+/* We don't want a .jcr section on uClinux. As if this makes a difference... */
-+#define TARGET_USE_JCR_SECTION 0
-+
-+/* Here we go. Drop the crtbegin/crtend stuff completely. */
-+#undef STARTFILE_SPEC
-+#define STARTFILE_SPEC							\
-+  "%{!shared: %{pg:gcrt1.o%s} %{!pg:%{p:gcrt1.o%s}"			\
-+  " %{!p:%{profile:gcrt1.o%s}"						\
-+  " %{!profile:crt1.o%s}}}} crti.o%s"
-+
-+#undef ENDFILE_SPEC
-+#define ENDFILE_SPEC "crtn.o%s"
-+
-+#undef TARGET_DEFAULT
-+#define TARGET_DEFAULT (AVR32_FLAG_NO_INIT_GOT)
-diff -Nur gcc-4.4.6.orig/gcc/config/host-linux.c gcc-4.4.6/gcc/config/host-linux.c
---- gcc-4.4.6.orig/gcc/config/host-linux.c	2009-02-20 16:20:38.000000000 +0100
-+++ gcc-4.4.6/gcc/config/host-linux.c	2011-10-22 19:23:08.528581303 +0200
-@@ -25,6 +25,9 @@
- #include "hosthooks.h"
- #include "hosthooks-def.h"
- 
-+#ifndef SSIZE_MAX
-+#define SSIZE_MAX LONG_MAX
-+#endif
- 
- /* Linux has a feature called exec-shield-randomize that perturbs the
-    address of non-fixed mapped segments by a (relatively) small amount.
-diff -Nur gcc-4.4.6.orig/gcc/config.gcc gcc-4.4.6/gcc/config.gcc
---- gcc-4.4.6.orig/gcc/config.gcc	2011-02-18 22:39:51.000000000 +0100
-+++ gcc-4.4.6/gcc/config.gcc	2011-10-22 19:23:08.528581303 +0200
-@@ -810,6 +810,24 @@
- avr-*-*)
- 	tm_file="avr/avr.h dbxelf.h"
- 	;;
-+avr32*-*-linux*)
-+	tm_file="dbxelf.h elfos.h linux.h avr32/linux-elf.h avr32/avr32.h "
-+	tmake_file="t-linux avr32/t-avr32-linux"
-+	extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-+	extra_modes=avr32/avr32-modes.def
-+	gnu_ld=yes
-+	;;
-+avr32*-*-uclinux*)
-+	tm_file="dbxelf.h elfos.h linux.h avr32/linux-elf.h avr32/uclinux-elf.h avr32/avr32.h"
-+	tmake_file="t-linux avr32/t-avr32-linux"
-+	extra_modes=avr32/avr32-modes.def
-+	gnu_ld=yes
-+	;;
-+avr32-*-*)
-+	tm_file="dbxelf.h elfos.h avr32/avr32.h avr32/avr32-elf.h"
-+	tmake_file="avr32/t-avr32 avr32/t-elf"
-+	extra_modes=avr32/avr32-modes.def
-+	;;
- bfin*-elf*)
- 	tm_file="${tm_file} dbxelf.h elfos.h bfin/elf.h"
- 	tmake_file=bfin/t-bfin-elf
-@@ -2736,6 +2754,32 @@
- 		fi
- 		;;
- 
-+	avr32*-*-*)
-+		supported_defaults="part arch"
-+
-+		case "$with_part" in
-+		"" \
-+		| "ap7000" | "ap7010" | "ap7020" | "uc3a0256" | "uc3a0512" | "uc3a1128" | "uc3a1256" | "uc3a1512" )
-+			# OK
-+			;;
-+		*)
-+			echo "Unknown part used in --with-part=$with_part" 1>&2
-+			exit 1
-+			;;
-+		esac
-+
-+		case "$with_arch" in
-+		"" \
-+		| "ap" | "uc")
-+			# OK
-+			;;
-+		*)
-+			echo "Unknown arch used in --with-arch=$with_arch" 1>&2
-+			exit 1
-+			;;
-+		esac
-+                ;;
-+
- 	fr*-*-*linux*)
- 		supported_defaults=cpu
- 		case "$with_cpu" in
-diff -Nur gcc-4.4.6.orig/gcc/config.gcc.orig gcc-4.4.6/gcc/config.gcc.orig
---- gcc-4.4.6.orig/gcc/config.gcc.orig	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.4.6/gcc/config.gcc.orig	2011-10-22 19:23:08.528581303 +0200
-@@ -0,0 +1,3208 @@
-+# GCC target-specific configuration file.
-+# Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-+# 2008, 2009, 2010 Free Software Foundation, Inc.
-+
-+#This file is part of GCC.
-+
-+#GCC is free software; you can redistribute it and/or modify it under
-+#the terms of the GNU General Public License as published by the Free
-+#Software Foundation; either version 3, or (at your option) any later
-+#version.
-+
-+#GCC is distributed in the hope that it will be useful, but WITHOUT
-+#ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+#FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-+#for more details.
-+
-+#You should have received a copy of the GNU General Public License
-+#along with GCC; see the file COPYING3.  If not see
-+#<http://www.gnu.org/licenses/>.
-+
-+# This is the GCC target-specific configuration file
-+# where a configuration type is mapped to different system-specific
-+# definitions and files.  This is invoked by the autoconf-generated
-+# configure script.  Putting it in a separate shell file lets us skip
-+# running autoconf when modifying target-specific information.
-+
-+# When you change the cases in the OS or target switches, consider
-+# updating ../libgcc/config.host also.
-+
-+# This file switches on the shell variable ${target}, and also uses the
-+# following shell variables:
-+#
-+#  with_*		Various variables as set by configure.
-+#
-+#  enable_threads	Either the name, yes or no depending on whether
-+#			threads support was requested.
-+#
-+#  default_use_cxa_atexit
-+#			  The default value for the $enable___cxa_atexit
-+#			variable.  enable___cxa_atexit needs to be set to
-+#			"yes" for the correct operation of C++ destructors
-+#			but it relies upon the presence of a non-standard C
-+#			library	function called	__cxa_atexit.
-+#			  Since not all C libraries provide __cxa_atexit the
-+#			default value of $default_use_cxa_atexit is set to
-+#			"no" except for targets which are known to be OK.
-+#
-+#  gas_flag		Either yes or no depending on whether GNU as was
-+#			requested.
-+#
-+#  gnu_ld_flag		Either yes or no depending on whether GNU ld was
-+#			requested.
-+
-+# This file sets the following shell variables for use by the
-+# autoconf-generated configure script:
-+#
-+#  cpu_type		The name of the cpu, if different from the first
-+#			chunk of the canonical target name.
-+#
-+#  tm_defines		List of target macros to define for all compilations.
-+#
-+#  tm_file		A list of target macro files, if different from
-+#			"$cpu_type/$cpu_type.h". Usually it's constructed
-+#			per target in a way like this:
-+#			tm_file="${tm_file} dbxelf.h elfos.h svr4.h ${cpu_type.h}/elf.h"
-+#			Note that the preferred order is:
-+#			- specific target header "${cpu_type}/${cpu_type.h}"
-+#			- generic headers like dbxelf.h elfos.h, etc.
-+#			- specializing target headers like ${cpu_type.h}/elf.h
-+#			This helps to keep OS specific stuff out of the CPU
-+#			defining header ${cpu_type}/${cpu_type.h}.
-+#
-+#			It is possible to include automatically-generated
-+#			build-directory files by prefixing them with "./".
-+#			All other files should relative to $srcdir/config.
-+#
-+#  tm_p_file		Location of file with declarations for functions
-+#			in $out_file.
-+#
-+#  out_file		The name of the machine description C support
-+#			file, if different from "$cpu_type/$cpu_type.c".
-+#
-+#  md_file		The name of the machine-description file, if
-+#			different from "$cpu_type/$cpu_type.md".
-+#
-+#  tmake_file		A list of machine-description-specific
-+#			makefile-fragments, if different from
-+#			"$cpu_type/t-$cpu_type".
-+#
-+#  extra_modes          The name of the file containing a list of extra
-+#                       machine modes, if necessary and different from
-+#                       "$cpu_type/$cpu_type-modes.def".
-+#
-+#  extra_objs		List of extra objects that should be linked into
-+#			the compiler proper (cc1, cc1obj, cc1plus)
-+#			depending on target.
-+#
-+#  extra_gcc_objs	List of extra objects that should be linked into
-+#			the compiler driver (gcc) depending on target.
-+#
-+#  extra_headers	List of used header files from the directory
-+#			config/${cpu_type}.
-+#
-+#  use_gcc_tgmath	If set, add tgmath.h to the list of used header
-+#			files.
-+#
-+#  extra_passes		List of extra executables compiled for this target
-+#			machine, used for compiling from source to object.
-+#
-+#  extra_parts		List of extra object files that should be compiled
-+#			for this target machine.
-+#
-+#  extra_programs	Like extra_passes, but these are used when linking.
-+#
-+#  extra_options	List of target-dependent .opt files.
-+#
-+#  c_target_objs	List of extra target-dependent objects that be
-+#			linked into the C compiler only.
-+#
-+#  cxx_target_objs	List of extra target-dependent objects that be
-+#			linked into the C++ compiler only.
-+#
-+#  fortran_target_objs	List of extra target-dependent objects that be
-+#			linked into the fortran compiler only.
-+#
-+#  target_gtfiles       List of extra source files with type information.
-+#
-+#  xm_defines		List of macros to define when compiling for the
-+#			target machine.
-+#
-+#  xm_file		List of files to include when compiling for the
-+#			target machine.
-+#
-+#  use_collect2		Set to yes or no, depending on whether collect2
-+#			will be used.
-+#
-+#  target_cpu_default	Set to override the default target model.
-+#
-+#  gdb_needs_out_file_path
-+#			Set to yes if gdb needs a dir command with
-+#			`dirname $out_file`.
-+#
-+#  thread_file		Set to control which thread package to use.
-+#
-+#  gas			Set to yes or no depending on whether the target
-+#			system normally uses GNU as.
-+#
-+#  need_64bit_hwint	Set to yes if HOST_WIDE_INT must be 64 bits wide
-+#			for this target.  This is true if this target
-+#			supports "long" or "wchar_t" wider than 32 bits,
-+#			or BITS_PER_WORD is wider than 32 bits.
-+#			The setting made here must match the one made in
-+#			other locations such as libcpp/configure.ac
-+#
-+#  configure_default_options
-+#			Set to an initializer for configure_default_options
-+#			in configargs.h, based on --with-cpu et cetera.
-+#
-+#  use_fixproto		Set to "yes" if fixproto should be run normally,
-+#			"no" if fixproto should never be run.
-+
-+# The following variables are used in each case-construct to build up the
-+# outgoing variables:
-+#
-+#  gnu_ld		Set to yes or no depending on whether the target
-+#			system normally uses GNU ld.
-+
-+out_file=
-+tmake_file=
-+extra_headers=
-+use_gcc_tgmath=yes
-+extra_passes=
-+extra_parts=
-+extra_programs=
-+extra_objs=
-+extra_gcc_objs=
-+extra_options=
-+c_target_objs=
-+cxx_target_objs=
-+fortran_target_objs=
-+tm_defines=
-+xm_defines=
-+# Set this to force installation and use of collect2.
-+use_collect2=
-+# Set this to override the default target model.
-+target_cpu_default=
-+# Set this if gdb needs a dir command with `dirname $out_file`
-+gdb_needs_out_file_path=
-+# Set this to control which thread package will be used.
-+thread_file=
-+# Reinitialize these from the flag values every loop pass, since some
-+# configure entries modify them.
-+gas="$gas_flag"
-+gnu_ld="$gnu_ld_flag"
-+default_use_cxa_atexit=no
-+target_gtfiles=
-+need_64bit_hwint=
-+
-+# Default to not using fixproto.  Targets which need fixproto should
-+# specifically set this to 'yes'.
-+use_fixproto=no
-+
-+# Don't carry these over build->host->target.  Please.
-+xm_file=
-+md_file=
-+
-+# Obsolete configurations.
-+case ${target} in
-+# Avoid generic cases below matching.
-+   h8300-*-rtems* | h8300-*-elf* \
-+ | sh-*-elf* | sh-*-symbianelf* | sh-*-linux* | sh-*-netbsdelf* \
-+ | sh-*-rtems* | sh-wrs-vxworks) ;;
-+   arm-*-coff*		\
-+ | armel-*-coff*	\
-+ | h8300-*-*		\
-+ | i[34567]86-*-aout*	\
-+ | i[34567]86-*-coff*	\
-+ | m68k-*-aout*		\
-+ | m68k-*-coff*		\
-+ | sh-*-*		\
-+ | pdp11-*-bsd		\
-+ | rs6000-ibm-aix4.[12]* \
-+ | powerpc-ibm-aix4.[12]* \
-+ )
-+    if test "x$enable_obsolete" != xyes; then
-+      echo "*** Configuration ${target} is obsolete." >&2
-+      echo "*** Specify --enable-obsolete to build it anyway." >&2
-+      echo "*** Support will be REMOVED in the next major release of GCC," >&2
-+      echo "*** unless a maintainer comes forward." >&2
-+      exit 1
-+    fi;;
-+esac
-+
-+# Unsupported targets list.  Do not put an entry in this list unless
-+# it would otherwise be caught by a more permissive pattern.  The list
-+# should be in alphabetical order.
-+case ${target} in
-+   i[34567]86-go32-*			\
-+ | i[34567]86-*-go32*			\
-+ | mips64orion*-*-rtems*		\
-+ | sparc-hal-solaris2*			\
-+ | thumb-*-*				\
-+ | *-*-linux*aout*			\
-+ | *-*-linux*coff*			\
-+ | *-*-linux*libc1*			\
-+ | *-*-linux*oldld*			\
-+ | *-*-rtemsaout*			\
-+ | *-*-rtemscoff*			\
-+ | *-*-solaris2.[0-6]			\
-+ | *-*-solaris2.[0-6].*			\
-+ | *-*-sysv*		\
-+ | vax-*-vms*				\
-+ )
-+	echo "*** Configuration ${target} not supported" 1>&2
-+	exit 1
-+	;;
-+esac
-+
-+# Set default cpu_type, tm_file, tm_p_file and xm_file so it can be
-+# updated in each machine entry.  Also set default extra_headers for some
-+# machines.
-+tm_p_file=
-+cpu_type=`echo ${target} | sed 's/-.*$//'`
-+cpu_is_64bit=
-+case ${target} in
-+m32c*-*-*)
-+        cpu_type=m32c
-+	tmake_file=m32c/t-m32c
-+        ;;
-+alpha*-*-*)
-+	cpu_type=alpha
-+	need_64bit_hwint=yes
-+	;;
-+am33_2.0-*-linux*)
-+	cpu_type=mn10300
-+	;;
-+arm*-*-*)
-+	cpu_type=arm
-+	extra_headers="mmintrin.h arm_neon.h"
-+	c_target_objs="arm-c.o"
-+	cxx_target_objs="arm-c.o"
-+	;;
-+bfin*-*)
-+	cpu_type=bfin
-+	;;
-+crisv32-*)
-+	cpu_type=cris
-+	;;
-+frv*)	cpu_type=frv
-+	;;
-+fido-*-*)
-+	cpu_type=m68k
-+	extra_headers=math-68881.h
-+        ;;
-+i[34567]86-*-*)
-+	cpu_type=i386
-+	c_target_objs="i386-c.o"
-+	cxx_target_objs="i386-c.o"
-+	extra_headers="cpuid.h mmintrin.h mm3dnow.h xmmintrin.h emmintrin.h
-+		       pmmintrin.h tmmintrin.h ammintrin.h smmintrin.h
-+		       nmmintrin.h bmmintrin.h mmintrin-common.h
-+		       wmmintrin.h immintrin.h x86intrin.h avxintrin.h 
-+		       cross-stdarg.h"
-+	;;
-+x86_64-*-*)
-+	cpu_type=i386
-+	c_target_objs="i386-c.o"
-+	cxx_target_objs="i386-c.o"
-+	extra_headers="cpuid.h mmintrin.h mm3dnow.h xmmintrin.h emmintrin.h
-+		       pmmintrin.h tmmintrin.h ammintrin.h smmintrin.h
-+		       nmmintrin.h bmmintrin.h mmintrin-common.h
-+		       wmmintrin.h immintrin.h x86intrin.h avxintrin.h 
-+		       cross-stdarg.h"
-+	need_64bit_hwint=yes
-+	;;
-+ia64-*-*)
-+	extra_headers=ia64intrin.h
-+	need_64bit_hwint=yes
-+	;;
-+hppa*-*-*)
-+	cpu_type=pa
-+	;;
-+m32r*-*-*)
-+        cpu_type=m32r
-+        ;;
-+m68k-*-*)
-+	extra_headers=math-68881.h
-+	;;
-+mips*-*-*)
-+	cpu_type=mips
-+	need_64bit_hwint=yes
-+	extra_headers="loongson.h"
-+	;;
-+picochip-*-*)
-+        cpu_type=picochip
-+        ;;
-+powerpc*-*-*)
-+	cpu_type=rs6000
-+	extra_headers="ppc-asm.h altivec.h spe.h ppu_intrinsics.h paired.h spu2vmx.h vec_types.h si2vmx.h"
-+	need_64bit_hwint=yes
-+	case x$with_cpu in
-+	    xpowerpc64|xdefault64|x6[23]0|x970|xG5|xpower[34567]|xpower6x|xrs64a|xcell)
-+		cpu_is_64bit=yes
-+		;;
-+	esac
-+	;;
-+rs6000*-*-*)
-+	need_64bit_hwint=yes
-+	;;
-+score*-*-*)
-+	cpu_type=score
-+	;;
-+sparc*-*-*)
-+	cpu_type=sparc
-+	need_64bit_hwint=yes
-+	;;
-+spu*-*-*)
-+	cpu_type=spu
-+	need_64bit_hwint=yes
-+	;;
-+s390*-*-*)
-+	cpu_type=s390
-+	need_64bit_hwint=yes
-+	;;
-+# Note the 'l'; we need to be able to match e.g. "shle" or "shl".
-+sh[123456789lbe]*-*-* | sh-*-*)
-+	cpu_type=sh
-+	need_64bit_hwint=yes
-+	;;
-+esac
-+
-+tm_file=${cpu_type}/${cpu_type}.h
-+if test -f ${srcdir}/config/${cpu_type}/${cpu_type}-protos.h
-+then
-+	tm_p_file=${cpu_type}/${cpu_type}-protos.h
-+fi
-+extra_modes=
-+if test -f ${srcdir}/config/${cpu_type}/${cpu_type}-modes.def
-+then
-+	extra_modes=${cpu_type}/${cpu_type}-modes.def
-+fi
-+if test -f ${srcdir}/config/${cpu_type}/${cpu_type}.opt
-+then
-+	extra_options="${extra_options} ${cpu_type}/${cpu_type}.opt"
-+fi
-+
-+case ${target} in
-+i[34567]86-*-*)
-+	if test "x$enable_cld" = xyes; then
-+		tm_defines="${tm_defines} USE_IX86_CLD=1"
-+	fi
-+	;;
-+x86_64-*-*)
-+	tm_file="i386/biarch64.h ${tm_file}"
-+	if test "x$enable_cld" = xyes; then
-+		tm_defines="${tm_defines} USE_IX86_CLD=1"
-+	fi
-+	;;
-+esac
-+
-+# On a.out targets, we need to use collect2.
-+case ${target} in
-+*-*-*aout*)
-+	use_collect2=yes
-+	;;
-+esac
-+
-+# Common parts for widely ported systems.
-+case ${target} in
-+*-*-darwin*)
-+  tm_file="${tm_file} darwin.h"
-+  case ${target} in
-+  *-*-darwin[912]*)
-+    tm_file="${tm_file} darwin9.h"
-+    ;;
-+  esac
-+  tm_file="${tm_file} ${cpu_type}/darwin.h"
-+  tm_p_file="${tm_p_file} darwin-protos.h"
-+  tmake_file="t-darwin ${cpu_type}/t-darwin t-slibgcc-darwin"
-+  target_gtfiles="\$(srcdir)/config/darwin.c"
-+  extra_options="${extra_options} darwin.opt"
-+  c_target_objs="${c_target_objs} darwin-c.o"
-+  cxx_target_objs="${cxx_target_objs} darwin-c.o"
-+  fortran_target_objs="darwin-f.o"
-+  extra_objs="darwin.o"
-+  extra_gcc_objs="darwin-driver.o"
-+  default_use_cxa_atexit=yes
-+  case ${enable_threads} in
-+    "" | yes | posix) thread_file='posix' ;;
-+  esac
-+  ;;
-+*-*-freebsd[12] | *-*-freebsd[12].* | *-*-freebsd*aout*)
-+  # This is the place-holder for the generic a.out configuration
-+  # of FreeBSD.  No actual configuration resides here since
-+  # there was only ever a bare-bones ix86 configuration for
-+  # a.out and it exists solely in the machine-specific section.
-+  # This place-holder must exist to avoid dropping into
-+  # the generic ELF configuration of FreeBSD (i.e. it must be
-+  # ordered before that section).
-+  ;;
-+*-*-freebsd*)
-+  # This is the generic ELF configuration of FreeBSD.  Later
-+  # machine-specific sections may refine and add to this
-+  # configuration.
-+  #
-+  # Due to tm_file entry ordering issues that vary between cpu
-+  # architectures, we only define fbsd_tm_file to allow the
-+  # machine-specific section to dictate the final order of all
-+  # entries of tm_file with the minor exception that components
-+  # of the tm_file set here will always be of the form:
-+  #
-+  # freebsd<version_number>.h [freebsd-<conf_option>.h ...] freebsd-spec.h freebsd.h
-+  #
-+  # The machine-specific section should not tamper with this
-+  # ordering but may order all other entries of tm_file as it
-+  # pleases around the provided core setting.
-+  gas=yes
-+  gnu_ld=yes
-+  extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o"
-+  fbsd_major=`echo ${target} | sed -e 's/.*freebsd//g' | sed -e 's/\..*//g'`
-+  tm_defines="${tm_defines} FBSD_MAJOR=${fbsd_major}"
-+  tmake_file="t-slibgcc-elf-ver t-freebsd"
-+  case ${enable_threads} in
-+    no)
-+      fbsd_tm_file="${fbsd_tm_file} freebsd-nthr.h"
-+      ;;
-+    "" | yes | posix)
-+      thread_file='posix'
-+      tmake_file="${tmake_file} t-freebsd-thread"
-+      # Before 5.0, FreeBSD can't bind shared libraries to -lc
-+      # when "optionally" threaded via weak pthread_* checks.
-+      case ${target} in
-+        *-*-freebsd[34] | *-*-freebsd[34].*)
-+          tmake_file="${tmake_file} t-slibgcc-nolc-override"
-+          ;;
-+      esac
-+      ;;
-+    *)
-+      echo 'Unknown thread configuration for FreeBSD'
-+      exit 1
-+      ;;
-+  esac
-+  fbsd_tm_file="${fbsd_tm_file} freebsd-spec.h freebsd.h"
-+  case ${target} in
-+    *-*-freebsd[345].*)
-+      :;;
-+    *)
-+      default_use_cxa_atexit=yes;;
-+  esac
-+  ;;
-+*-*-linux* | frv-*-*linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu | *-*-gnu* | *-*-kopensolaris*-gnu)
-+  extra_parts="crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o"
-+  gas=yes
-+  gnu_ld=yes
-+  case ${enable_threads} in
-+    "" | yes | posix) thread_file='posix' ;;
-+  esac
-+  tmake_file="t-slibgcc-elf-ver t-linux"
-+  case $target in
-+    *-*-linux* | frv-*-*linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu | *-*-kopensolaris*-gnu)
-+      :;;
-+    *-*-gnu*)
-+      tmake_file="$tmake_file t-gnu";;
-+  esac
-+  # glibc / uclibc switch.  uclibc isn't usable for GNU/Hurd and neither for
-+  # GNU/k*BSD.
-+  case $target in
-+    *linux*)
-+      extra_options="$extra_options linux.opt";;
-+    *)
-+      tm_defines="$tm_defines OPTION_GLIBC=1";;
-+  esac
-+  case ${target} in
-+    *-*-*uclibc*)
-+      tm_defines="${tm_defines} UCLIBC_DEFAULT=1"
-+      ;;
-+    *)
-+      tm_defines="${tm_defines} UCLIBC_DEFAULT=0"
-+      ;;
-+  esac
-+  # Assume that glibc or uClibc are being used and so __cxa_atexit is provided.
-+  default_use_cxa_atexit=yes
-+  use_gcc_tgmath=no
-+  ;;
-+*-*-netbsd*)
-+  tmake_file="t-slibgcc-elf-ver t-libc-ok t-netbsd t-libgcc-pic"
-+  gas=yes
-+  gnu_ld=yes
-+
-+  # NetBSD 2.0 and later get POSIX threads enabled by default.
-+  # Allow them to be explicitly enabled on any other version.
-+  case ${enable_threads} in
-+    "")
-+      case ${target} in
-+        *-*-netbsd[2-9]* | *-*-netbsdelf[2-9]*)
-+          thread_file='posix'
-+          tm_defines="${tm_defines} NETBSD_ENABLE_PTHREADS"
-+          ;;
-+      esac
-+      ;;
-+    yes | posix)
-+      thread_file='posix'
-+      tm_defines="${tm_defines} NETBSD_ENABLE_PTHREADS"
-+      ;;
-+  esac
-+
-+  # NetBSD 1.7 and later are set up to use GCC's crtstuff for
-+  # ELF configurations.  We will clear extra_parts in the
-+  # a.out configurations.
-+  case ${target} in
-+    *-*-netbsd*1.[7-9]* | *-*-netbsd[2-9]* | *-*-netbsdelf[2-9]*)
-+      extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o"
-+      ;;
-+  esac
-+
-+  # NetBSD 2.0 and later provide __cxa_atexit(), which we use by
-+  # default (unless overridden by --disable-__cxa_atexit).
-+  case ${target} in
-+    *-*-netbsd[2-9]* | *-*-netbsdelf[2-9]*)
-+      default_use_cxa_atexit=yes
-+      ;;
-+  esac
-+  ;;
-+*-*-openbsd*)
-+  tmake_file="t-libc-ok t-openbsd t-libgcc-pic"
-+  case ${enable_threads} in
-+    yes)
-+      thread_file='posix'
-+      tmake_file="${tmake_file} t-openbsd-thread"
-+      ;;
-+  esac
-+  case ${target} in
-+    *-*-openbsd2.*|*-*-openbsd3.[012])
-+      tm_defines="${tm_defines} HAS_LIBC_R=1" ;;
-+  esac
-+  ;;
-+*-*-rtems*)
-+  case ${enable_threads} in
-+    yes) thread_file='rtems' ;;
-+  esac
-+  ;;
-+*-*-vxworks*)
-+  tmake_file=t-vxworks
-+  xm_defines=POSIX
-+  extra_options="${extra_options} vxworks.opt"
-+  extra_objs=vxworks.o
-+  case ${enable_threads} in
-+    no) ;;
-+    "" | yes | vxworks) thread_file='vxworks' ;;
-+    *) echo 'Unknown thread configuration for VxWorks'; exit 1 ;;
-+  esac
-+  ;;
-+*-*-elf)
-+  # Assume that newlib is being used and so __cxa_atexit is provided.
-+  default_use_cxa_atexit=yes
-+  ;;
-+esac
-+
-+case ${target} in
-+# Support site-specific machine types.
-+*local*)
-+	rest=`echo ${target} | sed -e "s/$cpu_type-//"`
-+	tm_file=${cpu_type}/$rest.h
-+	if test -f $srcdir/config/${cpu_type}/xm-$rest.h
-+	then xm_file=${cpu_type}/xm-$rest.h
-+	fi
-+	if test -f $srcdir/config/${cpu_type}/t-$rest
-+	then tmake_file=${cpu_type}/t-$rest
-+	fi
-+	;;
-+alpha*-*-linux*)
-+	tm_file="${tm_file} alpha/elf.h alpha/linux.h alpha/linux-elf.h"
-+	target_cpu_default="MASK_GAS"
-+	tmake_file="${tmake_file} alpha/t-crtfm alpha/t-alpha alpha/t-ieee alpha/t-linux"
-+	;;
-+alpha*-*-gnu*)
-+	tm_file="$tm_file alpha/elf.h alpha/linux.h alpha/linux-elf.h gnu.h alpha/gnu.h"
-+	target_cpu_default="MASK_GAS"
-+	tmake_file="${tmake_file} alpha/t-crtfm alpha/t-alpha alpha/t-ieee"
-+	;;
-+alpha*-*-freebsd*)
-+	tm_file="${tm_file} ${fbsd_tm_file} alpha/elf.h alpha/freebsd.h"
-+	target_cpu_default="MASK_GAS"
-+	tmake_file="${tmake_file} alpha/t-crtfm alpha/t-alpha alpha/t-ieee"
-+	extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o"
-+	;;
-+alpha*-*-netbsd*)
-+	tm_file="${tm_file} netbsd.h alpha/elf.h netbsd-elf.h alpha/netbsd.h"
-+	target_cpu_default="MASK_GAS"
-+	tmake_file="${tmake_file} alpha/t-alpha alpha/t-ieee"
-+	;;
-+alpha*-*-openbsd*)
-+	tm_defines="${tm_defines} OBSD_NO_DYNAMIC_LIBRARIES OBSD_HAS_DECLARE_FUNCTION_NAME OBSD_HAS_DECLARE_FUNCTION_SIZE OBSD_HAS_DECLARE_OBJECT"
-+	tm_file="alpha/alpha.h openbsd.h alpha/openbsd.h"
-+	# default x-alpha is only appropriate for dec-osf.
-+	target_cpu_default="MASK_GAS"
-+	tmake_file="alpha/t-alpha alpha/t-ieee"
-+	;;
-+alpha*-dec-osf[45]*)
-+	if test x$stabs = xyes
-+	then
-+		tm_file="${tm_file} dbx.h"
-+	fi
-+	if test x$gas != xyes
-+	then
-+		extra_passes="mips-tfile mips-tdump"
-+	fi
-+	use_collect2=yes
-+	tmake_file="alpha/t-alpha alpha/t-ieee alpha/t-crtfm alpha/t-osf4"
-+	tm_file="${tm_file} alpha/osf.h"
-+	extra_headers=va_list.h
-+	case ${target} in
-+	  *-*-osf4*)
-+	    # Define TARGET_SUPPORT_ARCH except on 4.0a.
-+	    case ${target} in
-+		*-*-osf4.0a) ;;
-+		*) tm_defines="${tm_defines} TARGET_SUPPORT_ARCH=1"
-+	    esac
-+	    ;;
-+	  *-*-osf5*)
-+	    tm_file="${tm_file} alpha/osf5.h"
-+	    tm_defines="${tm_defines} TARGET_SUPPORT_ARCH=1"
-+	    ;;
-+	esac
-+	case ${enable_threads} in
-+	  "" | yes | posix)
-+	    thread_file='posix'
-+	    tmake_file="${tmake_file} alpha/t-osf-pthread"
-+	    ;;
-+	esac
-+	;;
-+alpha64-dec-*vms*)
-+	tm_file="${tm_file} alpha/vms.h alpha/vms64.h"
-+	xm_file="alpha/xm-vms.h"
-+	tmake_file="alpha/t-alpha alpha/t-vms alpha/t-vms64 alpha/t-ieee"
-+	prefix=/gnu
-+	local_prefix=/gnu
-+	;;
-+alpha*-dec-*vms*)
-+	tm_file="${tm_file} alpha/vms.h"
-+	xm_file=alpha/xm-vms.h
-+	tmake_file="alpha/t-alpha alpha/t-vms alpha/t-ieee"
-+	prefix=/gnu
-+	local_prefix=/gnu
-+	;;
-+arc-*-elf*)
-+	tm_file="dbxelf.h elfos.h svr4.h ${tm_file}"
-+	extra_parts="crtinit.o crtfini.o"
-+	;;
-+arm-*-coff* | armel-*-coff*)
-+	tm_file="arm/semi.h arm/aout.h arm/arm.h arm/coff.h dbxcoff.h"
-+	tmake_file="arm/t-arm arm/t-arm-coff"
-+	;;
-+arm-wrs-vxworks)
-+	tm_file="elfos.h arm/elf.h arm/aout.h ${tm_file} vx-common.h vxworks.h arm/vxworks.h"
-+	tmake_file="${tmake_file} arm/t-arm arm/t-vxworks"
-+	;;
-+arm*-*-freebsd*)
-+	tm_file="dbxelf.h elfos.h ${fbsd_tm_file} arm/elf.h arm/aout.h arm/freebsd.h arm/arm.h"
-+	tmake_file="${tmake_file} arm/t-arm arm/t-strongarm-elf"
-+	;;
-+arm*-*-netbsdelf*)
-+	tm_file="dbxelf.h elfos.h netbsd.h netbsd-elf.h arm/elf.h arm/aout.h arm/arm.h arm/netbsd-elf.h"
-+	tmake_file="${tmake_file} arm/t-arm arm/t-netbsd"
-+	;;
-+arm*-*-netbsd*)
-+	tm_file="arm/aout.h arm/arm.h netbsd.h netbsd-aout.h arm/netbsd.h"
-+	tmake_file="t-netbsd arm/t-arm arm/t-netbsd"
-+	extra_parts=""
-+	use_collect2=yes
-+	;;
-+arm*-*-linux*)			# ARM GNU/Linux with ELF
-+	tm_file="dbxelf.h elfos.h linux.h arm/elf.h arm/linux-gas.h arm/linux-elf.h"
-+	case $target in
-+	arm*b-*)
-+		tm_defines="${tm_defines} TARGET_BIG_ENDIAN_DEFAULT=1"
-+		;;
-+	esac
-+	tmake_file="${tmake_file} t-linux arm/t-arm"
-+	case ${target} in
-+	arm*-*-linux-*eabi)
-+	    tm_file="$tm_file arm/bpabi.h arm/linux-eabi.h"
-+	    tmake_file="$tmake_file arm/t-arm-elf arm/t-bpabi arm/t-linux-eabi t-slibgcc-libgcc"
-+  	    # The BPABI long long divmod functions return a 128-bit value in
-+	    # registers r0-r3.  Correctly modeling that requires the use of
-+	    # TImode.
-+	    need_64bit_hwint=yes
-+	    # The EABI requires the use of __cxa_atexit.
-+	    default_use_cxa_atexit=yes
-+	    ;;
-+	*)
-+	    tmake_file="$tmake_file arm/t-linux"
-+	    ;;
-+	esac
-+	tm_file="$tm_file arm/aout.h arm/arm.h"
-+	tmake_file="${tmake_file} arm/t-arm-softfp soft-fp/t-softfp"
-+	;;
-+arm*-*-uclinux*)		# ARM ucLinux
-+	tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/linux-gas.h arm/uclinux-elf.h"
-+	tmake_file="arm/t-arm arm/t-arm-elf"
-+	case ${target} in
-+	arm*-*-uclinux*eabi)
-+	    tm_file="$tm_file arm/bpabi.h arm/uclinux-eabi.h"
-+	    tmake_file="$tmake_file arm/t-bpabi"
-+  	    # The BPABI long long divmod functions return a 128-bit value in
-+	    # registers r0-r3.  Correctly modeling that requires the use of
-+	    # TImode.
-+	    need_64bit_hwint=yes
-+	    # The EABI requires the use of __cxa_atexit.
-+	    default_use_cxa_atexit=yes
-+	esac
-+	tm_file="$tm_file arm/aout.h arm/arm.h"
-+	tmake_file="${tmake_file} arm/t-arm-softfp soft-fp/t-softfp"
-+	;;
-+arm*-*-ecos-elf)
-+	tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h arm/ecos-elf.h"
-+	tmake_file="arm/t-arm arm/t-arm-elf"
-+	tmake_file="${tmake_file} arm/t-arm-softfp soft-fp/t-softfp"
-+	;;
-+arm*-*-eabi* | arm*-*-symbianelf* )
-+	# The BPABI long long divmod functions return a 128-bit value in
-+	# registers r0-r3.  Correctly modeling that requires the use of
-+	# TImode.
-+	need_64bit_hwint=yes
-+	default_use_cxa_atexit=yes
-+	tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/bpabi.h"
-+	tmake_file="arm/t-arm arm/t-arm-elf"
-+	case ${target} in
-+	arm*-*-eabi*)
-+	  tm_file="$tm_file arm/eabi.h"
-+	  tmake_file="${tmake_file} arm/t-bpabi"
-+	  extra_options="${extra_options} arm/eabi.opt"
-+	  ;;
-+	arm*-*-symbianelf*)
-+	  tm_file="${tm_file} arm/symbian.h"
-+	  # We do not include t-bpabi for Symbian OS because the system
-+	  # provides its own implementation of the BPABI functions.
-+	  tmake_file="${tmake_file} arm/t-symbian"
-+	  ;;
-+	esac
-+	tm_file="${tm_file} arm/aout.h arm/arm.h"
-+	tmake_file="${tmake_file} arm/t-arm-softfp soft-fp/t-softfp"
-+	;;
-+arm*-*-rtems*)
-+	tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h arm/rtems-elf.h rtems.h"
-+	tmake_file="arm/t-arm arm/t-arm-elf t-rtems arm/t-rtems"
-+	tmake_file="${tmake_file} arm/t-arm-softfp soft-fp/t-softfp"
-+	;;
-+arm*-*-elf)
-+	tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h"
-+	tmake_file="arm/t-arm arm/t-arm-elf"
-+	tmake_file="${tmake_file} arm/t-arm-softfp soft-fp/t-softfp"
-+	;;
-+arm*-wince-pe*)
-+	tm_file="arm/semi.h arm/aout.h arm/arm.h arm/coff.h dbxcoff.h arm/pe.h arm/wince-pe.h"
-+	tmake_file="arm/t-arm arm/t-wince-pe"
-+	extra_options="${extra_options} arm/pe.opt"
-+	extra_objs="pe.o"
-+	;;
-+arm-*-pe*)
-+	tm_file="arm/semi.h arm/aout.h arm/arm.h arm/coff.h dbxcoff.h arm/pe.h"
-+	tmake_file="arm/t-arm arm/t-pe"
-+	extra_options="${extra_options} arm/pe.opt"
-+	extra_objs="pe.o"
-+	;;
-+avr-*-rtems*)
-+	tm_file="avr/avr.h dbxelf.h avr/rtems.h rtems.h"
-+	tmake_file="avr/t-avr t-rtems avr/t-rtems"
-+	;;
-+avr-*-*)
-+	tm_file="avr/avr.h dbxelf.h"
-+	;;
-+bfin*-elf*)
-+	tm_file="${tm_file} dbxelf.h elfos.h bfin/elf.h"
-+	tmake_file=bfin/t-bfin-elf
-+	use_collect2=no
-+	;;
-+bfin*-uclinux*)
-+	tm_file="${tm_file} dbxelf.h elfos.h bfin/elf.h linux.h bfin/uclinux.h"
-+	tmake_file=bfin/t-bfin-uclinux
-+	tm_defines="${tm_defines} UCLIBC_DEFAULT=1"
-+	extra_options="${extra_options} linux.opt"
-+	use_collect2=no
-+	;;
-+bfin*-linux-uclibc*)
-+	tm_file="${tm_file} dbxelf.h elfos.h bfin/elf.h linux.h bfin/linux.h ./linux-sysroot-suffix.h"
-+	tmake_file="t-slibgcc-elf-ver bfin/t-bfin-linux"
-+	extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-+	use_collect2=no
-+	;;
-+bfin*-rtems*)
-+	tm_file="${tm_file} dbxelf.h elfos.h bfin/elf.h bfin/rtems.h rtems.h"
-+	tmake_file="bfin/t-bfin t-rtems bfin/t-rtems"
-+	;;
-+bfin*-*)
-+	tm_file="${tm_file} dbxelf.h elfos.h bfin/elf.h"
-+	tmake_file=bfin/t-bfin
-+	use_collect2=no
-+	;;
-+crisv32-*-elf | crisv32-*-none)
-+	tm_file="dbxelf.h elfos.h ${tm_file}"
-+	tmake_file="cris/t-cris"
-+	target_cpu_default=32
-+	gas=yes
-+	extra_options="${extra_options} cris/elf.opt"
-+	;;
-+cris-*-elf | cris-*-none)
-+	tm_file="dbxelf.h elfos.h ${tm_file}"
-+	tmake_file="cris/t-cris cris/t-elfmulti"
-+	gas=yes
-+	extra_options="${extra_options} cris/elf.opt"
-+	;;
-+crisv32-*-linux* | cris-*-linux*)
-+	tm_file="dbxelf.h elfos.h svr4.h ${tm_file} linux.h cris/linux.h"
-+	# We need to avoid using t-linux, so override default tmake_file
-+	tmake_file="cris/t-cris t-slibgcc-elf-ver cris/t-linux"
-+	extra_options="${extra_options} cris/linux.opt"
-+	case $target in
-+	  cris-*-*)
-+		target_cpu_default=10
-+		;;
-+	  crisv32-*-*)
-+		target_cpu_default=32
-+		;;
-+	esac
-+	;;
-+crx-*-elf)
-+	tm_file="elfos.h ${tm_file}"
-+	extra_parts="crtbegin.o crtend.o"
-+	use_collect2=no
-+	;;
-+fr30-*-elf)
-+	tm_file="dbxelf.h elfos.h svr4.h ${tm_file}"
-+	tmake_file=fr30/t-fr30
-+	extra_parts="crti.o crtn.o crtbegin.o crtend.o"
-+	;;
-+frv-*-elf)
-+	tm_file="dbxelf.h elfos.h svr4.h ${tm_file} frv/frv-abi.h"
-+	tmake_file=frv/t-frv
-+	;;
-+frv-*-*linux*)
-+	tm_file="dbxelf.h elfos.h svr4.h ${tm_file} \
-+	         linux.h frv/linux.h frv/frv-abi.h"
-+	tmake_file="${tmake_file} frv/t-frv frv/t-linux"
-+	;;
-+h8300-*-rtems*)
-+	tmake_file="h8300/t-h8300 h8300/t-elf t-rtems h8300/t-rtems"
-+	tm_file="h8300/h8300.h dbxelf.h elfos.h h8300/elf.h h8300/rtems.h rtems.h"
-+	;;
-+h8300-*-elf*)
-+	tmake_file="h8300/t-h8300 h8300/t-elf"
-+	tm_file="h8300/h8300.h dbxelf.h elfos.h h8300/elf.h"
-+	;;
-+h8300-*-*)
-+	tm_file="h8300/h8300.h dbxcoff.h h8300/coff.h"
-+	;;
-+hppa*64*-*-linux*)
-+	target_cpu_default="MASK_PA_11|MASK_PA_20"
-+	tm_file="pa/pa64-start.h ${tm_file} dbxelf.h elfos.h svr4.h linux.h \
-+		 pa/pa-linux.h pa/pa64-regs.h pa/pa-64.h pa/pa64-linux.h"
-+	tmake_file="${tmake_file} pa/t-linux64"
-+	gas=yes gnu_ld=yes
-+	need_64bit_hwint=yes
-+	;;
-+hppa*-*-linux*)
-+	target_cpu_default="MASK_PA_11|MASK_NO_SPACE_REGS"
-+	tm_file="${tm_file} dbxelf.h elfos.h svr4.h linux.h pa/pa-linux.h \
-+		 pa/pa32-regs.h pa/pa32-linux.h"
-+	tmake_file="${tmake_file} pa/t-linux"
-+	# Set the libgcc version number
-+	if test x$sjlj = x1; then
-+	    tmake_file="$tmake_file pa/t-slibgcc-sjlj-ver"
-+	else
-+	    tmake_file="$tmake_file pa/t-slibgcc-dwarf-ver"
-+	fi
-+	;;
-+# port not yet contributed.
-+#hppa*-*-openbsd*)
-+#	target_cpu_default="MASK_PA_11"
-+#	;;
-+hppa[12]*-*-hpux10*)
-+	case ${target} in
-+	hppa1.1-*-* | hppa2*-*-*)
-+		target_cpu_default="MASK_PA_11"
-+		;;
-+	esac
-+	tm_file="${tm_file} pa/pa32-regs.h dbxelf.h pa/som.h \
-+		 pa/pa-hpux.h pa/pa-hpux10.h"
-+	extra_options="${extra_options} pa/pa-hpux.opt"
-+	case ${target} in
-+	*-*-hpux10.[1-9]*)
-+		tm_file="${tm_file} pa/pa-hpux1010.h"
-+		extra_options="${extra_options} pa/pa-hpux1010.opt"
-+		;;
-+	esac
-+	tmake_file="pa/t-pa-hpux10 pa/t-pa-hpux pa/t-hpux-shlib"
-+	case ${enable_threads} in
-+	  "")
-+	    if test x$have_pthread_h = xyes ; then
-+	      tmake_file="${tmake_file} pa/t-dce-thr"
-+	    fi
-+	    ;;
-+	  yes | dce)
-+	    tmake_file="${tmake_file} pa/t-dce-thr"
-+	    ;;
-+	esac
-+	# Set the libgcc version number
-+	if test x$sjlj = x1; then
-+	    tmake_file="$tmake_file pa/t-slibgcc-sjlj-ver"
-+	else
-+	    tmake_file="$tmake_file pa/t-slibgcc-dwarf-ver"
-+	fi
-+	use_collect2=yes
-+	gas=yes
-+	;;
-+hppa*64*-*-hpux11*)
-+	target_cpu_default="MASK_PA_11|MASK_PA_20"
-+	if test x$gnu_ld = xyes
-+	then
-+		target_cpu_default="${target_cpu_default}|MASK_GNU_LD"
-+	fi
-+	tm_file="pa/pa64-start.h ${tm_file} dbxelf.h elfos.h \
-+		 pa/pa64-regs.h pa/pa-hpux.h pa/pa-hpux1010.h \
-+		 pa/pa-hpux11.h"
-+	case ${target} in
-+	*-*-hpux11.[1-9]*)
-+		tm_file="${tm_file} pa/pa-hpux1111.h pa/pa-64.h pa/pa64-hpux.h"
-+		extra_options="${extra_options} pa/pa-hpux1111.opt"
-+		;;
-+	*)
-+		tm_file="${tm_file} pa/pa-64.h pa/pa64-hpux.h"
-+		;;
-+	esac
-+	extra_options="${extra_options} pa/pa-hpux.opt \
-+		       pa/pa-hpux1010.opt pa/pa64-hpux.opt"
-+	need_64bit_hwint=yes
-+	tmake_file="pa/t-pa64 pa/t-pa-hpux pa/t-hpux-shlib"
-+	# Set the libgcc version number
-+	if test x$sjlj = x1; then
-+	    tmake_file="$tmake_file pa/t-slibgcc-sjlj-ver"
-+	else
-+	    tmake_file="$tmake_file pa/t-slibgcc-dwarf-ver"
-+	fi
-+	extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o \
-+		     libgcc_stub.a"
-+	case x${enable_threads} in
-+	x | xyes | xposix )
-+		thread_file=posix
-+		;;
-+	esac
-+	gas=yes
-+	;;
-+hppa[12]*-*-hpux11*)
-+	case ${target} in
-+	hppa1.1-*-* | hppa2*-*-*)
-+		target_cpu_default="MASK_PA_11"
-+		;;
-+	esac
-+	tm_file="${tm_file} pa/pa32-regs.h dbxelf.h pa/som.h \
-+		 pa/pa-hpux.h pa/pa-hpux1010.h pa/pa-hpux11.h"
-+	extra_options="${extra_options} pa/pa-hpux.opt pa/pa-hpux1010.opt"
-+	case ${target} in
-+	*-*-hpux11.[1-9]*)
-+		tm_file="${tm_file} pa/pa-hpux1111.h"
-+		extra_options="${extra_options} pa/pa-hpux1111.opt"
-+		;;
-+	esac
-+	tmake_file="pa/t-pa-hpux11 pa/t-pa-hpux pa/t-hpux-shlib"
-+	# Set the libgcc version number
-+	if test x$sjlj = x1; then
-+	    tmake_file="$tmake_file pa/t-slibgcc-sjlj-ver"
-+	else
-+	    tmake_file="$tmake_file pa/t-slibgcc-dwarf-ver"
-+	fi
-+	extra_parts="libgcc_stub.a"
-+	case x${enable_threads} in
-+	x | xyes | xposix )
-+		thread_file=posix
-+		;;
-+	esac
-+	use_collect2=yes
-+	gas=yes
-+	;;
-+i[34567]86-*-darwin*)
-+	need_64bit_hwint=yes
-+
-+	# This is so that '.../configure && make' doesn't fail due to
-+	# config.guess deciding that the configuration is i386-*-darwin* and
-+	# then this file using that to set --with-cpu=i386 which has no -m64
-+	# support.
-+	with_cpu=${with_cpu:-generic}
-+	tmake_file="${tmake_file} i386/t-crtpc i386/t-crtfm"
-+	;;
-+x86_64-*-darwin*)
-+	with_cpu=${with_cpu:-generic}
-+	tmake_file="${tmake_file} t-darwin ${cpu_type}/t-darwin64 t-slibgcc-darwin i386/t-crtpc i386/t-crtfm"
-+	tm_file="${tm_file} ${cpu_type}/darwin64.h"
-+	;;
-+i[34567]86-*-elf*)
-+	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h i386/i386elf.h"
-+	tmake_file="${tmake_file} i386/t-i386elf t-svr4"
-+	;;
-+x86_64-*-elf*)
-+	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h i386/i386elf.h i386/x86-64.h"
-+	tmake_file="${tmake_file} i386/t-i386elf t-svr4"
-+	;;
-+i[34567]86-*-aout*)
-+	tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h i386/i386-aout.h"
-+	;;
-+i[34567]86-*-freebsd*)
-+	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ${fbsd_tm_file} i386/freebsd.h"
-+	;;
-+x86_64-*-freebsd*)
-+	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ${fbsd_tm_file} i386/x86-64.h i386/freebsd.h i386/freebsd64.h"
-+	tmake_file="${tmake_file} i386/t-crtstuff"
-+	;;
-+i[34567]86-*-netbsdelf*)
-+	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h netbsd.h netbsd-elf.h i386/netbsd-elf.h"
-+	;;
-+i[34567]86-*-netbsd*)
-+	tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h netbsd.h netbsd-aout.h i386/netbsd.h"
-+	tmake_file="${tmake_file} t-netbsd"
-+	extra_parts=""
-+	use_collect2=yes
-+	;;
-+x86_64-*-netbsd*)
-+	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h netbsd.h netbsd-elf.h i386/x86-64.h i386/netbsd64.h"
-+	tmake_file="${tmake_file} i386/t-crtstuff"
-+	;;
-+i[34567]86-*-openbsd2.*|i[34567]86-*openbsd3.[0123])
-+	tm_file="i386/i386.h i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h openbsd-oldgas.h openbsd.h i386/openbsd.h"
-+	# needed to unconfuse gdb
-+	tmake_file="${tmake_file} t-libc-ok t-openbsd i386/t-openbsd"
-+	# we need collect2 until our bug is fixed...
-+	use_collect2=yes
-+	;;
-+i[34567]86-*-openbsd*)
-+	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h"
-+	tm_file="${tm_file} openbsd.h i386/openbsdelf.h"
-+	gas=yes
-+	gnu_ld=yes
-+	;;
-+i[34567]86-*-coff*)
-+	tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h dbxcoff.h i386/i386-coff.h"
-+	;;
-+i[34567]86-*-linux* | i[34567]86-*-kfreebsd*-gnu | i[34567]86-*-knetbsd*-gnu | i[34567]86-*-gnu* | i[34567]86-*-kopensolaris*-gnu)
-+			# Intel 80386's running GNU/*
-+			# with ELF format using glibc 2
-+	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h linux.h"
-+	case ${target} in
-+	i[34567]86-*-linux*)
-+		if test x$enable_targets = xall; then
-+			tm_file="${tm_file} i386/x86-64.h i386/linux64.h"
-+			tm_defines="${tm_defines} TARGET_BI_ARCH=1"
-+			tmake_file="${tmake_file} i386/t-linux64"
-+			need_64bit_hwint=yes
-+			case X"${with_cpu}" in
-+			Xgeneric|Xcore2|Xnocona|Xx86-64|Xamdfam10|Xbarcelona|Xk8|Xopteron|Xathlon64|Xathlon-fx|Xathlon64-sse3|Xk8-sse3|Xopteron-sse3)
-+				;;
-+			X)
-+				if test x$with_cpu_64 = x; then
-+					with_cpu_64=generic
-+				fi
-+				;;
-+			*)
-+				echo "Unsupported CPU used in --with-cpu=$with_cpu, supported values:" 1>&2
-+				echo "generic core2 nocona x86-64 amdfam10 barcelona k8 opteron athlon64 athlon-fx athlon64-sse3 k8-sse3 opteron-sse3" 1>&2
-+				exit 1
-+				;;
-+			esac
-+		else
-+			tm_file="${tm_file} i386/linux.h"
-+		fi
-+		;;
-+	i[34567]86-*-knetbsd*-gnu) tm_file="${tm_file} i386/linux.h knetbsd-gnu.h i386/knetbsd-gnu.h" ;;
-+	i[34567]86-*-kfreebsd*-gnu) tm_file="${tm_file} i386/linux.h kfreebsd-gnu.h i386/kfreebsd-gnu.h" ;;
-+	i[34567]86-*-kopensolaris*-gnu) tm_file="${tm_file} i386/linux.h kopensolaris-gnu.h i386/kopensolaris-gnu.h" ;;
-+	i[34567]86-*-gnu*) tm_file="$tm_file i386/linux.h gnu.h i386/gnu.h";;
-+	esac
-+	tmake_file="${tmake_file} i386/t-crtstuff i386/t-crtpc i386/t-crtfm t-dfprules"
-+	;;
-+x86_64-*-linux* | x86_64-*-kfreebsd*-gnu | x86_64-*-knetbsd*-gnu)
-+	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h linux.h \
-+		 i386/x86-64.h i386/linux64.h"
-+	case ${target} in
-+	x86_64-*-kfreebsd*-gnu) tm_file="${tm_file} kfreebsd-gnu.h" ;;
-+	x86_64-*-knetbsd*-gnu) tm_file="${tm_file} knetbsd-gnu.h" ;;
-+	esac
-+	tmake_file="${tmake_file} i386/t-linux64 i386/t-crtstuff i386/t-crtpc i386/t-crtfm t-dfprules"
-+	;;
-+i[34567]86-pc-msdosdjgpp*)
-+	xm_file=i386/xm-djgpp.h
-+	tm_file="dbxcoff.h ${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/djgpp.h"
-+	tmake_file="${tmake_file} i386/t-djgpp"
-+	extra_options="${extra_options} i386/djgpp.opt"
-+	gnu_ld=yes
-+	gas=yes
-+	;;
-+i[34567]86-*-lynxos*)
-+	xm_defines=POSIX
-+	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h i386/lynx.h lynx.h"
-+	tmake_file="${tmake_file} i386/t-crtstuff t-lynx"
-+	extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-+	extra_options="${extra_options} lynx.opt"
-+	thread_file=lynx
-+	gnu_ld=yes
-+	gas=yes
-+	;;
-+i[3456x]86-*-netware*)
-+	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h tm-dwarf2.h i386/netware.h"
-+ 	tmake_file="${tmake_file} i386/t-netware"
-+	extra_objs=netware.o
-+	case /${with_ld} in
-+	*/nwld)
-+		extra_objs="$extra_objs nwld.o"
-+		tm_file="${tm_file} i386/nwld.h"
-+	 	tmake_file="${tmake_file} i386/t-nwld"
-+		extra_parts="crt0.o libgcc.def libc.def libcpre.def posixpre.def"
-+		;;
-+	esac
-+	case x${enable_threads} in
-+	x | xyes | xposix) thread_file='posix';;
-+	xnks) thread_file='nks';;
-+	xno) ;;
-+	*) echo 'Unknown thread configuration for NetWare' >&2; exit 1;;
-+	esac
-+	;;
-+i[34567]86-*-nto-qnx*)
-+	tm_file="${tm_file} i386/att.h dbxelf.h tm-dwarf2.h elfos.h svr4.h i386/unix.h i386/nto.h"
-+	tmake_file="${tmake_file} i386/t-nto"
-+	gnu_ld=yes
-+	gas=yes
-+	;;
-+i[34567]86-*-rtems*)
-+	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h i386/i386elf.h i386/rtemself.h rtems.h"
-+	extra_parts="crtbegin.o crtend.o crti.o crtn.o"
-+	tmake_file="${tmake_file} i386/t-rtems-i386 i386/t-crtstuff t-rtems"
-+	;;
-+i[34567]86-*-solaris2*)
-+	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h i386/sysv4.h sol2.h"
-+	case ${target} in
-+	*-*-solaris2.1[0-9]*)
-+		tm_file="${tm_file} sol2-10.h"
-+		;;
-+	esac
-+	tm_file="${tm_file} i386/sol2.h"
-+	if test x$gnu_ld = xyes; then
-+		tm_file="${tm_file} sol2-gld.h"
-+	fi
-+	if test x$gas = xyes; then
-+		tm_file="${tm_file} i386/sol2-gas.h"
-+	fi
-+	tmake_file="${tmake_file} t-sol2 t-svr4"
-+	c_target_objs="${c_target_objs} sol2-c.o"
-+	cxx_target_objs="${cxx_target_objs} sol2-c.o"
-+	extra_objs="sol2.o"
-+	tm_p_file="${tm_p_file} sol2-protos.h"
-+	if test x$gnu_ld = xyes; then
-+		tmake_file="$tmake_file t-slibgcc-elf-ver"
-+		tm_defines="${tm_defines} TARGET_GNU_LD=1"
-+	else
-+		tmake_file="$tmake_file t-slibgcc-sld"
-+	fi
-+	if test x$gas = xyes; then
-+		tm_file="usegas.h ${tm_file}"
-+	fi
-+	tm_file="$tm_file tm-dwarf2.h"
-+	case ${target} in
-+	*-*-solaris2.1[0-9]*)
-+		tm_file="${tm_file} i386/x86-64.h i386/sol2-10.h"
-+		tm_defines="${tm_defines} TARGET_BI_ARCH=1"
-+		tmake_file="$tmake_file i386/t-sol2-10"
-+		# i386/t-crtstuff only affects libgcc.  Its inclusion
-+		# depends on a runtime test and is thus performed in
-+		# libgcc/configure.ac instead.
-+		need_64bit_hwint=yes
-+		case X"${with_cpu}" in
-+		Xgeneric|Xcore2|Xnocona|Xx86-64|Xamdfam10|Xbarcelona|Xk8|Xopteron|Xathlon64|Xathlon-fx|Xathlon64-sse3|Xk8-sse3|Xopteron-sse3)
-+			;;
-+		X)
-+			if test x$with_cpu_64 = x; then
-+				with_cpu_64=generic
-+			fi
-+			;;
-+		*)
-+			echo "Unsupported CPU used in --with-cpu=$with_cpu, supported values:" 1>&2
-+			echo "generic core2 nocona x86-64 amdfam10 barcelona k8 opteron athlon64 athlon-fx athlon64-sse3 k8-sse3 opteron-sse3" 1>&2
-+			exit 1
-+			;;
-+		esac
-+		;;
-+	esac
-+	case ${enable_threads}:${have_pthread_h}:${have_thread_h} in
-+	  "":yes:* | yes:yes:* )
-+		thread_file=posix
-+		;;
-+	  "":*:yes | yes:*:yes )
-+		thread_file=solaris
-+		;;
-+	esac
-+	;;
-+i[4567]86-wrs-vxworks|i[4567]86-wrs-vxworksae)
-+	tm_file="${tm_file} i386/unix.h i386/att.h elfos.h svr4.h vx-common.h"
-+	case ${target} in
-+	  *-vxworksae*)
-+	    tm_file="${tm_file} vxworksae.h i386/vx-common.h i386/vxworksae.h"
-+	    tmake_file="${tmake_file} i386/t-vxworks i386/t-vxworksae"
-+	    ;;
-+	  *)
-+	    tm_file="${tm_file} vxworks.h i386/vx-common.h i386/vxworks.h"
-+	    tmake_file="${tmake_file} i386/t-vxworks"
-+	    ;;
-+	esac
-+	;;
-+i[34567]86-*-pe | i[34567]86-*-cygwin*)
-+	tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h dbxcoff.h i386/cygming.h i386/cygwin.h"
-+	xm_file=i386/xm-cygwin.h
-+	# This has to match the logic for DWARF2_UNWIND_INFO in gcc/config/i386/cygming.h
-+	if test x$sjlj = x0; then
-+		tmake_eh_file="i386/t-dw2-eh"
-+	else
-+		tmake_eh_file="i386/t-sjlj-eh"
-+	fi
-+	tmake_file="${tmake_file} ${tmake_eh_file} i386/t-cygming i386/t-cygwin"
-+	target_gtfiles="\$(srcdir)/config/i386/winnt.c"
-+	extra_options="${extra_options} i386/cygming.opt"
-+	extra_objs="winnt.o winnt-stubs.o"
-+	c_target_objs="${c_target_objs} cygwin2.o msformat-c.o"
-+	cxx_target_objs="${cxx_target_objs} cygwin2.o winnt-cxx.o msformat-c.o"
-+	extra_gcc_objs=cygwin1.o
-+	if test x$enable_threads = xyes; then
-+		thread_file='posix'
-+	fi
-+	;;
-+i[34567]86-*-mingw* | x86_64-*-mingw*)
-+	tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h dbxcoff.h i386/cygming.h i386/mingw32.h"
-+	xm_file=i386/xm-mingw32.h
-+	case ${target} in
-+		x86_64-*-*)
-+			need_64bit_hwint=yes
-+			;;
-+		*)
-+			;;
-+	esac
-+	# This has to match the logic for DWARF2_UNWIND_INFO in gcc/config/i386/cygming.h
-+	if test x$sjlj = x0; then
-+		tmake_eh_file="i386/t-dw2-eh"
-+	else
-+		tmake_eh_file="i386/t-sjlj-eh"
-+	fi
-+	tmake_file="${tmake_file} ${tmake_eh_file} i386/t-cygming i386/t-mingw32"
-+	target_gtfiles="\$(srcdir)/config/i386/winnt.c"
-+	extra_options="${extra_options} i386/cygming.opt i386/mingw.opt"
-+	extra_objs="winnt.o winnt-stubs.o"
-+	c_target_objs="${c_target_objs} msformat-c.o"
-+	cxx_target_objs="${cxx_target_objs} winnt-cxx.o msformat-c.o"
-+	default_use_cxa_atexit=yes
-+	case ${enable_threads} in
-+	  "" | yes | win32)
-+	  thread_file='win32'
-+	  tmake_file="${tmake_file} i386/t-gthr-win32"
-+	  ;;
-+	esac
-+	case ${target} in
-+		x86_64-*-mingw*)
-+			tmake_file="${tmake_file} i386/t-crtfm"
-+			;;
-+		*)
-+			;;
-+	esac
-+	case ${target} in
-+ 		*mingw32crt*)
-+ 			tm_file="${tm_file} i386/crtdll.h"
-+ 			;;
-+		*mingw32msv* | *mingw*)
-+			;;
-+	esac
-+	;;
-+i[34567]86-*-interix3*)
-+	tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/i386-interix.h i386/i386-interix3.h interix.h interix3.h"
-+	tmake_file="${tmake_file} i386/t-interix"
-+	extra_objs=winnt.o
-+	target_gtfiles="\$(srcdir)/config/i386/winnt.c"
-+	if test x$enable_threads = xyes ; then
-+		thread_file='posix'
-+	fi
-+	if test x$stabs = xyes ; then
-+		tm_file="${tm_file} dbxcoff.h"
-+	fi
-+	;;
-+ia64*-*-elf*)
-+	tm_file="${tm_file} dbxelf.h elfos.h ia64/sysv4.h ia64/elf.h"
-+	tmake_file="ia64/t-ia64"
-+	target_cpu_default="0"
-+	if test x$gas = xyes
-+	then
-+		target_cpu_default="${target_cpu_default}|MASK_GNU_AS"
-+	fi
-+	if test x$gnu_ld = xyes
-+	then
-+		target_cpu_default="${target_cpu_default}|MASK_GNU_LD"
-+	fi
-+	extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtfastmath.o"
-+	;;
-+ia64*-*-freebsd*)
-+	tm_file="${tm_file} dbxelf.h elfos.h ${fbsd_tm_file} ia64/sysv4.h ia64/freebsd.h"
-+	target_cpu_default="MASK_GNU_AS|MASK_GNU_LD"
-+	tmake_file="${tmake_file} ia64/t-ia64"
-+	extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtfastmath.o"
-+	;;
-+ia64*-*-linux*)
-+	tm_file="${tm_file} dbxelf.h elfos.h svr4.h linux.h ia64/sysv4.h ia64/linux.h"
-+	tmake_file="${tmake_file} ia64/t-ia64 t-libunwind ia64/t-glibc"
-+	if test x$with_system_libunwind != xyes ; then
-+		tmake_file="${tmake_file} t-libunwind-elf ia64/t-glibc-libunwind"
-+	fi
-+	target_cpu_default="MASK_GNU_AS|MASK_GNU_LD"
-+	extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtfastmath.o"
-+	;;
-+ia64*-*-hpux*)
-+	tm_file="${tm_file} dbxelf.h elfos.h svr4.h ia64/sysv4.h ia64/hpux.h"
-+	tmake_file="ia64/t-ia64 ia64/t-hpux"
-+	target_cpu_default="MASK_GNU_AS"
-+	case x$enable_threads in
-+	x | xyes | xposix )
-+		thread_file=posix
-+		;;
-+	esac
-+	use_collect2=no
-+	c_target_objs="ia64-c.o"
-+	cxx_target_objs="ia64-c.o"
-+	extra_options="${extra_options} ia64/ilp32.opt"
-+	;;
-+iq2000*-*-elf*)
-+        tm_file="svr4.h elfos.h iq2000/iq2000.h"
-+        tmake_file=iq2000/t-iq2000
-+        out_file=iq2000/iq2000.c
-+        md_file=iq2000/iq2000.md
-+        ;;
-+m32r-*-elf*)
-+	tm_file="dbxelf.h elfos.h svr4.h ${tm_file}"
-+	extra_parts="crtinit.o crtfini.o"
-+ 	;;
-+m32rle-*-elf*)
-+	tm_file="dbxelf.h elfos.h svr4.h m32r/little.h ${tm_file}"
-+	extra_parts="crtinit.o crtfini.o m32rx/crtinit.o m32rx/crtfini.o"
-+	;;
-+m32r-*-rtems*)
-+	tm_file="dbxelf.h elfos.h svr4.h ${tm_file} m32r/rtems.h rtems.h"
-+	tmake_file="m32r/t-m32r t-rtems"
-+	extra_parts="crtinit.o crtfini.o"
-+ 	;;
-+m32r-*-linux*)
-+	tm_file="dbxelf.h elfos.h svr4.h linux.h ${tm_file} m32r/linux.h"
-+	# We override the tmake_file for linux -- why?
-+	tmake_file="t-slibgcc-elf-ver m32r/t-linux"
-+	gnu_ld=yes
-+	if test x$enable_threads = xyes; then
-+		thread_file='posix'
-+	fi
-+ 	;;
-+m32rle-*-linux*)
-+	tm_file="dbxelf.h elfos.h svr4.h linux.h m32r/little.h ${tm_file} m32r/linux.h"
-+	# We override the tmake_file for linux -- why?
-+	tmake_file="t-slibgcc-elf-ver m32r/t-linux"
-+	gnu_ld=yes
-+	if test x$enable_threads = xyes; then
-+		thread_file='posix'
-+	fi
-+	;;
-+# m68hc11 and m68hc12 share the same machine description.
-+m68hc11-*-*|m6811-*-*)
-+	tm_file="dbxelf.h elfos.h usegas.h m68hc11/m68hc11.h"
-+	tm_p_file="m68hc11/m68hc11-protos.h"
-+	md_file="m68hc11/m68hc11.md"
-+	out_file="m68hc11/m68hc11.c"
-+	tmake_file="m68hc11/t-m68hc11"
-+        ;;
-+m68hc12-*-*|m6812-*-*)
-+	tm_file="m68hc11/m68hc12.h dbxelf.h elfos.h usegas.h m68hc11/m68hc11.h"
-+	tm_p_file="m68hc11/m68hc11-protos.h"
-+	md_file="m68hc11/m68hc11.md"
-+	out_file="m68hc11/m68hc11.c"
-+	tmake_file="m68hc11/t-m68hc11"
-+	extra_options="${extra_options} m68hc11/m68hc11.opt"
-+        ;;
-+m68k-*-aout*)
-+	default_m68k_cpu=68020
-+	default_cf_cpu=5206
-+	tmake_file="m68k/t-floatlib m68k/t-m68kbare m68k/t-mlibs"
-+	tm_file="${tm_file} m68k/m68k-none.h m68k/m68kemb.h m68k/m68k-aout.h libgloss.h"
-+	;;
-+m68k-*-coff*)
-+	default_m68k_cpu=68020
-+	default_cf_cpu=5206
-+	tmake_file="m68k/t-floatlib m68k/t-m68kbare m68k/t-mlibs"
-+	tm_defines="${tm_defines} MOTOROLA=1"
-+	tm_file="${tm_file} m68k/m68k-none.h m68k/m68kemb.h dbxcoff.h m68k/coff.h dbx.h"
-+	;;
-+m68k-*-elf* | fido-*-elf*)
-+	case ${target} in
-+	fido-*-elf*)
-+		# Check that $with_cpu makes sense.
-+		case $with_cpu in
-+		"" | "fidoa")
-+			;;
-+		*)
-+			echo "Cannot accept --with-cpu=$with_cpu"
-+			exit 1
-+			;;
-+		esac
-+		with_cpu=fidoa
-+		;;
-+	*)
-+		default_m68k_cpu=68020
-+		default_cf_cpu=5206
-+		;;
-+	esac
-+	tm_file="${tm_file} m68k/m68k-none.h m68k/m68kelf.h dbxelf.h elfos.h m68k/m68kemb.h m68k/m68020-elf.h"
-+	tm_defines="${tm_defines} MOTOROLA=1"
-+	tmake_file="m68k/t-floatlib m68k/t-m68kbare m68k/t-m68kelf"
-+	# Add multilibs for targets other than fido.
-+	case ${target} in
-+	fido-*-elf*)
-+		;;
-+	*)
-+		tmake_file="$tmake_file m68k/t-mlibs"
-+		;;
-+	esac
-+	extra_parts="crtbegin.o crtend.o"
-+	;;
-+m68k*-*-netbsdelf*)
-+	default_m68k_cpu=68020
-+	default_cf_cpu=5475
-+	tm_file="${tm_file} dbxelf.h elfos.h netbsd.h netbsd-elf.h m68k/netbsd-elf.h"
-+	tm_defines="${tm_defines} MOTOROLA=1"
-+	;;
-+m68k*-*-openbsd*)
-+	default_m68k_cpu=68020
-+	default_cf_cpu=5475
-+	# needed to unconfuse gdb
-+	tm_defines="${tm_defines} OBSD_OLD_GAS"
-+	tm_file="${tm_file} openbsd.h m68k/openbsd.h"
-+	tmake_file="t-libc-ok t-openbsd m68k/t-openbsd"
-+	# we need collect2 until our bug is fixed...
-+	use_collect2=yes
-+	;;
-+m68k-*-uclinuxoldabi*)		# Motorola m68k/ColdFire running uClinux
-+				# with uClibc, using the original
-+				# m68k-elf-based ABI
-+	default_m68k_cpu=68020
-+	default_cf_cpu=5206
-+	tm_file="${tm_file} m68k/m68k-none.h m68k/m68kelf.h dbxelf.h elfos.h m68k/uclinux-oldabi.h"
-+ 	tm_defines="${tm_defines} MOTOROLA=1"
-+	tmake_file="m68k/t-floatlib m68k/t-uclinux"
-+	;;
-+m68k-*-uclinux*)		# Motorola m68k/ColdFire running uClinux
-+				# with uClibc, using the new GNU/Linux-style
-+				# ABI.
-+	default_m68k_cpu=68020
-+	default_cf_cpu=5206
-+	tm_file="${tm_file} dbxelf.h elfos.h svr4.h linux.h flat.h m68k/linux.h m68k/uclinux.h ./sysroot-suffix.h"
-+ 	tm_defines="${tm_defines} MOTOROLA=1 UCLIBC_DEFAULT=1"
-+	extra_options="${extra_options} linux.opt"
-+	tmake_file="m68k/t-floatlib m68k/t-uclinux m68k/t-mlibs"
-+	;;
-+m68k-*-linux*)		# Motorola m68k's running GNU/Linux
-+				# with ELF format using glibc 2
-+				# aka the GNU/Linux C library 6.
-+	default_m68k_cpu=68020
-+	default_cf_cpu=5475
-+	with_arch=${with_arch:-m68k}
-+	tm_file="${tm_file} dbxelf.h elfos.h svr4.h linux.h m68k/linux.h ./sysroot-suffix.h"
-+	extra_options="${extra_options} m68k/ieee.opt"
-+	tm_defines="${tm_defines} MOTOROLA=1"
-+	tmake_file="${tmake_file} m68k/t-floatlib m68k/t-linux m68k/t-mlibs"
-+	# if not configured with --enable-sjlj-exceptions, bump the
-+	# libgcc version number
-+	if test x$sjlj != x1; then
-+	    tmake_file="$tmake_file m68k/t-slibgcc-elf-ver"
-+	fi
-+	;;
-+m68k-*-rtems*)
-+	default_m68k_cpu=68020
-+	default_cf_cpu=5206
-+	tmake_file="m68k/t-floatlib m68k/t-m68kbare m68k/t-crtstuff t-rtems m68k/t-rtems m68k/t-mlibs"
-+	tm_file="${tm_file} m68k/m68k-none.h m68k/m68kelf.h dbxelf.h elfos.h m68k/m68kemb.h m68k/m68020-elf.h m68k/rtemself.h rtems.h"
-+	tm_defines="${tm_defines} MOTOROLA=1"
-+	extra_parts="crtbegin.o crtend.o"
-+	;;
-+mcore-*-elf)
-+	tm_file="dbxelf.h elfos.h svr4.h ${tm_file} mcore/mcore-elf.h"
-+	tmake_file=mcore/t-mcore
-+	inhibit_libc=true
-+	;;
-+mcore-*-pe*)
-+	tm_file="svr3.h dbxcoff.h ${tm_file} mcore/mcore-pe.h"
-+	tmake_file=mcore/t-mcore-pe
-+	inhibit_libc=true
-+	;;
-+mips-sgi-irix[56]*)
-+	tm_file="elfos.h ${tm_file} mips/iris.h"
-+	tmake_file="mips/t-iris mips/t-slibgcc-irix"
-+	target_cpu_default="MASK_ABICALLS"
-+	case ${target} in
-+	*-*-irix5*)
-+		tm_file="${tm_file} mips/iris5.h"
-+		;;
-+
-+	*-*-irix6*)
-+		tm_file="${tm_file} mips/iris6.h"
-+		tmake_file="${tmake_file} mips/t-iris6"
-+		tm_defines="${tm_defines} MIPS_ISA_DEFAULT=3 MIPS_ABI_DEFAULT=ABI_N32"
-+		;;
-+	esac
-+	if test "x$stabs" = xyes
-+	then
-+		tm_file="${tm_file} dbx.h mips/dbxmdebug.h"
-+	fi
-+	if test "x$gnu_ld" = xyes
-+	then
-+		tm_defines="${tm_defines} IRIX_USING_GNU_LD"
-+	fi
-+	case ${enable_threads}:${have_pthread_h} in
-+	  "":yes | yes:yes ) thread_file=posix ;;
-+	esac
-+	;;
-+mips*-*-netbsd*)			# NetBSD/mips, either endian.
-+	target_cpu_default="MASK_ABICALLS"
-+	tm_file="elfos.h ${tm_file} mips/elf.h netbsd.h netbsd-elf.h mips/netbsd.h"
-+	;;
-+mips64*-*-linux* | mipsisa64*-*-linux*)
-+	tm_file="dbxelf.h elfos.h svr4.h linux.h ${tm_file} mips/linux.h mips/linux64.h"
-+	tmake_file="${tmake_file} mips/t-linux64 mips/t-libgcc-mips16"
-+	tm_defines="${tm_defines} MIPS_ABI_DEFAULT=ABI_N32"
-+	case ${target} in
-+		mips64el-st-linux-gnu)
-+			tm_file="${tm_file} mips/st.h"
-+			tmake_file="${tmake_file} mips/t-st"
-+			;;
-+		mips64octeon*-*-linux*)
-+			tm_defines="${tm_defines} MIPS_CPU_STRING_DEFAULT=\\\"octeon\\\""
-+			target_cpu_default=MASK_SOFT_FLOAT_ABI
-+			;;
-+		mipsisa64r2*-*-linux*)
-+			tm_defines="${tm_defines} MIPS_ISA_DEFAULT=65"
-+			;;
-+	esac
-+	gnu_ld=yes
-+	gas=yes
-+	test x$with_llsc != x || with_llsc=yes
-+	;;
-+mips*-*-linux*)				# Linux MIPS, either endian.
-+        tm_file="dbxelf.h elfos.h svr4.h linux.h ${tm_file} mips/linux.h"
-+	tmake_file="${tmake_file} mips/t-libgcc-mips16"
-+	case ${target} in
-+        mipsisa32r2*)
-+		tm_defines="${tm_defines} MIPS_ISA_DEFAULT=33"
-+                ;;
-+        mipsisa32*)
-+		tm_defines="${tm_defines} MIPS_ISA_DEFAULT=32"
-+        esac
-+	test x$with_llsc != x || with_llsc=yes
-+	;;
-+mips*-*-openbsd*)
-+	tm_defines="${tm_defines} OBSD_HAS_DECLARE_FUNCTION_NAME OBSD_HAS_DECLARE_OBJECT OBSD_HAS_CORRECT_SPECS"
-+	target_cpu_default="MASK_ABICALLS"
-+	tm_file="mips/mips.h openbsd.h mips/openbsd.h mips/sdb.h"
-+	case ${target} in
-+	mips*el-*-openbsd*)
-+	    tm_defines="${tm_defines} TARGET_ENDIAN_DEFAULT=0";;
-+	*)  tm_defines="${tm_defines} TARGET_ENDIAN_DEFAULT=MASK_BIG_ENDIAN";;
-+        esac
-+	;;
-+mips*-sde-elf*)
-+	tm_file="elfos.h ${tm_file} mips/elf.h mips/sde.h"
-+	tmake_file="mips/t-sde mips/t-libgcc-mips16"
-+	case "${with_newlib}" in
-+	  yes)
-+	    # newlib / libgloss.
-+	    ;;
-+	  *)
-+	    # MIPS toolkit libraries.
-+	    tm_file="$tm_file mips/sdemtk.h"
-+	    tmake_file="$tmake_file mips/t-sdemtk"
-+	    extra_options="$extra_options mips/sdemtk.opt"
-+	    case ${enable_threads} in
-+	      "" | yes | mipssde)
-+		thread_file='mipssde'
-+		;;
-+	    esac
-+	    ;;
-+	esac
-+	case ${target} in
-+	  mipsisa32r2*)
-+	    tm_defines="MIPS_ISA_DEFAULT=33 MIPS_ABI_DEFAULT=ABI_32"
-+	    ;;
-+	  mipsisa32*)
-+	    tm_defines="MIPS_ISA_DEFAULT=32 MIPS_ABI_DEFAULT=ABI_32"
-+	    ;;
-+	  mipsisa64r2*)
-+	    tm_defines="MIPS_ISA_DEFAULT=65 MIPS_ABI_DEFAULT=ABI_N32"
-+	    ;;
-+	  mipsisa64*)
-+	    tm_defines="MIPS_ISA_DEFAULT=64 MIPS_ABI_DEFAULT=ABI_N32"
-+	    ;;
-+	esac
-+	;;
-+mipsisa32-*-elf* | mipsisa32el-*-elf* | \
-+mipsisa32r2-*-elf* | mipsisa32r2el-*-elf* | \
-+mipsisa64-*-elf* | mipsisa64el-*-elf* | \
-+mipsisa64r2-*-elf* | mipsisa64r2el-*-elf*)
-+	tm_file="elfos.h ${tm_file} mips/elf.h"
-+	tmake_file="mips/t-isa3264 mips/t-libgcc-mips16"
-+	case ${target} in
-+	  mipsisa32r2*)
-+	    tm_defines="${tm_defines} MIPS_ISA_DEFAULT=33"
-+	    ;;
-+	  mipsisa32*)
-+	    tm_defines="${tm_defines} MIPS_ISA_DEFAULT=32"
-+	    ;;
-+	  mipsisa64r2*)
-+	    tm_defines="${tm_defines} MIPS_ISA_DEFAULT=65"
-+	    ;;
-+	  mipsisa64*)
-+	    tm_defines="${tm_defines} MIPS_ISA_DEFAULT=64"
-+	    ;;
-+	esac
-+	case ${target} in
-+	  mipsisa32*-*-elfoabi*)
-+	    tm_defines="${tm_defines} MIPS_ABI_DEFAULT=ABI_32"
-+	    tm_file="${tm_file} mips/elfoabi.h"
-+	    ;;
-+	  mipsisa64*-*-elfoabi*)
-+	    tm_defines="${tm_defines} MIPS_ABI_DEFAULT=ABI_O64"
-+	    tm_file="${tm_file} mips/elfoabi.h"
-+	    ;;
-+	  *-*-elf*)
-+	    tm_defines="${tm_defines} MIPS_ABI_DEFAULT=ABI_EABI"
-+	    ;;
-+	esac
-+	;;
-+mipsisa64sr71k-*-elf*)
-+        tm_file="elfos.h ${tm_file} mips/elf.h"
-+        tmake_file=mips/t-sr71k
-+	target_cpu_default="MASK_64BIT|MASK_FLOAT64"
-+	tm_defines="${tm_defines} MIPS_ISA_DEFAULT=64 MIPS_CPU_STRING_DEFAULT=\\\"sr71000\\\" MIPS_ABI_DEFAULT=ABI_EABI"
-+        ;;
-+mipsisa64sb1-*-elf* | mipsisa64sb1el-*-elf*)
-+	tm_file="elfos.h ${tm_file} mips/elf.h"
-+	tmake_file="mips/t-elf mips/t-libgcc-mips16 mips/t-sb1"
-+	target_cpu_default="MASK_64BIT|MASK_FLOAT64"
-+	tm_defines="${tm_defines} MIPS_ISA_DEFAULT=64 MIPS_CPU_STRING_DEFAULT=\\\"sb1\\\" MIPS_ABI_DEFAULT=ABI_O64"
-+	;;
-+mips-*-elf* | mipsel-*-elf*)
-+	tm_file="elfos.h ${tm_file} mips/elf.h"
-+	tmake_file="mips/t-elf mips/t-libgcc-mips16"
-+	;;
-+mips64-*-elf* | mips64el-*-elf*)
-+	tm_file="elfos.h ${tm_file} mips/elf.h"
-+	tmake_file="mips/t-elf mips/t-libgcc-mips16"
-+	target_cpu_default="MASK_64BIT|MASK_FLOAT64"
-+	tm_defines="${tm_defines} MIPS_ISA_DEFAULT=3 MIPS_ABI_DEFAULT=ABI_O64"
-+	;;
-+mips64vr-*-elf* | mips64vrel-*-elf*)
-+        tm_file="elfos.h ${tm_file} mips/vr.h mips/elf.h"
-+        tmake_file=mips/t-vr
-+        ;;
-+mips64orion-*-elf* | mips64orionel-*-elf*)
-+	tm_file="elfos.h ${tm_file} mips/elforion.h mips/elf.h"
-+	tmake_file="mips/t-elf mips/t-libgcc-mips16"
-+	target_cpu_default="MASK_64BIT|MASK_FLOAT64"
-+	tm_defines="${tm_defines} MIPS_ISA_DEFAULT=3 MIPS_ABI_DEFAULT=ABI_O64"
-+	;;
-+mips*-*-rtems*)
-+	tm_file="elfos.h ${tm_file} mips/elf.h mips/rtems.h rtems.h"
-+	tmake_file="mips/t-elf mips/t-libgcc-mips16 t-rtems mips/t-rtems"
-+	;;
-+mips-wrs-vxworks)
-+	tm_file="elfos.h ${tm_file} svr4.h mips/elf.h vx-common.h vxworks.h mips/vxworks.h"
-+	tmake_file="${tmake_file} mips/t-vxworks"
-+	;;
-+mipstx39-*-elf* | mipstx39el-*-elf*)
-+	tm_file="elfos.h ${tm_file} mips/r3900.h mips/elf.h"
-+	tmake_file="mips/t-r3900 mips/t-libgcc-mips16"
-+	;;
-+mmix-knuth-mmixware)
-+	need_64bit_hwint=yes
-+	;;
-+mn10300-*-*)
-+	tm_file="dbxelf.h elfos.h svr4.h ${tm_file}"
-+	if test x$stabs = xyes
-+	then
-+		tm_file="${tm_file} dbx.h"
-+	fi
-+	use_collect2=no
-+	;;
-+pdp11-*-bsd)
-+	tm_file="${tm_file} pdp11/2bsd.h"
-+	use_fixproto=yes
-+        ;;
-+pdp11-*-*)
-+	;;
-+picochip-*)
-+        # Nothing special
-+        ;;
-+# port not yet contributed
-+#powerpc-*-openbsd*)
-+#	tmake_file="${tmake_file} rs6000/t-fprules rs6000/t-fprules-fpbit "
-+#	extra_headers=
-+#	;;
-+powerpc64-*-linux*)
-+	tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h"
-+	test x$with_cpu != x || cpu_is_64bit=yes
-+	test x$cpu_is_64bit != xyes || tm_file="${tm_file} rs6000/default64.h"
-+	tm_file="rs6000/biarch64.h ${tm_file} rs6000/linux64.h"
-+	if test x${enable_secureplt} = xyes; then
-+		tm_file="rs6000/secureplt.h ${tm_file}"
-+	fi
-+	extra_options="${extra_options} rs6000/sysv4.opt rs6000/linux64.opt"
-+	tmake_file="t-dfprules rs6000/t-fprules ${tmake_file} rs6000/t-ppccomm rs6000/t-linux64 rs6000/t-fprules-softfp soft-fp/t-softfp"
-+	;;
-+powerpc64-*-gnu*)
-+	tm_file="${cpu_type}/${cpu_type}.h elfos.h svr4.h freebsd-spec.h gnu.h rs6000/sysv4.h rs6000/linux64.h rs6000/gnu.h"
-+	extra_options="${extra_options} rs6000/sysv4.opt rs6000/linux64.opt"
-+	tmake_file="rs6000/t-fprules t-slibgcc-elf-ver t-gnu rs6000/t-linux64 rs6000/t-fprules-softfp soft-fp/t-softfp"
-+	;;
-+powerpc-*-darwin*)
-+	extra_options="${extra_options} rs6000/darwin.opt"
-+	extra_parts="crt2.o"
-+	case ${target} in
-+	  *-darwin1[0-9]* | *-darwin[8-9]*)
-+	    tmake_file="${tmake_file} rs6000/t-darwin8"
-+	    tm_file="${tm_file} rs6000/darwin8.h"
-+	    ;;
-+	  *-darwin7*)
-+	    tm_file="${tm_file} rs6000/darwin7.h"
-+	    ;;
-+	  *-darwin[0-6]*)
-+	    ;;
-+	esac
-+	extra_headers=altivec.h
-+	;;
-+powerpc64-*-darwin*)
-+	tm_file="${tm_file} ${cpu_type}/darwin8.h ${cpu_type}/darwin64.h"
-+	extra_options="${extra_options} ${cpu_type}/darwin.opt"
-+	# We're omitting t-darwin8 to avoid building any multilibs
-+	extra_headers=altivec.h
-+	;;
-+powerpc*-*-freebsd*)
-+	tm_file="${tm_file} dbxelf.h elfos.h ${fbsd_tm_file} rs6000/sysv4.h rs6000/freebsd.h"
-+	tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcos ${tmake_file} rs6000/t-ppccomm"
-+	extra_options="${extra_options} rs6000/sysv4.opt"
-+	;;
-+powerpc-*-netbsd*)
-+	tm_file="${tm_file} dbxelf.h elfos.h netbsd.h netbsd-elf.h freebsd-spec.h rs6000/sysv4.h rs6000/netbsd.h"
-+	tmake_file="${tmake_file} rs6000/t-netbsd"
-+	extra_options="${extra_options} rs6000/sysv4.opt"
-+	;;
-+powerpc-*-eabispe*)
-+	tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h rs6000/e500.h rs6000/eabispe.h"
-+	extra_options="${extra_options} rs6000/sysv4.opt"
-+	tmake_file="rs6000/t-spe rs6000/t-ppccomm"
-+	;;
-+powerpc-*-eabisimaltivec*)
-+	tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h rs6000/e500.h rs6000/eabisim.h rs6000/eabialtivec.h"
-+	extra_options="${extra_options} rs6000/sysv4.opt"
-+	tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcendian rs6000/t-ppccomm"
-+	;;
-+powerpc-*-eabisim*)
-+	tm_file="${tm_file} dbxelf.h elfos.h usegas.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h rs6000/e500.h rs6000/eabisim.h"
-+	extra_options="${extra_options} rs6000/sysv4.opt"
-+	tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcgas rs6000/t-ppccomm"
-+	;;
-+powerpc-*-elf*)
-+	tm_file="${tm_file} dbxelf.h elfos.h usegas.h svr4.h freebsd-spec.h rs6000/sysv4.h"
-+	extra_options="${extra_options} rs6000/sysv4.opt"
-+	tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcgas rs6000/t-ppccomm"
-+	;;
-+powerpc-*-eabialtivec*)
-+	tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h rs6000/e500.h rs6000/eabialtivec.h"
-+	extra_options="${extra_options} rs6000/sysv4.opt"
-+	tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcendian rs6000/t-ppccomm"
-+	;;
-+powerpc-xilinx-eabi*)
-+	tm_file="${tm_file} dbxelf.h elfos.h usegas.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h rs6000/singlefp.h"
-+	extra_options="${extra_options} rs6000/sysv4.opt"
-+	tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcgas rs6000/t-ppccomm"
-+	;;
-+powerpc-*-eabi*)
-+	tm_file="${tm_file} dbxelf.h elfos.h usegas.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h rs6000/e500.h"
-+	extra_options="${extra_options} rs6000/sysv4.opt"
-+	tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcgas rs6000/t-ppccomm"
-+	;;
-+powerpc-*-rtems*)
-+	tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h rs6000/e500.h rs6000/rtems.h rtems.h"
-+	extra_options="${extra_options} rs6000/sysv4.opt"
-+	tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-rtems t-rtems rs6000/t-ppccomm"
-+	;;
-+powerpc-*-linux*altivec*)
-+	tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/linux.h rs6000/linuxaltivec.h"
-+	extra_options="${extra_options} rs6000/sysv4.opt"
-+	tmake_file="rs6000/t-fprules rs6000/t-fprules-softfp soft-fp/t-softfp rs6000/t-ppcos ${tmake_file} rs6000/t-ppccomm"
-+	;;
-+powerpc-*-linux*spe*)
-+	tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/linux.h rs6000/linuxspe.h rs6000/e500.h"
-+	extra_options="${extra_options} rs6000/sysv4.opt"
-+	tmake_file="t-dfprules rs6000/t-fprules rs6000/t-fprules-softfp soft-fp/t-softfp rs6000/t-ppcos ${tmake_file} rs6000/t-ppccomm"
-+	;;
-+powerpc-*-linux*paired*)
-+        tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/linux.h rs6000/750cl.h"
-+        extra_options="${extra_options} rs6000/sysv4.opt"
-+        tmake_file="rs6000/t-fprules rs6000/t-fprules-softfp soft-fp/t-softfp rs6000/t-ppcos ${tmake_file} rs6000/t-ppccomm"
-+        ;;
-+powerpc-*-linux*)
-+	tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h"
-+	extra_options="${extra_options} rs6000/sysv4.opt"
-+	tmake_file="t-dfprules rs6000/t-fprules rs6000/t-ppcos ${tmake_file} rs6000/t-ppccomm"
-+	case ${enable_targets}:${cpu_is_64bit} in
-+	    *powerpc64* | all:* | *:yes)
-+		if test x$cpu_is_64bit = xyes; then
-+		    tm_file="${tm_file} rs6000/default64.h"
-+		fi
-+		tm_file="rs6000/biarch64.h ${tm_file} rs6000/linux64.h"
-+		tmake_file="$tmake_file rs6000/t-linux64"
-+		extra_options="${extra_options} rs6000/linux64.opt"
-+		;;
-+	    *)
-+		tm_file="${tm_file} rs6000/linux.h"
-+		;;
-+	esac
-+	tmake_file="${tmake_file} rs6000/t-fprules-softfp soft-fp/t-softfp"
-+	if test x${enable_secureplt} = xyes; then
-+		tm_file="rs6000/secureplt.h ${tm_file}"
-+	fi
-+	;;
-+powerpc-*-gnu-gnualtivec*)
-+	tm_file="${cpu_type}/${cpu_type}.h elfos.h svr4.h freebsd-spec.h gnu.h rs6000/sysv4.h rs6000/linux.h rs6000/linuxaltivec.h rs6000/gnu.h"
-+	extra_options="${extra_options} rs6000/sysv4.opt"
-+	tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcos t-slibgcc-elf-ver t-gnu rs6000/t-ppccomm"
-+	if test x$enable_threads = xyes; then
-+		thread_file='posix'
-+	fi
-+	;;
-+powerpc-*-gnu*)
-+	tm_file="${cpu_type}/${cpu_type}.h elfos.h svr4.h freebsd-spec.h gnu.h rs6000/sysv4.h rs6000/linux.h rs6000/gnu.h"
-+	tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcos t-slibgcc-elf-ver t-gnu rs6000/t-ppccomm"
-+	extra_options="${extra_options} rs6000/sysv4.opt"
-+	if test x$enable_threads = xyes; then
-+		thread_file='posix'
-+	fi
-+	;;
-+powerpc-wrs-vxworks|powerpc-wrs-vxworksae)
-+	tm_file="${tm_file} elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h"
-+	tmake_file="${tmake_file} rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppccomm rs6000/t-vxworks"
-+	extra_options="${extra_options} rs6000/sysv4.opt"
-+	extra_headers=ppc-asm.h
-+	case ${target} in
-+	  *-vxworksae*)
-+	    tm_file="${tm_file} vx-common.h vxworksae.h rs6000/vxworks.h rs6000/e500.h rs6000/vxworksae.h"
-+	    tmake_file="${tmake_file} rs6000/t-vxworksae"
-+	    ;;
-+	  *-vxworks*)
-+	    tm_file="${tm_file} vx-common.h vxworks.h rs6000/vxworks.h rs6000/e500.h"
-+	    ;;
-+	esac
-+	;;
-+powerpc-*-lynxos*)
-+	xm_defines=POSIX
-+	tm_file="${tm_file} dbxelf.h elfos.h rs6000/sysv4.h rs6000/lynx.h lynx.h"
-+	tmake_file="t-lynx rs6000/t-lynx"
-+	extra_options="${extra_options} rs6000/sysv4.opt lynx.opt"
-+	extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-+	extra_options="${extra_options} lynx.opt"
-+	thread_file=lynx
-+	gnu_ld=yes
-+	gas=yes
-+	;;
-+powerpcle-*-elf*)
-+	tm_file="${tm_file} dbxelf.h elfos.h usegas.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/sysv4le.h"
-+	tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcgas rs6000/t-ppccomm"
-+	extra_options="${extra_options} rs6000/sysv4.opt"
-+	;;
-+powerpcle-*-eabisim*)
-+	tm_file="${tm_file} dbxelf.h elfos.h usegas.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/sysv4le.h rs6000/eabi.h rs6000/e500.h rs6000/eabisim.h"
-+	tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcgas rs6000/t-ppccomm"
-+	extra_options="${extra_options} rs6000/sysv4.opt"
-+	;;
-+powerpcle-*-eabi*)
-+	tm_file="${tm_file} dbxelf.h elfos.h usegas.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/sysv4le.h rs6000/eabi.h rs6000/e500.h"
-+	tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcgas rs6000/t-ppccomm"
-+	extra_options="${extra_options} rs6000/sysv4.opt"
-+	;;
-+powerpc-xilinx-eabi*)
-+ 	tm_file="${tm_file} dbxelf.h elfos.h usegas.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h rs6000/singlefp.h rs6000/xfpu.h"
-+  	extra_options="${extra_options} rs6000/sysv4.opt"
-+  	tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcgas rs6000/t-ppccomm"
-+  	;;
-+rs6000-ibm-aix4.[12]* | powerpc-ibm-aix4.[12]*)
-+	tm_file="${tm_file} rs6000/aix.h rs6000/aix41.h rs6000/xcoff.h"
-+	tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-newas"
-+	extra_options="${extra_options} rs6000/aix41.opt"
-+	use_collect2=yes
-+	extra_headers=
-+	use_fixproto=yes
-+	;;
-+rs6000-ibm-aix4.[3456789]* | powerpc-ibm-aix4.[3456789]*)
-+	tm_file="rs6000/biarch64.h ${tm_file} rs6000/aix.h rs6000/aix43.h rs6000/xcoff.h"
-+	tmake_file=rs6000/t-aix43
-+	extra_options="${extra_options} rs6000/aix64.opt"
-+	use_collect2=yes
-+	thread_file='aix'
-+	extra_headers=
-+	;;
-+rs6000-ibm-aix5.1.* | powerpc-ibm-aix5.1.*)
-+	tm_file="rs6000/biarch64.h ${tm_file} rs6000/aix.h rs6000/aix51.h rs6000/xcoff.h"
-+	extra_options="${extra_options} rs6000/aix64.opt"
-+	tmake_file=rs6000/t-aix43
-+	use_collect2=yes
-+	thread_file='aix'
-+	extra_headers=
-+	;;
-+rs6000-ibm-aix5.2.* | powerpc-ibm-aix5.2.*)
-+	tm_file="${tm_file} rs6000/aix.h rs6000/aix52.h rs6000/xcoff.h"
-+	tmake_file=rs6000/t-aix52
-+	extra_options="${extra_options} rs6000/aix64.opt"
-+	use_collect2=yes
-+	thread_file='aix'
-+	extra_headers=
-+	;;
-+rs6000-ibm-aix5.3.* | powerpc-ibm-aix5.3.*)
-+	tm_file="${tm_file} rs6000/aix.h rs6000/aix53.h rs6000/xcoff.h"
-+	tmake_file=rs6000/t-aix52
-+	extra_options="${extra_options} rs6000/aix64.opt"
-+	use_collect2=yes
-+	thread_file='aix'
-+	extra_headers=altivec.h
-+	;;
-+rs6000-ibm-aix[6789].* | powerpc-ibm-aix[6789].*)
-+	tm_file="${tm_file} rs6000/aix.h rs6000/aix61.h rs6000/xcoff.h"
-+	tmake_file=rs6000/t-aix52
-+	extra_options="${extra_options} rs6000/aix64.opt"
-+	use_collect2=yes
-+	thread_file='aix'
-+	extra_headers=altivec.h
-+	;;
-+s390-*-linux*)
-+	tm_file="s390/s390.h dbxelf.h elfos.h svr4.h linux.h s390/linux.h"
-+	tmake_file="${tmake_file} t-dfprules s390/t-crtstuff s390/t-linux"
-+	;;
-+s390x-*-linux*)
-+	tm_file="s390/s390x.h s390/s390.h dbxelf.h elfos.h svr4.h linux.h s390/linux.h"
-+	tm_p_file=s390/s390-protos.h
-+	md_file=s390/s390.md
-+	extra_modes=s390/s390-modes.def
-+	out_file=s390/s390.c
-+	tmake_file="${tmake_file} t-dfprules s390/t-crtstuff s390/t-linux s390/t-linux64"
-+	;;
-+s390x-ibm-tpf*)
-+        tm_file="s390/s390x.h s390/s390.h dbxelf.h elfos.h svr4.h s390/tpf.h"
-+        tm_p_file=s390/s390-protos.h
-+        md_file=s390/s390.md
-+        extra_modes=s390/s390-modes.def
-+        out_file=s390/s390.c
-+        extra_parts="crtbeginS.o crtendS.o"
-+        tmake_file="s390/t-crtstuff s390/t-tpf"
-+        thread_file='tpf'
-+	extra_options="${extra_options} s390/tpf.opt"
-+	;;
-+score-*-elf)
-+        tm_file="dbxelf.h elfos.h score/elf.h score/score.h"
-+        tmake_file=score/t-score-elf
-+        extra_objs="score7.o score3.o"
-+        ;;
-+sh-*-elf* | sh[12346l]*-*-elf* | \
-+sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
-+  sh-*-linux* | sh[2346lbe]*-*-linux* | \
-+  sh-*-netbsdelf* | shl*-*-netbsdelf* | sh5-*-netbsd* | sh5l*-*-netbsd* | \
-+   sh64-*-netbsd* | sh64l*-*-netbsd*)
-+	tmake_file="${tmake_file} sh/t-sh sh/t-elf"
-+	if test x${with_endian} = x; then
-+		case ${target} in
-+		sh[1234]*be-*-* | sh[1234]*eb-*-*) with_endian=big ;;
-+		shbe-*-* | sheb-*-*)		   with_endian=big,little ;;
-+		sh[1234]l* | sh[34]*-*-linux*)	   with_endian=little ;;
-+		shl* | sh64l* | sh*-*-linux* | \
-+		  sh5l* | sh-superh-elf)	   with_endian=little,big ;;
-+		sh[1234]*-*-*)			   with_endian=big ;;
-+		*)				   with_endian=big,little ;;
-+		esac
-+	fi
-+	case ${with_endian} in
-+	big|little)	tmake_file="${tmake_file} sh/t-1e" ;;
-+	big,little|little,big) ;;
-+	*)	echo "with_endian=${with_endian} not supported."; exit 1 ;;
-+	esac
-+	case ${with_endian} in
-+	little*)	tm_file="sh/little.h ${tm_file}" ;;
-+	esac
-+	tm_file="${tm_file} dbxelf.h elfos.h"
-+	case ${target} in
-+	sh*-*-netbsd*)	;;
-+	*)		tm_file="${tm_file} svr4.h" ;;
-+	esac
-+	tm_file="${tm_file} sh/elf.h"
-+	case ${target} in
-+	sh*-*-linux*)	tmake_file="${tmake_file} sh/t-linux"
-+			tm_file="${tm_file} linux.h sh/linux.h" ;;
-+	sh*-*-netbsd*)	tm_file="${tm_file} netbsd.h netbsd-elf.h sh/netbsd-elf.h" ;;
-+	sh*-superh-elf)	if test x$with_libgloss != xno; then
-+				with_libgloss=yes
-+				tm_file="${tm_file} sh/newlib.h"
-+			fi
-+			tm_file="${tm_file} sh/embed-elf.h sh/superh.h"
-+			tmake_file="${tmake_file} sh/t-superh"
-+			extra_options="${extra_options} sh/superh.opt" ;;
-+	*)		if test x$with_newlib = xyes \
-+			   && test x$with_libgloss = xyes; then
-+				tm_file="${tm_file} sh/newlib.h"
-+			fi
-+			tm_file="${tm_file} sh/embed-elf.h" ;;
-+	esac
-+	case ${target} in
-+	sh5*-*-netbsd*)
-+		# SHmedia, 32-bit ABI
-+		tmake_file="${tmake_file} sh/t-sh64 sh/t-netbsd"
-+		;;
-+	sh64*-netbsd*)
-+		# SHmedia, 64-bit ABI
-+		tmake_file="${tmake_file} sh/t-sh64 sh/t-netbsd sh/t-netbsd-sh5-64"
-+		;;
-+	*-*-netbsd)
-+                tmake_file="${tmake_file} sh/t-netbsd"
-+		;;
-+	sh64*-*-linux*)
-+		tmake_file="${tmake_file} sh/t-sh64 sh/t-linux64"
-+		tm_file="${tm_file} sh/sh64.h"
-+		extra_headers="shmedia.h ushmedia.h sshmedia.h"
-+		;;
-+	sh64*)
-+		tmake_file="${tmake_file} sh/t-sh64"
-+		tm_file="${tm_file} sh/sh64.h"
-+		extra_headers="shmedia.h ushmedia.h sshmedia.h"
-+		;;
-+	*-*-symbianelf*)
-+		tmake_file="sh/t-symbian"
-+		tm_file="sh/symbian-pre.h sh/little.h ${tm_file} sh/symbian-post.h"
-+		extra_objs="symbian.o"
-+		extra_parts="crt1.o crti.o crtn.o crtbegin.o crtend.o crtbeginS.o crtendS.o"
-+		;;
-+	esac
-+	# sed el/eb endian suffixes away to avoid confusion with sh[23]e
-+	case `echo ${target} | sed 's/e[lb]-/-/'` in
-+	sh64*-*-netbsd*)	sh_cpu_target=sh5-64media ;;
-+	sh64* | sh5*-*-netbsd*)	sh_cpu_target=sh5-32media ;;
-+	sh4a_single_only*)	sh_cpu_target=sh4a-single-only ;;
-+	sh4a_single*)		sh_cpu_target=sh4a-single ;;
-+	sh4a_nofpu*)		sh_cpu_target=sh4a-nofpu ;;
-+	sh4al)			sh_cpu_target=sh4al ;;
-+	sh4a*)			sh_cpu_target=sh4a ;;
-+	sh4_single_only*)	sh_cpu_target=sh4-single-only ;;
-+	sh4_single*)		sh_cpu_target=sh4-single ;;
-+	sh4_nofpu*)		sh_cpu_target=sh4-nofpu ;;
-+	sh4* | sh-superh-*)	sh_cpu_target=sh4 ;;
-+	sh3e*)			sh_cpu_target=sh3e ;;
-+	sh*-*-netbsd* | sh3*)	sh_cpu_target=sh3 ;;
-+	sh2a_single_only*)	sh_cpu_target=sh2a-single-only ;;
-+	sh2a_single*)		sh_cpu_target=sh2a-single ;;
-+	sh2a_nofpu*)		sh_cpu_target=sh2a-nofpu ;;
-+	sh2a*)			sh_cpu_target=sh2a ;;
-+	sh2e*)			sh_cpu_target=sh2e ;;
-+	sh2*)			sh_cpu_target=sh2 ;;
-+	*)			sh_cpu_target=sh1 ;;
-+	esac
-+	# did the user say --without-fp ?
-+	if test x$with_fp = xno; then
-+		case ${sh_cpu_target} in
-+		sh5-*media)	sh_cpu_target=${sh_cpu_target}-nofpu ;;
-+		sh4al | sh1)	;;
-+		sh4a* )		sh_cpu_target=sh4a-nofpu ;;
-+		sh4*)		sh_cpu_target=sh4-nofpu ;;
-+		sh3*)		sh_cpu_target=sh3 ;;
-+		sh2a*)		sh_cpu_target=sh2a-nofpu ;;
-+		sh2*)		sh_cpu_target=sh2 ;;
-+		*)	echo --without-fp not available for $target: ignored
-+		esac
-+		tm_defines="$tm_defines STRICT_NOFPU=1"
-+	fi
-+	sh_cpu_default="`echo $with_cpu|sed s/^m/sh/|tr A-Z_ a-z-`"
-+	case $sh_cpu_default in
-+	sh5-64media-nofpu | sh5-64media | \
-+	  sh5-32media-nofpu | sh5-32media | sh5-compact-nofpu | sh5-compact | \
-+	  sh2a-single-only | sh2a-single | sh2a-nofpu | sh2a | \
-+	  sh4a-single-only | sh4a-single | sh4a-nofpu | sh4a | sh4al | \
-+	  sh4-single-only | sh4-single | sh4-nofpu | sh4 | sh4-300 | \
-+	  sh3e | sh3 | sh2e | sh2 | sh1) ;;
-+	"")	sh_cpu_default=${sh_cpu_target} ;;
-+	*)	echo "with_cpu=$with_cpu not supported"; exit 1 ;;
-+	esac
-+	sh_multilibs=${with_multilib_list}
-+	if test x${sh_multilibs} = x ; then
-+		case ${target} in
-+		sh64-superh-linux* | \
-+		sh[1234]*)	sh_multilibs=${sh_cpu_target} ;;
-+		sh64* | sh5*)	sh_multilibs=m5-32media,m5-32media-nofpu,m5-compact,m5-compact-nofpu,m5-64media,m5-64media-nofpu ;;
-+		sh-superh-*)	sh_multilibs=m4,m4-single,m4-single-only,m4-nofpu ;;
-+		sh*-*-linux*)	sh_multilibs=m1,m3e,m4 ;;
-+		sh*-*-netbsd*)	sh_multilibs=m3,m3e,m4 ;;
-+		*) sh_multilibs=m1,m2,m2e,m4,m4-single,m4-single-only,m2a,m2a-single ;;
-+		esac
-+		if test x$with_fp = xno; then
-+			sh_multilibs="`echo $sh_multilibs|sed -e s/m4/sh4-nofpu/ -e s/,m4-[^,]*//g -e s/,m[23]e// -e s/m2a,m2a-single/m2a-nofpu/ -e s/m5-..m....,//g`"
-+		fi
-+	fi
-+	target_cpu_default=SELECT_`echo ${sh_cpu_default}|tr abcdefghijklmnopqrstuvwxyz- ABCDEFGHIJKLMNOPQRSTUVWXYZ_`
-+	tm_defines=${tm_defines}' SH_MULTILIB_CPU_DEFAULT=\"'`echo $sh_cpu_default|sed s/sh/m/`'\"'
-+	sh_multilibs=`echo $sh_multilibs,$sh_cpu_default | sed -e 's/[ 	,/][ 	,]*/ /g' -e 's/ $//' -e 's/^m/sh/' -e 's/ m/ sh/g' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ_ abcdefghijklmnopqrstuvwxyz-`
-+	for sh_multilib in ${sh_multilibs}; do
-+		case ${sh_multilib} in
-+		sh1 | sh2 | sh2e | sh3 | sh3e | \
-+		sh4 | sh4-single | sh4-single-only | sh4-nofpu | sh4-300 |\
-+		sh4a | sh4a-single | sh4a-single-only | sh4a-nofpu | sh4al | \
-+		sh2a | sh2a-single | sh2a-single-only | sh2a-nofpu | \
-+		sh5-64media | sh5-64media-nofpu | \
-+		sh5-32media | sh5-32media-nofpu | \
-+		sh5-compact | sh5-compact-nofpu)
-+			tmake_file="${tmake_file} sh/t-mlib-${sh_multilib}"
-+			tm_defines="$tm_defines SUPPORT_`echo $sh_multilib|tr abcdefghijklmnopqrstuvwxyz- ABCDEFGHIJKLMNOPQRSTUVWXYZ_`=1"
-+			;;
-+		*)
-+			echo "with_multilib_list=${sh_multilib} not supported."
-+			exit 1
-+			;;
-+		esac
-+	done
-+	if test x${enable_incomplete_targets} = xyes ; then
-+		tm_defines="$tm_defines SUPPORT_SH1=1 SUPPORT_SH2E=1 SUPPORT_SH4=1 SUPPORT_SH4_SINGLE=1 SUPPORT_SH2A=1 SUPPORT_SH2A_SINGLE=1 SUPPORT_SH5_32MEDIA=1 SUPPORT_SH5_32MEDIA_NOFPU=1 SUPPORT_SH5_64MEDIA=1 SUPPORT_SH5_64MEDIA_NOFPU=1"
-+	fi
-+	;;
-+sh-*-rtems*)
-+	tmake_file="sh/t-sh sh/t-elf t-rtems sh/t-rtems"
-+	tm_file="${tm_file} dbxelf.h elfos.h svr4.h sh/elf.h sh/embed-elf.h sh/rtemself.h rtems.h"
-+	;;
-+sh-wrs-vxworks)
-+	tmake_file="$tmake_file sh/t-sh sh/t-elf sh/t-vxworks"
-+	tm_file="${tm_file} elfos.h svr4.h sh/elf.h sh/embed-elf.h vx-common.h vxworks.h sh/vxworks.h"
-+	;;
-+sh-*-*)
-+	tm_file="${tm_file} dbxcoff.h sh/coff.h"
-+	;;
-+sparc-*-netbsdelf*)
-+	tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h netbsd.h netbsd-elf.h sparc/netbsd-elf.h"
-+	extra_options="${extra_options} sparc/long-double-switch.opt"
-+	;;
-+sparc64-*-openbsd*)
-+	tm_file="sparc/openbsd1-64.h ${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/sp64-elf.h openbsd.h sparc/openbsd64.h"
-+	extra_options="${extra_options} sparc/little-endian.opt"
-+	gas=yes gnu_ld=yes
-+	with_cpu=ultrasparc
-+	;;
-+sparc-*-elf*)
-+	tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/sp-elf.h"
-+	tmake_file="sparc/t-elf sparc/t-crtfm"
-+	extra_parts="crti.o crtn.o crtbegin.o crtend.o"
-+	;;
-+sparc-*-linux*)		# SPARC's running GNU/Linux, libc6
-+	tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/gas.h linux.h"
-+	extra_options="${extra_options} sparc/long-double-switch.opt"
-+	tmake_file="${tmake_file} sparc/t-linux"
-+	if test x$enable_targets = xall; then
-+		tm_file="sparc/biarch64.h ${tm_file} sparc/linux64.h"
-+		tmake_file="${tmake_file} sparc/t-linux64"
-+	else
-+		tm_file="${tm_file} sparc/linux.h"
-+	fi
-+	tmake_file="${tmake_file} sparc/t-crtfm"
-+	;;
-+sparc-*-rtems*)
-+	tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/sp-elf.h sparc/rtemself.h rtems.h"
-+	tmake_file="sparc/t-elf sparc/t-crtfm t-rtems"
-+	extra_parts="crti.o crtn.o crtbegin.o crtend.o"
-+	;;
-+sparc64-*-solaris2* | sparcv9-*-solaris2*)
-+	tm_file="sparc/biarch64.h ${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h"
-+	case ${target} in
-+	*-*-solaris2.1[0-9]*)
-+		tm_file="${tm_file} sol2-10.h"
-+		;;
-+	esac
-+	tm_file="${tm_file} sparc/sol2.h sparc/sol2-64.h sparc/sol2-bi.h"
-+	if test x$gnu_ld = xyes; then
-+		tm_file="${tm_file} sol2-gld.h sparc/sol2-gld-bi.h"
-+	fi
-+	if test x$gas = xyes; then
-+		tm_file="${tm_file} sparc/sol2-gas.h sparc/sol2-gas-bi.h"
-+	fi
-+	tm_file="${tm_file} tm-dwarf2.h"
-+	tmake_file="t-sol2 sparc/t-sol2 sparc/t-sol2-64 sparc/t-crtfm"
-+	if test x$gnu_ld = xyes; then
-+		tmake_file="$tmake_file t-slibgcc-elf-ver"
-+	else
-+		tmake_file="$tmake_file t-slibgcc-sld"
-+	fi
-+	if test x$gas = xyes; then
-+		tm_file="usegas.h ${tm_file}"
-+	fi
-+	c_target_objs="sol2-c.o"
-+	cxx_target_objs="sol2-c.o"
-+	extra_objs="sol2.o"
-+	tm_p_file="${tm_p_file} sol2-protos.h"
-+	extra_parts="crt1.o crti.o crtn.o gcrt1.o crtbegin.o crtend.o"
-+	case ${enable_threads}:${have_pthread_h}:${have_thread_h} in
-+	  "":yes:* | yes:yes:* ) thread_file=posix ;;
-+	  "":*:yes | yes:*:yes ) thread_file=solaris ;;
-+	esac
-+	;;
-+sparc-*-solaris2*)
-+	tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h"
-+	case ${target} in
-+	*-*-solaris2.1[0-9]*)
-+		tm_file="${tm_file} sol2-10.h"
-+		;;
-+	esac
-+	tm_file="${tm_file} sparc/sol2.h"
-+	if test x$gnu_ld = xyes; then
-+		tm_file="${tm_file} sol2-gld.h"
-+	fi
-+	if test x$gas = xyes; then
-+		tm_file="${tm_file} sparc/sol2-gas.h"
-+	fi
-+	tmake_file="t-sol2 sparc/t-sol2 sparc/t-crtfm"
-+	if test x$gnu_ld = xyes; then
-+		tmake_file="$tmake_file t-slibgcc-elf-ver"
-+	else
-+		tmake_file="$tmake_file t-slibgcc-sld"
-+	fi
-+	tm_file="sparc/biarch64.h ${tm_file} sparc/sol2-bi.h"
-+	if test x$gnu_ld = xyes; then
-+		tm_file="${tm_file} sparc/sol2-gld-bi.h"
-+	fi
-+	if test x$gas = xyes; then
-+		tm_file="${tm_file} sparc/sol2-gas-bi.h"
-+	fi
-+	if test x$gas = xyes; then
-+		tm_file="usegas.h ${tm_file}"
-+	fi
-+	tm_file="${tm_file} tm-dwarf2.h"
-+	tmake_file="$tmake_file sparc/t-sol2-64"
-+	test x$with_cpu != x || with_cpu=v9
-+	c_target_objs="sol2-c.o"
-+	cxx_target_objs="sol2-c.o"
-+	extra_objs="sol2.o"
-+	tm_p_file="${tm_p_file} sol2-protos.h"
-+	extra_parts="crt1.o crti.o crtn.o gcrt1.o gmon.o crtbegin.o crtend.o"
-+	case ${enable_threads}:${have_pthread_h}:${have_thread_h} in
-+	  "":yes:* | yes:yes:* )
-+		thread_file=posix
-+		;;
-+	  "":*:yes | yes:*:yes )
-+		thread_file=solaris
-+		;;
-+	esac
-+	;;
-+sparc-wrs-vxworks)
-+	tm_file="${tm_file} elfos.h svr4.h sparc/sysv4.h vx-common.h vxworks.h sparc/vxworks.h"
-+	tmake_file="${tmake_file} sparc/t-vxworks"
-+	;;
-+sparc64-*-elf*)
-+	tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/sp64-elf.h"
-+	extra_options="${extra_options} sparc/little-endian.opt"
-+	tmake_file="${tmake_file} sparc/t-crtfm"
-+	extra_parts="crtbegin.o crtend.o"
-+	;;
-+sparc64-*-freebsd*|ultrasparc-*-freebsd*)
-+	tm_file="${tm_file} ${fbsd_tm_file} dbxelf.h elfos.h sparc/sysv4.h sparc/freebsd.h"
-+	extra_options="${extra_options} sparc/long-double-switch.opt"
-+	tmake_file="${tmake_file} sparc/t-crtfm"
-+	case "x$with_cpu" in
-+		xultrasparc) ;;
-+		x) with_cpu=ultrasparc ;;
-+		*) echo "$with_cpu not supported for freebsd target"; exit 1 ;;
-+	esac
-+	;;
-+sparc64-*-linux*)		# 64-bit SPARC's running GNU/Linux
-+	tm_file="sparc/biarch64.h ${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/gas.h linux.h sparc/linux64.h"
-+	extra_options="${extra_options} sparc/long-double-switch.opt"
-+	tmake_file="${tmake_file} sparc/t-linux sparc/t-linux64 sparc/t-crtfm"
-+	;;
-+sparc64-*-netbsd*)
-+	tm_file="sparc/biarch64.h ${tm_file}"
-+	tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h netbsd.h netbsd-elf.h sparc/netbsd-elf.h"
-+	extra_options="${extra_options} sparc/long-double-switch.opt"
-+	tmake_file="${tmake_file} sparc/t-netbsd64"
-+	;;
-+spu-*-elf*)
-+	tm_file="dbxelf.h elfos.h spu/spu-elf.h spu/spu.h"
-+	tmake_file="spu/t-spu-elf"
-+	extra_headers="spu_intrinsics.h spu_internals.h vmx2spu.h spu_mfcio.h vec_types.h"
-+	extra_modes=spu/spu-modes.def
-+	c_target_objs="${c_target_objs} spu-c.o"
-+	cxx_target_objs="${cxx_target_objs} spu-c.o"
-+	;;
-+v850e1-*-*)
-+	target_cpu_default="TARGET_CPU_v850e1"
-+	tm_file="dbxelf.h elfos.h svr4.h v850/v850.h"
-+	tm_p_file=v850/v850-protos.h
-+	tmake_file=v850/t-v850e
-+	md_file=v850/v850.md
-+	out_file=v850/v850.c
-+	extra_options="${extra_options} v850/v850.opt"
-+	if test x$stabs = xyes
-+	then
-+		tm_file="${tm_file} dbx.h"
-+	fi
-+	use_collect2=no
-+	c_target_objs="v850-c.o"
-+	cxx_target_objs="v850-c.o"
-+	;;
-+v850e-*-*)
-+	target_cpu_default="TARGET_CPU_v850e"
-+	tm_file="dbxelf.h elfos.h svr4.h v850/v850.h"
-+	tm_p_file=v850/v850-protos.h
-+	tmake_file=v850/t-v850e
-+	md_file=v850/v850.md
-+	out_file=v850/v850.c
-+	extra_options="${extra_options} v850/v850.opt"
-+	if test x$stabs = xyes
-+	then
-+		tm_file="${tm_file} dbx.h"
-+	fi
-+	use_collect2=no
-+	c_target_objs="v850-c.o"
-+	cxx_target_objs="v850-c.o"
-+	;;
-+v850-*-*)
-+	target_cpu_default="TARGET_CPU_generic"
-+	tm_file="dbxelf.h elfos.h svr4.h ${tm_file}"
-+	tmake_file=v850/t-v850
-+	if test x$stabs = xyes
-+	then
-+		tm_file="${tm_file} dbx.h"
-+	fi
-+	use_collect2=no
-+	c_target_objs="v850-c.o"
-+	cxx_target_objs="v850-c.o"
-+	;;
-+vax-*-netbsdelf*)
-+	tm_file="${tm_file} elfos.h netbsd.h netbsd-elf.h vax/elf.h vax/netbsd-elf.h"
-+	;;
-+vax-*-netbsd*)
-+	tm_file="${tm_file} netbsd.h netbsd-aout.h vax/netbsd.h"
-+	tmake_file=t-netbsd
-+	extra_parts=""
-+	use_collect2=yes
-+	;;
-+vax-*-openbsd*)
-+	tm_file="vax/vax.h vax/openbsd1.h openbsd.h vax/openbsd.h"
-+	use_collect2=yes
-+	;;
-+xstormy16-*-elf)
-+	# For historical reasons, the target files omit the 'x'.
-+	tm_file="dbxelf.h elfos.h svr4.h stormy16/stormy16.h"
-+	tm_p_file=stormy16/stormy16-protos.h
-+	md_file=stormy16/stormy16.md
-+	out_file=stormy16/stormy16.c
-+	extra_options=stormy16/stormy16.opt
-+	tmake_file="stormy16/t-stormy16"
-+	extra_parts="crtbegin.o crtend.o"
-+	;;
-+xtensa*-*-elf*)
-+	tm_file="${tm_file} dbxelf.h elfos.h svr4.h xtensa/elf.h"
-+	tmake_file="xtensa/t-xtensa xtensa/t-elf"
-+	;;
-+xtensa*-*-linux*)
-+	tm_file="${tm_file} dbxelf.h elfos.h svr4.h linux.h xtensa/linux.h"
-+	tmake_file="${tmake_file} xtensa/t-xtensa xtensa/t-linux"
-+	;;
-+am33_2.0-*-linux*)
-+	tm_file="mn10300/mn10300.h dbxelf.h elfos.h linux.h mn10300/linux.h"
-+	tmake_file="${tmake_file} mn10300/t-linux"
-+	gas=yes gnu_ld=yes
-+	extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o"
-+	use_collect2=no
-+	;;
-+m32c-*-rtems*)
-+	tm_file="dbxelf.h elfos.h svr4.h ${tm_file} m32c/rtems.h rtems.h"
-+	tmake_file="${tmake_file} t-rtems"
-+	c_target_objs="m32c-pragma.o"
-+	cxx_target_objs="m32c-pragma.o"
-+ 	;;
-+m32c-*-elf*)
-+	tm_file="dbxelf.h elfos.h svr4.h ${tm_file}"
-+	c_target_objs="m32c-pragma.o"
-+	cxx_target_objs="m32c-pragma.o"
-+ 	;;
-+*)
-+	echo "*** Configuration ${target} not supported" 1>&2
-+	exit 1
-+	;;
-+esac
-+
-+case ${target} in
-+i[34567]86-*-linux* | x86_64-*-linux*)
-+	tmake_file="${tmake_file} i386/t-pmm_malloc i386/t-i386"
-+	;;
-+i[34567]86-*-* | x86_64-*-*)
-+	tmake_file="${tmake_file} i386/t-gmm_malloc i386/t-i386"
-+	;;
-+esac
-+
-+# Support for --with-cpu and related options (and a few unrelated options,
-+# too).
-+case ${with_cpu} in
-+  yes | no)
-+    echo "--with-cpu must be passed a value" 1>&2
-+    exit 1
-+    ;;
-+esac
-+
-+# If there is no $with_cpu option, try to infer one from ${target}.
-+# This block sets nothing except for with_cpu.
-+if test x$with_cpu = x ; then
-+  case ${target} in
-+    i386-*-*)
-+      with_cpu=i386
-+      ;;
-+    i486-*-*)
-+      with_cpu=i486
-+      ;;
-+    i586-*-*)
-+      case ${target_noncanonical} in
-+        k6_2-*)
-+          with_cpu=k6-2
-+          ;;
-+        k6_3-*)
-+          with_cpu=k6-3
-+          ;;
-+        k6-*)
-+          with_cpu=k6
-+          ;;
-+        pentium_mmx-*|winchip_c6-*|winchip2-*|c3-*)
-+          with_cpu=pentium-mmx
-+          ;;
-+        *)
-+          with_cpu=pentium
-+          ;;
-+      esac
-+      ;;
-+    i686-*-* | i786-*-*)
-+      case ${target_noncanonical} in
-+        amdfam10-*|barcelona-*)
-+          with_cpu=amdfam10
-+          ;;
-+        k8_sse3-*|opteron_sse3-*|athlon64_sse3-*)
-+          with_cpu=k8-sse3
-+          ;;
-+        k8-*|opteron-*|athlon64-*|athlon_fx-*)
-+          with_cpu=k8
-+          ;;
-+        athlon_xp-*|athlon_mp-*|athlon_4-*)
-+          with_cpu=athlon-4
-+          ;;
-+        athlon_tbird-*|athlon-*)
-+          with_cpu=athlon
-+          ;;
-+	geode-*)
-+	  with_cpu=geode
-+	  ;;
-+        pentium2-*)
-+          with_cpu=pentium2
-+          ;;
-+        pentium3-*|pentium3m-*)
-+          with_cpu=pentium3
-+          ;;
-+        pentium4-*|pentium4m-*)
-+          with_cpu=pentium4
-+          ;;
-+        prescott-*)
-+          with_cpu=prescott
-+          ;;
-+        nocona-*)
-+          with_cpu=nocona
-+          ;;
-+	core2-*)
-+	  with_cpu=core2
-+	  ;;
-+        pentium_m-*)
-+          with_cpu=pentium-m
-+          ;;
-+        pentiumpro-*)
-+          with_cpu=pentiumpro
-+          ;;
-+        *)
-+          with_cpu=generic
-+          ;;
-+      esac
-+      ;;
-+    x86_64-*-*)
-+      case ${target_noncanonical} in
-+        amdfam10-*|barcelona-*)
-+          with_cpu=amdfam10
-+          ;;
-+        k8_sse3-*|opteron_sse3-*|athlon64_sse3-*)
-+          with_cpu=k8-sse3
-+          ;;
-+        k8-*|opteron-*|athlon64-*|athlon_fx-*)
-+          with_cpu=k8
-+          ;;
-+        nocona-*)
-+          with_cpu=nocona
-+          ;;
-+	core2-*)
-+	  with_cpu=core2
-+	  ;;
-+        *)
-+          with_cpu=generic
-+          ;;
-+      esac
-+      ;;
-+    alphaev6[78]*-*-*)
-+      with_cpu=ev67
-+      ;;
-+    alphaev6*-*-*)
-+      with_cpu=ev6
-+      ;;
-+    alphapca56*-*-*)
-+      with_cpu=pca56
-+      ;;
-+    alphaev56*-*-*)
-+      with_cpu=ev56
-+      ;;
-+    alphaev5*-*-*)
-+      with_cpu=ev5
-+      ;;
-+    frv-*-*linux* | frv400-*-*linux*)
-+      with_cpu=fr400
-+      ;;
-+    frv550-*-*linux*)
-+      with_cpu=fr550
-+      ;;
-+    m68k*-*-*)
-+      case "$with_arch" in
-+	"cf")
-+	  with_cpu=${default_cf_cpu}
-+	  ;;
-+	"" | "m68k")
-+	  with_cpu=m${default_m68k_cpu}
-+	  ;;
-+      esac
-+      ;;
-+    mips*-*-vxworks)
-+      with_arch=mips2
-+      ;;
-+    sparc*-*-*)
-+      with_cpu="`echo ${target} | sed 's/-.*$//'`"
-+      ;;
-+  esac
-+
-+  # Avoid overriding --with-cpu-32 and --with-cpu-64 values.
-+  case ${target} in
-+    i[34567]86-*-*|x86_64-*-*)
-+      if test x$with_cpu != x; then
-+        if test x$with_cpu_32 != x || test x$with_cpu_64 != x; then
-+          if test x$with_cpu_32 = x; then
-+            with_cpu_32=$with_cpu
-+          fi
-+          if test x$with_cpu_64 = x; then
-+            with_cpu_64=$with_cpu
-+          fi
-+          with_cpu=
-+        fi
-+      fi
-+      ;;
-+  esac
-+fi
-+
-+# Similarly for --with-schedule.
-+if test x$with_schedule = x; then
-+	case ${target} in
-+	hppa1*)
-+		# Override default PA8000 scheduling model.
-+		with_schedule=7100LC
-+		;;
-+	esac
-+fi
-+
-+# Validate and mark as valid any --with options supported
-+# by this target.  In order to use a particular --with option
-+# you must list it in supported_defaults; validating the value
-+# is optional.  This case statement should set nothing besides
-+# supported_defaults.
-+
-+supported_defaults=
-+case "${target}" in
-+	alpha*-*-*)
-+		supported_defaults="cpu tune"
-+		for which in cpu tune; do
-+			eval "val=\$with_$which"
-+			case "$val" in
-+			"" \
-+			| ev4 | ev45 | 21064 | ev5 | 21164 | ev56 | 21164a \
-+			| pca56 | 21164PC | 21164pc | ev6 | 21264 | ev67 \
-+			| 21264a)
-+				;;
-+			*)
-+				echo "Unknown CPU used in --with-$which=$val" 1>&2
-+				exit 1
-+				;;
-+			esac
-+		done
-+		;;
-+
-+	arm*-*-*)
-+		supported_defaults="arch cpu float tune fpu abi mode"
-+		for which in cpu tune; do
-+			# See if it matches any of the entries in arm-cores.def
-+			eval "val=\$with_$which"
-+			if [ x"$val" = x ] \
-+			    || grep "^ARM_CORE(\"$val\"," \
-+				    ${srcdir}/config/arm/arm-cores.def \
-+				    > /dev/null; then
-+			  # Ok
-+			  new_val=`grep "^ARM_CORE(\"$val\"," \
-+				${srcdir}/config/arm/arm-cores.def | \
-+				sed -e 's/^[^,]*,[ 	]*//' | \
-+				sed -e 's/,.*$//'`
-+			  eval "target_${which}_cname=$new_val"
-+			echo "For $val real value is $new_val"
-+			  true
-+			else
-+			  echo "Unknown CPU used in --with-$which=$val" 1>&2
-+			  exit 1
-+			fi
-+		done
-+
-+		case "$with_arch" in
-+		"" \
-+		| armv[23456] | armv2a | armv3m | armv4t | armv5t \
-+		| armv5te | armv6j |armv6k | armv6z | armv6zk | armv6-m \
-+		| armv7 | armv7-a | armv7-r | armv7-m \
-+		| iwmmxt | ep9312)
-+			# OK
-+			;;
-+		*)
-+			echo "Unknown arch used in --with-arch=$with_arch" 1>&2
-+			exit 1
-+			;;
-+		esac
-+
-+		case "$with_float" in
-+		"" \
-+		| soft | hard | softfp)
-+			# OK
-+			;;
-+		*)
-+			echo "Unknown floating point type used in --with-float=$with_float" 1>&2
-+			exit 1
-+			;;
-+		esac
-+
-+		case "$with_fpu" in
-+		"" \
-+		| fpa | fpe2 | fpe3 | maverick | vfp | vfp3 | vfpv3 | vfpv3-d16 | neon )
-+			# OK
-+			;;
-+		*)
-+			echo "Unknown fpu used in --with-fpu=$with_fpu" 2>&1
-+			exit 1
-+			;;
-+		esac
-+
-+		case "$with_abi" in
-+		"" \
-+		| apcs-gnu | atpcs | aapcs | iwmmxt | aapcs-linux )
-+			#OK
-+			;;
-+		*)
-+			echo "Unknown ABI used in --with-abi=$with_abi"
-+			exit 1
-+			;;
-+		esac
-+
-+		case "$with_mode" in
-+		"" \
-+		| arm | thumb )
-+			#OK
-+			;;
-+		*)
-+			echo "Unknown mode used in --with-mode=$with_mode"
-+			exit 1
-+			;;
-+		esac
-+
-+		if test "x$with_arch" != x && test "x$with_cpu" != x; then
-+			echo "Warning: --with-arch overrides --with-cpu=$with_cpu" 1>&2
-+		fi
-+		;;
-+
-+	fr*-*-*linux*)
-+		supported_defaults=cpu
-+		case "$with_cpu" in
-+		fr400) ;;
-+		fr550) ;;
-+		*)
-+			echo "Unknown cpu used in --with-cpu=$with_cpu" 1>&2
-+			exit 1
-+			;;
-+		esac
-+		;;
-+
-+	fido-*-* | m68k*-*-*)
-+		supported_defaults="arch cpu"
-+		case "$with_arch" in
-+		"" | "m68k"| "cf")
-+			m68k_arch_family="$with_arch"
-+			;;
-+		*)
-+			echo "Invalid --with-arch=$with_arch" 1>&2
-+			exit 1
-+			;;
-+		esac
-+
-+		# We always have a $with_cpu setting here.
-+		case "$with_cpu" in
-+		"m68000" | "m68010" | "m68020" | "m68030" | "m68040" | "m68060")
-+			m68k_cpu_ident=$with_cpu
-+			;;
-+		"m68020-40")
-+			m68k_cpu_ident=m68020
-+			tm_defines="$tm_defines M68K_DEFAULT_TUNE=u68020_40"
-+			;;
-+		"m68020-60")
-+			m68k_cpu_ident=m68020
-+			tm_defines="$tm_defines M68K_DEFAULT_TUNE=u68020_60"
-+			;;
-+		*)
-+			# We need the C identifier rather than the string.
-+			m68k_cpu_ident=`awk -v arg="\"$with_cpu\"" \
-+			   'BEGIN { FS="[ \t]*[,()][ \t]*" }; \
-+			    $1 == "M68K_DEVICE" && $2 == arg { print $3 }' \
-+				 ${srcdir}/config/m68k/m68k-devices.def`
-+			if [ x"$m68k_cpu_ident" = x ] ; then
-+				echo "Unknown CPU used in --with-cpu=$with_cpu" 1>&2
-+				exit 1
-+			fi
-+			with_cpu="mcpu=$with_cpu"
-+			;;
-+		esac
-+		;;
-+
-+	hppa*-*-*)
-+		supported_defaults="arch schedule"
-+
-+		case "$with_arch" in
-+		"" | 1.0 | 1.1 | 2.0)
-+			# OK
-+			;;
-+		*)
-+			echo "Unknown architecture used in --with-arch=$with_arch" 1>&2
-+			exit 1
-+			;;
-+		esac
-+
-+		case "$with_schedule" in
-+		"" | 700 | 7100 | 7100LC | 7200 | 7300 | 8000)
-+			# OK
-+			;;
-+		*)
-+			echo "Unknown processor used in --with-schedule=$with_schedule." 1>&2
-+			exit 1
-+			;;
-+		esac
-+		;;
-+
-+	i[34567]86-*-* | x86_64-*-*)
-+		supported_defaults="arch arch_32 arch_64 cpu cpu_32 cpu_64 tune tune_32 tune_64"
-+		for which in arch arch_32 arch_64 cpu cpu_32 cpu_64 tune tune_32 tune_64; do
-+			eval "val=\$with_$which"
-+			case ${val} in
-+			i386 | i486 \
-+			| i586 | pentium | pentium-mmx | winchip-c6 | winchip2 \
-+			| c3 | c3-2 | i686 | pentiumpro | pentium2 | pentium3 \
-+			| pentium4 | k6 | k6-2 | k6-3 | athlon | athlon-tbird \
-+			| athlon-4 | athlon-xp | athlon-mp | geode \
-+			| prescott | pentium-m | pentium4m | pentium3m)
-+				case "${target}" in
-+				  x86_64-*-*)
-+				      case "x$which" in
-+					*_32)
-+						;;
-+					*)
-+						echo "CPU given in --with-$which=$val doesn't support 64bit mode." 1>&2
-+						exit 1
-+						;;
-+				      esac
-+				      ;;
-+				esac
-+				# OK
-+				;;
-+			"" | amdfam10 | barcelona | k8-sse3 | opteron-sse3 | athlon64-sse3 | k8 | opteron | athlon64 | athlon-fx | nocona | core2 | generic)
-+				# OK
-+				;;
-+			*)
-+				echo "Unknown CPU given in --with-$which=$val." 1>&2
-+				exit 1
-+				;;
-+			esac
-+		done
-+		;;
-+
-+	mips*-*-*)
-+		supported_defaults="abi arch float tune divide llsc mips-plt"
-+
-+		case ${with_float} in
-+		"" | soft | hard)
-+			# OK
-+			;;
-+		*)
-+			echo "Unknown floating point type used in --with-float=$with_float" 1>&2
-+			exit 1
-+			;;
-+		esac
-+
-+		case ${with_abi} in
-+		"" | 32 | o64 | n32 | 64 | eabi)
-+			# OK
-+			;;
-+		*)
-+			echo "Unknown ABI used in --with-abi=$with_abi" 1>&2
-+			exit 1
-+			;;
-+		esac
-+
-+		case ${with_divide} in
-+		"" | breaks | traps)
-+			# OK
-+			;;
-+		*)
-+			echo "Unknown division check type use in --with-divide=$with_divide" 1>&2
-+			exit 1
-+			;;
-+		esac
-+
-+		case ${with_llsc} in
-+		yes)
-+			with_llsc=llsc
-+			;;
-+		no)
-+			with_llsc="no-llsc"
-+			;;
-+		"")
-+			# OK
-+			;;
-+		*)
-+			echo "Unknown llsc type used in --with-llsc" 1>&2
-+			exit 1
-+			;;
-+		esac
-+
-+		case ${with_mips_plt} in
-+		yes)
-+			with_mips_plt=plt
-+			;;
-+		no)
-+			with_mips_plt=no-plt
-+			;;
-+		"")
-+			;;
-+		*)
-+			echo "Unknown --with-mips-plt argument: $with_mips_plt" 1>&2
-+			exit 1
-+			;;
-+		esac
-+		;;
-+
-+	powerpc*-*-* | rs6000-*-*)
-+		supported_defaults="cpu float tune"
-+
-+		for which in cpu tune; do
-+			eval "val=\$with_$which"
-+			case ${val} in
-+			default32 | default64)
-+				with_which="with_$which"
-+				eval $with_which=
-+				;;
-+			405cr)
-+				tm_defines="${tm_defines} CONFIG_PPC405CR"
-+				eval "with_$which=405"
-+				;;
-+			"" | common \
-+			| power | power[234567] | power6x | powerpc | powerpc64 \
-+			| rios | rios1 | rios2 | rsc | rsc1 | rs64a \
-+			| 401 | 403 | 405 | 405fp | 440 | 440fp | 464 | 464fp \
-+			| 505 | 601 | 602 | 603 | 603e | ec603e | 604 \
-+			| 604e | 620 | 630 | 740 | 750 | 7400 | 7450 \
-+			| e300c[23] | 854[08] | e500mc \
-+			| 801 | 821 | 823 | 860 | 970 | G3 | G4 | G5 | cell)
-+				# OK
-+				;;
-+			*)
-+				echo "Unknown cpu used in --with-$which=$val." 1>&2
-+				exit 1
-+				;;
-+			esac
-+		done
-+		;;
-+
-+	s390*-*-*)
-+		supported_defaults="arch mode tune"
-+
-+		for which in arch tune; do
-+			eval "val=\$with_$which"
-+			case ${val} in
-+			"" | g5 | g6 | z900 | z990 | z9-109 | z9-ec | z10)
-+				# OK
-+				;;
-+			*)
-+				echo "Unknown cpu used in --with-$which=$val." 1>&2
-+				exit 1
-+				;;
-+			esac
-+		done
-+
-+		case ${with_mode} in
-+		"" | esa | zarch)
-+			# OK
-+			;;
-+		*)
-+			echo "Unknown architecture mode used in --with-mode=$with_mode." 1>&2
-+			exit 1
-+			;;
-+		esac
-+		;;
-+
-+	sh[123456ble]-*-* | sh-*-*)
-+		supported_defaults="cpu"
-+		case "`echo $with_cpu | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ_ abcdefghijklmnopqrstuvwxyz- | sed s/sh/m/`" in
-+		"" | m1 | m2 | m2e | m3 | m3e | m4 | m4-single | m4-single-only | m4-nofpu )
-+			# OK
-+			;;
-+		m2a | m2a-single | m2a-single-only | m2a-nofpu)
-+			;;
-+		m4a | m4a-single | m4a-single-only | m4a-nofpu | m4al)
-+		        ;;
-+		*)
-+			echo "Unknown CPU used in --with-cpu=$with_cpu, known values:"  1>&2
-+			echo "m1 m2 m2e m3 m3e m4 m4-single m4-single-only m4-nofpu" 1>&2
-+			echo "m4a m4a-single m4a-single-only m4a-nofpu m4al" 1>&2
-+			echo "m2a m2a-single m2a-single-only m2a-nofpu" 1>&2
-+			exit 1
-+			;;
-+		esac
-+		;;
-+	sparc*-*-*)
-+		supported_defaults="cpu float tune"
-+
-+		for which in cpu tune; do
-+			eval "val=\$with_$which"
-+			case ${val} in
-+			"" | sparc | sparcv9 | sparc64 | sparc86x \
-+			| v7 | cypress | v8 | supersparc | sparclite | f930 \
-+			| f934 | hypersparc | sparclite86x | sparclet | tsc701 \
-+			| v9 | ultrasparc | ultrasparc3 | niagara | niagara2)
-+				# OK
-+				;;
-+			*)
-+				echo "Unknown cpu used in --with-$which=$val" 1>&2
-+				exit 1
-+				;;
-+			esac
-+		done
-+
-+		case ${with_float} in
-+		"" | soft | hard)
-+			# OK
-+			;;
-+		*)
-+			echo "Unknown floating point type used in --with-float=$with_float" 1>&2
-+			exit 1
-+			;;
-+		esac
-+		;;
-+
-+	spu-*-*)
-+		supported_defaults="arch tune"
-+
-+		for which in arch tune; do
-+			eval "val=\$with_$which"
-+			case ${val} in
-+			"" | cell | celledp)
-+				# OK
-+				;;
-+			*)
-+				echo "Unknown cpu used in --with-$which=$val." 1>&2
-+				exit 1
-+				;;
-+			esac
-+		done
-+		;;
-+
-+	v850*-*-*)
-+		supported_defaults=cpu
-+		case ${with_cpu} in
-+		"" | v850e | v850e1)
-+			# OK
-+			;;
-+		*)
-+			echo "Unknown cpu used in --with-cpu=$with_cpu" 1>&2
-+			exit 1
-+			;;
-+		esac
-+		;;
-+esac
-+
-+# Set some miscellaneous flags for particular targets.
-+target_cpu_default2=
-+case ${target} in
-+	alpha*-*-*)
-+		if test x$gas = xyes
-+		then
-+			target_cpu_default2="MASK_GAS"
-+		fi
-+		;;
-+
-+	arm*-*-*)
-+		if test x$target_cpu_cname = x
-+		then
-+			target_cpu_default2=TARGET_CPU_generic
-+		else
-+			target_cpu_default2=TARGET_CPU_$target_cpu_cname
-+		fi
-+		;;
-+
-+	hppa*-*-*)
-+		target_cpu_default2="MASK_BIG_SWITCH"
-+		if test x$gas = xyes
-+		then
-+			target_cpu_default2="${target_cpu_default2}|MASK_GAS|MASK_JUMP_IN_DELAY"
-+		fi
-+		;;
-+
-+	fido*-*-* | m68k*-*-*)
-+		target_cpu_default2=$m68k_cpu_ident
-+		if [ x"$m68k_arch_family" != x ]; then
-+		        tmake_file="m68k/t-$m68k_arch_family $tmake_file"
-+		fi
-+		;;
-+
-+	i[34567]86-*-darwin* | x86_64-*-darwin*)
-+		tmake_file="${tmake_file} i386/t-fprules-softfp soft-fp/t-softfp"
-+		;;
-+	i[34567]86-*-linux* | x86_64-*-linux* | i[34567]86-*-kfreebsd*-gnu | x86_64-*-kfreebsd*-gnu)
-+		tmake_file="${tmake_file} i386/t-fprules-softfp soft-fp/t-softfp i386/t-linux"
-+		;;
-+	ia64*-*-linux*)
-+		tmake_file="${tmake_file} ia64/t-fprules-softfp soft-fp/t-softfp"
-+		;;
-+
-+	mips*-*-*)
-+		if test x$gnu_ld = xyes
-+		then
-+			target_cpu_default2="MASK_SPLIT_ADDRESSES"
-+		fi
-+		case ${target} in
-+			mips*el-*-*)
-+				tm_defines="TARGET_ENDIAN_DEFAULT=0 $tm_defines"
-+				;;
-+		esac
-+		if test "x$enable_gofast" = xyes
-+		then
-+			tm_defines="US_SOFTWARE_GOFAST $tm_defines"
-+			tmake_file="mips/t-gofast $tmake_file"
-+		else
-+			tmake_file="mips/t-mips $tmake_file"
-+		fi
-+		;;
-+
-+	powerpc*-*-* | rs6000-*-*)
-+		# FIXME: The PowerPC port uses the value set at compile time,
-+		# although it's only cosmetic.
-+		if test "x$with_cpu" != x
-+		then
-+			target_cpu_default2="\\\"$with_cpu\\\""
-+		fi
-+		out_file=rs6000/rs6000.c
-+		c_target_objs="${c_target_objs} rs6000-c.o"
-+		cxx_target_objs="${cxx_target_objs} rs6000-c.o"
-+		tmake_file="rs6000/t-rs6000 ${tmake_file}"
-+
-+                if test x$enable_e500_double = xyes
-+                then
-+                        tm_file="$tm_file rs6000/e500-double.h"
-+                fi
-+		;;
-+
-+	sh[123456ble]*-*-* | sh-*-*)
-+		c_target_objs="${c_target_objs} sh-c.o"
-+		cxx_target_objs="${cxx_target_objs} sh-c.o"
-+		;;
-+
-+	sparc*-*-*)
-+		# Some standard aliases.
-+		case x$with_cpu in
-+		xsparc)
-+			with_cpu=v7
-+			;;
-+		xsparcv9 | xsparc64)
-+			with_cpu=v9
-+			;;
-+		esac
-+
-+		# The SPARC port checks this value at compile-time.
-+		target_cpu_default2="TARGET_CPU_$with_cpu"
-+		;;
-+	v850*-*-*)
-+		# FIXME: The v850 is "special" in that it does not support
-+		# runtime CPU selection, only --with-cpu.
-+		case "x$with_cpu" in
-+		x)
-+			;;
-+		xv850e)
-+			target_cpu_default2="TARGET_CPU_$with_cpu"
-+			;;
-+		esac
-+		;;
-+esac
-+
-+t=
-+all_defaults="abi cpu cpu_32 cpu_64 arch arch_32 arch_64 tune tune_32 tune_64 schedule float mode fpu divide llsc mips-plt"
-+for option in $all_defaults
-+do
-+	eval "val=\$with_"`echo $option | sed s/-/_/g`
-+	if test -n "$val"; then
-+		case " $supported_defaults " in
-+		*" $option "*)
-+			;;
-+		*)
-+			echo "This target does not support --with-$option." 2>&1
-+			echo "Valid --with options are: $supported_defaults" 2>&1
-+			exit 1
-+			;;
-+		esac
-+
-+		if test "x$t" = x
-+		then
-+			t="{ \"$option\", \"$val\" }"
-+		else
-+			t="${t}, { \"$option\", \"$val\" }"
-+		fi
-+	fi
-+done
-+
-+if test "x$t" = x
-+then
-+	configure_default_options="{ { NULL, NULL} }"
-+else
-+	configure_default_options="{ ${t} }"
-+fi
-+
-+if test "$target_cpu_default2" != ""
-+then
-+	if test "$target_cpu_default" != ""
-+	then
-+		target_cpu_default="(${target_cpu_default}|${target_cpu_default2})"
-+	else
-+		target_cpu_default=$target_cpu_default2
-+	fi
-+fi
-diff -Nur gcc-4.4.6.orig/gcc/configure.ac gcc-4.4.6/gcc/configure.ac
---- gcc-4.4.6.orig/gcc/configure.ac	2010-12-13 19:19:43.000000000 +0100
-+++ gcc-4.4.6/gcc/configure.ac	2011-10-22 19:23:08.532581301 +0200
-@@ -2240,10 +2240,9 @@
-   as_ver=`$gcc_cv_as --version 2>/dev/null | sed 1q`
-   if echo "$as_ver" | grep GNU > /dev/null; then
- changequote(,)dnl
--    as_vers=`echo $as_ver | sed -n \
--	-e 's,^.*[	 ]\([0-9][0-9]*\.[0-9][0-9]*.*\)$,\1,p'`
--    as_major=`expr "$as_vers" : '\([0-9]*\)'`
--    as_minor=`expr "$as_vers" : '[0-9]*\.\([0-9]*\)'`
-+    as_ver=`echo $as_ver | sed -e 's/GNU assembler\( (GNU Binutils)\)\? \([0-9.][0-9.]*\).*/\2/'`
-+    as_major=`echo $as_ver | sed 's/\..*//'`
-+    as_minor=`echo $as_ver | sed 's/[^.]*\.\([0-9]*\).*/\1/'`
- changequote([,])dnl
-     if test $as_major -eq 2 && test $as_minor -lt 11
-     then :
-@@ -3308,7 +3307,7 @@
-   i?86*-*-* | mips*-*-* | alpha*-*-* | powerpc*-*-* | sparc*-*-* | m68*-*-* \
-   | x86_64*-*-* | hppa*-*-* | arm*-*-* \
-   | xstormy16*-*-* | cris-*-* | crisv32-*-* | xtensa*-*-* | bfin-*-* | score*-*-* \
--  | spu-*-* | fido*-*-* | m32c-*-*)
-+  | spu-*-* | fido*-*-* | m32c-*-* | avr32-*-*)
-     insn="nop"
-     ;;
-   ia64*-*-* | s390*-*-*)
-diff -Nur gcc-4.4.6.orig/gcc/doc/extend.texi gcc-4.4.6/gcc/doc/extend.texi
---- gcc-4.4.6.orig/gcc/doc/extend.texi	2011-03-23 22:45:18.000000000 +0100
-+++ gcc-4.4.6/gcc/doc/extend.texi	2011-10-22 19:23:08.532581301 +0200
-@@ -2397,7 +2397,7 @@
- 
- @item interrupt
- @cindex interrupt handler functions
--Use this attribute on the ARM, AVR, CRX, M32C, M32R/D, m68k,
-+Use this attribute on the ARM, AVR, AVR32, CRX, M32C, M32R/D, m68k,
- and Xstormy16 ports to indicate that the specified function is an
- interrupt handler.  The compiler will generate function entry and exit
- sequences suitable for use in an interrupt handler when this attribute
-@@ -2417,6 +2417,15 @@
- 
- Permissible values for this parameter are: IRQ, FIQ, SWI, ABORT and UNDEF@.
- 
-+Note, for the AVR32, you can specify which banking scheme is used for
-+the interrupt mode this interrupt handler is used in like this:
-+
-+@smallexample
-+void f () __attribute__ ((interrupt ("FULL")));
-+@end smallexample
-+
-+Permissible values for this parameter are: FULL, HALF, NONE and UNDEF.
-+
- On ARMv7-M the interrupt type is ignored, and the attribute means the function
- may be called with a word aligned stack pointer.
- 
-@@ -4188,6 +4197,23 @@
- 
- @end table
- 
-+@subsection AVR32 Variable Attributes
-+
-+One attribute is currently defined for AVR32 configurations:
-+@code{rmw_addressable}
-+
-+@table @code
-+@item rmw_addressable
-+@cindex @code{rmw_addressable} attribute
-+
-+This attribute can be used to signal that a variable can be accessed 
-+with the addressing mode of the AVR32 Atomic Read-Modify-Write memory
-+instructions and hence make it possible for gcc to generate these 
-+instructions without using built-in functions or inline assembly statements. 
-+Variables used within the AVR32 Atomic Read-Modify-Write built-in
-+functions will automatically get the @code{rmw_addressable} attribute.
-+@end table
-+
- @subsection AVR Variable Attributes
- 
- @table @code
-@@ -7042,6 +7068,7 @@
- * Alpha Built-in Functions::
- * ARM iWMMXt Built-in Functions::
- * ARM NEON Intrinsics::
-+* AVR32 Built-in Functions::
- * Blackfin Built-in Functions::
- * FR-V Built-in Functions::
- * X86 Built-in Functions::
-@@ -7284,6 +7311,7 @@
- long long __builtin_arm_wzero ()
- @end smallexample
- 
-+
- @node ARM NEON Intrinsics
- @subsection ARM NEON Intrinsics
- 
-@@ -7292,6 +7320,74 @@
- 
- @include arm-neon-intrinsics.texi
- 
-+@node AVR32 Built-in Functions
-+@subsection AVR32 Built-in Functions
-+
-+Built-in functions for atomic memory (RMW) instructions. Note that these
-+built-ins will fail for targets where the RMW instructions are not
-+implemented. Also note that these instructions only that a Ks15 << 2
-+memory address and will therefor not work with any runtime computed 
-+memory addresses. The user is responsible for making sure that any
-+pointers used within these functions points to a valid memory address.
-+ 
-+@smallexample
-+void __builtin_mems(int */*ptr*/, int /*bit*/)
-+void __builtin_memc(int */*ptr*/, int /*bit*/)
-+void __builtin_memt(int */*ptr*/, int /*bit*/)
-+@end smallexample
-+
-+Built-in functions for DSP instructions. Note that these built-ins will
-+fail for targets where the DSP instructions are not implemented.
-+
-+@smallexample
-+int __builtin_sats (int /*Rd*/,int /*sa*/, int /*bn*/)
-+int __builtin_satu (int /*Rd*/,int /*sa*/, int /*bn*/)
-+int __builtin_satrnds (int /*Rd*/,int /*sa*/, int /*bn*/)
-+int __builtin_satrndu (int /*Rd*/,int /*sa*/, int /*bn*/)
-+short __builtin_mulsathh_h (short, short)
-+int __builtin_mulsathh_w (short, short)
-+short __builtin_mulsatrndhh_h (short, short)
-+int __builtin_mulsatrndwh_w (int, short)
-+int __builtin_mulsatwh_w (int, short)
-+int __builtin_macsathh_w (int, short, short)
-+short __builtin_satadd_h (short, short)
-+short __builtin_satsub_h (short, short)
-+int __builtin_satadd_w (int, int)
-+int __builtin_satsub_w (int, int)
-+long long __builtin_mulwh_d(int, short)
-+long long __builtin_mulnwh_d(int, short)
-+long long __builtin_macwh_d(long long, int, short)
-+long long __builtin_machh_d(long long, short, short)
-+@end smallexample
-+
-+Other built-in functions for instructions that cannot easily be
-+generated by the compiler. 
-+
-+@smallexample
-+void __builtin_ssrf(int);
-+void __builtin_csrf(int);
-+void __builtin_musfr(int);
-+int __builtin_mustr(void);
-+int __builtin_mfsr(int /*Status Register Address*/)
-+void __builtin_mtsr(int /*Status Register Address*/, int /*Value*/)
-+int __builtin_mfdr(int /*Debug Register Address*/)
-+void __builtin_mtdr(int /*Debug Register Address*/, int /*Value*/)
-+void __builtin_cache(void * /*Address*/, int /*Cache Operation*/)
-+void __builtin_sync(int /*Sync Operation*/)
-+void __builtin_tlbr(void)
-+void __builtin_tlbs(void)
-+void __builtin_tlbw(void)
-+void __builtin_breakpoint(void)
-+int __builtin_xchg(void * /*Address*/, int /*Value*/ )
-+short __builtin_bswap_16(short)
-+int __builtin_bswap_32(int)
-+void __builtin_cop(int/*cpnr*/, int/*crd*/, int/*crx*/, int/*cry*/, int/*op*/)
-+int __builtin_mvcr_w(int/*cpnr*/, int/*crs*/)
-+void __builtin_mvrc_w(int/*cpnr*/, int/*crd*/, int/*value*/)
-+long long __builtin_mvcr_d(int/*cpnr*/, int/*crs*/)
-+void __builtin_mvrc_d(int/*cpnr*/, int/*crd*/, long long/*value*/)
-+@end smallexample
-+
- @node Blackfin Built-in Functions
- @subsection Blackfin Built-in Functions
- 
-diff -Nur gcc-4.4.6.orig/gcc/doc/invoke.texi gcc-4.4.6/gcc/doc/invoke.texi
---- gcc-4.4.6.orig/gcc/doc/invoke.texi	2011-03-23 23:02:12.000000000 +0100
-+++ gcc-4.4.6/gcc/doc/invoke.texi	2011-10-22 19:23:08.536581300 +0200
-@@ -195,7 +195,7 @@
- -fvisibility-ms-compat @gol
- -Wabi  -Wctor-dtor-privacy @gol
- -Wnon-virtual-dtor  -Wreorder @gol
---Weffc++  -Wstrict-null-sentinel @gol
-+-Weffc++  -Wno-deprecated @gol
- -Wno-non-template-friend  -Wold-style-cast @gol
- -Woverloaded-virtual  -Wno-pmf-conversions @gol
- -Wsign-promo}
-@@ -641,6 +641,12 @@
- -mauto-incdec  -minmax  -mlong-calls  -mshort @gol
- -msoft-reg-count=@var{count}}
- 
-+@emph{AVR32 Options}
-+@gccoptlist{-muse-rodata-section -mhard-float -msoft-float -mrelax @gol
-+-mforce-double-align -mno-init-got -mrelax -mmd-reorg-opt -masm-addr-pseudos @gol
-+-mpart=@var{part} -mcpu=@var{cpu} -march=@var{arch} @gol  
-+-mfast-float -mimm-in-const-pool}
-+
- @emph{MCore Options}
- @gccoptlist{-mhardlit  -mno-hardlit  -mdiv  -mno-div  -mrelax-immediates @gol
- -mno-relax-immediates  -mwide-bitfields  -mno-wide-bitfields @gol
-@@ -3256,13 +3262,11 @@
- If you want to warn about code which uses the uninitialized value of the
- variable in its own initializer, use the @option{-Winit-self} option.
- 
--These warnings occur for individual uninitialized or clobbered
--elements of structure, union or array variables as well as for
--variables which are uninitialized or clobbered as a whole.  They do
--not occur for variables or elements declared @code{volatile}.  Because
--these warnings depend on optimization, the exact variables or elements
--for which there are warnings will depend on the precise optimization
--options and version of GCC used.
-+These warnings occur only for variables that are candidates for
-+register allocation.  Therefore, they do not occur for a variable that
-+is declared @code{volatile}, or whose address is taken, or whose size
-+is other than 1, 2, 4 or 8 bytes.  Also, they do not occur for
-+structures, unions or arrays, even when they are in registers.
- 
- Note that there may be no warning about a variable that is used only
- to compute a value that itself is never used, because such
-@@ -7445,10 +7449,6 @@
- we always try to remove unnecessary ivs from the set during its
- optimization when a new iv is added to the set.
- 
--@item scev-max-expr-size
--Bound on size of expressions used in the scalar evolutions analyzer.
--Large expressions slow the analyzer.
--
- @item omega-max-vars
- The maximum number of variables in an Omega constraint system.
- The default value is 128.
-@@ -8844,6 +8844,7 @@
- * ARC Options::
- * ARM Options::
- * AVR Options::
-+* AVR32 Options::
- * Blackfin Options::
- * CRIS Options::
- * CRX Options::
-@@ -9332,6 +9333,145 @@
- size.
- @end table
- 
-+@node AVR32 Options
-+@subsection AVR32 Options
-+@cindex AVR32 Options
-+
-+These options are defined for AVR32 implementations:
-+
-+@table @gcctabopt
-+@item -muse-rodata-section
-+@opindex muse-rodata-section
-+Use section @samp{.rodata} for read-only data instead of @samp{.text}.
-+
-+@item -mhard-float
-+@opindex mhard-float
-+Use floating point coprocessor instructions.
-+
-+@item -msoft-float
-+@opindex msoft-float
-+Use software floating-point library for floating-point operations.
-+
-+@item -mforce-double-align
-+@opindex mforce-double-align
-+Force double-word alignment for double-word memory accesses.
-+
-+@item -masm-addr-pseudos
-+@opindex masm-addr-pseudos
-+Use assembler pseudo-instructions lda.w and call for handling direct
-+addresses. (Enabled by default)
-+
-+@item -mno-init-got
-+@opindex mno-init-got
-+Do not initialize the GOT register before using it when compiling PIC
-+code.
-+
-+@item -mrelax
-+@opindex mrelax
-+Let invoked assembler and linker do relaxing 
-+(Enabled by default when optimization level is >1).
-+This means that when the address of symbols are known at link time,
-+the linker can optimize @samp{icall} and @samp{mcall}
-+instructions into a @samp{rcall} instruction if possible. 
-+Loading the address of a symbol can also be optimized.  
-+
-+@item -mmd-reorg-opt
-+@opindex mmd-reorg-opt
-+Perform machine dependent optimizations in reorg stage.
-+
-+@item -mpart=@var{part}
-+@opindex mpart
-+Generate code for the specified part. Permissible parts are: 
-+@samp{ap7000},
-+@samp{ap7001},
-+@samp{ap7002},
-+@samp{ap7200},
-+@samp{uc3a0128},
-+@samp{uc3a0256},
-+@samp{uc3a0512},
-+@samp{uc3a0512es},
-+@samp{uc3a1128},
-+@samp{uc3a1256},
-+@samp{uc3a1512},
-+@samp{uc3a1512es},
-+@samp{uc3a3revd},
-+@samp{uc3a364},
-+@samp{uc3a364s},
-+@samp{uc3a3128},
-+@samp{uc3a3128s},
-+@samp{uc3a3256},
-+@samp{uc3a3256s},
-+@samp{uc3a464},
-+@samp{uc3a464s},
-+@samp{uc3a4128},
-+@samp{uc3a4128s},
-+@samp{uc3a4256},
-+@samp{uc3a4256s},
-+@samp{uc3b064},
-+@samp{uc3b0128},
-+@samp{uc3b0256},
-+@samp{uc3b0256es},
-+@samp{uc3b0512},
-+@samp{uc3b0512revc},
-+@samp{uc3b164},
-+@samp{uc3b1128},
-+@samp{uc3b1256},
-+@samp{uc3b1256es},
-+@samp{uc3b1512},
-+@samp{uc3b1512revc}
-+@samp{uc64d3},
-+@samp{uc128d3},
-+@samp{uc64d4},
-+@samp{uc128d4},
-+@samp{uc3c0512crevc},
-+@samp{uc3c1512crevc},
-+@samp{uc3c2512crevc},
-+@samp{uc3l0256},
-+@samp{uc3l0128},
-+@samp{uc3l064},
-+@samp{uc3l032},
-+@samp{uc3l016},
-+@samp{uc3l064revb},
-+@samp{uc64l3u},
-+@samp{uc128l3u},
-+@samp{uc256l3u},
-+@samp{uc64l4u},
-+@samp{uc128l4u},
-+@samp{uc256l4u},
-+@samp{uc3c064c},
-+@samp{uc3c0128c},
-+@samp{uc3c0256c},
-+@samp{uc3c0512c},
-+@samp{uc3c164c},
-+@samp{uc3c1128c},
-+@samp{uc3c1256c},
-+@samp{uc3c1512c},
-+@samp{uc3c264c},
-+@samp{uc3c2128c},
-+@samp{uc3c2256c},
-+@samp{uc3c2512c},
-+@samp{mxt768e}.
-+
-+@item -mcpu=@var{cpu-type}
-+@opindex mcpu
-+Same as -mpart. Obsolete.
-+
-+@item -march=@var{arch}
-+@opindex march
-+Generate code for the specified architecture. Permissible architectures are:
-+@samp{ap}, @samp{uc} and @samp{ucr2}. 
-+
-+@item -mfast-float
-+@opindex mfast-float
-+Enable fast floating-point library that does not conform to IEEE-754 but is still good enough
-+for most applications. The fast floating-point library does not round to the nearest even
-+but away from zero. Enabled by default if the -funsafe-math-optimizations switch is specified. 
-+
-+@item -mimm-in-const-pool
-+@opindex mimm-in-const-pool
-+Put large immediates in constant pool. This is enabled by default for archs with insn-cache.
-+@end table
-+
- @node Blackfin Options
- @subsection Blackfin Options
- @cindex Blackfin Options
-@@ -9387,29 +9527,12 @@
- contain speculative loads after jump instructions. If this option is used,
- @code{__WORKAROUND_SPECULATIVE_LOADS} is defined.
- 
--@item -mno-specld-anomaly
--@opindex mno-specld-anomaly
--Don't generate extra code to prevent speculative loads from occurring.
--
- @item -mcsync-anomaly
- @opindex mcsync-anomaly
- When enabled, the compiler will ensure that the generated code does not
- contain CSYNC or SSYNC instructions too soon after conditional branches.
- If this option is used, @code{__WORKAROUND_SPECULATIVE_SYNCS} is defined.
- 
--@item -mno-csync-anomaly
--@opindex mno-csync-anomaly
--Don't generate extra code to prevent CSYNC or SSYNC instructions from
--occurring too soon after a conditional branch.
--
--@item -mlow-64k
--@opindex mlow-64k
--When enabled, the compiler is free to take advantage of the knowledge that
--the entire program fits into the low 64k of memory.
--
--@item -mno-low-64k
--@opindex mno-low-64k
--Assume that the program is arbitrarily large.  This is the default.
- 
- @item -mstack-check-l1
- @opindex mstack-check-l1
-@@ -9423,11 +9546,6 @@
- without virtual memory management.  This option implies @option{-fPIC}.
- With a @samp{bfin-elf} target, this option implies @option{-msim}.
- 
--@item -mno-id-shared-library
--@opindex mno-id-shared-library
--Generate code that doesn't assume ID based shared libraries are being used.
--This is the default.
--
- @item -mleaf-id-shared-library
- @opindex mleaf-id-shared-library
- Generate code that supports shared libraries via the library ID method,
-@@ -9469,11 +9587,6 @@
- will lie outside of the 24 bit addressing range of the offset based
- version of subroutine call instruction.
- 
--This feature is not enabled by default.  Specifying
--@option{-mno-long-calls} will restore the default behavior.  Note these
--switches have no effect on how the compiler generates code to handle
--function calls via function pointers.
--
- @item -mfast-fp
- @opindex mfast-fp
- Link with the fast floating-point library. This library relaxes some of
-diff -Nur gcc-4.4.6.orig/gcc/doc/md.texi gcc-4.4.6/gcc/doc/md.texi
---- gcc-4.4.6.orig/gcc/doc/md.texi	2009-05-07 10:14:55.000000000 +0200
-+++ gcc-4.4.6/gcc/doc/md.texi	2011-10-22 19:23:08.548581303 +0200
-@@ -4,6 +4,7 @@
- @c This is part of the GCC manual.
- @c For copying conditions, see the file gcc.texi.
- 
-+
- @ifset INTERNALS
- @node Machine Desc
- @chapter Machine Descriptions
-@@ -1685,6 +1686,58 @@
- A memory reference suitable for the ARMv4 ldrsb instruction.
- @end table
- 
-+@item AVR32 family---@file{avr32.h}
-+@table @code
-+@item f
-+Floating-point registers (f0 to f15)
-+
-+@item Ku@var{bits}
-+Unsigned constant representable with @var{bits} number of bits (Must be
-+two digits). I.e: An unsigned 8-bit constant is written as @samp{Ku08}  
-+ 
-+@item Ks@var{bits}
-+Signed constant representable with @var{bits} number of bits (Must be
-+two digits). I.e: A signed 12-bit constant is written as @samp{Ks12}  
-+
-+@item Is@var{bits}
-+The negated range of a signed constant representable with  @var{bits} 
-+number of bits. The same as @samp{Ks@var{bits}} with a negated range. 
-+This means that the constant must be in the range @math{-2^{bits-1}-1} to @math{2^{bits-1}}
-+
-+@item G
-+A single/double precision floating-point immediate or 64-bit integer 
-+immediate where the least and most significant words both can be
-+loaded with a move instruction. That is the the integer form of the 
-+values in the least and most significant words both are in the range 
-+@math{-2^{20}} to @math{2^{20}-1}.
-+         
-+@item RKs@var{bits}
-+A memory reference where the address consists of a base register
-+plus a signed immediate displacement with range given by @samp{Ks@var{bits}}
-+which has the same format as for the signed immediate integer constraint
-+given above.  
-+
-+@item RKu@var{bits}
-+A memory reference where the address consists of a base register
-+plus an unsigned immediate displacement with range given by @samp{Ku@var{bits}}
-+which has the same format as for the unsigned immediate integer constraint
-+given above.  
-+
-+@item S
-+A memory reference with an immediate or register offset
-+
-+@item T
-+A memory reference to a constant pool entry
-+
-+@item W
-+A valid operand for use in the @samp{lda.w} instruction macro when
-+relaxing is enabled
-+
-+@item Z
-+A memory reference valid for coprocessor memory instructions
-+
-+@end table
-+
- @item AVR family---@file{config/avr/constraints.md}
- @table @code
- @item l
-diff -Nur gcc-4.4.6.orig/gcc/expmed.c gcc-4.4.6/gcc/expmed.c
---- gcc-4.4.6.orig/gcc/expmed.c	2010-08-06 09:52:04.000000000 +0200
-+++ gcc-4.4.6/gcc/expmed.c	2011-10-22 19:23:08.548581303 +0200
-@@ -472,9 +472,9 @@
- 	  ? ((GET_MODE_SIZE (fieldmode) >= UNITS_PER_WORD
- 	     || GET_MODE_SIZE (GET_MODE (op0)) == GET_MODE_SIZE (fieldmode))
- 	     && byte_offset % GET_MODE_SIZE (fieldmode) == 0)
--	  : (! SLOW_UNALIGNED_ACCESS (fieldmode, MEM_ALIGN (op0))
-+          : ( (! SLOW_UNALIGNED_ACCESS (fieldmode, MEM_ALIGN (op0))
- 	     || (offset * BITS_PER_UNIT % bitsize == 0
--		 && MEM_ALIGN (op0) % GET_MODE_BITSIZE (fieldmode) == 0))))
-+                     && MEM_ALIGN (op0) % GET_MODE_BITSIZE (fieldmode) == 0)))))
-     {
-       if (MEM_P (op0))
- 	op0 = adjust_address (op0, fieldmode, offset);
-diff -Nur gcc-4.4.6.orig/gcc/expr.c gcc-4.4.6/gcc/expr.c
---- gcc-4.4.6.orig/gcc/expr.c	2011-01-16 23:56:10.000000000 +0100
-+++ gcc-4.4.6/gcc/expr.c	2011-10-22 19:23:08.552581303 +0200
-@@ -52,6 +52,7 @@
- #include "tree-flow.h"
- #include "target.h"
- #include "timevar.h"
-+#include "c-common.h"
- #include "df.h"
- #include "diagnostic.h"
- 
-@@ -3647,16 +3648,17 @@
-     }
-   else
-     {
-+      emit_move_insn (stack_pointer_rtx,
-+		      expand_binop (Pmode,
- #ifdef STACK_GROWS_DOWNWARD
--      /* ??? This seems wrong if STACK_PUSH_CODE == POST_DEC.  */
--      dest_addr = gen_rtx_PLUS (Pmode, stack_pointer_rtx,
--				GEN_INT (-(HOST_WIDE_INT) rounded_size));
-+				    sub_optab,
- #else
--      /* ??? This seems wrong if STACK_PUSH_CODE == POST_INC.  */
--      dest_addr = gen_rtx_PLUS (Pmode, stack_pointer_rtx,
--				GEN_INT (rounded_size));
-+				    add_optab,
- #endif
--      dest_addr = gen_rtx_PRE_MODIFY (Pmode, stack_pointer_rtx, dest_addr);
-+				    stack_pointer_rtx,
-+				    GEN_INT (rounded_size),
-+				    NULL_RTX, 0, OPTAB_LIB_WIDEN));
-+      dest_addr = stack_pointer_rtx;
-     }
- 
-   dest = gen_rtx_MEM (mode, dest_addr);
-@@ -5775,7 +5777,8 @@
-      is a bit field, we cannot use addressing to access it.
-      Use bit-field techniques or SUBREG to store in it.  */
- 
--  if (mode == VOIDmode
-+  if (
-+      mode == VOIDmode
-       || (mode != BLKmode && ! direct_store[(int) mode]
- 	  && GET_MODE_CLASS (mode) != MODE_COMPLEX_INT
- 	  && GET_MODE_CLASS (mode) != MODE_COMPLEX_FLOAT)
-@@ -5932,7 +5935,18 @@
-     {
-       tree field = TREE_OPERAND (exp, 1);
-       size_tree = DECL_SIZE (field);
--      if (!DECL_BIT_FIELD (field))
-+      if (!DECL_BIT_FIELD (field)
-+          /* Added for AVR32:
-+             Bitfields with a size equal to a target storage
-+             type might not cause DECL_BIT_FIELD to return
-+             true since it can be optimized into a normal array
-+             access operation. But for volatile bitfields we do
-+             not allow this when targetm.narrow_volatile_bitfield ()
-+             is false. We can use DECL_C_BIT_FIELD to check if this
-+             really is a c-bitfield. */ 
-+          && !(TREE_THIS_VOLATILE (exp)
-+               && !targetm.narrow_volatile_bitfield ()
-+               && DECL_C_BIT_FIELD (field)) )
- 	mode = DECL_MODE (field);
-       else if (DECL_MODE (field) == BLKmode)
- 	blkmode_bitfield = true;
-@@ -7915,7 +7929,8 @@
- 	   by doing the extract into an object as wide as the field
- 	   (which we know to be the width of a basic mode), then
- 	   storing into memory, and changing the mode to BLKmode.  */
--	if (mode1 == VOIDmode
-+       if (      
-+            mode1 == VOIDmode
- 	    || REG_P (op0) || GET_CODE (op0) == SUBREG
- 	    || (mode1 != BLKmode && ! direct_load[(int) mode1]
- 		&& GET_MODE_CLASS (mode) != MODE_COMPLEX_INT
-diff -Nur gcc-4.4.6.orig/gcc/function.c gcc-4.4.6/gcc/function.c
---- gcc-4.4.6.orig/gcc/function.c	2010-08-16 22:24:54.000000000 +0200
-+++ gcc-4.4.6/gcc/function.c	2011-10-22 19:23:08.552581303 +0200
-@@ -2810,7 +2810,11 @@
-   assign_parm_remove_parallels (data);
- 
-   /* Copy the value into the register.  */
--  if (data->nominal_mode != data->passed_mode
-+  if ( (data->nominal_mode != data->passed_mode
-+        /* Added for AVR32: If passed_mode is equal
-+           to promoted nominal mode why should be convert?
-+           The conversion should make no difference. */
-+        && data->passed_mode != promoted_nominal_mode)
-       || promoted_nominal_mode != data->promoted_mode)
-     {
-       int save_tree_used;
-diff -Nur gcc-4.4.6.orig/gcc/genemit.c gcc-4.4.6/gcc/genemit.c
---- gcc-4.4.6.orig/gcc/genemit.c	2009-02-20 16:20:38.000000000 +0100
-+++ gcc-4.4.6/gcc/genemit.c	2011-10-22 19:23:08.552581303 +0200
-@@ -121,6 +121,24 @@
- }
- 
- static void
-+gen_vararg_prologue(int operands)
-+{
-+  int i;
-+
-+  if (operands > 1)
-+    {
-+      for (i = 1; i < operands; i++)
-+	printf("  rtx operand%d ATTRIBUTE_UNUSED;\n", i);
-+
-+      printf("  va_list args;\n\n");
-+      printf("  va_start(args, operand0);\n");
-+      for (i = 1; i < operands; i++)
-+	printf("  operand%d = va_arg(args, rtx);\n", i);
-+      printf("  va_end(args);\n\n");
-+    }
-+}
-+
-+static void
- print_code (RTX_CODE code)
- {
-   const char *p1;
-@@ -406,18 +424,16 @@
-     fatal ("match_dup operand number has no match_operand");
- 
-   /* Output the function name and argument declarations.  */
--  printf ("rtx\ngen_%s (", XSTR (insn, 0));
-+  printf ("rtx\ngen_%s ", XSTR (insn, 0));
-+
-   if (operands)
--    for (i = 0; i < operands; i++)
--      if (i)
--	printf (",\n\trtx operand%d ATTRIBUTE_UNUSED", i);
-+    printf("(rtx operand0 ATTRIBUTE_UNUSED, ...)\n");
-       else
--	printf ("rtx operand%d ATTRIBUTE_UNUSED", i);
--  else
--    printf ("void");
--  printf (")\n");
-+    printf("(void)\n");
-   printf ("{\n");
- 
-+  gen_vararg_prologue(operands);
-+
-   /* Output code to construct and return the rtl for the instruction body.  */
- 
-   if (XVECLEN (insn, 1) == 1)
-@@ -461,16 +477,12 @@
-   operands = max_operand_vec (expand, 1);
- 
-   /* Output the function name and argument declarations.  */
--  printf ("rtx\ngen_%s (", XSTR (expand, 0));
-+  printf ("rtx\ngen_%s ", XSTR (expand, 0));
-   if (operands)
--    for (i = 0; i < operands; i++)
--      if (i)
--	printf (",\n\trtx operand%d", i);
--      else
--	printf ("rtx operand%d", i);
-+    printf("(rtx operand0 ATTRIBUTE_UNUSED, ...)\n");
-   else
--    printf ("void");
--  printf (")\n");
-+    printf("(void)\n");
-+
-   printf ("{\n");
- 
-   /* If we don't have any C code to write, only one insn is being written,
-@@ -480,6 +492,8 @@
-       && operands > max_dup_opno
-       && XVECLEN (expand, 1) == 1)
-     {
-+      gen_vararg_prologue(operands);
-+
-       printf ("  return ");
-       gen_exp (XVECEXP (expand, 1, 0), DEFINE_EXPAND, NULL);
-       printf (";\n}\n\n");
-@@ -493,6 +507,7 @@
-   for (; i <= max_scratch_opno; i++)
-     printf ("  rtx operand%d ATTRIBUTE_UNUSED;\n", i);
-   printf ("  rtx _val = 0;\n");
-+  gen_vararg_prologue(operands);
-   printf ("  start_sequence ();\n");
- 
-   /* The fourth operand of DEFINE_EXPAND is some code to be executed
-diff -Nur gcc-4.4.6.orig/gcc/genflags.c gcc-4.4.6/gcc/genflags.c
---- gcc-4.4.6.orig/gcc/genflags.c	2007-07-26 10:37:01.000000000 +0200
-+++ gcc-4.4.6/gcc/genflags.c	2011-10-22 19:23:08.552581303 +0200
-@@ -127,7 +127,6 @@
- gen_proto (rtx insn)
- {
-   int num = num_operands (insn);
--  int i;
-   const char *name = XSTR (insn, 0);
-   int truth = maybe_eval_c_test (XSTR (insn, 2));
- 
-@@ -158,12 +157,7 @@
-   if (num == 0)
-     fputs ("void", stdout);
-   else
--    {
--      for (i = 1; i < num; i++)
--	fputs ("rtx, ", stdout);
--
--      fputs ("rtx", stdout);
--    }
-+    fputs("rtx, ...", stdout);
- 
-   puts (");");
- 
-@@ -173,12 +167,7 @@
-     {
-       printf ("static inline rtx\ngen_%s", name);
-       if (num > 0)
--	{
--	  putchar ('(');
--	  for (i = 0; i < num-1; i++)
--	    printf ("rtx ARG_UNUSED (%c), ", 'a' + i);
--	  printf ("rtx ARG_UNUSED (%c))\n", 'a' + i);
--	}
-+	puts("(rtx ARG_UNUSED(a), ...)");
-       else
- 	puts ("(void)");
-       puts ("{\n  return 0;\n}");
-diff -Nur gcc-4.4.6.orig/gcc/genoutput.c gcc-4.4.6/gcc/genoutput.c
---- gcc-4.4.6.orig/gcc/genoutput.c	2009-02-20 16:20:38.000000000 +0100
-+++ gcc-4.4.6/gcc/genoutput.c	2011-10-22 19:23:08.552581303 +0200
-@@ -386,7 +386,7 @@
- 	}
- 
-       if (d->name && d->name[0] != '*')
--	printf ("    (insn_gen_fn) gen_%s,\n", d->name);
-+	printf ("    gen_%s,\n", d->name);
-       else
- 	printf ("    0,\n");
- 
-diff -Nur gcc-4.4.6.orig/gcc/ifcvt.c gcc-4.4.6/gcc/ifcvt.c
---- gcc-4.4.6.orig/gcc/ifcvt.c	2010-01-07 15:59:59.000000000 +0100
-+++ gcc-4.4.6/gcc/ifcvt.c	2011-10-22 19:23:08.552581303 +0200
-@@ -84,7 +84,7 @@
- static int num_updated_if_blocks;
- 
- /* # of changes made.  */
--static int num_true_changes;
-+int num_true_changes;
- 
- /* Whether conditional execution changes were made.  */
- static int cond_exec_changed_p;
-@@ -290,6 +290,9 @@
-       if (must_be_last)
- 	return FALSE;
- 
-+#ifdef IFCVT_ALLOW_MODIFY_TEST_IN_INSN       
-+      if ( !IFCVT_ALLOW_MODIFY_TEST_IN_INSN )
-+#endif
-       if (modified_in_p (test, insn))
- 	{
- 	  if (!mod_ok)
-@@ -570,15 +573,18 @@
-   IFCVT_MODIFY_FINAL (ce_info);
- #endif
- 
-+  /* Merge the blocks!  */
-+  if ( reload_completed ){
-   /* Conversion succeeded.  */
-   if (dump_file)
-     fprintf (dump_file, "%d insn%s converted to conditional execution.\n",
- 	     n_insns, (n_insns == 1) ? " was" : "s were");
- 
--  /* Merge the blocks!  */
-   merge_if_block (ce_info);
-   cond_exec_changed_p = TRUE;
-   return TRUE;
-+  }
-+  return FALSE;
- 
-  fail:
- #ifdef IFCVT_MODIFY_CANCEL
-@@ -1087,7 +1093,11 @@
- 	  != UNKNOWN))
-     {
-       rtx cond = if_info->cond;
--      enum rtx_code code = reversed_comparison_code (cond, if_info->jump);
-+      /* This generates wrong code for AVR32. The cond code need not be reversed
-+         since the addmodecc patterns add if the condition is NOT met. */
-+      /*   enum rtx_code code = reversed_comparison_code (cond, if_info->jump);*/
-+      enum rtx_code code = GET_CODE(cond);
-+
- 
-       /* First try to use addcc pattern.  */
-       if (general_operand (XEXP (cond, 0), VOIDmode)
-@@ -3039,7 +3049,12 @@
-       && noce_find_if_block (test_bb, then_edge, else_edge, pass))
-     goto success;
- 
--  if (HAVE_conditional_execution && reload_completed
-+  if (HAVE_conditional_execution && 
-+#ifdef IFCVT_COND_EXEC_BEFORE_RELOAD
-+      (reload_completed || IFCVT_COND_EXEC_BEFORE_RELOAD)
-+#else
-+      reload_completed
-+#endif
-       && cond_exec_find_if_block (&ce_info))
-     goto success;
- 
-@@ -3154,7 +3169,11 @@
- 
-   /* We only ever should get here after reload,
-      and only if we have conditional execution.  */
-+#ifdef IFCVT_COND_EXEC_BEFORE_RELOAD
-+  gcc_assert (HAVE_conditional_execution && (reload_completed||IFCVT_COND_EXEC_BEFORE_RELOAD));
-+#else
-   gcc_assert (HAVE_conditional_execution && reload_completed);
-+#endif
- 
-   /* Discover if any fall through predecessors of the current test basic block
-      were && tests (which jump to the else block) or || tests (which jump to
-@@ -4259,6 +4278,14 @@
- static unsigned int
- rest_of_handle_if_after_reload (void)
- {
-+  /* Hack for the AVR32 experimental ifcvt processing before reload.
-+     The AVR32 specific ifcvt code needs to know when ifcvt after reload 
-+     has begun. */
-+#ifdef IFCVT_COND_EXEC_BEFORE_RELOAD
-+  if ( IFCVT_COND_EXEC_BEFORE_RELOAD )
-+    cfun->machine->ifcvt_after_reload = 1;
-+#endif
-+  
-   if_convert ();
-   return 0;
- }
-diff -Nur gcc-4.4.6.orig/gcc/longlong.h gcc-4.4.6/gcc/longlong.h
---- gcc-4.4.6.orig/gcc/longlong.h	2009-08-12 00:36:56.000000000 +0200
-+++ gcc-4.4.6/gcc/longlong.h	2011-10-22 19:23:08.552581303 +0200
-@@ -250,6 +250,41 @@
- #define COUNT_LEADING_ZEROS_0 32
- #endif
- 
-+#if defined (__avr32__) && W_TYPE_SIZE == 32
-+#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
-+  __asm__ ("add\t%1, %4, %5\n\tadc\t%0, %2, %3"		\
-+	   : "=r" ((USItype) (sh)),					\
-+	     "=&r" ((USItype) (sl))					\
-+	   : "r" ((USItype) (ah)),					\
-+	     "r" ((USItype) (bh)),					\
-+	     "r" ((USItype) (al)),					\
-+	     "r" ((USItype) (bl)) __CLOBBER_CC)
-+#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
-+  __asm__ ("sub\t%1, %4, %5\n\tsbc\t%0, %2, %3"		\
-+	   : "=r" ((USItype) (sh)),					\
-+	     "=&r" ((USItype) (sl))					\
-+	   : "r" ((USItype) (ah)),					\
-+	     "r" ((USItype) (bh)),					\
-+	     "r" ((USItype) (al)),					\
-+	     "r" ((USItype) (bl)) __CLOBBER_CC)
-+
-+#if !defined (__AVR32_NO_MUL__)
-+#define __umulsidi3(a,b) ((UDItype)(a) * (UDItype)(b))
-+
-+#define umul_ppmm(w1, w0, u, v) \
-+{									\
-+  DWunion __w;								\
-+  __w.ll = __umulsidi3 (u, v);						\
-+  w1 = __w.s.high;							\
-+  w0 = __w.s.low;							\
-+}
-+#endif
-+
-+#define count_leading_zeros(COUNT,X)	((COUNT) = __builtin_clz (X))
-+#define count_trailing_zeros(COUNT,X)	((COUNT) = __builtin_ctz (X))
-+#define COUNT_LEADING_ZEROS_0 32
-+#endif
-+
- #if defined (__CRIS__) && __CRIS_arch_version >= 3
- #define count_leading_zeros(COUNT, X) ((COUNT) = __builtin_clz (X))
- #if __CRIS_arch_version >= 8
-diff -Nur gcc-4.4.6.orig/gcc/optabs.h gcc-4.4.6/gcc/optabs.h
---- gcc-4.4.6.orig/gcc/optabs.h	2008-08-07 09:35:51.000000000 +0200
-+++ gcc-4.4.6/gcc/optabs.h	2011-10-22 19:23:08.556581301 +0200
-@@ -603,7 +603,7 @@
- extern optab code_to_optab[NUM_RTX_CODE + 1];
- 
- 
--typedef rtx (*rtxfun) (rtx);
-+typedef rtx (*rtxfun) (rtx, ...);
- 
- /* Indexed by the rtx-code for a conditional (e.g. EQ, LT,...)
-    gives the gen_function to make a branch to test that condition.  */
-diff -Nur gcc-4.4.6.orig/gcc/regrename.c gcc-4.4.6/gcc/regrename.c
---- gcc-4.4.6.orig/gcc/regrename.c	2009-02-20 16:20:38.000000000 +0100
-+++ gcc-4.4.6/gcc/regrename.c	2011-10-22 19:23:08.556581301 +0200
-@@ -1582,6 +1582,9 @@
-   bool changed = false;
-   rtx insn;
- 
-+  rtx prev_pred_test;
-+  int prev_pred_insn_skipped = 0;
-+
-   for (insn = BB_HEAD (bb); ; insn = NEXT_INSN (insn))
-     {
-       int n_ops, i, alt, predicated;
-@@ -1621,6 +1624,58 @@
- 	    recog_data.operand_type[i] = OP_INOUT;
- 	}
- 
-+
-+      /* Added for targets (AVR32) which supports test operands to be modified
-+         in cond_exec instruction. For these targets we cannot make a change to
-+         the test operands if one of the test operands is an output operand This beacuse
-+         changing the test operands might cause the need for inserting a new test
-+         insns in the middle of a sequence of cond_exec insns and if the test operands
-+         are modified these tests will fail.
-+      */
-+      if ( IFCVT_ALLOW_MODIFY_TEST_IN_INSN
-+           && predicated )
-+        { 
-+          int insn_skipped = 0;
-+          rtx test = COND_EXEC_TEST (PATTERN (insn));
-+
-+          /* Check if the previous insn was a skipped predicated insn with the same
-+             test as this predicated insns. If so we cannot do any modification to
-+             this insn either since we cannot emit the test insn because the operands
-+             are clobbered. */
-+          if ( prev_pred_insn_skipped 
-+               && (rtx_equal_p (test, prev_pred_test) 
-+                   || rtx_equal_p (test, reversed_condition (prev_pred_test))) )
-+            { 
-+              insn_skipped = 1;
-+            }
-+          else
-+            {
-+              /* Check if the output operand is used in the test expression. */
-+              for (i = 0; i < n_ops; ++i)
-+                if ( recog_data.operand_type[i] == OP_INOUT 
-+                     && reg_mentioned_p (recog_data.operand[i], test) )
-+                  {
-+                    insn_skipped = 1;
-+                    break;
-+                  }
-+              
-+            }
-+          
-+          prev_pred_test = test;
-+          prev_pred_insn_skipped = insn_skipped;
-+          if ( insn_skipped )
-+            {
-+              if (insn == BB_END (bb))
-+                break;
-+              else
-+                continue;
-+            }
-+        } 
-+      else 
-+        {
-+          prev_pred_insn_skipped = 0;
-+        }
-+      
-       /* For each earlyclobber operand, zap the value data.  */
-       for (i = 0; i < n_ops; i++)
- 	if (recog_op_alt[i][alt].earlyclobber)
-diff -Nur gcc-4.4.6.orig/gcc/sched-deps.c gcc-4.4.6/gcc/sched-deps.c
---- gcc-4.4.6.orig/gcc/sched-deps.c	2010-08-24 10:53:11.000000000 +0200
-+++ gcc-4.4.6/gcc/sched-deps.c	2011-10-22 19:23:08.556581301 +0200
-@@ -1473,7 +1473,14 @@
- 
-   prev_nonnote = prev_nonnote_insn (insn);
-   if (BLOCK_FOR_INSN (insn) == BLOCK_FOR_INSN (prev_nonnote)
--      && ! sched_insns_conditions_mutex_p (insn, prev_nonnote))
-+      /* Modification for AVR32 by RP: Why is this here, this will
-+         cause instruction to be without any dependencies which might
-+         cause it to be moved anywhere. For the AVR32 we try to keep
-+         a group of conditionals together even if they are mutual exclusive.
-+      */
-+      && (! sched_insns_conditions_mutex_p (insn, prev_nonnote)
-+          || GET_CODE (PATTERN (insn)) == COND_EXEC )
-+      )
-     add_dependence (insn, prev_nonnote, REG_DEP_ANTI);
- }
- 
-@@ -2230,8 +2237,29 @@
- 
-   if (code == COND_EXEC)
-     {
-+#ifdef IFCVT_ALLOW_MODIFY_TEST_IN_INSN
-+      if (IFCVT_ALLOW_MODIFY_TEST_IN_INSN)
-+        {
-+          /* Check if we have a group og conditional instructions with the same test. 
-+             If so we must make sure that they are not scheduled apart in order to
-+             avoid unnecesarry tests and if one of the registers in the test is modified
-+             in the instruction this is needed to ensure correct code. */
-+          if ( prev_nonnote_insn (insn)
-+               && INSN_P (prev_nonnote_insn (insn))
-+               && GET_CODE (PATTERN (prev_nonnote_insn (insn))) == COND_EXEC 
-+               && rtx_equal_p (XEXP(COND_EXEC_TEST (PATTERN (prev_nonnote_insn (insn))), 0), XEXP (COND_EXEC_TEST (x), 0))
-+               && rtx_equal_p (XEXP(COND_EXEC_TEST (PATTERN (prev_nonnote_insn (insn))), 1), XEXP (COND_EXEC_TEST (x), 1))
-+               && ( GET_CODE (COND_EXEC_TEST (PATTERN (prev_nonnote_insn (insn)))) == GET_CODE (COND_EXEC_TEST (x))
-+                    || GET_CODE (COND_EXEC_TEST (PATTERN (prev_nonnote_insn (insn)))) == reversed_comparison_code (COND_EXEC_TEST (x), insn)))
-+            {
-+              SCHED_GROUP_P (insn) = 1;
-+              //CANT_MOVE (prev_nonnote_insn (insn)) = 1;
-+            }
-+        }
-+#endif      
-       sched_analyze_2 (deps, COND_EXEC_TEST (x), insn);
- 
-+
-       /* ??? Should be recording conditions so we reduce the number of
- 	 false dependencies.  */
-       x = COND_EXEC_CODE (x);
-diff -Nur gcc-4.4.6.orig/gcc/testsuite/gcc.dg/sibcall-3.c gcc-4.4.6/gcc/testsuite/gcc.dg/sibcall-3.c
---- gcc-4.4.6.orig/gcc/testsuite/gcc.dg/sibcall-3.c	2009-01-08 18:56:52.000000000 +0100
-+++ gcc-4.4.6/gcc/testsuite/gcc.dg/sibcall-3.c	2011-10-22 19:23:08.556581301 +0200
-@@ -5,7 +5,7 @@
-    Copyright (C) 2002 Free Software Foundation Inc.
-    Contributed by Hans-Peter Nilsson  <hp@bitrange.com>  */
- 
--/* { dg-do run { xfail { { arc-*-* avr-*-* cris-*-* crisv32-*-* h8300-*-* hppa*64*-*-* m32r-*-* m68hc1?-*-* mcore-*-* mn10300-*-* xstormy16-*-* v850*-*-* vax-*-* xtensa*-*-* } || { arm*-*-* && { ! arm32 } } } } } */
-+/* { dg-do run { xfail { { arc-*-* avr-*-* avr32-*-* cris-*-* crisv32-*-* h8300-*-* hppa*64*-*-* m32r-*-* m68hc1?-*-* mcore-*-* mn10300-*-* xstormy16-*-* v850*-*-* vax-*-* xtensa*-*-* } || { arm*-*-* && { ! arm32 } } } } } */
- /* -mlongcall disables sibcall patterns.  */
- /* { dg-skip-if "" { powerpc*-*-* } { "-mlongcall" } { "" } } */
- /* { dg-options "-O2 -foptimize-sibling-calls" } */
-diff -Nur gcc-4.4.6.orig/gcc/testsuite/gcc.dg/sibcall-4.c gcc-4.4.6/gcc/testsuite/gcc.dg/sibcall-4.c
---- gcc-4.4.6.orig/gcc/testsuite/gcc.dg/sibcall-4.c	2009-01-08 18:56:52.000000000 +0100
-+++ gcc-4.4.6/gcc/testsuite/gcc.dg/sibcall-4.c	2011-10-22 19:23:08.556581301 +0200
-@@ -5,7 +5,7 @@
-    Copyright (C) 2002 Free Software Foundation Inc.
-    Contributed by Hans-Peter Nilsson  <hp@bitrange.com>  */
- 
--/* { dg-do run { xfail { { arc-*-* avr-*-* cris-*-* crisv32-*-* h8300-*-* hppa*64*-*-* m32r-*-* m68hc1?-*-* mcore-*-* mn10300-*-* xstormy16-*-* v850*-*-* vax-*-* xtensa*-*-* } || { arm*-*-* && { ! arm32 } } } } } */
-+/* { dg-do run { xfail { { arc-*-* avr-*-* avr32-*-* cris-*-* crisv32-*-* h8300-*-* hppa*64*-*-* m32r-*-* m68hc1?-*-* mcore-*-* mn10300-*-* xstormy16-*-* v850*-*-* vax-*-* xtensa*-*-* } || { arm*-*-* && { ! arm32 } } } } } */
- /* -mlongcall disables sibcall patterns.  */
- /* { dg-skip-if "" { powerpc*-*-* } { "-mlongcall" } { "" } } */
- /* { dg-options "-O2 -foptimize-sibling-calls" } */
-diff -Nur gcc-4.4.6.orig/gcc/testsuite/gcc.dg/trampoline-1.c gcc-4.4.6/gcc/testsuite/gcc.dg/trampoline-1.c
---- gcc-4.4.6.orig/gcc/testsuite/gcc.dg/trampoline-1.c	2008-05-12 23:52:38.000000000 +0200
-+++ gcc-4.4.6/gcc/testsuite/gcc.dg/trampoline-1.c	2011-10-22 19:23:08.556581301 +0200
-@@ -47,6 +47,8 @@
- 
- int main (void)
- {
-+#ifndef NO_TRAMPOLINES
-   foo ();
-+#endif
-   return 0;
- }
-diff -Nur gcc-4.4.6.orig/libgcc/config.host gcc-4.4.6/libgcc/config.host
---- gcc-4.4.6.orig/libgcc/config.host	2009-04-17 13:58:41.000000000 +0200
-+++ gcc-4.4.6/libgcc/config.host	2011-10-22 19:23:08.556581301 +0200
-@@ -218,6 +218,13 @@
- 	;;
- arm-*-pe*)
- 	;;
-+avr32-*-linux*)
-+	# No need to build crtbeginT.o on uClibc systems. Should probably be
-+	# moved to the OS specific section above.
-+	extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-+	;;
-+avr32-*-*)
-+	;;
- avr-*-rtems*)
- 	;;
- avr-*-*)
-diff -Nur gcc-4.4.6.orig/libstdc++-v3/Makefile.in gcc-4.4.6/libstdc++-v3/Makefile.in
---- gcc-4.4.6.orig/libstdc++-v3/Makefile.in	2010-04-29 17:03:38.000000000 +0200
-+++ gcc-4.4.6/libstdc++-v3/Makefile.in	2011-10-22 19:23:08.556581301 +0200
-@@ -36,6 +36,7 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+LIBOBJDIR =
- DIST_COMMON = $(top_srcdir)/fragment.am $(srcdir)/../config.guess \
- 	$(srcdir)/../config.sub README ChangeLog $(srcdir)/Makefile.in \
- 	$(srcdir)/Makefile.am $(top_srcdir)/configure \
-diff -Nur gcc-4.4.6.orig/libstdc++-v3/config/os/gnu-linux/ctype_base.h gcc-4.4.6/libstdc++-v3/config/os/gnu-linux/ctype_base.h
---- gcc-4.4.6.orig/libstdc++-v3/config/os/gnu-linux/ctype_base.h	2009-04-10 01:23:07.000000000 +0200
-+++ gcc-4.4.6/libstdc++-v3/config/os/gnu-linux/ctype_base.h	2011-10-22 19:23:08.556581301 +0200
-@@ -26,6 +26,8 @@
- //
- // ISO C++ 14882: 22.1  Locales
- //
-+#include <features.h>
-+#include <ctype.h>
-   
- /** @file ctype_base.h
-  *  This is an internal header file, included by other library headers.
-@@ -40,7 +42,11 @@
-   struct ctype_base
-   {
-     // Non-standard typedefs.
-+#ifdef __UCLIBC__
-+    typedef const __ctype_touplow_t*   __to_type;
-+#else
-     typedef const int* 		__to_type;
-+#endif
- 
-     // NB: Offsets into ctype<char>::_M_table force a particular size
-     // on the mask type. Because of this, we don't use an enum.
-diff -Nur gcc-4.4.6.orig/libstdc++-v3/include/Makefile.in gcc-4.4.6/libstdc++-v3/include/Makefile.in
---- gcc-4.4.6.orig/libstdc++-v3/include/Makefile.in	2009-05-13 02:24:16.000000000 +0200
-+++ gcc-4.4.6/libstdc++-v3/include/Makefile.in	2011-10-22 19:23:08.556581301 +0200
-@@ -36,6 +36,7 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+LIBOBJDIR =
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- 	$(top_srcdir)/fragment.am
- subdir = include
-diff -Nur gcc-4.4.6.orig/libstdc++-v3/libsupc++/Makefile.in gcc-4.4.6/libstdc++-v3/libsupc++/Makefile.in
---- gcc-4.4.6.orig/libstdc++-v3/libsupc++/Makefile.in	2009-01-15 21:02:11.000000000 +0100
-+++ gcc-4.4.6/libstdc++-v3/libsupc++/Makefile.in	2011-10-22 19:23:08.556581301 +0200
-@@ -38,6 +38,7 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+LIBOBJDIR =
- DIST_COMMON = $(glibcxxinstall_HEADERS) $(srcdir)/Makefile.am \
- 	$(srcdir)/Makefile.in $(top_srcdir)/fragment.am
- subdir = libsupc++
-diff -Nur gcc-4.4.6.orig/libstdc++-v3/po/Makefile.in gcc-4.4.6/libstdc++-v3/po/Makefile.in
---- gcc-4.4.6.orig/libstdc++-v3/po/Makefile.in	2009-01-15 21:02:11.000000000 +0100
-+++ gcc-4.4.6/libstdc++-v3/po/Makefile.in	2011-10-22 19:23:08.556581301 +0200
-@@ -36,6 +36,7 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+LIBOBJDIR =
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- 	$(top_srcdir)/fragment.am
- subdir = po
-diff -Nur gcc-4.4.6.orig/libstdc++-v3/src/Makefile.in gcc-4.4.6/libstdc++-v3/src/Makefile.in
---- gcc-4.4.6.orig/libstdc++-v3/src/Makefile.in	2009-08-26 21:04:11.000000000 +0200
-+++ gcc-4.4.6/libstdc++-v3/src/Makefile.in	2011-10-22 19:23:08.556581301 +0200
-@@ -37,6 +37,7 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+LIBOBJDIR =
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- 	$(top_srcdir)/fragment.am
- subdir = src
diff --git a/toolchain/gcc/patches/4.5.3/cflags.patch b/toolchain/gcc/patches/4.5.3/cflags.patch
deleted file mode 100644
index 0d5815a54..000000000
--- a/toolchain/gcc/patches/4.5.3/cflags.patch
+++ /dev/null
@@ -1,253 +0,0 @@
-
-	This patch brings over a few features from MirBSD:
-	* -fhonour-copts
-	  If this option is not given, it's warned (depending
-	  on environment variables). This is to catch errors
-	  of misbuilt packages which override CFLAGS themselves.
-	* -Werror-maybe-reset
-	  Has the effect of -Wno-error if GCC_NO_WERROR is
-	  set and not '0', a no-operation otherwise. This is
-	  to be able to use -Werror in "make" but prevent
-	  GNU autoconf generated configure scripts from
-	  freaking out.
-	* Make -fno-strict-aliasing and -fno-delete-null-pointer-checks
-	  the default for -O2/-Os, because they trigger gcc bugs
-	  and can delete code with security implications.
-
-	This patch was authored by Thorsten Glaser <tg at mirbsd.de>
-	with copyright assignment to the FSF in effect.
-
---- a/gcc/c-opts.c
-+++ b/gcc/c-opts.c
-@@ -105,6 +105,9 @@
- /* Number of deferred options scanned for -include.  */
- static size_t include_cursor;
- 
-+/* Check if a port honours COPTS.  */
-+static int honour_copts = 0;
-+
- static void set_Wimplicit (int);
- static void handle_OPT_d (const char *);
- static void set_std_cxx98 (int);
-@@ -454,6 +457,9 @@
-       enable_warning_as_error ("implicit-function-declaration", value, CL_C | CL_ObjC); 
-       break;
- 
-+    case OPT_Werror_maybe_reset:
-+      break;
-+
-     case OPT_Wformat:
-       set_Wformat (value);
-       break;
-@@ -690,6 +701,12 @@
-       flag_exceptions = value;
-       break;
- 
-+    case OPT_fhonour_copts:
-+      if (c_language == clk_c) {
-+	honour_copts++;
-+      }
-+      break;
-+
-     case OPT_fimplement_inlines:
-       flag_implement_inlines = value;
-       break;
-@@ -1209,6 +1226,47 @@
-       return false;
-     }
- 
-+  if (c_language == clk_c) {
-+    char *ev = getenv ("GCC_HONOUR_COPTS");
-+    int evv;
-+    if (ev == NULL)
-+      evv = -1;
-+    else if ((*ev == '0') || (*ev == '\0'))
-+      evv = 0;
-+    else if (*ev == '1')
-+      evv = 1;
-+    else if (*ev == '2')
-+      evv = 2;
-+    else if (*ev == 's')
-+      evv = -1;
-+    else {
-+      warning (0, "unknown GCC_HONOUR_COPTS value, assuming 1");
-+      evv = 1; /* maybe depend this on something like MIRBSD_NATIVE?  */
-+    }
-+    if (evv == 1) {
-+      if (honour_copts == 0) {
-+	error ("someone does not honour COPTS at all in lenient mode");
-+	return false;
-+      } else if (honour_copts != 1) {
-+	warning (0, "someone does not honour COPTS correctly, passed %d times",
-+	 honour_copts);
-+      }
-+    } else if (evv == 2) {
-+      if (honour_copts == 0) {
-+	error ("someone does not honour COPTS at all in strict mode");
-+	return false;
-+      } else if (honour_copts != 1) {
-+	error ("someone does not honour COPTS correctly, passed %d times",
-+	 honour_copts);
-+	return false;
-+      }
-+    } else if (evv == 0) {
-+      if (honour_copts != 1)
-+	inform (0, "someone does not honour COPTS correctly, passed %d times",
-+	 honour_copts);
-+    }
-+  }
-+
-   return true;
- }
- 
---- a/gcc/c.opt
-+++ b/gcc/c.opt
-@@ -215,6 +215,10 @@
- C ObjC RejectNegative Warning
- This switch is deprecated; use -Werror=implicit-function-declaration instead
- 
-+Werror-maybe-reset
-+C ObjC C++ ObjC++
-+; Documented in common.opt
-+
- Wfloat-equal
- C ObjC C++ ObjC++ Var(warn_float_equal) Warning
- Warn if testing floating point numbers for equality
-@@ -609,6 +613,9 @@
- fhonor-std
- C++ ObjC++
- 
-+fhonour-copts
-+C ObjC C++ ObjC++ RejectNegative
-+
- fhosted
- C ObjC
- Assume normal C execution environment
---- a/gcc/common.opt
-+++ b/gcc/common.opt
-@@ -102,6 +102,10 @@
- Common Joined
- Treat specified warning as error
- 
-+Werror-maybe-reset
-+Common
-+If environment variable GCC_NO_WERROR is set, act as -Wno-error
-+
- Wextra
- Common Warning
- Print extra (possibly unwanted) warnings
-@@ -573,6 +577,9 @@
- Common Report Var(flag_guess_branch_prob) Optimization
- Enable guessing of branch probabilities
- 
-+fhonour-copts
-+Common RejectNegative
-+
- ; Nonzero means ignore `#ident' directives.  0 means handle them.
- ; Generate position-independent code for executables if possible
- ; On SVR4 targets, it also controls whether or not to emit a
---- a/gcc/opts.c
-+++ b/gcc/opts.c
-@@ -896,8 +896,6 @@
-   flag_schedule_insns_after_reload = opt2;
- #endif
-   flag_regmove = opt2;
--  flag_strict_aliasing = opt2;
--  flag_strict_overflow = opt2;
-   flag_reorder_blocks = opt2;
-   flag_reorder_functions = opt2;
-   flag_tree_vrp = opt2;
-@@ -922,6 +919,8 @@
- 
-   /* -O3 optimizations.  */
-   opt3 = (optimize >= 3);
-+  flag_strict_aliasing = opt3;
-+  flag_strict_overflow = opt3;
-   flag_predictive_commoning = opt3;
-   flag_inline_functions = opt3;
-   flag_unswitch_loops = opt3;
-@@ -1601,6 +1601,17 @@
-       enable_warning_as_error (arg, value, lang_mask);
-       break;
- 
-+    case OPT_Werror_maybe_reset:
-+      {
-+	char *ev = getenv ("GCC_NO_WERROR");
-+	if ((ev != NULL) && (*ev != '0'))
-+	  warnings_are_errors = 0;
-+      }
-+      break;
-+
-+    case OPT_fhonour_copts:
-+      break;
-+
-     case OPT_Wlarger_than_:
-       /* This form corresponds to -Wlarger-than-. 
-          Kept for backward compatibility.
---- a/gcc/doc/cppopts.texi
-+++ b/gcc/doc/cppopts.texi
-@@ -164,6 +164,11 @@
- Make all warnings into hard errors.  Source code which triggers warnings
- will be rejected.
- 
-+ at item -Werror-maybe-reset
-+ at opindex Werror-maybe-reset
-+Act like @samp{-Wno-error} if the @env{GCC_NO_WERROR} environment
-+variable is set to anything other than 0 or empty.
-+
- @item -Wsystem-headers
- @opindex Wsystem-headers
- Issue warnings for code in system headers.  These are normally unhelpful
---- a/gcc/doc/invoke.texi
-+++ b/gcc/doc/invoke.texi
-@@ -234,7 +234,7 @@
- -Wconversion  -Wcoverage-mismatch  -Wno-deprecated  @gol
- -Wno-deprecated-declarations -Wdisabled-optimization  @gol
- -Wno-div-by-zero -Wempty-body  -Wenum-compare -Wno-endif-labels @gol
---Werror  -Werror=* @gol
-+-Werror  -Werror=* -Werror-maybe-reset @gol
- -Wfatal-errors  -Wfloat-equal  -Wformat  -Wformat=2 @gol
- -Wno-format-contains-nul -Wno-format-extra-args -Wformat-nonliteral @gol
- -Wformat-security  -Wformat-y2k @gol
-@@ -4161,6 +4161,22 @@
- @option{-Wall} and by @option{-pedantic}, which can be disabled with
- @option{-Wno-pointer-sign}.
- 
-+ at item -Werror-maybe-reset
-+ at opindex Werror-maybe-reset
-+Act like @samp{-Wno-error} if the @env{GCC_NO_WERROR} environment
-+variable is set to anything other than 0 or empty.
-+
-+ at item -fhonour-copts
-+ at opindex fhonour-copts
-+If @env{GCC_HONOUR_COPTS} is set to 1, abort if this option is not
-+given at least once, and warn if it is given more than once.
-+If @env{GCC_HONOUR_COPTS} is set to 2, abort if this option is not
-+given exactly once.
-+If @env{GCC_HONOUR_COPTS} is set to 0 or unset, warn if this option
-+is not given exactly once.
-+The warning is quelled if @env{GCC_HONOUR_COPTS} is set to @samp{s}.
-+This flag and environment variable only affect the C language.
-+
- @item -Wstack-protector
- @opindex Wstack-protector
- @opindex Wno-stack-protector
-@@ -5699,7 +5715,7 @@
- second branch or a point immediately following it, depending on whether
- the condition is known to be true or false.
- 
--Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}.
-+Enabled at levels @option{-O3}.
- 
- @item -fsplit-wide-types
- @opindex fsplit-wide-types
---- a/gcc/java/jvspec.c
-+++ b/gcc/java/jvspec.c
-@@ -670,6 +670,7 @@
-      class name.  Append dummy `.c' that can be stripped by set_input so %b
-      is correct.  */ 
-   set_input (concat (main_class_name, "main.c", NULL));
-+  putenv ("GCC_HONOUR_COPTS=s"); /* XXX hack!  */
-   err = do_spec (jvgenmain_spec);
-   if (err == 0)
-     {
diff --git a/toolchain/gcc/patches/4.5.3/mirbsd-compat.patch b/toolchain/gcc/patches/4.5.3/mirbsd-compat.patch
deleted file mode 100644
index 2f3ea0c87..000000000
--- a/toolchain/gcc/patches/4.5.3/mirbsd-compat.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur gcc-4.4.2.orig/gcc/configure gcc-4.4.2/gcc/configure
---- gcc-4.4.2.orig/gcc/configure	Tue Mar 24 18:45:39 2009
-+++ gcc-4.4.2/gcc/configure	Sat Dec 19 21:07:07 2009
-@@ -19381,7 +19381,7 @@
-   dynamic_linker='ldqnx.so'
-   ;;
- 
--openbsd*)
-+mirbsd*|openbsd*)
-   version_type=sunos
-   sys_lib_dlsearch_path_spec="/usr/lib"
-   need_lib_prefix=no
diff --git a/toolchain/gcc/patches/4.5.3/no-lib64.patch b/toolchain/gcc/patches/4.5.3/no-lib64.patch
deleted file mode 100644
index 5c6e0b045..000000000
--- a/toolchain/gcc/patches/4.5.3/no-lib64.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-diff -Nur gcc-4.5.3.orig/gcc/config/i386/linux64.h gcc-4.5.3/gcc/config/i386/linux64.h
---- gcc-4.5.3.orig/gcc/config/i386/linux64.h	2010-03-24 21:44:48.000000000 +0100
-+++ gcc-4.5.3/gcc/config/i386/linux64.h	2011-08-24 06:35:30.000000000 +0200
-@@ -59,7 +59,7 @@
-    done.  */
- 
- #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
-+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
- 
- #if TARGET_64BIT_DEFAULT
- #define SPEC_32 "m32"
-diff -Nur gcc-4.5.3.orig/gcc/config/i386/t-linux64 gcc-4.5.3/gcc/config/i386/t-linux64
---- gcc-4.5.3.orig/gcc/config/i386/t-linux64	2009-04-21 21:03:23.000000000 +0200
-+++ gcc-4.5.3/gcc/config/i386/t-linux64	2011-08-24 06:35:30.000000000 +0200
-@@ -25,7 +25,7 @@
- 
- MULTILIB_OPTIONS = m64/m32
- MULTILIB_DIRNAMES = 64 32 
--MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
-+MULTILIB_OSDIRNAMES = ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
- 
- LIBGCC = stmp-multilib
- INSTALL_LIBGCC = install-multilib
-diff -Nur gcc-4.5.3.orig/gcc/config/mips/linux64.h gcc-4.5.3/gcc/config/mips/linux64.h
---- gcc-4.5.3.orig/gcc/config/mips/linux64.h	2009-02-20 16:20:38.000000000 +0100
-+++ gcc-4.5.3/gcc/config/mips/linux64.h	2011-08-24 06:35:30.000000000 +0200
-@@ -36,9 +36,9 @@
-   %{profile:-lc_p} %{!profile:-lc}}"
- 
- #define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1"
--#define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1"
--#define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0"
-+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKERN32 "/lib/ld.so.1"
-+#define UCLIBC_DYNAMIC_LINKERN32 "/lib/ld-uClibc.so.0"
- #define LINUX_DYNAMIC_LINKERN32 \
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32)
- 
-diff -Nur gcc-4.5.3.orig/gcc/config/mips/t-linux64 gcc-4.5.3/gcc/config/mips/t-linux64
---- gcc-4.5.3.orig/gcc/config/mips/t-linux64	2009-04-21 21:03:23.000000000 +0200
-+++ gcc-4.5.3/gcc/config/mips/t-linux64	2011-08-24 06:35:30.000000000 +0200
-@@ -18,7 +18,7 @@
- 
- MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64
- MULTILIB_DIRNAMES = n32 32 64
--MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64
-+MULTILIB_OSDIRNAMES = ../lib ../lib ../lib
- 
- EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o
- 
-diff -Nur gcc-4.5.3.orig/gcc/config/rs6000/linux64.h gcc-4.5.3/gcc/config/rs6000/linux64.h
---- gcc-4.5.3.orig/gcc/config/rs6000/linux64.h	2010-11-17 07:09:53.000000000 +0100
-+++ gcc-4.5.3/gcc/config/rs6000/linux64.h	2011-08-24 06:35:30.000000000 +0200
-@@ -341,7 +341,7 @@
- #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
- 
- #define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1"
-+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1"
- #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
- #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
- #if UCLIBC_DEFAULT
-diff -Nur gcc-4.5.3.orig/gcc/config/rs6000/t-linux64 gcc-4.5.3/gcc/config/rs6000/t-linux64
---- gcc-4.5.3.orig/gcc/config/rs6000/t-linux64	2009-04-21 21:03:23.000000000 +0200
-+++ gcc-4.5.3/gcc/config/rs6000/t-linux64	2011-08-24 06:35:30.000000000 +0200
-@@ -36,7 +36,7 @@
- MULTILIB_EXTRA_OPTS     = fPIC mstrict-align
- MULTILIB_EXCEPTIONS     = m64/msoft-float
- MULTILIB_EXCLUSIONS     = m64/!m32/msoft-float
--MULTILIB_OSDIRNAMES	= ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof
-+MULTILIB_OSDIRNAMES	= ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof
- MULTILIB_MATCHES        = $(MULTILIB_MATCHES_FLOAT)
- 
- softfp_wrap_start := '\#ifndef __powerpc64__'
-diff -Nur gcc-4.5.3.orig/gcc/config/sparc/linux64.h gcc-4.5.3/gcc/config/sparc/linux64.h
---- gcc-4.5.3.orig/gcc/config/sparc/linux64.h	2010-09-22 23:15:37.000000000 +0200
-+++ gcc-4.5.3/gcc/config/sparc/linux64.h	2011-08-24 06:36:52.000000000 +0200
-@@ -110,7 +110,7 @@
- /* If ELF is the default format, we should not use /lib/elf.  */
- 
- #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux.so.2"
- 
- #ifdef SPARC_BI_ARCH
- 
-diff -Nur gcc-4.5.3.orig/gcc/config/sparc/t-linux64 gcc-4.5.3/gcc/config/sparc/t-linux64
---- gcc-4.5.3.orig/gcc/config/sparc/t-linux64	2010-10-04 18:54:26.000000000 +0200
-+++ gcc-4.5.3/gcc/config/sparc/t-linux64	2011-08-24 06:37:15.000000000 +0200
-@@ -26,7 +26,7 @@
- 
- MULTILIB_OPTIONS = m64/m32
- MULTILIB_DIRNAMES = 64 32
--MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
-+MULTILIB_OSDIRNAMES = ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
- 
- LIBGCC = stmp-multilib
- INSTALL_LIBGCC = install-multilib
diff --git a/toolchain/gcc/patches/4.6.3/cflags.patch b/toolchain/gcc/patches/4.6.3/cflags.patch
deleted file mode 100644
index 3623d3872..000000000
--- a/toolchain/gcc/patches/4.6.3/cflags.patch
+++ /dev/null
@@ -1,253 +0,0 @@
-
-	This patch brings over a few features from MirBSD:
-	* -fhonour-copts
-	  If this option is not given, it's warned (depending
-	  on environment variables). This is to catch errors
-	  of misbuilt packages which override CFLAGS themselves.
-	* -Werror-maybe-reset
-	  Has the effect of -Wno-error if GCC_NO_WERROR is
-	  set and not '0', a no-operation otherwise. This is
-	  to be able to use -Werror in "make" but prevent
-	  GNU autoconf generated configure scripts from
-	  freaking out.
-	* Make -fno-strict-aliasing and -fno-delete-null-pointer-checks
-	  the default for -O2/-Os, because they trigger gcc bugs
-	  and can delete code with security implications.
-
-	This patch was authored by Thorsten Glaser <tg at mirbsd.de>
-	with copyright assignment to the FSF in effect.
-
---- a/gcc/c-family/c-opts.c
-+++ b/gcc/c-family/c-opts.c
-@@ -103,6 +103,9 @@ static size_t deferred_count;
- /* Number of deferred options scanned for -include.  */
- static size_t include_cursor;
- 
-+/* Check if a port honours COPTS.  */
-+static int honour_copts = 0;
-+
- static void handle_OPT_d (const char *);
- static void set_std_cxx98 (int);
- static void set_std_cxx0x (int);
-@@ -441,6 +444,9 @@ c_common_handle_option (size_t scode, co
-       global_dc->warning_as_error_requested = value;
-       break;
- 
-+    case OPT_Werror_maybe_reset:
-+      break;
-+
-     case OPT_Wformat:
-       set_Wformat (value);
-       break;
-@@ -584,6 +590,12 @@ c_common_handle_option (size_t scode, co
-       flag_no_builtin = !value;
-       break;
- 
-+    case OPT_fhonour_copts:
-+      if (c_language == clk_c) {
-+        honour_copts++;
-+      }
-+      break;
-+
-     case OPT_fconstant_string_class_:
-       constant_string_class_name = arg;
-       break;
-@@ -1058,6 +1070,47 @@ c_common_init (void)
-       return false;
-     }
- 
-+  if (c_language == clk_c) {
-+    char *ev = getenv ("GCC_HONOUR_COPTS");
-+    int evv;
-+    if (ev == NULL)
-+      evv = -1;
-+    else if ((*ev == '0') || (*ev == '\0'))
-+      evv = 0;
-+    else if (*ev == '1')
-+      evv = 1;
-+    else if (*ev == '2')
-+      evv = 2;
-+    else if (*ev == 's')
-+      evv = -1;
-+    else {
-+      warning (0, "unknown GCC_HONOUR_COPTS value, assuming 1");
-+      evv = 1; /* maybe depend this on something like MIRBSD_NATIVE?  */
-+    }
-+    if (evv == 1) {
-+      if (honour_copts == 0) {
-+        error ("someone does not honour COPTS at all in lenient mode");
-+        return false;
-+      } else if (honour_copts != 1) {
-+        warning (0, "someone does not honour COPTS correctly, passed %d times",
-+         honour_copts);
-+      }
-+    } else if (evv == 2) {
-+      if (honour_copts == 0) {
-+        error ("someone does not honour COPTS at all in strict mode");
-+        return false;
-+      } else if (honour_copts != 1) {
-+        error ("someone does not honour COPTS correctly, passed %d times",
-+         honour_copts);
-+        return false;
-+      }
-+    } else if (evv == 0) {
-+      if (honour_copts != 1)
-+        inform (0, "someone does not honour COPTS correctly, passed %d times",
-+         honour_copts);
-+    }
-+  }
-+
-   return true;
- }
- 
---- a/gcc/c-family/c.opt
-+++ b/gcc/c-family/c.opt
-@@ -363,6 +363,10 @@ Werror-implicit-function-declaration
- C ObjC RejectNegative Warning Alias(Werror=, implicit-function-declaration)
- This switch is deprecated; use -Werror=implicit-function-declaration instead
- 
-+Werror-maybe-reset
-+C ObjC C++ ObjC++
-+; Documented in common.opt
-+
- Wfloat-equal
- C ObjC C++ ObjC++ Var(warn_float_equal) Warning
- Warn if testing floating point numbers for equality
-@@ -794,6 +798,9 @@ C++ ObjC++ Optimization Alias(fexception
- fhonor-std
- C++ ObjC++ Ignore Warn(switch %qs is no longer supported)
- 
-+fhonour-copts
-+C ObjC C++ ObjC++ RejectNegative
-+
- fhosted
- C ObjC
- Assume normal C execution environment
---- a/gcc/common.opt
-+++ b/gcc/common.opt
-@@ -520,6 +520,10 @@ Werror=
- Common Joined
- Treat specified warning as error
- 
-+Werror-maybe-reset
-+Common
-+If environment variable GCC_NO_WERROR is set, act as -Wno-error
-+
- Wextra
- Common Var(extra_warnings) Warning
- Print extra (possibly unwanted) warnings
-@@ -1156,6 +1160,9 @@ fguess-branch-probability
- Common Report Var(flag_guess_branch_prob) Optimization
- Enable guessing of branch probabilities
- 
-+fhonour-copts
-+Common RejectNegative
-+
- ; Nonzero means ignore `#ident' directives.  0 means handle them.
- ; Generate position-independent code for executables if possible
- ; On SVR4 targets, it also controls whether or not to emit a
---- a/gcc/opts.c
-+++ b/gcc/opts.c
-@@ -477,8 +477,6 @@ static const struct default_options defa
-     { OPT_LEVELS_2_PLUS, OPT_fschedule_insns2, NULL, 1 },
- #endif
-     { OPT_LEVELS_2_PLUS, OPT_fregmove, NULL, 1 },
--    { OPT_LEVELS_2_PLUS, OPT_fstrict_aliasing, NULL, 1 },
--    { OPT_LEVELS_2_PLUS, OPT_fstrict_overflow, NULL, 1 },
-     { OPT_LEVELS_2_PLUS, OPT_freorder_blocks, NULL, 1 },
-     { OPT_LEVELS_2_PLUS, OPT_freorder_functions, NULL, 1 },
-     { OPT_LEVELS_2_PLUS, OPT_ftree_vrp, NULL, 1 },
-@@ -494,6 +492,8 @@ static const struct default_options defa
-     { OPT_LEVELS_2_PLUS, OPT_falign_functions, NULL, 1 },
- 
-     /* -O3 optimizations.  */
-+    { OPT_LEVELS_3_PLUS, OPT_fstrict_aliasing, NULL, 1 },
-+    { OPT_LEVELS_3_PLUS, OPT_fstrict_overflow, NULL, 1 },
-     { OPT_LEVELS_3_PLUS, OPT_ftree_loop_distribute_patterns, NULL, 1 },
-     { OPT_LEVELS_3_PLUS, OPT_fpredictive_commoning, NULL, 1 },
-     /* Inlining of functions reducing size is a good idea with -Os
-@@ -1399,6 +1399,17 @@ common_handle_option (struct gcc_options
- 			       opts, opts_set, loc, dc);
-       break;
- 
-+    case OPT_Werror_maybe_reset:
-+      {
-+        char *ev = getenv ("GCC_NO_WERROR");
-+        if ((ev != NULL) && (*ev != '0'))
-+          warnings_are_errors = 0;
-+      }
-+      break;
-+
-+    case OPT_fhonour_copts:
-+      break;
-+
-     case OPT_Wlarger_than_:
-       opts->x_larger_than_size = value;
-       opts->x_warn_larger_than = value != -1;
---- a/gcc/doc/cppopts.texi
-+++ b/gcc/doc/cppopts.texi
-@@ -164,6 +164,11 @@ in older programs.  This warning is on b
- Make all warnings into hard errors.  Source code which triggers warnings
- will be rejected.
- 
-+ at item -Werror-maybe-reset
-+ at opindex Werror-maybe-reset
-+Act like @samp{-Wno-error} if the @env{GCC_NO_WERROR} environment
-+variable is set to anything other than 0 or empty.
-+
- @item -Wsystem-headers
- @opindex Wsystem-headers
- Issue warnings for code in system headers.  These are normally unhelpful
---- a/gcc/doc/invoke.texi
-+++ b/gcc/doc/invoke.texi
-@@ -240,7 +240,7 @@ Objective-C and Objective-C++ Dialects}.
- -Wconversion  -Wcoverage-mismatch  -Wno-cpp  -Wno-deprecated  @gol
- -Wno-deprecated-declarations -Wdisabled-optimization  @gol
- -Wno-div-by-zero -Wdouble-promotion -Wempty-body  -Wenum-compare @gol
---Wno-endif-labels -Werror  -Werror=* @gol
-+-Wno-endif-labels -Werror  -Werror=* -Werror-maybe-reset @gol
- -Wfatal-errors  -Wfloat-equal  -Wformat  -Wformat=2 @gol
- -Wno-format-contains-nul -Wno-format-extra-args -Wformat-nonliteral @gol
- -Wformat-security  -Wformat-y2k @gol
-@@ -4497,6 +4497,22 @@ This option is only supported for C and
- @option{-Wall} and by @option{-pedantic}, which can be disabled with
- @option{-Wno-pointer-sign}.
- 
-+ at item -Werror-maybe-reset
-+ at opindex Werror-maybe-reset
-+Act like @samp{-Wno-error} if the @env{GCC_NO_WERROR} environment
-+variable is set to anything other than 0 or empty.
-+
-+ at item -fhonour-copts
-+ at opindex fhonour-copts
-+If @env{GCC_HONOUR_COPTS} is set to 1, abort if this option is not
-+given at least once, and warn if it is given more than once.
-+If @env{GCC_HONOUR_COPTS} is set to 2, abort if this option is not
-+given exactly once.
-+If @env{GCC_HONOUR_COPTS} is set to 0 or unset, warn if this option
-+is not given exactly once.
-+The warning is quelled if @env{GCC_HONOUR_COPTS} is set to @samp{s}.
-+This flag and environment variable only affect the C language.
-+
- @item -Wstack-protector
- @opindex Wstack-protector
- @opindex Wno-stack-protector
-@@ -6319,7 +6335,7 @@ so, the first branch is redirected to ei
- second branch or a point immediately following it, depending on whether
- the condition is known to be true or false.
- 
--Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}.
-+Enabled at levels @option{-O3}.
- 
- @item -fsplit-wide-types
- @opindex fsplit-wide-types
---- a/gcc/java/jvspec.c
-+++ b/gcc/java/jvspec.c
-@@ -627,6 +627,7 @@ lang_specific_pre_link (void)
-      class name.  Append dummy `.c' that can be stripped by set_input so %b
-      is correct.  */ 
-   set_input (concat (main_class_name, "main.c", NULL));
-+  putenv ("GCC_HONOUR_COPTS=s"); /* XXX hack!  */
-   err = do_spec (jvgenmain_spec);
-   if (err == 0)
-     {
diff --git a/toolchain/gcc/patches/4.6.3/no-lib64.patch b/toolchain/gcc/patches/4.6.3/no-lib64.patch
deleted file mode 100644
index 8722018ea..000000000
--- a/toolchain/gcc/patches/4.6.3/no-lib64.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-diff -Nur gcc-4.6.3.orig/gcc/config/i386/linux64.h gcc-4.6.3/gcc/config/i386/linux64.h
---- gcc-4.6.3.orig/gcc/config/i386/linux64.h	2011-09-08 11:12:35.000000000 +0200
-+++ gcc-4.6.3/gcc/config/i386/linux64.h	2012-03-21 13:30:49.125903065 +0100
-@@ -63,7 +63,7 @@
-    done.  */
- 
- #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
-+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
- 
- #if TARGET_64BIT_DEFAULT
- #define SPEC_32 "m32"
-diff -Nur gcc-4.6.3.orig/gcc/config/i386/t-linux64 gcc-4.6.3/gcc/config/i386/t-linux64
---- gcc-4.6.3.orig/gcc/config/i386/t-linux64	2009-04-21 21:03:23.000000000 +0200
-+++ gcc-4.6.3/gcc/config/i386/t-linux64	2012-03-21 13:30:49.125903065 +0100
-@@ -25,7 +25,7 @@
- 
- MULTILIB_OPTIONS = m64/m32
- MULTILIB_DIRNAMES = 64 32 
--MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
-+MULTILIB_OSDIRNAMES = ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
- 
- LIBGCC = stmp-multilib
- INSTALL_LIBGCC = install-multilib
-diff -Nur gcc-4.6.3.orig/gcc/config/mips/linux64.h gcc-4.6.3/gcc/config/mips/linux64.h
---- gcc-4.6.3.orig/gcc/config/mips/linux64.h	2011-01-19 21:39:09.000000000 +0100
-+++ gcc-4.6.3/gcc/config/mips/linux64.h	2012-03-21 13:31:26.549903066 +0100
-@@ -36,9 +36,9 @@
-   %{profile:-lc_p} %{!profile:-lc}}"
- 
- #define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1"
--#define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1"
--#define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0"
-+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKERN32 "/lib/ld.so.1"
-+#define UCLIBC_DYNAMIC_LINKERN32 "/lib/ld-uClibc.so.0"
- #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32"
- #define LINUX_DYNAMIC_LINKERN32 \
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
-diff -Nur gcc-4.6.3.orig/gcc/config/mips/t-linux64 gcc-4.6.3/gcc/config/mips/t-linux64
---- gcc-4.6.3.orig/gcc/config/mips/t-linux64	2009-04-21 21:03:23.000000000 +0200
-+++ gcc-4.6.3/gcc/config/mips/t-linux64	2012-03-21 13:30:51.685903041 +0100
-@@ -18,7 +18,7 @@
- 
- MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64
- MULTILIB_DIRNAMES = n32 32 64
--MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64
-+MULTILIB_OSDIRNAMES = ../lib ../lib ../lib
- 
- EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o
- 
-diff -Nur gcc-4.6.3.orig/gcc/config/rs6000/linux64.h gcc-4.6.3/gcc/config/rs6000/linux64.h
---- gcc-4.6.3.orig/gcc/config/rs6000/linux64.h	2011-03-07 08:50:23.000000000 +0100
-+++ gcc-4.6.3/gcc/config/rs6000/linux64.h	2012-03-21 13:30:51.685903041 +0100
-@@ -373,7 +373,7 @@
- #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
- 
- #define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1"
-+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1"
- #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
- #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
- #if DEFAULT_LIBC == LIBC_UCLIBC
-diff -Nur gcc-4.6.3.orig/gcc/config/rs6000/t-linux64 gcc-4.6.3/gcc/config/rs6000/t-linux64
---- gcc-4.6.3.orig/gcc/config/rs6000/t-linux64	2009-04-21 21:03:23.000000000 +0200
-+++ gcc-4.6.3/gcc/config/rs6000/t-linux64	2012-03-21 13:30:51.685903041 +0100
-@@ -36,7 +36,7 @@
- MULTILIB_EXTRA_OPTS     = fPIC mstrict-align
- MULTILIB_EXCEPTIONS     = m64/msoft-float
- MULTILIB_EXCLUSIONS     = m64/!m32/msoft-float
--MULTILIB_OSDIRNAMES	= ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof
-+MULTILIB_OSDIRNAMES	= ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof
- MULTILIB_MATCHES        = $(MULTILIB_MATCHES_FLOAT)
- 
- softfp_wrap_start := '\#ifndef __powerpc64__'
-diff -Nur gcc-4.6.3.orig/gcc/config/sparc/linux64.h gcc-4.6.3/gcc/config/sparc/linux64.h
---- gcc-4.6.3.orig/gcc/config/sparc/linux64.h	2011-09-08 11:12:35.000000000 +0200
-+++ gcc-4.6.3/gcc/config/sparc/linux64.h	2012-03-21 13:30:51.685903041 +0100
-@@ -102,7 +102,7 @@
-    done.  */
- 
- #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux.so.2"
- 
- #ifdef SPARC_BI_ARCH
- 
-diff -Nur gcc-4.6.3.orig/gcc/config/sparc/t-linux64 gcc-4.6.3/gcc/config/sparc/t-linux64
---- gcc-4.6.3.orig/gcc/config/sparc/t-linux64	2011-05-22 22:03:43.000000000 +0200
-+++ gcc-4.6.3/gcc/config/sparc/t-linux64	2012-03-21 13:30:51.685903041 +0100
-@@ -26,7 +26,7 @@
- 
- MULTILIB_OPTIONS = m64/m32
- MULTILIB_DIRNAMES = 64 32
--MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
-+MULTILIB_OSDIRNAMES = ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
- 
- LIBGCC = stmp-multilib
- INSTALL_LIBGCC = install-multilib
diff --git a/toolchain/gcc/patches/4.6.3/siginfo.patch b/toolchain/gcc/patches/4.6.3/siginfo.patch
deleted file mode 100644
index 8dbf60415..000000000
--- a/toolchain/gcc/patches/4.6.3/siginfo.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Nur gcc-4.6.3.orig/gcc/config/i386/linux-unwind.h gcc-4.6.3/gcc/config/i386/linux-unwind.h
---- gcc-4.6.3.orig/gcc/config/i386/linux-unwind.h	2011-01-03 21:52:22.000000000 +0100
-+++ gcc-4.6.3/gcc/config/i386/linux-unwind.h	2012-08-30 15:37:37.000000000 +0200
-@@ -133,9 +133,9 @@
-     {
-       struct rt_sigframe {
- 	int sig;
--	struct siginfo *pinfo;
-+	siginfo_t *pinfo;
- 	void *puc;
--	struct siginfo info;
-+	siginfo_t info;
- 	struct ucontext uc;
-       } *rt_ = context->cfa;
-       /* The void * cast is necessary to avoid an aliasing warning.
-diff -Nur gcc-4.6.3.orig/gcc/config/mips/linux-unwind.h gcc-4.6.3/gcc/config/mips/linux-unwind.h
---- gcc-4.6.3.orig/gcc/config/mips/linux-unwind.h	2009-04-09 17:00:19.000000000 +0200
-+++ gcc-4.6.3/gcc/config/mips/linux-unwind.h	2012-08-30 15:38:45.000000000 +0200
-@@ -75,7 +75,7 @@
-       struct rt_sigframe {
- 	u_int32_t ass[4];  /* Argument save space for o32.  */
- 	u_int32_t trampoline[2];
--	struct siginfo info;
-+	siginfo_t info;
- 	_sig_ucontext_t uc;
-       } *rt_ = context->cfa;
-       sc = &rt_->uc.uc_mcontext;
diff --git a/toolchain/gcc/patches/4.7.2/cflags.patch b/toolchain/gcc/patches/4.7.2/cflags.patch
deleted file mode 100644
index a9ccdcbc8..000000000
--- a/toolchain/gcc/patches/4.7.2/cflags.patch
+++ /dev/null
@@ -1,241 +0,0 @@
-diff -Nur gcc-4.7.2.orig/gcc/c-family/c-opts.c gcc-4.7.2/gcc/c-family/c-opts.c
---- gcc-4.7.2.orig/gcc/c-family/c-opts.c	2012-01-18 14:10:40.000000000 +0100
-+++ gcc-4.7.2/gcc/c-family/c-opts.c	2012-09-22 12:53:33.000000000 +0200
-@@ -108,6 +108,9 @@
- /* Number of deferred options scanned for -include.  */
- static size_t include_cursor;
- 
-+/* Check if a port honours COPTS.  */
-+static int honour_copts = 0;
-+
- static void handle_OPT_d (const char *);
- static void set_std_cxx98 (int);
- static void set_std_cxx11 (int);
-@@ -449,6 +452,9 @@
-       cpp_opts->warn_endif_labels = value;
-       break;
- 
-+    case OPT_Werror_maybe_reset:
-+      break;
-+
-     case OPT_Wformat:
-       set_Wformat (value);
-       break;
-@@ -592,6 +598,12 @@
-       flag_no_builtin = !value;
-       break;
- 
-+    case OPT_fhonour_copts:
-+      if (c_language == clk_c) {
-+        honour_copts++;
-+      }
-+      break;
-+
-     case OPT_fconstant_string_class_:
-       constant_string_class_name = arg;
-       break;
-@@ -1098,6 +1110,47 @@
-       return false;
-     }
- 
-+  if (c_language == clk_c) {
-+    char *ev = getenv ("GCC_HONOUR_COPTS");
-+    int evv;
-+    if (ev == NULL)
-+      evv = -1;
-+    else if ((*ev == '0') || (*ev == '\0'))
-+      evv = 0;
-+    else if (*ev == '1')
-+      evv = 1;
-+    else if (*ev == '2')
-+      evv = 2;
-+    else if (*ev == 's')
-+      evv = -1;
-+    else {
-+      warning (0, "unknown GCC_HONOUR_COPTS value, assuming 1");
-+      evv = 1; /* maybe depend this on something like MIRBSD_NATIVE?  */
-+    }
-+    if (evv == 1) {
-+      if (honour_copts == 0) {
-+        error ("someone does not honour COPTS at all in lenient mode");
-+        return false;
-+      } else if (honour_copts != 1) {
-+        warning (0, "someone does not honour COPTS correctly, passed %d times",
-+         honour_copts);
-+      }
-+    } else if (evv == 2) {
-+      if (honour_copts == 0) {
-+        error ("someone does not honour COPTS at all in strict mode");
-+        return false;
-+      } else if (honour_copts != 1) {
-+        error ("someone does not honour COPTS correctly, passed %d times",
-+         honour_copts);
-+        return false;
-+      }
-+    } else if (evv == 0) {
-+      if (honour_copts != 1)
-+        inform (0, "someone does not honour COPTS correctly, passed %d times",
-+         honour_copts);
-+    }
-+  }
-+
-   return true;
- }
- 
-diff -Nur gcc-4.7.2.orig/gcc/c-family/c.opt gcc-4.7.2/gcc/c-family/c.opt
---- gcc-4.7.2.orig/gcc/c-family/c.opt	2012-02-06 11:31:18.000000000 +0100
-+++ gcc-4.7.2/gcc/c-family/c.opt	2012-09-22 12:53:33.000000000 +0200
-@@ -371,6 +371,10 @@
- C ObjC RejectNegative Warning Alias(Werror=, implicit-function-declaration)
- This switch is deprecated; use -Werror=implicit-function-declaration instead
- 
-+Werror-maybe-reset
-+C ObjC C++ ObjC++
-+; Documented in common.opt
-+
- Wfloat-equal
- C ObjC C++ ObjC++ Var(warn_float_equal) Warning
- Warn if testing floating point numbers for equality
-@@ -830,6 +834,9 @@
- fhonor-std
- C++ ObjC++ Ignore Warn(switch %qs is no longer supported)
- 
-+fhonour-copts
-+C ObjC C++ ObjC++ RejectNegative
-+
- fhosted
- C ObjC
- Assume normal C execution environment
-diff -Nur gcc-4.7.2.orig/gcc/common.opt gcc-4.7.2/gcc/common.opt
---- gcc-4.7.2.orig/gcc/common.opt	2012-08-06 16:34:27.000000000 +0200
-+++ gcc-4.7.2/gcc/common.opt	2012-09-22 12:53:33.000000000 +0200
-@@ -531,6 +531,10 @@
- Common Joined
- Treat specified warning as error
- 
-+Werror-maybe-reset
-+Common
-+If environment variable GCC_NO_WERROR is set, act as -Wno-error
-+
- Wextra
- Common Var(extra_warnings) Warning
- Print extra (possibly unwanted) warnings
-@@ -1209,6 +1213,9 @@
- Common Report Var(flag_guess_branch_prob) Optimization
- Enable guessing of branch probabilities
- 
-+fhonour-copts
-+Common RejectNegative
-+
- ; Nonzero means ignore `#ident' directives.  0 means handle them.
- ; Generate position-independent code for executables if possible
- ; On SVR4 targets, it also controls whether or not to emit a
-diff -Nur gcc-4.7.2.orig/gcc/doc/cppopts.texi gcc-4.7.2/gcc/doc/cppopts.texi
---- gcc-4.7.2.orig/gcc/doc/cppopts.texi	2011-12-20 21:44:13.000000000 +0100
-+++ gcc-4.7.2/gcc/doc/cppopts.texi	2012-09-22 12:53:33.000000000 +0200
-@@ -164,6 +164,11 @@
- Make all warnings into hard errors.  Source code which triggers warnings
- will be rejected.
- 
-+ at item -Werror-maybe-reset
-+ at opindex Werror-maybe-reset
-+Act like @samp{-Wno-error} if the @env{GCC_NO_WERROR} environment
-+variable is set to anything other than 0 or empty.
-+
- @item -Wsystem-headers
- @opindex Wsystem-headers
- Issue warnings for code in system headers.  These are normally unhelpful
-diff -Nur gcc-4.7.2.orig/gcc/doc/invoke.texi gcc-4.7.2/gcc/doc/invoke.texi
---- gcc-4.7.2.orig/gcc/doc/invoke.texi	2012-09-14 22:45:27.000000000 +0200
-+++ gcc-4.7.2/gcc/doc/invoke.texi	2012-09-22 12:53:33.000000000 +0200
-@@ -242,7 +242,7 @@
- -Wconversion  -Wcoverage-mismatch  -Wno-cpp  -Wno-deprecated  @gol
- -Wno-deprecated-declarations -Wdisabled-optimization  @gol
- -Wno-div-by-zero -Wdouble-promotion -Wempty-body  -Wenum-compare @gol
---Wno-endif-labels -Werror  -Werror=* @gol
-+-Wno-endif-labels -Werror  -Werror=* -Werror-maybe-reset @gol
- -Wfatal-errors  -Wfloat-equal  -Wformat  -Wformat=2 @gol
- -Wno-format-contains-nul -Wno-format-extra-args -Wformat-nonliteral @gol
- -Wformat-security  -Wformat-y2k @gol
-@@ -4651,6 +4651,22 @@
- @option{-Wall} and by @option{-pedantic}, which can be disabled with
- @option{-Wno-pointer-sign}.
- 
-+ at item -Werror-maybe-reset
-+ at opindex Werror-maybe-reset
-+Act like @samp{-Wno-error} if the @env{GCC_NO_WERROR} environment
-+variable is set to anything other than 0 or empty.
-+
-+ at item -fhonour-copts
-+ at opindex fhonour-copts
-+If @env{GCC_HONOUR_COPTS} is set to 1, abort if this option is not
-+given at least once, and warn if it is given more than once.
-+If @env{GCC_HONOUR_COPTS} is set to 2, abort if this option is not
-+given exactly once.
-+If @env{GCC_HONOUR_COPTS} is set to 0 or unset, warn if this option
-+is not given exactly once.
-+The warning is quelled if @env{GCC_HONOUR_COPTS} is set to @samp{s}.
-+This flag and environment variable only affect the C language.
-+
- @item -Wstack-protector
- @opindex Wstack-protector
- @opindex Wno-stack-protector
-@@ -6570,7 +6586,7 @@
- second branch or a point immediately following it, depending on whether
- the condition is known to be true or false.
- 
--Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}.
-+Enabled at levels @option{-O3}.
- 
- @item -fsplit-wide-types
- @opindex fsplit-wide-types
-diff -Nur gcc-4.7.2.orig/gcc/java/jvspec.c gcc-4.7.2/gcc/java/jvspec.c
---- gcc-4.7.2.orig/gcc/java/jvspec.c	2011-02-13 20:20:01.000000000 +0100
-+++ gcc-4.7.2/gcc/java/jvspec.c	2012-09-22 12:53:33.000000000 +0200
-@@ -627,6 +627,7 @@
-      class name.  Append dummy `.c' that can be stripped by set_input so %b
-      is correct.  */ 
-   set_input (concat (main_class_name, "main.c", NULL));
-+  putenv ("GCC_HONOUR_COPTS=s"); /* XXX hack!  */
-   err = do_spec (jvgenmain_spec);
-   if (err == 0)
-     {
-diff -Nur gcc-4.7.2.orig/gcc/opts.c gcc-4.7.2/gcc/opts.c
---- gcc-4.7.2.orig/gcc/opts.c	2012-01-10 17:27:55.000000000 +0100
-+++ gcc-4.7.2/gcc/opts.c	2012-09-22 12:53:33.000000000 +0200
-@@ -470,8 +470,6 @@
-     { OPT_LEVELS_2_PLUS, OPT_fschedule_insns2, NULL, 1 },
- #endif
-     { OPT_LEVELS_2_PLUS, OPT_fregmove, NULL, 1 },
--    { OPT_LEVELS_2_PLUS, OPT_fstrict_aliasing, NULL, 1 },
--    { OPT_LEVELS_2_PLUS, OPT_fstrict_overflow, NULL, 1 },
-     { OPT_LEVELS_2_PLUS, OPT_freorder_blocks, NULL, 1 },
-     { OPT_LEVELS_2_PLUS, OPT_freorder_functions, NULL, 1 },
-     { OPT_LEVELS_2_PLUS, OPT_ftree_vrp, NULL, 1 },
-@@ -489,6 +487,8 @@
-     { OPT_LEVELS_2_PLUS_SPEED_ONLY, OPT_foptimize_strlen, NULL, 1 },
- 
-     /* -O3 optimizations.  */
-+    { OPT_LEVELS_3_PLUS, OPT_fstrict_aliasing, NULL, 1 },
-+    { OPT_LEVELS_3_PLUS, OPT_fstrict_overflow, NULL, 1 },
-     { OPT_LEVELS_3_PLUS, OPT_ftree_loop_distribute_patterns, NULL, 1 },
-     { OPT_LEVELS_3_PLUS, OPT_fpredictive_commoning, NULL, 1 },
-     /* Inlining of functions reducing size is a good idea with -Os
-@@ -1432,6 +1432,17 @@
- 			       opts, opts_set, loc, dc);
-       break;
- 
-+    case OPT_Werror_maybe_reset:
-+      {
-+        char *ev = getenv ("GCC_NO_WERROR");
-+        if ((ev != NULL) && (*ev != '0'))
-+          warnings_are_errors = 0;
-+      }
-+      break;
-+
-+    case OPT_fhonour_copts:
-+      break;
-+
-     case OPT_Wlarger_than_:
-       opts->x_larger_than_size = value;
-       opts->x_warn_larger_than = value != -1;
diff --git a/toolchain/gcc/patches/4.7.2/uclibc-ld-path.patch b/toolchain/gcc/patches/4.7.2/uclibc-ld-path.patch
deleted file mode 100644
index d45d27885..000000000
--- a/toolchain/gcc/patches/4.7.2/uclibc-ld-path.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nur gcc-4.7.2.orig/gcc/config/linux.h gcc-4.7.2/gcc/config/linux.h
---- gcc-4.7.2.orig/gcc/config/linux.h	2012-08-14 15:59:04.000000000 +0200
-+++ gcc-4.7.2/gcc/config/linux.h	2012-10-05 12:49:06.000000000 +0200
-@@ -76,8 +76,8 @@
-    supporting both 32-bit and 64-bit compilation.  */
- #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
- #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
--#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
--#define UCLIBC_DYNAMIC_LINKERX32 "/lib/ldx32-uClibc.so.0"
-+#define UCLIBC_DYNAMIC_LINKER64 "/lib64/ld64-uClibc.so.0"
-+#define UCLIBC_DYNAMIC_LINKERX32 "/libx32/ldx32-uClibc.so.0"
- #define BIONIC_DYNAMIC_LINKER "/system/bin/linker"
- #define BIONIC_DYNAMIC_LINKER32 "/system/bin/linker"
- #define BIONIC_DYNAMIC_LINKER64 "/system/bin/linker64"
diff --git a/toolchain/gcc/patches/4.7.3/musl-cris.patch b/toolchain/gcc/patches/4.7.3/musl-cris.patch
deleted file mode 100644
index 4889263a1..000000000
--- a/toolchain/gcc/patches/4.7.3/musl-cris.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur gcc-4.7.3.orig/gcc/config/cris/linux.h gcc-4.7.3/gcc/config/cris/linux.h
---- gcc-4.7.3.orig/gcc/config/cris/linux.h	2011-04-11 20:46:05.000000000 +0200
-+++ gcc-4.7.3/gcc/config/cris/linux.h	2013-10-11 10:01:51.000000000 +0200
-@@ -104,6 +104,7 @@
- #define CRIS_DEFAULT_CPU_VERSION CRIS_CPU_NG
- 
- #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-cris.1"
- 
- #undef CRIS_LINK_SUBTARGET_SPEC
- #define CRIS_LINK_SUBTARGET_SPEC \
diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile
index 6ece517d3..2e5971f19 100644
--- a/toolchain/kernel-headers/Makefile
+++ b/toolchain/kernel-headers/Makefile
@@ -10,13 +10,6 @@ $(WRKBUILD)/.headers:
 	$(MAKE) -C $(WRKBUILD) HOSTCC=$(CC_FOR_BUILD) ARCH=$(ARCH) V=1 \
 		INSTALL_HDR_PATH=$(STAGING_DIR)/usr \
 		headers_install
-ifeq ($(ARCH),cris)
-ifeq ($(CPU_ARCH),crisv32)
-	cd $(STAGING_DIR)/usr/include && ln -sf arch-v32/arch arch
-else
-	cd $(STAGING_DIR)/usr/include && ln -sf arch-v10/arch arch
-endif
-endif
 	touch $@
 
 include ${TOPDIR}/mk/toolchain.mk
diff --git a/toolchain/kernel-headers/patches/3.11.10/cris-header.patch b/toolchain/kernel-headers/patches/3.11.10/cris-header.patch
deleted file mode 100644
index da455f3b3..000000000
--- a/toolchain/kernel-headers/patches/3.11.10/cris-header.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff -Nur linux-3.11.5.orig/arch/cris/include/arch-v10/arch/Kbuild linux-3.11.5/arch/cris/include/arch-v10/arch/Kbuild
---- linux-3.11.5.orig/arch/cris/include/arch-v10/arch/Kbuild	2013-10-14 03:14:45.000000000 +0200
-+++ linux-3.11.5/arch/cris/include/arch-v10/arch/Kbuild	2013-10-15 17:05:47.000000000 +0200
-@@ -1 +1,5 @@
- # CRISv10 arch
-+header-y += ptrace.h
-+header-y += user.h
-+header-y += elf.h
-+header-y += system.h
-diff -Nur linux-3.11.5.orig/arch/cris/include/asm/Kbuild linux-3.11.5/arch/cris/include/asm/Kbuild
---- linux-3.11.5.orig/arch/cris/include/asm/Kbuild	2013-10-14 03:14:45.000000000 +0200
-+++ linux-3.11.5/arch/cris/include/asm/Kbuild	2013-10-15 17:06:22.000000000 +0200
-@@ -1,7 +1,7 @@
--
--header-y += arch-v10/
--header-y += arch-v32/
--
-+header-y += ../arch-v10/arch/
-+header-y += ../arch-v32/arch/
-+header-y += elf.h
-+header-y += user.h
- 
- generic-y += clkdev.h
- generic-y += exec.h
-diff -Nur linux-3.11.5.orig/arch/cris/include/uapi/asm/Kbuild linux-3.11.5/arch/cris/include/uapi/asm/Kbuild
---- linux-3.11.5.orig/arch/cris/include/uapi/asm/Kbuild	2013-10-14 03:14:45.000000000 +0200
-+++ linux-3.11.5/arch/cris/include/uapi/asm/Kbuild	2013-10-15 17:05:49.000000000 +0200
-@@ -1,8 +1,8 @@
- # UAPI Header export list
- include include/uapi/asm-generic/Kbuild.asm
- 
--header-y += arch-v10/
--header-y += arch-v32/
-+header-y += ../arch-v10/arch/
-+header-y += ../arch-v32/arch/
- header-y += auxvec.h
- header-y += bitsperlong.h
- header-y += byteorder.h
-diff -Nur linux-3.11.5.orig/include/uapi/asm-generic/Kbuild linux-3.11.5/include/uapi/asm-generic/Kbuild
---- linux-3.11.5.orig/include/uapi/asm-generic/Kbuild	2013-10-14 03:14:45.000000000 +0200
-+++ linux-3.11.5/include/uapi/asm-generic/Kbuild	2013-10-15 17:05:49.000000000 +0200
-@@ -34,3 +34,4 @@
- header-y += types.h
- header-y += ucontext.h
- header-y += unistd.h
-+header-y += user.h
-diff -Nur linux-3.11.5.orig/include/uapi/asm-generic/Kbuild.asm linux-3.11.5/include/uapi/asm-generic/Kbuild.asm
---- linux-3.11.5.orig/include/uapi/asm-generic/Kbuild.asm	2013-10-14 03:14:45.000000000 +0200
-+++ linux-3.11.5/include/uapi/asm-generic/Kbuild.asm	2013-10-15 17:05:49.000000000 +0200
-@@ -18,6 +18,7 @@
- header-y += ipcbuf.h
- header-y += mman.h
- header-y += msgbuf.h
-+header-y += page.h
- header-y += param.h
- header-y += poll.h
- header-y += posix_types.h
-@@ -38,6 +39,7 @@
- header-y += termios.h
- header-y += types.h
- header-y += unistd.h
-+header-y += user.h
- 
- header-y += $(foreach hdr,$(opt-header), \
- 	      $(if \
diff --git a/toolchain/kernel-headers/patches/3.12.6/cris-header.patch b/toolchain/kernel-headers/patches/3.12.6/cris-header.patch
deleted file mode 100644
index da455f3b3..000000000
--- a/toolchain/kernel-headers/patches/3.12.6/cris-header.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff -Nur linux-3.11.5.orig/arch/cris/include/arch-v10/arch/Kbuild linux-3.11.5/arch/cris/include/arch-v10/arch/Kbuild
---- linux-3.11.5.orig/arch/cris/include/arch-v10/arch/Kbuild	2013-10-14 03:14:45.000000000 +0200
-+++ linux-3.11.5/arch/cris/include/arch-v10/arch/Kbuild	2013-10-15 17:05:47.000000000 +0200
-@@ -1 +1,5 @@
- # CRISv10 arch
-+header-y += ptrace.h
-+header-y += user.h
-+header-y += elf.h
-+header-y += system.h
-diff -Nur linux-3.11.5.orig/arch/cris/include/asm/Kbuild linux-3.11.5/arch/cris/include/asm/Kbuild
---- linux-3.11.5.orig/arch/cris/include/asm/Kbuild	2013-10-14 03:14:45.000000000 +0200
-+++ linux-3.11.5/arch/cris/include/asm/Kbuild	2013-10-15 17:06:22.000000000 +0200
-@@ -1,7 +1,7 @@
--
--header-y += arch-v10/
--header-y += arch-v32/
--
-+header-y += ../arch-v10/arch/
-+header-y += ../arch-v32/arch/
-+header-y += elf.h
-+header-y += user.h
- 
- generic-y += clkdev.h
- generic-y += exec.h
-diff -Nur linux-3.11.5.orig/arch/cris/include/uapi/asm/Kbuild linux-3.11.5/arch/cris/include/uapi/asm/Kbuild
---- linux-3.11.5.orig/arch/cris/include/uapi/asm/Kbuild	2013-10-14 03:14:45.000000000 +0200
-+++ linux-3.11.5/arch/cris/include/uapi/asm/Kbuild	2013-10-15 17:05:49.000000000 +0200
-@@ -1,8 +1,8 @@
- # UAPI Header export list
- include include/uapi/asm-generic/Kbuild.asm
- 
--header-y += arch-v10/
--header-y += arch-v32/
-+header-y += ../arch-v10/arch/
-+header-y += ../arch-v32/arch/
- header-y += auxvec.h
- header-y += bitsperlong.h
- header-y += byteorder.h
-diff -Nur linux-3.11.5.orig/include/uapi/asm-generic/Kbuild linux-3.11.5/include/uapi/asm-generic/Kbuild
---- linux-3.11.5.orig/include/uapi/asm-generic/Kbuild	2013-10-14 03:14:45.000000000 +0200
-+++ linux-3.11.5/include/uapi/asm-generic/Kbuild	2013-10-15 17:05:49.000000000 +0200
-@@ -34,3 +34,4 @@
- header-y += types.h
- header-y += ucontext.h
- header-y += unistd.h
-+header-y += user.h
-diff -Nur linux-3.11.5.orig/include/uapi/asm-generic/Kbuild.asm linux-3.11.5/include/uapi/asm-generic/Kbuild.asm
---- linux-3.11.5.orig/include/uapi/asm-generic/Kbuild.asm	2013-10-14 03:14:45.000000000 +0200
-+++ linux-3.11.5/include/uapi/asm-generic/Kbuild.asm	2013-10-15 17:05:49.000000000 +0200
-@@ -18,6 +18,7 @@
- header-y += ipcbuf.h
- header-y += mman.h
- header-y += msgbuf.h
-+header-y += page.h
- header-y += param.h
- header-y += poll.h
- header-y += posix_types.h
-@@ -38,6 +39,7 @@
- header-y += termios.h
- header-y += types.h
- header-y += unistd.h
-+header-y += user.h
- 
- header-y += $(foreach hdr,$(opt-header), \
- 	      $(if \
diff --git a/toolchain/kernel-headers/patches/3.4.71/cleankernel.patch b/toolchain/kernel-headers/patches/3.4.71/cleankernel.patch
deleted file mode 100644
index f8d5448ee..000000000
--- a/toolchain/kernel-headers/patches/3.4.71/cleankernel.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur linux-2.6.29.1.orig/scripts/Makefile.headersinst linux-2.6.29.1/scripts/Makefile.headersinst
---- linux-2.6.29.1.orig/scripts/Makefile.headersinst	2009-04-02 22:55:27.000000000 +0200
-+++ linux-2.6.29.1/scripts/Makefile.headersinst	2009-04-17 20:56:09.143476927 +0200
-@@ -65,7 +65,6 @@
- 
- targets += $(install-file)
- $(install-file): scripts/headers_install.pl $(input-files) FORCE
--	$(if $(unwanted),$(call cmd,remove),)
- 	$(if $(wildcard $(dir $@)),,$(shell mkdir -p $(dir $@)))
- 	$(call if_changed,install)
- 
diff --git a/toolchain/kernel-headers/patches/3.4.71/etrax-header.patch b/toolchain/kernel-headers/patches/3.4.71/etrax-header.patch
deleted file mode 100644
index 559c0f322..000000000
--- a/toolchain/kernel-headers/patches/3.4.71/etrax-header.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-diff -Nur linux-3.4.4.orig/arch/cris/include/arch-v10/arch/Kbuild linux-3.4.4/arch/cris/include/arch-v10/arch/Kbuild
---- linux-3.4.4.orig/arch/cris/include/arch-v10/arch/Kbuild	2012-06-22 20:37:50.000000000 +0200
-+++ linux-3.4.4/arch/cris/include/arch-v10/arch/Kbuild	2012-07-18 07:38:39.000000000 +0200
-@@ -1,4 +1,10 @@
-+header-y += dma.h
-+header-y += io_interface_mux.h
- header-y += user.h
- header-y += svinto.h
- header-y += sv_addr_ag.h
- header-y += sv_addr.agh
-+header-y += elf.h
-+header-y += page.h
-+header-y += ptrace.h
-+header-y += system.h
-diff -Nur linux-3.4.4.orig/arch/cris/include/arch-v32/arch/Kbuild linux-3.4.4/arch/cris/include/arch-v32/arch/Kbuild
---- linux-3.4.4.orig/arch/cris/include/arch-v32/arch/Kbuild	2012-06-22 20:37:50.000000000 +0200
-+++ linux-3.4.4/arch/cris/include/arch-v32/arch/Kbuild	2012-07-18 07:38:26.000000000 +0200
-@@ -1,2 +1,7 @@
- header-y += user.h
- header-y += cryptocop.h
-+header-y += elf.h
-+header-y += page.h
-+header-y += ptrace.h
-+header-y += system.h
-+
-diff -Nur linux-3.4.4.orig/arch/cris/include/asm/Kbuild linux-3.4.4/arch/cris/include/asm/Kbuild
---- linux-3.4.4.orig/arch/cris/include/asm/Kbuild	2012-06-22 20:37:50.000000000 +0200
-+++ linux-3.4.4/arch/cris/include/asm/Kbuild	2012-07-18 07:38:03.000000000 +0200
-@@ -1,10 +1,13 @@
- include include/asm-generic/Kbuild.asm
- 
--header-y += arch-v10/
--header-y += arch-v32/
--
-+header-y += ../arch-v10/arch/
-+header-y += ../arch-v32/arch/
-+  
-+header-y += elf.h
- header-y += ethernet.h
- header-y += etraxgpio.h
- header-y += rs485.h
- header-y += rtc.h
- header-y += sync_serial.h
-+header-y += page.h
-+header-y += user.h
-diff -Nur linux-3.4.4.orig/arch/cris/include/asm/posix_types.h linux-3.4.4/arch/cris/include/asm/posix_types.h
---- linux-3.4.4.orig/arch/cris/include/asm/posix_types.h	2012-06-22 20:37:50.000000000 +0200
-+++ linux-3.4.4/arch/cris/include/asm/posix_types.h	2012-07-18 17:10:45.000000000 +0200
-@@ -6,6 +6,7 @@
- #ifndef __ARCH_CRIS_POSIX_TYPES_H
- #define __ARCH_CRIS_POSIX_TYPES_H
- 
-+
- /*
-  * This file is generally used by user-level software, so you need to
-  * be a little careful about namespace pollution etc.  Also, we cannot
-@@ -33,4 +34,6 @@
- typedef unsigned short	__kernel_old_dev_t;
- #define __kernel_old_dev_t __kernel_old_dev_t
- 
-+#include <asm-generic/posix_types.h>
-+
- #endif /* __ARCH_CRIS_POSIX_TYPES_H */
-diff -Nur linux-3.4.4.orig/include/asm-generic/Kbuild linux-3.4.4/include/asm-generic/Kbuild
---- linux-3.4.4.orig/include/asm-generic/Kbuild	2012-06-22 20:37:50.000000000 +0200
-+++ linux-3.4.4/include/asm-generic/Kbuild	2012-07-18 07:38:03.000000000 +0200
-@@ -3,14 +3,17 @@
- header-y += errno-base.h
- header-y += errno.h
- header-y += fcntl.h
-+header-y += getorder.h
- header-y += int-l64.h
- header-y += int-ll64.h
- header-y += ioctl.h
- header-y += ioctls.h
- header-y += ipcbuf.h
-+header-y += memory_model.h
- header-y += mman-common.h
- header-y += mman.h
- header-y += msgbuf.h
-+header-y += page.h
- header-y += param.h
- header-y += poll.h
- header-y += posix_types.h
-diff -Nur linux-3.4.4.orig/include/linux/Kbuild linux-3.4.4/include/linux/Kbuild
---- linux-3.4.4.orig/include/linux/Kbuild	2012-06-22 20:37:50.000000000 +0200
-+++ linux-3.4.4/include/linux/Kbuild	2012-07-18 07:38:03.000000000 +0200
-@@ -380,6 +380,7 @@
- header-y += un.h
- header-y += unistd.h
- header-y += usbdevice_fs.h
-+header-y += user.h
- header-y += utime.h
- header-y += utsname.h
- header-y += uvcvideo.h
diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile
index 98bb6f2b1..6345e239b 100644
--- a/toolchain/uClibc/Makefile
+++ b/toolchain/uClibc/Makefile
@@ -30,10 +30,6 @@ UCLIBCCFG=uclibc.config.big
 endif
 endif
 
-ifeq ($(ADK_TARGET_SYSTEM_QEMU_CRIS),y)
-UCLIBCCFG=uclibc.config.v32
-endif
-
 ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y)
 UCLIBCCFG=uclibc.config.little.mips64
 endif
diff --git a/toolchain/uClibc/patches/0.9.32.1/avr32_atomic_fix.patch b/toolchain/uClibc/patches/0.9.32.1/avr32_atomic_fix.patch
deleted file mode 100644
index 5e5460a3d..000000000
--- a/toolchain/uClibc/patches/0.9.32.1/avr32_atomic_fix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/libc/sysdeps/linux/avr32/bits/atomic.h
-+++ b/libc/sysdeps/linux/avr32/bits/atomic.h
-@@ -28,6 +28,7 @@ typedef uintmax_t uatomic_max_t;
- 
- #define __arch_compare_and_exchange_val_32_acq(mem, newval, oldval)	\
- 	({								\
-+		__uint32_t __result;					\
- 		__typeof__(*(mem)) __prev;				\
- 		__asm__ __volatile__(					\
- 			"/* __arch_compare_and_exchange_val_32_acq */\n" \
diff --git a/toolchain/uClibc/patches/0.9.32.1/epoll.patch b/toolchain/uClibc/patches/0.9.32.1/epoll.patch
deleted file mode 100644
index 4d9cc38cd..000000000
--- a/toolchain/uClibc/patches/0.9.32.1/epoll.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Nur uClibc-0.9.32.orig/libc/sysdeps/linux/common/epoll.c uClibc-0.9.32/libc/sysdeps/linux/common/epoll.c
---- uClibc-0.9.32.orig/libc/sysdeps/linux/common/epoll.c	2011-06-08 21:35:20.000000000 +0200
-+++ uClibc-0.9.32/libc/sysdeps/linux/common/epoll.c	2011-06-15 14:18:06.798202250 +0200
-@@ -67,12 +67,13 @@
- int __libc_epoll_pwait(int epfd, struct epoll_event *events, int maxevents,
- 						int timeout, const sigset_t *set)
- {
-+	int nsig = _NSIG / 8;
- 	if (SINGLE_THREAD_P)
--		return INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, _NSIG / 8);
-+		return INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, nsig);
- # ifdef __UCLIBC_HAS_THREADS_NATIVE__
- 	else {
- 		int oldtype = LIBC_CANCEL_ASYNC ();
--		int result = INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, _NSIG / 8);
-+		int result = INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, nsig);
- 		LIBC_CANCEL_RESET (oldtype);
- 		return result;
- 	}
diff --git a/toolchain/uClibc/patches/0.9.32.1/gnutar-problem.patch b/toolchain/uClibc/patches/0.9.32.1/gnutar-problem.patch
deleted file mode 100644
index a3d71131a..000000000
--- a/toolchain/uClibc/patches/0.9.32.1/gnutar-problem.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Nur uClibc-0.9.32-rc3.orig/Makefile.in uClibc-0.9.32-rc3/Makefile.in
---- uClibc-0.9.32-rc3.orig/Makefile.in	2011-03-16 20:11:13.000000000 +0100
-+++ uClibc-0.9.32-rc3/Makefile.in	2011-05-20 11:16:00.000000000 +0200
-@@ -385,13 +385,13 @@
- ifeq ($(HAVE_SHARED),y)
- 	$(INSTALL) -m 755 $(top_builddir)lib/lib*-$(VERSION).so \
- 		$(PREFIX)$(RUNTIME_PREFIX)$(MULTILIB_DIR)
--	(cd $(top_builddir)lib && $(TAR) -cf - *.so.*) | $(TAR) -xf - -C $(PREFIX)$(RUNTIME_PREFIX)$(MULTILIB_DIR)
- 	@if [ -x $(top_builddir)lib/$(UCLIBC_LDSO_NAME)-$(VERSION).so ] ; then \
- 		set -e; \
- 		$(SHELL_SET_X); \
- 		$(INSTALL) -m 755 $(top_builddir)lib/$(UCLIBC_LDSO_NAME)-$(VERSION).so \
- 			$(PREFIX)$(RUNTIME_PREFIX)$(MULTILIB_DIR); \
- 	fi
-+	(cd $(top_builddir)lib && $(TAR) -cf - *.so.*) | $(TAR) -xf - -C $(PREFIX)$(RUNTIME_PREFIX)$(MULTILIB_DIR)
- endif
- 
- utils: | pregen
diff --git a/toolchain/uClibc/patches/0.9.32.1/rpath-origin.patch b/toolchain/uClibc/patches/0.9.32.1/rpath-origin.patch
deleted file mode 100644
index c2bd2e8ab..000000000
--- a/toolchain/uClibc/patches/0.9.32.1/rpath-origin.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-diff -Nur uClibc-0.9.32.orig//ldso/ldso/dl-elf.c uClibc-0.9.32/ldso/ldso/dl-elf.c
---- uClibc-0.9.32.orig//ldso/ldso/dl-elf.c	2011-06-08 21:35:20.000000000 +0200
-+++ uClibc-0.9.32/ldso/ldso/dl-elf.c	2011-08-09 11:19:18.325314589 +0200
-@@ -133,53 +133,59 @@
-  * in uClibc/ldso/util/ldd.c */
- static struct elf_resolve *
- search_for_named_library(const char *name, int secure, const char *path_list,
--	struct dyn_elf **rpnt)
-+	struct dyn_elf **rpnt, const char *origin)
- {
--	char *path, *path_n, *mylibname;
-+	char *mylibname;
-+	const char *p, *pn;
- 	struct elf_resolve *tpnt;
--	int done;
-+	int plen;
- 
- 	if (path_list==NULL)
- 		return NULL;
- 
--	/* We need a writable copy of this string, but we don't
--	 * need this allocated permanently since we don't want
--	 * to leak memory, so use alloca to put path on the stack */
--	done = _dl_strlen(path_list);
--	path = alloca(done + 1);
--
- 	/* another bit of local storage */
- 	mylibname = alloca(2050);
- 
--	_dl_memcpy(path, path_list, done+1);
--
- 	/* Unlike ldd.c, don't bother to eliminate double //s */
- 
- 	/* Replace colons with zeros in path_list */
- 	/* : at the beginning or end of path maps to CWD */
- 	/* :: anywhere maps CWD */
- 	/* "" maps to CWD */
--	done = 0;
--	path_n = path;
--	do {
--		if (*path == 0) {
--			*path = ':';
--			done = 1;
-+	for (p = path_list; p != NULL; p = pn) { 
-+		pn = _dl_strchr(p + 1, ':');
-+		if (pn != NULL) {
-+			plen = pn - p;
-+			pn++;
-+		} else
-+			plen = _dl_strlen(p);
-+
-+		if (plen >= 7 && _dl_memcmp(p, "$ORIGIN", 7) == 0) {
-+			int olen;
-+			if (secure && plen != 7)
-+				continue;
-+			if (origin == NULL)
-+				continue;
-+			for (olen = _dl_strlen(origin) - 1; olen >= 0 && origin[olen] != '/'; olen--)
-+				;
-+			if (olen <= 0)
-+				continue;
-+			_dl_memcpy(&mylibname[0], origin, olen);
-+			_dl_memcpy(&mylibname[olen], p + 7, plen - 7);
-+			mylibname[olen + plen - 7] = 0;
-+		} else if (plen != 0) {
-+			_dl_memcpy(mylibname, p, plen);
-+			mylibname[plen] = 0; 
-+		} else {
-+			_dl_strcpy(mylibname, ".");
- 		}
--		if (*path == ':') {
--			*path = 0;
--			if (*path_n)
--				_dl_strcpy(mylibname, path_n);
--			else
--				_dl_strcpy(mylibname, "."); /* Assume current dir if empty path */
--			_dl_strcat(mylibname, "/");
--			_dl_strcat(mylibname, name);
--			if ((tpnt = _dl_load_elf_shared_library(secure, rpnt, mylibname)) != NULL)
--				return tpnt;
--			path_n = path+1;
--		}
--		path++;
--	} while (!done);
-+		_dl_strcat(mylibname, "/");
-+		_dl_strcat(mylibname, name); 
-+		
-+		tpnt = _dl_load_elf_shared_library(secure, rpnt, mylibname);
-+		if (tpnt != NULL)
-+			return tpnt;
-+	}
- 	return NULL;
- }
- 
-@@ -231,7 +237,7 @@
- 	if (pnt) {
- 		pnt += (unsigned long) tpnt->dynamic_info[DT_STRTAB];
- 		_dl_if_debug_dprint("\tsearching RPATH='%s'\n", pnt);
--		if ((tpnt1 = search_for_named_library(libname, secure, pnt, rpnt)) != NULL)
-+		if ((tpnt1 = search_for_named_library(libname, secure, pnt, rpnt, tpnt->libname)) != NULL)
- 			return tpnt1;
- 	}
- #endif
-@@ -239,7 +245,7 @@
- 	/* Check in LD_{ELF_}LIBRARY_PATH, if specified and allowed */
- 	if (_dl_library_path) {
- 		_dl_if_debug_dprint("\tsearching LD_LIBRARY_PATH='%s'\n", _dl_library_path);
--		if ((tpnt1 = search_for_named_library(libname, secure, _dl_library_path, rpnt)) != NULL)
-+		if ((tpnt1 = search_for_named_library(libname, secure, _dl_library_path, rpnt, NULL)) != NULL)
- 		{
- 			return tpnt1;
- 		}
-@@ -253,7 +259,7 @@
- 	if (pnt) {
- 		pnt += (unsigned long) tpnt->dynamic_info[DT_STRTAB];
- 		_dl_if_debug_dprint("\tsearching RUNPATH='%s'\n", pnt);
--		if ((tpnt1 = search_for_named_library(libname, secure, pnt, rpnt)) != NULL)
-+		if ((tpnt1 = search_for_named_library(libname, secure, pnt, rpnt, NULL)) != NULL)
- 			return tpnt1;
- 	}
- #endif
-@@ -287,7 +293,7 @@
- 	/* Look for libraries wherever the shared library loader
- 	 * was installed */
- 	_dl_if_debug_dprint("\tsearching ldso dir='%s'\n", _dl_ldsopath);
--	tpnt1 = search_for_named_library(libname, secure, _dl_ldsopath, rpnt);
-+	tpnt1 = search_for_named_library(libname, secure, _dl_ldsopath, rpnt, NULL);
- 	if (tpnt1 != NULL)
- 		return tpnt1;
- 
-@@ -300,7 +306,7 @@
- #ifndef __LDSO_CACHE_SUPPORT__
- 					":" UCLIBC_RUNTIME_PREFIX "usr/X11R6/lib"
- #endif
--					, rpnt);
-+					, rpnt, NULL);
- 	if (tpnt1 != NULL)
- 		return tpnt1;
- 
-diff -Nur uClibc-0.9.32.orig//ldso/ldso/ldso.c uClibc-0.9.32/ldso/ldso/ldso.c
---- uClibc-0.9.32.orig//ldso/ldso/ldso.c	2011-06-08 21:35:20.000000000 +0200
-+++ uClibc-0.9.32/ldso/ldso/ldso.c	2011-08-09 11:15:04.135386129 +0200
-@@ -272,6 +272,20 @@
- 	}
- }
- 
-+static void _dl_setup_progname(const char *argv0)
-+{
-+	char image[PATH_MAX];
-+	ssize_t s;
-+
-+	s = _dl_readlink("/proc/self/exe", image, sizeof(image));
-+	if (s > 0 && image[0] == '/') {
-+	 image[s] = 0;
-+	 _dl_progname = _dl_strdup(image);
-+	} else if (argv0) {
-+	 _dl_progname = argv0;
-+	}
-+}
-+
- void _dl_get_ready_to_run(struct elf_resolve *tpnt, DL_LOADADDR_TYPE load_addr,
- 			  ElfW(auxv_t) auxvt[AT_EGID + 1], char **envp,
- 			  char **argv
-@@ -321,9 +335,7 @@
- 	 * been fixed up by now.  Still no function calls outside of this
- 	 * library, since the dynamic resolver is not yet ready.
- 	 */
--	if (argv[0]) {
--		_dl_progname = argv[0];
--	}
-+	_dl_setup_progname(argv[0]);
- 
- 	if (_start == (void *) auxvt[AT_ENTRY].a_un.a_val) {
- 		_dl_dprintf(_dl_debug_file, "Standalone execution is not supported yet\n");
diff --git a/toolchain/uClibc/patches/0.9.32.1/uClibc-0.9.32.1-unshare.patch b/toolchain/uClibc/patches/0.9.32.1/uClibc-0.9.32.1-unshare.patch
deleted file mode 100644
index 5820e15bb..000000000
--- a/toolchain/uClibc/patches/0.9.32.1/uClibc-0.9.32.1-unshare.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-Backport of unshare() syscall.
-From uClibc git 19dd090a0f68765db87990ef8eda9bf77bb29581
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
----
-diff -Nura uClibc-0.9.32.orig/libc/sysdeps/linux/common/bits/sched.h uClibc-0.9.32/libc/sysdeps/linux/common/bits/sched.h
---- uClibc-0.9.32.orig/libc/sysdeps/linux/common/bits/sched.h	2011-12-02 23:54:30.571841170 -0300
-+++ uClibc-0.9.32/libc/sysdeps/linux/common/bits/sched.h	2011-12-02 23:57:45.874205079 -0300
-@@ -58,7 +58,13 @@
- 				      force CLONE_PTRACE on this clone.  */
- # define CLONE_CHILD_SETTID 0x01000000 /* Store TID in userlevel buffer in
- 					  the child.  */
--# define CLONE_STOPPED	0x02000000 /* Start in stopped state.  */
-+# define CLONE_STOPPED 0x02000000 /* Start in stopped state.  */
-+# define CLONE_NEWUTS  0x04000000      /* New utsname group.  */
-+# define CLONE_NEWIPC  0x08000000      /* New ipcs.  */
-+# define CLONE_NEWUSER 0x10000000      /* New user namespace.  */
-+# define CLONE_NEWPID  0x20000000      /* New pid namespace.  */
-+# define CLONE_NEWNET  0x40000000      /* New network namespace.  */
-+# define CLONE_IO      0x80000000      /* Clone I/O context.  */
- #endif
- 
- /* The official definition.  */
-@@ -74,11 +80,9 @@
- extern int clone (int (*__fn) (void *__arg), void *__child_stack,
- 		  int __flags, void *__arg, ...) __THROW;
- 
--#if 0
- /* Unshare the specified resources.  */
- extern int unshare (int __flags) __THROW;
- #endif
--#endif
- 
- __END_DECLS
- 
-diff -Nura uClibc-0.9.32.orig/libc/sysdeps/linux/common/Makefile.in uClibc-0.9.32/libc/sysdeps/linux/common/Makefile.in
---- uClibc-0.9.32.orig/libc/sysdeps/linux/common/Makefile.in	2011-12-02 23:54:30.577841215 -0300
-+++ uClibc-0.9.32/libc/sysdeps/linux/common/Makefile.in	2011-12-02 23:56:08.801527166 -0300
-@@ -24,7 +24,8 @@
- 	remap_file_pages.c sched_getaffinity.c sched_setaffinity.c \
- 	sendfile64.c sendfile.c setfsgid.c setfsuid.c setresuid.c \
- 	splice.c vmsplice.c tee.c signalfd.c swapoff.c swapon.c \
--	sync_file_range.c sysctl.c sysinfo.c timerfd.c uselib.c vhangup.c
-+	sync_file_range.c sysctl.c sysinfo.c timerfd.c unshare.c uselib.c \
-+	vhangup.c
- # NPTL needs these internally: madvise.c
- CSRC-$(findstring y,$(UCLIBC_LINUX_SPECIFIC)$(UCLIBC_HAS_THREADS_NATIVE)) += madvise.c
- ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y)
-diff -Nura uClibc-0.9.32.orig/libc/sysdeps/linux/common/stubs.c uClibc-0.9.32/libc/sysdeps/linux/common/stubs.c
---- uClibc-0.9.32.orig/libc/sysdeps/linux/common/stubs.c	2011-12-02 23:54:30.577841215 -0300
-+++ uClibc-0.9.32/libc/sysdeps/linux/common/stubs.c	2011-12-02 23:58:18.803435042 -0300
-@@ -278,6 +278,10 @@
- make_stub(umount2)
- #endif
- 
-+#if !defined __NR_unshare && defined __UCLIBC_LINUX_SPECIFIC__
-+make_stub(unshare)
-+#endif
-+
- #ifndef __NR_utimensat
- make_stub(futimens)
- make_stub(utimensat)
-diff -Nura uClibc-0.9.32.orig/libc/sysdeps/linux/common/unshare.c uClibc-0.9.32/libc/sysdeps/linux/common/unshare.c
---- uClibc-0.9.32.orig/libc/sysdeps/linux/common/unshare.c	1969-12-31 21:00:00.000000000 -0300
-+++ uClibc-0.9.32/libc/sysdeps/linux/common/unshare.c	2011-12-02 23:58:42.693601880 -0300
-@@ -0,0 +1,15 @@
-+/* vi: set sw=4 ts=4: */
-+/*
-+ * unshare() for uClibc
-+ *
-+ * Copyright (C) 2011 Henning Heinold <heinold@inf.fu-berlin.de>
-+ *
-+ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
-+ */
-+
-+#include <sys/syscall.h>
-+#include <sched.h>
-+
-+#if defined __NR_unshare
-+_syscall1(int, unshare, int, flags)
-+#endif
diff --git a/toolchain/uClibc/patches/0.9.32.1/uClibc-sigaction.patch b/toolchain/uClibc/patches/0.9.32.1/uClibc-sigaction.patch
deleted file mode 100644
index 0077191e5..000000000
--- a/toolchain/uClibc/patches/0.9.32.1/uClibc-sigaction.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-diff -Nur uClibc-0.9.32.1/libc/signal/sigaction.c uClibc.new/libc/signal/sigaction.c
---- uClibc-0.9.32.1/libc/signal/sigaction.c	2011-12-30 12:11:07.000000000 +0100
-+++ uClibc.new/libc/signal/sigaction.c	2012-02-17 14:49:51.000000000 +0100
-@@ -82,6 +82,11 @@
- 
- 
- #ifndef LIBC_SIGACTION
-+# ifndef __UCLIBC_HAS_THREADS__
-+strong_alias(__libc_sigaction,sigaction)
-+libc_hidden_def(sigaction)
-+# else
- weak_alias(__libc_sigaction,sigaction)
- libc_hidden_weak(sigaction)
-+# endif
- #endif
-diff -Nur uClibc-0.9.32.1/libc/sysdeps/linux/arm/sigaction.c uClibc.new/libc/sysdeps/linux/arm/sigaction.c
---- uClibc-0.9.32.1/libc/sysdeps/linux/arm/sigaction.c	2011-12-30 12:11:07.000000000 +0100
-+++ uClibc.new/libc/sysdeps/linux/arm/sigaction.c	2012-02-17 14:49:51.000000000 +0100
-@@ -96,6 +96,11 @@
- 
- 
- #ifndef LIBC_SIGACTION
-+# ifndef __UCLIBC_HAS_THREADS__
-+strong_alias(__libc_sigaction,sigaction)
-+libc_hidden_def(sigaction)
-+# else
- weak_alias(__libc_sigaction,sigaction)
- libc_hidden_weak(sigaction)
-+# endif
- #endif
-diff -Nur uClibc-0.9.32.1/libc/sysdeps/linux/avr32/sigaction.c uClibc.new/libc/sysdeps/linux/avr32/sigaction.c
---- uClibc-0.9.32.1/libc/sysdeps/linux/avr32/sigaction.c	2011-12-30 12:11:07.000000000 +0100
-+++ uClibc.new/libc/sysdeps/linux/avr32/sigaction.c	2012-02-17 14:49:51.000000000 +0100
-@@ -38,6 +38,11 @@
- }
- 
- #ifndef LIBC_SIGACTION
--weak_alias(__libc_sigaction, sigaction)
-+# ifndef __UCLIBC_HAS_THREADS__
-+strong_alias(__libc_sigaction,sigaction)
-+libc_hidden_def(sigaction)
-+# else
-+weak_alias(__libc_sigaction,sigaction)
- libc_hidden_weak(sigaction)
-+# endif
- #endif
-diff -Nur uClibc-0.9.32.1/libc/sysdeps/linux/c6x/sigaction.c uClibc.new/libc/sysdeps/linux/c6x/sigaction.c
---- uClibc-0.9.32.1/libc/sysdeps/linux/c6x/sigaction.c	2011-12-30 12:11:07.000000000 +0100
-+++ uClibc.new/libc/sysdeps/linux/c6x/sigaction.c	2012-02-17 14:49:51.000000000 +0100
-@@ -75,10 +75,16 @@
- }
- 
- #ifndef LIBC_SIGACTION
-+# ifndef __UCLIBC_HAS_THREADS__
-+strong_alias(__libc_sigaction,sigaction)
-+libc_hidden_def(sigaction)
-+# else
- weak_alias(__libc_sigaction,sigaction)
- libc_hidden_weak(sigaction)
-+# endif
- #endif
- 
-+
- /* NOTE: Please think twice before making any changes to the bits of
-    code below.  GDB needs some intimate knowledge about it to
-    recognize them as signal trampolines, and make backtraces through
-diff -Nur uClibc-0.9.32.1/libc/sysdeps/linux/i386/sigaction.c uClibc.new/libc/sysdeps/linux/i386/sigaction.c
---- uClibc-0.9.32.1/libc/sysdeps/linux/i386/sigaction.c	2011-12-30 12:11:07.000000000 +0100
-+++ uClibc.new/libc/sysdeps/linux/i386/sigaction.c	2012-02-17 14:49:51.000000000 +0100
-@@ -95,8 +95,13 @@
- 
- 
- #ifndef LIBC_SIGACTION
-+# ifndef __UCLIBC_HAS_THREADS__
-+strong_alias(__libc_sigaction,sigaction)
-+libc_hidden_def(sigaction)
-+# else
- weak_alias(__libc_sigaction,sigaction)
- libc_hidden_weak(sigaction)
-+# endif
- #endif
- 
- 
-diff -Nur uClibc-0.9.32.1/libc/sysdeps/linux/mips/sigaction.c uClibc.new/libc/sysdeps/linux/mips/sigaction.c
---- uClibc-0.9.32.1/libc/sysdeps/linux/mips/sigaction.c	2011-12-30 12:11:07.000000000 +0100
-+++ uClibc.new/libc/sysdeps/linux/mips/sigaction.c	2012-02-17 14:49:51.000000000 +0100
-@@ -100,8 +100,13 @@
- 
- 
- #ifndef LIBC_SIGACTION
-+# ifndef __UCLIBC_HAS_THREADS__
-+strong_alias(__libc_sigaction,sigaction)
-+libc_hidden_def(sigaction)
-+# else
- weak_alias(__libc_sigaction,sigaction)
- libc_hidden_weak(sigaction)
-+# endif
- #endif
- 
- 
-diff -Nur uClibc-0.9.32.1/libc/sysdeps/linux/sparc/sigaction.c uClibc.new/libc/sysdeps/linux/sparc/sigaction.c
---- uClibc-0.9.32.1/libc/sysdeps/linux/sparc/sigaction.c	2011-12-30 12:11:07.000000000 +0100
-+++ uClibc.new/libc/sysdeps/linux/sparc/sigaction.c	2012-02-17 14:49:51.000000000 +0100
-@@ -65,11 +65,18 @@
- 	return ret;
- }
- 
-+
- #ifndef LIBC_SIGACTION
-+# ifndef __UCLIBC_HAS_THREADS__
-+strong_alias(__libc_sigaction,sigaction)
-+libc_hidden_def(sigaction)
-+# else
- weak_alias(__libc_sigaction,sigaction)
- libc_hidden_weak(sigaction)
-+# endif
- #endif
- 
-+
- static void
- __rt_sigreturn_stub(void)
- {
-diff -Nur uClibc-0.9.32.1/libc/sysdeps/linux/x86_64/sigaction.c uClibc.new/libc/sysdeps/linux/x86_64/sigaction.c
---- uClibc-0.9.32.1/libc/sysdeps/linux/x86_64/sigaction.c	2011-12-30 12:11:07.000000000 +0100
-+++ uClibc.new/libc/sysdeps/linux/x86_64/sigaction.c	2012-02-17 14:49:51.000000000 +0100
-@@ -99,8 +99,13 @@
- 
- 
- #ifndef LIBC_SIGACTION
-+# ifndef __UCLIBC_HAS_THREADS__
-+strong_alias(__libc_sigaction,sigaction)
-+libc_hidden_def(sigaction)
-+# else
- weak_alias(__libc_sigaction,sigaction)
- libc_hidden_weak(sigaction)
-+# endif
- #endif
- 
- 
-diff -Nur uClibc-0.9.32.1/libc/sysdeps/linux/xtensa/sigaction.c uClibc.new/libc/sysdeps/linux/xtensa/sigaction.c
---- uClibc-0.9.32.1/libc/sysdeps/linux/xtensa/sigaction.c	2011-12-30 12:11:07.000000000 +0100
-+++ uClibc.new/libc/sysdeps/linux/xtensa/sigaction.c	2012-02-17 14:49:51.000000000 +0100
-@@ -34,6 +34,11 @@
- }
- 
- #ifndef LIBC_SIGACTION
--weak_alias(__libc_sigaction, sigaction)
-+# ifndef __UCLIBC_HAS_THREADS__
-+strong_alias(__libc_sigaction,sigaction)
-+libc_hidden_def(sigaction)
-+# else
-+weak_alias(__libc_sigaction,sigaction)
- libc_hidden_weak(sigaction)
-+# endif
- #endif
diff --git a/toolchain/uClibc/patches/0.9.32.1/uClibc-sigaction2.patch b/toolchain/uClibc/patches/0.9.32.1/uClibc-sigaction2.patch
deleted file mode 100644
index f33e14dde..000000000
--- a/toolchain/uClibc/patches/0.9.32.1/uClibc-sigaction2.patch
+++ /dev/null
@@ -1,247 +0,0 @@
-diff -Nur uClibc-0.9.32.1/libc/signal/Makefile.in uClibc.new/libc/signal/Makefile.in
---- uClibc-0.9.32.1/libc/signal/Makefile.in	2011-12-30 12:11:07.000000000 +0100
-+++ uClibc.new/libc/signal/Makefile.in	2012-02-17 15:13:33.000000000 +0100
-@@ -17,7 +17,7 @@
- CSRC-$(UCLIBC_SUSV4_LEGACY) += sigintr.c
- 
- ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y)
--CSRC-y:=$(filter-out raise.c sigaction.c,$(CSRC-y))
-+CSRC-y:=$(filter-out raise.c,$(CSRC-y))
- endif
- 
- ifneq ($(strip $(ARCH_OBJS)),)
-diff -Nur uClibc-0.9.32.1/libc/sysdeps/linux/arm/Makefile.arch uClibc.new/libc/sysdeps/linux/arm/Makefile.arch
---- uClibc-0.9.32.1/libc/sysdeps/linux/arm/Makefile.arch	2011-12-30 12:11:07.000000000 +0100
-+++ uClibc.new/libc/sysdeps/linux/arm/Makefile.arch	2012-02-17 15:13:33.000000000 +0100
-@@ -5,11 +5,7 @@
- # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
- #
- 
--CSRC := brk.c ioperm.c iopl.c mmap.c __syscall_error.c
--
--ifneq ($(UCLIBC_HAS_THREADS_NATIVE),y)
--CSRC += sigaction.c
--endif
-+CSRC := brk.c ioperm.c iopl.c mmap.c __syscall_error.c sigaction.c
- 
- SSRC := \
- 	__longjmp.S setjmp.S bsd-setjmp.S \
-diff -Nur uClibc-0.9.32.1/libc/sysdeps/linux/i386/Makefile.arch uClibc.new/libc/sysdeps/linux/i386/Makefile.arch
---- uClibc-0.9.32.1/libc/sysdeps/linux/i386/Makefile.arch	2011-12-30 12:11:07.000000000 +0100
-+++ uClibc.new/libc/sysdeps/linux/i386/Makefile.arch	2012-02-17 15:13:33.000000000 +0100
-@@ -5,11 +5,7 @@
- # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
- #
- 
--CSRC := brk.c __syscall_error.c
--
--ifneq ($(UCLIBC_HAS_THREADS_NATIVE),y)
--CSRC += sigaction.c
--endif
-+CSRC := brk.c __syscall_error.c sigaction.c
- 
- SSRC := \
- 	__longjmp.S setjmp.S bsd-setjmp.S bsd-_setjmp.S \
-diff -Nur uClibc-0.9.32.1/libc/sysdeps/linux/mips/Makefile.arch uClibc.new/libc/sysdeps/linux/mips/Makefile.arch
---- uClibc-0.9.32.1/libc/sysdeps/linux/mips/Makefile.arch	2011-12-30 12:11:07.000000000 +0100
-+++ uClibc.new/libc/sysdeps/linux/mips/Makefile.arch	2012-02-17 15:13:33.000000000 +0100
-@@ -7,7 +7,7 @@
- 
- CSRC := \
- 	__longjmp.c  brk.c setjmp_aux.c mmap.c \
--	cacheflush.c pread_write.c sysmips.c _test_and_set.c \
-+	cacheflush.c pread_write.c sigaction.c sysmips.c _test_and_set.c \
- 	readahead.c
- 
- SSRC := bsd-_setjmp.S bsd-setjmp.S setjmp.S syscall.S pipe.S syscall_error.S
-@@ -17,7 +17,6 @@
- endif
- 
- ifneq ($(UCLIBC_HAS_THREADS_NATIVE),y)
--CSRC += sigaction.c
- SSRC += vfork.S clone.S
- endif
- 
-diff -Nur uClibc-0.9.32.1/libc/sysdeps/linux/sparc/Makefile.arch uClibc.new/libc/sysdeps/linux/sparc/Makefile.arch
---- uClibc-0.9.32.1/libc/sysdeps/linux/sparc/Makefile.arch	2011-12-30 12:11:07.000000000 +0100
-+++ uClibc.new/libc/sysdeps/linux/sparc/Makefile.arch	2012-02-17 15:14:20.000000000 +0100
-@@ -5,15 +5,14 @@
- # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
- #
- 
--CSRC := brk.c __syscall_error.c
-+CSRC := brk.c __syscall_error.c sigaction.c
- 
- SSRC := \
- 	__longjmp.S setjmp.S bsd-setjmp.S bsd-_setjmp.S \
- 	syscall.S urem.S udiv.S umul.S sdiv.S rem.S pipe.S
- 
- ifneq ($(UCLIBC_HAS_THREADS_NATIVE),y)
--CSRC += sigaction.c
--SSRC += fork.S vfork.S
-+SSRC += fork.S vfork.S clone.S
- endif
- 
- # check weather __LONG_DOUBLE_128__ is defined (long double support)
-diff -Nur uClibc-0.9.32.1/libc/sysdeps/linux/x86_64/Makefile.arch uClibc.new/libc/sysdeps/linux/x86_64/Makefile.arch
---- uClibc-0.9.32.1/libc/sysdeps/linux/x86_64/Makefile.arch	2011-12-30 12:11:07.000000000 +0100
-+++ uClibc.new/libc/sysdeps/linux/x86_64/Makefile.arch	2012-02-17 15:13:33.000000000 +0100
-@@ -5,11 +5,7 @@
- # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
- #
- 
--CSRC := brk.c __syscall_error.c mmap.c
--
--ifneq ($(UCLIBC_HAS_THREADS_NATIVE),y)
--CSRC += sigaction.c
--endif
-+CSRC := brk.c __syscall_error.c sigaction.c mmap.c
- 
- SSRC := \
- 	__longjmp.S setjmp.S syscall.S bsd-setjmp.S bsd-_setjmp.S
-diff -Nur uClibc-0.9.32.1/libpthread/nptl/.gitignore uClibc.new/libpthread/nptl/.gitignore
---- uClibc-0.9.32.1/libpthread/nptl/.gitignore	2011-12-30 12:11:07.000000000 +0100
-+++ uClibc.new/libpthread/nptl/.gitignore	2012-02-17 15:13:33.000000000 +0100
-@@ -24,6 +24,5 @@
- #
- # symlinks
- #
--sysdeps/pthread/pt-sigaction.c
- sysdeps/pthread/pt-sigfillset.c
- sysdeps/pthread/pt-sigprocmask.c
-diff -Nur uClibc-0.9.32.1/libpthread/nptl/sysdeps/pthread/Makefile.in uClibc.new/libpthread/nptl/sysdeps/pthread/Makefile.in
---- uClibc-0.9.32.1/libpthread/nptl/sysdeps/pthread/Makefile.in	2011-12-30 12:11:07.000000000 +0100
-+++ uClibc.new/libpthread/nptl/sysdeps/pthread/Makefile.in	2012-02-17 15:13:33.000000000 +0100
-@@ -42,8 +42,6 @@
- CFLAGS-pthread_spin_destroy.c = -D_GNU_SOURCE
- CFLAGS-pthread_spin_init.c = -D_GNU_SOURCE
- CFLAGS-pthread_spin_unlock.c = -D_GNU_SOURCE
--CFLAGS-pt-sigaction.c = -I$(top_srcdir)libc/sysdeps/linux/$(TARGET_ARCH) \
--			-I$(top_srcdir)libc/signal
- CFLAGS-pt-sigfillset.c = -I$(top_srcdir)libc/signal
- CFLAGS-pt-sigprocmask.c = -I$(top_srcdir)libc/sysdeps/linux/common
- CFLAGS-unwind-forcedunwind.c = -fexceptions -fasynchronous-unwind-tables
-@@ -58,10 +56,6 @@
- libpthread-so-y += $(patsubst %,$(libpthread_pthread_OUT)/%.oS, \
- 	pt-sigaction pt-sigprocmask unwind-forcedunwind)
- 
--CFLAGS-OMIT-sigaction.c = $(CFLAGS-pthread)
--CFLAGS-sigaction.c = -I$(top_srcdir)libc/signal
--libc-y += $(libpthread_pthread_OUT)/sigaction.o
--
- librt-pt-routines-y = librt-cancellation.c
- librt-pt-shared-only-routines-y = rt-unwind-resume.c
- 
-@@ -114,7 +108,7 @@
- # impl, but ok.
- # Special rules needed since we do objdir->objdir compilation for these 3.
- # First symlink them, then build them. Rob would freak out on these. Sheesh! ;)
--pthread-lc-fwd = sigaction sigfillset sigprocmask
-+pthread-lc-fwd = sigfillset sigprocmask
- $(patsubst %,$(libpthread_pthread_OUT)/pt-%.c,$(pthread-lc-fwd)): | $(libpthread_pthread_OUT)
- 	$(do_ln) $(call rel_srcdir)$(patsubst pt-%,$(libpthread_pthread_DIR)/%,$(@F)) $@
- $(patsubst %,$(libpthread_pthread_OUT)/pt-%.oS,$(pthread-lc-fwd)): $(libpthread_pthread_OUT)/pt-%.oS: $(libpthread_pthread_OUT)/pt-%.c
-@@ -131,5 +125,5 @@
- CLEAN_libpthread/nptl/sysdeps/pthread:
- 	$(do_rm) $(addprefix $(libpthread_pthread_OUT)/*., o os oS s S) \
- 		$(libpthread_pthread_OUT)/defs.h \
--		$(addprefix $(libpthread_pthread_DIR)/,pt-sigaction.c \
-+		$(addprefix $(libpthread_pthread_DIR)/, \
- 			pt-sigfillset.c pt-sigprocmask.c)
-diff -Nur uClibc-0.9.32.1/libpthread/nptl/sysdeps/pthread/pt-sigaction.c uClibc.new/libpthread/nptl/sysdeps/pthread/pt-sigaction.c
---- uClibc-0.9.32.1/libpthread/nptl/sysdeps/pthread/pt-sigaction.c	1970-01-01 01:00:00.000000000 +0100
-+++ uClibc.new/libpthread/nptl/sysdeps/pthread/pt-sigaction.c	2012-02-17 15:13:33.000000000 +0100
-@@ -0,0 +1,40 @@
-+/* Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#include <pthreadP.h>
-+#include <signal.h>
-+
-+/* We use the libc implementation but we tell it to not allow
-+   SIGCANCEL or SIGTIMER to be handled.  */
-+
-+extern __typeof(sigaction) __libc_sigaction;
-+int
-+__sigaction (int sig, const struct sigaction *act, struct sigaction *oact)
-+{
-+  if (unlikely (sig == SIGCANCEL || sig == SIGSETXID))
-+    {
-+      __set_errno (EINVAL);
-+      return -1;
-+    }
-+
-+  return __libc_sigaction (sig, act, oact);
-+}
-+libc_hidden_proto(sigaction)
-+weak_alias (__sigaction, sigaction)
-+libc_hidden_weak(sigaction)
-diff -Nur uClibc-0.9.32.1/libpthread/nptl/sysdeps/pthread/sigaction.c uClibc.new/libpthread/nptl/sysdeps/pthread/sigaction.c
---- uClibc-0.9.32.1/libpthread/nptl/sysdeps/pthread/sigaction.c	2011-12-30 12:11:07.000000000 +0100
-+++ uClibc.new/libpthread/nptl/sysdeps/pthread/sigaction.c	1970-01-01 01:00:00.000000000 +0100
-@@ -1,49 +0,0 @@
--/* Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
--   This file is part of the GNU C Library.
--   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
--
--   The GNU C Library is free software; you can redistribute it and/or
--   modify it under the terms of the GNU Lesser General Public
--   License as published by the Free Software Foundation; either
--   version 2.1 of the License, or (at your option) any later version.
--
--   The GNU C Library is distributed in the hope that it will be useful,
--   but WITHOUT ANY WARRANTY; without even the implied warranty of
--   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
--   Lesser General Public License for more details.
--
--   You should have received a copy of the GNU Lesser General Public
--   License along with the GNU C Library; if not, write to the Free
--   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
--   02111-1307 USA.  */
--
--#ifndef LIBC_SIGACTION
--
--#include <pthreadP.h>
--
--/* We use the libc implementation but we tell it to not allow
--   SIGCANCEL or SIGTIMER to be handled.  */
--#define LIBC_SIGACTION	1
--#include <sigaction.c>
--
--extern __typeof(sigaction) __sigaction;
--int
--__sigaction (int sig, const struct sigaction *act, struct sigaction *oact)
--{
--  if (__builtin_expect (sig == SIGCANCEL || sig == SIGSETXID, 0))
--    {
--      __set_errno (EINVAL);
--      return -1;
--    }
--
--  return __libc_sigaction (sig, act, oact);
--}
--libc_hidden_proto(sigaction)
--weak_alias (__sigaction, sigaction)
--libc_hidden_weak(sigaction)
--
--#else
--
--# include_next <sigaction.c>
--
--#endif /* LIBC_SIGACTION */
diff --git a/toolchain/uClibc/patches/0.9.32.1/uClibc-weak-sigprocmask.patch b/toolchain/uClibc/patches/0.9.32.1/uClibc-weak-sigprocmask.patch
deleted file mode 100644
index a98f5b94d..000000000
--- a/toolchain/uClibc/patches/0.9.32.1/uClibc-weak-sigprocmask.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Nur uClibc-0.9.32.1.orig/libc/sysdeps/linux/common/sigprocmask.c uClibc-0.9.32.1/libc/sysdeps/linux/common/sigprocmask.c
---- uClibc-0.9.32.1.orig/libc/sysdeps/linux/common/sigprocmask.c	2011-12-30 12:11:07.000000000 +0100
-+++ uClibc-0.9.32.1/libc/sysdeps/linux/common/sigprocmask.c	2012-02-18 11:40:09.000000000 +0100
-@@ -23,7 +23,7 @@
- _syscall4(int, __rt_sigprocmask, int, how, const sigset_t *, set,
- 		  sigset_t *, oldset, size_t, size)
- 
--int sigprocmask(int how, const sigset_t * set, sigset_t * oldset)
-+int weak_function sigprocmask(int how, const sigset_t * set, sigset_t * oldset)
- {
- #ifdef SIGCANCEL
- 	sigset_t local_newmask;
-@@ -58,7 +58,7 @@
- _syscall3(int, __syscall_sigprocmask, int, how, const sigset_t *, set,
- 		  sigset_t *, oldset)
- 
--int sigprocmask(int how, const sigset_t * set, sigset_t * oldset)
-+int weak_function sigprocmask(int how, const sigset_t * set, sigset_t * oldset)
- {
- #ifdef SIGCANCEL
- 	sigset_t local_newmask;
diff --git a/toolchain/uClibc/patches/0.9.33.2/avr32_atomic_fix.patch b/toolchain/uClibc/patches/0.9.33.2/avr32_atomic_fix.patch
deleted file mode 100644
index 5e5460a3d..000000000
--- a/toolchain/uClibc/patches/0.9.33.2/avr32_atomic_fix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/libc/sysdeps/linux/avr32/bits/atomic.h
-+++ b/libc/sysdeps/linux/avr32/bits/atomic.h
-@@ -28,6 +28,7 @@ typedef uintmax_t uatomic_max_t;
- 
- #define __arch_compare_and_exchange_val_32_acq(mem, newval, oldval)	\
- 	({								\
-+		__uint32_t __result;					\
- 		__typeof__(*(mem)) __prev;				\
- 		__asm__ __volatile__(					\
- 			"/* __arch_compare_and_exchange_val_32_acq */\n" \
diff --git a/tools/adk/depmaker.c b/tools/adk/depmaker.c
index a2291e4b0..f1483cced 100644
--- a/tools/adk/depmaker.c
+++ b/tools/adk/depmaker.c
@@ -1,7 +1,7 @@
 /*
  * depmaker - create package/Depends.mk for OpenADK buildsystem
  *
- * Copyright (C) 2010,2011 Waldemar Brodkorb <wbx@openadk.org>
+ * Copyright (C) 2010-2014 Waldemar Brodkorb <wbx@openadk.org>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -64,7 +64,7 @@ static int check_symbol(char *symbol) {
 }
 
 /*@null@*/
-static char *parse_line(char *package, char *pkgvar, char *string, int checksym, int pprefix) {
+static char *parse_line(char *package, char *pkgvar, char *string, int checksym, int pprefix, int system) {
 
 	char *key, *value, *dep, *key_sym, *pkgdeps;
 	char temp[MAXLINE];
@@ -83,15 +83,20 @@ static char *parse_line(char *package, char *pkgvar, char *string, int checksym,
 			perror("Can not allocate memory.");
 			exit(EXIT_FAILURE);
 		}
-		if (pprefix == 0) {
-			if (snprintf(key_sym, MAXLINE, "ADK_PACKAGE_%s_", pkgvar) < 0)
-				perror("Can not create string variable.");
+		if (system == 0) {
+			if (pprefix == 0) {
+				if (snprintf(key_sym, MAXLINE, "ADK_PACKAGE_%s_", pkgvar) < 0)
+					perror("Can not create string variable.");
+			} else {
+				if (snprintf(key_sym, MAXLINE, "ADK_PACKAGE_") < 0)
+					perror("Can not create string variable.");
+			}
+			strncat(key_sym, key+6, strlen(key)-6);
 		} else {
-			if (snprintf(key_sym, MAXLINE, "ADK_PACKAGE_") < 0)
-				perror("Can not create string variable.");
+			if (snprintf(key_sym, MAXLINE, "ADK_TARGET_SYSTEM_%s", pkgvar) < 0)
+					perror("Can not create string variable.");
 		}
 			
-		strncat(key_sym, key+6, strlen(key)-6);
 		if (check_symbol(key_sym) != 0) {
 			free(key_sym);
 			return(NULL);
@@ -130,8 +135,13 @@ int main() {
 	FILE *pkg;
 	char buf[MAXLINE];
 	char path[MAXPATH];
-	char *string, *pkgvar, *pkgdeps, *tmp, *fpkg, *cpkg, *spkg, *key, *check;
+	char *string, *pkgvar, *pkgdeps, *tmp, *fpkg, *cpkg, *spkg, *key, *check, *dpkg;
+	char *stringtmp;
 	int i;
+
+	spkg = NULL;
+	cpkg = NULL;
+	fpkg = NULL;
 	
 	/* read Makefile's for all packages */
 	pkgdir = opendir("package");
@@ -160,6 +170,7 @@ int main() {
 				!(strncmp(pkgdirp->d_name, "libpthread", 10) == 0 && strlen(pkgdirp->d_name) == 10) &&
 				!(strncmp(pkgdirp->d_name, "uclibc++", 8) == 0) &&
 				!(strncmp(pkgdirp->d_name, "uclibc", 6) == 0) &&
+				!(strncmp(pkgdirp->d_name, "musl", 4) == 0) &&
 				!(strncmp(pkgdirp->d_name, "glibc", 5) == 0)) {
 				/* print result to stdout */
 				printf("package-$(ADK_COMPILE_%s) += %s\n", pkgvar, pkgdirp->d_name); 
@@ -187,7 +198,7 @@ int main() {
 
 					string = strstr(buf, "PKG_BUILDDEP:=");
 					if (string != NULL) {
-						tmp = parse_line(pkgdirp->d_name, pkgvar, string, 0, 0);
+						tmp = parse_line(pkgdirp->d_name, pkgvar, string, 0, 0, 0);
 						if (tmp != NULL) {
 							strncat(pkgdeps, tmp, strlen(tmp));
 						}
@@ -195,12 +206,27 @@ int main() {
 
 					string = strstr(buf, "PKG_BUILDDEP+=");
 					if (string != NULL) {
-						tmp = parse_line(pkgdirp->d_name, pkgvar, string, 0, 0);
+						tmp = parse_line(pkgdirp->d_name, pkgvar, string, 0, 0, 0);
 						if (tmp != NULL)
 							strncat(pkgdeps, tmp, strlen(tmp));
 					}
 
-					// WE need to find the subpackage name here
+					// We need to find the system name here
+					string = strstr(buf, "PKG_BUILDDEP_");
+					if (string != NULL) {
+						check = strstr(buf, ":=");
+						if (check != NULL) {
+							stringtmp = strdup(string);
+							string[strlen(string)-1] = '\0';
+							key = strtok(string, ":=");
+							dpkg = strdup(key+13);
+							tmp = parse_line(pkgdirp->d_name, dpkg, stringtmp, 1, 0, 1);
+							if (tmp != NULL)
+								strncat(pkgdeps, tmp, strlen(tmp));
+						}
+					}
+
+					// We need to find the subpackage name here
 					string = strstr(buf, "PKG_FLAVOURS_");
 					if (string != NULL) {
 						check = strstr(buf, ":=");
@@ -213,12 +239,12 @@ int main() {
 
 					string = strstr(buf, "PKGFB_");
 					if (string != NULL) {
-						tmp = parse_line(pkgdirp->d_name, fpkg, string, 1, 0);
+						tmp = parse_line(pkgdirp->d_name, fpkg, string, 1, 0, 0);
 						if (tmp != NULL)
 							strncat(pkgdeps, tmp, strlen(tmp));
 					}
 
-					// WE need to find the subpackage name here
+					// We need to find the subpackage name here
 					string = strstr(buf, "PKG_CHOICES_");
 					if (string != NULL) {
 						check = strstr(buf, ":=");
@@ -230,12 +256,12 @@ int main() {
 					}
 					string = strstr(buf, "PKGCB_");
 					if (string != NULL) {
-						tmp = parse_line(pkgdirp->d_name, cpkg, string, 1, 0);
+						tmp = parse_line(pkgdirp->d_name, cpkg, string, 1, 0, 0);
 						if (tmp != NULL)
 							strncat(pkgdeps, tmp, strlen(tmp));
 					}
 
-					// WE need to find the subpackage name here
+					// We need to find the subpackage name here
 					string = strstr(buf, "PKG_SUBPKGS_");
 					if (string != NULL) {
 						check = strstr(buf, ":=");
@@ -248,7 +274,7 @@ int main() {
 
 					string = strstr(buf, "PKGSB_");
 					if (string != NULL) {
-						tmp = parse_line(pkgdirp->d_name, spkg, string, 1, 1);
+						tmp = parse_line(pkgdirp->d_name, spkg, string, 1, 1, 0);
 						if (tmp != NULL) {
 							strncat(pkgdeps, tmp, strlen(tmp));
 						}
diff --git a/tools/adk/pkgmaker.c b/tools/adk/pkgmaker.c
index d00e7302f..3609691b6 100644
--- a/tools/adk/pkgmaker.c
+++ b/tools/adk/pkgmaker.c
@@ -1,7 +1,7 @@
 /*
  * pkgmaker - create package meta-data for OpenADK buildsystem
  *
- * Copyright (C) 2010-2013 Waldemar Brodkorb <wbx@openadk.org>
+ * Copyright (C) 2010-2014 Waldemar Brodkorb <wbx@openadk.org>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -111,6 +111,53 @@ static int parse_var(char *buf, const char *varname, char *pvalue, char **result
 	return(1);
 }
 
+static int parse_var_with_system(char *buf, const char *varname, char *pvalue, char **result, char **sysname, int varlen) {
+
+	char *pkg_var, *check;
+	char *key, *value, *string;
+
+	if ((pkg_var = malloc(MAXLINE)) != NULL)
+		memset(pkg_var, 0, MAXLINE);
+	else {
+		perror("Can not allocate memory");
+		exit(EXIT_FAILURE);
+	}
+
+	check = strstr(buf, ":=");
+	if (check != NULL) {
+		string = strstr(buf, varname);
+		if (string != NULL) {
+			string[strlen(string)-1] = '\0';
+			key = strtok(string, ":=");
+			*sysname = strdup(key+varlen);
+			value = strtok(NULL, "=\t");
+			if (value != NULL) {
+				strncat(pkg_var, value, strlen(value));
+				*result = strdup(pkg_var);
+			}
+			free(pkg_var);
+			return(0);
+		}
+	} else {
+		string = strstr(buf, varname);
+		if (string != NULL) {
+			string[strlen(string)-1] = '\0';
+			key = strtok(string, "+=");
+			value = strtok(NULL, "=\t");
+			if (pvalue != NULL)
+				strncat(pkg_var, pvalue, strlen(pvalue));
+			strncat(pkg_var, " ", 1);
+			if (value != NULL)
+				strncat(pkg_var, value, strlen(value));
+			*result = strdup(pkg_var);
+			free(pkg_var);
+			return(0);
+		}
+	}
+	free(pkg_var);
+	return(1);
+}
+
 static int parse_var_with_pkg(char *buf, const char *varname, char *pvalue, char **result, char **pkgname, int varlen) {
 
 	char *pkg_var, *check;
@@ -268,9 +315,9 @@ int main() {
 	char dir[MAXPATH];
 	char variable[2*MAXVAR];
 	char *key, *value, *token, *cftoken, *sp, *hkey, *val, *pkg_fd;
-	char *pkg_name, *pkg_depends, *pkg_section, *pkg_descr, *pkg_url;
+	char *pkg_name, *pkg_depends, *pkg_depends_system, *pkg_section, *pkg_descr, *pkg_url;
 	char *pkg_cxx, *pkg_subpkgs, *pkg_cfline, *pkg_dflt, *pkg_multi;
-	char *pkg_need_cxx, *pkg_need_java, *pkgname, *pkg_debug;
+	char *pkg_need_cxx, *pkg_need_java, *pkgname, *sysname, *pkg_debug;
 	char *pkg_libc_depends, *pkg_host_depends, *pkg_system_depends, *pkg_arch_depends, *pkg_flavours, *pkg_flavours_string, *pkg_choices, *pseudo_name;
 	char *packages, *pkg_name_u, *pkgs, *pkg_opts, *pkg_libname;
 	char *saveptr, *p_ptr, *s_ptr, *pkg_helper;
@@ -282,6 +329,7 @@ int main() {
 	pkg_section = NULL;
 	pkg_url = NULL;
 	pkg_depends = NULL;
+	pkg_depends_system = NULL;
 	pkg_opts = NULL;
 	pkg_libname = NULL;
 	pkg_flavours = NULL;
@@ -299,6 +347,7 @@ int main() {
 	pkg_need_cxx = NULL;
 	pkg_need_java = NULL;
 	pkgname = NULL;
+	sysname = NULL;
 	pkg_helper = NULL;
 	pkg_debug = NULL;
 
@@ -463,6 +512,8 @@ int main() {
 						continue;
 					if ((parse_var(buf, "PKG_DEPENDS", pkg_depends, &pkg_depends)) == 0)
 						continue;
+					if ((parse_var_with_system(buf, "PKG_DEPENDS_", pkg_depends_system, &pkg_depends_system, &sysname, 12)) == 0)
+						continue;
 					if ((parse_var(buf, "PKG_LIBNAME", pkg_libname, &pkg_libname)) == 0) 
 						continue;
 					if ((parse_var(buf, "PKG_OPTS", pkg_opts, &pkg_opts)) == 0)
@@ -517,6 +568,8 @@ int main() {
 				fprintf(stderr, "Package description is %s\n", pkg_descr);
 			if (pkg_depends != NULL)
 				fprintf(stderr, "Package dependencies are %s\n", pkg_depends);
+			if (pkg_depends_system != NULL)
+				fprintf(stderr, "Package systemspecific dependencies are %s\n", pkg_depends_system);
 			if (pkg_subpkgs != NULL)
 				fprintf(stderr, "Package subpackages are %s\n", pkg_subpkgs);
 			if (pkg_flavours != NULL && pkgname != NULL)
@@ -782,6 +835,16 @@ int main() {
 					free(pkg_depends);
 					pkg_depends = NULL;
 				}
+				/* create system specific package dependency information */
+				if (pkg_depends_system != NULL) {
+					token = strtok(pkg_depends_system, " ");
+					while (token != NULL) {
+						fprintf(cfg, "\tselect ADK_PACKAGE_%s if ADK_TARGET_SYSTEM_%s\n", toupperstr(token), sysname);
+						token = strtok(NULL, " ");
+					}
+					free(pkg_depends_system);
+					pkg_depends_system = NULL;
+				}
 
 				if (pkg_need_cxx != NULL) {
 					fprintf(cfg, "\tdepends on ADK_TOOLCHAIN_GCC_CXX\n");